[Checkins] SVN: zope.i18nmessageid/branches/tseaver-no_2to3/ Removed use of '2to3' and associated fixers when installing under Py3k.

[Tres Seaver]

Log message for revision 125052:
  Removed use of '2to3' and associated fixers when installing under Py3k.
  
  The code is now in a "compatible subset" which supports Python 2.6, 2.7,
  and 3.2, including PyPy 1.8 (the version compatible with the 2.7 language
  spec).
  

Changed:
  U   zope.i18nmessageid/branches/tseaver-no_2to3/CHANGES.txt
  U   zope.i18nmessageid/branches/tseaver-no_2to3/setup.py
  U   zope.i18nmessageid/branches/tseaver-no_2to3/src/zope/i18nmessageid/message.py

-=-
Modified: zope.i18nmessageid/branches/tseaver-no_2to3/CHANGES.txt
===================================================================
--- zope.i18nmessageid/branches/tseaver-no_2to3/CHANGES.txt	2012-04-06 22:49:11 UTC (rev 125051)
+++ zope.i18nmessageid/branches/tseaver-no_2to3/CHANGES.txt	2012-04-06 22:49:15 UTC (rev 125052)
@@ -5,6 +5,11 @@
 4.0.0 (unreleased)
 ------------------
 
+- Removed use of '2to3' and associated fixers when installing under Py3k.
+  The code is now in a "compatible subset" which supports Python 2.6, 2.7,
+  and 3.2, including PyPy 1.8 (the version compatible with the 2.7 language
+  spec).
+
 - 100% unit test coverage.
 
 - Move doctest examples into Sphinx documentation.

Modified: zope.i18nmessageid/branches/tseaver-no_2to3/setup.py
===================================================================
--- zope.i18nmessageid/branches/tseaver-no_2to3/setup.py	2012-04-06 22:49:11 UTC (rev 125051)
+++ zope.i18nmessageid/branches/tseaver-no_2to3/setup.py	2012-04-06 22:49:15 UTC (rev 125052)
@@ -55,11 +55,6 @@
     # and defeats JIT opportunities).
     extra['features'] = {'codeoptimization':codeoptimization}
 
-if sys.version_info >= (3,):
-    extra['use_2to3'] = True
-    extra['convert_2to3_doctests'] = ['src/zope/i18nmessageid/messages.txt',
-                                     ]
-
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 

Modified: zope.i18nmessageid/branches/tseaver-no_2to3/src/zope/i18nmessageid/message.py
===================================================================
--- zope.i18nmessageid/branches/tseaver-no_2to3/src/zope/i18nmessageid/message.py	2012-04-06 22:49:11 UTC (rev 125051)
+++ zope.i18nmessageid/branches/tseaver-no_2to3/src/zope/i18nmessageid/message.py	2012-04-06 22:49:15 UTC (rev 125052)
@@ -15,6 +15,12 @@
 """
 __docformat__ = "reStructuredText"
 
+try:
+    unicode
+except NameError: #pragma NO COVER Python3
+    unicode = str
+
+
 class Message(unicode):
     """Message (Python implementation)