projects
/
grml-x.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tempfile.NamedTemporaryFile usage under Python 3
[grml-x.git]
/
grml-x
diff --git
a/grml-x
b/grml-x
index
554c2d2
..
7323991
100755
(executable)
--- a/
grml-x
+++ b/
grml-x
@@
-1,4
+1,4
@@
-#!/usr/bin/python
2.7
+#!/usr/bin/python
3
# -*- coding: utf-8 -*-
# vim: set et ts=4:
# -*- coding: utf-8 -*-
# vim: set et ts=4:
@@
-9,8
+9,6
@@
# License: This file is licensed under the GPL v2.
###############################################################################
# License: This file is licensed under the GPL v2.
###############################################################################
-# Requires python 2.6 or, possibly, a newer version of python 2.X.
-
import fileinput, os, subprocess, sys, tempfile, time, traceback
from optparse import OptionParser
import fileinput, os, subprocess, sys, tempfile, time, traceback
from optparse import OptionParser
@@
-26,7
+24,7
@@
class Section(object):
v = self.data[k]
if isinstance(v, list):
v = '" "'.join(v)
v = self.data[k]
if isinstance(v, list):
v = '" "'.join(v)
- elif not isinstance(v,
basestring
): # int, others
+ elif not isinstance(v,
str
): # int, others
v = str(v)
elif '-' in v: # sync range
pass
v = str(v)
elif '-' in v: # sync range
pass
@@
-65,12
+63,12
@@
def build_bootparams():
lines.extend(f.readlines())
f.close()
except:
lines.extend(f.readlines())
f.close()
except:
- print
'W: Error while getting bootparams from %s' % p
+ print
('W: Error while getting bootparams from %s' % p)
f = open('/proc/cmdline')
lines.append(f.readline())
f.close()
f = open('/proc/cmdline')
lines.append(f.readline())
f.close()
- walk_bootparams_path('/
cdro
m/bootparams')
- walk_bootparams_path('/
live/image
/bootparams')
+ walk_bootparams_path('/
lib/live/mount/mediu
m/bootparams')
+ walk_bootparams_path('/
run/live/medium
/bootparams')
params = {}
for p in ' '.join(lines).split(' '):
if '=' in p:
params = {}
for p in ' '.join(lines).split(' '):
if '=' in p:
@@
-147,12
+145,12
@@
def main():
bootparams = build_bootparams()
if os.getuid() == 0 and options.start_server:
bootparams = build_bootparams()
if os.getuid() == 0 and options.start_server:
- print
"W: running as root is unsupported and may not work."
+ print
("W: running as root is unsupported and may not work.")
time.sleep(1)
if not check_old_xorg_conf(options.xorg_conf, options.overwrite):
time.sleep(1)
if not check_old_xorg_conf(options.xorg_conf, options.overwrite):
- print
"E: Not overwriting existing %r without --force." % options.xorg_conf
- print
"I: If you previously ran grml-x, use startx /usr/bin/x-window-manager"
+ print
("E: Not overwriting existing %r without --force." % options.xorg_conf)
+ print
("I: If you previously ran grml-x, use startx /usr/bin/x-window-manager")
return 1
if 'xmode' in bootparams and not options.mode: options.mode = bootparams['xmode']
return 1
if 'xmode' in bootparams and not options.mode: options.mode = bootparams['xmode']
@@
-183,7
+181,7
@@
def main():
if len(args) == 1: window_manager = args[0]
window_manager_path = which(window_manager)
if not window_manager_path:
if len(args) == 1: window_manager = args[0]
window_manager_path = which(window_manager)
if not window_manager_path:
- print
"E: Cannot find window manager %r, aborting." % window_manager
+ print
("E: Cannot find window manager %r, aborting." % window_manager)
return 2
wm_exec = "exec %s\n" % window_manager_path
return 2
wm_exec = "exec %s\n" % window_manager_path
@@
-200,13
+198,13
@@
def main():
for line in lines:
if line.strip().startswith('exec '): line = wm_exec
f.write(line)
for line in lines:
if line.strip().startswith('exec '): line = wm_exec
f.write(line)
- os.fchmod(f.fileno(), 0750)
+ os.fchmod(f.fileno(), 0
o
750)
f.close()
# write new config
if monitor or device or len(screen.data) > 0 or screen.subsect != '':
try:
f.close()
# write new config
if monitor or device or len(screen.data) > 0 or screen.subsect != '':
try:
- f = tempfile.NamedTemporaryFile(delete=False)
+ f = tempfile.NamedTemporaryFile(
mode='w+',
delete=False)
f.write(XORG_CONF_HEADER + "\n")
f.write("# DO NOT MODIFY, YOUR CHANGES WILL BE LOST - OR REMOVE ALL HEADER LINES\n")
f.write("# See man xorg.conf or /etc/X11/xorg.conf.example for more\n")
f.write(XORG_CONF_HEADER + "\n")
f.write("# DO NOT MODIFY, YOUR CHANGES WILL BE LOST - OR REMOVE ALL HEADER LINES\n")
f.write("# See man xorg.conf or /etc/X11/xorg.conf.example for more\n")
@@
-214,7
+212,7
@@
def main():
if device: f.write(str(device))
f.write(str(screen))
f.flush()
if device: f.write(str(device))
f.write(str(screen))
f.flush()
- os.fchmod(f.fileno(), 0644)
+ os.fchmod(f.fileno(), 0
o
644)
run_program(['sudo', 'mv', '-f', f.name, options.xorg_conf])
finally:
f.close()
run_program(['sudo', 'mv', '-f', f.name, options.xorg_conf])
finally:
f.close()
@@
-222,7
+220,7
@@
def main():
if options.start_server:
startx = ['startx', xinitrc, '--']
if options.display: startx.append(':' + options.display)
if options.start_server:
startx = ['startx', xinitrc, '--']
if options.display: startx.append(':' + options.display)
- print
"Starting X: %r" % startx
+ print
("Starting X: %r" % startx)
run_program(startx)
return 0
run_program(startx)
return 0
@@
-232,7
+230,7
@@
if __name__ == '__main__':
try:
rc = main()
except Exception:
try:
rc = main()
except Exception:
- print
"E: Exception: ",
+ print
("E: Exception: ", end=' ')
traceback.print_exc()
sys.exit(1)
traceback.print_exc()
sys.exit(1)