kallithea Changeset - f9988201a3c4

Changeset - f9988201a3c4

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 6 years ago 2019-12-21 15:14:08
mads@kiilerich.com

Grafted from: ffca1325171a

py3: some not-entirely-trivial removing of "unicode"

6 files changed with 10 insertions and 12 deletions:

kallithea/controllers/admin/admin.py

kallithea/controllers/search.py

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

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

kallithea/model/db.py

scripts/update-copyrights.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ def _journal_filter(user_log, search_ter @@
     """
     log.debug('Initial search term: %r', search_term)
     qry = None
     if search_term:
         qp = QueryParser('repository', schema=JOURNAL_SCHEMA)
         qp.add_plugin(DateParserPlugin())
-        qry = qp.parse(unicode(search_term))
         qry = qp.parse(search_term)
         log.debug('Filtering using parsed query %r', qry)
     def wildcard_handler(col, wc_term):
         if wc_term.startswith('*') and not wc_term.endswith('*'):
             # postfix == endswith
             wc_term = remove_prefix(wc_term, prefix='*')

kallithea/controllers/search.py

➞

Show inline comments

@@ @@ -93,13 +93,13 @@ class SearchController(BaseRepoControlle @@
                 qp = QueryParser(search_type, schema=schema_defn)
                 if c.repo_name:
                     # use "repository_rawname:" instead of "repository:"
                     # for case-sensitive matching
                     cur_query = u'repository_rawname:%s %s' % (c.repo_name, cur_query)
                 try:
-                    query = qp.parse(unicode(cur_query))
                     query = qp.parse(cur_query)
                     # extract words for highlight
                     if isinstance(query, Phrase):
                         highlight_items.update(query.words)
                     elif isinstance(query, Prefix):
                         highlight_items.add(query.text)
                     else:

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

➞

Show inline comments

@@ @@ -271,13 +271,13 @@ class GitRepository(BaseRepository): @@
             try:
                 return self.revisions[revision]
             except IndexError:
                 msg = "Revision %r does not exist for %s" % (revision, self.name)
                 raise ChangesetDoesNotExistError(msg)
-        if isinstance(revision, (str, unicode)):
         if isinstance(revision, str):
             if revision.isdigit() and (len(revision) < 12 or len(revision) == revision.count('0')):
                 try:
                     return self.revisions[int(revision)]
                 except IndexError:
                     msg = "Revision %r does not exist for %s" % (revision, self)
                     raise ChangesetDoesNotExistError(msg)

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

➞

Show inline comments

@@ @@ -27,18 +27,18 @@ class MercurialInMemoryChangeset(BaseInM @@
           branch would be used.
         :raises ``CommitError``: if any error occurs while committing
         """
         self.check_integrity(parents)
         if not isinstance(message, str):
             raise RepositoryError('message must be a str - got %r' % type(message))
         if not isinstance(author, str):
             raise RepositoryError('author must be a str - got %r' % type(author))
         from .repository import MercurialRepository
         if not isinstance(message, unicode) or not isinstance(author, unicode):
             raise RepositoryError('Given message and author needs to be '
                                   'an <unicode> instance got %r & %r instead'
                                   % (type(message), type(author)))
         if branch is None:
             branch = MercurialRepository.DEFAULT_BRANCH_NAME
         kwargs[b'branch'] = safe_bytes(branch)
         def filectxfn(_repo, memctx, bytes_path):
             """

kallithea/model/db.py

➞

Show inline comments

@@ @@ -215,15 +215,13 @@ class Setting(Base, BaseDbModel): @@
         converter = self.SETTINGS_TYPES.get(_type) or self.SETTINGS_TYPES['unicode']
         return converter(v)
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
         :param val:
         Setter that will always make sure we use str in app_settings_value
         """
         self._app_settings_value = safe_str(val)
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type

scripts/update-copyrights.py

➞

Show inline comments

@@ @@ -48,13 +48,13 @@ from . import contributor_data @@
 def sortkey(x):
     """Return key for sorting contributors "fairly":
     * latest contribution
     * first contribution
     * number of contribution years
     * name (with some unicode normalization)
-    The entries must be 2-tuples of a list of string years and the unicode name"""
     The entries must be 2-tuples of a list of string years and the name"""
     return (x[0] and -int(x[0][-1]),
             x[0] and int(x[0][0]),
             -len(x[0]),
             x[1].decode('utf-8').lower().replace(u'\xe9', u'e').replace(u'\u0142', u'l')
+        )

0 comments (0 inline, 0 general)