diff rhodecode/model/db.py @ 1515:da8f1d1b22de

merge stable with beta
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Oct 2011 02:53:29 +0200
parents bf263968da47 87ec80c280bb
children 752b0a7b7679
line wrap: on
line diff
--- a/rhodecode/model/db.py	Fri Oct 07 01:13:36 2011 +0200
+++ b/rhodecode/model/db.py	Fri Oct 07 02:53:29 2011 +0200
@@ -41,9 +41,10 @@
 from vcs.exceptions import VCSError
 from vcs.utils.lazy import LazyProperty
 
+from rhodecode.lib import str2bool, safe_str, get_changeset_safe, \
+    generate_api_key
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
-from rhodecode.lib import str2bool, json, safe_str, get_changeset_safe,\
-    generate_api_key
+from rhodecode.lib.compat import json
 
 from rhodecode.model.meta import Base, Session
 from rhodecode.model.caching_query import FromCache
@@ -302,7 +303,7 @@
     @classmethod
     def create(cls, form_data):
         from rhodecode.lib.auth import get_crypt_password
-        
+
         try:
             new_user = cls()
             for k, v in form_data.items():