Explorar o código

HUE-9026 [core] Use str instead of unicode for password
Change-Id: I2089d25eb507bc56a852e021b3875b703eefa19e

Jean-Francois Desjeans Gauthier %!s(int64=6) %!d(string=hai) anos
pai
achega
4309f2f4a6
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      desktop/core/src/desktop/lib/conf.py

+ 2 - 2
desktop/core/src/desktop/lib/conf.py

@@ -720,9 +720,9 @@ def coerce_password_from_script(script):
   p = subprocess.Popen(script, shell=True, stdout=subprocess.PIPE)
   stdout, stderr = p.communicate()
 
-  if isinstance(stdout, bytes):
+  if sys.version_info[0] > 2 and isinstance(stdout, bytes):
     stdout = stdout.decode('utf-8')
-  if isinstance(stderr, bytes):
+  if sys.version_info[0] > 2 and isinstance(stderr, bytes):
     stderr = stderr.decode('utf-8')
 
   if p.returncode != 0: