Export the mtypes module under the old types name. Fix configure.zcml…

… to use the new mtypes name so it can be loaded.
zopefoundation · Mar 1, 2013 · b0746c9 · b0746c9
1 parent a6ff4fd
commit b0746c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,7 +5,10 @@ CHANGES
 2.0.0a2 (unreleased)
 --------------------
 
-- Nothing changed yet.
+- Restore the ability to write `from zope.mimetype import types`.
+
+- Make `configure.zcml` respect the renaming of the `types` module
+  so that it can be loaded.
 
 
 2.0.0a1 (2013-02-27)
@@ -19,6 +22,8 @@ CHANGES
 - Replaced deprecated ``zope.interface.implements`` usage with equivalent
   ``zope.interface.implementer`` decorator.
 
+- Renamed `zope.mimetype.types` to `zope.mimetype.mtypes`.
+
 - Dropped support for Python 2.4 and 2.5.
 
 

diff --git a/src/zope/mimetype/__init__.py b/src/zope/mimetype/__init__.py
@@ -1 +1,2 @@
 from zope.mimetype import mtypes
+types = mtypes # alternate spelling/backwards (1.3) compatible export
diff --git a/src/zope/mimetype/configure.zcml b/src/zope/mimetype/configure.zcml
@@ -3,7 +3,7 @@
     i18n_domain="zope.mimetype">
 
   <mimeTypes
-      module=".types"
+      module=".mtypes"
       file="types.csv"
       />