From 0f22b9bad06a70d56b327dcaa4973abafce3e30b Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Sat, 25 Aug 2018 02:23:58 -0600
Subject: [PATCH] fixups after rebase

---
 src/allmydata/node.py           | 4 +++-
 src/allmydata/test/test_node.py | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 803a0227b..671b922cc 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -190,7 +190,9 @@ def read_config(basedir, portnumfile, generated_files=[], _valid_config_sections
 
 
 def config_from_string(config_str, portnumfile, basedir):
-    # load configuration from in-memory string
+    """
+    load configuration from in-memory string
+    """
     parser = ConfigParser.SafeConfigParser()
     parser.readfp(BytesIO(config_str))
     return _Config(parser, portnumfile, basedir, '<in-memory>')
diff --git a/src/allmydata/test/test_node.py b/src/allmydata/test/test_node.py
index b11587740..7e0b103d4 100644
--- a/src/allmydata/test/test_node.py
+++ b/src/allmydata/test/test_node.py
@@ -399,7 +399,7 @@ class TestMissingPorts(unittest.TestCase):
             "[node]\n"
             "tub.port = \n"
         )
-        config = config_from_string(self.basedir, "portnum", config_data)
+        config = config_from_string(config_data, "portnum", self.basedir)
 
         with self.assertRaises(ValueError) as ctx:
             Node(config)
@@ -416,7 +416,7 @@ class TestMissingPorts(unittest.TestCase):
             "[node]\n"
             "tub.location = \n"
         )
-        config = config_from_string(self.basedir, "portnum", config_data)
+        config = config_from_string(config_data, "portnum", self.basedir)
 
         with self.assertRaises(ValueError) as ctx:
             Node(config)
@@ -434,7 +434,7 @@ class TestMissingPorts(unittest.TestCase):
             "tub.port = disabled\n"
             "tub.location = not_disabled\n"
         )
-        config = config_from_string(self.basedir, "portnum", config_data)
+        config = config_from_string(config_data, "portnum", self.basedir)
 
         with self.assertRaises(ValueError) as ctx:
             Node(config)
@@ -452,7 +452,7 @@ class TestMissingPorts(unittest.TestCase):
             "tub.port = not_disabled\n"
             "tub.location = disabled\n"
         )
-        config = config_from_string(self.basedir, "portnum", config_data)
+        config = config_from_string(config_data, "portnum", self.basedir)
 
         with self.assertRaises(ValueError) as ctx:
             Node(config)