kallithea Changeset - fd0998635e83

Changeset - fd0998635e83

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 6 years ago 2019-12-16 03:22:22
mads@kiilerich.com

Grafted from: 0f717ec3f5a8

cleanup: drop some unnecessary use of safe_str

5 files changed with 11 insertions and 7 deletions:

kallithea/lib/celerylib/__init__.py

kallithea/lib/helpers.py

kallithea/model/db.py

kallithea/model/scm.py

kallithea/model/ssh_key.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -92,13 +92,13 @@ def __get_lockkey(func, *fargs, **fkwarg @@
     params = list(fargs)
     params.extend(['%s-%s' % ar for ar in fkwargs.items()])
     func_name = str(func.__name__) if hasattr(func, '__name__') else str(func)
     lockkey = 'task_%s.lock' % \
-        md5(func_name + '-' + '-'.join(map(safe_str, params))).hexdigest()
+        md5(safe_str(func_name + '-' + '-'.join(unicode(x) for x in params))).hexdigest()
     return lockkey
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -939,13 +939,13 @@ def gravatar_url(email_address, size=30, @@
     parsed_url = urlparse.urlparse(url.current(qualified=True))
     url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL) \
                .replace('{email}', email_address) \
                .replace('{md5email}', hashlib.md5(safe_str(email_address).lower()).hexdigest()) \
                .replace('{netloc}', parsed_url.netloc) \
                .replace('{scheme}', parsed_url.scheme) \
-               .replace('{size}', safe_str(size))
+               .replace('{size}', str(size))
     return url
 def changed_tooltip(nodes):
     """
     Generates a html string for changed nodes in changeset page.

kallithea/model/db.py

➞

Show inline comments

@@ @@ -133,14 +133,16 @@ class BaseDbModel(object): @@
         """
         if value is None:
             return None
         if isinstance(value, cls):
             return value
-        if isinstance(value, (int, long)) or safe_str(value).isdigit():
         if isinstance(value, (int, long)):
             return cls.get(value)
         if isinstance(value, basestring) and value.isdigit():
             return cls.get(int(value))
         if callback is not None:
             return callback(value)
         raise Exception(
             'given object must be int, long or Instance of %s '
             'got %s, no callback provided' % (cls, type(value))

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -136,15 +136,17 @@ class ScmModel(object): @@
     """
     def __get_repo(self, instance):
         cls = Repository
         if isinstance(instance, cls):
             return instance
-        elif isinstance(instance, int) or safe_str(instance).isdigit():
         elif isinstance(instance, int):
             return cls.get(instance)
         elif isinstance(instance, basestring):
             if instance.isdigit():
                 return cls.get(int(instance))
             return cls.get_by_repo_name(instance)
         elif instance is not None:
             raise Exception('given object must be int, basestr or Instance'
                             ' of %s got %s' % (type(cls), type(instance)))
     @LazyProperty

kallithea/model/ssh_key.py

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ import stat @@
 import tempfile
 from tg import config
 from tg.i18n import ugettext as _
 from kallithea.lib import ssh
-from kallithea.lib.utils2 import safe_str, str2bool
 from kallithea.lib.utils2 import str2bool
 from kallithea.model.db import User, UserSshKeys
 from kallithea.model.meta import Session
 log = logging.getLogger(__name__)
@@ @@ -50,13 +50,13 @@ class SshKeyModel(object): @@
         :param publickey: public key text
         Will raise SshKeyModelException on errors
         """
         try:
             keytype, pub, comment = ssh.parse_pub_key(public_key)
         except ssh.SshKeyParseError as e:
-            raise SshKeyModelException(_('SSH key %r is invalid: %s') % (safe_str(public_key), e.message))
             raise SshKeyModelException(_('SSH key %r is invalid: %s') % (public_key, e.message))
         if not description.strip():
             description = comment.strip()
         user = User.guess_instance(user)
         new_ssh_key = UserSshKeys()
@@ @@ -83,13 +83,13 @@ class SshKeyModel(object): @@
         if user:
             user = User.guess_instance(user)
             ssh_key = ssh_key.filter(UserSshKeys.user_id == user.user_id)
         ssh_key = ssh_key.scalar()
         if ssh_key is None:
-            raise SshKeyModelException(_('SSH key %r not found') % safe_str(public_key))
             raise SshKeyModelException(_('SSH key %r not found') % public_key)
         Session().delete(ssh_key)
     def get_ssh_keys(self, user):
         user = User.guess_instance(user)
         user_ssh_keys = UserSshKeys.query() \
             .filter(UserSshKeys.user_id == user.user_id).all()

0 comments (0 inline, 0 general)