Changeset 11b93412 in trunk

Timestamp:

2020-08-11T19:49:59Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

2772980

Parents:

babe2db

Message:

Port to Python 3.

Location:

src/allmydata/util

Files:

• _python3.py (modified) (1 diff)
• configutil.py (modified) (3 diffs)

src/allmydata/util/_python3.py ¶

@@ -29 +29 @@
     "allmydata.util.base32",
     "allmydata.util.base62",
+    "allmydata.util.configutil",
     "allmydata.util.connection_status",
     "allmydata.util.deferredutil",

src/allmydata/util/configutil.py ¶

@@ +1 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
-from ConfigParser import SafeConfigParser
+from future.utils import PY2
+if PY2:
+    from 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
+
+from configparser import SafeConfigParser
 
 import attr
@@ -14 +22 @@
 def get_config(tahoe_cfg):
     config = SafeConfigParser()
-    with open(tahoe_cfg, "rb") as f:
-        # Skip any initial Byte Order Mark. Since this is an ordinary file, we
-        # don't need to handle incomplete reads, and can assume seekability.
-        if f.read(3) != '\xEF\xBB\xBF':
-            f.seek(0)
+    with open(tahoe_cfg, "r") as f:
         config.readfp(f)
     return config
@@ -29 +33 @@
 
 def write_config(tahoe_cfg, config):
-    with open(tahoe_cfg, "wb") as f:
+    with open(tahoe_cfg, "w") as f:
         config.write(f)