diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-15 12:01:03 -0300 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-15 12:01:03 -0300 |
| commit | 01580ad37a7d000045baccb0a67ebd1f8a4da8be (patch) | |
| tree | 1de9b1dfe51d92136bdaaeaddc547e316f11ed5c | |
| parent | d3d8c478101006b9874bfdffd2f7027d3a598629 (diff) | |
| parent | a0d827d28e7aba2e55be9b1cbf04292e6c385c34 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/pep-8-fixes' into develop
| -rw-r--r-- | src/leap/bitmask/app.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnprocess.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/util/leap_log_handler.py | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py index 75bf7123..40a77075 100644 --- a/src/leap/bitmask/app.py +++ b/src/leap/bitmask/app.py @@ -100,7 +100,8 @@ def add_logger_handlers(debug=False, logfile=None): logger = logging.getLogger(name='leap') logger.setLevel(level) - log_format = '%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s - %(levelname)s - %(message)s' + log_format = ('%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s ' + '- %(levelname)s - %(message)s') formatter = logging.Formatter(log_format) # Console handler diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index 2a03023b..77685cd3 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -427,7 +427,6 @@ class EIPStatusWidget(QtGui.QWidget): self._eip_status = 'ON' self._update_systray_tooltip() - self.set_eip_icon(selected_pixmap) self._systray.setIcon(QtGui.QIcon(selected_pixmap_tray)) self._eip_status_menu.setTitle(tray_message) diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py index 9baa4c53..19e1aa7b 100644 --- a/src/leap/bitmask/services/eip/vpnprocess.py +++ b/src/leap/bitmask/services/eip/vpnprocess.py @@ -739,7 +739,6 @@ class VPNManager(object): raise OpenVPNAlreadyRunning - class VPNProcess(protocol.ProcessProtocol, VPNManager): """ A ProcessProtocol class that can be used to spawn a process that will diff --git a/src/leap/bitmask/util/leap_log_handler.py b/src/leap/bitmask/util/leap_log_handler.py index 262f2f65..1ab62331 100644 --- a/src/leap/bitmask/util/leap_log_handler.py +++ b/src/leap/bitmask/util/leap_log_handler.py @@ -52,7 +52,8 @@ class LogHandler(logging.Handler): :param logging_level: the debug level to define the color. :type logging_level: str. """ - log_format = '%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s - %(levelname)s - %(message)s' + log_format = ('%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s ' + '- %(levelname)s - %(message)s') formatter = logging.Formatter(log_format) return formatter |