kallithea Changeset - ce5d4c582a82

Changeset - ce5d4c582a82

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Mads Kiilerich - 6 years ago 2019-11-23 23:59:28
mads@kiilerich.com

Grafted from: 998e361b5896

py3: cleanup map usage and avoid py3 ambiguity

Based on 2to3 -f map ... but replace map with something more explicit (unless
born and raised in a lisp world) (but sometimes slightly more verbose).

11 files changed with 14 insertions and 19 deletions:

kallithea/bin/kallithea_api.py

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/api/__init__.py

kallithea/controllers/feed.py

kallithea/lib/helpers.py

kallithea/lib/indexers/daemon.py

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

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

kallithea/model/db.py

kallithea/model/permission.py

kallithea/model/repo.py

0 comments (0 inline, 0 general)

kallithea/bin/kallithea_api.py

➞

Show inline comments

@@ @@ -98,13 +98,13 @@ def main(argv=None): @@
     # if we don't have method here it's an error
     if not method:
         parser.error('Please specify method name')
     try:
-        margs = dict(map(lambda s: s.split(':', 1), other))
+        margs = dict(s.split(':', 1) for s in other)
     except ValueError:
         sys.stderr.write('Error parsing arguments \n')
         sys.exit()
     if args.format == FORMAT_PRETTY:
         print('Calling method %s => %s' % (method, apihost))

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ Original author and date, and relevant c @@
 :created_on: Mar 23, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import itertools
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from tg import app_globals, request
@@ @@ -39,13 +38,13 @@ from webob.exc import HTTPForbidden, HTT @@
 import kallithea
 from kallithea.config.routing import url
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoGroupPermissionLevelDecorator, LoginRequired
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.utils2 import safe_int
+from kallithea.lib.utils2 import safe_int, safe_unicode
 from kallithea.model.db import RepoGroup, Repository
 from kallithea.model.forms import RepoGroupForm, RepoGroupPermsForm
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.scm import AvailableRepoGroupChoices, RepoGroupList
@@ @@ -117,15 +116,13 @@ class RepoGroupsController(BaseControlle @@
             template.get_def("repo_group_actions")
             .render(repo_group_id, repo_group_name, gr_count, _=_, h=h, c=c,
                     ungettext=ungettext)
+        )
         for repo_gr in group_iter:
             children_groups = map(h.safe_unicode,
                 itertools.chain((g.name for g in repo_gr.parents),
                                 (x.name for x in [repo_gr])))
             children_groups = [safe_unicode(g.name) for g in repo_gr.parents] + [safe_unicode(repo_gr.name)]
             repo_count = repo_gr.repositories.count()
             repo_groups_data.append({
                 "raw_name": repo_gr.group_name,
                 "group_name": repo_group_name(repo_gr.group_name, children_groups),
                 "desc": h.escape(repo_gr.group_description),
                 "repos": repo_count,

kallithea/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -165,13 +165,13 @@ class JSONRPCController(TGController): @@
                                        message=str(e))
         # now that we have a method, add self._req_params to
         # self.kargs and dispatch control to WGIController
         argspec = inspect.getargspec(self._func)
         arglist = argspec[0][1:]
-        defaults = map(type, argspec[3] or [])
+        defaults = [type(arg) for arg in argspec[3] or []]
         default_empty = type(NotImplemented)
         # kw arguments required by this method
         func_kwargs = dict(itertools.izip_longest(reversed(arglist), reversed(defaults),
                                                   fillvalue=default_empty))

kallithea/controllers/feed.py

➞

Show inline comments

@@ @@ -97,13 +97,13 @@ class FeedController(BaseRepoController) @@
         desc_msg.append('\n')
         desc_msg.extend(changes)
         if str2bool(CONFIG.get('rss_include_diff', False)):
             desc_msg.append('\n\n')
             desc_msg.append(raw_diff)
         desc_msg.append('</pre>')
-        return map(safe_unicode, desc_msg)
+        return [safe_unicode(chunk) for chunk in desc_msg]
     def _feed(self, repo_name, kind, feed_factory):
         """Produce a simple feed"""
         @cache_region('long_term', '_get_feed_from_cache')
         def _get_feed_from_cache(*_cache_keys):  # parameters are not really used - only as caching key

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -376,13 +376,13 @@ def pygmentize_annotation(repo_name, fil @@
         for _unused in xrange(n):
             h += golden_ratio
             h %= 1
             HSV_tuple = [h, 0.95, 0.95]
             RGB_tuple = hsv_to_rgb(*HSV_tuple)
-            yield map(lambda x: str(int(x * 256)), RGB_tuple)
+            yield [str(int(x * 256)) for x in RGB_tuple]
     cgenerator = gen_color()
     def get_color_string(cs):
         if cs in color_dict:
             col = color_dict[cs]

kallithea/lib/indexers/daemon.py

➞

Show inline comments

@@ @@ -75,13 +75,13 @@ class WhooshIndexingDaemon(object): @@
         self.repo_paths = ScmModel().repo_scan(self.repo_location)
         # filter repo list
         if repo_list:
             # Fix non-ascii repo names to unicode
-            repo_list = map(safe_unicode, repo_list)
+            repo_list = set(safe_unicode(repo_name) for repo_name in repo_list)
             self.filtered_repo_paths = {}
             for repo_name, repo in self.repo_paths.items():
                 if repo_name in repo_list:
                     self.filtered_repo_paths[repo_name] = repo
             self.repo_paths = self.filtered_repo_paths

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

➞

Show inline comments

@@ @@ -44,13 +44,13 @@ class GitInMemoryChangeset(BaseInMemoryC @@
         # Create tree and populates it with blobs
         commit_tree = self.parents[0] and repo[self.parents[0]._commit.tree] or \
             objects.Tree()
         for node in self.added + self.changed:
             # Compute subdirs if needed
             dirpath, nodename = posixpath.split(node.path)
-            dirnames = map(safe_str, dirpath and dirpath.split('/') or [])
+            dirnames = safe_str(dirpath).split('/') if dirpath else []
             parent = commit_tree
             ancestors = [('', parent)]
             # Tries to dig for the deepest existing tree
             while dirnames:
                 curdir = dirnames.pop(0)

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

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ class MercurialChangeset(BaseChangeset): @@
         self._ctx = repository._repo[revision]
         self.revision = self._ctx._rev
         self.nodes = {}
     @LazyProperty
     def tags(self):
-        return map(safe_unicode, self._ctx.tags())
+        return [safe_unicode(tag) for tag in self._ctx.tags()]
     @LazyProperty
     def branch(self):
         return safe_unicode(self._ctx.branch())
     @LazyProperty
@@ @@ -92,13 +92,13 @@ class MercurialChangeset(BaseChangeset): @@
     @LazyProperty
     def predecessors(self):
         return [hex(n)[:12] for n in obsutil.closestpredecessors(self._ctx._repo, self._ctx.node())]
     @LazyProperty
     def bookmarks(self):
-        return map(safe_unicode, self._ctx.bookmarks())
+        return [safe_unicode(bookmark) for bookmark in self._ctx.bookmarks()]
     @LazyProperty
     def message(self):
         return safe_unicode(self._ctx.description())
     @LazyProperty

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1160,13 +1160,13 @@ class Repository(Base, BaseDbModel): @@
     def repo_full_path(self):
         p = [self.repo_path]
         # we need to split the name by / since this is how we store the
         # names in the database, but that eventually needs to be converted
         # into a valid system path
         p += self.repo_name.split(Repository.url_sep())
-        return os.path.join(*map(safe_unicode, p))
+        return os.path.join(*(safe_unicode(d) for d in p))
     @property
     def cache_keys(self):
         """
         Returns associated cache keys for that repo
         """
@@ @@ -2508,14 +2508,13 @@ class Gist(Base, BaseDbModel): @@
     ## SCM functions
     @property
     def scm_instance(self):
         from kallithea.lib.vcs import get_repo
         base_path = self.base_path()
         return get_repo(os.path.join(*map(safe_str,
                                           [base_path, self.gist_access_id])))
         return get_repo(os.path.join(safe_str(base_path), safe_str(self.gist_access_id)))
 class UserSshKeys(Base, BaseDbModel):
     __tablename__ = 'user_ssh_keys'
     __table_args__ = (
         Index('usk_public_key_idx', 'public_key'),

kallithea/model/permission.py

➞

Show inline comments

@@ @@ -70,14 +70,13 @@ class PermissionModel(object): @@
             return new_perm
         def _get_group(perm_name):
             return '.'.join(perm_name.split('.')[:1])
         perms = UserToPerm.query().filter(UserToPerm.user == user).all()
         defined_perms_groups = map(_get_group,
                                 (x.permission.permission_name for x in perms))
         defined_perms_groups = set(_get_group(x.permission.permission_name) for x in perms)
         log.debug('GOT ALREADY DEFINED:%s', perms)
         DEFAULT_PERMS = Permission.DEFAULT_USER_PERMISSIONS
         if force:
             for perm in perms:
                 Session().delete(perm)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -641,13 +641,13 @@ class RepoModel(object): @@
         if repo_store_location:
             _paths = [repo_store_location]
         else:
             _paths = [self.repos_path, new_parent_path, repo_name]
             # we need to make it str for mercurial
-        repo_path = os.path.join(*map(lambda x: safe_str(x), _paths))
+        repo_path = os.path.join(*(safe_str(x) for x in _paths))
         # check if this path is not a repository
         if is_valid_repo(repo_path, self.repos_path):
             raise Exception('This path %s is a valid repository' % repo_path)
         # check if this path is a group

0 comments (0 inline, 0 general)