[Python-modules-commits] [nevow] 01/03: Import nevow_0.14.2.orig.tar.gz
Tristan Seligmann
mithrandi at moszumanska.debian.org
Tue Aug 30 20:06: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 3e79632a442c31c74bdd65fdcde70b2fb3ab6ed8
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Tue Aug 30 22:01:01 2016 +0200
Import nevow_0.14.2.orig.tar.gz
---
PKG-INFO | 2 +-
nevow/_version.py | 4 ++--
nevow/js/Nevow/Athena/__init__.js | 16 ++++++++++++----
nevow/js/Nevow/Test/TestWidget.js | 9 +++++++++
nevow/static.py | 1 +
nevow/test/test_appserver.py | 15 +++++++++++----
nevow/test/test_guard.py | 3 +++
nevow/testutil.py | 4 +++-
8 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index a4e6db3..241354e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Nevow
-Version: 0.14.0
+Version: 0.14.2
Summary: Web Application Construction Kit
Home-page: https://github.com/twisted/nevow
Author: Twisted Matrix Labs
diff --git a/nevow/_version.py b/nevow/_version.py
index 7cf0de2..9d9d409 100644
--- a/nevow/_version.py
+++ b/nevow/_version.py
@@ -4,8 +4,8 @@
# unpacked source archive. Distribution tarballs contain a pre-generated copy
# of this file.
-version_version = '0.14.0'
-version_full = '8204df0b63285ddbcc02e0cd56b21cd3757f7d83'
+version_version = '0.14.2'
+version_full = '41fd6b5ff6393ee254a4acbb0a8bfb173ab51d33'
def get_versions(default={}, verbose=False):
return {'version': version_version, 'full': version_full}
diff --git a/nevow/js/Nevow/Athena/__init__.js b/nevow/js/Nevow/Athena/__init__.js
index 520658c..6f38e90 100644
--- a/nevow/js/Nevow/Athena/__init__.js
+++ b/nevow/js/Nevow/Athena/__init__.js
@@ -105,6 +105,17 @@ Nevow.Athena.PageWidget.methods(
var d = self.remoteCalls[responseId];
delete self.remoteCalls[responseId];
+ if (d === undefined) {
+ // If the transport is running then something strange has happened,
+ // otherwise just do nothing.
+ if (self.deliveryChannel.running) {
+ Divmod.msg(
+ 'Received response to unknown or already-responded call: ' +
+ responseId);
+ }
+ return;
+ }
+
if (success) {
d.callback(result);
} else {
@@ -492,7 +503,7 @@ Nevow.Athena.ReliableMessageDelivery.methods(
for (var i = 0; i < self.requests.length; ++i) {
self.requests[i].abort();
}
- self.requests = null;
+ self.requests = [];
self.page.connectionLost('Connection closed by remote host');
},
@@ -1405,9 +1416,7 @@ Nevow.Athena.IntrospectionWidget.methods(
* Instantiate Athena Widgets.
*/
Nevow.Athena.Widget._instantiateOneWidget = function(cls, node) {
- Divmod.debug("widget", "Found Widget class " + cls + ", instantiating.");
var inst = cls.get(node);
- Divmod.debug("widget", "Widget class " + cls + " instantiated.");
try {
var widgetParent = Nevow.Athena.Widget.get(node.parentNode);
widgetParent.addChildWidget(inst);
@@ -1417,7 +1426,6 @@ Nevow.Athena.Widget._instantiateOneWidget = function(cls, node) {
}
if (inst.loaded != undefined) {
inst.loaded();
- Divmod.debug("widget", "Widget class " + cls + " loaded.");
}
if (inst.nodeInserted != undefined) {
inst.nodeInserted();
diff --git a/nevow/js/Nevow/Test/TestWidget.js b/nevow/js/Nevow/Test/TestWidget.js
index 40a5f82..9c506b1 100644
--- a/nevow/js/Nevow/Test/TestWidget.js
+++ b/nevow/js/Nevow/Test/TestWidget.js
@@ -218,6 +218,15 @@ Nevow.Test.TestWidget.PageWidgetTests.methods(
},
/**
+ * Trying to respond to a missing call doesn't explode.
+ */
+ function test_respondMissingCall(self) {
+ var OPAQUE_ID = "opaque test remote call id";
+ var RESULT = "opaque test result";
+ self.page.action_respond(OPAQUE_ID, true, RESULT);
+ },
+
+ /**
* Test that the 'noop' action does nothing, so the server can ping us.
*/
function test_noopAction(self) {
diff --git a/nevow/static.py b/nevow/static.py
index 9853b44..cb8941a 100644
--- a/nevow/static.py
+++ b/nevow/static.py
@@ -131,6 +131,7 @@ def loadMimeTypes(mimetype_locations=['/etc/mime.types']):
'.patch': 'text/plain',
'.pjpeg': 'image/pjpeg',
'.tac': 'text/x-python',
+ '.svg': 'image/svg+xml',
}
)
# Users can override these mime-types by loading them out configuration
diff --git a/nevow/test/test_appserver.py b/nevow/test/test_appserver.py
index 151ba8a..766516b 100644
--- a/nevow/test/test_appserver.py
+++ b/nevow/test/test_appserver.py
@@ -12,6 +12,7 @@ from shlex import split
from twisted.trial.unittest import TestCase
from twisted.internet.defer import Deferred
+from twisted.web.test.requesthelper import DummyChannel
from nevow import inevow
from nevow import appserver
@@ -24,6 +25,7 @@ from nevow.context import RequestContext
from nevow.rend import Page
from nevow.testutil import FakeRequest
+
class Render:
implements(inevow.IResource)
@@ -101,7 +103,9 @@ class TestLookup(testutil.TestCase):
class TestSiteAndRequest(testutil.TestCase):
def renderResource(self, resource, path):
s = appserver.NevowSite(resource)
- r = appserver.NevowRequest(testutil.FakeChannel(s), True)
+ channel = DummyChannel()
+ channel.site = s
+ r = appserver.NevowRequest(channel, True)
r.path = path
return r.process()
@@ -143,7 +147,9 @@ class TestSiteAndRequest(testutil.TestCase):
def renderHTTP(self, ctx):
return rendering
site = appserver.NevowSite(Res())
- request = appserver.NevowRequest(testutil.FakeChannel(site), True)
+ channel = DummyChannel()
+ channel.site = site
+ request = appserver.NevowRequest(channel, True)
request.connectionLost(Exception("Just Testing"))
rendering.callback(b"finished")
@@ -161,8 +167,9 @@ class TestSiteAndRequest(testutil.TestCase):
return b''
s = appserver.NevowSite(Res())
- r = appserver.NevowRequest(
- testutil.FakeChannel(s), True)
+ channel = DummyChannel()
+ channel.site = s
+ r = appserver.NevowRequest(channel, True)
r.method = b'POST'
r.path = b'/'
r.content = StringIO(b'foo=bar')
diff --git a/nevow/test/test_guard.py b/nevow/test/test_guard.py
index dc0a6d0..e548341 100644
--- a/nevow/test/test_guard.py
+++ b/nevow/test/test_guard.py
@@ -65,6 +65,9 @@ class FakeHTTPChannel:
headerSequence.append(b"\r\n")
self.transport.writeSequence(headerSequence)
+ def isSecure(self):
+ return False
+
# Utility for testing.
def makeFakeRequest(self, path, username='',password='',
diff --git a/nevow/testutil.py b/nevow/testutil.py
index 662d654..2f24bb3 100644
--- a/nevow/testutil.py
+++ b/nevow/testutil.py
@@ -21,12 +21,14 @@ from twisted.internet import defer
from twisted.web import http
from twisted.protocols.basic import LineReceiver
from twisted.web.http_headers import Headers
+from twisted.web.test.requesthelper import DummyChannel
from formless import iformless
from nevow import inevow, context, athena, loaders, tags, appserver
from nevow.jsutil import findJavascriptInterpreter, generateTestScript
+
class FakeChannel:
def __init__(self, site):
self.site = site
@@ -389,7 +391,7 @@ def renderPage(res, topLevelContext=context.WebContext,
ctx = topLevelContext(tag=res)
ctx.remember(req, inevow.IRequest)
- render = appserver.NevowRequest(None, True).gotPageContext
+ render = appserver.NevowRequest(DummyChannel(), True).gotPageContext
result = render(ctx)
result.addCallback(lambda x: req.accumulator)
--
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