evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

per python docs http://docs.python.org/library/stdtypes.html, use != for not equal, rather than not x == y

Browse Source
This commit is contained in:
eblade 2009-03-26 14:57:40 -04:00
parent 6d4c812b51
commit b80a068795
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pyfpdb/Configuration.py
View File

@ -236,7 +236,7 @@ class Config:
# we check the existence of "file" and try to recover if it doesn't exist # we check the existence of "file" and try to recover if it doesn't exist
self.default_config_path = self.get_default_config_path() self.default_config_path = self.get_default_config_path()
if not file == None: # configuration file path has been passed if file != None: # configuration file path has been passed
if not os.path.exists(file): if not os.path.exists(file):
print "Configuration file %s not found. Using defaults." % (file) print "Configuration file %s not found. Using defaults." % (file)
sys.stderr.write("Configuration file %s not found. Using defaults." % (file)) sys.stderr.write("Configuration file %s not found. Using defaults." % (file))
@ -247,7 +247,7 @@ class Config:
if file == None: # no config file in the normal places if file == None: # no config file in the normal places
file = self.find_example_config() #Look for an example file to edit file = self.find_example_config() #Look for an example file to edit
if not file == None: if file != None:
pass pass
if file == None: # that didn't work either, just die if file == None: # that didn't work either, just die
@ -411,7 +411,7 @@ class Config:
return location_node return location_node
def save(self, file = None): def save(self, file = None):
if not file == None: if file != None:
f = open(file, 'w') f = open(file, 'w')
self.doc.writexml(f) self.doc.writexml(f)
f.close() f.close()
@ -476,18 +476,18 @@ class Config:
def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_user = None, def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_user = None,
db_pass = None, db_server = None, db_type = None): db_pass = None, db_server = None, db_type = None):
db_node = self.get_db_node(db_name) db_node = self.get_db_node(db_name)
if not db_node == None: if db_node != None:
if not db_ip == None: db_node.setAttribute("db_ip", db_ip) if db_ip != None: db_node.setAttribute("db_ip", db_ip)
if not db_user == None: db_node.setAttribute("db_user", db_user) if db_user != None: db_node.setAttribute("db_user", db_user)
if not db_pass == None: db_node.setAttribute("db_pass", db_pass) if db_pass != None: db_node.setAttribute("db_pass", db_pass)
if not db_server == None: db_node.setAttribute("db_server", db_server) if db_server != None: db_node.setAttribute("db_server", db_server)
if not db_type == None: db_node.setAttribute("db_type", db_type) if db_type != None: db_node.setAttribute("db_type", db_type)
if self.supported_databases.has_key(db_name): if self.supported_databases.has_key(db_name):
if not db_ip == None: self.supported_databases[db_name].dp_ip = db_ip if db_ip != None: self.supported_databases[db_name].dp_ip = db_ip
if not db_user == None: self.supported_databases[db_name].dp_user = db_user if db_user != None: self.supported_databases[db_name].dp_user = db_user
if not db_pass == None: self.supported_databases[db_name].dp_pass = db_pass if db_pass != None: self.supported_databases[db_name].dp_pass = db_pass
if not db_server == None: self.supported_databases[db_name].dp_server = db_server if db_server != None: self.supported_databases[db_name].dp_server = db_server
if not db_type == None: self.supported_databases[db_name].dp_type = db_type if db_type != None: self.supported_databases[db_name].dp_type = db_type
return return
def get_tv_parameters(self): def get_tv_parameters(self):
@ -615,19 +615,19 @@ class Config:
font = None, font_size = None): font = None, font_size = None):
"""Sets the specified site parameters for the specified site.""" """Sets the specified site parameters for the specified site."""
site_node = self.get_site_node(site_name) site_node = self.get_site_node(site_name)
if not db_node == None: if db_node != None:
if not converter == None: site_node.setAttribute("converter", converter) if converter != None: site_node.setAttribute("converter", converter)
if not decoder == None: site_node.setAttribute("decoder", decoder) if decoder != None: site_node.setAttribute("decoder", decoder)
if not hudbgcolor == None: site_node.setAttribute("hudbgcolor", hudbgcolor) if hudbgcolor != None: site_node.setAttribute("hudbgcolor", hudbgcolor)
if not hudfgcolor == None: site_node.setAttribute("hudfgcolor", hudfgcolor) if hudfgcolor != None: site_node.setAttribute("hudfgcolor", hudfgcolor)
if not hudopacity == None: site_node.setAttribute("hudopacity", hudopacity) if hudopacity != None: site_node.setAttribute("hudopacity", hudopacity)
if not screen_name == None: site_node.setAttribute("screen_name", screen_name) if screen_name != None: site_node.setAttribute("screen_name", screen_name)
if not site_path == None: site_node.setAttribute("site_path", site_path) if site_path != None: site_node.setAttribute("site_path", site_path)
if not table_finder == None: site_node.setAttribute("table_finder", table_finder) if table_finder != None: site_node.setAttribute("table_finder", table_finder)
if not HH_path == None: site_node.setAttribute("HH_path", HH_path) if HH_path != None: site_node.setAttribute("HH_path", HH_path)
if not enabled == None: site_node.setAttribute("enabled", enabled) if enabled != None: site_node.setAttribute("enabled", enabled)
if not font == None: site_node.setAttribute("font", font) if font != None: site_node.setAttribute("font", font)
if not font_size == None: site_node.setAttribute("font_size", font_size) if font_size != None: site_node.setAttribute("font_size", font_size)
return return
def get_aux_windows(self): def get_aux_windows(self):

2
pyfpdb/Tables.py
View File

@ -219,7 +219,7 @@ def discover_nt(c):
else: else:
tw.site = "Unknown" tw.site = "Unknown"
sys.stderr.write("Found unknown table = %s" % tw.title) sys.stderr.write("Found unknown table = %s" % tw.title)
if not tw.site == "Unknown": if tw.site != "Unknown":
eval("%s(tw)" % c.supported_sites[tw.site].decoder) eval("%s(tw)" % c.supported_sites[tw.site].decoder)
else: else:
tw.name = "Unknown" tw.name = "Unknown"