babel 1.0 doesn't have a localedata.list() method, so updated setup.py.

made "import crypto" fully qualified

diff --git a/mediagoblin/tools/session.py b/mediagoblin/tools/session.py
index d79afb66428102ffccac535f4b1740d2aedc4a4e..a57f69cc959206d30a321dc059a2a8e3bc1a2ddc 100644 (file)
--- a/mediagoblin/tools/session.py
+++ b/mediagoblin/tools/session.py
@@ -17,7 +17,7 @@
 import itsdangerous
 import logging
 
-import crypto
+from mediagoblin.tools import crypto
 
 _log = logging.getLogger(__name__)
 

diff --git a/setup.py b/setup.py
index 6e026f30b6997257d931b9733ce8d0af4addde99..14a9a24f61e9f1e9355cff0589600afe32973bcf 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ setup(
         'kombu==2.1.7',
         'jinja2',
         'sphinx',
-        'Babel',
+        'Babel<1.0',
         'argparse',
         'webtest<2',
         'ConfigObj',