Fix up most of the real platform.py pylint errors

This commit is contained in:
Dan Smith 2008-09-03 16:44:45 -07:00
parent 4da0251412
commit d867860b96
2 changed files with 62 additions and 61 deletions

View file

@ -55,7 +55,7 @@ disable-checker=SIMILARITIES
#enable-msg=
# Disable the message(s) with the given id(s).
disable-msg=W0142
disable-msg=W0142,C0111
[REPORTS]

View file

@ -44,11 +44,11 @@ class Platform:
return self._base
def log_dir(self):
dir = os.path.join(self.config_dir(), "logs")
if not os.path.isdir(dir):
os.mkdir(dir)
logdir = os.path.join(self.config_dir(), "logs")
if not os.path.isdir(logdir):
os.mkdir(logdir)
return dir
return logdir
def filter_filename(self, filename):
return filename
@ -76,63 +76,63 @@ class Platform:
def gui_open_file(self, start_dir=None):
import gtk
d = gtk.FileChooserDialog("Select a file to open",
None,
gtk.FILE_CHOOSER_ACTION_OPEN,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OPEN, gtk.RESPONSE_OK))
dlg = gtk.FileChooserDialog("Select a file to open",
None,
gtk.FILE_CHOOSER_ACTION_OPEN,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OPEN, gtk.RESPONSE_OK))
if start_dir and os.path.isdir(start_dir):
d.set_current_folder(start_dir)
dlg.set_current_folder(start_dir)
r = d.run()
f = d.get_filename()
d.destroy()
res = dlg.run()
fname = dlg.get_filename()
dlg.destroy()
if r == gtk.RESPONSE_OK:
return f
if res == gtk.RESPONSE_OK:
return fname
else:
return None
def gui_save_file(self, start_dir=None, default_name=None):
import gtk
d = gtk.FileChooserDialog("Save file as",
None,
gtk.FILE_CHOOSER_ACTION_SAVE,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_SAVE, gtk.RESPONSE_OK))
dlg = gtk.FileChooserDialog("Save file as",
None,
gtk.FILE_CHOOSER_ACTION_SAVE,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_SAVE, gtk.RESPONSE_OK))
if start_dir and os.path.isdir(start_dir):
d.set_current_folder(start_dir)
dlg.set_current_folder(start_dir)
if default_name:
d.set_current_name(default_name)
dlg.set_current_name(default_name)
r = d.run()
f = d.get_filename()
d.destroy()
res = dlg.run()
fname = dlg.get_filename()
dlg.destroy()
if r == gtk.RESPONSE_OK:
return f
if res == gtk.RESPONSE_OK:
return fname
else:
return None
def gui_select_dir(self, start_dir=None):
import gtk
d = gtk.FileChooserDialog("Choose folder",
None,
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_SAVE, gtk.RESPONSE_OK))
dlg = gtk.FileChooserDialog("Choose folder",
None,
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_SAVE, gtk.RESPONSE_OK))
if start_dir and os.path.isdir(start_dir):
d.set_current_folder(start_dir)
dlg.set_current_folder(start_dir)
r = d.run()
f = d.get_filename()
d.destroy()
res = dlg.run()
fname = dlg.get_filename()
dlg.destroy()
if r == gtk.RESPONSE_OK and os.path.isdir(f):
return f
if res == gtk.RESPONSE_OK and os.path.isdir(fname):
return fname
else:
return None
@ -186,11 +186,11 @@ class UnixPlatform(Platform):
def os_version_string(self):
try:
f = file("/etc/issue.net", "r")
ver = f.read().strip()
f.close()
issue = file("/etc/issue.net", "r")
ver = issue.read().strip()
issue.close()
ver = "%s - %s" % (os.uname()[0], ver)
except:
except Exception, e:
ver = " ".join(os.uname())
return ver
@ -224,41 +224,41 @@ class Win32Platform(Platform):
os.system("explorer %s" % path)
def list_serial_ports(self):
return ["COM%i" % x for x in range(1,8)]
return ["COM%i" % x for x in range(1, 8)]
def gui_open_file(self, start_dir=None):
import win32gui
try:
f, _, _ = win32gui.GetOpenFileNameW()
fname, _, _ = win32gui.GetOpenFileNameW()
except Exception, e:
print "Failed to get filename: %s" % e
return None
return str(f)
return str(fname)
def gui_save_file(self, start_dir=None, default_name=None):
import win32gui
try:
f, _, _ = win32gui.GetSaveFileNameW(File=default_name)
fname, _, _ = win32gui.GetSaveFileNameW(File=default_name)
except Exception, e:
print "Failed to get filename: %s" % e
return None
return str(f)
return str(fname)
def gui_select_dir(self, start_dir=None):
from win32com.shell import shell
try:
pidl, _, _ = shell.SHBrowseForFolder()
f = shell.SHGetPathFromIDList(pidl)
fname = shell.SHGetPathFromIDList(pidl)
except Exception, e:
print "Failed to get directory: %s" % e
return None
return str(f)
return str(fname)
def os_version_string(self):
import win32api
@ -287,17 +287,18 @@ def get_platform(basepath=None):
return PLATFORM
if __name__ == "__main__":
p = get_platform()
def do_test():
__pform = get_platform()
print "Config dir: %s" % p.config_dir()
print "Default dir: %s" % p.default_dir()
print "Log file (foo): %s" % p.log_file("foo")
print "Serial ports: %s" % p.list_serial_ports()
print "OS Version: %s" % p.os_version_string()
print "Config dir: %s" % __pform.config_dir()
print "Default dir: %s" % __pform.default_dir()
print "Log file (foo): %s" % __pform.log_file("foo")
print "Serial ports: %s" % __pform.list_serial_ports()
print "OS Version: %s" % __pform.os_version_string()
#__pform.open_text_file("d-rats.py")
#p.open_text_file("d-rats.py")
#print "Open file: %s" % __pform.gui_open_file()
#print "Save file: %s" % __pform.gui_save_file(default_name="Foo.txt")
print "Open folder: %s" % __pform.gui_select_dir("/tmp")
#print "Open file: %s" % p.gui_open_file()
#print "Save file: %s" % p.gui_save_file(default_name="Foo.txt")
print "Open folder: %s" % p.gui_select_dir("/tmp")
do_test()