Mercurial > kallithea
changeset 2672:169807710db2 beta
fixed possible unicode errors on repo get function
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 27 Jul 2012 01:01:02 +0200 |
parents | 8990d58fb22f |
children | d5e42c00f3c1 |
files | rhodecode/model/__init__.py rhodecode/model/scm.py |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/__init__.py Thu Jul 26 23:38:16 2012 +0200 +++ b/rhodecode/model/__init__.py Fri Jul 27 01:01:02 2012 +0200 @@ -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 @@ 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:
--- a/rhodecode/model/scm.py Thu Jul 26 23:38:16 2012 +0200 +++ b/rhodecode/model/scm.py Fri Jul 27 01:01:02 2012 +0200 @@ -186,7 +186,7 @@ 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 @@ 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')