[102537] trunk/dports/python/py-spyder-devel/files

[eborisch at macports.org]

Revision: 102537
          https://trac.macports.org/changeset/102537
Author:   eborisch at macports.org
Date:     2013-02-04 09:55:39 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
py-spyder-devel: Delete correct patchfile.

Added Paths:
-----------
    trunk/dports/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff

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

Copied: trunk/dports/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff (from rev 102532, trunk/dports/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff)
===================================================================
--- trunk/dports/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff	                        (rev 0)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff	2013-02-04 17:55:39 UTC (rev 102537)
@@ -0,0 +1,13 @@
+--- spyderlib/utils/programs.py.orig	2011-10-12 11:06:09.000000000 -0500
++++ spyderlib/utils/programs.py	2011-10-12 11:07:28.000000000 -0500
+@@ -20,6 +20,10 @@
+         abspath = osp.join(path, basename)
+         if osp.isfile(abspath):
+             return abspath
++        else:
++            abspath = "@@APPS_DIR@@/Qt4/" + basename + ".app/Contents/MacOS/" + basename
++            if osp.isfile(abspath):
++                return abspath
+ 
+ 
+ def find_program(basename):

Deleted: trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_shell.py.diff
===================================================================
--- trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_shell.py.diff	2013-02-04 17:38:29 UTC (rev 102536)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_shell.py.diff	2013-02-04 17:55:39 UTC (rev 102537)
@@ -1,35 +0,0 @@
---- spyderlib/widgets/shell.py.orig	2012-07-18 15:55:19.000000000 -0500
-+++ spyderlib/widgets/shell.py	2012-07-18 15:58:31.000000000 -0500
-@@ -227,11 +227,13 @@
-         
-     #------ Copy / Keyboard interrupt
-     def copy(self):
--        """Copy text to clipboard... or keyboard interrupt"""
-+        """Copy text to clipboard"""
-         if self.has_selected_text():
-             ConsoleBaseWidget.copy(self)
--        else:
--            self.emit(SIGNAL("keyboard_interrupt()"))
-+            
-+    def interrupt(self):
-+        """Keyboard interrupt"""
-+        self.emit(SIGNAL("keyboard_interrupt()"))
-             
-     def cut(self):
-         """Cut text"""
-@@ -305,9 +307,12 @@
-         # Copy must be done first to be able to copy read-only text parts
-         # (otherwise, right below, we would remove selection
-         #  if not on current line)
--        ctrl = event.modifiers() & Qt.ControlModifier
--        if event.key() == Qt.Key_C and ctrl:
--            self.copy()
-+        if event.key() == Qt.Key_C and ((Qt.MetaModifier | Qt.ControlModifier) &
-+                                        event.modifiers()):
-+            if event.modifiers() & Qt.MetaModifier: # OSX: Meta = control
-+              self.interrupt()
-+            elif event.modifiers() & Qt.ControlModifier: # Control = command
-+              self.copy()
-             event.accept()
-             return True
-         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130204/859e1477/attachment.html>