From 22a1721b62da3553efd29e829e8d448663e4a3ba Mon Sep 17 00:00:00 2001
From: Sajith Sasidharan <sajith@hcoop.net>
Date: Tue, 22 Sep 2020 21:04:19 -0400
Subject: [PATCH 1/3] Remove unused web.common.getxmlfile()

---
 newsfragments/3436.minor    | 0
 src/allmydata/web/common.py | 6 +-----
 2 files changed, 1 insertion(+), 5 deletions(-)
 create mode 100644 newsfragments/3436.minor

diff --git a/newsfragments/3436.minor b/newsfragments/3436.minor
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/allmydata/web/common.py b/src/allmydata/web/common.py
index 6035e2884..472bba644 100644
--- a/src/allmydata/web/common.py
+++ b/src/allmydata/web/common.py
@@ -5,10 +5,9 @@ from functools import wraps
 
 from twisted.web import http, server, resource, template
 from twisted.python import log
-from nevow import loaders, appserver
+from nevow import appserver
 from nevow.rend import Page
 from nevow.inevow import IRequest
-from nevow.util import resource_filename
 from allmydata import blacklist
 from allmydata.interfaces import ExistingChildError, NoSuchChildError, \
      FileTooLargeError, NotEnoughSharesError, NoSharesError, \
@@ -42,9 +41,6 @@ def get_filenode_metadata(filenode):
         metadata['size'] = size
     return metadata
 
-def getxmlfile(name):
-    return loaders.xmlfile(resource_filename('allmydata.web', '%s' % name))
-
 def boolean_of_arg(arg):
     # TODO: ""
     if arg.lower() not in ("true", "t", "1", "false", "f", "0", "on", "off"):

From e6a5dda7e1116bd18b0b38ab8f06e6e4bdf89798 Mon Sep 17 00:00:00 2001
From: Sajith Sasidharan <sajith@hcoop.net>
Date: Tue, 22 Sep 2020 21:14:00 -0400
Subject: [PATCH 2/3] Rearrange imports

---
 src/allmydata/web/common.py | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/allmydata/web/common.py b/src/allmydata/web/common.py
index 472bba644..c1bddae86 100644
--- a/src/allmydata/web/common.py
+++ b/src/allmydata/web/common.py
@@ -3,20 +3,40 @@ import time
 import json
 from functools import wraps
 
-from twisted.web import http, server, resource, template
+from twisted.web import (
+    http,
+    resource,
+    server,
+    template,
+)
 from twisted.python import log
 from nevow import appserver
 from nevow.rend import Page
 from nevow.inevow import IRequest
 from allmydata import blacklist
-from allmydata.interfaces import ExistingChildError, NoSuchChildError, \
-     FileTooLargeError, NotEnoughSharesError, NoSharesError, \
-     EmptyPathnameComponentError, MustBeDeepImmutableError, \
-     MustBeReadonlyError, MustNotBeUnknownRWError, SDMF_VERSION, MDMF_VERSION
+from allmydata.interfaces import (
+    EmptyPathnameComponentError,
+    ExistingChildError,
+    FileTooLargeError,
+    MustBeDeepImmutableError,
+    MustBeReadonlyError,
+    MustNotBeUnknownRWError,
+    NoSharesError,
+    NoSuchChildError,
+    NotEnoughSharesError,
+    MDMF_VERSION,
+    SDMF_VERSION,
+)
 from allmydata.mutable.common import UnrecoverableFileError
 from allmydata.util.hashutil import timing_safe_compare
-from allmydata.util.time_format import format_time, format_delta
-from allmydata.util.encodingutil import to_bytes, quote_output
+from allmydata.util.time_format import (
+    format_delta,
+    format_time,
+)
+from allmydata.util.encodingutil import (
+    quote_output,
+    to_bytes,
+)
 
 # Originally part of this module, so still part of its API:
 from .common_py3 import (  # noqa: F401

From 704b36d7e1e2bef8afb2f63a806659ef0ce05577 Mon Sep 17 00:00:00 2001
From: Sajith Sasidharan <sajith@hcoop.net>
Date: Tue, 22 Sep 2020 21:15:58 -0400
Subject: [PATCH 3/3] Remove test for web.common.getxmlfile()

---
 src/allmydata/test/web/test_util.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/allmydata/test/web/test_util.py b/src/allmydata/test/web/test_util.py
index 8c48c20a5..24f865ebc 100644
--- a/src/allmydata/test/web/test_util.py
+++ b/src/allmydata/test/web/test_util.py
@@ -4,9 +4,6 @@ from ..common import ShouldFailMixin
 from .. import common_util as testutil
 
 class Util(ShouldFailMixin, testutil.ReallyEqualMixin, unittest.TestCase):
-    def test_load_file(self):
-        # This will raise an exception unless a well-formed XML file is found under that name.
-        common.getxmlfile('directory.xhtml').load()
 
     def test_parse_replace_arg(self):
         self.failUnlessReallyEqual(common.parse_replace_arg("true"), True)