[95608] trunk/dports/python/py-spyder

eborisch at macports.org eborisch at macports.org
Tue Jul 17 13:47:52 PDT 2012


Revision: 95608
          https://trac.macports.org/changeset/95608
Author:   eborisch at macports.org
Date:     2012-07-17 13:47:52 -0700 (Tue, 17 Jul 2012)
Log Message:
-----------
py-spyder: Adjust version checks to detect IPython 0.13; Add error check in bsdsocket.py

Modified Paths:
--------------
    trunk/dports/python/py-spyder/Portfile

Added Paths:
-----------
    trunk/dports/python/py-spyder/files/ipython_checks.diff
    trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff

Removed Paths:
-------------
    trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff

Modified: trunk/dports/python/py-spyder/Portfile
===================================================================
--- trunk/dports/python/py-spyder/Portfile	2012-07-17 16:16:37 UTC (rev 95607)
+++ trunk/dports/python/py-spyder/Portfile	2012-07-17 20:47:52 UTC (rev 95608)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 name                py-spyder
 version             2.1.10
+revision            2
 epoch               20111202
 
 PortGroup           python 1.0
@@ -51,10 +52,11 @@
     patchfiles          patch-widgets-pylintgui.py.diff \
                         spyderlib_baseconfig.py.diff \
                         spyderlib_plugins_editor.py.diff \
-                        spyderlib_plugins_externalconsole.py.diff \
                         spyderlib_spyder.py.diff \
+                        spyderlib_utils_bsdsocket.py.diff \
                         spyderlib_utils_programs.py.diff \
-                        spyderlib_widgets_sourcecode_codeeditor.py.diff
+                        spyderlib_widgets_sourcecode_codeeditor.py.diff \
+                        ipython_checks.diff
 
     post-patch {
         reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \

Added: trunk/dports/python/py-spyder/files/ipython_checks.diff
===================================================================
--- trunk/dports/python/py-spyder/files/ipython_checks.diff	                        (rev 0)
+++ trunk/dports/python/py-spyder/files/ipython_checks.diff	2012-07-17 20:47:52 UTC (rev 95608)
@@ -0,0 +1,45 @@
+--- ./spyderlib/plugins/externalconsole.py.orig	2012-07-17 15:26:16.000000000 -0500
++++ ./spyderlib/plugins/externalconsole.py	2012-07-17 15:27:08.000000000 -0500
+@@ -339,9 +339,9 @@
+         ipython_group = QGroupBox(
+                             _("IPython interpreter command line options"))
+         ipython_layout = QVBoxLayout()
+-        ipython_is_installed = programs.is_module_installed('IPython', '0.1')
++        ipython_is_installed = programs.is_module_installed('IPython', '>=0.1')
+         if ipython_is_installed:
+-            if programs.is_module_installed('IPython', '0.12'):
++            if programs.is_module_installed('IPython', '>=0.12'):
+                 ipython_edit_012 = self.create_lineedit("IPython >=v0.12",
+                              'ipython_kernel_options', alignment=Qt.Horizontal)
+                 ipython_layout.addWidget(ipython_edit_012)
+--- ./spyderlib/spyder.py.orig	2012-07-17 15:28:33.000000000 -0500
++++ ./spyderlib/spyder.py	2012-07-17 15:29:35.000000000 -0500
+@@ -27,7 +27,7 @@
+ try:
+     # Test if IPython v0.11+ is installed
+     import IPython
+-    if IPython.__version__.startswith(('0.11', '0.12'))\
++    if IPython.__version__.startswith(('0.11', '0.12', '0.13'))\
+        and 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),
+@@ -837,7 +837,7 @@
+             self.help_menu_actions.append(web_resources)
+             
+             # IPython frontend action
+-            if is_module_installed('IPython', '0.12'):
++            if is_module_installed('IPython', '>=0.12'):
+                 ipf_action = create_action(self, _("New IPython frontend..."),
+                                            icon="ipython.png",
+                                            triggered=self.new_ipython_frontend)
+--- ./spyderlib/widgets/explorer.py.orig	2012-07-17 15:31:38.000000000 -0500
++++ ./spyderlib/widgets/explorer.py	2012-07-17 15:30:25.000000000 -0500
+@@ -286,7 +286,7 @@
+                                triggered=lambda fnames=fnames:
+                                self.open_interpreter(fnames))
+         actions.append(action)
+-        if programs.is_module_installed('IPython', '0.10'):
++        if programs.is_module_installed('IPython', '>=0.10'):
+             _title = _("Open IPython here")
+             action = create_action(self, _title, icon="ipython.png",
+                                    triggered=lambda fnames=fnames:

Deleted: trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff	2012-07-17 16:16:37 UTC (rev 95607)
+++ trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff	2012-07-17 20:47:52 UTC (rev 95608)
@@ -1,11 +0,0 @@
---- spyderlib/plugins/externalconsole.py.orig	2012-05-29 16:43:10.000000000 -0500
-+++ spyderlib/plugins/externalconsole.py	2012-05-29 16:43:31.000000000 -0500
-@@ -339,7 +339,7 @@
-         ipython_group = QGroupBox(
-                             _("IPython interpreter command line options"))
-         ipython_layout = QVBoxLayout()
--        ipython_is_installed = programs.is_module_installed('IPython', '0.1')
-+        ipython_is_installed = programs.is_module_installed('IPython', '>=0.1')
-         if ipython_is_installed:
-             if programs.is_module_installed('IPython', '0.12'):
-                 ipython_edit_012 = self.create_lineedit("IPython >=v0.12",

Added: trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff	                        (rev 0)
+++ trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff	2012-07-17 20:47:52 UTC (rev 95608)
@@ -0,0 +1,12 @@
+--- spyderlib/utils/bsdsocket.py.orig	2012-06-18 09:50:37.000000000 -0500
++++ spyderlib/utils/bsdsocket.py	2012-06-18 09:50:57.000000000 -0500
+@@ -33,6 +33,9 @@
+     dlen, data = None, None
+     try:
+         datalen = sock.recv(SZ)
++        if len(datalen) < SZ:  # Unable to read required size from socket
++          sock.settimeout(None)
++          return
+         dlen, = struct.unpack("l", datalen)
+         data = ''
+         while len(data) < dlen:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120717/81286822/attachment.html>


More information about the macports-changes mailing list