Mercurial > kallithea
changeset 3889:b84c83b651de beta
replace equality comparision to None
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 22 May 2013 03:15:44 +0200 |
| parents | 7aa0ff5b4e09 |
| children | f5a1314886ec |
| files | rhodecode/bin/ldap_sync.py rhodecode/controllers/changeset.py rhodecode/lib/db_manage.py rhodecode/lib/middleware/simplegit.py rhodecode/lib/rcmail/response.py rhodecode/lib/vcs/subprocessio.py rhodecode/tests/functional/test_admin_settings.py rhodecode/tests/other/test_validators.py rhodecode/tests/scripts/test_concurency.py |
| diffstat | 9 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/bin/ldap_sync.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/bin/ldap_sync.py Wed May 22 03:15:44 2013 +0200 @@ -79,7 +79,7 @@ if uid != response["id"]: raise InvalidResponseIDError("UUID does not match.") - if response["error"] != None: + if response["error"] is not None: raise RhodecodeResponseError(response["error"]) return response["result"]
--- a/rhodecode/controllers/changeset.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/controllers/changeset.py Wed May 22 03:15:44 2013 +0200 @@ -234,7 +234,7 @@ # show comments from them prs = set([x.pull_request for x in - filter(lambda x: x.pull_request != None, st)]) + filter(lambda x: x.pull_request is not None, st)]) for pr in prs: c.comments.extend(pr.comments)
--- a/rhodecode/lib/db_manage.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/lib/db_manage.py Wed May 22 03:15:44 2013 +0200 @@ -514,7 +514,7 @@ ('ldap_attr_login', ''), ('ldap_attr_firstname', ''), ('ldap_attr_lastname', ''), ('ldap_attr_email', '')]: - if skip_existing and RhodeCodeSetting.get_by_name(k) != None: + if skip_existing and RhodeCodeSetting.get_by_name(k) is not None: log.debug('Skipping option %s' % k) continue setting = RhodeCodeSetting(k, v) @@ -530,7 +530,7 @@ ('default_repo_private', False), ('default_repo_type', 'hg')]: - if skip_existing and RhodeCodeSetting.get_by_name(k) != None: + if skip_existing and RhodeCodeSetting.get_by_name(k) is not None: log.debug('Skipping option %s' % k) continue setting = RhodeCodeSetting(k, v)
--- a/rhodecode/lib/middleware/simplegit.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/lib/middleware/simplegit.py Wed May 22 03:15:44 2013 +0200 @@ -97,7 +97,7 @@ path_info = environ['PATH_INFO'] isgit_path = GIT_PROTO_PAT.match(path_info) log.debug('pathinfo: %s detected as GIT %s' % ( - path_info, isgit_path != None) + path_info, isgit_path is not None) ) return isgit_path
--- a/rhodecode/lib/rcmail/response.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/lib/rcmail/response.py Wed May 22 03:15:44 2013 +0200 @@ -87,7 +87,7 @@ del self.headers[normalize_header(key)] def __nonzero__(self): - return self.body != None or len(self.headers) > 0 or len(self.parts) > 0 + return self.body is not None or len(self.headers) > 0 or len(self.parts) > 0 def keys(self): """Returns the sorted keys.""" @@ -388,7 +388,7 @@ self.set_payload(encoded, charset=charset) def extract_payload(self, mail): - if mail.body == None: + if mail.body is None: return # only None, '' is still ok ctype, ctype_params = mail.content_encoding['Content-Type']
--- a/rhodecode/lib/vcs/subprocessio.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/lib/vcs/subprocessio.py Wed May 22 03:15:44 2013 +0200 @@ -368,7 +368,7 @@ # presence of stuff in stderr output) we error out. # Else, we are happy. _returncode = _p.poll() - if _returncode or (_returncode == None and bg_err.length): + if _returncode or (_returncode is None and bg_err.length): try: _p.terminate() except:
--- a/rhodecode/tests/functional/test_admin_settings.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/tests/functional/test_admin_settings.py Wed May 22 03:15:44 2013 +0200 @@ -252,7 +252,7 @@ repo2 = Repository.get_by_repo_name(GIT_REPO) self.checkSessionFlash(response, 'Marked repo %s as fork of %s' % (repo.repo_name, "Nothing")) - assert repo.fork == None + assert repo.fork is None def test_set_fork_of_same_repo(self): self.log_user()
--- a/rhodecode/tests/other/test_validators.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/tests/other/test_validators.py Wed May 22 03:15:44 2013 +0200 @@ -60,7 +60,7 @@ gr2 = fixture.create_user_group('tes2') Session().commit() self.assertRaises(formencode.Invalid, validator.to_python, 'test') - assert gr.users_group_id != None + assert gr.users_group_id is not None validator = v.ValidUserGroup(edit=True, old_data={'users_group_id': gr2.users_group_id})
--- a/rhodecode/tests/scripts/test_concurency.py Wed May 22 03:14:03 2013 +0200 +++ b/rhodecode/tests/scripts/test_concurency.py Wed May 22 03:15:44 2013 +0200 @@ -161,7 +161,7 @@ seq=None, backend='hg'): cwd = path = jn(TESTS_TMP_PATH, repo) - if seq == None: + if seq is None: seq = _RandomNameSequence().next() try: