From 1a9c4232aa2f47c6ce93c2393bc4d37be74047c1 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 6 Oct 2020 11:14:43 -0400 Subject: [PATCH 1/2] News file --- newsfragments/3462.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3462.minor diff --git a/newsfragments/3462.minor b/newsfragments/3462.minor new file mode 100644 index 000000000..e69de29bb From 3e87ba368ed7549c767a8ae897f4300074136966 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 6 Oct 2020 11:32:19 -0400 Subject: [PATCH 2/2] Port to Python 3. --- src/allmydata/immutable/encode.py | 15 ++++++++++++++- src/allmydata/util/_python3.py | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/allmydata/immutable/encode.py b/src/allmydata/immutable/encode.py index fb6733cf7..9351df501 100644 --- a/src/allmydata/immutable/encode.py +++ b/src/allmydata/immutable/encode.py @@ -1,5 +1,18 @@ # -*- test-case-name: allmydata.test.test_encode -*- +""" +Ported to Python 3. +""" + +from __future__ import division +from __future__ import absolute_import +from __future__ import print_function +from __future__ import unicode_literals + +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 + import time from zope.interface import implementer from twisted.internet import defer @@ -468,7 +481,7 @@ class Encoder(object): (self, self.segment_size*(segnum+1), self.segment_size*self.num_segments, - 100 * (segnum+1) / self.num_segments, + 100 * (segnum+1) // self.num_segments, ), level=log.OPERATIONAL) elapsed = time.time() - start diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 04b5651db..6be9077b0 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -40,6 +40,7 @@ PORTED_MODULES = [ "allmydata.immutable.downloader.segmentation", "allmydata.immutable.downloader.share", "allmydata.immutable.downloader.status", + "allmydata.immutable.encode", "allmydata.immutable.happiness_upload", "allmydata.immutable.literal", "allmydata.interfaces",