[Python-apps-commits] r12592 - in packages/pyspread/trunk/debian (4 files)

[anoteng-guest at users.alioth.debian.org]

    Date: Wednesday, November 11, 2015 @ 22:04:17
  Author: anoteng-guest
Revision: 12592

add patch from upstream to fix code autocompletion after change in python-jedi

Added:
  packages/pyspread/trunk/debian/patches/fix_autocompletion.patch
Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/control
  packages/pyspread/trunk/debian/patches/series

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2015-11-11 12:58:01 UTC (rev 12591)
+++ packages/pyspread/trunk/debian/changelog	2015-11-11 22:04:17 UTC (rev 12592)
@@ -1,3 +1,11 @@
+pyspread (1.0-2) unstable; urgency=medium
+
+  * Fix autocompletion (Closes: #804449)
+    (fix_autocompletion.patch)
+  * Add minimum version 0.9.0-1 to Recommends: python-jedi
+
+ -- Andreas Noteng <andreas at noteng.no>  Wed, 11 Nov 2015 22:59:44 +0100
+
 pyspread (1.0-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control	2015-11-11 12:58:01 UTC (rev 12591)
+++ packages/pyspread/trunk/debian/control	2015-11-11 22:04:17 UTC (rev 12592)
@@ -22,7 +22,7 @@
          python-wxgtk3.0,
          ${misc:Depends},
          ${python:Depends}
-Recommends: python-jedi, python-rsvg, python-xlrd, python-xlwt
+Recommends: python-jedi (>=0.9.0-1), python-rsvg, python-xlrd, python-xlwt
 Suggests: python-mpltoolkits.basemap, ttf-mscorefonts-installer
 Description: cross-platform Python spreadsheet application
  Pyspread is a cross-platform Python spreadsheet application. Instead of

Added: packages/pyspread/trunk/debian/patches/fix_autocompletion.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/fix_autocompletion.patch	                        (rev 0)
+++ packages/pyspread/trunk/debian/patches/fix_autocompletion.patch	2015-11-11 22:04:17 UTC (rev 12592)
@@ -0,0 +1,34 @@
+Description: Fix autocompletion in Pyspread after API change in python-jedi
+Author: Martin Manns
+Origin: upstream, https://github.com/manns/pyspread/commit/cb89eb2cdbfbe47cc39c616464fcff1d58c0a052
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804449
+Last-Update: 2015-11-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: pyspread-1.0/pyspread/src/gui/_widgets.py
+===================================================================
+--- pyspread-1.0.orig/pyspread/src/gui/_widgets.py
++++ pyspread-1.0/pyspread/src/gui/_widgets.py
+@@ -939,10 +939,11 @@ class EntryLine(wx.TextCtrl, EntryLineEv
+                     event.Skip()
+                     return
+ 
+-                completions = script.complete()
++                completions = script.completions()
+                 completes = [completion.complete for completion in completions]
+                 complete = common_start(completes)
+-                if complete:
++                if complete and \
++		    not self.GetSelection()[1] > self.GetSelection()[0]:
+                     # There is a non-empty completion
+                     insertion_point = self.GetInsertionPoint()
+                     self.write(complete)
+@@ -950,7 +951,7 @@ class EntryLine(wx.TextCtrl, EntryLineEv
+                         self.SetSelection(insertion_point,
+                                           insertion_point + len(complete))
+ 
+-                words = [completion.word for completion in completions]
++                words = [completion.name for completion in completions]
+ 
+                 docs = []
+                 for completion in completions:

Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series	2015-11-11 12:58:01 UTC (rev 12591)
+++ packages/pyspread/trunk/debian/patches/series	2015-11-11 22:04:17 UTC (rev 12592)
@@ -1,3 +1,4 @@
 about_dialog_license.patch
 change_default_paths.patch
 python_tutorial.patch
+fix_autocompletion.patch