- prevent more warnings

zopefoundation · May 16, 2018 · 6ce7641 · 6ce7641
1 parent 1a55abd
commit 6ce7641
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Products/GenericSetup/content.py b/Products/GenericSetup/content.py
@@ -337,7 +337,10 @@ def put_ini(self, text):
         """
         context = self.context
         parser = ConfigParser()
-        parser.readfp(cStringIO(text))
+        try:
+            parser.read_file(cStringIO(text))
+        except AttributeError:  # Python 2
+            parser.readfp(cStringIO(text))
         for option, value in parser.defaults().items():
             prop_type = context.getPropertyType(option)
             if prop_type is None:

diff --git a/Products/GenericSetup/tests/test_content.py b/Products/GenericSetup/tests/test_content.py
@@ -946,7 +946,10 @@ def _parseINI(text):
     from six.moves.configparser import ConfigParser
     from six.moves import cStringIO
     parser = ConfigParser()
-    parser.readfp(cStringIO(text))
+    try:
+        parser.read_file(cStringIO(text))
+    except AttributeError:  # Python 2
+        parser.readfp(cStringIO(text))
     return parser
 
 

diff --git a/Products/GenericSetup/tests/test_context.py b/Products/GenericSetup/tests/test_context.py
@@ -794,6 +794,8 @@ def test_writeDataFile_PdataStreamIterator(self):
         self._verifyTarballContents(fileish, ['foo.txt'])
         self._verifyTarballEntry(fileish, 'foo.txt', printable_bytes)
 
+        fp.close()  # Prevent unclosed file warning
+
     def test_writeDataFile_subdir(self):
 
         site = DummySite('site').__of__(self.app)

diff --git a/Products/GenericSetup/tool.py b/Products/GenericSetup/tool.py
@@ -13,12 +13,15 @@
 """ Classes:  SetupTool
 """
 
+try:
+    from html import escape
+except ImportError:
+    from cgi import escape
 import logging
 import os
 import six
 import time
 import types
-from cgi import escape
 from operator import itemgetter
 
 from AccessControl.class_init import InitializeClass