From 4fca6c785cab213f4b0ca4fbe6941206c8a878dd Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 19:06:47 +0100
Subject: [PATCH] Thu Nov 17 22:54:23 GMT 2011 Brian Warner
<warner@lothar.com> * remove remaining uses of nevow's "formless" module
We're slowly moving away from Nevow, and marcusw's previous patch removed
uses of the formless CSS file, so now we can stop testing that nevow can find
that file, and remove the lingering unused "import formless" call.
---
src/allmydata/test/test_nevow.py | 17 -----------------
src/allmydata/web/root.py | 2 --
2 files changed, 19 deletions(-)
delete mode 100644 src/allmydata/test/test_nevow.py
diff --git a/src/allmydata/test/test_nevow.py b/src/allmydata/test/test_nevow.py
deleted file mode 100644
index 39b1d80b..00000000
--- a/src/allmydata/test/test_nevow.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from twisted.trial import unittest
-
-from formless import webform
-
-class Web(unittest.TestCase):
- def test_read_default_css(self):
- """
- Sometimes Nevow can't find its resource files such as its default css file.
- """
-
- from allmydata import get_package_versions, normalized_version
- nevow_ver = get_package_versions()['Nevow']
-
- if not normalized_version(nevow_ver) >= normalized_version('0.9.33'):
- raise unittest.SkipTest("We pass this test only with Nevow >= v0.9.33, which is the first version of Nevow that has our patch from http://www.divmod.org/trac/ticket/2527")
-
- webform.defaultCSS.openForReading()
diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index 69ee6460..3b9dd1c0 100644
--- a/src/allmydata/web/root.py
+++ b/src/allmydata/web/root.py
@@ -6,7 +6,6 @@ from nevow import rend, url, loaders, tags as T
from nevow.inevow import IRequest
from nevow.static import File as nevow_File # TODO: merge with static.File?
from nevow.util import resource_filename
-from formless import webform
import allmydata # to display import path
from allmydata import get_package_versions_string
@@ -132,7 +131,6 @@ class NoReliability(rend.Page):
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
<head>
<title>AllMyData - Tahoe</title>
- <link href="/webform_css" rel="stylesheet" type="text/css"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
--
2.45.2