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

[eborisch at macports.org]

Revision: 96288
          https://trac.macports.org/changeset/96288
Author:   eborisch at macports.org
Date:     2012-08-06 21:16:31 -0700 (Mon, 06 Aug 2012)
Log Message:
-----------
py-spyder: Fixing 'c' in console. Fixes #35564

Modified Paths:
--------------
    trunk/dports/python/py-spyder/Portfile
    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-08-07 03:34:11 UTC (rev 96287)
+++ trunk/dports/python/py-spyder/Portfile	2012-08-07 04:16:31 UTC (rev 96288)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 name                py-spyder
 version             2.1.11
-revision            1
+revision            2
 epoch               20111202
 
 PortGroup           python 1.0

Modified: trunk/dports/python/py-spyder/files/spyderlib_widgets_shell.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_widgets_shell.py.diff	2012-08-07 03:34:11 UTC (rev 96287)
+++ trunk/dports/python/py-spyder/files/spyderlib_widgets_shell.py.diff	2012-08-07 04:16:31 UTC (rev 96288)
@@ -17,14 +17,15 @@
              
      def cut(self):
          """Cut text"""
-@@ -305,9 +307,11 @@
+@@ -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:
++        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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120806/3cd03cc6/attachment.html>