Merge lp:~ralsina/python-oops/py3 into lp:python-oops

[Roberto Alsina]

Pretty much automatic conversion to python 3, but tests pass...

Pretty much automatic conversion to python 3, but tests pass...

Unmerged revisions

38. By Roberto Alsina on 2015-06-09

py3 version, passes tests

=== modified file 'bootstrap.py'
--- bootstrap.py	2011-08-10 05:06:50 +0000
+++ bootstrap.py	2015-06-09 19:09:00 +0000
@@ -19,7 +19,7 @@
 use the -c option to specify an alternate configuration file.
 """
 
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+import os, shutil, sys, tempfile, textwrap, urllib.request, urllib.parse, urllib.error, urllib.request, urllib.error, urllib.parse, subprocess
 from optparse import OptionParser
 
 if sys.platform == 'win32':
@@ -51,7 +51,7 @@
     # We will restart with python -S.
     args = sys.argv[:]
     args[0:0] = [sys.executable, '-S']
-    args = map(quote, args)
+    args = list(map(quote, args))
     os.execv(sys.executable, args)
 # Now we are running with -S.  We'll get the clean sys.path, import site
 # because distutils will do it later, and then reset the path and clean
@@ -60,7 +60,7 @@
 clean_path = sys.path[:]
 import site
 sys.path[:] = clean_path
-for k, v in sys.modules.items():
+for k, v in list(sys.modules.items()):
     if (hasattr(v, '__path__') and
         len(v.__path__)==1 and
         not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
@@ -77,7 +77,7 @@
     if value:
         if '://' not in value: # It doesn't smell like a URL.
             value = 'file://%s' % (
-                urllib.pathname2url(
+                urllib.request.pathname2url(
                     os.path.abspath(os.path.expanduser(value))),)
         if opt_str == '--download-base' and not value.endswith('/'):
             # Download base needs a trailing slash to make the world happy.
@@ -160,10 +160,10 @@
     if not hasattr(pkg_resources, '_distribute'):
         raise ImportError
 except ImportError:
-    ez_code = urllib2.urlopen(
+    ez_code = urllib.request.urlopen(
         options.setup_source).read().replace('\r\n', '\n')
     ez = {}
-    exec ez_code in ez
+    exec(ez_code, ez)
     setup_args = dict(to_dir=eggs_dir, download_delay=0)
     if options.download_base:
         setup_args['download_base'] = options.download_base

=== modified file 'oops/config.py'
--- oops/config.py	2012-06-26 20:57:41 +0000
+++ oops/config.py	2015-06-09 19:09:00 +0000
@@ -102,8 +102,8 @@
 from copy import deepcopy
 import warnings
 
-from createhooks import default_hooks
-from publishers import (
+from .createhooks import default_hooks
+from .publishers import (
     convert_result_to_list,
     publish_to_many,
     )
@@ -208,7 +208,7 @@
                 "instead, with an oops.publishers.publish_to_many object "
                 "if multiple publishers are needed",
                 DeprecationWarning, stacklevel=2)
-        old_publishers = map(convert_result_to_list, self.publishers)
+        old_publishers = list(map(convert_result_to_list, self.publishers))
         if self.publisher:
             publisher = publish_to_many(self.publisher, *old_publishers)
         else:

=== modified file 'oops/createhooks.py'
--- oops/createhooks.py	2011-11-13 21:24:42 +0000
+++ oops/createhooks.py	2015-06-09 19:09:00 +0000
@@ -42,7 +42,7 @@
 _sentinel = object()
 
 # (Prep for python3 - should be set conditional on version
-strtypes = (basestring,)
+strtypes = (str,)
 
 
 def _simple_copy(key):
@@ -67,19 +67,19 @@
     serialize it, but a representation is needed for the report. It is
     exposed a convenience for other on_create hook authors.
     """
-    if isinstance(obj, unicode):
+    if isinstance(obj, str):
         return obj
     # A call to str(obj) could raise anything at all.
     # We'll ignore these errors, and print something
     # useful instead, but also log the error.
     # We disable the pylint warning for the blank except.
     try:
-        value = unicode(obj)
+        value = str(obj)
     except:
-        value = u'<unprintable %s object>' % (
-            unicode(type(obj).__name__))
+        value = '<unprintable %s object>' % (
+            str(type(obj).__name__))
     # Some objects give back bytestrings to __unicode__...
-    if isinstance(value, str):
+    if isinstance(value, bytes):
         value = value.decode('latin-1')
     return value
 
@@ -110,7 +110,7 @@
     if isinstance(info[2], strtypes):
         tb_text = info[2]
     else:
-        tb_text = u''.join(map(safe_unicode, traceback.format_tb(info[2])))
+        tb_text = ''.join(map(safe_unicode, traceback.format_tb(info[2])))
     report['tb_text'] = tb_text
 
 

=== modified file 'oops/publishers.py'
--- oops/publishers.py	2012-08-10 02:18:06 +0000
+++ oops/publishers.py	2015-06-09 19:09:00 +0000
@@ -36,7 +36,7 @@
         report = dict(report)
         output = pformat(report)
         if not report.get('id'):
-            report['id'] = md5(output).hexdigest()
+            report['id'] = md5(output.encode('utf-8')).hexdigest()
             output = pformat(report)
         stream.write(output)
         stream.write('\n')

=== modified file 'oops/tests/test_createhooks.py'
--- oops/tests/test_createhooks.py	2011-11-13 21:24:42 +0000
+++ oops/tests/test_createhooks.py	2015-06-09 19:09:00 +0000
@@ -51,7 +51,7 @@
             attach_exc_info(report, {'exc_info':sys.exc_info()})
         self.assertEqual('ValueError', report['type'])
         self.assertEqual('foo bar', report['value'])
-        self.assertIsInstance(report['tb_text'], basestring)
+        self.assertIsInstance(report['tb_text'], str)
 
     def test_attach_date(self):
         report = {}
@@ -78,7 +78,7 @@
             attach_exc_info(report, {'exc_info':sys.exc_info()})
         self.assertEqual(
                 '<unprintable UnprintableException object>', report['value'])
-        self.assertIsInstance(report['tb_text'], basestring)
+        self.assertIsInstance(report['tb_text'], str)
 
     def test_defaults(self):
         self.assertEqual([attach_exc_info, attach_date, copy_reporter, copy_topic,

=== modified file 'oops/tests/test_publishers.py'
--- oops/tests/test_publishers.py	2012-08-10 02:18:06 +0000
+++ oops/tests/test_publishers.py	2015-06-09 19:09:00 +0000
@@ -19,7 +19,7 @@
 
 from hashlib import md5
 from pprint import pformat
-from StringIO import StringIO
+from io import StringIO
 
 import testtools
 
@@ -188,7 +188,7 @@
         publisher = pprint_to_stream(output)
         published = publisher({'foo': 'bar'})
         pprint_value = pformat({'foo': 'bar'})
-        self.assertEqual([md5(pprint_value).hexdigest()], published)
+        self.assertEqual([md5(pprint_value.encode('utf-8')).hexdigest()], published)
 
     def test_outputs_pprint(self):
         output = StringIO()

=== modified file 'versions.cfg'
--- versions.cfg	2011-08-10 06:08:53 +0000
+++ versions.cfg	2015-06-09 19:09:00 +0000
@@ -5,9 +5,8 @@
 fixtures = 0.3.6
 iso8601 = 0.1.4
 pytz = 2010o
-setuptools = 0.6c11
 testtools = 0.9.11
 zc.recipe.egg = 1.3.2
-z3c.recipe.filetemplate = 2.1.0
-z3c.recipe.scripts = 1.0.1
-zc.buildout = 1.5.1
+zc.recipe.filetemplate = 2.1.0
+zc.recipe.scripts = 1.0.1
+zc.buildout = 2.3.1