[Python-modules-commits] [pyenchant] 04/05: merge patched into master

[Piotr Ożarowski]

This is an automated email from the git hooks/post-receive script.

piotr pushed a commit to branch master
in repository pyenchant.

commit f280fc667b14d2b861fce1068e4b324a31bd5171
Merge: 6e56875 07943ab
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Aug 6 10:43:18 2016 +0200

    merge patched into master

 PKG-INFO                                 |   2 +-
 README.txt                               |  48 ++-------
 debian/.git-dpm                          |   6 +-
 debian/patches/wxpython3.0.patch         |   4 +-
 enchant/__init__.py                      | 165 +++++++++++++++++--------------
 enchant/_enchant.py                      |   6 +-
 enchant/checker/GtkSpellCheckerDialog.py |   6 +-
 enchant/checker/tests.py                 |   4 +-
 enchant/errors.py                        |   2 +-
 enchant/tests.py                         |  24 ++---
 enchant/tokenize/__init__.py             |  38 +++----
 enchant/tokenize/en.py                   |   2 +-
 enchant/utils.py                         |  74 +++++++++-----
 pyenchant.egg-info/PKG-INFO              |   2 +-
 pyenchant.egg-info/eager_resources.txt   |  12 ++-
 setup.cfg                                |   2 +-
 setup.py                                 |   6 +-
 tools/shootout.py                        |   4 +-
 tools/wx_example.py                      |   4 +-
 19 files changed, 216 insertions(+), 195 deletions(-)

diff --cc debian/.git-dpm
index 94167eb,0000000..6a52797
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e833c092d7bc92d598d14a1c7898a130f2e23ce4
- e833c092d7bc92d598d14a1c7898a130f2e23ce4
- f46f727ddd722a02a5e429728205b52c5fa179a1
++07943ab55ff3b4e8c2d57804b6efbc3432599f88
++07943ab55ff3b4e8c2d57804b6efbc3432599f88
++651192e97d5b5dc8fa37c505d9fb0790bcd0a310
 +651192e97d5b5dc8fa37c505d9fb0790bcd0a310
 +pyenchant_1.6.7.orig.tar.gz
 +ec63323359e8b10bcd1a8fc30fd2c02190d70560
 +63673
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/wxpython3.0.patch
index ba506cb,0000000..b6f1fd6
mode 100644,000000..100644
--- a/debian/patches/wxpython3.0.patch
+++ b/debian/patches/wxpython3.0.patch
@@@ -1,42 -1,0 +1,42 @@@
- From e833c092d7bc92d598d14a1c7898a130f2e23ce4 Mon Sep 17 00:00:00 2001
++From 07943ab55ff3b4e8c2d57804b6efbc3432599f88 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 10:28:07 -0700
 +Subject: Update for wxPython 3.0
 +
 + These changes should remain compatible with wxPython 2.8.
 +Bug-Debian: https://bugs.debian.org/759075
 +Forwarded: no
 +Last-Update: 2014-09-14
 +
 +Patch-Name: wxpython3.0.patch
 +---
 + enchant/checker/wxSpellCheckerDialog.py | 2 +-
 + tools/wx_example.py                     | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/enchant/checker/wxSpellCheckerDialog.py b/enchant/checker/wxSpellCheckerDialog.py
 +index b6aa66b..6ae1689 100644
 +--- a/enchant/checker/wxSpellCheckerDialog.py
 ++++ b/enchant/checker/wxSpellCheckerDialog.py
 +@@ -256,7 +256,7 @@ def _test():
 +     from enchant.checker import SpellChecker
 +     text = "This is sme text with a fw speling errors in it. Here are a fw more to tst it ut."
 +     printf(["BEFORE:", text])
 +-    app = wx.PySimpleApp()
 ++    app = wx.App(False)
 +     dlg = TestDialog()
 +     chkr = SpellChecker("en_US",text)
 +     dlg.SetSpellChecker(chkr)
 +diff --git a/tools/wx_example.py b/tools/wx_example.py
- index f097ab1..5fec515 100644
++index c0d9285..d88ebcb 100644
 +--- a/tools/wx_example.py
 ++++ b/tools/wx_example.py
 +@@ -10,7 +10,7 @@ text = "this is some smple text with a few erors in it"
 + print "[INITIAL TEXT:]", text
 + 
 + # Need to have an App before any windows will be shown
 +-app = wx.PySimpleApp()
 ++app = wx.App(False)
 + 
 + # Construct the dialog, and the SpellChecker it is to use
 + dlg = wxSpellCheckerDialog(None)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyenchant.git