[Python-modules-commits] [twisted] 05/09: Fix paths in patches, since code is now under src/
Free Ekanayaka
freee at moszumanska.debian.org
Thu Nov 10 11:29:22 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 769e98f949648dd5300b675c3f9ea0a5afd1c599
Author: Free Ekanayaka <freee at debian.org>
Date: Mon Oct 31 08:22:15 2016 +0000
Fix paths in patches, since code is now under src/
---
debian/patches/0001-wxpython3.0.patch | 8 +++---
debian/patches/0002-combinedlog.patch | 36 ++++++++++++------------
debian/patches/0006-fix-sphinx-import-path.patch | 23 +++++++++++++++
debian/patches/series | 1 +
4 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/debian/patches/0001-wxpython3.0.patch b/debian/patches/0001-wxpython3.0.patch
index 5800fe3..c30bd0f 100644
--- a/debian/patches/0001-wxpython3.0.patch
+++ b/debian/patches/0001-wxpython3.0.patch
@@ -4,13 +4,13 @@ Subject: wxpython3.0
Fix imports from the wx package.
---
- twisted/internet/wxreactor.py | 6 +++---
+ src/twisted/internet/wxreactor.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/twisted/internet/wxreactor.py b/twisted/internet/wxreactor.py
+diff --git a/src/twisted/internet/wxreactor.py b/src/twisted/internet/wxreactor.py
index 71e861a..6713de0 100644
---- a/twisted/internet/wxreactor.py
-+++ b/twisted/internet/wxreactor.py
+--- a/src/twisted/internet/wxreactor.py
++++ b/src/twisted/internet/wxreactor.py
@@ -25,11 +25,11 @@ real applications.
import Queue
diff --git a/debian/patches/0002-combinedlog.patch b/debian/patches/0002-combinedlog.patch
index 54993e3..9c43a08 100644
--- a/debian/patches/0002-combinedlog.patch
+++ b/debian/patches/0002-combinedlog.patch
@@ -8,14 +8,14 @@ is logged by the twisted.web HTTP server.
Bug: https://twistedmatrix.com/trac/ticket/7730
Bug-Debian https://bugs.debian.org/772629
---
- twisted/web/http.py | 2 +-
- twisted/web/test/test_web.py | 16 ++++++++--------
+ src/twisted/web/http.py | 2 +-
+ src/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
+diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
+index 29370c1..24a31d8 100644
+--- a/src/twisted/web/http.py
++++ b/src/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"-")
@@ -25,11 +25,11 @@ index c7caba3..148fb86 100644
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):
+diff --git a/src/twisted/web/test/test_web.py b/src/twisted/web/test/test_web.py
+index 0418f15..03759f0 100644
+--- a/src/twisted/web/test/test_web.py
++++ b/src/twisted/web/test/test_web.py
+@@ -1183,7 +1183,7 @@ class AccessLogTestsMixin(object):
self.assertEqual(
# Client IP
@@ -38,7 +38,7 @@ index 6f10648..f2cb628 100644
# Some blanks we never fill in
b'- - '
# The current time (circa 1234567890)
-@@ -1285,7 +1285,7 @@ class CombinedLogFormatterTests(unittest.TestCase):
+@@ -1283,7 +1283,7 @@ class CombinedLogFormatterTests(unittest.TestCase):
line = http.combinedLogFormatter(timestamp, request)
self.assertEqual(
@@ -47,7 +47,7 @@ index 6f10648..f2cb628 100644
u'"POS\\x81 /dummy HTTP/1.0" 123 - "evil \\x83" "evil \\x84"',
line)
-@@ -1377,7 +1377,7 @@ class LogEscapingTests(unittest.TestCase):
+@@ -1375,7 +1375,7 @@ class LogEscapingTests(unittest.TestCase):
self.site._logDateTime = "[%02d/%3s/%4d:%02d:%02d:%02d +0000]" % (
25, 'Oct', 2004, 12, 31, 59)
self.assertLogs(
@@ -56,7 +56,7 @@ index 6f10648..f2cb628 100644
b'"GET /dummy HTTP/1.0" 123 - "-" "-"\n')
-@@ -1389,7 +1389,7 @@ class LogEscapingTests(unittest.TestCase):
+@@ -1387,7 +1387,7 @@ class LogEscapingTests(unittest.TestCase):
25, 'Oct', 2004, 12, 31, 59)
self.request.method = b'G"T'
self.assertLogs(
@@ -65,7 +65,7 @@ index 6f10648..f2cb628 100644
b'"G\\"T /dummy HTTP/1.0" 123 - "-" "-"\n')
-@@ -1401,7 +1401,7 @@ class LogEscapingTests(unittest.TestCase):
+@@ -1399,7 +1399,7 @@ class LogEscapingTests(unittest.TestCase):
25, 'Oct', 2004, 12, 31, 59)
self.request.uri = b'/dummy"withquote'
self.assertLogs(
@@ -74,7 +74,7 @@ index 6f10648..f2cb628 100644
b'"GET /dummy\\"withquote HTTP/1.0" 123 - "-" "-"\n')
-@@ -1413,7 +1413,7 @@ class LogEscapingTests(unittest.TestCase):
+@@ -1411,7 +1411,7 @@ class LogEscapingTests(unittest.TestCase):
25, 'Oct', 2004, 12, 31, 59)
self.request.clientproto = b'HT"P/1.0'
self.assertLogs(
@@ -83,7 +83,7 @@ index 6f10648..f2cb628 100644
b'"GET /dummy HT\\"P/1.0" 123 - "-" "-"\n')
-@@ -1428,7 +1428,7 @@ class LogEscapingTests(unittest.TestCase):
+@@ -1426,7 +1426,7 @@ class LogEscapingTests(unittest.TestCase):
b'referer',
b'http://malicious" ".website.invalid')
self.assertLogs(
@@ -92,7 +92,7 @@ index 6f10648..f2cb628 100644
b'"GET /dummy HTTP/1.0" 123 - '
b'"http://malicious\\" \\".website.invalid" "-"\n')
-@@ -1443,7 +1443,7 @@ class LogEscapingTests(unittest.TestCase):
+@@ -1441,7 +1441,7 @@ class LogEscapingTests(unittest.TestCase):
self.request.requestHeaders.addRawHeader(b'user-agent',
b'Malicious Web" Evil')
self.assertLogs(
diff --git a/debian/patches/0006-fix-sphinx-import-path.patch b/debian/patches/0006-fix-sphinx-import-path.patch
new file mode 100644
index 0000000..756d926
--- /dev/null
+++ b/debian/patches/0006-fix-sphinx-import-path.patch
@@ -0,0 +1,23 @@
+From: Free Ekanayaka <freee at debian.org>
+Date: Fri, 4 Nov 2016 07:26:00 +0000
+Subject: fix-sphinx-import-path
+
+Adjust the import path in the Sphinx configuration file to
+match the new source files location (src/).
+---
+ docs/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index ab033a0..4919d40 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -19,7 +19,7 @@ import os
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
+ sys.path.insert(0, os.path.abspath('./_extensions'))
+-sys.path.insert(0, os.path.abspath('..'))
++sys.path.insert(0, os.path.abspath('../src'))
+
+ # -- General configuration ------------------------------------------------
+
diff --git a/debian/patches/series b/debian/patches/series
index aa529d4..75a1ebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0003-sphinx-theme.patch
0004-localIntersphinx.patch
0005-insecure-pythonpath.patch
+0006-fix-sphinx-import-path.patch
--
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