commit e257d5666568a9621b7dfece313c705e41e17070
author Mike Frysinger <vapier@google.com> Mon Mar 23 16:55:02 2020 -0400
committer Mike Frysinger <vapier@google.com> Wed Mar 25 04:56:07 2020 +0000
tree 82720ced71c4aaa1a12cecd79a95c83d506fd644
parent 3599cc397581086b7fddcd2e07308bfdac7751b1

version: fix running under Python 2

This gets the unittests passing again for now.

Change-Id: Ibed430a305bc26b907ad0ea424c7eec7de37e942
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/259994
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: Jonathan Nieder <jrn@google.com>

repo

diff --git a/repo b/repo
index 66a2a07..12904c3 100755
--- a/repo
+++ b/repo
@@ -1060,9 +1060,13 @@
   print('git %s' % (ParseGitVersion().full,))
   print('Python %s' % sys.version)
   uname = platform.uname()
-  print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
-  print('CPU %s (%s)' %
-        (uname.machine, uname.processor if uname.processor else 'unknown'))
+  if sys.version_info.major < 3:
+    # Python 3 returns a named tuple, but Python 2 is simpler.
+    print(uname)
+  else:
+    print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
+    print('CPU %s (%s)' %
+          (uname.machine, uname.processor if uname.processor else 'unknown'))
   sys.exit(0)
 
 

subcmds/version.py

diff --git a/subcmds/version.py b/subcmds/version.py
index 8721bf4..0bf200f 100644
--- a/subcmds/version.py
+++ b/subcmds/version.py
@@ -56,6 +56,10 @@
     print('git User-Agent %s' % user_agent.git)
     print('Python %s' % sys.version)
     uname = platform.uname()
-    print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
-    print('CPU %s (%s)' %
-          (uname.machine, uname.processor if uname.processor else 'unknown'))
+    if sys.version_info.major < 3:
+      # Python 3 returns a named tuple, but Python 2 is simpler.
+      print(uname)
+    else:
+      print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
+      print('CPU %s (%s)' %
+            (uname.machine, uname.processor if uname.processor else 'unknown'))