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

@@ @@ -319,8 +319,8 @@ class DbManage(object): @@
         """
         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)

kallithea/lib/ipaddr.py

➞

Show inline comments

@@ @@ -769,18 +769,17 @@ class _BaseNet(_IPAddrBase): @@
                 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)

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -142,7 +142,7 @@ class _BaseTestApi(object): @@
         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')
@@ @@ -998,7 +998,7 @@ class _BaseTestApi(object): @@
         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,
@@ @@ -1017,7 +1017,7 @@ class _BaseTestApi(object): @@
         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,
@@ @@ -1083,7 +1083,7 @@ class _BaseTestApi(object): @@
         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,
@@ @@ -1103,7 +1103,7 @@ class _BaseTestApi(object): @@
         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,

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -389,7 +389,7 @@ class _BaseTestCase(TestController): @@
         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
@@ @@ -439,7 +439,7 @@ class _BaseTestCase(TestController): @@
         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
@@ @@ -612,7 +612,7 @@ class _BaseTestCase(TestController): @@
                                '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))

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

@@ @@ -60,7 +60,7 @@ class TestAdminUsersGroupsController(Tes @@
         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()
@@ @@ -123,7 +123,7 @@ class TestAdminUsersGroupsController(Tes @@
         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()
@@ @@ -191,7 +191,7 @@ class TestAdminUsersGroupsController(Tes @@
                            .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()

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -343,7 +343,7 @@ class TestLoginController(TestController @@
         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
     #==========================================================================

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

@@ @@ -157,7 +157,7 @@ class TestPullrequestsController(TestCon @@
         # 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
@@ @@ -193,7 +193,7 @@ class TestPullrequestsController(TestCon @@
         # 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

kallithea/tests/models/test_permissions.py

➞

Show inline comments

@@ @@ -684,8 +684,8 @@ class TestPermissions(TestController): @@
         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() \

kallithea/tests/models/test_repo_groups.py

➞

Show inline comments

@@ @@ -85,13 +85,13 @@ class TestRepoGroups(TestController): @@
         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):
@@ @@ -99,7 +99,7 @@ class TestRepoGroups(TestController): @@
         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):
@@ @@ -107,7 +107,7 @@ class TestRepoGroups(TestController): @@
         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')

kallithea/tests/models/test_repos.py

➞

Show inline comments

@@ @@ -22,7 +22,7 @@ class TestRepos(TestController): @@
         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')
@@ @@ -52,9 +52,9 @@ class TestRepos(TestController): @@
         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')
@@ @@ -71,9 +71,9 @@ class TestRepos(TestController): @@
         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')

kallithea/tests/models/test_users.py

➞

Show inline comments

@@ @@ -90,13 +90,12 @@ class TestUser(TestController): @@
         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()

kallithea/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -103,7 +103,7 @@ class TestRepoGroups(TestController): @@
     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('ąćżź')

0 comments (0 inline, 0 general)