[Python-modules-commits] [nevow] 05/08: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Wed Feb 3 15:24:43 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 52283bfb1561389e170b98a6196f992bf93a926a
Merge: 4a51d73 17790d2
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Wed Feb 3 16:42:19 2016 +0200
merge patched into master
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/41-disable-test_oldstyle | 6 +-
doc/Makefile | 177 ++++++
doc/README | 5 -
doc/_static/.hidden | 0
doc/_templates/.hidden | 0
doc/conf.py | 267 +++++++++
doc/howto/chattutorial/concepts.rst | 132 +++++
doc/howto/chattutorial/concepts.xhtml | 136 -----
doc/howto/chattutorial/env.rst | 85 +++
doc/howto/chattutorial/env.xhtml | 122 ----
doc/howto/chattutorial/index.rst | 40 ++
doc/howto/chattutorial/index.xhtml | 56 --
doc/howto/chattutorial/intro.rst | 101 ++++
doc/howto/chattutorial/intro.xhtml | 106 ----
doc/howto/chattutorial/part00/index.rst | 213 +++++++
doc/howto/chattutorial/part00/index.xhtml | 230 -------
.../part00/listings/nevow/plugins/dropin.cache | 50 ++
doc/howto/chattutorial/part01/index.rst | 224 +++++++
doc/howto/chattutorial/part01/index.xhtml | 236 --------
.../part01/listings/nevow/plugins/dropin.cache | 50 ++
doc/howto/deployment.rst | 248 ++++++++
doc/howto/deployment.xhtml | 300 ----------
doc/howto/gettingstarted.rst | 70 +++
doc/howto/gettingstarted.xhtml | 110 ----
doc/howto/glossary.rst | 66 +++
doc/howto/glossary.xhtml | 82 ---
doc/howto/index.xhtml | 49 --
doc/howto/intro.rst | 262 ++++++++
doc/howto/intro.xhtml | 294 ---------
doc/howto/publishing.rst | 593 +++++++++++++++++++
doc/howto/publishing.xhtml | 658 ---------------------
doc/howto/stylesheet.css | 129 ----
doc/howto/template.tpl | 24 -
doc/howto/traversal.rst | 363 ++++++++++++
doc/howto/traversal.xhtml | 448 --------------
doc/howto/xmltemplates.rst | 319 ++++++++++
doc/howto/xmltemplates.xhtml | 407 -------------
doc/html/default.css | 209 -------
doc/index.rst | 46 ++
formless/test/test_freeform.py | 10 +-
nevow/_flat.py | 2 +-
nevow/_version.py | 4 +-
nevow/appserver.py | 45 +-
nevow/athena.py | 13 +-
nevow/flat/flatstan.py | 2 +-
nevow/js/Divmod/Runtime/__init__.js | 441 ++++++++------
nevow/js/Divmod/Test/TestObject.js | 23 +
nevow/js/Divmod/__init__.js | 12 +-
nevow/js/Nevow/Athena/Tests/__init__.js | 14 +-
nevow/js/Nevow/Athena/__init__.js | 7 +-
nevow/json.py | 2 +
nevow/test/test_appserver.py | 21 +
nevow/test/test_athena.py | 4 +-
nevow/test/test_json.py | 8 +
setup.py | 5 +
57 files changed, 3699 insertions(+), 3835 deletions(-)
diff --cc debian/.git-dpm
index d68071b,0000000..20eb98d
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
- 511c1730b67d84066a06a4f7a4c742cb605aa70a
- 511c1730b67d84066a06a4f7a4c742cb605aa70a
- 5a1fcf86af5d0cebce95f7fda5a13dd2e1297b85
++17790d2803a57fc710075ce9de1489d07294f0f7
++17790d2803a57fc710075ce9de1489d07294f0f7
++3d07d7fe88ac4f944b4c5078e7a8f428ef956a46
+3d07d7fe88ac4f944b4c5078e7a8f428ef956a46
+nevow_0.12.0.orig.tar.gz
+4d202c94b8b7bb49faac672a21efc1c2ea757e15
+564213
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/41-disable-test_oldstyle
index 5facf2c,0000000..fea7c33
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 511c1730b67d84066a06a4f7a4c742cb605aa70a Mon Sep 17 00:00:00 2001
++From 17790d2803a57fc710075ce9de1489d07294f0f7 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 d0f430c..95bd255 100644
++index 896803c..76529e5 100644
+--- a/nevow/test/test_appserver.py
++++ b/nevow/test/test_appserver.py
- @@ -193,6 +193,8 @@ class Logging(testutil.TestCase):
++@@ -214,6 +214,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