Skip to content

Commit d4e5d0a

Browse files
committed
Fixing all linter errors
Using flake8
1 parent ca8c50e commit d4e5d0a

8 files changed

+501
-430
lines changed

gui.py

+36-37
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import ps2mc
1313
import wx
1414
from functools import partial
15-
import time
1615
from io import BytesIO
1716
import struct
1817
import sys
1918
import os
19+
2020
_SCCS_ID = "@(#) mymc gui.py 1.9 23/07/06 19:35:21\n"
2121

2222

@@ -26,15 +26,15 @@
2626

2727

2828
try:
29-
import ctypes
29+
import ctypes # noqa: F401
3030
import mymcicon
3131
D3DXVECTOR3 = mymcicon.D3DXVECTOR3
3232
D3DXVECTOR4 = mymcicon.D3DXVECTOR4
3333
D3DXVECTOR4_ARRAY3 = mymcicon.D3DXVECTOR4_ARRAY3
3434

35-
def mkvec4arr3(l):
35+
def mkvec4arr3(length):
3636
return D3DXVECTOR4_ARRAY3(*[D3DXVECTOR4(*vec)
37-
for vec in l])
37+
for vec in length])
3838
except ImportError:
3939
mymcicon = None
4040

@@ -172,7 +172,7 @@ def _update_dirtable(self, mc, dir):
172172
continue
173173
dirname = "/" + ent[8]
174174
s = mc.get_icon_sys(dirname)
175-
if s == None:
175+
if s is None:
176176
continue
177177
a = ps2save.unpack_icon_sys(s)
178178
size = mc.dir_size(dirname)
@@ -181,7 +181,7 @@ def _update_dirtable(self, mc, dir):
181181

182182
def update_dirtable(self, mc):
183183
self.dirtable = []
184-
if mc == None:
184+
if mc is None:
185185
return
186186
dir = mc.dir_open("/")
187187
try:
@@ -346,7 +346,7 @@ def append_menu_options(self, win, menu):
346346
def __init__(self, parent, focus):
347347
self.failed = False
348348
wx.Window.__init__(self, parent)
349-
if mymcicon == None:
349+
if mymcicon is None:
350350
self.failed = True
351351
return
352352
r = mymcicon.init_icon_renderer(focus.GetHandle(),
@@ -367,7 +367,7 @@ def __init__(self, parent, focus):
367367
self.Bind(wx.EVT_CONTEXT_MENU, self.evt_context_menu)
368368

369369
def __del__(self):
370-
if mymcicon != None:
370+
if mymcicon is not None:
371371
mymcicon.delete_icon_renderer()
372372

373373
def update_menu(self, menu):
@@ -383,7 +383,7 @@ def load_icon(self, icon_sys, icon):
383383
if self.failed:
384384
return
385385

386-
if icon_sys == None or icon == None:
386+
if icon_sys is None or icon is None:
387387
r = mymcicon.load_icon(None, 0, None, 0)
388388
else:
389389
r = mymcicon.load_icon(icon_sys, len(icon_sys),
@@ -498,15 +498,15 @@ def error_box(self, msg):
498498
def mc_error(self, value, filename=None):
499499
"""Display a message box for EnvironmentError exeception."""
500500

501-
if filename == None:
501+
if filename is None:
502502
filename = getattr(value, "filename")
503-
if filename == None:
503+
if filename is None:
504504
filename = self.mcname
505-
if filename == None:
505+
if filename is None:
506506
filename = "???"
507507

508508
strerror = getattr(value, "strerror", None)
509-
if strerror == None:
509+
if strerror is None:
510510
strerror = "unknown error"
511511

512512
return self.error_box(filename + ": " + strerror)
@@ -518,7 +518,7 @@ def __init__(self, parent, title, mcname=None):
518518
self.icon_win = None
519519

520520
size = (750, 350)
521-
if mymcicon == None:
521+
if mymcicon is None:
522522
size = (500, 350)
523523
wx.Frame.__init__(self, parent, wx.ID_ANY, title, size=size)
524524

@@ -580,7 +580,7 @@ def __init__(self, parent, title, mcname=None):
580580
self.evt_dirlist_item_focused,
581581
self.evt_dirlist_select,
582582
self.config)
583-
if mcname != None:
583+
if mcname is not None:
584584
self.open_mc(mcname)
585585
else:
586586
self.refresh()
@@ -590,14 +590,14 @@ def __init__(self, parent, title, mcname=None):
590590
sizer.AddSpacer(5)
591591

592592
icon_win = None
593-
if mymcicon != None:
593+
if mymcicon is not None:
594594
icon_win = icon_window(panel, self)
595595
if icon_win.failed:
596596
icon_win.Destroy()
597597
icon_win = None
598598
self.icon_win = icon_win
599599

600-
if icon_win == None:
600+
if icon_win is None:
601601
self.info1 = None
602602
self.info2 = None
603603
else:
@@ -633,17 +633,17 @@ def __init__(self, parent, title, mcname=None):
633633

634634
self.Show(True)
635635

636-
if self.mc == None:
636+
if self.mc is None:
637637
self.evt_cmd_open()
638638

639639
def _close_mc(self):
640-
if self.mc != None:
640+
if self.mc is not None:
641641
try:
642642
self.mc.close()
643643
except EnvironmentError as e:
644644
self.mc_error(e)
645645
self.mc = None
646-
if self.f != None:
646+
if self.f is not None:
647647
try:
648648
self.f.close()
649649
except EnvironmentError as e:
@@ -661,10 +661,10 @@ def refresh(self):
661661

662662
mc = self.mc
663663

664-
self.toolbar.EnableTool(self.ID_CMD_IMPORT, mc != None)
664+
self.toolbar.EnableTool(self.ID_CMD_IMPORT, mc is not None)
665665
self.toolbar.EnableTool(self.ID_CMD_EXPORT, False)
666666

667-
if mc == None:
667+
if mc is None:
668668
status = "No memory card image"
669669
else:
670670
free = mc.get_free_space() / 1024
@@ -675,15 +675,15 @@ def refresh(self):
675675
def open_mc(self, filename):
676676
self._close_mc()
677677
self.statusbar.SetStatusText("", 1)
678-
if self.icon_win != None:
678+
if self.icon_win is not None:
679679
self.icon_win.load_icon(None, None)
680680

681681
f = None
682682
try:
683683
f = open(filename, "r+b")
684684
mc = ps2mc.ps2mc(f)
685685
except EnvironmentError as e:
686-
if f != None:
686+
if f is not None:
687687
f.close()
688688
self.mc_error(e, filename)
689689
self.SetTitle(self.title)
@@ -697,16 +697,16 @@ def open_mc(self, filename):
697697
self.refresh()
698698

699699
def evt_menu_open(self, event):
700-
self.import_menu_item.Enable(self.mc != None)
701-
selected = self.mc != None and len(self.dirlist.selected) > 0
700+
self.import_menu_item.Enable(self.mc is not None)
701+
selected = self.mc is not None and len(self.dirlist.selected) > 0
702702
self.export_menu_item.Enable(selected)
703703
self.delete_menu_item.Enable(selected)
704704
self.ascii_menu_item.Check(self.config.get_ascii())
705-
if self.icon_win != None:
705+
if self.icon_win is not None:
706706
self.icon_win.update_menu(self.icon_menu)
707707

708708
def evt_dirlist_item_focused(self, event):
709-
if self.icon_win == None:
709+
if self.icon_win is None:
710710
return
711711

712712
mc = self.mc
@@ -732,7 +732,7 @@ def evt_dirlist_item_focused(self, event):
732732
self.icon_win.load_icon(icon_sys, icon)
733733

734734
def evt_dirlist_select(self, event):
735-
self.toolbar.EnableTool(self.ID_CMD_IMPORT, self.mc != None)
735+
self.toolbar.EnableTool(self.ID_CMD_IMPORT, self.mc is not None)
736736
self.toolbar.EnableTool(self.ID_CMD_EXPORT,
737737
len(self.dirlist.selected) > 0)
738738

@@ -745,14 +745,14 @@ def evt_cmd_open(self, event=None):
745745
if fn == "":
746746
return
747747
self.open_mc(fn)
748-
if self.mc != None:
748+
if self.mc is not None:
749749
dirname = os.path.dirname(fn)
750750
if os.path.isabs(dirname):
751751
self.config.set_memcard_dir(dirname)
752752

753753
def evt_cmd_export(self, event):
754754
mc = self.mc
755-
if mc == None:
755+
if mc is None:
756756
return
757757

758758
selected = self.dirlist.selected
@@ -851,7 +851,7 @@ def _do_import(self, fn):
851851
self.error_box(fn + ": Save file already present.")
852852

853853
def evt_cmd_import(self, event):
854-
if self.mc == None:
854+
if self.mc is None:
855855
return
856856

857857
dir = self.config.get_savefile_dir("")
@@ -862,7 +862,7 @@ def evt_cmd_import(self, event):
862862
"|All files|*.*"),
863863
style=(wx.FD_OPEN | wx.FD_MULTIPLE
864864
| wx.FD_FILE_MUST_EXIST))
865-
if fd == None:
865+
if fd is None:
866866
return
867867
r = fd.ShowModal()
868868
if r == wx.ID_CANCEL:
@@ -876,15 +876,15 @@ def evt_cmd_import(self, event):
876876
except EnvironmentError as e:
877877
self.mc_error(e, fn)
878878

879-
if success != None:
879+
if success is not None:
880880
dir = os.path.dirname(success)
881881
if os.path.isabs(dir):
882882
self.config.set_savefile_dir(dir)
883883
self.refresh()
884884

885885
def evt_cmd_delete(self, event):
886886
mc = self.mc
887-
if mc == None:
887+
if mc is None:
888888
return
889889

890890
selected = self.dirlist.selected
@@ -931,7 +931,6 @@ def run(filename=None):
931931
"""Display a GUI for working with memory card images."""
932932

933933
wx_app = wx.App()
934-
frame = gui_frame(None, "mymc", filename)
935934
return wx_app.MainLoop()
936935

937936

@@ -954,7 +953,7 @@ def run(filename=None):
954953
# for o in gc.garbage:
955954
# if type(o) == ps2mc.ps2mc_file:
956955
# for m in dir(o):
957-
# if getattr(o, m) == None:
956+
# if getattr(o, m) is None:
958957
# continue
959958
# if (m == "__del__"
960959
# or m == "__class__"

0 commit comments

Comments
 (0)