kallithea Changeset - 548357c4301d

Changeset - 548357c4301d

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 6 years ago 2019-08-04 01:39:04
mads@kiilerich.com

Grafted from: 065b18816a85

flake8: fix E117 over-indented

6 files changed with 26 insertions and 26 deletions:

kallithea/controllers/api/__init__.py

kallithea/controllers/api/api.py

kallithea/lib/utils2.py

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

kallithea/lib/vcs/utils/progressbar.py

kallithea/model/validators.py

0 comments (0 inline, 0 general)

kallithea/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -193,17 +193,17 @@ class JSONRPCController(TGController): @@
                     retid=self._req_id,
                     message='Missing non optional `%s` arg in JSON DATA' % arg,
+                )
         extra = set(self._request_params).difference(func_kwargs)
         if extra:
                 raise JSONRPCErrorResponse(
                     retid=self._req_id,
                     message='Unknown %s arg in JSON DATA' %
                             ', '.join('`%s`' % arg for arg in extra),
+                )
             raise JSONRPCErrorResponse(
                 retid=self._req_id,
                 message='Unknown %s arg in JSON DATA' %
                         ', '.join('`%s`' % arg for arg in extra),
+            )
         self._rpc_args = {}
         self._rpc_args.update(self._request_params)
         self._rpc_args['action'] = self._req_method
         self._rpc_args['environ'] = environ

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -2351,15 +2351,15 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError('Changeset %s does not exist' % raw_id)
         info = dict(changeset.as_dict())
         with_reviews = Optional.extract(with_reviews)
         if with_reviews:
                 reviews = ChangesetStatusModel().get_statuses(
                                     repo.repo_name, raw_id)
                 info["reviews"] = reviews
             reviews = ChangesetStatusModel().get_statuses(
                                 repo.repo_name, raw_id)
             info["reviews"] = reviews
         return info
     # permission check inside
     def get_pullrequest(self, pullrequest_id):
         """

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -97,19 +97,19 @@ def convert_line_endings(line, mode): @@
     :rtype: str
     :return: converted line according to mode
     """
     from string import replace
     if mode == 0:
             line = replace(line, '\r\n', '\n')
             line = replace(line, '\r', '\n')
         line = replace(line, '\r\n', '\n')
         line = replace(line, '\r', '\n')
     elif mode == 1:
             line = replace(line, '\r\n', '\r')
             line = replace(line, '\n', '\r')
         line = replace(line, '\r\n', '\r')
         line = replace(line, '\n', '\r')
     elif mode == 2:
-            line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line)
         line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line)
     return line
 def detect_mode(line, default):
     """
     Detects line break for given line, if line break couldn't be found

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

➞

Show inline comments

@@ @@ -313,13 +313,13 @@ class GitRepository(BaseRepository): @@
         """
         return self._get_revision(ref_name)
     def _get_archives(self, archive_name='tip'):
         for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
-                yield {"type": i[0], "extension": i[1], "node": archive_name}
             yield {"type": i[0], "extension": i[1], "node": archive_name}
     def _get_url(self, url):
         """
         Returns normalized url. If schema is not given, would fall to
         filesystem (``file:///``) schema.
         """

kallithea/lib/vcs/utils/progressbar.py

➞

Show inline comments

@@ @@ -354,14 +354,14 @@ class BarOnlyColoredProgressBar(ColoredP @@
 def main():
     import time
     print "Standard progress bar..."
     bar = ProgressBar(30)
     for x in xrange(1, 31):
             bar.render(x)
             time.sleep(0.02)
         bar.render(x)
         time.sleep(0.02)
     bar.stream.write('\n')
     print
     print "Empty bar..."
     bar = ProgressBar(50)
     bar.render(0)

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -362,23 +362,23 @@ def ValidRepoName(edit=False, old_data=N @@
                         msg = self.message('repository_in_group_exists', state,
                                 repo=repo.repo_name, group=group_name)
                         raise formencode.Invalid(msg, value, state,
                             error_dict=dict(repo_name=msg)
+                        )
                 elif repo_group is not None:
                         msg = self.message('same_group_exists', state,
                                 repo=repo_name)
                         raise formencode.Invalid(msg, value, state,
                             error_dict=dict(repo_name=msg)
+                        )
                     msg = self.message('same_group_exists', state,
                             repo=repo_name)
                     raise formencode.Invalid(msg, value, state,
                         error_dict=dict(repo_name=msg)
+                    )
                 elif repo is not None:
                         msg = self.message('repository_exists', state,
                                 repo=repo.repo_name)
                         raise formencode.Invalid(msg, value, state,
                             error_dict=dict(repo_name=msg)
+                        )
                     msg = self.message('repository_exists', state,
                             repo=repo.repo_name)
                     raise formencode.Invalid(msg, value, state,
                         error_dict=dict(repo_name=msg)
+                    )
             return value
     return _validator
 def ValidForkName(*args, **kwargs):
     return ValidRepoName(*args, **kwargs)

0 comments (0 inline, 0 general)