From: Brett Smith Date: Wed, 12 Nov 2014 14:38:26 +0000 (-0500) Subject: 3603: Clean up PySDK imports. X-Git-Tag: 1.1.0~2010^2~1 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7924077e3db2898de26c86599d9f311e02d6db46 3603: Clean up PySDK imports. Sort; remove unused imports. --- diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py index a88f36d575..59dc49fbbc 100644 --- a/sdk/python/arvados/collection.py +++ b/sdk/python/arvados/collection.py @@ -1,20 +1,6 @@ -import gflags import logging import os -import pprint -import sys -import types -import subprocess -import json -import UserDict import re -import hashlib -import string -import bz2 -import zlib -import fcntl -import time -import threading from collections import deque from stat import * diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py index 9b90cea2e0..8f787b7843 100644 --- a/sdk/python/arvados/stream.py +++ b/sdk/python/arvados/stream.py @@ -1,20 +1,9 @@ -import gflags +import bz2 +import collections +import hashlib import os -import pprint -import sys -import types -import subprocess -import json -import UserDict import re -import hashlib -import string -import bz2 import zlib -import fcntl -import time -import threading -import collections from arvados.retry import retry_method from keep import * @@ -193,7 +182,7 @@ class StreamFileReader(object): data += newdata sol = 0 while True: - eol = string.find(data, "\n", sol) + eol = data.find("\n", sol) if eol < 0: break yield data[sol:eol+1]