Merge branch 'NextThought-py32'

.travis.yml

@@ -1,16 +1,16 @@
 language: python
 sudo: false
-python:
-    - 2.6
-    - 2.7
-    - 3.3
-    - 3.4
-    - pypy
-    - pypy3
+env:
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=py32
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=pypy
+    - TOXENV=pypy3
 install:
-    - pip install
-    - pip install zope.applicationcontrol[test]
+    - pip install tox
 script:
-    - python setup.py -q test -q
+    - tox
 notifications:
     email: false

setup.py

@@ -61,9 +61,11 @@ def alltests():
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',

src/zope/applicationcontrol/runtimeinfo.py

@@ -39,6 +39,10 @@
     appsetup = None
 
 PY3 = sys.version_info[0] == 3
+if PY3:
+    _u = str
+else:
+    _u = unicode
 
 @implementer(IRuntimeInfo)
 @adapter(IApplicationControl)
@@ -62,12 +66,14 @@ def getDeveloperMode(self):
 
     def getPreferredEncoding(self):
         """See zope.app.applicationcontrol.interfaces.IRuntimeInfo"""
-        if locale is not None:
-            try:
-                return locale.getpreferredencoding()
-            except locale.Error:
-                pass
-        return sys.getdefaultencoding()
+        try:
+            result = locale.getpreferredencoding()
+        except (locale.Error, AttributeError):
+            result = ''
+        # Under some systems, getpreferredencoding() can return ''
+        # (e.g., Python 2.7/MacOSX/LANG=en_us.UTF-8). This then blows
+        # up with 'unknown encoding'
+        return result or sys.getdefaultencoding()
 
     def getFileSystemEncoding(self):
         """See zope.app.applicationcontrol.interfaces.IRuntimeInfo"""
@@ -105,7 +111,7 @@ def getSystemPlatform(self):
             except ValueError:
                 continue
             info.append(t)
-        return u" ".join(info)
+        return _u(" ").join(info)
 
     def getCommandLine(self):
         """See zope.app.applicationcontrol.interfaces.IRuntimeInfo"""

src/zope/applicationcontrol/tests/test_runtimeinfo.py

@@ -31,6 +31,11 @@
 stupid_version_string = "3085t0klvn93850voids"
 
 PY3 = sys.version_info[0] == 3
+if PY3:
+    _u = str
+else:
+    _u = unicode
+
 
 @implementer(IZopeVersion)
 class TestZopeVersion(object):
@@ -47,12 +52,14 @@ def _Test__new(self):
         return RuntimeInfo(applicationController)
 
     def _getPreferredEncoding(self):
-        if locale is not None:
-            try:
-                return locale.getpreferredencoding()
-            except locale.Error:
-                pass
-        return sys.getdefaultencoding()
+        try:
+            result = locale.getpreferredencoding()
+        except (locale.Error, AttributeError):
+            result = ''
+        # Under some systems, getpreferredencoding() can return ''
+        # (e.g., Python 2.7/MacOSX/LANG=en_us.UTF-8). This then blows
+        # up with 'unknown encoding'
+        return result or sys.getdefaultencoding()
 
     def _getFileSystemEncoding(self):
         enc = sys.getfilesystemencoding()
@@ -77,7 +84,7 @@ def test_ZopeVersion(self):
         runtime_info = self._Test__new()
 
         # we expect that there is no utility
-        self.assertEqual(runtime_info.getZopeVersion(), u"Unavailable")
+        self.assertEqual(runtime_info.getZopeVersion(), _u("Unavailable"))
 
         siteManager = component.getSiteManager()
         siteManager.registerUtility(TestZopeVersion(), IZopeVersion)

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py33,py34,pypy,pypy3
+    py26,py27,py32,py33,py34,pypy,pypy3
 
 [testenv]
 commands =
@@ -16,3 +16,9 @@ deps =
     zope.testing
     zope.testrunner
 
+[testenv:py26]
+commands =
+    {[testenv]commands}
+deps =
+    {[testenv]deps}
+    ordereddict