Merge branch 'stable-2.16' into stable-2.17
[ganeti-github.git] / src / Ganeti / THH / PyRPC.hs
index d25c811..859f080 100644 (file)
@@ -40,9 +40,11 @@ module Ganeti.THH.PyRPC
   , genPyUDSRpcStubStr
   ) where
 
-import Control.Monad
+import Prelude ()
+import Ganeti.Prelude
+
+import Control.Monad (liftM, zipWithM)
 import Data.Char (toLower, toUpper)
-import Data.Functor
 import Data.Maybe (fromMaybe)
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax (liftString)