Replace python super with objc super for NSObjects

Author: adigeo

AccountSettings.py

@@ -45,7 +45,7 @@ def createWithOwner_(cls, owner):
         return w
 
     def initWithOwner_(self, owner):
-        self = super(AccountSettings, self).init()
+        self = objc.super(AccountSettings, self).init()
         if self:
             self.owner = owner
             NSBundle.loadNibNamed_owner_("AccountSettings", self)

AudioSession.py

@@ -56,7 +56,7 @@ def sessionControllersManager(self):
         return NSApp.delegate().contactsWindowController.sessionControllersManager
 
     def dealloc(self):
-        super(AudioSession, self).dealloc()
+        objc.super(AudioSession, self).dealloc()
 
     def acceptsFirstResponder(self):
         return True

BlinkAppDelegate.py

@@ -142,7 +142,7 @@ class BlinkAppDelegate(NSObject):
     terminating = False
 
     def init(self):
-        self = super(BlinkAppDelegate, self).init()
+        self = objc.super(BlinkAppDelegate, self).init()
         if self:
             self.applicationName = str(NSBundle.mainBundle().infoDictionary().objectForKey_("CFBundleExecutable"))
             self.applicationNamePrint = str(NSBundle.mainBundle().infoDictionary().objectForKey_("CFBundleName"))

ChatController.py

@@ -1824,7 +1824,7 @@ class OutgoingMessageHandler(NSObject):
     OTRNegotiationTimer = None
 
     def initWithView_(self, chatView):
-        self = super(OutgoingMessageHandler, self).init()
+        self = objc.super(OutgoingMessageHandler, self).init()
         if self:
             self.stream = None
             self.connected = None
@@ -1838,7 +1838,7 @@ def initWithView_(self, chatView):
 
     def dealloc(self):
         self.delegate = None
-        super(OutgoingMessageHandler, self).dealloc()
+        objc.super(OutgoingMessageHandler, self).dealloc()
 
     def close(self):
         self.stream = None

ChatPrivateMessageController.py

@@ -89,5 +89,5 @@ def cancelClicked_(self, sender):
         NSApp.stopModalWithCode_(NSCancelButton)
 
     def dealloc(self):
-        super(ChatPrivateMessageController, self).dealloc()
+        objc.super(ChatPrivateMessageController, self).dealloc()
 

ChatViewController.py

@@ -84,7 +84,7 @@ class ChatInputTextView(NSTextView):
     maxLength = None
 
     def dealloc(self):
-        super(ChatInputTextView, self).dealloc()
+        objc.super(ChatInputTextView, self).dealloc()
 
     def initWithRect_(self, rect):
         self = NSTextView.initWithRect_(self, rect)
@@ -156,12 +156,12 @@ def keyDown_(self, event):
             if keys[0] == 'i' and self.owner.delegate.sessionController.info_panel is not None:
                 self.owner.delegate.sessionController.info_panel.toggle()
         else:
-            super(ChatInputTextView, self).keyDown_(event)
+            objc.super(ChatInputTextView, self).keyDown_(event)
 
 
 class ChatWebView(WebView):
     def dealloc(self):
-        super(ChatWebView, self).dealloc()
+        objc.super(ChatWebView, self).dealloc()
 
     def draggingEntered_(self, sender):
         pboard = sender.draggingPasteboard()
@@ -681,7 +681,7 @@ def dealloc(self):
             self.scrollingTimer.invalidate()
             self.scrollingTimer = None
         NSNotificationCenter.defaultCenter().removeObserver_(self)
-        super(ChatViewController, self).dealloc()
+        objc.super(ChatViewController, self).dealloc()
 
 
 class Transform(object):

ChatWindowController.py

@@ -161,7 +161,7 @@ class ChatWindowController(NSWindowController):
     contact_timer = None
 
     def init(self):
-        self = super(ChatWindowController, self).init()
+        self = objc.super(ChatWindowController, self).init()
         if self:
             BlinkLogger().log_debug('Starting Chat Window Controller')
             smileys = SmileyManager()
@@ -668,7 +668,7 @@ def keyDown_(self, event):
             if keys[0] == 'i' and session and session.info_panel is not None:
                 session.info_panel.toggle()
         else:
-            super(ChatWindowController, self).keyDown_(event)
+            objc.super(ChatWindowController, self).keyDown_(event)
 
     def close_(self, sender):
         chat_sessions = len([s for s in self.sessions.values() if s.hasStreamOfType("chat")])

ConferenceController.py

@@ -145,7 +145,7 @@ def dealloc(self):
         self.notification_center.remove_observer(self, name='BonjourConferenceServicesDidUpdateServer')
         self.notification_center.remove_observer(self, name='BonjourConferenceServicesDidAddServer')
         self.notification_center.remove_observer(self, name='SIPAccountManagerDidChangeDefaultAccount')
-        super(JoinConferenceWindowController, self).dealloc()
+        objc.super(JoinConferenceWindowController, self).dealloc()
 
     @allocate_autorelease_pool
     @run_in_gui_thread

ConferenceFileCell.py

@@ -11,6 +11,7 @@
                         NSMakeSize,
                         NSTextFieldCell)
 
+import objc
 
 class ConferenceFileCell(NSTextFieldCell):
     conference_file = None
@@ -35,13 +36,13 @@ def drawingRectForBounds_(self, rect):
 
     def cellSize(self):
         if self.conference_file is None:
-            return super(ConferenceFileCell, self).cellSize()
+            return objc.super(ConferenceFileCell, self).cellSize()
         return NSMakeSize(100, 30)
 
     def drawWithFrame_inView_(self, frame, view):
         if self.conference_file is None:
             tmp = frame
-            return super(ConferenceFileCell, self).drawWithFrame_inView_(tmp, view)
+            return objc.super(ConferenceFileCell, self).drawWithFrame_inView_(tmp, view)
 
         self.drawIcon(self.conference_file.icon, 2, frame.origin.y+3, 28, 28)
 

ConferenceScreenSharing.py

@@ -48,7 +48,7 @@ def createWithOwner_(cls, owner):
         return w
 
     def initWithOwner_(self, owner):
-        self = super(ConferenceScreenSharing, self).init()
+        self = objc.super(ConferenceScreenSharing, self).init()
         if self:
             self.owner = owner
             NSBundle.loadNibNamed_owner_("ConferenceScreenSharing", self)

ContactCell.py

@@ -19,6 +19,7 @@
                         NSTextFieldCell)
 
 import datetime
+import objc
 
 from sipsimple.configuration.settings import SIPSimpleSettings
 from sipsimple.account import BonjourAccount
@@ -57,13 +58,13 @@ def drawingRectForBounds_(self, rect):
 
     def cellSize(self):
         if self.contact is None:
-            return super(ContactCell, self).cellSize()
+            return objc.super(ContactCell, self).cellSize()
         return NSMakeSize(100, 30)
 
     @allocate_autorelease_pool
     def drawWithFrame_inView_(self, frame, view):
         if self.contact is None:
-            return super(ContactCell, self).drawWithFrame_inView_(frame, view)
+            return objc.super(ContactCell, self).drawWithFrame_inView_(frame, view)
 
         self.frame = frame
         self.view = view

ContactController.py

@@ -43,7 +43,7 @@
 
 class MyImageThing(NSImageView):
     def mouseDown_(self, event):
-        super(MyImageThing, self).mouseDown_(event)
+        objc.super(MyImageThing, self).mouseDown_(event)
         self.target().performSelector_withObject_(self.action(), self)
 
 

ContactListModel.py

@@ -403,7 +403,7 @@ def preferred_media(self):
 
     def dealloc(self):
         self.avatar = None
-        super(BlinkContact, self).dealloc()
+        objc.super(BlinkContact, self).dealloc()
 
     def destroy(self):
         # workaround to keep the object alive as cocoa still sends delegate outline view messages to deallocated contacts
@@ -513,7 +513,7 @@ class BlinkConferenceContact(BlinkContact):
     implements(IObserver)
 
     def __init__(self, uri, name=None, icon=None, presence_contact=None):
-        super(BlinkConferenceContact, self).__init__(uri, name=name, icon=icon)
+        objc.super(BlinkConferenceContact, self).__init__(uri, name=name, icon=icon)
         self.active_media = []
         self.screensharing_url = None
         self.presence_contact = presence_contact
@@ -535,7 +535,7 @@ def destroy(self):
         if self.presence_contact is not None:
             NotificationCenter().remove_observer(self, name="BlinkContactPresenceHasChanged", sender=self.presence_contact)
             self.presence_contact = None
-        super(BlinkConferenceContact, self).destroy()
+        objc.super(BlinkConferenceContact, self).destroy()
 
     @run_in_gui_thread
     def handle_notification(self, notification):
@@ -637,7 +637,7 @@ def __init__(self, account):
 
         name = account.display_name or uri
 
-        super(BlinkMyselfConferenceContact, self).__init__(uri, name=name, icon=own_icon)
+        objc.super(BlinkMyselfConferenceContact, self).__init__(uri, name=name, icon=own_icon)
         self.active_media = []
         self.screensharing_url = None
         self.presence_note = None
@@ -650,7 +650,7 @@ class BlinkPendingWatcher(BlinkContact):
 
     def __init__(self, watcher):
         uri = sip_prefix_pattern.sub('', watcher.sipuri)
-        super(BlinkPendingWatcher, self).__init__(uri, name=watcher.display_name)
+        objc.super(BlinkPendingWatcher, self).__init__(uri, name=watcher.display_name)
         self.avatar = PendingWatcherAvatar()
 
 
@@ -663,12 +663,12 @@ def __init__(self, policy):
         self.policy = policy
         uri = policy.uri
         name = policy.name
-        super(BlinkBlockedPresenceContact, self).__init__(uri, name=name)
+        objc.super(BlinkBlockedPresenceContact, self).__init__(uri, name=name)
         self.avatar = BlockedPolicyAvatar()
 
     def destroy(self):
         self.policy = None
-        super(BlinkBlockedPresenceContact, self).destroy()
+        objc.super(BlinkBlockedPresenceContact, self).destroy()
 
 
 class BlinkPresenceContactAttribute(object):
@@ -797,7 +797,7 @@ def destroy(self):
             self.timer.invalidate()
         self.timer = None
         self.pidfs_map = {}
-        super(BlinkPresenceContact, self).destroy()
+        objc.super(BlinkPresenceContact, self).destroy()
 
     @allocate_autorelease_pool
     @run_in_gui_thread
@@ -1551,7 +1551,7 @@ def matchesURI(self, uri, exact_match=False):
 
     def destroy(self):
         self.bonjour_neighbour = None
-        super(BonjourBlinkContact, self).destroy()
+        objc.super(BonjourBlinkContact, self).destroy()
 
 
 class SearchResultContact(BlinkContact):
@@ -1760,7 +1760,7 @@ class BonjourBlinkGroup(VirtualBlinkGroup):
     delete_contact_allowed = False
 
     def __init__(self, name=NSLocalizedString("Bonjour Neighbours", "Group name label"), expanded=True):
-        super(BonjourBlinkGroup, self).__init__(name, expanded)
+        objc.super(BonjourBlinkGroup, self).__init__(name, expanded)
         self.not_filtered_contacts = [] # keep a list of all neighbors so that we can rebuild the contacts when the sip transport changes, by default TLS transport is preferred
         self.original_position = None
 
@@ -1775,7 +1775,7 @@ class NoBlinkGroup(VirtualBlinkGroup):
     delete_contact_allowed = True
 
     def __init__(self, name=NSLocalizedString("No Group", "Group name label"), expanded=False):
-        super(NoBlinkGroup, self).__init__(name, expanded)
+        objc.super(NoBlinkGroup, self).__init__(name, expanded)
 
 
 class PendingWatchersGroup(VirtualBlinkGroup):
@@ -1788,7 +1788,7 @@ class PendingWatchersGroup(VirtualBlinkGroup):
     delete_contact_allowed = False
 
     def __init__(self, name=NSLocalizedString("New Contact Requests", "Group name label"), expanded=True):
-        super(PendingWatchersGroup, self).__init__(name, expanded)
+        objc.super(PendingWatchersGroup, self).__init__(name, expanded)
 
 
 class BlockedGroup(VirtualBlinkGroup):
@@ -1801,7 +1801,7 @@ class BlockedGroup(VirtualBlinkGroup):
     delete_contact_allowed = False
 
     def __init__(self, name=NSLocalizedString("Blocked Contacts", "Group name label"), expanded=False):
-        super(BlockedGroup, self).__init__(name, expanded)
+        objc.super(BlockedGroup, self).__init__(name, expanded)
 
 
 class OnlineGroup(VirtualBlinkGroup):
@@ -1814,7 +1814,7 @@ class OnlineGroup(VirtualBlinkGroup):
     delete_contact_allowed = True
 
     def __init__(self, name=NSLocalizedString("Online Contacts", "Group name label"), expanded=True):
-        super(OnlineGroup, self).__init__(name, expanded)
+        objc.super(OnlineGroup, self).__init__(name, expanded)
 
 
 class AllContactsBlinkGroup(VirtualBlinkGroup):
@@ -1828,7 +1828,7 @@ class AllContactsBlinkGroup(VirtualBlinkGroup):
     delete_contact_allowed = True
 
     def __init__(self, name=NSLocalizedString("All Contacts", "Group name label"), expanded=True):
-        super(AllContactsBlinkGroup, self).__init__(name, expanded)
+        objc.super(AllContactsBlinkGroup, self).__init__(name, expanded)
 
 
 class HistoryBlinkGroup(VirtualBlinkGroup):
@@ -1844,7 +1844,7 @@ class HistoryBlinkGroup(VirtualBlinkGroup):
     last_results = []
 
     def __init__(self, name, expanded=False):
-        super(HistoryBlinkGroup, self).__init__(name, expanded)
+        objc.super(HistoryBlinkGroup, self).__init__(name, expanded)
         # contacts are not yet loaded when building this group so we cannot lookup contacts just yet
         self.timer = NSTimer.timerWithTimeInterval_target_selector_userInfo_repeats_(6.0, self, "firstLoadTimer:", None, False)
         NSRunLoop.currentRunLoop().addTimer_forMode_(self.timer, NSRunLoopCommonModes)
@@ -1998,7 +1998,7 @@ class MissedCallsBlinkGroup(HistoryBlinkGroup):
     type = 'missed'
 
     def __init__(self, name=NSLocalizedString("Missed Calls", "Group name label")):
-        super(MissedCallsBlinkGroup, self).__init__(name, expanded=True)
+        objc.super(MissedCallsBlinkGroup, self).__init__(name, expanded=True)
 
     def get_history_entries(self):
         return SessionHistory().get_entries(hidden=0, after_date=self.after_date, count=200)
@@ -2008,7 +2008,7 @@ class OutgoingCallsBlinkGroup(HistoryBlinkGroup):
     type = 'outgoing'
 
     def __init__(self, name=NSLocalizedString("Outgoing Calls", "Group name label")):
-        super(OutgoingCallsBlinkGroup, self).__init__(name, expanded=True)
+        objc.super(OutgoingCallsBlinkGroup, self).__init__(name, expanded=True)
 
     def get_history_entries(self):
         return SessionHistory().get_entries(direction='outgoing', remote_focus="0", hidden=0, after_date=self.after_date, count=100)
@@ -2018,7 +2018,7 @@ class IncomingCallsBlinkGroup(HistoryBlinkGroup):
     type = 'incoming'
 
     def __init__(self, name=NSLocalizedString("Incoming Calls", "Group name label")):
-        super(IncomingCallsBlinkGroup, self).__init__(name, expanded=True)
+        objc.super(IncomingCallsBlinkGroup, self).__init__(name, expanded=True)
 
     def get_history_entries(self):
         return SessionHistory().get_entries(direction='incoming', status='completed', remote_focus="0", hidden=0, after_date=self.after_date, count=100)
@@ -2035,7 +2035,7 @@ class VoicemailBlinkGroup(VirtualBlinkGroup):
     original_position = None
 
     def __init__(self, name=NSLocalizedString("Voicemail", "Group name label")):
-        super(VoicemailBlinkGroup, self).__init__(name, expanded=True)
+        objc.super(VoicemailBlinkGroup, self).__init__(name, expanded=True)
 
     @property
     def groupsList(self):
@@ -2112,7 +2112,7 @@ class AddressBookBlinkGroup(VirtualBlinkGroup):
     delete_contact_allowed = False
 
     def __init__(self, name=NSLocalizedString("Address Book", "Group name label")):
-        super(AddressBookBlinkGroup, self).__init__(name, expanded=False)
+        objc.super(AddressBookBlinkGroup, self).__init__(name, expanded=False)
 
     @run_in_thread('addressbook')
     @allocate_autorelease_pool

ContactWindowController.py

@@ -730,7 +730,7 @@ def showWindow_(self, sender):
             self.window().setTitle_(NSApp.delegate().main_window_title)
         else:
             self.window().setTitle_(NSApp.delegate().applicationNamePrint)
-        super(ContactWindowController, self).showWindow_(sender)
+        objc.super(ContactWindowController, self).showWindow_(sender)
 
     def copyToSearchBar_(self, sender):
         self.searchBox.setStringValue_(sender.representedObject())

DebugWindow.py

@@ -135,7 +135,7 @@ class DebugWindow(NSObject):
     sendingText = NSAttributedString.alloc().initWithString_attributes_("SENDING:", NSDictionary.dictionaryWithObject_forKey_(NSColor.orangeColor(), NSForegroundColorAttributeName))
 
     def init(self):
-        self = super(DebugWindow, self).init()
+        self = objc.super(DebugWindow, self).init()
 
         NSBundle.loadNibNamed_owner_("DebugWindow", self)
 
@@ -352,7 +352,7 @@ def dealloc(self):
         notification_center.discard_observer(self, name="SIPEngineLog")
         notification_center.discard_observer(self)
 
-        super(DebugWindow, self).dealloc()
+        objc.super(DebugWindow, self).dealloc()
 
     def append_line(self, textView, line):
         if isinstance(line, NSAttributedString):

EnrollmentController.py

@@ -99,7 +99,7 @@ def init(self):
 
     def dealloc(self):
         NotificationCenter().discard_observer(self, name='SIPAccountManagerDidAddAccount')
-        super(EnrollmentController, self).dealloc()
+        objc.super(EnrollmentController, self).dealloc()
 
     def runModal(self):
         BlinkLogger().log_info('Starting Enrollment')