kallithea Changeset - 169807710db2

Changeset - 169807710db2

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-07-27 01:01:02
marcin@python-works.com

fixed possible unicode errors on repo get function

2 files changed with 4 insertions and 3 deletions:

rhodecode/model/__init__.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/model/__init__.py

➞

Show inline comments

@@ @@ -43,6 +43,7 @@ @@
 import logging
 from rhodecode.model import meta
 from rhodecode.lib.utils2 import safe_str
 log = logging.getLogger(__name__)
@@ @@ -86,7 +87,7 @@ class BaseModel(object): @@
         if isinstance(instance, cls):
             return instance
-        elif isinstance(instance, (int, long)) or str(instance).isdigit():
+        elif isinstance(instance, (int, long)) or safe_str(instance).isdigit():
             return cls.get(instance)
         else:
             if instance:

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -186,7 +186,7 @@ class ScmModel(BaseModel): @@
         cls = Repository
         if isinstance(instance, cls):
             return instance
-        elif isinstance(instance, int) or str(instance).isdigit():
+        elif isinstance(instance, int) or safe_str(instance).isdigit():
             return cls.get(instance)
         elif isinstance(instance, basestring):
             return cls.get_by_repo_name(instance)
@@ @@ -592,4 +592,4 @@ class ScmModel(BaseModel): @@
                 f.write(tmpl)
             os.chmod(_hook_file, 0755)
         else:
             log.debug('skipping writing hook file')
@@ \ No newline at end of file @@
             log.debug('skipping writing hook file')

0 comments (0 inline, 0 general)