Merge pull request #16 from fayvel/deprecated

Replace some deprecated python constructs + Fix PyQt elements search paths

Author: gen2brain

m64py

@@ -30,15 +30,15 @@ try:
     sip.setapi('QVariant', 2)
     from PyQt4.QtGui import QApplication
     from PyQt4.QtCore import Qt, QLocale, QTranslator
-except ImportError, err:
+except ImportError as err:
     sys.stderr.write("This application needs PyQt4 module%sError:%s%s" % (
         os.linesep, str(err), os.linesep))
     sys.exit(1)
 
 try:
     from m64py.loader import load_library
     from m64py.core.defs import FRONTEND_VERSION, LOGO
-except ImportError, err:
+except ImportError as err:
     sys.stderr.write("Can't import m64py modules%sError:%s%s" % (
         os.linesep, str(err), os.linesep))
     sys.exit(1)

src/m64py/core/config.py

@@ -60,7 +60,7 @@ def open_section(self, section=None):
         try:
             self.section = section
             self.parameters[self.section] = {}
-        except ValueError, err:
+        except ValueError as err:
             log.exception(str(err))
             return
         config_ptr = C.c_void_p()

src/m64py/core/core.py

@@ -91,7 +91,7 @@ def core_load(self, path=None):
                 self.check_version()
             else:
                 raise Exception("'%s' library not found." % self.core_name)
-        except Exception, err:
+        except Exception as err:
             self.m64p = None
             log.exception(str(err))
 
@@ -190,7 +190,7 @@ def plugin_get_version(self, handle, path):
             unload_library(handle)
             log.warn("library '%s' is invalid, no PluginGetVersion() function found." % (
                 os.path.basename(path)))
-        except OSError, err:
+        except OSError as err:
             log.debug("plugin_get_version()")
             log.warn(str(err))
         else:

src/m64py/core/vidext.py

@@ -51,7 +51,7 @@
             None, SDL_FULLSCREEN|SDL_HWSURFACE)]
     if SDL_WasInit(SDL_INIT_VIDEO):
         SDL_QuitSubSystem(SDL_INIT_VIDEO)
-except Exception, err:
+except Exception as err:
     log.warn(str(err))
     MODES = [(1920, 1440), (1600, 1200), (1400, 1050),
              (1280, 960), (1152, 864), (1024, 768),

src/m64py/frontend/joystick.py

@@ -91,7 +91,7 @@ def open(self, stick=0):
 
         try:
             self.joystick = SDL_JoystickOpen(stick)
-        except Exception, err:
+        except Exception as err:
             log.warn(str(err))
 
         if self.joystick:

src/m64py/frontend/romlist.py

@@ -229,7 +229,7 @@ def read_files(self):
                         crc = "%X%X" % (sl(rom_header.CRC1), sl(rom_header.CRC2))
                         self.roms.append((crc, rom_settings.goodname, fullpath, fname))
                 archive.close()
-            except Exception, err:
+            except Exception as err:
                 log.warn(str(err))
                 continue
             percent = float(filenum) / float(num_files) * 100

src/m64py/loader.py

@@ -83,7 +83,7 @@ def load(self, path):
                 return ctypes.CDLL(path, ctypes.RTLD_GLOBAL)
             else:
                 return ctypes.cdll.LoadLibrary(path)
-        except OSError, e:
+        except OSError as e:
             raise ImportError(e)
 
     def getpaths(self, libname):

src/m64py/screensaver.py

@@ -30,7 +30,7 @@ def __init__(self):
             import dbus
             self.screensaver = dbus.SessionBus().get_object(
                 "org.freedesktop.ScreenSaver", "/ScreenSaver")
-        except Exception, err:
+        except Exception as err:
             log.info("ScreenSaver not available: %s" % str(err))
 
     def disable(self):
@@ -39,7 +39,7 @@ def disable(self):
                 self.cookie = self.screensaver.Inhibit(
                     "M64Py", "Emulation started")
                 log.info("ScreenSaver disabled")
-            except Exception, err:
+            except Exception as err:
                 log.exception(str(err))
 
     def enable(self):
@@ -48,7 +48,7 @@ def enable(self):
                 self.screensaver.UnInhibit(self.cookie)
                 log.info("ScreenSaver enabled")
                 self.cookie = None
-            except Exception, err:
+            except Exception as err:
                 log.exception(str(err))
 
 
@@ -81,7 +81,7 @@ class WindowsScreenSaver:
     def __init__(self):
         try:
             self.sys_param_info = ctypes.windll.user32.SystemParametersInfoA
-        except Exception, err:
+        except Exception as err:
             log.info("ScreenSaver not available: %s" % str(err))
 
     def disable(self):

src/m64py/ui/input.ui

@@ -1459,7 +1459,7 @@ QGroupBox::title {
   <customwidget>
    <class>InputButton</class>
    <extends>QPushButton</extends>
-   <header>inputbutton.h</header>
+   <header location="global">m64py/ui/inputbutton.h</header>
   </customwidget>
  </customwidgets>
  <resources>

src/m64py/ui/romlist.ui

@@ -309,7 +309,7 @@ QGroupBox::title {
   <customwidget>
    <class>ImageView</class>
    <extends>QGraphicsView</extends>
-   <header location="global">imageview.h</header>
+   <header location="global">m64py/ui/imageview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>