Changeset - 884d2c246570
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Søren Løvborg - 9 years ago 2017-02-20 19:21:34
sorenl@unity3d.com
cleanup: use list comprehensions

It's often the same number of lines, but avoids introducing a needless
"result" variable, and makes the item expression stand out more clearly.

It's also a tiny bit faster, but the readability gains is what matters.
4 files changed with 48 insertions and 52 deletions:
kallithea/controllers/api/api.py
28
29
kallithea/controllers/compare.py
4
4
kallithea/model/db.py
8
9
kallithea/tests/api/api_base.py
8
10
0 comments (0 inline, 0 general)
kallithea/controllers/api/api.py
➞
Show inline comments
 
@@ -581,19 +581,18 @@ class ApiController(JSONRPCController):
 

			




	
	
	
		
 
            id : <id_given_in_input>

			




	
	
	
		
 
            result: [<user_object>, ...]

			




	
	
	
		
 
            error:  null

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        result = []

			




	
	
	
		
 
        users_list = User.query().order_by(User.username) \

			




	
	
	
		
 
            .filter(User.username != User.DEFAULT_USER) \

			




	
	
	
		
 
            .all()

			




	
	
	
		
 
        for user in users_list:

			




	
	
	
		
 
            result.append(user.get_api_data())

			




	
	
	
		
 
        return result

			




	
	
	
		
 
        return [

			




	
	
	
		
 
            user.get_api_data()

			




	
	
	
		
 
            for user in User.query()

			




	
	
	
		
 
                .order_by(User.username)

			




	
	
	
		
 
                .filter(User.username != User.DEFAULT_USER)

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin')

			




	
	
	
		
 
    def create_user(self, username, email, password=Optional(''),

			




	
	
	
		
 
                    firstname=Optional(''), lastname=Optional(''),

			




	
	
	
		
 
                    active=Optional(True), admin=Optional(False),

			




	
	
	
		
 
                    extern_type=Optional(User.DEFAULT_AUTH_TYPE),

			




	
	
		
 
@@ -838,16 +837,16 @@ class ApiController(JSONRPCController):

			




	
	
	
		
 

			




	
	
	
		
 
            id : <id_given_in_input>

			




	
	
	
		
 
            result : [<user_group_obj>,...]

			




	
	
	
		
 
            error : null

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        result = []

			




	
	
	
		
 
        for user_group in UserGroupList(UserGroup.query().all(), perm_level='read'):

			




	
	
	
		
 
            result.append(user_group.get_api_data())

			




	
	
	
		
 
        return result

			




	
	
	
		
 
        return [

			




	
	
	
		
 
            user_group.get_api_data()

			




	
	
	
		
 
            for user_group in UserGroupList(UserGroup.query().all(), perm_level='read')

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')

			




	
	
	
		
 
    def create_user_group(self, group_name, description=Optional(''),

			




	
	
	
		
 
                          owner=Optional(OAttr('apiuser')), active=Optional(True)):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Creates new user group. This command can be executed only using api_key

			




	
	
		
 
@@ -1184,13 +1183,12 @@ class ApiController(JSONRPCController):

			




	
	
	
		
 

			




	
	
	
		
 
        if not HasPermissionAny('hg.admin')():

			




	
	
	
		
 
            if not HasRepoPermissionLevel('read')(repo.repo_name):

			




	
	
	
		
 
                raise JSONRPCError('repository `%s` does not exist' % (repoid,))

			




	
	
	
		
 

			




	
	
	
		
 
        members = []

			




	
	
	
		
 
        followers = []

			




	
	
	
		
 
        for user in repo.repo_to_perm:

			




	
	
	
		
 
            perm = user.permission.permission_name

			




	
	
	
		
 
            user = user.user

			




	
	
	
		
 
            user_data = {

			




	
	
	
		
 
                'name': user.username,

			




	
	
	
		
 
                'type': "user",

			




	
	
		
 
@@ -1205,14 +1203,16 @@ class ApiController(JSONRPCController):

			




	
	
	
		
 
                'name': user_group.users_group_name,

			




	
	
	
		
 
                'type': "user_group",

			




	
	
	
		
 
                'permission': perm

			




	
	
	
		
 
            }

			




	
	
	
		
 
            members.append(user_group_data)

			




	
	
	
		
 

			




	
	
	
		
 
        for user in repo.followers:

			




	
	
	
		
 
            followers.append(user.user.get_api_data())

			




	
	
	
		
 
        followers = [

			




	
	
	
		
 
            uf.user.get_api_data()

			




	
	
	
		
 
            for uf in repo.followers

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
        data = repo.get_api_data()

			




	
	
	
		
 
        data['members'] = members

			




	
	
	
		
 
        data['followers'] = followers

			




	
	
	
		
 
        return data

			




	
	
	
		
 

			




	
	
		
 
@@ -1244,21 +1244,21 @@ class ApiController(JSONRPCController):

			




	
	
	
		
 
                        "enable_statistics": "<bool>",

			




	
	
	
		
 
                      },

			




	
	
	
		
 
                      …

			




	
	
	
		
 
                    ]

			




	
	
	
		
 
            error:  null

			




	
	
	
		
 
        """

			




	
	
	
		
 
        result = []

			




	
	
	
		
 
        if not HasPermissionAny('hg.admin')():

			




	
	
	
		
 
            repos = RepoModel().get_all_user_repos(user=request.authuser.user_id)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            repos = Repository.query()

			




	
	
	
		
 

			




	
	
	
		
 
        for repo in repos:

			




	
	
	
		
 
            result.append(repo.get_api_data())

			




	
	
	
		
 
        return result

			




	
	
	
		
 
        return [

			




	
	
	
		
 
            repo.get_api_data()

			




	
	
	
		
 
            for repo in repos

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
    # permission check inside

			




	
	
	
		
 
    def get_repo_nodes(self, repoid, revision, root_path,

			




	
	
	
		
 
                       ret_type=Optional('all')):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        returns a list of nodes and it's children in a flat list for a given path

			




	
	
		
 
@@ -1907,16 +1907,16 @@ class ApiController(JSONRPCController):

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin')

			




	
	
	
		
 
    def get_repo_groups(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns all repository groups

			




	
	
	
		
 

			




	
	
	
		
 
        """

			




	
	
	
		
 
        result = []

			




	
	
	
		
 
        for repo_group in RepoGroup.query():

			




	
	
	
		
 
            result.append(repo_group.get_api_data())

			




	
	
	
		
 
        return result

			




	
	
	
		
 
        return [

			




	
	
	
		
 
            repo_group.get_api_data()

			




	
	
	
		
 
            for repo_group in RepoGroup.query()

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin')

			




	
	
	
		
 
    def create_repo_group(self, group_name, description=Optional(''),

			




	
	
	
		
 
                          owner=Optional(OAttr('apiuser')),

			




	
	
	
		
 
                          parent=Optional(None),

			




	
	
	
		
 
                          copy_permissions=Optional(False)):

			




	
	
		
 
@@ -2349,20 +2349,19 @@ class ApiController(JSONRPCController):

			




	
	
	
		
 

			




	
	
	
		
 
        if isinstance(userid, Optional):

			




	
	
	
		
 
            user_id = request.authuser.user_id

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            user_id = get_user_or_error(userid).user_id

			




	
	
	
		
 

			




	
	
	
		
 
        gists = []

			




	
	
	
		
 
        _gists = Gist().query() \

			




	
	
	
		
 
            .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time())) \

			




	
	
	
		
 
            .filter(Gist.owner_id == user_id) \

			




	
	
	
		
 
        return [

			




	
	
	
		
 
            gist.get_api_data()

			




	
	
	
		
 
            for gist in Gist().query()

			




	
	
	
		
 
                .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time()))

			




	
	
	
		
 
                .filter(Gist.owner_id == user_id)

			




	
	
	
		
 
            .order_by(Gist.created_on.desc())

			




	
	
	
		
 
        for gist in _gists:

			




	
	
	
		
 
            gists.append(gist.get_api_data())

			




	
	
	
		
 
        return gists

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
    def create_gist(self, files, owner=Optional(OAttr('apiuser')),

			




	
	
	
		
 
                    gist_type=Optional(Gist.GIST_PUBLIC), lifetime=Optional(-1),

			




	
	
	
		
 
                    description=Optional('')):

			




	
	
	
		
 

			




	
	
	
		
 
        """

			




        

    


    
    

    

        

                

                    kallithea/controllers/compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -131,17 +131,17 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
                gitrepo = Repo(org_repo.path)

			




	
	
	
		
 
                SubprocessGitClient(thin_packs=False).fetch(safe_str(other_repo.path), gitrepo)

			




	
	
	
		
 

			




	
	
	
		
 
                gitrepo_remote = Repo(other_repo.path)

			




	
	
	
		
 
                SubprocessGitClient(thin_packs=False).fetch(safe_str(org_repo.path), gitrepo_remote)

			




	
	
	
		
 

			




	
	
	
		
 
                revs = []

			




	
	
	
		
 
                revs = [

			




	
	
	
		
 
                    x.commit.id

			




	
	
	
		
 
                for x in gitrepo_remote.get_walker(include=[other_rev],

			




	
	
	
		
 
                                                   exclude=[org_rev]):

			




	
	
	
		
 
                    revs.append(x.commit.id)

			




	
	
	
		
 

			




	
	
	
		
 
                                                       exclude=[org_rev])

			




	
	
	
		
 
                ]

			




	
	
	
		
 
                other_changesets = [other_repo.get_changeset(rev) for rev in reversed(revs)]

			




	
	
	
		
 
                if other_changesets:

			




	
	
	
		
 
                    ancestors = [other_changesets[0].parents[0].raw_id]

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    # no changesets from other repo, ancestor is the other_rev

			




	
	
	
		
 
                    ancestors = [other_rev]

			




        

    


    
    

    

        

                

                    kallithea/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -97,16 +97,16 @@ class BaseDbModel(object):

			




	
	
	
		
 
        return d

			




	
	
	
		
 

			




	
	
	
		
 
    def get_appstruct(self):

			




	
	
	
		
 
        """return list with keys and values tuples corresponding

			




	
	
	
		
 
        to this model data """

			




	
	
	
		
 

			




	
	
	
		
 
        l = []

			




	
	
	
		
 
        for k in self._get_keys():

			




	
	
	
		
 
            l.append((k, getattr(self, k),))

			




	
	
	
		
 
        return l

			




	
	
	
		
 
        return [

			




	
	
	
		
 
            (k, getattr(self, k))

			




	
	
	
		
 
            for k in self._get_keys()

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
    def populate_obj(self, populate_dict):

			




	
	
	
		
 
        """populate model with data from given populate_dict"""

			




	
	
	
		
 

			




	
	
	
		
 
        for k in self._get_keys():

			




	
	
	
		
 
            if k in populate_dict:

			




	
	
		
 
@@ -912,17 +912,16 @@ class UserGroup(Base, BaseDbModel):

			




	
	
	
		
 
            group_name=user_group.users_group_name,

			




	
	
	
		
 
            group_description=user_group.user_group_description,

			




	
	
	
		
 
            active=user_group.users_group_active,

			




	
	
	
		
 
            owner=user_group.owner.username,

			




	
	
	
		
 
        )

			




	
	
	
		
 
        if with_members:

			




	
	
	
		
 
            members = []

			




	
	
	
		
 
            for user in user_group.members:

			




	
	
	
		
 
                user = user.user

			




	
	
	
		
 
                members.append(user.get_api_data())

			




	
	
	
		
 
            data['members'] = members

			




	
	
	
		
 
            data['members'] = [

			




	
	
	
		
 
                ugm.user.get_api_data()

			




	
	
	
		
 
                for ugm in user_group.members

			




	
	
	
		
 
            ]

			




	
	
	
		
 

			




	
	
	
		
 
        return data

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserGroupMember(Base, BaseDbModel):

			




	
	
	
		
 
    __tablename__ = 'users_groups_members'

			




        

    


    
    

    

        

                

                    kallithea/tests/api/api_base.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -874,30 +874,28 @@ class _BaseTestApi(object):

			




	
	
	
		
 
        self._compare_error(id_, expected, given=response.body)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_api_get_repos(self):

			




	
	
	
		
 
        id_, params = _build_data(self.apikey, 'get_repos')

			




	
	
	
		
 
        response = api_call(self, params)

			




	
	
	
		
 

			




	
	
	
		
 
        result = []

			




	
	
	
		
 
        for repo in Repository.query():

			




	
	
	
		
 
            result.append(repo.get_api_data())

			




	
	
	
		
 
        ret = jsonify(result)

			




	
	
	
		
 
        expected = jsonify([

			




	
	
	
		
 
            repo.get_api_data()

			




	
	
	
		
 
            for repo in Repository.query()

			




	
	
	
		
 
        ])

			




	
	
	
		
 

			




	
	
	
		
 
        expected = ret

			




	
	
	
		
 
        self._compare_ok(id_, expected, given=response.body)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_api_get_repos_non_admin(self):

			




	
	
	
		
 
        id_, params = _build_data(self.apikey_regular, 'get_repos')

			




	
	
	
		
 
        response = api_call(self, params)

			




	
	
	
		
 

			




	
	
	
		
 
        result = []

			




	
	
	
		
 
        for repo in RepoModel().get_all_user_repos(self.TEST_USER_LOGIN):

			




	
	
	
		
 
            result.append(repo.get_api_data())

			




	
	
	
		
 
        ret = jsonify(result)

			




	
	
	
		
 
        expected = jsonify([

			




	
	
	
		
 
            repo.get_api_data()

			




	
	
	
		
 
            for repo in RepoModel().get_all_user_repos(self.TEST_USER_LOGIN)

			




	
	
	
		
 
        ])

			




	
	
	
		
 

			




	
	
	
		
 
        expected = ret

			




	
	
	
		
 
        self._compare_ok(id_, expected, given=response.body)

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize('name,ret_type', [

			




	
	
	
		
 
        ('all', 'all'),

			




	
	
	
		
 
        ('dirs', 'dirs'),

			




	
	
	
		
 
        ('files', 'files'),

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.