projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9b823dc
)
11308: Futurize.
author
Tom Clegg <tom@curoverse.com>
Sat, 1 Apr 2017 02:36:21 +0000
(22:36 -0400)
committer
Tom Clegg <tom@curoverse.com>
Sat, 1 Apr 2017 21:43:54 +0000
(17:43 -0400)
36 files changed:
sdk/python/arvados/__init__.py
patch
|
blob
|
history
sdk/python/arvados/_normalize_stream.py
patch
|
blob
|
history
sdk/python/arvados/_ranges.py
patch
|
blob
|
history
sdk/python/arvados/api.py
patch
|
blob
|
history
sdk/python/arvados/arvfile.py
patch
|
blob
|
history
sdk/python/arvados/cache.py
patch
|
blob
|
history
sdk/python/arvados/collection.py
patch
|
blob
|
history
sdk/python/arvados/commands/migrate19.py
patch
|
blob
|
history
sdk/python/arvados/commands/run.py
patch
|
blob
|
history
sdk/python/arvados/commands/ws.py
patch
|
blob
|
history
sdk/python/arvados/events.py
patch
|
blob
|
history
sdk/python/arvados/keep.py
patch
|
blob
|
history
sdk/python/arvados/safeapi.py
patch
|
blob
|
history
sdk/python/arvados/stream.py
patch
|
blob
|
history
sdk/python/arvados/timer.py
patch
|
blob
|
history
sdk/python/arvados/util.py
patch
|
blob
|
history
sdk/python/tests/manifest_examples.py
patch
|
blob
|
history
sdk/python/tests/performance/test_a_sample.py
patch
|
blob
|
history
sdk/python/tests/run_test_server.py
patch
|
blob
|
history
sdk/python/tests/test_api.py
patch
|
blob
|
history
sdk/python/tests/test_arv_copy.py
patch
|
blob
|
history
sdk/python/tests/test_arv_keepdocker.py
patch
|
blob
|
history
sdk/python/tests/test_arv_ls.py
patch
|
blob
|
history
sdk/python/tests/test_arv_put.py
patch
|
blob
|
history
sdk/python/tests/test_arv_run.py
patch
|
blob
|
history
sdk/python/tests/test_arv_ws.py
patch
|
blob
|
history
sdk/python/tests/test_arvfile.py
patch
|
blob
|
history
sdk/python/tests/test_benchmark_collections.py
patch
|
blob
|
history
sdk/python/tests/test_cache.py
patch
|
blob
|
history
sdk/python/tests/test_collections.py
patch
|
blob
|
history
sdk/python/tests/test_errors.py
patch
|
blob
|
history
sdk/python/tests/test_events.py
patch
|
blob
|
history
sdk/python/tests/test_keep_client.py
patch
|
blob
|
history
sdk/python/tests/test_pipeline_template.py
patch
|
blob
|
history
sdk/python/tests/test_retry_job_helpers.py
patch
|
blob
|
history
sdk/python/tests/test_stream.py
patch
|
blob
|
history
diff --git
a/sdk/python/arvados/__init__.py
b/sdk/python/arvados/__init__.py
index b74f828f4bd04a2a6321aa50e5f823cb3a2496ab..45370777362a8baaa705401974f29299f59d801f 100644
(file)
--- a/
sdk/python/arvados/__init__.py
+++ b/
sdk/python/arvados/__init__.py
@@
-1,3
+1,5
@@
+from __future__ import print_function
+from __future__ import absolute_import
import gflags
import httplib
import httplib2
import gflags
import httplib
import httplib2
@@
-19,13
+21,13
@@
import time
import threading
from .api import api, http_cache
import threading
from .api import api, http_cache
-from collection import CollectionReader, CollectionWriter, ResumableCollectionWriter
-from keep import *
-from stream import *
-from arvfile import StreamFileReader
-from retry import RetryLoop
-import errors
-import util
+from
.
collection import CollectionReader, CollectionWriter, ResumableCollectionWriter
+from
.
keep import *
+from
.
stream import *
+from
.
arvfile import StreamFileReader
+from
.
retry import RetryLoop
+
from .
import errors
+
from .
import util
# Set up Arvados logging based on the user's configuration.
# All Arvados code should log under the arvados hierarchy.
# Set up Arvados logging based on the user's configuration.
# All Arvados code should log under the arvados hierarchy.
@@
-104,7
+106,7
@@
def get_task_param_mount(*args):
class JobTask(object):
def __init__(self, parameters=dict(), runtime_constraints=dict()):
class JobTask(object):
def __init__(self, parameters=dict(), runtime_constraints=dict()):
- print
"init jobtask %s %s" % (parameters, runtime_constraints
)
+ print
("init jobtask %s %s" % (parameters, runtime_constraints)
)
class job_setup:
@staticmethod
class job_setup:
@staticmethod
diff --git
a/sdk/python/arvados/_normalize_stream.py
b/sdk/python/arvados/_normalize_stream.py
index e0831b1aacd648ec3820cbe58ee3b0e9b5f02c0c..babcabc1a79ab5a90ac5a42131564d898665f508 100644
(file)
--- a/
sdk/python/arvados/_normalize_stream.py
+++ b/
sdk/python/arvados/_normalize_stream.py
@@
-1,4
+1,5
@@
-import config
+from __future__ import absolute_import
+from . import config
def normalize_stream(stream_name, stream):
"""Take manifest stream and return a list of tokens in normalized format.
def normalize_stream(stream_name, stream):
"""Take manifest stream and return a list of tokens in normalized format.
@@
-17,7
+18,7
@@
def normalize_stream(stream_name, stream):
sortedfiles.sort()
blocks = {}
sortedfiles.sort()
blocks = {}
- streamoffset = 0
L
+ streamoffset = 0
# Go through each file and add each referenced block exactly once.
for streamfile in sortedfiles:
for segment in stream[streamfile]:
# Go through each file and add each referenced block exactly once.
for streamfile in sortedfiles:
for segment in stream[streamfile]:
diff --git
a/sdk/python/arvados/_ranges.py
b/sdk/python/arvados/_ranges.py
index 83874164eebd8bd88b03e6558f14f62c0b991033..e0fe61509f9373d5e43bc5a6cd4d150ccea9805d 100644
(file)
--- a/
sdk/python/arvados/_ranges.py
+++ b/
sdk/python/arvados/_ranges.py
@@
-24,7
+24,7
@@
class Range(object):
self.segment_offset == other.segment_offset)
def first_block(data_locators, range_start):
self.segment_offset == other.segment_offset)
def first_block(data_locators, range_start):
- block_start = 0
L
+ block_start = 0
# range_start/block_start is the inclusive lower bound
# range_end/block_end is the exclusive upper bound
# range_start/block_start is the inclusive lower bound
# range_end/block_end is the exclusive upper bound
diff --git
a/sdk/python/arvados/api.py
b/sdk/python/arvados/api.py
index 1af50b311020f4ed87391cd2a1e76463f39394f5..65aadbd6b725922f4b540fa8ed3059e42f00810d 100644
(file)
--- a/
sdk/python/arvados/api.py
+++ b/
sdk/python/arvados/api.py
@@
-1,3
+1,4
@@
+from __future__ import absolute_import
import collections
import httplib
import httplib2
import collections
import httplib
import httplib2
@@
-12,10
+13,10
@@
import types
import apiclient
from apiclient import discovery as apiclient_discovery
from apiclient import errors as apiclient_errors
import apiclient
from apiclient import discovery as apiclient_discovery
from apiclient import errors as apiclient_errors
-import config
-import errors
-import util
-import cache
+
from .
import config
+
from .
import errors
+
from .
import util
+
from .
import cache
_logger = logging.getLogger('arvados.api')
_logger = logging.getLogger('arvados.api')
diff --git
a/sdk/python/arvados/arvfile.py
b/sdk/python/arvados/arvfile.py
index ca45cf2deba52051d403d215e19ed983580ed343..2c44c349e00de03605367c60b87711a13b39c88e 100644
(file)
--- a/
sdk/python/arvados/arvfile.py
+++ b/
sdk/python/arvados/arvfile.py
@@
-1,8
+1,9
@@
+from __future__ import absolute_import
import functools
import os
import zlib
import bz2
import functools
import os
import zlib
import bz2
-import config
+
from .
import config
import hashlib
import threading
import Queue
import hashlib
import threading
import Queue
@@
-76,7
+77,7
@@
class _FileLikeObjectBase(object):
class ArvadosFileReaderBase(_FileLikeObjectBase):
def __init__(self, name, mode, num_retries=None):
super(ArvadosFileReaderBase, self).__init__(name, mode)
class ArvadosFileReaderBase(_FileLikeObjectBase):
def __init__(self, name, mode, num_retries=None):
super(ArvadosFileReaderBase, self).__init__(name, mode)
- self._filepos = 0
L
+ self._filepos = 0
self.num_retries = num_retries
self._readline_cache = (None, None)
self.num_retries = num_retries
self._readline_cache = (None, None)
@@
-96,7
+97,7
@@
class ArvadosFileReaderBase(_FileLikeObjectBase):
pos += self._filepos
elif whence == os.SEEK_END:
pos += self.size()
pos += self._filepos
elif whence == os.SEEK_END:
pos += self.size()
- self._filepos = min(max(pos, 0
L
), self.size())
+ self._filepos = min(max(pos, 0), self.size())
def tell(self):
return self._filepos
def tell(self):
return self._filepos
diff --git
a/sdk/python/arvados/cache.py
b/sdk/python/arvados/cache.py
index 08c19e4aa7de1423bf80122fe437a732980380d8..ac6d18463c540ad2af84d3b76a9db2129cfa333e 100644
(file)
--- a/
sdk/python/arvados/cache.py
+++ b/
sdk/python/arvados/cache.py
@@
-39,7
+39,7
@@
class SafeHTTPCache(object):
try:
with open(filename, 'rb') as f:
return f.read()
try:
with open(filename, 'rb') as f:
return f.read()
- except IOError
,
OSError:
+ except IOError
as
OSError:
return None
def set(self, url, content):
return None
def set(self, url, content):
diff --git
a/sdk/python/arvados/collection.py
b/sdk/python/arvados/collection.py
index f26d3a3d27c0b221d269d3d4a1beb8775268f7e6..095187e4c6188dd03d3b1277e2074da87d944490 100644
(file)
--- a/
sdk/python/arvados/collection.py
+++ b/
sdk/python/arvados/collection.py
@@
-1,3
+1,4
@@
+from __future__ import absolute_import
import functools
import logging
import os
import functools
import logging
import os
@@
-11,15
+12,15
@@
from collections import deque
from stat import *
from .arvfile import split, _FileLikeObjectBase, ArvadosFile, ArvadosFileWriter, ArvadosFileReader, _BlockManager, synchronized, must_be_writable, NoopLock
from stat import *
from .arvfile import split, _FileLikeObjectBase, ArvadosFile, ArvadosFileWriter, ArvadosFileReader, _BlockManager, synchronized, must_be_writable, NoopLock
-from keep import KeepLocator, KeepClient
+from
.
keep import KeepLocator, KeepClient
from .stream import StreamReader
from ._normalize_stream import normalize_stream
from ._ranges import Range, LocatorAndRange
from .safeapi import ThreadSafeApiCache
from .stream import StreamReader
from ._normalize_stream import normalize_stream
from ._ranges import Range, LocatorAndRange
from .safeapi import ThreadSafeApiCache
-import config
-import errors
-import util
-import events
+
from .
import config
+
from .
import errors
+
from .
import util
+
from .
import events
from arvados.retry import retry_method
_logger = logging.getLogger('arvados.collection')
from arvados.retry import retry_method
_logger = logging.getLogger('arvados.collection')
@@
-1575,7
+1576,7
@@
class Collection(RichCollectionBase):
stream_name = tok.replace('\\040', ' ')
blocks = []
segments = []
stream_name = tok.replace('\\040', ' ')
blocks = []
segments = []
- streamoffset = 0
L
+ streamoffset = 0
state = BLOCKS
self.find_or_create(stream_name, COLLECTION)
continue
state = BLOCKS
self.find_or_create(stream_name, COLLECTION)
continue
diff --git
a/sdk/python/arvados/commands/migrate19.py
b/sdk/python/arvados/commands/migrate19.py
index 4be99961ba0febcfcf36b254f582945427b133e8..802744ba6872192811a1fab31ffcafc8f66faf9b 100644
(file)
--- a/
sdk/python/arvados/commands/migrate19.py
+++ b/
sdk/python/arvados/commands/migrate19.py
@@
-1,3
+1,4
@@
+from __future__ import print_function
import argparse
import time
import sys
import argparse
import time
import sys
@@
-127,7
+128,7
@@
def main(arguments=None):
if args.print_unmigrated:
only_migrate = set()
for pdh in need_migrate:
if args.print_unmigrated:
only_migrate = set()
for pdh in need_migrate:
- print
pdh
+ print
(pdh)
return
logger.info("Already migrated %i images", len(already_migrated))
return
logger.info("Already migrated %i images", len(already_migrated))
diff --git
a/sdk/python/arvados/commands/run.py
b/sdk/python/arvados/commands/run.py
index 46a56ca5589cf07a28054114cb0ccd75e580f44a..2f3e0427d9eb41137cd4f87721f88b811031b0fe 100644
(file)
--- a/
sdk/python/arvados/commands/run.py
+++ b/
sdk/python/arvados/commands/run.py
@@
-1,5
+1,7
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import print_function
+from __future__ import absolute_import
import arvados
import arvados.commands.ws as ws
import argparse
import arvados
import arvados.commands.ws as ws
import argparse
@@
-7,7
+9,7
@@
import json
import re
import os
import stat
import re
import os
import stat
-import put
+
from .
import put
import time
import subprocess
import logging
import time
import subprocess
import logging
diff --git
a/sdk/python/arvados/commands/ws.py
b/sdk/python/arvados/commands/ws.py
index 72ef1befed85ffd4d8b883270ebefa0a3bcd3dac..cd67b739f46477c2fc69e7756c258c2cd479daf8 100644
(file)
--- a/
sdk/python/arvados/commands/ws.py
+++ b/
sdk/python/arvados/commands/ws.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import print_function
import sys
import logging
import argparse
import sys
import logging
import argparse
@@
-97,7
+98,7
@@
def main(arguments=None):
elif 'status' in ev and ev['status'] == 200:
pass
else:
elif 'status' in ev and ev['status'] == 200:
pass
else:
- print
json.dumps(ev
)
+ print
(json.dumps(ev)
)
try:
ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval, last_log_id=last_log_id)
try:
ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval, last_log_id=last_log_id)
diff --git
a/sdk/python/arvados/events.py
b/sdk/python/arvados/events.py
index cf26f9e8addb7b6e45e2af87a2504947878c7c6c..b385761f7b7b1575dc576e783b3ae61e45eeb2cf 100644
(file)
--- a/
sdk/python/arvados/events.py
+++ b/
sdk/python/arvados/events.py
@@
-1,7
+1,8
@@
+from __future__ import absolute_import
import arvados
import arvados
-import config
-import errors
-from retry import RetryLoop
+
from .
import config
+
from .
import errors
+from
.
retry import RetryLoop
import logging
import json
import logging
import json
diff --git
a/sdk/python/arvados/keep.py
b/sdk/python/arvados/keep.py
index 38f332b38e2d51aae9b6a3fa5007a59aad6b006f..4efa6982a1fa346e3ae6c55a0e72f892968173f1 100644
(file)
--- a/
sdk/python/arvados/keep.py
+++ b/
sdk/python/arvados/keep.py
@@
-1,3
+1,4
@@
+from __future__ import absolute_import
import cStringIO
import datetime
import hashlib
import cStringIO
import datetime
import hashlib
@@
-11,7
+12,7
@@
import socket
import ssl
import sys
import threading
import ssl
import sys
import threading
-import timer
+
from .
import timer
import urlparse
import arvados
import urlparse
import arvados
diff --git
a/sdk/python/arvados/safeapi.py
b/sdk/python/arvados/safeapi.py
index 5c5c87250ac678f9b9bf93cbf56cb335707c6554..bc875367de02e6bea245c4d2230346bf4a78ac36 100644
(file)
--- a/
sdk/python/arvados/safeapi.py
+++ b/
sdk/python/arvados/safeapi.py
@@
-1,7
+1,8
@@
+from __future__ import absolute_import
import threading
import threading
-import api
-import keep
-import config
+
from .
import api
+
from .
import keep
+
from .
import config
import copy
class ThreadSafeApiCache(object):
import copy
class ThreadSafeApiCache(object):
diff --git
a/sdk/python/arvados/stream.py
b/sdk/python/arvados/stream.py
index afc202e1806cd9c5ce32ce4aa8e09777d527be0b..042ed47e40edb495cf1a91073ea75cc4d08b5a01 100644
(file)
--- a/
sdk/python/arvados/stream.py
+++ b/
sdk/python/arvados/stream.py
@@
-1,3
+1,5
@@
+from __future__ import print_function
+from __future__ import absolute_import
import collections
import hashlib
import os
import collections
import hashlib
import os
@@
-9,10
+11,10
@@
import copy
from ._ranges import locators_and_ranges, Range
from .arvfile import StreamFileReader
from arvados.retry import retry_method
from ._ranges import locators_and_ranges, Range
from .arvfile import StreamFileReader
from arvados.retry import retry_method
-from keep import *
-import config
-import errors
-from _normalize_stream import normalize_stream
+from
.
keep import *
+
from .
import config
+
from .
import errors
+from
.
_normalize_stream import normalize_stream
class StreamReader(object):
def __init__(self, tokens, keep=None, debug=False, _empty=False,
class StreamReader(object):
def __init__(self, tokens, keep=None, debug=False, _empty=False,
@@
-23,11
+25,11
@@
class StreamReader(object):
self._keep = keep
self.num_retries = num_retries
self._keep = keep
self.num_retries = num_retries
- streamoffset = 0
L
+ streamoffset = 0
# parse stream
for tok in tokens:
# parse stream
for tok in tokens:
- if debug: print
'tok', tok
+ if debug: print
('tok', tok)
if self._stream_name is None:
self._stream_name = tok.replace('\\040', ' ')
continue
if self._stream_name is None:
self._stream_name = tok.replace('\\040', ' ')
continue
diff --git
a/sdk/python/arvados/timer.py
b/sdk/python/arvados/timer.py
index 739d0d59c02be7f93e3008629f12e4572109a640..6d4a73f25917c16aab5b49cb21d01c94fff0425f 100644
(file)
--- a/
sdk/python/arvados/timer.py
+++ b/
sdk/python/arvados/timer.py
@@
-1,3
+1,4
@@
+from __future__ import print_function
import time
class Timer(object):
import time
class Timer(object):
@@
-13,4
+14,4
@@
class Timer(object):
self.secs = self.end - self.start
self.msecs = self.secs * 1000 # millisecs
if self.verbose:
self.secs = self.end - self.start
self.msecs = self.secs * 1000 # millisecs
if self.verbose:
- print
'elapsed time: %f ms' % self.msecs
+ print
('elapsed time: %f ms' % self.msecs)
diff --git
a/sdk/python/arvados/util.py
b/sdk/python/arvados/util.py
index e2692b738aa16a945d2d3935d39bae3030f5c687..522a95e3e4ff276f7b189de395e0d6f95fe5124b 100644
(file)
--- a/
sdk/python/arvados/util.py
+++ b/
sdk/python/arvados/util.py
@@
-364,10
+364,10
@@
def is_hex(s, *length_args):
def list_all(fn, num_retries=0, **kwargs):
# Default limit to (effectively) api server's MAX_LIMIT
def list_all(fn, num_retries=0, **kwargs):
# Default limit to (effectively) api server's MAX_LIMIT
- kwargs.setdefault('limit', sys.max
int
)
+ kwargs.setdefault('limit', sys.max
size
)
items = []
offset = 0
items = []
offset = 0
- items_available = sys.max
int
+ items_available = sys.max
size
while len(items) < items_available:
c = fn(offset=offset, **kwargs).execute(num_retries=num_retries)
items += c['items']
while len(items) < items_available:
c = fn(offset=offset, **kwargs).execute(num_retries=num_retries)
items += c['items']
diff --git
a/sdk/python/tests/manifest_examples.py
b/sdk/python/tests/manifest_examples.py
index 8f0abd245ba752cd778473f0951f1b89a38cc868..f20d9090229dbd90b1466d6c3f065e6296ccdbb2 100644
(file)
--- a/
sdk/python/tests/manifest_examples.py
+++ b/
sdk/python/tests/manifest_examples.py
@@
-1,5
+1,6
@@
+from __future__ import absolute_import
import arvados
import arvados
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
class ManifestExamples(object):
def make_manifest(self,
class ManifestExamples(object):
def make_manifest(self,
diff --git
a/sdk/python/tests/performance/test_a_sample.py
b/sdk/python/tests/performance/test_a_sample.py
index dff098403dfffbba967b63c67702e7d27251c507..b99ca64a3e8d959d87d783bdaf0052d0e9f21ac1 100644
(file)
--- a/
sdk/python/tests/performance/test_a_sample.py
+++ b/
sdk/python/tests/performance/test_a_sample.py
@@
-1,6
+1,8
@@
+from __future__ import print_function
+from __future__ import absolute_import
import unittest
import unittest
-from performance_profiler import profiled
+from
.
performance_profiler import profiled
class PerformanceTestSample(unittest.TestCase):
def foo(self):
class PerformanceTestSample(unittest.TestCase):
def foo(self):
@@
-12,4
+14,4
@@
class PerformanceTestSample(unittest.TestCase):
for i in range(0,2**20):
j += i
self.foo()
for i in range(0,2**20):
j += i
self.foo()
- print
'Hello'
+ print
('Hello')
diff --git
a/sdk/python/tests/run_test_server.py
b/sdk/python/tests/run_test_server.py
index d10e60c22fef1009179c90da126d098a2fdc9c56..8d7e708de933e3091d4d11d1e6247b1211865d92 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-211,7
+211,7
@@
def _fifo2stderr(label):
except OSError as error:
if error.errno != errno.ENOENT:
raise
except OSError as error:
if error.errno != errno.ENOENT:
raise
- os.mkfifo(fifo, 0700)
+ os.mkfifo(fifo, 0
o
700)
subprocess.Popen(
['stdbuf', '-i0', '-oL', '-eL', 'sed', '-e', 's/^/['+label+'] /', fifo],
stdout=sys.stderr)
subprocess.Popen(
['stdbuf', '-i0', '-oL', '-eL', 'sed', '-e', 's/^/['+label+'] /', fifo],
stdout=sys.stderr)
diff --git
a/sdk/python/tests/test_api.py
b/sdk/python/tests/test_api.py
index 6c379e1455f9f81c4c71d0bdafeb5ca03d02b75d..b6b2b563a74f8a0f8fee7ab1459d2f178c33f2b3 100644
(file)
--- a/
sdk/python/tests/test_api.py
+++ b/
sdk/python/tests/test_api.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import absolute_import
import arvados
import collections
import httplib2
import arvados
import collections
import httplib2
@@
-12,12
+13,12
@@
import string
import unittest
import mock
import unittest
import mock
-import run_test_server
+
from .
import run_test_server
from apiclient import errors as apiclient_errors
from apiclient import http as apiclient_http
from arvados.api import OrderedJsonModel, RETRY_DELAY_INITIAL, RETRY_DELAY_BACKOFF, RETRY_COUNT
from apiclient import errors as apiclient_errors
from apiclient import http as apiclient_http
from arvados.api import OrderedJsonModel, RETRY_DELAY_INITIAL, RETRY_DELAY_BACKOFF, RETRY_COUNT
-from arvados_testutil import fake_httplib2_response, queue_with
+from
.
arvados_testutil import fake_httplib2_response, queue_with
if not mimetypes.inited:
mimetypes.init()
if not mimetypes.inited:
mimetypes.init()
diff --git
a/sdk/python/tests/test_arv_copy.py
b/sdk/python/tests/test_arv_copy.py
index e291ee05f2ed07b0635cc6c8b5374b0fdecb11ba..c8eb5d14f838161355e3dd392419ff9dae86a1b2 100644
(file)
--- a/
sdk/python/tests/test_arv_copy.py
+++ b/
sdk/python/tests/test_arv_copy.py
@@
-1,6
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import
import io
import os
import sys
import io
import os
import sys
@@
-8,7
+9,7
@@
import tempfile
import unittest
import arvados.commands.arv_copy as arv_copy
import unittest
import arvados.commands.arv_copy as arv_copy
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
class ArvCopyTestCase(unittest.TestCase):
def run_copy(self, args):
class ArvCopyTestCase(unittest.TestCase):
def run_copy(self, args):
diff --git
a/sdk/python/tests/test_arv_keepdocker.py
b/sdk/python/tests/test_arv_keepdocker.py
index a25ad1660912b08ebc825d795ba7c23626be3d89..2257227c742f1e5a33f52189acb9b92ce5e43483 100644
(file)
--- a/
sdk/python/tests/test_arv_keepdocker.py
+++ b/
sdk/python/tests/test_arv_keepdocker.py
@@
-1,6
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import
import arvados
import hashlib
import io
import arvados
import hashlib
import io
@@
-13,8
+14,8
@@
import unittest
import logging
import arvados.commands.keepdocker as arv_keepdocker
import logging
import arvados.commands.keepdocker as arv_keepdocker
-import arvados_testutil as tutil
-import run_test_server
+
from .
import arvados_testutil as tutil
+
from .
import run_test_server
class StopTest(Exception):
class StopTest(Exception):
diff --git
a/sdk/python/tests/test_arv_ls.py
b/sdk/python/tests/test_arv_ls.py
index 5064f07d722ee77efc0c8a4f733eaf86d02b8b39..8e5c5ad12a10f8851a5ba4ac016db67ed8d4b152 100644
(file)
--- a/
sdk/python/tests/test_arv_ls.py
+++ b/
sdk/python/tests/test_arv_ls.py
@@
-1,6
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import
import io
import os
import random
import io
import os
import random
@@
-10,9
+11,9
@@
import tempfile
import arvados.errors as arv_error
import arvados.commands.ls as arv_ls
import arvados.errors as arv_error
import arvados.commands.ls as arv_ls
-import run_test_server
+
from .
import run_test_server
-from arvados_testutil import str_keep_locator, redirected_streams
+from
.
arvados_testutil import str_keep_locator, redirected_streams
class ArvLsTestCase(run_test_server.TestCaseWithServers):
FAKE_UUID = 'zzzzz-4zz18-12345abcde12345'
class ArvLsTestCase(run_test_server.TestCaseWithServers):
FAKE_UUID = 'zzzzz-4zz18-12345abcde12345'
diff --git
a/sdk/python/tests/test_arv_put.py
b/sdk/python/tests/test_arv_put.py
index 286a22e36a559779fd190a96201479d5ed81413d..5f314bd3078af98ea5a465d07a24fde4282a6310 100644
(file)
--- a/
sdk/python/tests/test_arv_put.py
+++ b/
sdk/python/tests/test_arv_put.py
@@
-1,6
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import
import apiclient
import io
import mock
import apiclient
import io
import mock
@@
-22,10
+23,10
@@
from cStringIO import StringIO
import arvados
import arvados.commands.put as arv_put
import arvados
import arvados.commands.put as arv_put
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
-from arvados_testutil import ArvadosBaseTestCase, fake_httplib2_response
-import run_test_server
+from
.
arvados_testutil import ArvadosBaseTestCase, fake_httplib2_response
+
from .
import run_test_server
class ArvadosPutResumeCacheTest(ArvadosBaseTestCase):
CACHE_ARGSET = [
class ArvadosPutResumeCacheTest(ArvadosBaseTestCase):
CACHE_ARGSET = [
diff --git
a/sdk/python/tests/test_arv_run.py
b/sdk/python/tests/test_arv_run.py
index 3d04d272286240cec2ec2d9103a10d6dbaddbda9..0f33dfc6c898f1dbdec4fd8582ae14841bf497fd 100644
(file)
--- a/
sdk/python/tests/test_arv_run.py
+++ b/
sdk/python/tests/test_arv_run.py
@@
-1,6
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import
import io
import os
import sys
import io
import os
import sys
@@
-8,7
+9,7
@@
import tempfile
import unittest
import arvados.commands.run as arv_run
import unittest
import arvados.commands.run as arv_run
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
class ArvRunTestCase(unittest.TestCase):
def run_arv_run(self, args):
class ArvRunTestCase(unittest.TestCase):
def run_arv_run(self, args):
diff --git
a/sdk/python/tests/test_arv_ws.py
b/sdk/python/tests/test_arv_ws.py
index 2a85e04e87c06067bd7d83773295cf049f747852..4a0b8238a7f360d2a8dad1b437745ab67e5b4f24 100644
(file)
--- a/
sdk/python/tests/test_arv_ws.py
+++ b/
sdk/python/tests/test_arv_ws.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import absolute_import
import io
import os
import sys
import io
import os
import sys
@@
-8,7
+9,7
@@
import unittest
import arvados.errors as arv_error
import arvados.commands.ws as arv_ws
import arvados.errors as arv_error
import arvados.commands.ws as arv_ws
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
class ArvWsTestCase(unittest.TestCase):
def run_ws(self, args):
class ArvWsTestCase(unittest.TestCase):
def run_ws(self, args):
diff --git
a/sdk/python/tests/test_arvfile.py
b/sdk/python/tests/test_arvfile.py
index 1b66935237c20bcedb75ab1d6ae51fd17bf38dad..6c4976ee0de1633ca114423624f3ca6c1b9a3546 100644
(file)
--- a/
sdk/python/tests/test_arvfile.py
+++ b/
sdk/python/tests/test_arvfile.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import absolute_import
import bz2
import datetime
import gzip
import bz2
import datetime
import gzip
@@
-15,8
+16,8
@@
from arvados.keep import KeepLocator
from arvados.collection import Collection, CollectionReader
from arvados.arvfile import ArvadosFile, ArvadosFileReader
from arvados.collection import Collection, CollectionReader
from arvados.arvfile import ArvadosFile, ArvadosFileReader
-import arvados_testutil as tutil
-from test_stream import StreamFileReaderTestCase, StreamRetryTestMixin
+
from .
import arvados_testutil as tutil
+from
.
test_stream import StreamFileReaderTestCase, StreamRetryTestMixin
class ArvadosFileWriterTestCase(unittest.TestCase):
class MockKeep(object):
class ArvadosFileWriterTestCase(unittest.TestCase):
class MockKeep(object):
diff --git
a/sdk/python/tests/test_benchmark_collections.py
b/sdk/python/tests/test_benchmark_collections.py
index d75ad477896defb39eab00035cd9fbe757e49fbf..273011e8f0d58cdf24b8a02ad26c64509483fc54 100644
(file)
--- a/
sdk/python/tests/test_benchmark_collections.py
+++ b/
sdk/python/tests/test_benchmark_collections.py
@@
-1,10
+1,11
@@
+from __future__ import absolute_import
import arvados
import sys
import arvados
import sys
-import run_test_server
-import arvados_testutil as tutil
-import manifest_examples
-from performance.performance_profiler import profiled
+
from .
import run_test_server
+
from .
import arvados_testutil as tutil
+
from .
import manifest_examples
+from
.
performance.performance_profiler import profiled
class CollectionBenchmark(run_test_server.TestCaseWithServers,
tutil.ArvadosBaseTestCase,
class CollectionBenchmark(run_test_server.TestCaseWithServers,
tutil.ArvadosBaseTestCase,
diff --git
a/sdk/python/tests/test_cache.py
b/sdk/python/tests/test_cache.py
index 4d68b401ee2c219cce872ce75d6ec81a6a678108..93388e6de8d80b56d09038403cdc0bc4f1e4ea38 100644
(file)
--- a/
sdk/python/tests/test_cache.py
+++ b/
sdk/python/tests/test_cache.py
@@
-1,4
+1,5
@@
from __future__ import print_function
from __future__ import print_function
+from __future__ import absolute_import
import md5
import mock
import md5
import mock
@@
-10,9
+11,9
@@
import tempfile
import threading
import unittest
import threading
import unittest
-import arvados.cache
import arvados
import arvados
-import run_test_server
+import arvados.cache
+from . import run_test_server
def _random(n):
def _random(n):
diff --git
a/sdk/python/tests/test_collections.py
b/sdk/python/tests/test_collections.py
index 0e3d5e13f135c84f2fde2f741bd554b0ccdf3a85..46682deaa660171a3e6878c98b23c198a4578fd3 100644
(file)
--- a/
sdk/python/tests/test_collections.py
+++ b/
sdk/python/tests/test_collections.py
@@
-1,3
+1,4
@@
+from __future__ import absolute_import
# usage example:
#
# ARVADOS_API_TOKEN=abc ARVADOS_API_HOST=arvados.local python -m unittest discover
# usage example:
#
# ARVADOS_API_TOKEN=abc ARVADOS_API_HOST=arvados.local python -m unittest discover
@@
-11,10
+12,10
@@
import re
import tempfile
import unittest
import tempfile
import unittest
-import run_test_server
+
from .
import run_test_server
from arvados._ranges import Range, LocatorAndRange
from arvados.collection import Collection, CollectionReader
from arvados._ranges import Range, LocatorAndRange
from arvados.collection import Collection, CollectionReader
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
class TestResumableWriter(arvados.ResumableCollectionWriter):
KEEP_BLOCK_SIZE = 1024 # PUT to Keep every 1K.
class TestResumableWriter(arvados.ResumableCollectionWriter):
KEEP_BLOCK_SIZE = 1024 # PUT to Keep every 1K.
diff --git
a/sdk/python/tests/test_errors.py
b/sdk/python/tests/test_errors.py
index db875dc212a1567638ad82155817078e0da48773..2ccd59461356ec69281e645bad39c587c3e6c6b1 100644
(file)
--- a/
sdk/python/tests/test_errors.py
+++ b/
sdk/python/tests/test_errors.py
@@
-1,10
+1,11
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import absolute_import
import traceback
import unittest
import arvados.errors as arv_error
import traceback
import unittest
import arvados.errors as arv_error
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
class KeepRequestErrorTestCase(unittest.TestCase):
REQUEST_ERRORS = [
class KeepRequestErrorTestCase(unittest.TestCase):
REQUEST_ERRORS = [
diff --git
a/sdk/python/tests/test_events.py
b/sdk/python/tests/test_events.py
index 88e528362143b04b1477aef0b4af3c2af1d76b0a..73b9f2254497b0c90cdb51ebb2ea4dd70cb46f18 100644
(file)
--- a/
sdk/python/tests/test_events.py
+++ b/
sdk/python/tests/test_events.py
@@
-1,14
+1,16
@@
+from __future__ import print_function
+from __future__ import absolute_import
import arvados
import io
import logging
import mock
import Queue
import arvados
import io
import logging
import mock
import Queue
-import run_test_server
+
from .
import run_test_server
import threading
import time
import unittest
import threading
import time
import unittest
-import arvados_testutil
+
from .
import arvados_testutil
class WebsocketTest(run_test_server.TestCaseWithServers):
MAIN_SERVER = {}
class WebsocketTest(run_test_server.TestCaseWithServers):
MAIN_SERVER = {}
@@
-27,7
+29,7
@@
class WebsocketTest(run_test_server.TestCaseWithServers):
if self.ws:
self.ws.close()
except Exception as e:
if self.ws:
self.ws.close()
except Exception as e:
- print(
"Error in teardown: ", e
)
+ print(
("Error in teardown: ", e)
)
super(WebsocketTest, self).tearDown()
run_test_server.reset()
super(WebsocketTest, self).tearDown()
run_test_server.reset()
diff --git
a/sdk/python/tests/test_keep_client.py
b/sdk/python/tests/test_keep_client.py
index 85b5bc81f00902a2a816d606bbc2cecff06de289..bb6e983185ccb354ac1774340db0387784b7c653 100644
(file)
--- a/
sdk/python/tests/test_keep_client.py
+++ b/
sdk/python/tests/test_keep_client.py
@@
-1,3
+1,4
@@
+from __future__ import absolute_import
import hashlib
import mock
import os
import hashlib
import mock
import os
@@
-12,9
+13,9
@@
import urlparse
import arvados
import arvados.retry
import arvados
import arvados.retry
-import arvados_testutil as tutil
-import keepstub
-import run_test_server
+
from .
import arvados_testutil as tutil
+
from .
import keepstub
+
from .
import run_test_server
class KeepTestCase(run_test_server.TestCaseWithServers):
MAIN_SERVER = {}
class KeepTestCase(run_test_server.TestCaseWithServers):
MAIN_SERVER = {}
diff --git
a/sdk/python/tests/test_pipeline_template.py
b/sdk/python/tests/test_pipeline_template.py
index fa9fef28266bd668d61b1513adcf47395a937a6d..4c0059aaea18844ead873943f6c97cad1695a9ef 100644
(file)
--- a/
sdk/python/tests/test_pipeline_template.py
+++ b/
sdk/python/tests/test_pipeline_template.py
@@
-1,3
+1,4
@@
+from __future__ import absolute_import
# usage example:
#
# ARVADOS_API_TOKEN=abc ARVADOS_API_HOST=arvados.local python -m unittest discover
# usage example:
#
# ARVADOS_API_TOKEN=abc ARVADOS_API_HOST=arvados.local python -m unittest discover
@@
-5,7
+6,7
@@
import unittest
import arvados
import apiclient
import unittest
import arvados
import apiclient
-import run_test_server
+
from .
import run_test_server
class PipelineTemplateTest(run_test_server.TestCaseWithServers):
MAIN_SERVER = {}
class PipelineTemplateTest(run_test_server.TestCaseWithServers):
MAIN_SERVER = {}
diff --git
a/sdk/python/tests/test_retry_job_helpers.py
b/sdk/python/tests/test_retry_job_helpers.py
index 6e562a022edd969e21e7d67098dd5011e431f91f..3ccaa37218f76f26d25f86af1b094164ad643d50 100644
(file)
--- a/
sdk/python/tests/test_retry_job_helpers.py
+++ b/
sdk/python/tests/test_retry_job_helpers.py
@@
-1,13
+1,14
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import absolute_import
import mock
import os
import unittest
import hashlib
import mock
import os
import unittest
import hashlib
-import run_test_server
+
from .
import run_test_server
import json
import arvados
import json
import arvados
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
from apiclient import http as apiclient_http
from apiclient import http as apiclient_http
diff --git
a/sdk/python/tests/test_stream.py
b/sdk/python/tests/test_stream.py
index 624f1b8ca4391678215539f70c2a28b00fd37388..9e35bcf9c8327266c84cfeb25faa2a38b656dfc9 100644
(file)
--- a/
sdk/python/tests/test_stream.py
+++ b/
sdk/python/tests/test_stream.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+from __future__ import absolute_import
import bz2
import gzip
import io
import bz2
import gzip
import io
@@
-12,8
+13,8
@@
import arvados
from arvados import StreamReader, StreamFileReader
from arvados._ranges import Range
from arvados import StreamReader, StreamFileReader
from arvados._ranges import Range
-import arvados_testutil as tutil
-import run_test_server
+
from .
import arvados_testutil as tutil
+
from .
import run_test_server
class StreamFileReaderTestCase(unittest.TestCase):
def make_count_reader(self):
class StreamFileReaderTestCase(unittest.TestCase):
def make_count_reader(self):