diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 1aa39b183..499e6f520 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -311,7 +311,7 @@ class _Config(object): return self.config.getboolean(section, option) item = self.config.get(section, option) - if option.endswith(".furl") and self._contains_unescaped_hash(item): + if option.endswith(".furl") and '#' in item: raise UnescapedHashError(section, option, item) return item diff --git a/src/allmydata/test/test_node.py b/src/allmydata/test/test_node.py index a1ecedfd5..21d854ffd 100644 --- a/src/allmydata/test/test_node.py +++ b/src/allmydata/test/test_node.py @@ -185,7 +185,6 @@ class TestCase(testutil.SignalMixin, unittest.TestCase): """ Hashes in furl options are not allowed, resulting in exception. """ - escaped = "lalal\\#onohash" basedir = self.mktemp() fileutil.make_dirs(basedir) with open(os.path.join(basedir, 'tahoe.cfg'), 'wt') as f: @@ -196,11 +195,6 @@ class TestCase(testutil.SignalMixin, unittest.TestCase): with self.assertRaises(UnescapedHashError): config.get_config("node", "log_gatherer.furl") - with open(os.path.join(basedir, 'tahoe.cfg'), 'wt') as f: - f.write("[node]\n") - f.write("log_gatherer.furl = %s\n" % (escaped,)) - self.assertEquals(config.get_config("node", "log_gatherer.furl"), escaped) - def test_missing_config_item(self): """ If a config item is missing: