refactor codes and setup for python 2.5

readme update

8 files changed, 26 insertions, 21 deletions

diff --git a/rhodecode/controllers/admin/permissions.py b/rhodecode/controllers/admin/permissions.py
index dff5f45a..01e8d6bb 100644
--- a/rhodecode/controllers/admin/permissions.py
+++ b/rhodecode/controllers/admin/permissions.py
@@ -102,7 +102,7 @@ class PermissionsController(BaseController):
             h.flash(_('Default permissions updated succesfully'),
                     category='success')
                            
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             c.perms_choices = self.perms_choices
             c.register_choices = self.register_choices
             c.create_choices = self.create_choices
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index dc56cc50..b0ffa8d3 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -79,13 +79,13 @@ class ReposController(BaseController):
                     category='success')
 
             if request.POST.get('user_created'):
-                action_logger(self.rhodecode_user, 'user_created_repo', 
+                action_logger(self.rhodecode_user, 'user_created_repo',
                               form_result['repo_name'], '', self.sa)
             else:
-                action_logger(self.rhodecode_user, 'admin_created_repo', 
+                action_logger(self.rhodecode_user, 'admin_created_repo',
                               form_result['repo_name'], '', self.sa)                
                                                                              
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             c.new_repo = errors.value['repo_name']
             
             if request.POST.get('user_created'):
@@ -137,7 +137,7 @@ class ReposController(BaseController):
             h.flash(_('Repository %s updated succesfully' % repo_name),
                     category='success')
             changed_name = form_result['repo_name']
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             c.repo_info = repo_model.get(repo_name)
             c.users_array = repo_model.get_users_js()
             errors.value.update({'user':c.repo_info.user.username})
@@ -176,7 +176,7 @@ class ReposController(BaseController):
         
             return redirect(url('repos'))
         try:
-            action_logger(self.rhodecode_user, 'admin_deleted_repo', 
+            action_logger(self.rhodecode_user, 'admin_deleted_repo',
                               repo_name, '', self.sa)
             repo_model.delete(repo)            
             invalidate_cache('cached_repo_list')
@@ -199,7 +199,7 @@ class ReposController(BaseController):
         try:
             repo_model = RepoModel()
             repo_model.delete_perm_user(request.POST, repo_name)            
-        except Exception as e:
+        except Exception, e:
             h.flash(_('An error occured during deletion of repository user'),
                     category='error')
             raise HTTPInternalServerError()
diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
index 2e2ea178..c7274dea 100644
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -140,7 +140,7 @@ class SettingsController(BaseController):
                     self.sa.rollback()
                     
 
-            except formencode.Invalid as errors:
+            except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
                      defaults=errors.value,
@@ -193,7 +193,7 @@ class SettingsController(BaseController):
                     self.sa.rollback()
                     
 
-            except formencode.Invalid as errors:
+            except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
                      defaults=errors.value,
@@ -269,7 +269,7 @@ class SettingsController(BaseController):
             h.flash(_('Your account was updated succesfully'),
                     category='success')
                            
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             c.user = self.sa.query(User).get(c.rhodecode_user.user_id)
             c.user_repos = []
             for repo in c.cached_repo_list.values():
diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py
index 5760d3ee..8b93f835 100644
--- a/rhodecode/controllers/admin/users.py
+++ b/rhodecode/controllers/admin/users.py
@@ -73,7 +73,7 @@ class UsersController(BaseController):
             h.flash(_('created user %s') % form_result['username'],
                     category='success')
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_add.html'),
                 defaults=errors.value,
@@ -110,7 +110,7 @@ class UsersController(BaseController):
             user_model.update(id, form_result)
             h.flash(_('User updated succesfully'), category='success')
                            
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_edit.html'),
                 defaults=errors.value,
@@ -136,7 +136,7 @@ class UsersController(BaseController):
         try:
             user_model.delete(id)
             h.flash(_('sucessfully deleted user'), category='success')
-        except DefaultUserException as e:
+        except DefaultUserException, e:
             h.flash(str(e), category='warning')
         except Exception:
             h.flash(_('An error occured during deletion of user'),
diff --git a/rhodecode/controllers/login.py b/rhodecode/controllers/login.py
index 3dfd66e4..816bdf4b 100644
--- a/rhodecode/controllers/login.py
+++ b/rhodecode/controllers/login.py
@@ -74,7 +74,7 @@ class LoginController(BaseController):
                 else:
                     return redirect(url('hg_home'))
                                
-            except formencode.Invalid as errors:
+            except formencode.Invalid, errors:
                 return htmlfill.render(
                     render('/login.html'),
                     defaults=errors.value,
@@ -105,7 +105,7 @@ class LoginController(BaseController):
                             category='success')                
                 return redirect(url('login_home'))
                                
-            except formencode.Invalid as errors:
+            except formencode.Invalid, errors:
                 return htmlfill.render(
                     render('/register.html'),
                     defaults=errors.value,
@@ -127,7 +127,7 @@ class LoginController(BaseController):
                             category='success')                 
                 return redirect(url('login_home'))
                                
-            except formencode.Invalid as errors:
+            except formencode.Invalid, errors:
                 return htmlfill.render(
                     render('/password_reset.html'),
                     defaults=errors.value,
diff --git a/rhodecode/controllers/settings.py b/rhodecode/controllers/settings.py
index 5d8c75a2..a731ac23 100644
--- a/rhodecode/controllers/settings.py
+++ b/rhodecode/controllers/settings.py
@@ -82,7 +82,7 @@ class SettingsController(BaseController):
             h.flash(_('Repository %s updated successfully' % repo_name),
                     category='success')
             changed_name = form_result['repo_name']               
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             c.repo_info = repo_model.get(repo_name)
             c.users_array = repo_model.get_users_js()
             errors.value.update({'user':c.repo_info.user.username})
@@ -121,7 +121,7 @@ class SettingsController(BaseController):
         
             return redirect(url('hg_home'))
         try:
-            action_logger(self.rhodecode_user, 'user_deleted_repo', 
+            action_logger(self.rhodecode_user, 'user_deleted_repo',
                               repo_name, '', self.sa)            
             repo_model.delete(repo)            
             invalidate_cache('cached_repo_list')
@@ -162,7 +162,7 @@ class SettingsController(BaseController):
                     category='success')
             action_logger(self.rhodecode_user, 'user_forked_repo',
                             repo_name, '', self.sa)                                                 
-        except formencode.Invalid as errors:
+        except formencode.Invalid, errors:
             c.new_repo = errors.value['fork_name']
             r = render('settings/repo_fork.html')
             
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index f425b5d5..5df39311 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -85,7 +85,7 @@ def get_user_cached(username):
 def authfunc(environ, username, password):
     try:
         user = get_user_cached(username)
-    except (NoResultFound, MultipleResultsFound, OperationalError) as e:
+    except (NoResultFound, MultipleResultsFound, OperationalError), e:
         log.error(e)
         user = None
         
diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py
index 552b1574..ae92ec9f 100644
--- a/rhodecode/lib/celerylib/tasks.py
+++ b/rhodecode/lib/celerylib/tasks.py
@@ -8,10 +8,15 @@ from rhodecode.lib.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import OrderedDict
 from time import mktime
 from vcs.backends.hg import MercurialRepository
-import json
 import traceback
 
 try:
+    import json
+except ImportError:
+    #python 2.5 compatibility
+    import simplejson as json
+
+try:
     from celeryconfig import PYLONS_CONFIG as config
     celery_on = True
 except ImportError: