important null check

This commit is contained in:
Mattias Andrée 2012-10-31 23:58:05 +01:00
parent 0facfd6c58
commit 8f30c75c1d

View file

@ -211,14 +211,14 @@ class Ponysay():
self.xponydirs = [] self.xponydirs = []
_ponydirs = share('ponies/') _ponydirs = share('ponies/')
for ponydir in _ponydirs: for ponydir in _ponydirs:
if os.path.isdir(ponydir) and (ponydir not in appendset): if (ponydir is not None) and os.path.isdir(ponydir) and (ponydir not in appendset):
self.xponydirs.append(ponydir) self.xponydirs.append(ponydir)
appendset.add(ponydir) appendset.add(ponydir)
appendset = set() appendset = set()
self.vtponydirs = [] self.vtponydirs = []
_ponydirs = share('ttyponies/') _ponydirs = share('ttyponies/')
for ponydir in _ponydirs: for ponydir in _ponydirs:
if os.path.isdir(ponydir) and (ponydir not in appendset): if (ponydir is not None) and os.path.isdir(ponydir) and (ponydir not in appendset):
self.vtponydirs.append(ponydir) self.vtponydirs.append(ponydir)
appendset.add(ponydir) appendset.add(ponydir)
@ -230,14 +230,14 @@ class Ponysay():
self.extraxponydirs = [] self.extraxponydirs = []
_extraponydirs = share('extraponies/') _extraponydirs = share('extraponies/')
for extraponydir in _extraponydirs: for extraponydir in _extraponydirs:
if os.path.isdir(extraponydir) and (extraponydir not in appendset): if (extraponydir is not None) and os.path.isdir(extraponydir) and (extraponydir not in appendset):
self.extraxponydirs.append(extraponydir) self.extraxponydirs.append(extraponydir)
appendset.add(extraponydir) appendset.add(extraponydir)
appendset = set() appendset = set()
self.extravtponydirs = [] self.extravtponydirs = []
_extraponydirs = share('extrattyponies/') _extraponydirs = share('extrattyponies/')
for extraponydir in _extraponydirs: for extraponydir in _extraponydirs:
if os.path.isdir(extraponydir) and (extraponydir not in appendset): if (extraponydir is not None) and os.path.isdir(extraponydir) and (extraponydir not in appendset):
self.extravtponydirs.append(extraponydir) self.extravtponydirs.append(extraponydir)
appendset.add(extraponydir) appendset.add(extraponydir)
@ -249,7 +249,7 @@ class Ponysay():
self.quotedirs = [] self.quotedirs = []
_quotedirs = share('quotes/') _quotedirs = share('quotes/')
for quotedir in _quotedirs: for quotedir in _quotedirs:
if os.path.isdir(quotedir) and (quotedir not in appendset): if (quotedir is not None) and os.path.isdir(quotedir) and (quotedir not in appendset):
self.quotedirs.append(quotedir) self.quotedirs.append(quotedir)
appendset.add(quotedir) appendset.add(quotedir)
@ -261,7 +261,7 @@ class Ponysay():
self.balloondirs = [] self.balloondirs = []
_balloondirs = share('balloons/') _balloondirs = share('balloons/')
for balloondir in _balloondirs: for balloondir in _balloondirs:
if os.path.isdir(balloondir) and (balloondir not in appendset): if (balloondir is not None) and os.path.isdir(balloondir) and (balloondir not in appendset):
self.balloondirs.append(balloondir) self.balloondirs.append(balloondir)
appendset.add(balloondir) appendset.add(balloondir)
@ -273,7 +273,7 @@ class Ponysay():
self.ucsmaps = [] self.ucsmaps = []
_ucsmaps = share('ucsmap/') _ucsmaps = share('ucsmap/')
for ucsmap in _ucsmaps: for ucsmap in _ucsmaps:
if os.path.isdir(ucsmap) and (ucsmap not in appendset): if (ucsmap is not None) and os.path.isdir(ucsmap) and (ucsmap not in appendset):
self.ucsmaps.append(ucsmap) self.ucsmaps.append(ucsmap)
appendset.add(ucsmap) appendset.add(ucsmap)