Skip to content

Commit

Permalink
Renamed xml dir to xml_templates.
Browse files Browse the repository at this point in the history
This avoids an import warning on Python 2.7:

```
Products/PluggableAuthService/plugins/exportimport.py:19:
ImportWarning: Not importing directory '.../PluggableAuthService/plugins/xml': missing __init__.py
  from xml.dom.minidom import parseString
```
  • Loading branch information
mauritsvanrees committed Sep 2, 2020
1 parent 1882ac3 commit e5e5f83
Show file tree
Hide file tree
Showing 12 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.rst
Expand Up @@ -4,6 +4,9 @@ Change Log
2.5 (unreleased)
----------------

- Renamed ``xml`` dir to ``xml_templates``.
This avoids an import warning on Python 2.7.

- Disable ZMI CSRF check and log it if sessioning is not available
instead of breaking ZMI interactions

Expand Down
2 changes: 1 addition & 1 deletion Products/PluggableAuthService/plugins/exportimport.py
Expand Up @@ -61,7 +61,7 @@ def export(self, export_context, subdir, root=False):
""" See IFilesystemExporter.
"""
package_path = getPackagePath(self)
template = PageTemplateFile('xml/%s' % self._FILENAME,
template = PageTemplateFile('xml_templates/%s' % self._FILENAME,
package_path).__of__(self.context)
info = self._getExportInfo()
export_context.writeDataFile('%s.xml' % self.context.getId(),
Expand Down

0 comments on commit e5e5f83

Please sign in to comment.