Merge lp:~gz/wikkid/support_python_2.4 into lp:wikkid

[Martin Packman]

Simple set of changes that gets the test suite passing on my box. Mostly just adapting to some Python 2.4 limitations, but also an import bug and a few platform issues.

[Tim Penhey (thumper)]

Hi Martin,

I've been thinking about this quite a bit. Personally what I'd like to do here is to have wikkid trunk requiring python 2.6 as I'd like to be able to use context managers and other 2.6 features.

However, if you'd like, I could create another series of wikkid that has the 2.4 support. I'd be happy if you want to be the maintainer of that branch.

Is there a reason that you want python 2.4 support?

Tim

review: Needs Information

[Martin Packman (gz)]

Was trying to reproduce bug 672056 which involved running the wikkid test suite. As the failures were noisy but shallow, I fixed them rather than switch to a different box.

I don't have any particular opinion about what python versions you should support, but currently there's nothing that really needs higher than the bzrlib minimum. So, feel free to merge this then revert the 2.4 bits or just regress later on when you want to use context managers.

Unmerged revisions

58. By Martin Packman on 2010-11-10

Fix import for email.Utils.parseaddr

57. By Martin Packman on 2010-11-10

Use WebOb support for HTTP exceptions as old style classes

56. By Martin Packman on 2010-11-10

Don't test for the mime type of *.cpp files as it may vary across platforms

55. By Martin Packman on 2010-11-10

Use old style percent style interpolation rather than str.format

54. By Martin Packman on 2010-11-10

Support old location of md5 as well as new hashlib module

53. By Martin Packman on 2010-11-10

Use os.path not bzrlib.urlutils functions for platform paths to fix load_view_modules

=== modified file 'wikkid/dispatcher.py'
--- wikkid/dispatcher.py	2010-06-13 11:41:41 +0000
+++ wikkid/dispatcher.py	2010-11-10 22:19:42 +0000
@@ -13,8 +13,6 @@
 
 import os
 
-from bzrlib.urlutils import dirname, joinpath
-
 from zope.interface import providedBy
 
 
@@ -68,8 +66,8 @@
 # themselves with the view registry.
 
 def load_view_modules():
-    curr_dir = os.path.abspath(dirname(__file__))
-    view_dir = joinpath(curr_dir, 'view')
+    curr_dir = os.path.abspath(os.path.dirname(__file__))
+    view_dir = os.path.join(curr_dir, 'view')
     py_files = [
         filename for filename in os.listdir(view_dir)
         if filename.endswith('.py') and not filename.startswith('__')]

=== modified file 'wikkid/tests/fakes.py'
--- wikkid/tests/fakes.py	2010-05-12 10:39:13 +0000
+++ wikkid/tests/fakes.py	2010-11-10 22:19:42 +0000
@@ -23,7 +23,7 @@
     def __init__(self, email, display_name):
         self.email = email
         self.display_name = display_name
-        self.committer_id = "{0} <{1}>".format(email, display_name)
+        self.committer_id = "%s <%s>" % (email, display_name)
 
 
 class TestRequest(object):

=== modified file 'wikkid/tests/filestore.py'
--- wikkid/tests/filestore.py	2010-11-08 00:00:06 +0000
+++ wikkid/tests/filestore.py	2010-11-10 22:19:42 +0000
@@ -59,15 +59,12 @@
              ('lib/', None),
              ('image.jpg', 'pretend image'),
              ('binary-file', 'a\0binary\0file'),
-             ('simple.txt', 'A text file'),
-             ('source.cpp', 'A cpp file')])
+             ('simple.txt', 'A text file')])
         self.assertIs(None, filestore.get_file('lib').mimetype)
         self.assertIs(None, filestore.get_file('README').mimetype)
         self.assertEqual(
             'text/plain', filestore.get_file('simple.txt').mimetype)
         self.assertEqual(
-            'text/x-c++src', filestore.get_file('source.cpp').mimetype)
-        self.assertEqual(
             'image/jpeg', filestore.get_file('image.jpg').mimetype)
         self.assertIs(None, filestore.get_file('binary-file').mimetype)
 

=== modified file 'wikkid/tests/views/test_root.py'
--- wikkid/tests/views/test_root.py	2010-06-17 10:45:52 +0000
+++ wikkid/tests/views/test_root.py	2010-11-10 22:19:42 +0000
@@ -6,7 +6,7 @@
 
 """Test views for the root object."""
 
-from webob.exc import HTTPSeeOther
+from webob.exc import HTTPException, HTTPSeeOther
 
 from wikkid.tests.factory import ViewTestCase
 
@@ -19,7 +19,8 @@
         factory = self.make_factory()
         view = self.get_view(factory, '/')
         error = self.assertRaises(
-            HTTPSeeOther,
+            HTTPException,
             view.render,
             None)
-        self.assertEqual('/Home', error.headers['Location'])
+        self.assertIsInstance(error.wsgi_response, HTTPSeeOther)
+        self.assertEqual('/Home', error.wsgi_response.headers['Location'])

=== modified file 'wikkid/user/baseuser.py'
--- wikkid/user/baseuser.py	2010-05-25 22:12:26 +0000
+++ wikkid/user/baseuser.py	2010-11-10 22:19:42 +0000
@@ -9,7 +9,10 @@
 Provides the gravatar support.
 """
 
-import hashlib
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
 
 
 class BaseUser(object):
@@ -17,6 +20,6 @@
     @property
     def gravatar(self):
         url = "http://www.gravatar.com/avatar/"
-        url += hashlib.md5(self.email).hexdigest()
+        url += md5(self.email).hexdigest()
         url += "?s=50&d=identicon"
         return url

=== modified file 'wikkid/user/bzr.py'
--- wikkid/user/bzr.py	2010-06-13 11:10:54 +0000
+++ wikkid/user/bzr.py	2010-11-10 22:19:42 +0000
@@ -7,7 +7,7 @@
 """A user factory and user class which uses the bzr identity from the
 local bazaar config."""
 
-import email
+from email.Utils import parseaddr
 import logging
 
 from webob import Request
@@ -18,7 +18,7 @@
 
 
 def create_bzr_user_from_author_string(author):
-    name, address = email.Utils.parseaddr(author)
+    name, address = parseaddr(author)
     if name:
         display_name = name
     else:

=== modified file 'wikkid/view/root.py'
--- wikkid/view/root.py	2010-06-17 10:45:52 +0000
+++ wikkid/view/root.py	2010-11-10 22:19:42 +0000
@@ -23,4 +23,4 @@
         """Redirect to Home (or the default page)."""
         default_resource = self.context.default_resource
         preferred = default_resource.preferred_path
-        raise HTTPSeeOther(location=preferred)
+        raise HTTPSeeOther(location=preferred).exception

=== modified file 'wikkid/view/urls.py'
--- wikkid/view/urls.py	2010-06-16 10:29:35 +0000
+++ wikkid/view/urls.py	2010-11-10 22:19:42 +0000
@@ -32,4 +32,4 @@
     else:
         if path == '/':
             path = ''
-        return '{0}/+{1}'.format(path, view)
+        return '%s/+%s' % (path, view)