Minor fixes

diff --git a/fabfile.py b/fabfile.py
index c5424be..7557f7f 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -42,8 +42,8 @@ from fabric.colors import *
 env.project_root = "./"
 env.develop = False
 env.autoremove = True
-env.packages = ['snf-pithos-lib', 'snf-pithos-app',
-                        'snf-pithos-tools', 'snf-pithos-backend', ]
+env.packages = ['snf-pithos-lib', 'snf-pithos-backend', 'snf-pithos-app',
+                'snf-pithos-tools']
 env.deb_packages = ['snf-pithos-lib', 'snf-pithos-backend']
 env.capture = False
 env.colors = True

diff --git a/snf-pithos-app/pithos/synnefo_settings.py b/snf-pithos-app/pithos/synnefo_settings.py
index b926700..0a0a043 100644 (file)
--- a/snf-pithos-app/pithos/synnefo_settings.py
+++ b/snf-pithos-app/pithos/synnefo_settings.py
@@ -6,7 +6,7 @@ from django.conf.urls.defaults import include, patterns
 
 synnefo_installed_apps = ['pithos.ui', 'pithos.api']
 synnefo_urls = patterns('',
-    (r'^pithos', include('pithos.urls')),
+    (r'pithos', include('pithos.urls')),
 )
 synnefo_middlewares = [
     'pithos.middleware.LoggingConfigMiddleware',

diff --git a/snf-pithos-backend/pithos/backends/__init__.py b/snf-pithos-backend/pithos/backends/__init__.py
index e4dcafd..4b3c6dc 100644 (file)
--- a/snf-pithos-backend/pithos/backends/__init__.py
+++ b/snf-pithos-backend/pithos/backends/__init__.py
@@ -1,18 +1,18 @@
 # Copyright 2011 GRNET S.A. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
 # conditions are met:
-# 
+#
 #   1. Redistributions of source code must retain the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer.
-# 
+#
 #   2. Redistributions in binary form must reproduce the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer in the documentation and/or other materials
 #      provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -25,7 +25,7 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-# 
+#
 # The views and conclusions contained in the software and
 # documentation are those of the authors and should not be
 # interpreted as representing official policies, either expressed
@@ -33,7 +33,7 @@
 
 import warnings
 
-from modular import ModularBackend
+from pithos.backends.modular import ModularBackend
 
 
 def connect_backend(**kwargs):
@@ -45,5 +45,6 @@ def connect_backend(**kwargs):
     finally:
         # Restore warnings.
         warnings.filters = original_filters
-    
+
     return backend
+