[Python-modules-commits] [nevow] 05/10: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Wed Feb 17 14:57:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository nevow.
commit 20c0bb341927feb9f471c715c87983fc2bd0a997
Merge: f5653c8 889c3fb
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Wed Feb 17 16:44:09 2016 +0200
merge patched into master
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/41-disable-test_oldstyle | 10 +-
doc/howto/deployment.rst | 155 +-----
doc/howto/intro.rst | 3 -
doc/howto/traversal.rst | 9 +-
examples/examples.tac | 8 -
examples/index.html | 105 +---
examples/liveanimal/__init__.py | 0
examples/liveanimal/liveanimal.py | 120 -----
examples/liveanimal/liveanimal.tac | 13 -
examples/livepage/__init__.py | 0
examples/livepage/livepage.py | 25 -
examples/progress/__init__.py | 0
examples/progress/progress.py | 61 ---
examples/tests/testexamples.py | 194 -------
examples/tests/testformless.py | 105 ----
examples/wsgi/README | 2 -
examples/wsgi/test-cgi.py | 118 -----
examples/wsgi/test-modpy.py | 139 -----
examples/xul/__init__.py | 0
examples/xul/xul_example.xul | 38 --
examples/xul/xul_nevow.py | 30 --
nevow/__init__.py | 2 -
nevow/_version.py | 4 +-
nevow/appserver.py | 122 ++++-
nevow/compression.py | 2 +-
nevow/flat/flatstan.py | 12 -
nevow/guard.py | 6 +-
nevow/inevow.py | 10 +-
nevow/liveglue.js | 273 ----------
nevow/livepage.py | 906 --------------------------------
nevow/livetest-postscripts.js | 49 --
nevow/livetest.css | 33 --
nevow/livetest.js | 35 --
nevow/livetest.py | 365 -------------
nevow/rend.py | 2 +-
nevow/stan.py | 8 -
nevow/taglibrary/livetags.py | 93 ----
nevow/taglibrary/progressBar.css | 11 -
nevow/taglibrary/progressBar.js | 7 -
nevow/taglibrary/progressbar.py | 52 --
nevow/taglibrary/tabbedPane.py | 69 +--
nevow/tags.py | 4 +-
nevow/test/test_appserver.py | 31 +-
nevow/test/test_athena.py | 8 +-
nevow/test/test_compression.py | 26 +-
nevow/test/test_guard.py | 40 +-
nevow/test/test_livepage.py | 353 -------------
nevow/test/test_rend.py | 20 +
nevow/test/test_static.py | 80 +--
nevow/test/test_tags.py | 21 -
nevow/test/test_testutil.py | 8 +-
nevow/testutil.py | 55 +-
nevow/wsgi.py | 615 ----------------------
nevow/zomnesrv.py | 102 ----
setup.py | 170 +++---
zomne.c | 183 -------
58 files changed, 439 insertions(+), 4481 deletions(-)
diff --cc debian/.git-dpm
index c1796e0,0000000..7fd8d41
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
- 17790d2803a57fc710075ce9de1489d07294f0f7
- 17790d2803a57fc710075ce9de1489d07294f0f7
- 3d07d7fe88ac4f944b4c5078e7a8f428ef956a46
++889c3fbdef475eca9288aeefd3608bfa39d0c6f2
++889c3fbdef475eca9288aeefd3608bfa39d0c6f2
++643a8070e72d90f8ba76f8f0a008d85b9d489108
+643a8070e72d90f8ba76f8f0a008d85b9d489108
+nevow_0.13.0.orig.tar.gz
+581c5ca9a79f55534821ae783db45159bb7b5001
+528151
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/41-disable-test_oldstyle
index fea7c33,0000000..f8a6b40
mode 100644,000000..100644
--- a/debian/patches/41-disable-test_oldstyle
+++ b/debian/patches/41-disable-test_oldstyle
@@@ -1,29 -1,0 +1,29 @@@
- From 17790d2803a57fc710075ce9de1489d07294f0f7 Mon Sep 17 00:00:00 2001
++From 889c3fbdef475eca9288aeefd3608bfa39d0c6f2 Mon Sep 17 00:00:00 2001
+From: Tristan Seligmann <mithrandi at debian.org>
+Date: Thu, 8 Oct 2015 10:00:07 -0700
+Subject: Disable nevow.test.test_appserver.Logging.test_oldStyle
+
+ The format of request log messages changed in Twisted 14.0, but this test
+ hardcodes a formatted log message, meaning it will either not work on Twisted
+ 13.2, or Twisted 14.0, depending on which version is used in the test.
+Origin: vendor
+Bug: https://github.com/twisted/nevow/issues/41
+Last-Update: 2014-06-22
+Patch-Name: 41-disable-test_oldstyle
+---
+ nevow/test/test_appserver.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nevow/test/test_appserver.py b/nevow/test/test_appserver.py
- index 896803c..76529e5 100644
++index 1096c3e..a82ab0d 100644
+--- a/nevow/test/test_appserver.py
++++ b/nevow/test/test_appserver.py
- @@ -214,6 +214,8 @@ class Logging(testutil.TestCase):
- ['"fakeaddress2" - - faketime "GET /foo HTTP/1.0" 200 6 '
- '"fakerefer" "fakeagent"'])
++@@ -233,6 +233,8 @@ class Logging(testutil.TestCase):
++ ['fakeaddress2', '-', '-', 'faketime', 'GET /foo HTTP/1.0', '200', '6',
++ 'fakerefer', 'fakeagent'])
+
++ test_oldStyle.skip = 'Skipped due to Twisted compatibility issues'
++
+
+ def test_newStyle(self):
+ class FakeLogger(object):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nevow.git
More information about the Python-modules-commits
mailing list