STY : pep8 work on qt* files

Author: tacaswell

lib/matplotlib/backends/backend_qt4.py

@@ -32,23 +32,25 @@
 from .qt_compat import QtCore, QtWidgets, _getSaveFileName, __version__
 from matplotlib.backends.qt_editor.formsubplottool import UiSubplotTool
 
-from .backend_qt5 import (backend_version, SPECIAL_KEYS, SUPER, ALT, CTRL, 
+from .backend_qt5 import (backend_version, SPECIAL_KEYS, SUPER, ALT, CTRL,
                         SHIFT, MODIFIER_KEYS, fn_name, cursord,
-                        draw_if_interactive, _create_qApp, show, TimerQT, 
+                        draw_if_interactive, _create_qApp, show, TimerQT,
                         MainWindow, FigureManagerQT, NavigationToolbar2QT,
                         SubplotToolQt, error_msg_qt, exception_handler)
 
 from .backend_qt5 import FigureCanvasQT as FigureCanvasQT5
 
 DEBUG = False
 
+
 def new_figure_manager(num, *args, **kwargs):
     """
     Create a new figure manager instance
     """
     thisFig = Figure(*args, **kwargs)
     return new_figure_manager_given_figure(num, thisFig)
 
+
 def new_figure_manager_given_figure(num, figure):
     """
     Create a new figure manager instance for the given figure.
@@ -57,6 +59,7 @@ def new_figure_manager_given_figure(num, figure):
     manager = FigureManagerQT(canvas, num)
     return manager
 
+
 class FigureCanvasQT(FigureCanvasQT5):
 
     def __init__(self, figure):
@@ -71,7 +74,7 @@ def __init__(self, figure):
         self.setMouseTracking(True)
         self._idle = True
         # hide until we can test and fix
-        #self.startTimer(backend_IdleEvent.milliseconds)
+        # self.startTimer(backend_IdleEvent.milliseconds)
         w, h = self.get_width_height()
         self.resize(w, h)
 

lib/matplotlib/backends/backend_qt4agg.py

@@ -36,24 +36,16 @@
 _decref.restype = None
 
 
-def new_figure_manager(num, *args, **kwargs):
-    """
-    Create a new figure manager instance
-    """
-    if DEBUG:
-        print('backend_qt4agg.new_figure_manager')
-    FigureClass = kwargs.pop('FigureClass', Figure)
-    thisFig = FigureClass(*args, **kwargs)
-    return new_figure_manager_given_figure(num, thisFig)
-
 def new_figure_manager_given_figure(num, figure):
     """
     Create a new figure manager instance for the given figure.
     """
     canvas = FigureCanvasQTAgg(figure)
     return FigureManagerQT(canvas, num)
 
-class FigureCanvasQTAgg(FigureCanvasQTAggBase, FigureCanvasQT, FigureCanvasAgg):
+
+class FigureCanvasQTAgg(FigureCanvasQTAggBase,
+                        FigureCanvasQT, FigureCanvasAgg):
     """
     The canvas the figure renders into.  Calls the draw and print fig
     methods, creates the renderers, etc...
@@ -89,6 +81,5 @@ def __init__(self, figure):
             self._priv_update = self.update
 
 
-
 FigureCanvas = FigureCanvasQTAgg
 FigureManager = FigureManagerQT

lib/matplotlib/backends/backend_qt5.py

@@ -116,6 +116,9 @@ def draw_if_interactive():
         if figManager is not None:
             figManager.canvas.draw_idle()
 
+# make place holder
+qApp = None
+
 
 def _create_qApp():
     """
@@ -227,13 +230,15 @@ def __init__(self, figure):
             print('FigureCanvasQt qt5: ', figure)
         _create_qApp()
 
-        # NB: Using super for this call to avoid a TypeError: __init__() takes exactly 2 arguments (1 given) on QWidget PyQt5
+        # NB: Using super for this call to avoid a TypeError:
+        # __init__() takes exactly 2 arguments (1 given) on QWidget
+        # PyQt5
         super(FigureCanvasQT, self).__init__(figure=figure)
         self.figure = figure
         self.setMouseTracking(True)
         self._idle = True
         # hide until we can test and fix
-        #self.startTimer(backend_IdleEvent.milliseconds)
+        # self.startTimer(backend_IdleEvent.milliseconds)
         w, h = self.get_width_height()
         self.resize(w, h)
 
@@ -274,7 +279,7 @@ def mouseMoveEvent(self, event):
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height - event.y()
         FigureCanvasBase.motion_notify_event(self, x, y)
-        #if DEBUG: print('mouse move')
+        # if DEBUG: print('mouse move')
 
     def mouseReleaseEvent(self, event):
         x = event.x()
@@ -647,7 +652,7 @@ def edit_parameters(self):
             figureoptions.figure_edit(axes, self)
 
     def _update_buttons_checked(self):
-        #sync button checkstates to match active mode
+        # sync button checkstates to match active mode
         self._actions['pan'].setChecked(self._active == 'PAN')
         self._actions['zoom'].setChecked(self._active == 'ZOOM')
 
@@ -824,7 +829,8 @@ def error_msg_qt(msg, parent=None):
     if not is_string_like(msg):
         msg = ','.join(map(str, msg))
 
-    QtWidgets.QMessageBox.warning(None, "Matplotlib", msg, QtGui.QMessageBox.Ok)
+    QtWidgets.QMessageBox.warning(None, "Matplotlib",
+                                  msg, QtGui.QMessageBox.Ok)
 
 
 def exception_handler(type, value, tb):

lib/matplotlib/backends/backend_qt5agg.py

@@ -36,6 +36,7 @@
 _decref.argtypes = [ctypes.py_object]
 _decref.restype = None
 
+
 def new_figure_manager(num, *args, **kwargs):
     """
     Create a new figure manager instance
@@ -46,13 +47,15 @@ def new_figure_manager(num, *args, **kwargs):
     thisFig = FigureClass(*args, **kwargs)
     return new_figure_manager_given_figure(num, thisFig)
 
+
 def new_figure_manager_given_figure(num, figure):
     """
     Create a new figure manager instance for the given figure.
     """
     canvas = FigureCanvasQTAgg(figure)
     return FigureManagerQT(canvas, num)
 
+
 class FigureCanvasQTAggBase(object):
     """
     The canvas the figure renders into.  Calls the draw and print fig
@@ -62,7 +65,7 @@ class FigureCanvasQTAggBase(object):
 
       figure - A Figure instance
    """
-   
+
     def drawRectangle(self, rect):
         self._drawRect = rect
         self.repaint()
@@ -74,7 +77,7 @@ def paintEvent(self, e):
         shown onscreen.
         """
 
-        #FigureCanvasQT.paintEvent(self, e)
+        # FigureCanvasQT.paintEvent(self, e)
         if DEBUG:
             print('FigureCanvasQtAgg.paintEvent: ', self,
                 self.get_width_height())
@@ -157,12 +160,14 @@ def blit(self, bbox=None):
     def print_figure(self, *args, **kwargs):
         FigureCanvasAgg.print_figure(self, *args, **kwargs)
         self.draw()
-        
-class FigureCanvasQTAgg(FigureCanvasQTAggBase, FigureCanvasQT, FigureCanvasAgg):
+
+
+class FigureCanvasQTAgg(FigureCanvasQTAggBase,
+                        FigureCanvasQT, FigureCanvasAgg):
     """
     The canvas the figure renders into.  Calls the draw and print fig
-    methods, creates the renderers, etc. 
-    
+    methods, creates the renderers, etc.
+
     Modified to import from Qt5 backend for new-style mouse events.
 
     Public attribute
@@ -194,7 +199,8 @@ def __init__(self, figure):
             self._priv_update = self.repaint
         else:
             self._priv_update = self.update
-            
+
+
 class NavigationToolbar2QTAgg(NavigationToolbar2QT):
     def __init__(*args, **kwargs):
         warnings.warn('This class has been deprecated in 1.4 ' +
@@ -205,6 +211,5 @@ def __init__(*args, **kwargs):
         NavigationToolbar2QT.__init__(*args, **kwargs)
 
 
-    
 FigureCanvas = FigureCanvasQTAgg
 FigureManager = FigureManagerQT

lib/matplotlib/backends/qt_compat.py

@@ -27,7 +27,7 @@
     except KeyError:
         raise RuntimeError(
           'Unrecognized environment variable %r, valid values are: %r or %r' %
-                           (QT_API_ENV, 'pyqt', 'pyside', 'pyqt5'))
+          (QT_API_ENV, 'pyqt', 'pyside', 'pyqt5'))
 else:
     # No ETS environment, so use rcParams.
     if rcParams['backend'] == 'Qt5Agg':
@@ -70,8 +70,8 @@
         except:
             res = 'QVariant API v2 specification failed. Defaulting to v1.'
             verbose.report(cond+res, 'helpful')
-            
-    if QT_API in [QT_API_PYQT, QT_API_PYQTv2]: # PyQt4 API
+
+    if QT_API in [QT_API_PYQT, QT_API_PYQTv2]:  # PyQt4 API
 
         from PyQt4 import QtCore, QtGui
 
@@ -85,30 +85,28 @@
         except (AttributeError, KeyError):
             # call to getapi() can fail in older versions of sip
             _getSaveFileName = QtGui.QFileDialog.getSaveFileName
-        
-            
-    else: # PyQt5 API
+
+    else:  # PyQt5 API
 
         from PyQt5 import QtCore, QtGui, QtWidgets
 
         # Additional PyQt5 shimming to make it appear as for PyQt4
 
         _get_save = QtWidgets.QFileDialog.getSaveFileName
         _getSaveFileName = QtWidgets.QFileDialog.getSaveFileName
-        
+
     # Alias PyQt-specific functions for PySide compatibility.
     QtCore.Signal = QtCore.pyqtSignal
     try:
         QtCore.Slot = QtCore.pyqtSlot
     except AttributeError:
-        QtCore.Slot = pyqtSignature  # Not a perfect match but
-                                     # works in simple cases
+        # Not a perfect match but works in simple cases
+        QtCore.Slot = QtCore.pyqtSignature
+
     QtCore.Property = QtCore.pyqtProperty
     __version__ = QtCore.PYQT_VERSION_STR
 
-    
-
-else: # try importing pyside
+else:  # try importing pyside
     from PySide import QtCore, QtGui, __version__, __version_info__
     if __version_info__ < (1, 0, 3):
         raise ImportError(
@@ -122,11 +120,11 @@ def _getSaveFileName(self, msg, start, filters, selectedFilter):
 
 # Apply shim to Qt4 APIs to make them look like Qt5
 if QT_API in (QT_API_PYQT, QT_API_PYQTv2, QT_API_PYSIDE):
-    '''
-    Import all used QtGui objects into QtWidgets
-    
-    Here I've opted to simple copy QtGui into QtWidgets as that achieves the same result
-    as copying over the objects, and will continue to work if other objects are used.
+    '''Import all used QtGui objects into QtWidgets
+
+    Here I've opted to simple copy QtGui into QtWidgets as that
+    achieves the same result as copying over the objects, and will
+    continue to work if other objects are used.
+
     '''
     QtWidgets = QtGui
-

lib/matplotlib/backends/qt_editor/formsubplottool.py

@@ -10,6 +10,7 @@
 
 from matplotlib.backends.qt_compat import QtCore, QtGui, QtWidgets
 
+
 class UiSubplotTool(QtWidgets.QDialog):
 
     def __init__(self, *args, **kwargs):
@@ -217,7 +218,8 @@ def __init__(self, *args, **kwargs):
         gbox.addLayout(hbox2, 8, 0, 1, 1)
         self.tightlayout = QtWidgets.QPushButton('Tight Layout', self)
         spacer = QtWidgets.QSpacerItem(
-            5, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+            5, 20, QtWidgets.QSizePolicy.Expanding,
+            QtWidgets.QSizePolicy.Minimum)
         self.resetbutton = QtWidgets.QPushButton('Reset', self)
         self.donebutton = QtWidgets.QPushButton('Close', self)
         self.donebutton.setFocus()

lib/matplotlib/tests/test_coding_standards.py

@@ -131,10 +131,8 @@
                       '*/matplotlib/backends/backend_tkagg.py',
                       '*/matplotlib/backends/backend_wx.py',
                       '*/matplotlib/backends/backend_wxagg.py',
-                      '*/matplotlib/backends/qt4_compat.py',
                       '*/matplotlib/backends/tkagg.py',
                       '*/matplotlib/backends/windowing.py',
-                      '*/matplotlib/backends/qt_editor/figureoptions.py',
                       '*/matplotlib/backends/qt_editor/formlayout.py',
                       '*/matplotlib/sphinxext/ipython_console_highlighting.py',
                       '*/matplotlib/sphinxext/ipython_directive.py',