PEP8: comparison to None, True, or False should use is/is not

This commit is contained in:
Labrys 2016-06-04 22:16:52 -04:00
commit 92ae852513
5 changed files with 11 additions and 11 deletions

View file

@ -46,7 +46,7 @@ class DBConnection:
return 0
def fetch(self, query, args=None):
if query == None:
if query is None:
return
sqlResult = None
@ -54,7 +54,7 @@ class DBConnection:
while attempt < 5:
try:
if args == None:
if args is None:
logger.log(self.filename + ": " + query, logger.DB)
cursor = self.connection.cursor()
cursor.execute(query)
@ -82,7 +82,7 @@ class DBConnection:
return sqlResult
def mass_action(self, querylist, logTransaction=False):
if querylist == None:
if querylist is None:
return
sqlResult = []
@ -123,7 +123,7 @@ class DBConnection:
return sqlResult
def action(self, query, args=None):
if query == None:
if query is None:
return
sqlResult = None
@ -131,7 +131,7 @@ class DBConnection:
while attempt < 5:
try:
if args == None:
if args is None:
logger.log(self.filename + ": " + query, logger.DB)
sqlResult = self.connection.execute(query)
else:
@ -158,7 +158,7 @@ class DBConnection:
sqlResults = self.action(query, args).fetchall()
if sqlResults == None:
if sqlResults is None:
return []
return sqlResults

View file

@ -1110,7 +1110,7 @@ def extractFiles(src, dst=None, keep_archive=None):
fullFileName = os.path.basename(inputFile)
archiveName = os.path.splitext(fullFileName)[0]
archiveName = re.sub(r"part[0-9]+", "", archiveName)
if not archiveName in extracted_archive or keep_archive == True:
if not archiveName in extracted_archive or keep_archive is True:
continue # don't remove if we haven't extracted this archive, or if we want to preserve them.
logger.info("Removing extracted archive %s from folder %s ..." % (fullFileName, folder))
try:

View file

@ -461,7 +461,7 @@ def test():
assert loads(dumps(L)) == L
L = tuple(['a' * n for n in range(1000)]) + (None, True, None)
assert loads(dumps(L)) == L
assert loads(dumps(None)) == None
assert loads(dumps(None)) is None
assert loads(dumps({None: None})) == {None: None}
assert 1e-10 < abs(loads(dumps(1.1)) - 1.1) < 1e-6
assert 1e-10 < abs(loads(dumps(1.1, 32)) - 1.1) < 1e-6

View file

@ -111,7 +111,7 @@ def parse_torrent_ids(args):
ids.extend(parse_torrent_ids(item))
else:
torrent_id = parse_torrent_id(args)
if torrent_id == None:
if torrent_id is None:
raise ValueError('Invalid torrent id')
else:
ids = [torrent_id]

View file

@ -267,7 +267,7 @@ class Torrent(object):
self._fields['downloadLimited'] = Field(True, True)
self._fields['downloadLimit'] = Field(limit, True)
self._push()
elif limit == None:
elif limit is None:
self._fields['downloadLimited'] = Field(False, True)
self._push()
else:
@ -426,7 +426,7 @@ class Torrent(object):
self._fields['uploadLimited'] = Field(True, True)
self._fields['uploadLimit'] = Field(limit, True)
self._push()
elif limit == None:
elif limit is None:
self._fields['uploadLimited'] = Field(False, True)
self._push()
else: