[Python-modules-commits] [pyenchant] 04/08: 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 afdf82caee70d770830a09793ca5e7c4221ff0fe
Merge: 2fa8abd 2ff8081
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Sep 29 09:59:06 2017 +0200

    merge patched into master

 LICENSE.txt                              |   0
 MANIFEST.in                              |   0
 PKG-INFO                                 |   2 +-
 README.txt                               |   0
 TODO.txt                                 |   0
 debian/.git-dpm                          |   6 +-
 debian/patches/wxpython3.0.patch         |   6 +-
 enchant/__init__.py                      |  20 ++--
 enchant/_enchant.py                      |   0
 enchant/checker/CmdLineChecker.py        | 175 +++++++++++++++++++++++--------
 enchant/checker/GtkSpellCheckerDialog.py |   0
 enchant/checker/__init__.py              |   0
 enchant/checker/tests.py                 |   0
 enchant/checker/wxSpellCheckerDialog.py  |   0
 enchant/errors.py                        |   0
 enchant/pypwl.py                         |   0
 enchant/tests.py                         |  18 ++--
 enchant/tokenize/__init__.py             |  36 ++++++-
 enchant/tokenize/en.py                   |  22 +++-
 enchant/tokenize/tests.py                |  13 +++
 enchant/utils.py                         |   0
 ez_setup.py                              |   0
 pyenchant.egg-info/PKG-INFO              |   2 +-
 pyenchant.egg-info/SOURCES.txt           |   0
 pyenchant.egg-info/dependency_links.txt  |   0
 pyenchant.egg-info/eager_resources.txt   |  12 +--
 pyenchant.egg-info/top_level.txt         |   0
 setup.cfg                                |   2 +-
 setup.py                                 |   4 +-
 tools/setup.py2exe.py                    |   0
 tools/shootout.py                        |   0
 tools/test_multiprocessing.py            |   0
 tools/wx_example.py                      |   0
 33 files changed, 234 insertions(+), 84 deletions(-)

diff --cc debian/.git-dpm
index b9245b4,0000000..e9d2fce
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
- 07943ab55ff3b4e8c2d57804b6efbc3432599f88
- 07943ab55ff3b4e8c2d57804b6efbc3432599f88
- 651192e97d5b5dc8fa37c505d9fb0790bcd0a310
++2ff8081da544ec287932d150f23ff1a9efc14673
++2ff8081da544ec287932d150f23ff1a9efc14673
++e95dd26b09bf24865eaf911f4e3a00f57e3d1c47
 +e95dd26b09bf24865eaf911f4e3a00f57e3d1c47
 +pyenchant_1.6.11.orig.tar.gz
 +0119a4ceaa849bc45efbca8d4f5afed537eefc8b
 +64137
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/wxpython3.0.patch
index b6f1fd6,0000000..168dc92
mode 100644,000000..100644
--- a/debian/patches/wxpython3.0.patch
+++ b/debian/patches/wxpython3.0.patch
@@@ -1,42 -1,0 +1,42 @@@
- From 07943ab55ff3b4e8c2d57804b6efbc3432599f88 Mon Sep 17 00:00:00 2001
++From 2ff8081da544ec287932d150f23ff1a9efc14673 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
++index b6aa66b..6ae1689 100755
 +--- 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 c0d9285..d88ebcb 100644
++index c0d9285..d88ebcb 100755
 +--- 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