From 1d508c74e885ecae62f279008b59c1f84b82e064 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 14 Sep 2020 14:13:07 -0400
Subject: [PATCH] Port to Python 3.

---
 src/allmydata/storage/shares.py    | 13 ++++++++++++-
 src/allmydata/test/test_storage.py | 21 +++++++++++++++++++--
 src/allmydata/util/_python3.py     |  1 +
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/allmydata/storage/shares.py b/src/allmydata/storage/shares.py
index bd94c0f3f..ec6c0a501 100644
--- a/src/allmydata/storage/shares.py
+++ b/src/allmydata/storage/shares.py
@@ -1,4 +1,15 @@
-#! /usr/bin/python
+"""
+Ported to Python 3.
+"""
+
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from future.utils import PY2
+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
 
 from allmydata.storage.mutable import MutableShareFile
 from allmydata.storage.immutable import ShareFile
diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index de2b04dd7..8956fbf52 100644
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -29,8 +29,9 @@ import itertools
 from allmydata import interfaces
 from allmydata.util import fileutil, hashutil, base32
 from allmydata.storage.server import StorageServer
+from allmydata.storage.shares import get_share_file
 from allmydata.storage.mutable import MutableShareFile
-from allmydata.storage.immutable import BucketWriter, BucketReader
+from allmydata.storage.immutable import BucketWriter, BucketReader, ShareFile
 from allmydata.storage.common import DataTooLargeError, storage_index_to_dir, \
      UnknownMutableContainerVersionError, UnknownImmutableContainerVersionError, \
      si_b2a, si_a2b
@@ -54,7 +55,7 @@ from .common_py3 import FakeCanary, LoggingServiceParent, ShouldFailMixin
 
 
 class UtilTests(unittest.TestCase):
-    """Tests for allmydata.storage.common."""
+    """Tests for allmydata.storage.common and .shares."""
 
     def test_encoding(self):
         """b2a/a2b are the same as base32."""
@@ -71,6 +72,22 @@ class UtilTests(unittest.TestCase):
         self.assertEqual(parts[0], parts[1][:2])
         self.assertIsInstance(path, native_str)
 
+    def test_get_share_file_mutable(self):
+        """A mutable share is identified by get_share_file()."""
+        path = self.mktemp()
+        msf = MutableShareFile(path)
+        msf.create(b"12", b"abc")  # arbitrary values
+        loaded = get_share_file(path)
+        self.assertIsInstance(loaded, MutableShareFile)
+        self.assertEqual(loaded.home, path)
+
+    def test_get_share_file_immutable(self):
+        """An immutable share is identified by get_share_file()."""
+        path = self.mktemp()
+        _ = ShareFile(path, max_size=1000, create=True)
+        loaded = get_share_file(path)
+        self.assertIsInstance(loaded, ShareFile)
+        self.assertEqual(loaded.home, path)
 
 
 class FakeStatsProvider(object):
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index 10cc69431..2b10854a9 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -40,6 +40,7 @@ PORTED_MODULES = [
     "allmydata.storage.expirer",
     "allmydata.storage.lease",
     "allmydata.storage.mutable",
+    "allmydata.storage.shares",
     "allmydata.test.common_py3",
     "allmydata.uri",
     "allmydata.util._python3",