More verbose UA & test UA test fixes

certbot/le_util.py

@@ -238,7 +238,9 @@ def get_os_info_ua(filepath="/etc/os-release"):
     """
 
     if os.path.isfile(filepath):
-        os_ua = _get_systemd_os_release_var("NAME", filepath=filepath)
+        os_ua = _get_systemd_os_release_var("PRETTY_NAME", filepath=filepath)
+        if not os_ua:
+            os_ua = _get_systemd_os_release_var("NAME", filepath=filepath)
         if os_ua:
             return os_ua
 
@@ -396,7 +398,7 @@ def enforce_domain_sanity(domain):
         domain = domain.encode('ascii').lower()
     except UnicodeError:
         error_fmt = (u"Internationalized domain names "
-                      "are not presently supported: {0}")
+                     "are not presently supported: {0}")
         if isinstance(domain, six.text_type):
             raise errors.ConfigurationError(error_fmt.format(domain))
         else:
@@ -423,5 +425,6 @@ def enforce_domain_sanity(domain):
     #  first and last char is not "-"
     fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,63}$")
     if not fqdn.match(domain):
-        raise errors.ConfigurationError("Requested domain {0} is not a FQDN".format(domain))
+        raise errors.ConfigurationError("Requested domain {0} is not a FQDN"
+                                        .format(domain))
     return domain

certbot/tests/cli_test.py

@@ -163,13 +163,13 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
 
         with mock.patch('certbot.main.client.acme_client.ClientNetwork') as acme_net:
             self._call_no_clientmock(args)
-            os_ver = " ".join(le_util.get_os_info())
+            os_ver = le_util.get_os_info_ua()
             ua = acme_net.call_args[1]["user_agent"]
             self.assertTrue(os_ver in ua)
             import platform
             plat = platform.platform()
             if "linux" in plat.lower():
-                self.assertTrue(le_util.get_os_info()[0] in ua)
+                self.assertTrue(le_util.get_os_info_ua() in ua)
 
         with mock.patch('certbot.main.client.acme_client.ClientNetwork') as acme_net:
             ua = "bandersnatch"

certbot/tests/testdata/os-release

@@ -2,7 +2,6 @@ NAME="SystemdOS"
 VERSION="42.42.42 LTS, Unreal"
 ID=systemdos
 ID_LIKE=debian
-PRETTY_NAME="SystemdOS 42.42.42 Unreal"
 VERSION_ID="42"
 HOME_URL="http://www.example.com/"
 SUPPORT_URL="http://help.example.com/"