kallithea Changeset - 95ca00cd722f

Changeset - 95ca00cd722f

Parent rev.

Child rev.

[Not reviewed]

stable

0 5 0

Mads Kiilerich - 6 years ago 2020-02-03 15:46:22
mads@kiilerich.com

Grafted from: 7e5b9fa298df

cleanup: minor correctness fixes

"Trivial" potential problems spotted with pytype.

5 files changed with 9 insertions and 5 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/pullrequests.py

kallithea/lib/diffs.py

kallithea/lib/utils2.py

kallithea/lib/vcs/nodes.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -148,6 +148,7 @@ class RepoGroupsController(BaseControlle @@
         # permissions for can create group based on parent_id are checked
         # here in the Form
         repo_group_form = RepoGroupForm(repo_groups=c.repo_groups)
         form_result = None
         try:
             form_result = repo_group_form.to_python(dict(request.POST))
             gr = RepoGroupModel().create(
@@ @@ -171,6 +172,8 @@ class RepoGroupsController(BaseControlle @@
             log.error(traceback.format_exc())
             h.flash(_('Error occurred during creation of repository group %s')
                     % request.POST.get('group_name'), category='error')
             if form_result is None:
                 raise
             parent_group_id = form_result['parent_group_id']
             # TODO: maybe we should get back to the main view, not the admin one
             raise HTTPFound(location=url('repos_groups', parent_group=parent_group_id))

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -470,14 +470,15 @@ class PullrequestsController(BaseRepoCon @@
          c.a_rev) = c.pull_request.other_ref.split(':') # a_rev is ancestor
         org_scm_instance = c.cs_repo.scm_instance # property with expensive cache invalidation check!!!
         try:
             c.cs_ranges = []
             for x in c.pull_request.revisions:
             try:
                 c.cs_ranges.append(org_scm_instance.get_changeset(x))
         except ChangesetDoesNotExistError:
             c.cs_ranges = []
             h.flash(_('Revision %s not found in %s') % (x, c.cs_repo.repo_name),
                 'error')
                 break
         c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...
         revs = [ctx.revision for ctx in reversed(c.cs_ranges)]
         c.jsdata = graph_data(org_scm_instance, revs)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -557,8 +557,8 @@ def _parse_lines(diff_lines): @@
     added = deleted = 0
     old_line = old_end = new_line = new_end = None
     chunks = []
     try:
         chunks = []
         line = diff_lines.next()
         while True:

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -374,7 +374,7 @@ def uri_filter(uri): @@
     :returns: filtered list of strings
     """
     if not uri:
-        return ''
+        return []
     proto = ''
@@ @@ -541,8 +541,8 @@ def get_hook_environment(): @@
         raise HookEnvironmentError("Environment variable KALLITHEA_EXTRAS not found")
     extras = json.loads(kallithea_extras)
     for k in ['username', 'repository', 'scm', 'action', 'ip', 'config']:
     try:
         for k in ['username', 'repository', 'scm', 'action', 'ip', 'config']:
             extras[k]
     except KeyError:
         raise HookEnvironmentError('Missing key %s in KALLITHEA_EXTRAS %s' % (k, extras))

kallithea/lib/vcs/nodes.py

➞

Show inline comments

@@ @@ -329,8 +329,8 @@ class FileNode(Node): @@
                 encoding = None
                 # try with pygments
                 from pygments import lexers
                 try:
                     from pygments import lexers
                     mt = lexers.get_lexer_for_filename(self.name).mimetypes
                 except lexers.ClassNotFound:
                     mt = None

0 comments (0 inline, 0 general)