[arch-commits] Commit in python-pyenchant/trunk (2 files)

[Jelle van der Waa]

    Date: Saturday, December 2, 2017 @ 20:44:13
  Author: jelle
Revision: 271925

upgpkg: python-pyenchant 1.6.11-2

Remove enchant's deprecated is_in_session function.
Which is removed in enchant 2.

Added:
  python-pyenchant/trunk/0001-Add-enchant-2-compatibility.patch
Modified:
  python-pyenchant/trunk/PKGBUILD

----------------------------------------+
 0001-Add-enchant-2-compatibility.patch |   70 +++++++++++++++++++++++++++++++
 PKGBUILD                               |   13 ++++-
 2 files changed, 80 insertions(+), 3 deletions(-)

Added: 0001-Add-enchant-2-compatibility.patch
===================================================================
--- 0001-Add-enchant-2-compatibility.patch	                        (rev 0)
+++ 0001-Add-enchant-2-compatibility.patch	2017-12-02 20:44:13 UTC (rev 271925)
@@ -0,0 +1,70 @@
+From 4ecabbdb345a4f84e97e05abb970e8ca83e6b52e Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at vdwaa.nl>
+Date: Sat, 2 Dec 2017 21:13:42 +0100
+Subject: [PATCH] Add enchant 2 compatibility
+
+Remove is_in_session of which the function is removed in Enchant 2.0 and
+was already deprecated.
+---
+ enchant/__init__.py | 9 ---------
+ enchant/_enchant.py | 6 ------
+ enchant/pypwl.py    | 6 ------
+ 3 files changed, 21 deletions(-)
+
+diff --git a/enchant/__init__.py b/enchant/__init__.py
+index 016d32f..56ecbeb 100644
+--- a/enchant/__init__.py
++++ b/enchant/__init__.py
+@@ -715,15 +715,6 @@ class Dict(_EnchantObject):
+         word = self._StringClass(word)
+         return _e.dict_is_removed(self._this,word.encode())
+ 
+-    def is_in_session(self,word):
+-        """Check whether a word is in the session list."""
+-        warnings.warn("Dict.is_in_session is deprecated, "\
+-                      "please use Dict.is_added",
+-                      category=DeprecationWarning,stacklevel=2)
+-        self._check_this()
+-        word = self._StringClass(word)
+-        return _e.dict_is_in_session(self._this,word.encode())
+-
+     def store_replacement(self,mis,cor):
+         """Store a replacement spelling for a miss-spelled word.
+ 
+diff --git a/enchant/_enchant.py b/enchant/_enchant.py
+index a07058d..cf77908 100644
+--- a/enchant/_enchant.py
++++ b/enchant/_enchant.py
+@@ -309,12 +309,6 @@ dict_is_removed1.restype = c_int
+ def dict_is_removed(dict,word):
+     return dict_is_removed1(dict,word,len(word))
+ 
+-dict_is_in_session1 = e.enchant_dict_is_in_session
+-dict_is_in_session1.argtypes = [t_dict,c_char_p,c_size_t]
+-dict_is_in_session1.restype = c_int
+-def dict_is_in_session(dict,word):
+-    return dict_is_in_session1(dict,word,len(word))
+-
+ dict_store_replacement1 = e.enchant_dict_store_replacement
+ dict_store_replacement1.argtypes = [t_dict,c_char_p,c_size_t,c_char_p,c_size_t]
+ dict_store_replacement1.restype = None
+diff --git a/enchant/pypwl.py b/enchant/pypwl.py
+index 3a2248f..282c015 100644
+--- a/enchant/pypwl.py
++++ b/enchant/pypwl.py
+@@ -247,12 +247,6 @@ class PyPWL:
+         """Add a word to the session list."""
+         self._words.insert(word)
+                     
+-    def is_in_session(self,word):
+-        """Check whether a word is in the session list."""
+-        warnings.warn("PyPWL.is_in_session is deprecated, please use PyPWL.is_added",category=DeprecationWarning)
+-        # Consider all words to be in the session list
+-        return self.check(word)
+-    
+     def store_replacement(self,mis,cor):
+         """Store a replacement spelling for a miss-spelled word.
+         
+-- 
+2.15.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-02 19:46:26 UTC (rev 271924)
+++ PKGBUILD	2017-12-02 20:44:13 UTC (rev 271925)
@@ -7,14 +7,21 @@
 
 pkgname=('python-pyenchant' 'python2-pyenchant')
 pkgver=1.6.11
-pkgrel=1
+pkgrel=2
 arch=('any')
 url="https://pypi.python.org/pypi/pyenchant"
 license=('LGPL')
 makedepends=('python2-setuptools' 'python-setuptools' 'enchant')
-source=('https://pypi.python.org/packages/f3/00/c04496277b1e681d0f500baf7ac8f3c7f1d21b9ea97ed951ed4ac5635fda/pyenchant-1.6.11.tar.gz')
-md5sums=('a97f46c6bf0133318759e099117e91a8')
+source=('https://pypi.python.org/packages/f3/00/c04496277b1e681d0f500baf7ac8f3c7f1d21b9ea97ed951ed4ac5635fda/pyenchant-1.6.11.tar.gz'
+        '0001-Add-enchant-2-compatibility.patch')
+md5sums=('a97f46c6bf0133318759e099117e91a8'
+         'b25bd3e7e3b6c19d24d2209214673e41')
 
+prepare() {
+  cd pyenchant-${pkgver}
+  patch -Np1 -i "${srcdir}/0001-Add-enchant-2-compatibility.patch"
+}
+
 build() {
   cp -r pyenchant-${pkgver} pyenchant2-${pkgver}