Merge lp:~cjwatson/lazr.restfulclient/lsb-release into lp:lazr.restfulclient

[Colin Watson]

Inline a small part of platform.linux_distribution, since it's deprecated in Python 3.5 and will be removed in 3.7.

Inline a small part of platform.linux_distribution, since it's deprecated in Python 3.5 and will be removed in 3.7. This only supports platforms where /etc/lsb-release exists, and otherwise falls back to platform.system; we can extend it if that's actually needed, but it probably isn't.

[lp:~cjwatson/lazr.restfulclient/lsb-release]

147. By Colin Watson on 2015-11-18

Inline a small part of platform.linux_distribution, since it's deprecated in Python 3.5 and will be removed in 3.7.

[Dimitri John Ledkov (xnox)]

I did complain upstream saying that they should simply parse /etc/os-release, with fallback got /usr/lib/os-release, but no avail.

I would prefer for the new code to parse the first one of ['/etc/os-release', '/usr/lib/os-release'] as per http://www.freedesktop.org/software/systemd/man/os-release.html

[Colin Watson (cjwatson)]

I would be more motivated to do that if you could suggest an example situation where it actually makes a difference? It feels like busywork otherwise, since we'll probably still have to include lsb-release support.

[Colin Watson (cjwatson)]

I noticed today that there's a "distro" module on PyPI and in Debian which is actively maintained and provides much the same interface as was previously in the stdlib, but including more modern data sources such as os-release. I'm therefore withdrawing this MP in favour of https://code.launchpad.net/~cjwatson/lazr.restfulclient/distro/+merge/344799.

review: Disapprove

Unmerged revisions

147. By Colin Watson on 2015-11-18

Inline a small part of platform.linux_distribution, since it's deprecated in Python 3.5 and will be removed in 3.7.

=== modified file 'src/lazr/restfulclient/authorize/oauth.py'
--- src/lazr/restfulclient/authorize/oauth.py	2014-07-28 15:35:35 +0000
+++ src/lazr/restfulclient/authorize/oauth.py	2015-11-18 14:26:19 +0000
@@ -26,6 +26,7 @@
     from ConfigParser import SafeConfigParser
 import os
 import platform
+import re
 import stat
 import socket
 # Work around relative import behavior.  The below is equivalent to
@@ -107,14 +108,16 @@
         This key identifies the platform and the computer's
         hostname. It does not identify the active user.
         """
+        _distributor_id_file_re = re.compile("(?:DISTRIB_ID\s*=)\s*(.*)", re.I)
+        distname = ''
         try:
-            distname, version, release_id = platform.linux_distribution()
-        except Exception:
-            # This can happen in pre-2.6 versions of Python. We don't
-            # use platform.dist() because it looks like old versions
-            # of dist can give inconsistent answers on a single
-            # computer.
-            distname = ''
+            with open("/etc/lsb-release", "r") as etclsbrel:
+                for line in etclsbrel:
+                    m = _distributor_id_file_re.search(line)
+                    if m:
+                        distname = m.group(1).strip()
+        except EnvironmentError:
+            pass
         if distname == '':
             distname = platform.system() # (eg. "Windows")
         return self.KEY_FORMAT % (distname, socket.gethostname())