Merge pull request #190 from robotools/super

Super

Author: typesupply

Demos/TinyTextEditor/TinyTextEditor.py

@@ -2,24 +2,25 @@
 from PyObjCTools import AppHelper
 from tinyTextEditorDocumentWindow import TinyTextEditorDocumentWindow
 from io import open
+from objc import super
 
 
 class TinyTextEditorDocument(NSDocument):
-    
+
     def init(self):
-        self = super(TinyTextEditorDocument, self).init()
+        self = super().init()
         self.vanillaWindowController = TinyTextEditorDocumentWindow()
         self.vanillaWindowController.assignToDocument(self)
-        return self        
-    
+        return self
+
     def readFromFile_ofType_(self, path, tp):
         # refer to the NSDocument reference for information about this method
         f = open(path, 'r', encoding='utf-8')
         text = f.read()
         f.close()
         self.vanillaWindowController.setText(text)
         return True
-    
+
     def writeWithBackupToFile_ofType_saveOperation_(self, fileName, fileType, operation):
         # refer to the NSDocument reference for information about this method
         text = self.vanillaWindowController.getText()

Lib/vanilla/dialogs.py

@@ -1,5 +1,6 @@
 from objc import selector
 from objc import python_method
+from objc import super
 from Foundation import NSObject
 from AppKit import NSAlert, NSSavePanel, NSOpenPanel, NSAlertStyleCritical, NSAlertStyleInformational, NSAlertStyleWarning, NSAlertFirstButtonReturn, NSAlertSecondButtonReturn, NSAlertThirdButtonReturn, NSOKButton, NSURL, NSImage
 
@@ -43,7 +44,7 @@ def windowWillClose_(self, notification):
 class BaseMessageDialog(BasePanel):
 
     def initWithWindow_resultCallback_(cls, parentWindow=None, resultCallback=None):
-        self = super(BaseMessageDialog, cls).initWithWindow_resultCallback_(parentWindow, resultCallback)
+        self = super().initWithWindow_resultCallback_(parentWindow, resultCallback)
         self.messageText = ""
         self.informativeText = ""
         self.alertStyle = NSAlertStyleInformational
@@ -139,7 +140,7 @@ def completionHandler_(self, returnCode):
 class PutFilePanel(BasePutGetPanel):
 
     def initWithWindow_resultCallback_cancelCallback_(self, parentWindow=None, resultCallback=None, cancelCallback=None):
-        self = super(PutFilePanel, self).initWithWindow_resultCallback_cancelCallback_(parentWindow, resultCallback, cancelCallback)
+        self = super().initWithWindow_resultCallback_cancelCallback_(parentWindow, resultCallback, cancelCallback)
         self.messageText = None
         self.title = None
         self.fileTypes = None
@@ -186,7 +187,7 @@ def completionHandler_(self, returnCode):
 class GetFileOrFolderPanel(BasePutGetPanel):
 
     def initWithWindow_resultCallback_cancelCallback_(self, parentWindow=None, resultCallback=None, cancelCallback=None):
-        self = super(GetFileOrFolderPanel, self).initWithWindow_resultCallback_cancelCallback_(parentWindow, resultCallback, cancelCallback)
+        self = super().initWithWindow_resultCallback_cancelCallback_(parentWindow, resultCallback, cancelCallback)
         self.messageText = None
         self.title = None
         self.directory = None

Lib/vanilla/vanillaBase.py

@@ -1,4 +1,5 @@
 import platform
+from objc import super
 
 from Foundation import NSObject
 from AppKit import NSFont, NSRegularControlSize, NSSmallControlSize, NSMiniControlSize, \

Lib/vanilla/vanillaBox.py

@@ -1,4 +1,4 @@
-import objc
+from objc import super
 from AppKit import NSBox, NSColor, NSFont, NSSmallControlSize, NSNoTitle, NSLineBorder, NSBoxSeparator, NSBoxCustom
 from vanilla.vanillaBase import VanillaBaseObject, _breakCycles, osVersionCurrent, osVersion10_10
 
@@ -91,13 +91,13 @@ def _adjustPosSize(self, frame):
                 title = "None"
             boxType = "Box-" + title
             self.frameAdjustments = self.allFrameAdjustments[boxType]
-        return super(Box, self)._adjustPosSize(frame)
+        return super()._adjustPosSize(frame)
 
     def _getContentView(self):
         return self._nsObject.contentView()
 
     def _breakCycles(self):
-        super(Box, self)._breakCycles()
+        super()._breakCycles()
         view = self._nsObject.contentView()
         if view is not None:
             _breakCycles(view)
@@ -196,7 +196,7 @@ def __init__(self):
     """
 
     def __init__(self, posSize):
-        super(HorizontalLine, self).__init__(posSize)
+        super().__init__(posSize)
 
 
 class VerticalLine(_Line):
@@ -230,4 +230,4 @@ def __init__(self):
     """
 
     def __init__(self, posSize):
-        super(VerticalLine, self).__init__(posSize)
+        super().__init__(posSize)

Lib/vanilla/vanillaButton.py

@@ -97,7 +97,7 @@ def __init__(self, posSize, title, callback=None, sizeStyle="regular"):
         self._nsObject.setButtonType_(self.nsButtonType)
 
     def _testForDeprecatedAttributes(self):
-        super(Button, self)._testForDeprecatedAttributes()
+        super()._testForDeprecatedAttributes()
         from warnings import warn
         if hasattr(self, "_nsBezelStyle"):
             warn(DeprecationWarning("The _nsBezelStyle attribute is deprecated. Use the nsBezelStyle attribute."))
@@ -209,7 +209,7 @@ def buttonCallback(self, sender):
     frameAdjustments = None
 
     def __init__(self, posSize, title, callback=None, sizeStyle="regular"):
-        super(SquareButton, self).__init__(posSize=posSize, title=title, callback=callback, sizeStyle=sizeStyle)
+        super().__init__(posSize=posSize, title=title, callback=callback, sizeStyle=sizeStyle)
 
 
 _imagePositionMap = {
@@ -296,7 +296,7 @@ def buttonCallback(self, sender):
     def __init__(self, posSize,
                 imagePath=None, imageNamed=None, imageObject=None,
                 title=None, bordered=True, imagePosition="top", callback=None, sizeStyle="regular"):
-        super(ImageButton,  self).__init__(posSize, title=title, callback=callback, sizeStyle=sizeStyle)
+        super().__init__(posSize, title=title, callback=callback, sizeStyle=sizeStyle)
         image = None
         if imagePath is not None:
             image = NSImage.alloc().initWithContentsOfFile_(imagePath)
@@ -394,7 +394,7 @@ def __init__(self, posSize, callback=None, page=None, anchor=None):
         if callback is None:
             if page is not None or anchor is not None:
                 callback = self._helpBookCallback
-        super(HelpButton, self).__init__(posSize, title="", callback=callback)
+        super().__init__(posSize, title="", callback=callback)
 
     def _helpBookCallback(self, sender):
         from Carbon import AH

Lib/vanilla/vanillaCheckBox.py

@@ -80,7 +80,7 @@ class _CheckBoxStandardBuild(Button):
     }
 
     def __init__(self, posSize, title, callback=None, value=False, sizeStyle="regular"):
-        super(_CheckBoxStandardBuild, self).__init__(posSize, title, callback=callback, sizeStyle=sizeStyle)
+        super().__init__(posSize, title, callback=callback, sizeStyle=sizeStyle)
         self.set(value)
 
     def set(self, value):
@@ -133,7 +133,7 @@ class _CheckBoxManualBuildTextButton(Button):
     frameAdjustments = None
 
     def __init__(self, posSize, title, callback, sizeStyle):
-        super(_CheckBoxManualBuildTextButton, self).__init__(posSize, title=title, callback=callback)
+        super().__init__(posSize, title=title, callback=callback)
         self._nsObject.setBordered_(False)
         self._setSizeStyle(sizeStyle)
         self._nsObject.setAlignment_(NSTextAlignmentLeft)

Lib/vanilla/vanillaComboBox.py

@@ -115,11 +115,11 @@ def __init__(self, posSize, items, completes=True, continuous=False,
             self._nsObject.setFormatter_(formatter)
 
     def _breakCycles(self):
-        super(ComboBox, self)._breakCycles()
+        super()._breakCycles()
         self._delegate = None
 
     def _setCallback(self, callback):
-        super(ComboBox, self)._setCallback(callback)
+        super()._setCallback(callback)
         if callback is not None:
             self._delegate = VanillaComboBoxDelegate.alloc().init()
             self._delegate._continuous = self._continuous

Lib/vanilla/vanillaDrawer.py

@@ -111,7 +111,7 @@ def _getContentView(self):
         return self._nsObject.contentView()
 
     def _breakCycles(self):
-        super(Drawer, self)._breakCycles()
+        super()._breakCycles()
         view = self._getContentView()
         if view is not None:
             _breakCycles(view)

Lib/vanilla/vanillaEditText.py

@@ -104,7 +104,7 @@ def __init__(self, posSize, text="", callback=None, continuous=True, readOnly=Fa
             self._nsObject.cell().setPlaceholderString_(placeholder)
 
     def _testForDeprecatedAttributes(self):
-        super(EditText, self)._testForDeprecatedAttributes()
+        super()._testForDeprecatedAttributes()
         from warnings import warn
         if hasattr(self, "_textFieldClass"):
             warn(DeprecationWarning("The _textFieldClass attribute is deprecated. Use the nsTextFieldClass attribute."))

Lib/vanilla/vanillaGroup.py

@@ -124,17 +124,17 @@ def __init__(self, posSize, blendingMode=None, dropSettings=None):
     def __setattr__(self, attr, value):
         # __init__
         if not hasattr(self, "_visualEffectGroup") or attr == "_visualEffectGroup":
-            super(Group, self).__setattr__(attr, value)
+            super().__setattr__(attr, value)
         # adding a vanilla subview: add to the visual effect view
         elif hasattr(self, "_visualEffectGroup") and isinstance(value, VanillaBaseObject) and hasattr(value, "_posSize"):
             setattr(self._visualEffectGroup, attr, value)
         # fallback: add to the main view
         else:
-            super(Group, self).__setattr__(attr, value)
+            super().__setattr__(attr, value)
 
     def __delattr__(self, attr):
         if hasattr(self, attr):
-            super(Group, self).__delattr__(attr)
+            super().__delattr__(attr)
         elif hasattr(self, "_visualEffectView"):
             delattr(self._visualEffectView, attr)