Code cleanp scan through
This commit is contained in:
@@ -19,7 +19,7 @@ def execute(
|
||||
|
||||
starting_files = settings_manager.get_starting_files()
|
||||
|
||||
if len(starting_files) == 0: return
|
||||
if not starting_files: return
|
||||
|
||||
file = starting_files.pop()
|
||||
file = file.replace("FILE|", "")
|
||||
@@ -31,7 +31,7 @@ def execute(
|
||||
(view, gfile, file)
|
||||
)
|
||||
|
||||
if len(starting_files) == 0: return
|
||||
if not starting_files: return
|
||||
|
||||
for file in starting_files:
|
||||
file = file.replace("FILE|", "")
|
||||
|
||||
@@ -101,7 +101,7 @@ class FilesController(ControllerBase, list):
|
||||
|
||||
eve = Event_Factory.create_event(
|
||||
"popped_file",
|
||||
view = view,
|
||||
view = event.view,
|
||||
file = popped_file,
|
||||
next_file = next_file
|
||||
)
|
||||
@@ -137,9 +137,9 @@ class FilesController(ControllerBase, list):
|
||||
def next_index(self, i):
|
||||
size = len(self)
|
||||
|
||||
if (i == 0) & (size >= 2):
|
||||
if (i == 0) and (size >= 2):
|
||||
j = i + 1
|
||||
elif (i == (size - 1)) & (size >= 2):
|
||||
elif (i == (size - 1)) and (size >= 2):
|
||||
j = i - 1
|
||||
elif (size - 1) == 0:
|
||||
j = -1
|
||||
|
||||
@@ -111,13 +111,13 @@ class KeyMapper:
|
||||
|
||||
def _set_key_state(self, eve):
|
||||
modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
|
||||
is_control = True if modifiers & Gdk.ModifierType.CONTROL_MASK else False
|
||||
is_shift = True if modifiers & Gdk.ModifierType.SHIFT_MASK else False
|
||||
is_control = modifiers & Gdk.ModifierType.CONTROL_MASK
|
||||
is_shift = modifiers & Gdk.ModifierType.SHIFT_MASK
|
||||
|
||||
try:
|
||||
is_alt = True if modifiers & Gdk.ModifierType.ALT_MASK else False
|
||||
except Exception:
|
||||
is_alt = True if modifiers & Gdk.ModifierType.MOD1_MASK else False
|
||||
is_alt = modifiers & Gdk.ModifierType.ALT_MASK
|
||||
except:
|
||||
is_alt = modifiers & Gdk.ModifierType.MOD1_MASK
|
||||
|
||||
self.state = NoKeyState
|
||||
if is_control:
|
||||
@@ -129,11 +129,11 @@ class KeyMapper:
|
||||
|
||||
def is_control(self, eve):
|
||||
modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
|
||||
return True if modifiers & Gdk.ModifierType.CONTROL_MASK else False
|
||||
return modifiers & Gdk.ModifierType.CONTROL_MASK
|
||||
|
||||
def is_shift(self, eve):
|
||||
modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
|
||||
return True if modifiers & Gdk.ModifierType.SHIFT_MASK else False
|
||||
return modifiers & Gdk.ModifierType.SHIFT_MASK
|
||||
|
||||
def get_raw_keyname(self, eve):
|
||||
return Gdk.keyval_name(eve.keyval)
|
||||
|
||||
@@ -26,8 +26,8 @@ class SourceViewDnDMixin:
|
||||
if info == 80:
|
||||
uris = data.get_uris()
|
||||
|
||||
if len(uris) == 0:
|
||||
uris = data.get_text().split("\n")
|
||||
if not uris: return
|
||||
uris = data.get_text().split("\n")
|
||||
|
||||
self._on_uri_data_received(uris)
|
||||
|
||||
@@ -35,6 +35,6 @@ class SourceViewDnDMixin:
|
||||
uri = uris.pop(0)
|
||||
self.command.exec_with_args("dnd_load_file_to_buffer", (self, uri))
|
||||
|
||||
if len(uris) == 0: return
|
||||
if not uris: return
|
||||
|
||||
self.command.exec_with_args("dnd_load_files", (self, uris))
|
||||
|
||||
@@ -71,6 +71,4 @@ class SourceBuffer(GtkSource.Buffer):
|
||||
self.disconnect(handle_id)
|
||||
|
||||
def __del__(self):
|
||||
for handle_id in self._handler_ids:
|
||||
self.disconnect(handle_id)
|
||||
|
||||
self.clear_signals()
|
||||
|
||||
@@ -17,7 +17,6 @@ class TabWidget(Gtk.Box):
|
||||
|
||||
self.file = None
|
||||
|
||||
self._close_tab = None
|
||||
self._handler_id = None
|
||||
self._eve_handler_id = None
|
||||
|
||||
@@ -63,7 +62,6 @@ class TabWidget(Gtk.Box):
|
||||
def clear_signals_and_data(self):
|
||||
self.close_bttn.disconnect(self._handler_id)
|
||||
self.event_box.disconnect(self._eve_handler_id)
|
||||
self._close_tab = None
|
||||
self._handler_id = None
|
||||
|
||||
for child in self.get_children():
|
||||
|
||||
Reference in New Issue
Block a user