Merge lp:~xnox/upstart/pyflakes3 into lp:upstart

Proposed by Dimitri John Ledkov on 2014-03-05
Status: Merged
Merged at revision: 1596
Proposed branch: lp:~xnox/upstart/pyflakes3
Merge into: lp:upstart
Diff against target: 53 lines (+3/-4)
3 files modified
scripts/pyupstart.py.in (+0/-1)
scripts/tests/test_pyupstart_session_init.py (+1/-2)
scripts/upstart-monitor.py (+2/-1)
To merge this branch: bzr merge lp:~xnox/upstart/pyflakes3
Reviewer Review Type Date Requested Status
James Hunt 2014-03-05 Approve on 2014-03-05
Review via email: mp+209419@code.launchpad.net
To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

Fix pyflakes3 warnings.

James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/pyupstart.py.in'
2--- scripts/pyupstart.py.in 2014-03-05 10:34:32 +0000
3+++ scripts/pyupstart.py.in 2014-03-05 10:51:44 +0000
4@@ -15,7 +15,6 @@
5 """
6
7 import os
8-import sys
9 import logging
10 import tempfile
11 import pyinotify
12
13=== modified file 'scripts/tests/test_pyupstart_session_init.py'
14--- scripts/tests/test_pyupstart_session_init.py 2014-03-05 10:34:32 +0000
15+++ scripts/tests/test_pyupstart_session_init.py 2014-03-05 10:51:44 +0000
16@@ -30,7 +30,6 @@
17 import os
18 import sys
19 import re
20-import json
21
22 base_dir = os.path.abspath(os.path.dirname(__file__))
23 module_dir = os.path.normpath(os.path.realpath(base_dir + os.sep + '..'))
24@@ -81,7 +80,7 @@
25 tmp = '{}{}{}'.format(DEFAULT_SESSION_INSTALL_PATH, os.sep, self.REEXEC_CONF)
26 if os.path.exists(tmp):
27 print('INFO: UPSTART_TEST_USE_INSTALLED_CONF set - using {} rather than {}'.format(tmp, self.reexec_conf))
28- reexec_conf = tmp
29+ self.reexec_conf = tmp
30
31 self.assertTrue(os.path.exists(self.file_bridge_conf))
32 self.assertTrue(os.path.exists(self.reexec_conf))
33
34=== modified file 'scripts/upstart-monitor.py'
35--- scripts/upstart-monitor.py 2013-03-28 09:52:16 +0000
36+++ scripts/upstart-monitor.py 2014-03-05 10:51:44 +0000
37@@ -40,6 +40,7 @@
38 import os
39 import sys
40 import gettext
41+from gettext import gettext as _
42 import argparse
43 import signal
44 import dbus
45@@ -58,7 +59,7 @@
46 cli = False
47
48 try:
49- from gi.repository import Gtk, Gdk, GdkPixbuf, GLib
50+ from gi.repository import Gtk, Gdk, GLib
51 except ImportError:
52 gettext.install(NAME)
53 print("%s: %s" % (_('WARNING'), _('GUI modules not available - falling back to CLI')), file=sys.stderr)

Subscribers

People subscribed via source and target branches