From 87fa52a3eba2450e76302a905be492f248c9f1e0 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Jul 18 2019 11:51:52 +0000
Subject: linux_distribution import moved


and minor code cleanup

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/doc/fedpkg_man_page.py b/doc/fedpkg_man_page.py
index 70e4086..fb25159 100755
--- a/doc/fedpkg_man_page.py
+++ b/doc/fedpkg_man_page.py
@@ -3,7 +3,6 @@
 
 import os
 import sys
-import datetime
 
 from six.moves.configparser import ConfigParser
 
diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
index 270cae0..f66cb12 100644
--- a/fedpkg/__init__.py
+++ b/fedpkg/__init__.py
@@ -16,16 +16,21 @@ import re
 
 from datetime import datetime, timedelta
 
+# doc/fedpkg_man_page.py uses the 'cli' import
 from . import cli  # noqa
 from .lookaside import FedoraLookasideCache
 from pyrpkg.utils import cached_property
-from .utils import linux_distribution
 
 try:
     from bodhi.client.bindings import BodhiClient as _BodhiClient
 except ImportError:
     _BodhiClient = None
 
+try:
+    from distro import linux_distribution  # noqa
+except ImportError:
+    from platform import linux_distribution  # noqa
+
 
 if _BodhiClient is not None:
     from fedora.client import AuthError
diff --git a/fedpkg/utils.py b/fedpkg/utils.py
index 81ccae8..ea25439 100644
--- a/fedpkg/utils.py
+++ b/fedpkg/utils.py
@@ -10,20 +10,16 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import re
 import json
+import re
 from datetime import datetime
 
-from six.moves.urllib.parse import urlencode, urlparse
-from six.moves.configparser import NoSectionError, NoOptionError
 import requests
 from requests.exceptions import ConnectionError
-from pyrpkg import rpkgError
+from six.moves.configparser import NoOptionError, NoSectionError
+from six.moves.urllib.parse import urlencode, urlparse
 
-try:
-    from distro import linux_distribution  # noqa
-except ImportError:
-    from platform import linux_distribution  # noqa
+from pyrpkg import rpkgError
 
 
 def query_pdc(server_url, endpoint, params, timeout=60):
diff --git a/setup.py b/setup.py
index 70e5c63..9e26216 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 try:
     from subprocess import getstatusoutput
-except:
+except ImportError:
     from commands import getstatusoutput