Merge "Handle readfp deprecation"

tools/trove-pylint.config

@@ -405,6 +405,12 @@
       "Instance of 'API' has no 'mongodb_add_shard_cluster' member",
       "MongoDbCluster.add_shard"
     ],
+    [
+      "trove/common/stream_codecs.py",
+      "no-member",
+      "Instance of 'ConfigParser' has no 'read_file' member",
+      "IniCodec.deserialize"
+    ],
     [
       "trove/common/utils.py",
       "E1127",
@@ -1667,4 +1673,4 @@
     "--rcfile=./pylintrc",
     "-E"
   ]
-}
+}

trove/common/stream_codecs.py

@@ -206,7 +206,10 @@ class IniCodec(StreamCodec):
 
     def deserialize(self, stream):
         parser = self._init_config_parser()
-        parser.readfp(self._pre_parse(stream))
+        if sys.version_info >= (3, 2):
+            parser.read_file(self._pre_parse(stream))
+        else:
+            parser.readfp(self._pre_parse(stream))
 
         return {s: {k:
                     StringConverter({None: self._default_value}).to_objects(v)