Browse Source

[core] Make coerce_password_from_script compatible with Python 2.6

Romain Rigaux 10 years ago
parent
commit
248ab12
1 changed files with 1 additions and 2 deletions
  1. 1 2
      desktop/core/src/desktop/conf.py

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

@@ -57,8 +57,7 @@ def coerce_password_from_script(script):
   stdout, stderr = p.communicate()
   stdout, stderr = p.communicate()
 
 
   if p.returncode != 0:
   if p.returncode != 0:
-    raise subprocess.CalledProcessError(p.returncode, script,
-      output='stdout: %s\nstderr: %s' % (stdout, stderr))
+    raise subprocess.CalledProcessError(p.returncode, script)
 
 
   # whitespace may be significant in the password, but most files have a
   # whitespace may be significant in the password, but most files have a
   # trailing newline.
   # trailing newline.