Merge lp:~cjwatson/lazr.config/py3-configparser-readfp-deprecated into lp:lazr.config

[Colin Watson]

Fix deprecation warning on Python >= 3.2.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2019-11-04 17:08:58 +0000
+++ NEWS.rst	2021-01-25 23:03:27 +0000
@@ -2,6 +2,10 @@
 NEWS for lazr.config
 ====================
 
+2.2.3
+=====
+- Fix deprecation warning on Python >= 3.2.  (LP: #1870199)
+
 2.2.2 (2019-11-04)
 ==================
 - Officially add support for Python 3.7 and 3.8.  The test suite required

=== modified file 'src/lazr/config/_config.py'
--- src/lazr/config/_config.py	2015-01-06 01:41:25 +0000
+++ src/lazr/config/_config.py	2021-01-25 23:03:27 +0000
@@ -49,11 +49,17 @@
 try:
     from io import StringIO
     from configparser import NoSectionError, RawConfigParser
+
+    def _parser_read_file(parser, f, source=None):
+        parser.read_file(f, source)
 except ImportError:
     # Python 2.
     from StringIO import StringIO
     from ConfigParser import NoSectionError, RawConfigParser
 
+    def _parser_read_file(parser, f, source=None):
+        parser.readfp(f, source)
+
 
 from zope.interface import implementer
 
@@ -261,7 +267,7 @@
         else:
             raw_schema = file_object
         parser = RawConfigParser()
-        parser.readfp(raw_schema, filename)
+        _parser_read_file(parser, raw_schema, filename)
         self._setSectionSchemasAndCategoryNames(parser)
 
     def _getRawSchema(self, filename):
@@ -581,7 +587,7 @@
         if sys.version_info >= (3,):
             kws['strict'] = False
         parser = RawConfigParser(**kws)
-        parser.readfp(StringIO(conf_data), conf_filename)
+        _parser_read_file(parser, StringIO(conf_data), conf_filename)
         confs.append((conf_filename, parser, encoding_errors))
         if parser.has_option('meta', 'extends'):
             base_path = dirname(conf_filename)