Merge authors:
Dimitri John Ledkov (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/pyflakes3/+merge/209419
proposed by: Dimitri John Ledkov (xnox)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1596 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Wed 2014-03-05 11:15:08 +0000
message:
* Merged lp:~xnox/upstart/pyflakes3.
modified:
scripts/pyupstart.py.in
scripts/tests/test_pyupstart_session_init.py
scripts/upstart-monitor.py
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'scripts/pyupstart.py.in'
--- scripts/pyupstart.py.in 2014-03-05 10:34:32 +0000
+++ scripts/pyupstart.py.in 2014-03-05 10:41:18 +0000
@@ -15,7 +15,6 @@
"""
import os
-import sys
import logging
import tempfile
import pyinotify
=== modified file 'scripts/tests/test_pyupstart_session_init.py'
--- scripts/tests/test_pyupstart_session_init.py 2014-03-05 10:34:32 +0000
+++ scripts/tests/test_pyupstart_session_init.py 2014-03-05 10:41:18 +0000
@@ -30,7 +30,6 @@
import os
import sys
import re
-import json
base_dir = os.path.abspath(os.path.dirname(__file__))
module_dir = os.path.normpath(os.path.realpath(base_dir + os.sep + '..'))
@@ -81,7 +80,7 @@
tmp = '{}{}{}'.format(DEFAULT_SESSION_INSTALL_PATH, os.sep, self.REEXEC_CONF)
if os.path.exists(tmp):
print('INFO: UPSTART_TEST_USE_INSTALLED_CONF set - using {} rather than {}'.format(tmp, self.reexec_conf))
- reexec_conf = tmp
+ self.reexec_conf = tmp
self.assertTrue(os.path.exists(self.file_bridge_conf))
self.assertTrue(os.path.exists(self.reexec_conf))
=== modified file 'scripts/upstart-monitor.py'
--- scripts/upstart-monitor.py 2013-03-28 09:52:16 +0000
+++ scripts/upstart-monitor.py 2014-03-05 10:41:18 +0000
@@ -40,6 +40,7 @@
import os
import sys
import gettext
+from gettext import gettext as _
import argparse
import signal
import dbus
@@ -58,7 +59,7 @@
cli = False
try:
- from gi.repository import Gtk, Gdk, GdkPixbuf, GLib
+ from gi.repository import Gtk, Gdk, GLib
except ImportError:
gettext.install(NAME)
print("%s: %s" % (_('WARNING'), _('GUI modules not available - falling back to CLI')), file=sys.stderr)
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
