From 1242b1cf33c7b6b6569b16300d7a5d2933260231 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Tue, 22 May 2018 11:58:50 +0200 Subject: [PATCH] Make all internal imports relative --- src/file_helpers.py | 4 ++-- src/follow.py | 2 +- src/iter_helpers.py | 2 +- src/log_helpers.py | 2 +- src/log_read.py | 4 ++-- src/test_helpers.py | 10 +++++----- src/text_helpers.py | 2 +- src/zip_stream.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/file_helpers.py b/src/file_helpers.py index d35954b..4f38ea0 100644 --- a/src/file_helpers.py +++ b/src/file_helpers.py @@ -56,8 +56,8 @@ from warnings import warn from math import floor, ceil import re -from call_helpers import call_and_capture -from iter_helpers import pairwise +from .call_helpers import call_and_capture +from .iter_helpers import pairwise @contextmanager diff --git a/src/follow.py b/src/follow.py index 3cf8bcb..167ba0f 100644 --- a/src/follow.py +++ b/src/follow.py @@ -101,7 +101,7 @@ from select import poll, POLLIN, POLLOUT, POLLPRI, POLLHUP, POLLERR, POLLNVAL from subprocess import Popen, PIPE from socket import socket as Socket -from type_helpers import isstr +from .type_helpers import isstr # ############################################################################# # CONSTANTS diff --git a/src/iter_helpers.py b/src/iter_helpers.py index 1ce9c10..e24b68a 100644 --- a/src/iter_helpers.py +++ b/src/iter_helpers.py @@ -25,7 +25,7 @@ been deemed useful """ import itertools as it -from type_helpers import PY2, PY3 +from .type_helpers import PY2, PY3 zip_longest = None diff --git a/src/log_helpers.py b/src/log_helpers.py index c35ac1d..b3b76d5 100644 --- a/src/log_helpers.py +++ b/src/log_helpers.py @@ -46,7 +46,7 @@ from logging import DEBUG, INFO, WARNING, ERROR, CRITICAL, NOTSET from math import log10, floor import sys -from type_helpers import isstr +from .type_helpers import isstr #: log level half-way between INFO and WARNING NOTICE = (INFO + WARNING)//2 diff --git a/src/log_read.py b/src/log_read.py index e9d47a0..1251848 100644 --- a/src/log_read.py +++ b/src/log_read.py @@ -40,9 +40,9 @@ import os import re from warnings import warn import os.path -from iter_helpers import zip_longest +from .iter_helpers import zip_longest -from type_helpers import is_str_or_byte, is_file_obj +from .type_helpers import is_str_or_byte, is_file_obj class LogReadWarning(UserWarning): diff --git a/src/test_helpers.py b/src/test_helpers.py index 18a233c..58bef0e 100644 --- a/src/test_helpers.py +++ b/src/test_helpers.py @@ -46,11 +46,11 @@ except ImportError: # only added in python 3.2 WARN_BASE_CLASS = UserWarning -from buffers import LogarithmicBuffer -from file_helpers import get_filesystem_fill_states, FilesystemFillState, \ - get_mount_info, get_fill_from_statvfs, \ - NOT_REAL_FILESYSTEMS_SPEC, size_str -from iter_helpers import pairwise +from .buffers import LogarithmicBuffer +from .file_helpers import get_filesystem_fill_states, FilesystemFillState, \ + get_mount_info, get_fill_from_statvfs, \ + NOT_REAL_FILESYSTEMS_SPEC, size_str +from .iter_helpers import pairwise class DiscFullPreventionError(Exception): diff --git a/src/text_helpers.py b/src/text_helpers.py index 712609b..36de9e7 100644 --- a/src/text_helpers.py +++ b/src/text_helpers.py @@ -29,7 +29,7 @@ except ImportError: # different name in py2 from functools import partial from itertools import islice -from type_helpers import isstr +from .type_helpers import isstr from sys import stdout diff --git a/src/zip_stream.py b/src/zip_stream.py index caf22a2..b5032e2 100644 --- a/src/zip_stream.py +++ b/src/zip_stream.py @@ -39,7 +39,7 @@ else: import struct # backport of zipfile from python 3.5; works at least for py3.3 from zipfile35 import * -from type_helpers import isstr +from .type_helpers import isstr # copied from zipfile.py -- 1.7.1