Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <sascha-pgp@silbe.org>2010-02-07 13:13:01 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-02-07 13:13:01 (GMT)
commitb90bc3754f65530a9bee5e7d688ad0693b6537aa (patch)
treeab4ddcae2bdf9582709da1c190307da1b869565c
parent374fcd0ec733e964eb0a84305e15919780f61678 (diff)
pylint/PEP8 fixes
-rw-r--r--src/jarabe/util/emulator.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
index 8934f5e..491c968 100644
--- a/src/jarabe/util/emulator.py
+++ b/src/jarabe/util/emulator.py
@@ -62,10 +62,13 @@ def _run_xauth(display):
"""Set up Xauthority file for new display.
Returns name of Xauthority file."""
- xauth_file = os.environ.get('XAUTHORITY', os.path.expanduser('~/.Xauthority'))
+ # pylint: disable-msg=E1103,W0612
+ xauth_file = os.environ.get('XAUTHORITY',
+ os.path.expanduser('~/.Xauthority'))
host = _run_pipe(['uname', '-n']).strip()
cookie = _run_pipe(['mcookie']).strip()
- xauth_pipe = subprocess.Popen(['xauth', '-f', xauth_file], stdin=subprocess.PIPE, close_fds=True)
+ xauth_pipe = subprocess.Popen(['xauth', '-f', xauth_file],
+ stdin=subprocess.PIPE, close_fds=True)
xauth_pipe.communicate('add %(host)s:%(display)s . %(cookie)s\n'
'add %(host)s/unix:%(display)s . %(cookie)s\n' % locals())
return xauth_file
@@ -174,7 +177,6 @@ def _setup_env(display, scaling):
os.environ['SUGAR_SCALING'] = scaling
-
def _parse_args():
"""Parse command line arguments."""
parser = OptionParser()