[Python-modules-commits] [twisted] 05/08: Imported patches from patch-queue/master via gbp pq export.
Free Ekanayaka
freee at moszumanska.debian.org
Thu Oct 20 08:27:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
freee pushed a commit to branch master
in repository twisted.
commit c10959f83983ffb921b1261b6c3329284f93651f
Author: Free Ekanayaka <freee at debian.org>
Date: Thu Oct 20 04:41:48 2016 +0000
Imported patches from patch-queue/master via gbp pq export.
---
debian/changelog | 7 +++++--
debian/patches/combinedlog.patch | 36 ++++++++++++++++++++----------------
debian/patches/lp1098127.diff | 30 ------------------------------
debian/patches/lp1102685.diff | 37 -------------------------------------
debian/patches/series | 4 ----
debian/patches/sphinx-theme.diff | 13 +++++++++++--
debian/patches/wxpython3.0.patch | 21 ++++++++++++---------
7 files changed, 48 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8440fee..b227867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-twisted (16.4.1-2) UNRELEASED; urgency=medium
+twisted (16.4.1-2ubuntu1~1.gbpaef4ec) UNRELEASED; urgency=medium
+
+ ** SNAPSHOT build @aef4ecf9295710eb9109fa455c22c2e5342c1f35 **
* Add Vcs-Git and Vcs-Browser stanzas pointing to Alioth.
* Don't remove Twisted.egg-info in the clean target, as it's part of
the upstream source.
* Point watch file to pypi.debian.ne.
+ * Imported patches from patch-queue/master via gbp pq export.
- -- Free Ekanayaka <freee at debian.org> Wed, 19 Oct 2016 19:06:21 +0000
+ -- Free Ekanayaka <freee at debian.org> Thu, 20 Oct 2016 04:43:26 +0000
twisted (16.4.1-1) unstable; urgency=medium
diff --git a/debian/patches/combinedlog.patch b/debian/patches/combinedlog.patch
index e0b5340..794e05a 100644
--- a/debian/patches/combinedlog.patch
+++ b/debian/patches/combinedlog.patch
@@ -1,6 +1,6 @@
-Description: Don't enclose IPs between double quotes in combined log
- This is a fix for upstream bug #7730, which restores the combined log
- format that was in place until version 14.0.0. See also
+From: Matthias Klose <doko at debian.org>
+Date: Thu, 20 Oct 2016 04:34:06 +0000
+Subject: combinedlog
https://twistedmatrix.com/trac/ticket/7730
@@ -9,12 +9,16 @@ Author: Free Ekanayaka <freee at debian.org>
Bug-Debian: https://bugs.debian.org/772629
Forwarded: yes
Last-Update: 2014-11-09
+---
+ twisted/web/http.py | 2 +-
+ twisted/web/test/test_web.py | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
-Index: b/twisted/web/http.py
-===================================================================
+diff --git a/twisted/web/http.py b/twisted/web/http.py
+index c7caba3..148fb86 100644
--- a/twisted/web/http.py
+++ b/twisted/web/http.py
-@@ -1911,7 +1911,7 @@ def combinedLogFormatter(timestamp, requ
+@@ -2143,7 +2143,7 @@ def combinedLogFormatter(timestamp, request):
referrer = _escape(request.getHeader(b"referer") or b"-")
agent = _escape(request.getHeader(b"user-agent") or b"-")
line = (
@@ -23,11 +27,11 @@ Index: b/twisted/web/http.py
u'%(code)d %(length)s "%(referrer)s" "%(agent)s"' % dict(
ip=_escape(request.getClientIP() or b"-"),
timestamp=timestamp,
-Index: b/twisted/web/test/test_web.py
-===================================================================
+diff --git a/twisted/web/test/test_web.py b/twisted/web/test/test_web.py
+index 6f10648..f2cb628 100644
--- a/twisted/web/test/test_web.py
+++ b/twisted/web/test/test_web.py
-@@ -1056,7 +1056,7 @@ class AccessLogTestsMixin(object):
+@@ -1185,7 +1185,7 @@ class AccessLogTestsMixin(object):
self.assertEqual(
# Client IP
@@ -36,7 +40,7 @@ Index: b/twisted/web/test/test_web.py
# Some blanks we never fill in
b'- - '
# The current time (circa 1234567890)
-@@ -1156,7 +1156,7 @@ class CombinedLogFormatterTests(unittest
+@@ -1285,7 +1285,7 @@ class CombinedLogFormatterTests(unittest.TestCase):
line = http.combinedLogFormatter(timestamp, request)
self.assertEqual(
@@ -45,7 +49,7 @@ Index: b/twisted/web/test/test_web.py
u'"POS\\x81 /dummy HTTP/1.0" 123 - "evil \\x83" "evil \\x84"',
line)
-@@ -1248,7 +1248,7 @@ class LogEscapingTests(unittest.TestCase
+@@ -1377,7 +1377,7 @@ class LogEscapingTests(unittest.TestCase):
self.site._logDateTime = "[%02d/%3s/%4d:%02d:%02d:%02d +0000]" % (
25, 'Oct', 2004, 12, 31, 59)
self.assertLogs(
@@ -54,7 +58,7 @@ Index: b/twisted/web/test/test_web.py
b'"GET /dummy HTTP/1.0" 123 - "-" "-"\n')
-@@ -1260,7 +1260,7 @@ class LogEscapingTests(unittest.TestCase
+@@ -1389,7 +1389,7 @@ class LogEscapingTests(unittest.TestCase):
25, 'Oct', 2004, 12, 31, 59)
self.request.method = b'G"T'
self.assertLogs(
@@ -63,7 +67,7 @@ Index: b/twisted/web/test/test_web.py
b'"G\\"T /dummy HTTP/1.0" 123 - "-" "-"\n')
-@@ -1272,7 +1272,7 @@ class LogEscapingTests(unittest.TestCase
+@@ -1401,7 +1401,7 @@ class LogEscapingTests(unittest.TestCase):
25, 'Oct', 2004, 12, 31, 59)
self.request.uri = b'/dummy"withquote'
self.assertLogs(
@@ -72,7 +76,7 @@ Index: b/twisted/web/test/test_web.py
b'"GET /dummy\\"withquote HTTP/1.0" 123 - "-" "-"\n')
-@@ -1284,7 +1284,7 @@ class LogEscapingTests(unittest.TestCase
+@@ -1413,7 +1413,7 @@ class LogEscapingTests(unittest.TestCase):
25, 'Oct', 2004, 12, 31, 59)
self.request.clientproto = b'HT"P/1.0'
self.assertLogs(
@@ -81,7 +85,7 @@ Index: b/twisted/web/test/test_web.py
b'"GET /dummy HT\\"P/1.0" 123 - "-" "-"\n')
-@@ -1299,7 +1299,7 @@ class LogEscapingTests(unittest.TestCase
+@@ -1428,7 +1428,7 @@ class LogEscapingTests(unittest.TestCase):
b'referer',
b'http://malicious" ".website.invalid')
self.assertLogs(
@@ -90,7 +94,7 @@ Index: b/twisted/web/test/test_web.py
b'"GET /dummy HTTP/1.0" 123 - '
b'"http://malicious\\" \\".website.invalid" "-"\n')
-@@ -1314,7 +1314,7 @@ class LogEscapingTests(unittest.TestCase
+@@ -1443,7 +1443,7 @@ class LogEscapingTests(unittest.TestCase):
self.request.requestHeaders.addRawHeader(b'user-agent',
b'Malicious Web" Evil')
self.assertLogs(
diff --git a/debian/patches/lp1098127.diff b/debian/patches/lp1098127.diff
deleted file mode 100644
index 7c4b754..0000000
--- a/debian/patches/lp1098127.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Use new io_add_watch api on new versions of pygobject.
-Bug: https://twistedmatrix.com/trac/ticket/6369
-Author: Rodney Dawes <rodney.dawes at canonical.com>
-
-=== modified file 'twisted/internet/_glibbase.py'
-Index: b/twisted/internet/_glibbase.py
-===================================================================
---- a/twisted/internet/_glibbase.py
-+++ b/twisted/internet/_glibbase.py
-@@ -157,9 +157,17 @@
- else:
- fileno = source
- wrapper = callback
-- return self._glib.io_add_watch(
-- fileno, condition, wrapper,
-- priority=self._glib.PRIORITY_DEFAULT_IDLE)
-+ try:
-+ from gi import version_info as gi_version
-+ except ImportError:
-+ gi_version = (2, 32, 0)
-+ if gi_version < (3, 7, 3):
-+ return self._glib.io_add_watch(
-+ fileno, condition, wrapper,
-+ priority=self._glib.PRIORITY_DEFAULT_IDLE)
-+ else:
-+ return self._glib.io_add_watch(
-+ fileno, self._glib.PRIORITY_DEFAULT, condition, wrapper)
-
-
- def _ioEventCallback(self, source, condition):
diff --git a/debian/patches/lp1102685.diff b/debian/patches/lp1102685.diff
deleted file mode 100644
index f0ed221..0000000
--- a/debian/patches/lp1102685.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Use pygtkcompat directly and fall back to gi.pygtkcompat
-Bug: https://twistedmatrix.com/trac/ticket/6280
-Author: Rodney Dawes <rodney.dawes at canonical.com>
-
-=== modified file 'twisted/internet/gireactor.py'
---- old/twisted/internet/gireactor.py 2013-01-16 17:44:26 +0000
-+++ new/twisted/internet/gireactor.py 2013-01-23 17:13:29 +0000
-@@ -37,9 +37,12 @@ else:
- from twisted.python.modules import theSystemPath
- _pygtkcompatPresent = True
- try:
-- theSystemPath["gi.pygtkcompat"]
-+ theSystemPath["pygtkcompat"]
- except KeyError:
-- _pygtkcompatPresent = False
-+ try:
-+ theSystemPath["gi.pygtkcompat"]
-+ except KeyError:
-+ _pygtkcompatPresent = False
-
-
- # Modules that we want to ensure aren't imported if we're on older versions of
-@@ -75,8 +78,11 @@ else:
- # Newer version of gi, so we can try to initialize compatibility layer; if
- # real pygtk was already imported we'll get ImportError at this point
- # rather than segfault, so unconditional import is fine.
-- import gi.pygtkcompat
-- gi.pygtkcompat.enable()
-+ try:
-+ import pygtkcompat
-+ except ImportError:
-+ from gi import pygtkcompat
-+ pygtkcompat.enable()
- # At this point importing gobject will get you gi version, and importing
- # e.g. gtk will either fail in non-segfaulty way or use gi version if user
- # does gi.pygtkcompat.enable_gtk(). So, no need to prevent imports of
-
diff --git a/debian/patches/series b/debian/patches/series
index 1908151..cc55506 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
wxpython3.0.patch
combinedlog.patch
-
-# don't apply, performance issue just for backward compatibility
-#lp1102685.diff
-#lp1098127.diff
sphinx-theme.diff
diff --git a/debian/patches/sphinx-theme.diff b/debian/patches/sphinx-theme.diff
index 910f117..efc525f 100644
--- a/debian/patches/sphinx-theme.diff
+++ b/debian/patches/sphinx-theme.diff
@@ -1,8 +1,17 @@
-Index: b/docs/conf.py
+From: Matthias Klose <doko at debian.org>
+Date: Thu, 20 Oct 2016 04:34:07 +0000
+Subject: sphinx-theme
+
===================================================================
+---
+ docs/conf.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 1679d0c..5f498b2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -120,6 +120,8 @@ on_rtd = os.environ.get('READTHEDOCS', N
+@@ -120,6 +120,8 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
if not on_rtd:
html_theme = 'twistedtrac'
diff --git a/debian/patches/wxpython3.0.patch b/debian/patches/wxpython3.0.patch
index ecfe338..cc14ad9 100644
--- a/debian/patches/wxpython3.0.patch
+++ b/debian/patches/wxpython3.0.patch
@@ -1,12 +1,15 @@
-Description: Update for wxPython 3.0
- These changes should remain compatible with wxPython 2.8.
-Author: Olly Betts <olly at survex.com>
-Bug-Debian: https://bugs.debian.org/759073
-Forwarded: no
-Last-Update: 2014-09-20
+From: Matthias Klose <doko at debian.org>
+Date: Thu, 20 Oct 2016 04:34:06 +0000
+Subject: wxpython3.0
---- twisted-14.0.0.orig/twisted/internet/wxreactor.py
-+++ twisted-14.0.0/twisted/internet/wxreactor.py
+---
+ twisted/internet/wxreactor.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/twisted/internet/wxreactor.py b/twisted/internet/wxreactor.py
+index 71e861a..6713de0 100644
+--- a/twisted/internet/wxreactor.py
++++ b/twisted/internet/wxreactor.py
@@ -25,11 +25,11 @@ real applications.
import Queue
@@ -21,7 +24,7 @@ Last-Update: 2014-09-20
from twisted.python import log, runtime
from twisted.internet import _threadedselect
-@@ -125,7 +125,7 @@ class WxReactor(_threadedselect.Threaded
+@@ -125,7 +125,7 @@ class WxReactor(_threadedselect.ThreadedSelectReactor):
if not hasattr(self, "wxapp"):
log.msg("registerWxApp() was not called on reactor, "
"registering my own wxApp instance.")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/twisted.git
More information about the Python-modules-commits
mailing list