Do not import memoize, humanize_bytes and urllib_* in powerline.lib

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.

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
 
 

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
 

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