diff options
Diffstat (limited to 'FusionIcon/environment.py')
-rw-r--r-- | FusionIcon/environment.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/FusionIcon/environment.py b/FusionIcon/environment.py index 1c6432e..56a84df 100644 --- a/FusionIcon/environment.py +++ b/FusionIcon/environment.py @@ -65,7 +65,7 @@ Xgl: True in Xgl''' else: failsafe_str = '' - print ' * Detected Session: %s%s' %(failsafe_str, self.desktop) + print(' * Detected Session: %s%s' %(failsafe_str, self.desktop)) ## Save the output of glxinfo and xvinfo for later use: @@ -74,7 +74,7 @@ Xgl: True in Xgl''' if run(['which', 'glxinfo'], 'call', quiet=True) == 0: self.glxinfo = run('glxinfo', 'output') else: - raise SystemExit, ' * Error: glxinfo not installed!' + raise SystemExit(' * Error: glxinfo not installed!') # make a temp environment indirect_environ = os.environ.copy() @@ -84,7 +84,7 @@ Xgl: True in Xgl''' if run(['which', 'xvinfo'], 'call', quiet=True) == 0: self.xvinfo = run('xvinfo', 'output') else: - raise SystemExit, ' * Error: xvinfo not installed!' + raise SystemExit(' * Error: xvinfo not installed!') line = [l for l in self.glxinfo.splitlines() if 'client glx vendor string:' in l] if line: @@ -113,33 +113,33 @@ Xgl: True in Xgl''' # Check for Intel and export INTEL_BATCH if 'Intel' in self.glxinfo: - print ' * Intel detected, exporting: INTEL_BATCH=1' + print(' * Intel detected, exporting: INTEL_BATCH=1') os.environ['INTEL_BATCH'] = '1' # Check TFP and export LIBGL_ALWAYS_INDIRECT if needed if self.tfp != 'direct': - print ' * No %s with direct rendering context' %tfp + print(' * No %s with direct rendering context' %tfp) if self.tfp == 'indirect': - print ' ... present with indirect rendering, exporting: LIBGL_ALWAYS_INDIRECT=1' + print(' ... present with indirect rendering, exporting: LIBGL_ALWAYS_INDIRECT=1') os.environ['LIBGL_ALWAYS_INDIRECT'] = '1' else: - print ' ... nor with indirect rendering, this isn\'t going to work!' + print(' ... nor with indirect rendering, this isn\'t going to work!') # If using Xgl with a proprietary driver, exports LD_PRELOAD=<mesa libGL> if self.Xgl and self.glx_vendor != 'SGI': - print ' * Non-mesa driver on Xgl detected' - from data import mesa_libgl_locations + print(' * Non-mesa driver on Xgl detected') + from .data import mesa_libgl_locations location = [l for l in mesa_libgl_locations if os.path.exists(l)] if location: - print ' ... exporting: LD_PRELOAD=%s' %location[0] + print(' ... exporting: LD_PRELOAD=%s' %location[0]) os.environ['LD_PRELOAD'] = location[0] else: # kindly let the user know... but don't abort (maybe it will work :> ) - print ' ... no mesa libGL found for preloading, this may not work!' + print(' ... no mesa libGL found for preloading, this may not work!') # Check for nvidia on Xorg if not self.Xgl and self.glx_vendor == 'NVIDIA Corporation': - print ' * NVIDIA on Xorg detected, exporting: __GL_YIELD=NOTHING' + print(' * NVIDIA on Xorg detected, exporting: __GL_YIELD=NOTHING') os.environ['__GL_YIELD'] = 'NOTHING' env = Environment() |