kallithea Changeset - b84c83b651de

Changeset - b84c83b651de

Parent rev.

Child rev.

[Not reviewed]

beta

0 9 0

Marcin Kuzminski - 12 years ago 2013-05-22 03:15:44
marcin@python-works.com

replace equality comparision to None

9 files changed with 11 insertions and 11 deletions:

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

0 comments (0 inline, 0 general)

rhodecode/bin/ldap_sync.py

➞

Show inline comments

@@ @@ -76,13 +76,13 @@ class RhodecodeAPI(): @@
         response = urllib2.urlopen(req)
         response = json.load(response)
         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"]
     def create_group(self, name, active=True):
         """Create the Rhodecode user group."""

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -231,13 +231,13 @@ class ChangesetController(BaseRepoContro @@
                             c.rhodecode_db_repo.repo_id, changeset.raw_id,
                             with_revisions=True)
                 # from associated statuses, check the pull requests, and
                 # 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)
                 inlines = ChangesetCommentsModel()\
                             .get_inline_comments(c.rhodecode_db_repo.repo_id,
                                                  revision=changeset.raw_id)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -511,13 +511,13 @@ class DbManage(object): @@
                     ('ldap_tls_reqcert', ''), ('ldap_dn_user', ''),
                     ('ldap_dn_pass', ''), ('ldap_base_dn', ''),
                     ('ldap_filter', ''), ('ldap_search_scope', ''),
                     ('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)
             self.sa.add(setting)
     def create_default_options(self, skip_existing=False):
@@ @@ -527,13 +527,13 @@ class DbManage(object): @@
             ('default_repo_enable_locking',  False),
             ('default_repo_enable_downloads', False),
             ('default_repo_enable_statistics', False),
             ('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)
             self.sa.add(setting)
     def fixup_groups(self):

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -94,13 +94,13 @@ GIT_PROTO_PAT = re.compile(r'^/(.+)/(inf @@
 def is_git(environ):
     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
 class SimpleGit(BaseVCSController):

rhodecode/lib/rcmail/response.py

➞

Show inline comments

@@ @@ -84,13 +84,13 @@ class MailBase(object): @@
         self.headers[normalize_header(key)] = value
     def __delitem__(self, key):
         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."""
         return sorted(self.headers.keys())
     def attach_file(self, filename, data, ctype, disposition):
@@ @@ -385,13 +385,13 @@ class MIMEPart(MIMEBase): @@
             encoded = content.encode('utf-8')
             charset = 'utf-8'
         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']
         cdisp, cdisp_params = mail.content_encoding['Content-Disposition']
         assert ctype, ("Extract payload requires that mail.content_encoding "

rhodecode/lib/vcs/subprocessio.py

➞

Show inline comments

@@ @@ -365,13 +365,13 @@ class SubprocessIOChunker(object): @@
         # at this point it's still ambiguous if we are done reading or just full buffer.
         # Either way, if error (returned by ended process, or implied based on
         # 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:
                 pass
             bg_out.stop()
             bg_err.stop()

rhodecode/tests/functional/test_admin_settings.py

➞

Show inline comments

@@ @@ -249,13 +249,13 @@ class TestAdminSettingsController(TestCo @@
                                     id_fork_of=None
                                  ))
         repo = Repository.get_by_repo_name(HG_REPO)
         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()
         repo = Repository.get_by_repo_name(HG_REPO)
         response = self.app.put(url('repo_as_fork', repo_name=HG_REPO),
                                  params=dict(

rhodecode/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ class TestReposGroups(BaseTestCase): @@
         self.assertRaises(formencode.Invalid, validator.to_python, '.,')
         gr = fixture.create_user_group('test')
         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})
         self.assertRaises(formencode.Invalid, validator.to_python, 'test')
         self.assertRaises(formencode.Invalid, validator.to_python, 'TesT')

rhodecode/tests/scripts/test_concurency.py

➞

Show inline comments

@@ @@ -158,13 +158,13 @@ def get_anonymous_access(): @@
 # TESTS
 #==============================================================================
 def test_clone_with_credentials(no_errors=False, repo=HG_REPO, method=METHOD,
                                 seq=None, backend='hg'):
     cwd = path = jn(TESTS_TMP_PATH, repo)
-    if seq == None:
+    if seq is None:
         seq = _RandomNameSequence().next()
     try:
         shutil.rmtree(path, ignore_errors=True)
         os.makedirs(path)
         #print 'made dirs %s' % jn(path)

0 comments (0 inline, 0 general)