[Python-modules-commits] [twisted] 01/16: tmp

[Free Ekanayaka]

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

freee pushed a commit to branch patch-queue/master
in repository twisted.

commit ab824b7f51715ab8f82736bade0e449261c1ea13
Author: Free Ekanayaka <free.ekanayaka at canonical.com>
Date:   Mon Aug 28 07:17:28 2017 +0000

    tmp
---
 debian/{patches/0007-openssl-1.1.0.patch => patch2} | 0
 debian/patches/0001-wxpython3.0.patch               | 8 ++++----
 debian/patches/series                               | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0007-openssl-1.1.0.patch b/debian/patch2
similarity index 100%
rename from debian/patches/0007-openssl-1.1.0.patch
rename to debian/patch2
diff --git a/debian/patches/0001-wxpython3.0.patch b/debian/patches/0001-wxpython3.0.patch
index c30bd0f..9fa12a9 100644
--- a/debian/patches/0001-wxpython3.0.patch
+++ b/debian/patches/0001-wxpython3.0.patch
@@ -8,12 +8,12 @@ Fix imports from the wx package.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/twisted/internet/wxreactor.py b/src/twisted/internet/wxreactor.py
-index 71e861a..6713de0 100644
+index a6c968d..1a73626 100644
 --- a/src/twisted/internet/wxreactor.py
 +++ b/src/twisted/internet/wxreactor.py
-@@ -25,11 +25,11 @@ real applications.
+@@ -29,11 +29,11 @@ except ImportError:
+     from Queue import Empty, Queue
  
- import Queue
  try:
 -    from wx import PySimpleApp as wxPySimpleApp, CallAfter as wxCallAfter, \
 +    from wx import App as wxApp, CallAfter as wxCallAfter, \
@@ -25,7 +25,7 @@ index 71e861a..6713de0 100644
  
  from twisted.python import log, runtime
  from twisted.internet import _threadedselect
-@@ -125,7 +125,7 @@ class WxReactor(_threadedselect.ThreadedSelectReactor):
+@@ -129,7 +129,7 @@ class WxReactor(_threadedselect.ThreadedSelectReactor):
          if not hasattr(self, "wxapp"):
              log.msg("registerWxApp() was not called on reactor, "
                      "registering my own wxApp instance.")
diff --git a/debian/patches/series b/debian/patches/series
index e4b4f58..b57ed7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@
 0006-fix-sphinx-import-path.patch
 0008-sort-option-keys.patch
 0009-no-stderr-in-test_ckeygen.patch
-0007-openssl-1.1.0.patch
 0010-handle-setlocale-test-failure.patch

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