Use super() for all class initializers instead

1.3
IceArmy 2011-09-12 22:27:04 -07:00
parent c7dafc8dcb
commit febf9a14f6
8 changed files with 11 additions and 10 deletions

View File

@ -26,7 +26,7 @@ from PyQt4.QtWebKit import QWebPage
class Config(QObject): class Config(QObject):
def __init__(self, parent, jsonFile): def __init__(self, parent, jsonFile):
QObject.__init__(self, parent) super(Config, self).__init__(parent)
with codecs.open(jsonFile, encoding='utf-8') as fd: with codecs.open(jsonFile, encoding='utf-8') as fd:
json = fd.read() json = fd.read()

View File

@ -23,7 +23,7 @@ from PyQt4.QtNetwork import QNetworkCookie, QNetworkCookieJar
class CookieJar(QNetworkCookieJar): class CookieJar(QNetworkCookieJar):
def __init__(self, parent, cookieFile): def __init__(self, parent, cookieFile):
QNetworkCookieJar.__init__(self, parent) super(CookieJar, self).__init__(parent)
self.m_cookieFile = cookieFile self.m_cookieFile = cookieFile

View File

@ -32,7 +32,8 @@ class CSConverter(QObject):
return cls._instance return cls._instance
def __init__(self): def __init__(self):
QObject.__init__(self, QApplication.instance()) super(CSConverter, self).__init__(QApplication.instance())
self.m_webPage = QWebPage(self) self.m_webPage = QWebPage(self)
converter = QFile(':/resources/coffee-script.js') converter = QFile(':/resources/coffee-script.js')

View File

@ -35,7 +35,7 @@ from plugincontroller import do_action
class File(QObject): class File(QObject):
def __init__(self, parent, openfile): def __init__(self, parent, openfile):
QObject.__init__(self, parent) super(File, self).__init__(parent)
self.m_file = openfile self.m_file = openfile
@ -118,7 +118,7 @@ class FileSystem(QObject):
return cls._instance return cls._instance
def __init__(self, parent): def __init__(self, parent):
QObject.__init__(self, parent) super(FileSystem, self).__init__(parent)
do_action('FileSystemInit') do_action('FileSystemInit')

View File

@ -32,7 +32,7 @@ class NetworkAccessManager(QNetworkAccessManager):
resourceRequested = pyqtSignal('QVariantMap') resourceRequested = pyqtSignal('QVariantMap')
def __init__(self, parent, auth, cookieFile, diskCacheEnabled, ignoreSslErrors, maxDiskCacheSize): def __init__(self, parent, auth, cookieFile, diskCacheEnabled, ignoreSslErrors, maxDiskCacheSize):
QNetworkAccessManager.__init__(self, parent) super(NetworkAccessManager, self).__init__(parent)
self.m_ignoreSslErrors = ignoreSslErrors self.m_ignoreSslErrors = ignoreSslErrors
self.m_idCounter = 0 self.m_idCounter = 0

View File

@ -22,7 +22,7 @@ from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
class NetworkReplyProxy(QNetworkReply): class NetworkReplyProxy(QNetworkReply):
def __init__(self, parent, reply): def __init__(self, parent, reply):
QNetworkReply.__init__(self, parent) super(NetworkReplyProxy, self).__init__(parent)
self.m_reply = reply self.m_reply = reply
self.m_buffer = self.m_data = '' self.m_buffer = self.m_data = ''

View File

@ -37,7 +37,7 @@ from encoding import Encode
class Phantom(QObject): class Phantom(QObject):
def __init__(self, parent, args): def __init__(self, parent, args):
QObject.__init__(self, parent) super(Phantom, self).__init__(parent)
# variable declarations # variable declarations
self.m_defaultPageSettings = {} self.m_defaultPageSettings = {}

View File

@ -35,7 +35,7 @@ from utils import injectJsInFrame
class CustomPage(QWebPage): class CustomPage(QWebPage):
def __init__(self, parent): def __init__(self, parent):
QWebPage.__init__(self, parent) super(CustomPage, self).__init__(parent)
self.m_parent = parent self.m_parent = parent
@ -74,7 +74,7 @@ class WebPage(QObject):
resourceRequested = pyqtSignal('QVariantMap') resourceRequested = pyqtSignal('QVariantMap')
def __init__(self, parent): def __init__(self, parent):
QObject.__init__(self, parent) super(WebPage, self).__init__(parent)
self.m_parent = parent self.m_parent = parent