diff --git a/powerline/lib/__init__.py b/powerline/lib/__init__.py index fc97407d..a2e4be4a 100644 --- a/powerline/lib/__init__.py +++ b/powerline/lib/__init__.py @@ -2,10 +2,6 @@ from functools import wraps import json -from powerline.lib.memoize import memoize # NOQA -from powerline.lib.humanize_bytes import humanize_bytes # NOQA -from powerline.lib.url import urllib_read, urllib_urlencode # NOQA - def mergedicts(d1, d2): '''Recursively merge two dictionaries. First dictionary is modified in-place. diff --git a/powerline/segments/common.py b/powerline/segments/common.py index 085f17c8..80909360 100644 --- a/powerline/segments/common.py +++ b/powerline/segments/common.py @@ -7,7 +7,9 @@ from datetime import datetime import socket from multiprocessing import cpu_count -from powerline.lib import memoize, urllib_read, urllib_urlencode, add_divider_highlight_group +from powerline.lib import add_divider_highlight_group +from powerline.lib.memoize import memoize +from powerline.lib.url import urllib_read, urllib_urlencode from powerline.lib.vcs import guess diff --git a/powerline/segments/vim.py b/powerline/segments/vim.py index 09b4c636..dc8c2678 100644 --- a/powerline/segments/vim.py +++ b/powerline/segments/vim.py @@ -10,8 +10,10 @@ except ImportError: from powerline.bindings.vim import vim_get_func, getbufvar from powerline.theme import requires_segment_info -from powerline.lib import memoize, humanize_bytes, add_divider_highlight_group +from powerline.lib import add_divider_highlight_group +from powerline.lib.memoize import memoize from powerline.lib.vcs import guess +from powerline.lib.humanize_bytes import humanize_bytes from functools import wraps from collections import defaultdict diff --git a/tests/test_lib.py b/tests/test_lib.py index 94b43b94..6355e25f 100644 --- a/tests/test_lib.py +++ b/tests/test_lib.py @@ -1,5 +1,6 @@ # vim:fileencoding=utf-8:noet -from powerline.lib import mergedicts, add_divider_highlight_group, humanize_bytes +from powerline.lib import mergedicts, add_divider_highlight_group +from powerline.lib.humanize_bytes import humanize_bytes from powerline.lib.vcs import guess from subprocess import call, PIPE import os