Mercurial > hg > commentator

changeset 4:f02a3672254e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to import from two different places in webob
author k0s <k0scist@gmail.com>
date Fri, 26 Feb 2010 11:12:37 -0500
parents d0d8524d9495
children 451169e51935
files commentator/model.py setup.py
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/commentator/model.py	Fri Feb 26 11:06:48 2010 -0500
+++ b/commentator/model.py	Fri Feb 26 11:12:37 2010 -0500
@@ -2,7 +2,13 @@
 import pickle
 
 from datetime import datetime
-from webob import _UTC
+
+# need a timezone object, which python *should*
+# have by default
+try:
+    from webob import _UTC
+except ImportError:
+    from webob.datetime_utils import _UTC
         
 class PickleComments(object):
     # TODO: locking
--- a/setup.py	Fri Feb 26 11:06:48 2010 -0500
+++ b/setup.py	Fri Feb 26 11:12:37 2010 -0500
@@ -5,7 +5,7 @@
 except IOError: 
     description = ''
 
-version = "0.2"
+version = "0.2.1"
 
 setup(name='commentator',
       version=version,