Rename PyValueInstances.hs to PyValue.hs

Now the file contains the type class declaration as well.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

Makefile.am

@@ -701,7 +701,7 @@ HS_LIB_SRCS = \
 	src/Ganeti/OpParams.hs \
 	src/Ganeti/Path.hs \
 	src/Ganeti/Parsers.hs \
-	src/Ganeti/PyValueInstances.hs \
+	src/Ganeti/PyValue.hs \
 	src/Ganeti/Query/Cluster.hs \
 	src/Ganeti/Query/Common.hs \
 	src/Ganeti/Query/Export.hs \

src/Ganeti/ConstantUtils.hs

@@ -32,8 +32,7 @@ import Data.Char (ord)
 import Data.Set (Set)
 import qualified Data.Set as Set (difference, fromList, toList, union)
 
-import Ganeti.THH (PyValue(..))
-import Ganeti.PyValueInstances ()
+import Ganeti.PyValue
 
 -- | 'PythonChar' wraps a Python 'char'
 newtype PythonChar = PythonChar { unPythonChar :: Char }

src/Ganeti/Hs2Py/ListConstants.hs.in

@@ -30,7 +30,7 @@ module Ganeti.Hs2Py.ListConstants where
 
 import Ganeti.Constants
 import Ganeti.Hs2Py.GenConstants
-import Ganeti.PyValueInstances ()
+import Ganeti.PyValue ()
 
 $(genPyConstants "pyConstants"
   (

src/Ganeti/OpCodes.hs

@@ -53,7 +53,7 @@ import Ganeti.THH
 
 import qualified Ganeti.Hs2Py.OpDoc as OpDoc
 import Ganeti.OpParams
-import Ganeti.PyValueInstances ()
+import Ganeti.PyValue ()
 import Ganeti.Types
 import Ganeti.Query.Language (queryTypeOpToRaw)
 

src/Ganeti/PyValueInstances.hs → src/Ganeti/PyValue.hs

-{-| PyValueInstances contains instances for the 'PyValue' typeclass.
+{-| PyValue contains instances for the 'PyValue' typeclass.
 
 The typeclass 'PyValue' converts Haskell values to Python values.
 This module contains instances of this typeclass for several generic
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE FlexibleInstances, OverlappingInstances,
              TypeSynonymInstances, IncoherentInstances #-}
-module Ganeti.PyValueInstances where
+module Ganeti.PyValue where
 
 import Data.List (intercalate)
 import Data.Map (Map)

src/Ganeti/THH.hs

@@ -77,7 +77,7 @@ import qualified Text.JSON as JSON
 import Text.JSON.Pretty (pp_value)
 
 import Ganeti.JSON
-import Ganeti.PyValueInstances
+import Ganeti.PyValue
 
 import Data.Maybe
 import Data.Functor ((<$>))