Port test_node.py to Python 3.

src/allmydata/node.py

@@ -16,8 +16,6 @@ from base64 import b32decode, b32encode
 # Python 2 compatibility
 from six.moves import configparser
 from future.utils import PY2
-if PY2:
-    from io import BytesIO as StringIO  # noqa: F811
 
 from twisted.python import log as twlog
 from twisted.application import service

src/allmydata/test/test_node.py

@@ -1,5 +1,14 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from future.utils import PY2
-from past.builtins import unicode
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
 import base64
 import os
@@ -340,7 +349,7 @@ class TestCase(testutil.SignalMixin, unittest.TestCase):
         ns.called = False
         def call_setLogDir(logdir):
             ns.called = True
-            self.failUnless(isinstance(logdir, unicode), logdir)
+            self.failUnless(isinstance(logdir, str), logdir)
         self.patch(foolscap.logging.log, 'setLogDir', call_setLogDir)
 
         create_node_dir(basedir, "nothing to see here")

src/allmydata/util/_python3.py

@@ -120,6 +120,7 @@ PORTED_TEST_MODULES = [
     "allmydata.test.test_monitor",
     "allmydata.test.test_netstring",
     "allmydata.test.test_no_network",
+    "allmydata.test.test_node",
     "allmydata.test.test_observer",
     "allmydata.test.test_pipeline",
     "allmydata.test.test_python3",