Fix comparisons to None

Diff checked manually.

autopep8 -a -ir -j2 --select=E711 .

This required the "agressive" option because it can change code
behavior.
This commit is contained in:
Laurent Bachelier 2013-03-15 20:20:35 +01:00
commit e0542c2e4a
14 changed files with 27 additions and 27 deletions

View file

@ -74,7 +74,7 @@ class ImdbBackend(BaseBackend, ICapCinema):
or 'death_date' in fields or 'nationality' in fields\
or 'short_biography' in fields or 'roles' in fields\
or 'birth_date' in fields or 'thumbnail_url' in fields\
or 'gender' in fields or fields == None:
or 'gender' in fields or fields is None:
per = self.get_person(person.id)
person.real_name = per.real_name
person.birth_date = per.birth_date

View file

@ -89,7 +89,7 @@ class ImdbBrowser(BaseBrowser):
def get_movie(self, id):
res = self.readurl('http://imdbapi.org/?id=%s&type=json&plot=simple&episode=1&lang=en-US&aka=full&release=simple&business=0&tech=0' % id )
if res != None:
if res is not None:
jres = json.loads(res)
else:
return None

View file

@ -37,7 +37,7 @@ class ReleasePage(BasePage):
for a in links:
href = a.attrib.get('href','')
if href.strip('/').split('/')[0] == 'calendar' and\
(country_filter == None or href.split('region=')[-1].lower() == country_filter):
(country_filter is None or href.split('region=')[-1].lower() == country_filter):
country = a.text
td_date = self.parser.select(a.getparent().getparent().getparent(),'td')[1]
date_links = self.parser.select(td_date,'a')
@ -73,7 +73,7 @@ class MovieCrewPage(BasePage):
''' Page listing all the persons related to a movie
'''
def iter_persons(self, role_filter=None):
if (role_filter == None or (role_filter != None and role_filter == 'actor')):
if (role_filter is None or (role_filter is not None and role_filter == 'actor')):
tables = self.parser.select(self.document.getroot(),'table.cast')
if len(tables) > 0:
table = tables[0]
@ -97,7 +97,7 @@ class MovieCrewPage(BasePage):
for gloss_link in self.parser.select(self.document.getroot(),'table[cellspacing=1] h5 a'):
role = gloss_link.attrib.get('name','').rstrip('s')
if (role_filter == None or (role_filter != None and role == role_filter)):
if (role_filter is None or (role_filter is not None and role == role_filter)):
tbody = gloss_link.getparent().getparent().getparent().getparent()
for line in self.parser.select(tbody,'tr')[1:]:
for a in self.parser.select(line,'a'):
@ -217,7 +217,7 @@ class FilmographyPage(BasePage):
def iter_movies(self, role_filter=None):
for role_div in self.parser.select(self.document.getroot(),'div.filmo'):
role = self.parser.select(role_div,'h5 a',1).text.replace(':','')
if (role_filter == None or (role_filter != None and role.lower().strip() == role_filter))\
if (role_filter is None or (role_filter is not None and role.lower().strip() == role_filter))\
and role != 'In Development':
for a in self.parser.select(role_div,'ol > li > a'):
id = a.attrib.get('href','').strip('/').split('/')[-1]

View file

@ -59,9 +59,9 @@ class ImdbTest(BackendTest):
def test_get_person_biography(self):
bio = self.backend.get_person_biography('nm0223033')
assert bio != ''
assert bio != None
assert bio is not None
def test_get_movie_releases(self):
rel = self.backend.get_movie_releases('tt0079980')
assert rel != ''
assert rel != None
assert rel is not None