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

eborisch at macports.org eborisch at macports.org
Thu Jul 19 06:15:42 PDT 2012


Revision: 95694
          https://trac.macports.org/changeset/95694
Author:   eborisch at macports.org
Date:     2012-07-19 06:15:42 -0700 (Thu, 19 Jul 2012)
Log Message:
-----------
py-spyder: Adds patch to make ctrl-c (rather than cmd-c iff no text selected) the interrupt signal in shells.

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

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

Modified: trunk/dports/python/py-spyder/Portfile
===================================================================
--- trunk/dports/python/py-spyder/Portfile	2012-07-19 12:40:33 UTC (rev 95693)
+++ trunk/dports/python/py-spyder/Portfile	2012-07-19 13:15:42 UTC (rev 95694)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 name                py-spyder
 version             2.1.10
-revision            2
+revision            3
 epoch               20111202
 
 PortGroup           python 1.0
@@ -55,6 +55,7 @@
                         spyderlib_spyder.py.diff \
                         spyderlib_utils_bsdsocket.py.diff \
                         spyderlib_utils_programs.py.diff \
+                        spyderlib_widgets_shell.py.diff \
                         spyderlib_widgets_sourcecode_codeeditor.py.diff \
                         ipython_checks.diff
 

Added: trunk/dports/python/py-spyder/files/spyderlib_widgets_shell.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_widgets_shell.py.diff	                        (rev 0)
+++ trunk/dports/python/py-spyder/files/spyderlib_widgets_shell.py.diff	2012-07-19 13:15:42 UTC (rev 95694)
@@ -0,0 +1,34 @@
+--- 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,11 @@
+         # 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:
++            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/20120719/9cf9d6c3/attachment.html>


More information about the macports-changes mailing list