Merge pull request #20 from fayvel/deprecated

Replace deprecated functionality with new ones

Author: gen2brain

setup.py

@@ -35,7 +35,7 @@ def compile_ui(self, ui_file):
         if not newer(ui_file, py_file):
             return
         fp = open(py_file, "w")
-        uic.compileUi(ui_file, fp)
+        uic.compileUi(ui_file, fp, from_imports = True)
         fp.close()
 
     def compile_rc(self, qrc_file):
@@ -47,7 +47,7 @@ def compile_rc(self, qrc_file):
         path = origpath.split(os.pathsep)
         path.append(dirname(PyQt4.__file__))
         os.putenv("PATH", os.pathsep.join(path))
-        if subprocess.call(["pyrcc4", qrc_file, "-o", py_file]) > 0:
+        if subprocess.call(["pyrcc4", "-py3", qrc_file, "-o", py_file]) > 0:
             self.warn("Unable to compile resource file %s" % qrc_file)
             if not os.path.exists(py_file):
                 sys.exit(1)

src/m64py/archive.py

@@ -21,6 +21,7 @@
 import shutil
 import tempfile
 from subprocess import Popen, PIPE
+import binascii
 
 from m64py.utils import which
 
@@ -47,9 +48,9 @@
 if HAS_7Z or LZMA_CMD: EXT_FILTER += " *.7z"
 
 ROM_TYPE = {
-    '80371240': 'z64 (native)',
-    '37804012': 'v64 (byteswapped)',
-    '40123780': 'n64 (wordswapped)'
+    b'80371240': 'z64 (native)',
+    b'37804012': 'v64 (byteswapped)',
+    b'40123780': 'n64 (wordswapped)'
 }
 
 
@@ -153,17 +154,17 @@ def get_filetype(self):
         fd = open(self.file, "rb")
         magic = fd.read(4)
         fd.close()
-        if magic == 'PK\03\04':
+        if magic == b'PK\03\04':
             return ZIP
-        elif magic.startswith('\037\213'):
+        elif magic.startswith(b'\037\213'):
             return GZIP
-        elif magic.startswith('BZh'):
+        elif magic.startswith(b'BZh'):
             return BZIP
-        elif magic == 'Rar!':
+        elif magic == b'Rar!':
             return RAR
-        elif magic == '7z\xbc\xaf':
+        elif magic == b'7z\xbc\xaf':
             return LZMA
-        elif magic.encode('hex') in ROM_TYPE.keys():
+        elif binascii.hexlify(magic) in ROM_TYPE.keys():
             return ROM
         return None
 

src/m64py/core/core.py

@@ -19,6 +19,7 @@
 import signal
 import ctypes as C
 import subprocess
+import binascii
 
 from m64py.core.defs import *
 from m64py.core.config import Config
@@ -295,7 +296,7 @@ def detach_plugins(self):
     def rom_open(self, romfile):
         """Reads in a binary ROM image"""
         self.rom_length = len(romfile)
-        self.rom_type = ROM_TYPE[romfile[:4].encode('hex')]
+        self.rom_type = ROM_TYPE[binascii.hexlify(romfile[:4])]
         romlength = C.c_int(self.rom_length)
         rombuffer = C.c_buffer(romfile)
         rval = self.m64p.CoreDoCommand(

src/m64py/core/vidext.py

@@ -16,7 +16,6 @@
 
 import ctypes
 
-from PyQt4.QtCore import SIGNAL
 from PyQt4.QtOpenGL import QGLFormat
 
 try:
@@ -116,13 +115,13 @@ def set_caption(self, title):
         """Sets the caption text of the
         emulator rendering window. """
         title = "M64Py :: %s" % title
-        self.parent.emit(SIGNAL("set_caption(PyQt_PyObject)"), title)
+        self.parent.set_caption.emit(title)
         return M64ERR_SUCCESS
 
     def toggle_fs(self):
         """Toggles between fullscreen and
         windowed rendering modes. """
-        self.widget.emit(SIGNAL("toggle_fs()"))
+        self.widget.toggle_fs.emit()
         return M64ERR_SUCCESS
 
     def gl_get_proc(self, proc):

src/m64py/frontend/glwidget.py

@@ -34,7 +34,7 @@ def __init__(self, parent):
         self.setContentsMargins(QMargins())
         self.setFocusPolicy(Qt.StrongFocus)
         self.setFocus(True)
-        self.connect(self, SIGNAL("toggle_fs()"), self.toggle_fullscreen)
+        self.toggle_fs.connect(self.toggle_fullscreen)
 
     def showEvent(self, event):
         self.setFocus(True)
@@ -47,15 +47,15 @@ def paintEvent(self, event):
         pass
 
     def mouseDoubleClickEvent(self, event):
-        self.emit(SIGNAL("toggle_fs()"))
+        self.toggle_fs.emit()
 
     def keyPressEvent(self, event):
         if self.worker.state == M64EMU_RUNNING:
             key = event.key()
             modifiers = event.modifiers()
             if modifiers & Qt.AltModifier and \
                     (key == Qt.Key_Enter or key == Qt.Key_Return):
-                self.emit(SIGNAL("toggle_fs()"))
+                self.toggle_fs.emit()
             elif key == Qt.Key_F3:
                 self.worker.save_title()
             elif key == Qt.Key_F4:

src/m64py/frontend/joystick.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from PyQt4.QtCore import QObject, pyqtSignal, QTime, QTimer, SIGNAL
+from PyQt4.QtCore import QObject, pyqtSignal, QTime, QTimer
 
 from m64py.opts import SDL2
 from m64py.frontend.log import log
@@ -81,7 +81,7 @@ def init(self):
                         self.joystick_names.append(SDL_JoystickNameForIndex(i))
                     else:
                         self.joystick_names.append(SDL_JoystickName(i))
-                self.connect(self.joystick_timer, SIGNAL("timeout()"), self.process_events)
+                self.joystick_timer.timeout.connect(self.process_events)
             else:
                 log.info("couldn't initialize SDL joystick support")
 
@@ -139,60 +139,45 @@ def process_events(self):
                 if moved != self.axes[i]:
                     delta_moved = abs(self.axes[i] - moved)
                     if delta_moved >= self.sensitivities[i]:
-                        self.emit(SIGNAL(
-                            "axis_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                            i, moved)
+                        self.axis_value_changed.emit(i, moved)
                     self.axes[i] = moved
                     self.axis_repeat_timers[i].restart()
                 elif self.auto_repeat and moved != 0:
                     if self.axis_repeat_timers[i].elapsed() >= self.auto_repeat_delay:
-                        self.emit(SIGNAL(
-                            "axis_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                            i, moved)
+                        self.axis_value_changed.emit(i, moved)
                         self.axes[i] = moved
                 else:
                     self.axis_repeat_timers[i].restart()
             else:
-                self.emit(SIGNAL(
-                    "axis_value_changed(int, int)"), i, 0)
+                self.axis_value_changed.emit(i, 0)
 
         for i in range(self.num_buttons):
             changed = SDL_JoystickGetButton(self.joystick, i)
             if changed != self.buttons[i]:
-                self.emit(SIGNAL(
-                    "button_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                    i, changed)
+                self.button_value_changed.emit(i, changed)
                 self.buttons[i] = changed
                 self.button_repeat_timers[i].restart()
             elif self.auto_repeat and changed != 0:
                 if self.button_repeat_timers[i].elapsed() >= self.auto_repeat_delay:
-                    self.emit(SIGNAL(
-                        "button_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                        i, changed)
+                    self.button_value_changed.emit(i, changed)
                     self.buttons[i] = changed
             else:
                 self.button_repeat_timers[i].restart()
 
         for i in range(self.num_hats):
             changed = SDL_JoystickGetHat(self.joystick, i)
             if changed != self.hats[i]:
-                self.emit(SIGNAL(
-                    "hat_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                    i, changed)
+                self.hat_value_changed.emit(i, changed)
                 self.hats[i] = changed
                 self.hat_repeat_timers[i].restart()
             elif self.auto_repeat and changed != 0:
                 if self.hat_repeat_timers[i].elapsed() >= self.auto_repeat_delay:
-                    self.emit(SIGNAL(
-                        "hat_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                        i, changed)
+                    self.hat_value_changed.emit(i, changed)
                     self.hats[i] = changed
             else:
                 self.hat_repeat_timers[i].restart()
 
         for i in range(self.num_trackballs):
             dx, dy = self.joystick.get_ball(i)
             if dx != 0 or dy != 0:
-                self.emit(SIGNAL(
-                    "trackball_value_changed(int, int, int)"),
-                    i, dx, dy)
+                self.trackball_value_changed.emit(i, dx, dy)

src/m64py/frontend/log.py

@@ -17,7 +17,7 @@
 import sys
 import logging
 
-from PyQt4.QtCore import pyqtSignal, SIGNAL
+from PyQt4.QtCore import pyqtSignal
 from PyQt4.QtGui import QDialog, QTextCursor
 
 from m64py.ui.logview_ui import Ui_LogView
@@ -32,8 +32,7 @@ def write(self, msg):
         if self.out:
             self.out.write(msg)
         if self.logview:
-            self.logview.emit(SIGNAL(
-                "msg_written(PyQt_PyObject)"), msg)
+            self.logview.msg_written.emit(msg)
 
 
 class LogView(QDialog, Ui_LogView):
@@ -43,8 +42,7 @@ def __init__(self, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
         self.textEdit.setReadOnly(True)
-        self.connect(self, SIGNAL(
-            "msg_written(PyQt_PyObject)"), self.on_msg_written)
+        self.msg_written.connect(self.on_msg_written)
 
     def on_msg_written(self, msg):
         self.textEdit.moveCursor(QTextCursor.End)