Feat(bin/webbrowser-encode-url): Port to Python 2+3

[dotfiles.git] / bin / mc_type.py

diff --git a/bin/mc_type.py b/bin/mc_type.py
index 70dcc2b6a56f062086fc4bd0471aeb2cd7361a53..dbcf94d5ab3eeaa8372ca779b546e96e89c57279 100755 (executable)
--- a/bin/mc_type.py
+++ b/bin/mc_type.py
@@ -7,19 +7,21 @@ assert mc in ['/usr/local/bin/mc', '/usr/bin/mc']
 
 mc = subprocess.Popen([mc, '--version'],
                       stdout=subprocess.PIPE,
-                      stderr=subprocess.STDOUT)
-mc.wait()
-mc_version = mc.stdout.readline()
-mc.stdout.read()
-mc.stdout.close()
+                      stderr=subprocess.PIPE,
+                      close_fds=True, env={})
+stdout, stderr = mc.communicate()
+if mc.returncode or stderr:
+    sys.exit('Error reading mc version: (%d) %s' % (mc.returncode, stderr))
 
+mc_version = stdout.split('\n')[0]
 if mc_version.startswith('Midnight Commander'):
     mc_version = mc_version.split()[2]
 elif mc_version.startswith('GNU Midnight Commander') or \
      mc_version.startswith('The Midnight Commander'):
     mc_version = mc_version.split()[3]
 else:
-    raise ValueError('Unknown mc version')
+    sys.exit('Unknown mc version')
+
 if '.' in mc_version:
     major, minor = [int(v) for v in mc_version.split('.')[:2]]
     if major < 4: