kallithea Changeset - e2519d2e74c2

Changeset - e2519d2e74c2

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

Mads Kiilerich - 7 years ago 2018-06-09 16:30:22
mads@kiilerich.com

unicode: consistently use the preferred Python spelling 'utf-8' instead of the alias 'utf8'

12 files changed with 14 insertions and 14 deletions:

development.ini

kallithea/lib/helpers.py

kallithea/lib/middleware/pygrack.py

kallithea/lib/paster_commands/template.ini.mako

kallithea/lib/utils.py

kallithea/lib/utils2.py

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

kallithea/lib/vcs/conf/settings.py

kallithea/tests/vcs/test_changesets.py

kallithea/tests/vcs/test_filenodes_unicode_path.py

kallithea/tests/vcs/test_inmemchangesets.py

scripts/update-copyrights.py

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -155,13 +155,13 @@ api_access_controllers_whitelist = @@
 #    ChangesetController:changeset_raw,
 #    FilesController:raw,
 #    FilesController:archivefile
 ## default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
-default_encoding = utf8
+default_encoding = utf-8
 ## Set Mercurial encoding, similar to setting HGENCODING before launching Kallithea
 hgencoding = utf-8
 ## issue tracker for Kallithea (leave blank to disable, absent for default)
 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -472,13 +472,13 @@ def show_id(cs): @@
     else:
         return raw_id
 def fmt_date(date):
     if date:
-        return date.strftime("%Y-%m-%d %H:%M:%S").decode('utf8')
+        return date.strftime("%Y-%m-%d %H:%M:%S").decode('utf-8')
     return ""
 def is_git(repository):
     if hasattr(repository, 'alias'):

kallithea/lib/middleware/pygrack.py

➞

Show inline comments

@@ @@ -173,13 +173,13 @@ class GitRepository(object): @@
             from dulwich.server import update_server_info
             repo = get_repo(self.content_path)
             if repo:
                 update_server_info(repo._repo)
         resp = Response()
-        resp.content_type = 'application/x-%s-result' % git_command.encode('utf8')
+        resp.content_type = 'application/x-%s-result' % git_command.encode('utf-8')
         resp.charset = None
         resp.app_iter = out
         return resp
     def __call__(self, environ, start_response):
         req = Request(environ)

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

@@ @@ -249,13 +249,13 @@ api_access_controllers_whitelist = @@
 #    ChangesetController:changeset_raw,
 #    FilesController:raw,
 #    FilesController:archivefile
 <%text>## default encoding used to convert from and to unicode</%text>
 <%text>## can be also a comma separated list of encoding in case of mixed encodings</%text>
-default_encoding = utf8
+default_encoding = utf-8
 <%text>## Set Mercurial encoding, similar to setting HGENCODING before launching Kallithea</%text>
 hgencoding = utf-8
 <%text>## issue tracker for Kallithea (leave blank to disable, absent for default)</%text>
 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -432,13 +432,13 @@ def set_vcs_config(config): @@
         'git': 'kallithea.lib.vcs.backends.git.GitRepository',
+    }
     conf.settings.GIT_EXECUTABLE_PATH = config.get('git_path', 'git')
     conf.settings.GIT_REV_FILTER = config.get('git_rev_filter', '--all').strip()
     conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding',
-                                                        'utf8'), sep=',')
+                                                        'utf-8'), sep=',')
 def set_indexer_config(config):
     """
     Update Whoosh index mapping

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -173,13 +173,13 @@ def safe_unicode(str_, from_encoding=Non @@
     if isinstance(str_, unicode):
         return str_
     if not from_encoding:
         import kallithea
         DEFAULT_ENCODINGS = aslist(kallithea.CONFIG.get('default_encoding',
-                                                        'utf8'), sep=',')
+                                                        'utf-8'), sep=',')
         from_encoding = DEFAULT_ENCODINGS
     if not isinstance(from_encoding, (list, tuple)):
         from_encoding = [from_encoding]
     try:
@@ @@ -222,13 +222,13 @@ def safe_str(unicode_, to_encoding=None) @@
     if isinstance(unicode_, str):
         return unicode_
     if not to_encoding:
         import kallithea
         DEFAULT_ENCODINGS = aslist(kallithea.CONFIG.get('default_encoding',
-                                                        'utf8'), sep=',')
+                                                        'utf-8'), sep=',')
         to_encoding = DEFAULT_ENCODINGS
     if not isinstance(to_encoding, (list, tuple)):
         to_encoding = [to_encoding]
     for enc in to_encoding:

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

➞

Show inline comments

@@ @@ -50,23 +50,23 @@ class MercurialInMemoryChangeset(BaseInM @@
                 return None
             # check if this path is added
             for node in self.added:
                 if node.path == path:
                     return memfilectx(_repo, memctx, path=node.path,
-                        data=(node.content.encode('utf8')
+                        data=(node.content.encode('utf-8')
                               if not node.is_binary else node.content),
                         islink=False,
                         isexec=node.is_executable,
                         copied=False)
             # or changed
             for node in self.changed:
                 if node.path == path:
                     return memfilectx(_repo, memctx, path=node.path,
-                        data=(node.content.encode('utf8')
+                        data=(node.content.encode('utf-8')
                               if not node.is_binary else node.content),
                         islink=False,
                         isexec=node.is_executable,
                         copied=False)
             raise RepositoryError("Given path haven't been marked as added,"

kallithea/lib/vcs/conf/settings.py

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ if not VCSRC_PATH: @@
 VCSRC_PATH = VCSRC_PATH or abspath(HOME_, '.vcsrc')
 if os.path.isdir(VCSRC_PATH):
     VCSRC_PATH = os.path.join(VCSRC_PATH, '__init__.py')
 # list of default encoding used in safe_unicode/safe_str methods
-DEFAULT_ENCODINGS = aslist('utf8')
+DEFAULT_ENCODINGS = aslist('utf-8')
 # path to git executable run by run_git_command function
 GIT_EXECUTABLE_PATH = 'git'
 # can be also --branches --tags
 GIT_REV_FILTER = '--all'

kallithea/tests/vcs/test_changesets.py

➞

Show inline comments

-# encoding: utf8
+# encoding: utf-8
 import time
 import datetime
 import pytest

kallithea/tests/vcs/test_filenodes_unicode_path.py

➞

Show inline comments

-# encoding: utf8
+# encoding: utf-8
 import datetime
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.tests.vcs.base import _BackendTestMixin

kallithea/tests/vcs/test_inmemchangesets.py

➞

Show inline comments

-# encoding: utf8
+# encoding: utf-8
 """
 Tests so called "in memory changesets" commit API of vcs.
 """
 import time
 import datetime

scripts/update-copyrights.py

➞

Show inline comments

@@ @@ -140,13 +140,13 @@ def sortkey(x): @@
     * 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"""
     return (x[0] and -int(x[0][-1]),
             x[0] and int(x[0][0]),
             -len(x[0]),
-            x[1].decode('utf8').lower().replace(u'\xe9', u'e').replace(u'\u0142', u'l')
+            x[1].decode('utf-8').lower().replace(u'\xe9', u'e').replace(u'\u0142', u'l')
+        )
 def nice_years(l, dash='-', join=' '):
     """Convert a list of years into brief range like '1900-1901, 1921'."""
     if not l:

0 comments (0 inline, 0 general)