Merge pull request #95 from zopefoundation/maurits/fix-warnings

Renamed xml dir to xml_templates.
zopefoundation · Sep 2, 2020 · c42d867 · c42d867
2 parents 4528c25 + 9079df4
commit c42d867
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.0.3 (unreleased)
 ------------------
 
+- Renamed ``xml`` dir to ``xml_templates``.
+  This avoids an import warning on Python 2.7.
+
 
 2.0.2 (2020-01-29)
 ------------------

diff --git a/Products/GenericSetup/utils.py b/Products/GenericSetup/utils.py
@@ -54,7 +54,7 @@
 
 _pkgdir = package_home(globals())
 _wwwdir = os.path.join(_pkgdir, 'www')
-_xmldir = os.path.join(_pkgdir, 'xml')
+_xmldir = os.path.join(_pkgdir, 'xml_templates')
 
 # Please note that these values may change. Always import
 # the values from here instead of using the values directly.

diff --git a/Products/GenericSetup/xml/esrExport.xml → .../GenericSetup/xml_templates/esrExport.xml b/Products/GenericSetup/xml/esrExport.xml → .../GenericSetup/xml_templates/esrExport.xml
diff --git a/Products/GenericSetup/xml/isrExport.xml → .../GenericSetup/xml_templates/isrExport.xml b/Products/GenericSetup/xml/isrExport.xml → .../GenericSetup/xml_templates/isrExport.xml
diff --git a/Products/GenericSetup/xml/rmeExport.xml → .../GenericSetup/xml_templates/rmeExport.xml b/Products/GenericSetup/xml/rmeExport.xml → .../GenericSetup/xml_templates/rmeExport.xml
diff --git a/Products/GenericSetup/xml/tscExport.xml → .../GenericSetup/xml_templates/tscExport.xml b/Products/GenericSetup/xml/tscExport.xml → .../GenericSetup/xml_templates/tscExport.xml