kallithea Changeset - e7b6a0ce123c

Changeset - e7b6a0ce123c

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 6 years ago 2019-12-27 01:43:46
mads@kiilerich.com

Grafted from: ac456490cdda

cleanup: minor formatting

6 files changed with 5 insertions and 9 deletions:

kallithea/lib/utils.py

kallithea/lib/utils2.py

kallithea/lib/vcs/backends/git/inmemory.py

kallithea/lib/vcs/backends/git/repository.py

kallithea/lib/vcs/subprocessio.py

kallithea/lib/vcs/utils/__init__.py

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -373,13 +373,12 @@ def set_app_settings(config): @@
     """
     Updates app config with new settings from database
     :param config:
     """
     hgsettings = Setting.get_app_settings()
     for k, v in hgsettings.items():
         config[k] = v
 def set_vcs_config(config):
     """

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -151,18 +151,16 @@ def safe_int(val, default=None): @@
     Returns int() of val if val is not convertable to int use default
     instead
     :param val:
     :param default:
     """
     try:
         val = int(val)
     except (ValueError, TypeError):
         val = default
     return val
 def remove_suffix(s, suffix):
     if s.endswith(suffix):
         s = s[:-1 * len(suffix)]

kallithea/lib/vcs/backends/git/inmemory.py

➞

Show inline comments

@@ @@ -181,14 +181,14 @@ class GitInMemoryChangeset(BaseInMemoryC @@
                 if name == dirname:
                     obj = self.repository._repo[id]
                     if isinstance(obj, objects.Tree):
                         return obj
                     else:
                         raise RepositoryError("Cannot create directory %s "
                         "at tree %s as path is occupied and is not a "
                         "Tree" % (dirname, tree))
                             "at tree %s as path is occupied and is not a "
                             "Tree" % (dirname, tree))
             return None
         trees = []
         parent = root_tree
         for dirname in dirs:
             tree = get_tree_for_dir(parent, dirname)

kallithea/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -211,13 +211,13 @@ class GitRepository(BaseRepository): @@
             raise urllib2.URLError("[%s] org_exc: %s" % (cleaned_uri, e))
         # now detect if it's proper git repo
         gitdata = resp.read()
         if 'service=git-upload-pack' not in gitdata:
             raise urllib2.URLError(
-                "url [%s] does not look like an git" % (cleaned_uri))
                 "url [%s] does not look like an git" % cleaned_uri)
         return True
     def _get_repo(self, create, src_url=None, update_after_clone=False,
                   bare=False):
         if create and os.path.exists(self.path):

kallithea/lib/vcs/subprocessio.py

➞

Show inline comments

@@ @@ -374,14 +374,13 @@ class SubprocessIOChunker(object): @@
                 out.startswith('0034shallow ')
             ):
                 # hack inspired by https://github.com/schacon/grack/pull/7
                 bg_out = iter([out])
                 _p = None
             elif err:
                 raise EnvironmentError(
                     "Subprocess exited due to an error:\n" + err)
                 raise EnvironmentError("Subprocess exited due to an error: %s" % err)
             else:
                 raise EnvironmentError(
                     "Subprocess exited with non 0 ret code: %s" % returncode)
         self.process = _p
         self.output = bg_out
         self.error = bg_err

kallithea/lib/vcs/utils/__init__.py

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ def aslist(obj, sep=None, strip=True): @@
     Returns given string separated by sep as list
     :param obj:
     :param sep:
     :param strip:
     """
-    if isinstance(obj, (basestring)):
     if isinstance(obj, basestring):
         lst = obj.split(sep)
         if strip:
             lst = [v.strip() for v in lst]
         return lst
     elif isinstance(obj, (list, tuple)):
         return obj

0 comments (0 inline, 0 general)