Minor code update and error management

Author: gsemet

guake/boxes.py

@@ -5,12 +5,12 @@
 import gi
 gi.require_version('Vte', '2.91')  # vte-0.42
 gi.require_version('Gtk', '3.0')
+from gi.repository import GLib
+from gi.repository import GObject
 from gi.repository import Gdk
 from gi.repository import Gio
 from gi.repository import Gtk
 from gi.repository import Vte
-from gi.repository import GLib
-from gi.repository import GObject
 
 from guake.callbacks import MenuHideCallback
 from guake.callbacks import TerminalContextMenuCallbacks
@@ -21,7 +21,6 @@
 from guake.utils import TabNameUtils
 from guake.utils import save_tabs_when_changed
 
-
 log = logging.getLogger(__name__)
 
 # TODO remove calls to guake
@@ -118,34 +117,29 @@ def _add_search_box(self):
             b'#search-frame border {'
             b'    padding: 5px 5px 5px 5px;'
             b'    background-color: #CFCFCF;'
-            b'}')
+            b'}'
+        )
         Gtk.StyleContext.add_provider_for_screen(
-            Gdk.Screen.get_default(),
-            css_provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+            Gdk.Screen.get_default(), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+        )
 
         # Add to revealer
         self.search_revealer.add(self.search_frame)
         self.search_revealer.set_transition_duration(500)
-        self.search_revealer.set_transition_type(
-            Gtk.RevealerTransitionType.CROSSFADE)
+        self.search_revealer.set_transition_type(Gtk.RevealerTransitionType.CROSSFADE)
         self.search_revealer.set_valign(Gtk.Align.END)
         self.search_revealer.set_halign(Gtk.Align.END)
 
         # Welcome to the overlay
         self.add_overlay(self.search_revealer)
 
         # Events
-        self.search_entry.connect('key-press-event',
-                                  self.on_search_entry_keypress)
+        self.search_entry.connect('key-press-event', self.on_search_entry_keypress)
         self.search_entry.connect('changed', self.do_search)
         self.search_entry.connect('activate', self.do_search)
-        self.search_entry.connect('focus-out-event',
-                                  self.on_search_entry_focus_out_event)
-        self.search_next_btn.connect('clicked',
-                                     self.on_search_next_clicked)
-        self.search_prev_btn.connect('clicked',
-                                     self.on_search_prev_clicked)
+        self.search_entry.connect('focus-out-event', self.on_search_entry_focus_out_event)
+        self.search_next_btn.connect('clicked', self.on_search_next_clicked)
+        self.search_prev_btn.connect('clicked', self.on_search_prev_clicked)
         self.search_prev = False
 
     def get_terminals(self):
@@ -216,7 +210,8 @@ def show_search_box(self):
             self.search_entry.grab_focus()
             GObject.signal_handler_block(
                 self.get_notebook(),
-                self.get_notebook().notebook_on_button_press_id)
+                self.get_notebook().notebook_on_button_press_id
+            )
 
     def hide_search_box(self):
         if self.search_revealer.get_reveal_child():
@@ -225,7 +220,8 @@ def hide_search_box(self):
             self.last_terminal_focused.unselect_all()
             GObject.signal_handler_unblock(
                 self.get_notebook(),
-                self.get_notebook().notebook_on_button_press_id)
+                self.get_notebook().notebook_on_button_press_id
+            )
 
     def on_search_entry_focus_out_event(self, event, user_data):
         self.hide_search_box()

guake/guake_app.py

@@ -1150,37 +1150,49 @@ def save_tabs(self, filename='session.json'):
         for key, nb in self.notebook_manager.get_notebooks().items():
             tabs = []
             for index in range(nb.get_n_pages()):
-                page = nb.get_nth_page(index)
-                tabs.append({
-                    'directory': page.child.terminal.get_current_directory(),
-                    'label': nb.get_tab_text_index(index),
-                    'custom_label_set': getattr(page, 'custom_label_set', False)
-                })
+                try:
+                    page = nb.get_nth_page(index)
+                    tabs.append({
+                        'directory': page.child.terminal.get_current_directory(),
+                        'label': nb.get_tab_text_index(index),
+                        'custom_label_set': getattr(page, 'custom_label_set', False)
+                    })
+                except FileNotFoundError:
+                    # discard same broken tabs
+                    pass
             # NOTE: Maybe we will have frame inside the workspace in future
             #       So lets use list to store the tabs (as for each frame)
             config['workspace'][key] = [tabs]
 
-        with open(self.get_xdg_config_directory() / filename, 'w') as f:
+        if not self.get_xdg_config_directory().exists():
+            self.get_xdg_config_directory().mkdir(parents=True)
+        session_file = self.get_xdg_config_directory() / filename
+        with session_file.open('w') as f:
             json.dump(config, f, ensure_ascii=False, indent=4)
 
-        log.info('Guake tabs saved')
+        log.info('Guake tabs saved to %s', session_file)
 
     def restore_tabs(self, filename='session.json', suppress_notify=False):
-        path = self.get_xdg_config_directory() / filename
-        if not path.exists():
+        session_file = self.get_xdg_config_directory() / filename
+        if not session_file.exists():
             log.info('Cannot found tabs session.json file')
             return
-        with open(path) as f:
+        with session_file.open() as f:
             try:
                 config = json.load(f)
             except Exception:
                 log.warning('session.json is broken')
-                shutil.copy(path, self.get_xdg_config_directory() / '{}.bak'.format(filename))
+                shutil.copy(
+                    session_file,
+                    self.get_xdg_config_directory() / '{0}.bak'.format(filename)
+                )
                 img_filename = pixmapfile('guake-notification.png')
                 notifier.showMessage(
                     _('Guake Terminal'),
-                    _('Your session.json file is broken, backup to {}.bak'.format(filename)),
-                    img_filename)
+                    _('Your session.json file is broken, backup to {session_filename}.bak').format(
+                        session_filename=filename
+                    ), img_filename
+                )
                 return
 
         # Disable auto save tabs
@@ -1198,9 +1210,8 @@ def restore_tabs(self, filename='session.json', suppress_notify=False):
                 for tabs in frames:
                     for index, tab in enumerate(tabs):
                         nb.new_page_with_focus(
-                            tab['directory'],
-                            tab['label'],
-                            tab['custom_label_set'])
+                            tab['directory'], tab['label'], tab['custom_label_set']
+                        )
 
                     # Remove original pages in notebook
                     for i in range(current_pages):
@@ -1213,20 +1224,18 @@ def restore_tabs(self, filename='session.json', suppress_notify=False):
             img_filename = pixmapfile('guake-notification.png')
             notifier.showMessage(
                 _('Guake Terminal'),
-                _('Your session.json schema is broken, backup to {0}.bak,'
-                  'and error message has been saved to {0}.log.err'.format(filename)),
-                img_filename)
+                _(
+                    'Your session.json schema is broken, backup to {0}.bak,'
+                    'and error message has been saved to {0}.log.err'.format(filename)
+                ), img_filename
+            )
 
         # Reset auto save tabs
         self.settings.general.set_boolean('save-tabs-when-changed', v)
 
         # Notify the user
-        if (self.settings.general.get_boolean('restore-tabs-notify') and
-                not suppress_notify):
+        if (self.settings.general.get_boolean('restore-tabs-notify') and not suppress_notify):
             filename = pixmapfile('guake-notification.png')
-            notifier.showMessage(
-                _("Guake Terminal"),
-                _("Your tabs has been restored!"),
-                filename)
+            notifier.showMessage(_("Guake Terminal"), _("Your tabs has been restored!"), filename)
 
-        log.info('Guake tabs restored')
+        log.info('Guake tabs restored from %s', session_file)

guake/main.py

@@ -38,8 +38,8 @@
 
 from guake.globals import NAME
 from guake.globals import bindtextdomain
-from guake.utils import save_preferences
 from guake.utils import restore_preferences
+from guake.utils import save_preferences
 
 # When we are in the document generation on readthedocs, we do not have paths.py generated
 try:

guake/notebook.py

@@ -78,7 +78,8 @@ def __init__(self, *args, **kwargs):
         self.add_events(Gdk.EventMask.SCROLL_MASK)
         self.connect('scroll-event', self.scroll_callback.on_scroll)
         self.notebook_on_button_press_id = self.connect(
-            "button-press-event", self.on_button_press, None)
+            "button-press-event", self.on_button_press, None
+        )
 
         self.new_page_button = Gtk.Button(
             image=Gtk.Image.new_from_icon_name("tab-new", Gtk.IconSize.MENU), visible=True
@@ -137,7 +138,10 @@ def get_running_fg_processes_count(self):
     def get_running_fg_processes_count_page(self, index):
         total_procs = 0
         for terminal in self.get_terminals_for_page(index):
-            fdpty = terminal.get_pty().get_fd()
+            pty = terminal.get_pty()
+            if not pty:
+                continue
+            fdpty = pty.get_fd()
             term_pid = terminal.pid
             try:
                 fgpid = posix.tcgetpgrp(fdpty)
@@ -236,8 +240,7 @@ def terminal_attached(self, terminal):
         terminal.emit("focus", Gtk.DirectionType.TAB_FORWARD)
         self.emit('terminal-spawned', terminal, terminal.pid)
 
-    def new_page_with_focus(self, directory=None,
-                            label=None, user_set=False):
+    def new_page_with_focus(self, directory=None, label=None, user_set=False):
         box, page_num, terminal = self.new_page(directory)
         self.set_current_page(page_num)
         if not label:

guake/prefs.py

@@ -90,36 +90,28 @@
     {
         'label': _('General'),
         'key': 'general',
-        'keys': [
-            {
-                'key': 'show-hide',
-                'label': _('Toggle Guake visibility')
-            },
-            {
-                'key': 'show-focus',
-                'label': _('Show and focus Guake window')
-            },
-            {
-                'key': 'toggle-fullscreen',
-                'label': _('Toggle Fullscreen')
-            },
-            {
-                'key': 'toggle-hide-on-lose-focus',
-                'label': _('Toggle Hide on Lose Focus')
-            },
-            {
-                'key': 'quit',
-                'label': _('Quit')
-            },
-            {
-                'key': 'reset-terminal',
-                'label': _('Reset terminal')
-            },
-            {
-                'key': 'search-terminal',
-                'label': _('Search terminal')
-            }
-        ]
+        'keys': [{
+            'key': 'show-hide',
+            'label': _('Toggle Guake visibility')
+        }, {
+            'key': 'show-focus',
+            'label': _('Show and focus Guake window')
+        }, {
+            'key': 'toggle-fullscreen',
+            'label': _('Toggle Fullscreen')
+        }, {
+            'key': 'toggle-hide-on-lose-focus',
+            'label': _('Toggle Hide on Lose Focus')
+        }, {
+            'key': 'quit',
+            'label': _('Quit')
+        }, {
+            'key': 'reset-terminal',
+            'label': _('Reset terminal')
+        }, {
+            'key': 'search-terminal',
+            'label': _('Search terminal')
+        }]
     },
     {
         'label': _('Tab management'),

guake/tests/test_about.py

@@ -2,22 +2,27 @@
 # pylint: disable=redefined-outer-name
 
 import pytest
+import os
 
 from guake import guake_version
 from guake.about import AboutDialog
-from locale import gettext as _
 
 
 @pytest.fixture
 def dialog(mocker):
     mocker.patch('guake.simplegladeapp.Gtk.Widget.show_all')
-    ad = AboutDialog()
-    return ad
+    try:
+        old_os_environ = os.environ
+        os.environ["LANGUAGE"] = "en_US.UTF-8"
+        ad = AboutDialog()
+        yield ad
+    finally:
+        os.environ = old_os_environ
 
 
 def test_version_test(dialog):
     assert dialog.get_widget('aboutdialog').get_version() == guake_version()
 
 
 def test_title(dialog):
-    assert dialog.get_widget('aboutdialog').get_title() == _('About Guake')
+    assert dialog.get_widget('aboutdialog').get_title() == 'About Guake'

guake/tests/test_notebook.py

@@ -11,8 +11,7 @@ def nb(mocker):
     targets = [
         'guake.notebook.TerminalNotebook.terminal_spawn',
         'guake.notebook.TerminalNotebook.terminal_attached',
-        'guake.notebook.TerminalNotebook.guake',
-        'guake.notebook.TerminalBox.set_terminal'
+        'guake.notebook.TerminalNotebook.guake', 'guake.notebook.TerminalBox.set_terminal'
     ]
     for target in targets:
         mocker.patch(target, create=True)

guake/utils.py

@@ -40,7 +40,6 @@
 from guake.globals import ALIGN_TOP
 from guake.globals import ALWAYS_ON_PRIMARY
 
-
 log = logging.getLogger(__name__)
 
 
@@ -59,6 +58,7 @@ def get_server_time(widget):
 def save_tabs_when_changed(func):
     """Decorator for save-tabs-when-changed
     """
+
     def wrapper(*args, **kwargs):
         func(*args, **kwargs)
         log.debug("mom, I've been called: %s %s", func.__name__, func)
@@ -80,6 +80,7 @@ def wrapper(*args, **kwargs):
         # Tada!
         if g and g.settings.general.get_boolean('save-tabs-when-changed'):
             g.save_tabs()
+
     return wrapper
 
 
@@ -94,8 +95,7 @@ def restore_preferences(filename):
     # XXX: Hardcode?
     with open(filename, 'rb') as f:
         prefs = f.read()
-    p = subprocess.Popen(['dconf', 'load', '/apps/guake/'],
-                         stdin=subprocess.PIPE)
+    p = subprocess.Popen(['dconf', 'load', '/apps/guake/'], stdin=subprocess.PIPE)
     p.communicate(input=prefs)