Follow-up to ab9a381 from giampaolo#1341

embray · Sep 26, 2018 · 2091a20 · 2091a20
1 parent 1524af0
commit 2091a20
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/psutil/_common.py b/psutil/_common.py
@@ -62,7 +62,7 @@
     'pthread', 'puids', 'sconn', 'scpustats', 'sdiskio', 'sdiskpart',
     'sdiskusage', 'snetio', 'snicaddr', 'snicstats', 'sswap', 'suser',
     # utility functions
-    'str2bytes', 'bytes2str', 'unicode2str',
+    'str2bytes', 'bytes2str', 'unicode2str', 'open_binary', 'open_text',
     'conn_tmap', 'deprecated_method', 'isfile_strict', 'memoize',
     'parse_environ_block', 'path_exists_strict', 'usage_percent',
     'supports_ipv6', 'sockfam_to_enum', 'socktype_to_enum', "wrap_numbers",

diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
@@ -25,8 +25,6 @@
 from . import _psposix
 from . import _psutil_linux as cext
 from . import _psutil_posix as cext_posix
-from ._common import ENCODING
-from ._common import ENCODING_ERRS
 from ._common import isfile_strict
 from ._common import memoize
 from ._common import memoize_when_activated