mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-31 16:36:20 +00:00
A couple more cleanups
- attempt the same future imports in both common and common_util - put an import in a better place
This commit is contained in:
parent
9fccf37053
commit
d21046fe9f
@ -1,4 +1,7 @@
|
||||
from __future__ import absolute_import
|
||||
from __future__ import division
|
||||
from __future__ import print_function
|
||||
from __future__ import unicode_literals
|
||||
|
||||
__all__ = [
|
||||
"SyncTestCase",
|
||||
|
@ -3,8 +3,6 @@ from __future__ import division
|
||||
from __future__ import print_function
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from future.utils import PY2, bord, bchr, binary_type
|
||||
|
||||
import os
|
||||
from random import randrange
|
||||
from six.moves import StringIO
|
||||
@ -16,6 +14,7 @@ from ..util.assertutil import precondition
|
||||
from ..scripts import runner
|
||||
from allmydata.util.encodingutil import get_io_encoding
|
||||
# Imported for backwards compatibility:
|
||||
from future.utils import PY2, bord, bchr, binary_type
|
||||
from .common_py3 import (
|
||||
SignalMixin, skip_if_cannot_represent_filename, ReallyEqualMixin, ShouldFailMixin
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user