kallithea Changeset - 48a00daba2f2

Changeset - 48a00daba2f2

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

Lars Kruse - 8 years ago 2017-08-25 14:35:28
devel@sumpfralle.de

codingstyle: replace comparison for equality against None with "is" expression

Both style and correctness.

Reported by flake8.

12 files changed with 38 insertions and 40 deletions:

kallithea/lib/db_manage.py

kallithea/lib/ipaddr.py

kallithea/tests/api/api_base.py

kallithea/tests/functional/test_admin_repos.py

kallithea/tests/functional/test_admin_user_groups.py

kallithea/tests/functional/test_login.py

kallithea/tests/functional/test_pullrequests.py

kallithea/tests/models/test_permissions.py

kallithea/tests/models/test_repo_groups.py

kallithea/tests/models/test_repos.py

kallithea/tests/models/test_users.py

kallithea/tests/other/test_validators.py

0 comments (0 inline, 0 general)

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -316,14 +316,14 @@ class DbManage(object): @@
         Create default auth plugin settings, and make it active
         :param skip_existing:
         """
         for k, v, t in [('auth_plugins', 'kallithea.lib.auth_modules.auth_internal', 'list'),
                      ('auth_internal_enabled', 'True', 'bool')]:
             if skip_existing and Setting.get_by_name(k) != None:
                         ('auth_internal_enabled', 'True', 'bool')]:
             if skip_existing and Setting.get_by_name(k) is not None:
                 log.debug('Skipping option %s', k)
                 continue
             setting = Setting(k, v, t)
             self.sa.add(setting)
     def create_default_options(self, skip_existing=False):

kallithea/lib/ipaddr.py

➞

Show inline comments

@@ @@ -766,24 +766,23 @@ class _BaseNet(_IPAddrBase): @@
                 s1, s2 = s1.subnet()
             elif other in s2:
                 ret_addrs.append(s1)
                 s1, s2 = s2.subnet()
             else:
                 # If we got here, there's a bug somewhere.
                 assert True == False, ('Error performing exclusion: '
                                        's1: %s s2: %s other: %s' %
                                        (str(s1), str(s2), str(other)))
                 assert False, ('Error performing exclusion: '
                                's1: %s s2: %s other: %s' %
                                (str(s1), str(s2), str(other)))
         if s1 == other:
             ret_addrs.append(s2)
         elif s2 == other:
             ret_addrs.append(s1)
         else:
             # If we got here, there's a bug somewhere.
             assert True == False, ('Error performing exclusion: '
                                    's1: %s s2: %s other: %s' %
                                    (str(s1), str(s2), str(other)))
             assert False, ('Error performing exclusion: s1: %s s2: %s other: %s'
                            % (str(s1), str(s2), str(other)))
         return sorted(ret_addrs, key=_BaseNet._get_networks_key)
     def compare_networks(self, other):
         """Compare two IP objects.

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -139,13 +139,13 @@ class _BaseTestApi(object): @@
     def test_Optional_object(self):
         from kallithea.controllers.api.api import Optional
         option1 = Optional(None)
         assert '<Optional:%s>' % None == repr(option1)
-        assert option1() == None
+        assert option1() is None
         assert 1 == Optional.extract(Optional(1))
         assert 'trololo' == Optional.extract('trololo')
     def test_Optional_OAttr(self):
         from kallithea.controllers.api.api import Optional, OAttr
@@ @@ -995,13 +995,13 @@ class _BaseTestApi(object): @@
                                   owner=TEST_USER_ADMIN_LOGIN,
                                   repo_type=self.REPO_TYPE,
+        )
         response = api_call(self, params)
         repo = RepoModel().get_by_repo_name(repo_name)
-        assert repo != None
+        assert repo is not None
         ret = {
             'msg': 'Created new repository `%s`' % repo_name,
             'success': True,
             'task': None,
+        }
         expected = ret
@@ @@ -1014,13 +1014,13 @@ class _BaseTestApi(object): @@
                                   repo_name=repo_name,
                                   owner=TEST_USER_ADMIN_LOGIN,
                                   repo_type=self.REPO_TYPE,)
         response = api_call(self, params)
         print params
         repo = RepoModel().get_by_repo_name(repo_name)
-        assert repo != None
+        assert repo is not None
         ret = {
             'msg': 'Created new repository `%s`' % repo_name,
             'success': True,
             'task': None,
+        }
         expected = ret
@@ @@ -1080,13 +1080,13 @@ class _BaseTestApi(object): @@
                                   repo_name=repo_name,
                                   repo_type=self.REPO_TYPE,
+        )
         response = api_call(self, params)
         repo = RepoModel().get_by_repo_name(repo_name)
-        assert repo != None
+        assert repo is not None
         ret = {
             'msg': 'Created new repository `%s`' % repo_name,
             'success': True,
             'task': None,
+        }
         expected = ret
@@ @@ -1100,13 +1100,13 @@ class _BaseTestApi(object): @@
                                   repo_name=repo_name,
                                   repo_type=self.REPO_TYPE,
+        )
         response = api_call(self, params)
         repo = RepoModel().get_by_repo_name(repo_name)
-        assert repo != None
+        assert repo is not None
         ret = {
             'msg': 'Created new repository `%s`' % repo_name,
             'success': True,
             'task': None,
+        }
         expected = ret

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -386,13 +386,13 @@ class _BaseTestCase(TestController): @@
         response.follow()
         # check if repo was deleted from db
         deleted_repo = Session().query(Repository) \
             .filter(Repository.repo_name == repo_name).scalar()
-        assert deleted_repo == None
+        assert deleted_repo is None
         assert os.path.isdir(os.path.join(Ui.get_by_key('paths', '/').ui_value, repo_name)) == False
     def test_delete_non_ascii(self):
         self.log_user()
         non_ascii = "ąęł"
@@ @@ -436,13 +436,13 @@ class _BaseTestCase(TestController): @@
         response.follow()
         # check if repo was deleted from db
         deleted_repo = Session().query(Repository) \
             .filter(Repository.repo_name == repo_name_unicode).scalar()
-        assert deleted_repo == None
+        assert deleted_repo is None
         assert os.path.isdir(os.path.join(Ui.get_by_key('paths', '/').ui_value, repo_name_unicode)) == False
     def test_delete_repo_with_group(self):
         # TODO:
         pass
@@ @@ -609,13 +609,13 @@ class _BaseTestCase(TestController): @@
                                                 _authentication_token=self.authentication_token()))
         self.checkSessionFlash(response,
                                'Error creating repository %s' % repo_name)
         # repo must not be in db
         repo = Repository.get_by_repo_name(repo_name)
-        assert repo == None
+        assert repo is None
         # repo must not be in filesystem !
         assert not os.path.isdir(os.path.join(Ui.get_by_key('paths', '/').ui_value, repo_name))
 class TestAdminReposControllerGIT(_BaseTestCase):

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ class TestAdminUsersGroupsController(Tes @@
         response = self.app.post(url('delete_users_group', id=gr.users_group_id),
             params={'_authentication_token': self.authentication_token()})
         gr = Session().query(UserGroup) \
             .filter(UserGroup.users_group_name == users_group_name).scalar()
-        assert gr == None
+        assert gr is None
     def test_default_perms_enable_repository_read_on_group(self):
         self.log_user()
         users_group_name = TEST_USER_GROUP + 'another2'
         response = self.app.post(url('users_groups'),
                                  {'users_group_name': users_group_name,
@@ @@ -120,13 +120,13 @@ class TestAdminUsersGroupsController(Tes @@
         response = self.app.post(url('delete_users_group', id=ug.users_group_id),
             params={'_authentication_token': self.authentication_token()})
         response = response.follow()
         gr = Session().query(UserGroup) \
             .filter(UserGroup.users_group_name == users_group_name).scalar()
-        assert gr == None
+        assert gr is None
         p = Permission.get_by_key('hg.create.repository')
         perms = UserGroupToPerm.query() \
             .filter(UserGroupToPerm.users_group_id == ugid).all()
         perms = [[x.users_group_id,
                   x.permission_id, ] for x in perms]
         assert perms == []
@@ @@ -188,13 +188,13 @@ class TestAdminUsersGroupsController(Tes @@
             params={'_authentication_token': self.authentication_token()})
         response = response.follow()
         gr = Session().query(UserGroup) \
                            .filter(UserGroup.users_group_name ==
                                    users_group_name).scalar()
-        assert gr == None
+        assert gr is None
         p = Permission.get_by_key('hg.fork.repository')
         perms = UserGroupToPerm.query() \
             .filter(UserGroupToPerm.users_group_id == ugid).all()
         perms = [[x.users_group_id,
                   x.permission_id, ] for x in perms]
         assert perms == []

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -340,13 +340,13 @@ class TestLoginController(TestController @@
         ret = Session().query(User).filter(User.username == 'test_regular4').one()
         assert ret.username == username
         assert check_password(password, ret.password) == True
         assert ret.email == email
         assert ret.name == name
         assert ret.lastname == lastname
-        assert ret.api_key != None
+        assert ret.api_key is not None
         assert ret.admin == False
     #==========================================================================
     # PASSWORD RESET
     #==========================================================================

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

@@ @@ -154,13 +154,13 @@ class TestPullrequestsController(TestCon @@
                                   '_authentication_token': self.authentication_token(),
                                  },
                                 status=302)
         # location is of the form:
         # http://localhost/vcs_test_hg/pull-request/54/_/title
         m = re.search('/pull-request/(\d+)/', response.location)
-        assert m != None
+        assert m is not None
         pull_request_id = m.group(1)
         # update it
         response = self.app.post(url(controller='pullrequests', action='post',
                                      repo_name=HG_REPO, pull_request_id=pull_request_id),
+                                 {
@@ @@ -190,13 +190,13 @@ class TestPullrequestsController(TestCon @@
                                   '_authentication_token': self.authentication_token(),
                                  },
                                 status=302)
         # location is of the form:
         # http://localhost/vcs_test_hg/pull-request/54/_/title
         m = re.search('/pull-request/(\d+)/', response.location)
-        assert m != None
+        assert m is not None
         pull_request_id = m.group(1)
         # edit it
         response = self.app.post(url(controller='pullrequests', action='post',
                                      repo_name=HG_REPO, pull_request_id=pull_request_id),
+                                 {

kallithea/tests/models/test_permissions.py

➞

Show inline comments

@@ @@ -681,14 +681,14 @@ class TestPermissions(TestController): @@
     def test_set_default_permissions_after_modification(self, perm, modify_to):
         PermissionModel().create_default_permissions(user=self.u1)
         self._test_def_perm_equal(user=self.u1)
         old = Permission.get_by_key(perm)
         new = Permission.get_by_key(modify_to)
         assert old != None
         assert new != None
         assert old is not None
         assert new is not None
         # now modify permissions
         p = UserToPerm.query() \
                 .filter(UserToPerm.user == self.u1) \
                 .filter(UserToPerm.permission == old) \
                 .one()

kallithea/tests/models/test_repo_groups.py

➞

Show inline comments

@@ @@ -82,35 +82,35 @@ class TestRepoGroups(TestController): @@
         assert self.__check_path('test1', 'sub1', 'subsub1')
     def test_remove_group(self):
         sg1 = fixture.create_repo_group(u'deleteme')
         self.__delete_group(sg1.group_id)
-        assert RepoGroup.get(sg1.group_id) == None
+        assert RepoGroup.get(sg1.group_id) is None
         assert not self.__check_path('deteteme')
         sg1 = fixture.create_repo_group(u'deleteme', parent_group_id=self.g1.group_id)
         self.__delete_group(sg1.group_id)
-        assert RepoGroup.get(sg1.group_id) == None
+        assert RepoGroup.get(sg1.group_id) is None
         assert not self.__check_path('test1', 'deteteme')
     def test_rename_single_group(self):
         sg1 = fixture.create_repo_group(u'initial')
         new_sg1 = _update_repo_group(sg1.group_id, u'after')
         assert self.__check_path('after')
-        assert RepoGroup.get_by_group_name(u'initial') == None
+        assert RepoGroup.get_by_group_name(u'initial') is None
     def test_update_group_parent(self):
         sg1 = fixture.create_repo_group(u'initial', parent_group_id=self.g1.group_id)
         new_sg1 = _update_repo_group(sg1.group_id, u'after', parent_id=self.g1.group_id)
         assert self.__check_path('test1', 'after')
-        assert RepoGroup.get_by_group_name(u'test1/initial') == None
+        assert RepoGroup.get_by_group_name(u'test1/initial') is None
         new_sg1 = _update_repo_group(sg1.group_id, u'after', parent_id=self.g3.group_id)
         assert self.__check_path('test3', 'after')
         assert RepoGroup.get_by_group_name(u'test3/initial') == None
         new_sg1 = _update_repo_group(sg1.group_id, u'hello')

kallithea/tests/models/test_repos.py

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ class TestRepos(TestController): @@
         repo = fixture.create_repo(name=u'test-repo-1')
         Session().commit()
         RepoModel().delete(repo=repo)
         Session().commit()
-        assert None == Repository.get_by_repo_name(repo_name=u'test-repo-1')
+        assert Repository.get_by_repo_name(repo_name=u'test-repo-1') is None
     def test_remove_repo_repo_raises_exc_when_attached_forks(self):
         repo = fixture.create_repo(name=u'test-repo-1')
         Session().commit()
         fixture.create_fork(repo.repo_name, u'test-repo-fork-1')
@@ @@ -49,15 +49,15 @@ class TestRepos(TestController): @@
         fixture.create_fork(fork.repo_name, u'test-repo-fork-fork-1')
         Session().commit()
         RepoModel().delete(repo=repo, forks='delete')
         Session().commit()
         assert None == Repository.get_by_repo_name(repo_name=u'test-repo-1')
         assert None == Repository.get_by_repo_name(repo_name=u'test-repo-fork-1')
         assert None == Repository.get_by_repo_name(repo_name=u'test-repo-fork-fork-1')
         assert Repository.get_by_repo_name(repo_name=u'test-repo-1') is None
         assert Repository.get_by_repo_name(repo_name=u'test-repo-fork-1') is None
         assert Repository.get_by_repo_name(repo_name=u'test-repo-fork-fork-1') is None
     def test_remove_repo_detach_forks(self):
         repo = fixture.create_repo(name=u'test-repo-1')
         Session().commit()
         fork = fixture.create_fork(repo.repo_name, u'test-repo-fork-1')
@@ @@ -68,13 +68,13 @@ class TestRepos(TestController): @@
         Session().commit()
         RepoModel().delete(repo=repo, forks='detach')
         Session().commit()
         try:
             assert None == Repository.get_by_repo_name(repo_name=u'test-repo-1')
             assert None != Repository.get_by_repo_name(repo_name=u'test-repo-fork-1')
             assert None != Repository.get_by_repo_name(repo_name=u'test-repo-fork-fork-1')
             assert Repository.get_by_repo_name(repo_name=u'test-repo-1') is None
             assert Repository.get_by_repo_name(repo_name=u'test-repo-fork-1') is not None
             assert Repository.get_by_repo_name(repo_name=u'test-repo-fork-fork-1') is not None
         finally:
             RepoModel().delete(repo=u'test-repo-fork-fork-1')
             RepoModel().delete(repo=u'test-repo-fork-1')
             Session().commit()

kallithea/tests/models/test_users.py

➞

Show inline comments

@@ @@ -87,19 +87,18 @@ class TestUser(TestController): @@
         assert usr.username == u.username
         u = User.get_by_email(email='main_email2@example.com')
         assert usr.user_id == u.user_id
         assert usr.username == u.username
         u = User.get_by_email(email='main_email3@example.com')
-        assert None == u
+        assert u is None
         u = User.get_by_email(email='main_e%ail@example.com')
-        assert None == u
+        assert u is None
         u = User.get_by_email(email='main_emai_@example.com')
         assert None == u
         assert u is None
         UserModel().delete(usr.user_id)
         Session().commit()
 class TestUsers(TestController):

kallithea/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -100,13 +100,13 @@ class TestRepoGroups(TestController): @@
                                         })
         model.delete(gr)
     def test_ValidPassword(self):
         validator = v.ValidPassword()
         assert 'lol' == validator.to_python('lol')
-        assert None == validator.to_python(None)
+        assert validator.to_python(None) is None
         with pytest.raises(formencode.Invalid):
             validator.to_python('ąćżź')
     def test_ValidPasswordsMatch(self):
         validator = v.ValidPasswordsMatch('new_password', 'password_confirmation')
         with pytest.raises(formencode.Invalid):

0 comments (0 inline, 0 general)