[arch-commits] Commit in spyder/trunk (f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch)

[Fabio Castelli]

    Date: Sunday, September 6, 2015 @ 18:28:36
  Author: muflone
Revision: 139265

Removed pre 2.3.6 patch

Deleted:
  spyder/trunk/f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch

------------------------------------------------+
 f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch |  116 -----------------------
 1 file changed, 116 deletions(-)

Deleted: f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch
===================================================================
--- f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch	2015-09-06 16:27:24 UTC (rev 139264)
+++ f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch	2015-09-06 16:28:36 UTC (rev 139265)
@@ -1,116 +0,0 @@
-diff -Naur spyder-2.3.5.2.orig/spyderlib/__init__.py spyder-2.3.5.2/spyderlib/__init__.py
---- spyder-2.3.5.2.orig/spyderlib/__init__.py	2015-06-23 04:12:07.000000000 +0200
-+++ spyder-2.3.5.2/spyderlib/__init__.py	2015-08-22 20:19:26.512473530 +0200
-@@ -62,11 +62,6 @@
-     """Get version information for components used by Spyder"""
-     import sys
-     import platform
--    # Hack to let IPython set QT_API, in case it's installed
--    try:
--        from IPython.external import qt     # analysis:ignore
--    except (ImportError, ValueError):
--        pass
-     import spyderlib.qt
-     import spyderlib.qt.QtCore
- 
-diff -Naur spyder-2.3.5.2.orig/spyderlib/qt/__init__.py spyder-2.3.5.2/spyderlib/qt/__init__.py
---- spyder-2.3.5.2.orig/spyderlib/qt/__init__.py	2015-06-23 04:12:07.000000000 +0200
-+++ spyder-2.3.5.2/spyderlib/qt/__init__.py	2015-08-22 20:20:24.309139778 +0200
-@@ -15,16 +15,18 @@
- API_NAME = {'pyqt': 'PyQt4', 'pyside': 'PySide'}[API]
- 
- if API == 'pyqt':
--    # We do not force QString, QVariant, ... API to #1 or #2 anymore 
--    # as spyderlib is now compatible with both APIs
--#    import sip
--#    try:
--#        sip.setapi('QString', 2)
--#        sip.setapi('QVariant', 2)
--#    except AttributeError:
--#        # PyQt < v4.6: in future version, we should warn the user 
--#        # that PyQt is outdated and won't be supported by Spyder >v2.1
--#        pass
-+    # Since Spyder 2.3.6 we only support API #2
-+    import sip
-+    try:
-+        sip.setapi('QString', 2)
-+        sip.setapi('QVariant', 2)
-+        sip.setapi('QDate', 2)
-+        sip.setapi('QDateTime', 2)
-+        sip.setapi('QTextStream', 2)
-+        sip.setapi('QTime', 2)
-+        sip.setapi('QUrl', 2)
-+    except AttributeError:
-+        pass
-     try:
-         from PyQt4.QtCore import PYQT_VERSION_STR as __version__
-     except ImportError:
-@@ -32,7 +34,6 @@
-         API = os.environ['QT_API'] = 'pyside'
-         API_NAME = 'PySide'
-     else:
--        __version_info__ = tuple(__version__.split('.')+['final', 1])
-         is_old_pyqt = __version__.startswith(('4.4', '4.5', '4.6', '4.7'))
-         is_pyqt46 = __version__.startswith('4.6')
-         import sip
-diff -Naur spyder-2.3.5.2.orig/spyderlib/spyder.py spyder-2.3.5.2/spyderlib/spyder.py
---- spyder-2.3.5.2.orig/spyderlib/spyder.py	2015-06-23 04:12:07.000000000 +0200
-+++ spyder-2.3.5.2/spyderlib/spyder.py	2015-08-22 20:21:35.902472594 +0200
-@@ -41,7 +41,15 @@
- 
- 
- #==============================================================================
--# Test if IPython is installed to eventually switch to PyQt API #2
-+# Check requirements
-+#==============================================================================
-+from spyderlib import requirements
-+requirements.check_path()
-+requirements.check_qt()
-+
-+
-+#==============================================================================
-+# IPython dependencies
- #==============================================================================
- from spyderlib.baseconfig import _
- from spyderlib.ipythonconfig import IPYTHON_QT_INSTALLED, SUPPORTED_IPYTHON
-@@ -52,31 +60,6 @@
- dependencies.add("zmq", _("IPython Console integration"),
-                  required_version='>=2.1.11')
- 
--if IPYTHON_QT_INSTALLED:
--    # Importing IPython will eventually set the QT_API environment variable
--    import IPython  # analysis:ignore
--    if os.environ.get('QT_API', 'pyqt') == 'pyqt':
--        # If PyQt is the selected GUI toolkit (at this stage, only the
--        # bootstrap script has eventually set this option), switch to 
--        # PyQt API #2 by simply importing the IPython qt module
--        os.environ['QT_API'] = 'pyqt'
--        try:
--            from IPython.external import qt  #analysis:ignore
--        except ImportError:
--            # Avoid raising any error here: the spyderlib.requirements module
--            # will take care of it, in a user-friendly way (Tkinter message box
--            # if no GUI toolkit is installed)
--            pass
--
--
--#==============================================================================
--# Check requirements
--#==============================================================================
--from spyderlib import requirements
--requirements.check_path()
--requirements.check_qt()
--
--
- #==============================================================================
- # Windows platforms only: support for hiding the attached console window
- #==============================================================================
-@@ -128,7 +111,7 @@
- #==============================================================================
- # Create splash screen out of MainWindow to reduce perceived startup time. 
- #==============================================================================
--from spyderlib.baseconfig import _, get_image_path
-+from spyderlib.baseconfig import get_image_path
- SPLASH = QSplashScreen(QPixmap(get_image_path('splash.png'), 'png'))
- SPLASH_FONT = SPLASH.font()
- SPLASH_FONT.setPixelSize(10)