kallithea Changeset - b6b6955981a5

Changeset - b6b6955981a5

Parent rev.

Child rev.

[Not reviewed]

default

2 17 0

Mads Kiilerich - 6 years ago 2020-02-07 01:38:30
mads@kiilerich.com

cleanup: drop some dead code spotted by "vulture"

19 files changed with 5 insertions and 257 deletions:

docs/api/models.rst

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/user_groups.py

kallithea/controllers/admin/users.py

kallithea/controllers/changeset.py

kallithea/lib/db_manage.py

kallithea/lib/exceptions.py

kallithea/lib/middleware/sessionmiddleware.py

kallithea/lib/rcmail/message.py

kallithea/lib/rcmail/response.py

kallithea/lib/vcs/backends/base.py

kallithea/lib/vcs/exceptions.py

kallithea/lib/vcs/subprocessio.py

kallithea/lib/vcs/utils/lazy.py

kallithea/lib/vcs/utils/paths.py

kallithea/model/notification.py

kallithea/model/repo_permission.py

100

kallithea/model/ssh_key.py

kallithea/model/validators.py

0 comments (0 inline, 0 general)

docs/api/models.rst

➞

Show inline comments

@@ @@ -10,15 +10,12 @@ The :mod:`models` module @@
 .. automodule:: kallithea.model.comment
    :members:
 .. automodule:: kallithea.model.permission
    :members:
 .. automodule:: kallithea.model.repo_permission
    :members:
 .. automodule:: kallithea.model.repo
    :members:
 .. automodule:: kallithea.model.repo_group
    :members:

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -98,13 +98,12 @@ class RepoGroupsController(BaseControlle @@
         return False
     def index(self, format='html'):
         _list = RepoGroup.query(sorted=True).all()
         group_iter = RepoGroupList(_list, perm_level='admin')
         repo_groups_data = []
         total_records = len(group_iter)
         _tmpl_lookup = app_globals.mako_lookup
         template = _tmpl_lookup.get_template('data_table/_dt_elements.html')
         repo_group_name = lambda repo_group_name, children_groups: (
             template.get_def("repo_group_name")
             .render_unicode(repo_group_name, children_groups, _=_, h=h, c=c)

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -83,13 +83,12 @@ class UserGroupsController(BaseControlle @@
     def index(self, format='html'):
         _list = UserGroup.query() \
                         .order_by(func.lower(UserGroup.users_group_name)) \
                         .all()
         group_iter = UserGroupList(_list, perm_level='admin')
         user_groups_data = []
         total_records = len(group_iter)
         _tmpl_lookup = app_globals.mako_lookup
         template = _tmpl_lookup.get_template('data_table/_dt_elements.html')
         user_group_name = lambda user_group_id, user_group_name: (
             template.get_def("user_group_name")
             .render_unicode(user_group_id, user_group_name, _=_, h=h, c=c)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -67,13 +67,12 @@ class UsersController(BaseController): @@
         c.users_list = User.query().order_by(User.username) \
                         .filter_by(is_default_user=False) \
                         .order_by(func.lower(User.username)) \
                         .all()
         users_data = []
         total_records = len(c.users_list)
         _tmpl_lookup = app_globals.mako_lookup
         template = _tmpl_lookup.get_template('data_table/_dt_elements.html')
         grav_tmpl = '<div class="gravatar">%s</div>'
         username = lambda user_id, username: (

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -212,13 +212,12 @@ def create_cs_pr_comment(repo_name, revi @@
             Session().commit()
             h.flash(_('Successfully deleted pull request %s') % pull_request_id,
                     category='success')
             return {
                'location': h.url('my_pullrequests'), # or repo pr list?
+            }
             raise HTTPFound(location=h.url('my_pullrequests')) # or repo pr list?
         raise HTTPForbidden()
     text = request.POST.get('text', '').strip()
     comment = ChangesetCommentsModel().create(
         text=text,

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -51,13 +51,12 @@ log = logging.getLogger(__name__) @@
 class DbManage(object):
     def __init__(self, dbconf, root, tests=False, SESSION=None, cli_args=None):
         self.dbname = dbconf.split('/')[-1]
         self.tests = tests
         self.root = root
         self.dburi = dbconf
         self.db_exists = False
         self.cli_args = cli_args or {}
         self.init_db(SESSION=SESSION)
     def _ask_ok(self, msg):
         """Invoke ask_ok unless the force_ask option provides the answer"""
         force_ask = self.cli_args.get('force_ask')

kallithea/lib/exceptions.py

➞

Show inline comments

@@ @@ -71,12 +71,8 @@ class IMCCommitError(Exception): @@
 class UserCreationError(Exception):
     pass
 class RepositoryCreationError(Exception):
     pass
 class HgsubversionImportError(Exception):
     pass

kallithea/lib/middleware/sessionmiddleware.py

➞

Show inline comments

deleted file

kallithea/lib/rcmail/message.py

➞

Show inline comments

 from kallithea.lib.rcmail.exceptions import BadHeaders, InvalidMessage
 from kallithea.lib.rcmail.response import MailResponse
 class Attachment(object):
     """
     Encapsulates file attachment information.
     :param filename: filename of attachment
     :param content_type: file mimetype
     :param data: the raw file data, either as string or file obj
     :param disposition: content-disposition (if any)
     """
     def __init__(self,
                  filename=None,
                  content_type=None,
                  data=None,
                  disposition=None):
         self.filename = filename
         self.content_type = content_type
         self.disposition = disposition or 'attachment'
         self._data = data
     @property
     def data(self):
         if isinstance(self._data, str):
             return self._data
         self._data = self._data.read()
         return self._data
 class Message(object):
     """
     Encapsulates an email message.
     :param subject: email subject header
     :param recipients: list of email addresses

kallithea/lib/rcmail/response.py

➞

Show inline comments

@@ @@ -389,13 +389,13 @@ class MIMEPart(MIMEBase): @@
         self.set_payload(encoded, charset=charset)
     def extract_payload(self, mail):
         if mail.body is None:
             return  # only None, '' is still ok
-        ctype, ctype_params = mail.content_encoding['Content-Type']
+        ctype, _ctype_params = mail.content_encoding['Content-Type']
         cdisp, cdisp_params = mail.content_encoding['Content-Disposition']
         assert ctype, ("Extract payload requires that mail.content_encoding "
                        "have a valid Content-Type.")
         if ctype.startswith("text/"):

kallithea/lib/vcs/backends/base.py

➞

Show inline comments

@@ @@ -255,14 +255,12 @@ class BaseRepository(object): @@
         raise NotImplementedError
     def commit(self, message, **kwargs):
         """
         Persists current changes made on this repository and returns newly
         created changeset.
         :raises ``NothingChangedError``: if no changes has been made
         """
         raise NotImplementedError
     def get_state(self):
         """
         Returns dictionary with ``added``, ``changed`` and ``removed`` lists

kallithea/lib/vcs/exceptions.py

➞

Show inline comments

@@ @@ -27,16 +27,12 @@ class TagAlreadyExistError(RepositoryErr @@
 class TagDoesNotExistError(RepositoryError):
     pass
 class BranchAlreadyExistError(RepositoryError):
     pass
 class BranchDoesNotExistError(RepositoryError):
     pass
 class ChangesetError(RepositoryError):
     pass
@@ @@ -47,16 +43,12 @@ class ChangesetDoesNotExistError(Changes @@
 class CommitError(RepositoryError):
     pass
 class NothingChangedError(CommitError):
     pass
 class NodeError(VCSError):
     pass
 class RemovedFileNodeError(NodeError):
     pass
@@ @@ -85,10 +77,6 @@ class NodeAlreadyAddedError(CommitError) @@
 class NodeAlreadyRemovedError(CommitError):
     pass
 class ImproperArchiveTypeError(VCSError):
     pass
 class CommandError(VCSError):
     pass

kallithea/lib/vcs/subprocessio.py

➞

Show inline comments

@@ @@ -218,23 +218,12 @@ class BufferedGenerator(object): @@
     @property
     def reading_paused(self):
         return not self.worker.keep_reading.is_set()
     @property
     def done_reading_event(self):
         """
         Done_reading does not mean that the iterator's buffer is empty.
         Iterator might have done reading from underlying source, but the read
         chunks might still be available for serving through .next() method.
         :returns: An threading.Event class instance.
         """
         return self.worker.EOF
     @property
     def done_reading(self):
         """
         Done_reading does not mean that the iterator's buffer is empty.
         Iterator might have done reading from underlying source, but the read
         chunks might still be available for serving through .next() method.

kallithea/lib/vcs/utils/lazy.py

➞

Show inline comments

 import threading
 class _Missing(object):
     def __repr__(self):
         return 'no value'
     def __reduce__(self):
@@ @@ -41,24 +38,6 @@ class LazyProperty(object): @@
             return self
         value = obj.__dict__.get(self.__name__, _missing)
         if value is _missing:
             value = self._func(obj)
             obj.__dict__[self.__name__] = value
         return value
 class ThreadLocalLazyProperty(LazyProperty):
     """
     Same as above but uses thread local dict for cache storage.
     """
     def __get__(self, obj, klass=None):
         if obj is None:
             return self
         if not hasattr(obj, '__tl_dict__'):
             obj.__tl_dict__ = threading.local().__dict__
         value = obj.__tl_dict__.get(self.__name__, _missing)
         if value is _missing:
             value = self._func(obj)
             obj.__tl_dict__[self.__name__] = value
         return value

kallithea/lib/vcs/utils/paths.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ def get_dirs_for_path(*paths): @@
     """
     Returns list of directories, including intermediate.
     """
     for path in paths:
         head = path
         while head:
-            head, tail = os.path.split(head)
+            head, _tail = os.path.split(head)
             if head:
                 yield head
             else:
                 # We don't need to yield empty path
                 break

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -30,13 +30,12 @@ import datetime @@
 import logging
 from tg import app_globals
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 import kallithea
 from kallithea.lib import helpers as h
 from kallithea.model.db import User
 log = logging.getLogger(__name__)
@@ @@ -146,13 +145,12 @@ class EmailNotificationModel(object): @@
     TYPE_PULL_REQUEST = NotificationModel.TYPE_PULL_REQUEST
     TYPE_PULL_REQUEST_COMMENT = NotificationModel.TYPE_PULL_REQUEST_COMMENT
     TYPE_DEFAULT = 'default'
     def __init__(self):
         super(EmailNotificationModel, self).__init__()
         self._template_root = kallithea.CONFIG['paths']['templates'][0]
         self._tmpl_lookup = app_globals.mako_lookup
         self.email_types = {
             self.TYPE_CHANGESET_COMMENT: 'changeset_comment',
             self.TYPE_PASSWORD_RESET: 'password_reset',
             self.TYPE_REGISTRATION: 'registration',
             self.TYPE_DEFAULT: 'default',

kallithea/model/repo_permission.py

➞

Show inline comments

deleted file

kallithea/model/ssh_key.py

➞

Show inline comments

@@ @@ -49,13 +49,13 @@ class SshKeyModel(object): @@
         :param user: user or user_id
         :param description: description of SshKey
         :param publickey: public key text
         Will raise SshKeyModelException on errors
         """
         try:
-            keytype, pub, comment = ssh.parse_pub_key(public_key)
+            keytype, _pub, comment = ssh.parse_pub_key(public_key)
         except ssh.SshKeyParseError as e:
             raise SshKeyModelException(_('SSH key %r is invalid: %s') % (public_key, e.args[0]))
         if not description.strip():
             description = comment.strip()
         user = User.guess_instance(user)

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -581,17 +581,17 @@ def ValidPerms(type_='repo'): @@
             value['perms_new'] = list(perms_new)
             # update permissions
             for k, v, t in perms_new:
                 try:
                     if t == 'user':
-                        self.user_db = User.query() \
+                        _user_db = User.query() \
                             .filter(User.active == True) \
                             .filter(User.username == k).one()
                     if t == 'users_group':
-                        self.user_db = UserGroup.query() \
+                        _user_db = UserGroup.query() \
                             .filter(UserGroup.users_group_active == True) \
                             .filter(UserGroup.users_group_name == k).one()
                 except Exception:
                     log.exception('Updated permission failed')
                     msg = self.message('perm_new_member_type', state)

0 comments (0 inline, 0 general)