Merge pull request #65 from ushiboy/release/1.2.0

[WIP] Release 1.2.0

Author: ushiboy

README.md

@@ -459,6 +459,10 @@ nmcli.set_lang(lang: str) -> None
 
 ## Change Log
 
+### 1.2.0
+
+- Added support for encodings other than UTF-8.
+
 ### 1.1.2
 
 - Fixed a problem with environment variables being scraped.

nmcli/_system.py

@@ -1,3 +1,4 @@
+import locale
 import os
 from subprocess import CalledProcessError, run
 from typing import List, Union
@@ -14,6 +15,9 @@
 CommandParameter = Union[str, List[str]]
 
 
+encoding = locale.getpreferredencoding()
+
+
 class SystemCommandInterface:
 
     def nmcli(self, parameters: CommandParameter) -> str:
@@ -42,10 +46,10 @@ def nmcli(self, parameters: CommandParameter) -> str:
             env = dict(os.environ, **{'LANG': self._lang})
             r = self._run(commands, capture_output=True,
                           check=True, env=env)
-            return r.stdout.decode('utf-8')
+            return r.stdout.decode(encoding)
         except CalledProcessError as e:
             rc = e.returncode
-            stderr = e.stderr.decode('utf-8')
+            stderr = e.stderr.decode(encoding)
             if rc == 2:
                 raise InvalidUserInputException(
                     'Invalid user input, wrong nmcli invocation') from e

setup.py

@@ -13,7 +13,7 @@ def run_tests(self):
 
 setup(
     name='nmcli',
-    version='1.1.2',
+    version='1.2.0',
     author='ushiboy',
     license='MIT',
     license_files = ('LICENSE.txt',),