diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-22 10:37:39 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-22 10:37:39 +0100 |
| commit | c62b41f3df3e3ee98cc605a64b90152d3a9c631e (patch) | |
| tree | 8c840394825f0890285abfc6dc4c68b526f7f269 /psutil/__init__.py | |
| parent | 0aa753fff8dcbf0ca36acfd8cfd9ae196ce000f9 (diff) | |
| download | psutil-fbenkstein-non-unicode.tar.gz | |
expose https://github.com/fbenkstein and fix name() / cmdline() encoding errors on linux / py3fbenkstein-non-unicode
Diffstat (limited to 'psutil/__init__.py')
| -rw-r--r-- | psutil/__init__.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/psutil/__init__.py b/psutil/__init__.py index d46e034e..f3425de7 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -141,6 +141,12 @@ else: # pragma: no cover raise NotImplementedError('platform %s is not supported' % sys.platform) +# Dictates how to handle encoding and decoding errors (with open()) +# on Python 3. This is public API and it will be retrieved from _ps*.py +# modules via sys.modules. +ENCODING_ERRORS_HANDLER = 'surrogateescape' + + __all__ = [ # exceptions "Error", "NoSuchProcess", "ZombieProcess", "AccessDenied", @@ -155,6 +161,7 @@ __all__ = [ "CONN_LAST_ACK", "CONN_LISTEN", "CONN_CLOSING", "CONN_NONE", "AF_LINK", "NIC_DUPLEX_FULL", "NIC_DUPLEX_HALF", "NIC_DUPLEX_UNKNOWN", + "ENCODING_ERRORS_HANDLER", # classes "Process", "Popen", # functions @@ -168,7 +175,7 @@ __all__ = [ ] __all__.extend(_psplatform.__extra__all__) __author__ = "Giampaolo Rodola'" -__version__ = "3.4.2" +__version__ = "3.5.0" version_info = tuple([int(num) for num in __version__.split('.')]) AF_LINK = _psplatform.AF_LINK _TOTAL_PHYMEM = None |