[Python-modules-commits] [twisted] 08/10: Fix patches to include some DEP-3 metadata.
Free Ekanayaka
freee at moszumanska.debian.org
Fri Oct 21 10:09:06 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 a7b473abaeeeee4b679f8c2d4e7d1c06f0e089b3
Author: Free Ekanayaka <freee at debian.org>
Date: Fri Oct 21 11:02:26 2016 +0200
Fix patches to include some DEP-3 metadata.
---
debian/patches/0004-localIntersphinx.patch | 4 +-
debian/patches/combinedlog.patch | 105 -----------------------------
debian/patches/series | 6 +-
debian/patches/sphinx-theme.diff | 22 ------
debian/patches/wxpython3.0.patch | 35 ----------
5 files changed, 6 insertions(+), 166 deletions(-)
diff --git a/debian/patches/0004-localIntersphinx.patch b/debian/patches/0004-localIntersphinx.patch
index bdbd7d4..f39d37a 100644
--- a/debian/patches/0004-localIntersphinx.patch
+++ b/debian/patches/0004-localIntersphinx.patch
@@ -3,7 +3,9 @@ Date: Fri, 21 Oct 2016 07:37:26 +0000
Subject: localIntersphinx
Use local copies of object.inv for building documentation.
-Doesn't need forwarding.
+
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/836169
---
docs/conf.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/combinedlog.patch b/debian/patches/combinedlog.patch
deleted file mode 100644
index 794e05a..0000000
--- a/debian/patches/combinedlog.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Matthias Klose <doko at debian.org>
-Date: Thu, 20 Oct 2016 04:34:06 +0000
-Subject: combinedlog
-
- https://twistedmatrix.com/trac/ticket/7730
-
- for more details.
-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(-)
-
-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
-@@ -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 = (
-- u'"%(ip)s" - - %(timestamp)s "%(method)s %(uri)s %(protocol)s" '
-+ u'%(ip)s - - %(timestamp)s "%(method)s %(uri)s %(protocol)s" '
- u'%(code)d %(length)s "%(referrer)s" "%(agent)s"' % dict(
- ip=_escape(request.getClientIP() or b"-"),
- timestamp=timestamp,
-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
-@@ -1185,7 +1185,7 @@ class AccessLogTestsMixin(object):
-
- self.assertEqual(
- # Client IP
-- b'"1.2.3.4" '
-+ b'1.2.3.4 '
- # Some blanks we never fill in
- b'- - '
- # The current time (circa 1234567890)
-@@ -1285,7 +1285,7 @@ class CombinedLogFormatterTests(unittest.TestCase):
-
- line = http.combinedLogFormatter(timestamp, request)
- self.assertEqual(
-- u'"evil x-forwarded-for \\x80" - - [13/Feb/2009:23:31:30 +0000] '
-+ u'evil x-forwarded-for \\x80 - - [13/Feb/2009:23:31:30 +0000] '
- u'"POS\\x81 /dummy HTTP/1.0" 123 - "evil \\x83" "evil \\x84"',
- line)
-
-@@ -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(
-- b'"1.2.3.4" - - [25/Oct/2004:12:31:59 +0000] '
-+ b'1.2.3.4 - - [25/Oct/2004:12:31:59 +0000] '
- b'"GET /dummy HTTP/1.0" 123 - "-" "-"\n')
-
-
-@@ -1389,7 +1389,7 @@ class LogEscapingTests(unittest.TestCase):
- 25, 'Oct', 2004, 12, 31, 59)
- self.request.method = b'G"T'
- self.assertLogs(
-- b'"1.2.3.4" - - [25/Oct/2004:12:31:59 +0000] '
-+ b'1.2.3.4 - - [25/Oct/2004:12:31:59 +0000] '
- b'"G\\"T /dummy HTTP/1.0" 123 - "-" "-"\n')
-
-
-@@ -1401,7 +1401,7 @@ class LogEscapingTests(unittest.TestCase):
- 25, 'Oct', 2004, 12, 31, 59)
- self.request.uri = b'/dummy"withquote'
- self.assertLogs(
-- b'"1.2.3.4" - - [25/Oct/2004:12:31:59 +0000] '
-+ b'1.2.3.4 - - [25/Oct/2004:12:31:59 +0000] '
- b'"GET /dummy\\"withquote HTTP/1.0" 123 - "-" "-"\n')
-
-
-@@ -1413,7 +1413,7 @@ class LogEscapingTests(unittest.TestCase):
- 25, 'Oct', 2004, 12, 31, 59)
- self.request.clientproto = b'HT"P/1.0'
- self.assertLogs(
-- b'"1.2.3.4" - - [25/Oct/2004:12:31:59 +0000] '
-+ b'1.2.3.4 - - [25/Oct/2004:12:31:59 +0000] '
- b'"GET /dummy HT\\"P/1.0" 123 - "-" "-"\n')
-
-
-@@ -1428,7 +1428,7 @@ class LogEscapingTests(unittest.TestCase):
- b'referer',
- b'http://malicious" ".website.invalid')
- self.assertLogs(
-- b'"1.2.3.4" - - [25/Oct/2004:12:31:59 +0000] '
-+ b'1.2.3.4 - - [25/Oct/2004:12:31:59 +0000] '
- b'"GET /dummy HTTP/1.0" 123 - '
- b'"http://malicious\\" \\".website.invalid" "-"\n')
-
-@@ -1443,7 +1443,7 @@ class LogEscapingTests(unittest.TestCase):
- self.request.requestHeaders.addRawHeader(b'user-agent',
- b'Malicious Web" Evil')
- self.assertLogs(
-- b'"1.2.3.4" - - [25/Oct/2004:12:31:59 +0000] '
-+ b'1.2.3.4 - - [25/Oct/2004:12:31:59 +0000] '
- b'"GET /dummy HTTP/1.0" 123 - "-" "Malicious Web\\" Evil"\n')
-
-
diff --git a/debian/patches/series b/debian/patches/series
index e25a771..852dafe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-wxpython3.0.patch
-combinedlog.patch
-sphinx-theme.diff
+0001-wxpython3.0.patch
+0002-combinedlog.patch
+0003-sphinx-theme.patch
0004-localIntersphinx.patch
diff --git a/debian/patches/sphinx-theme.diff b/debian/patches/sphinx-theme.diff
deleted file mode 100644
index efc525f..0000000
--- a/debian/patches/sphinx-theme.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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', None) == 'True'
- if not on_rtd:
- html_theme = 'twistedtrac'
-
-+html_theme = 'twisteddefault'
-+
- # Theme options are theme-specific and customize the look and feel of a theme
- # further. For a list of options available for each theme, see the
- # documentation.
diff --git a/debian/patches/wxpython3.0.patch b/debian/patches/wxpython3.0.patch
deleted file mode 100644
index cc14ad9..0000000
--- a/debian/patches/wxpython3.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Matthias Klose <doko at debian.org>
-Date: Thu, 20 Oct 2016 04:34:06 +0000
-Subject: wxpython3.0
-
----
- 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
- try:
-- from wx import PySimpleApp as wxPySimpleApp, CallAfter as wxCallAfter, \
-+ from wx import App as wxApp, CallAfter as wxCallAfter, \
- Timer as wxTimer
- except ImportError:
- # older version of wxPython:
-- from wxPython.wx import wxPySimpleApp, wxCallAfter, wxTimer
-+ from wxPython.wx import wxApp, wxCallAfter, wxTimer
-
- from twisted.python import log, runtime
- from twisted.internet import _threadedselect
-@@ -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.")
-- self.registerWxApp(wxPySimpleApp())
-+ self.registerWxApp(wxApp(False))
-
- # start select() thread:
- self.interleave(self._runInMainThread,
--
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