From c8fcb2782a862cea45891e9a96b398fc236e907b Mon Sep 17 00:00:00 2001
From: nir0s <nir36g@gmail.com>
Date: Thu, 21 Apr 2016 17:04:51 +0300
Subject: [PATCH] replace ld with distro and arrange some code

---
 serv/init/__init__.py |  4 ++--
 serv/init/base.py     |  8 ++++----
 serv/init/nssm.py     |  2 +-
 serv/serv.py          | 13 +++++++------
 serv/utils.py         |  4 ++--
 setup.py              |  4 ++--
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/serv/init/__init__.py b/serv/init/__init__.py
index 4be051e..bb69f74 100644
--- a/serv/init/__init__.py
+++ b/serv/init/__init__.py
@@ -1,4 +1,4 @@
-from serv.init.systemd import SystemD  # NOQA
-from serv.init.upstart import Upstart  # NOQA
 from serv.init.sysv import SysV  # NOQA
 from serv.init.nssm import Nssm  # NOQA
+from serv.init.upstart import Upstart  # NOQA
+from serv.init.systemd import SystemD  # NOQA
diff --git a/serv/init/base.py b/serv/init/base.py
index 2c3b379..d83ab67 100644
--- a/serv/init/base.py
+++ b/serv/init/base.py
@@ -1,14 +1,14 @@
-import pkgutil
 import os
-import json
 import sys
-from distutils.spawn import find_executable
+import json
 import shutil
+import pkgutil
+from distutils.spawn import find_executable
 
 import jinja2
 
-from serv import constants as const
 from serv import utils
+from serv import constants as const
 
 
 class Base(object):
diff --git a/serv/init/nssm.py b/serv/init/nssm.py
index 58690af..3ca44ec 100644
--- a/serv/init/nssm.py
+++ b/serv/init/nssm.py
@@ -2,9 +2,9 @@
 import sys
 import shutil
 
+from serv import utils
 from serv.init.base import Base
 from serv import constants as const
-from serv import utils
 
 
 RUNNING_STATES = ['SERVICE_RUNNING', 'SERVICE_STOP_PENDING']
diff --git a/serv/serv.py b/serv/serv.py
index 4768dd6..947c2d4 100644
--- a/serv/serv.py
+++ b/serv/serv.py
@@ -315,16 +315,17 @@ def _lookup_by_mapping():
         for Arch where the distro's ID changes (Manjaro, Antergos, etc...)
         But the "ID_LIKE" field is always (?) `arch`.
         """
-        import ld
-        like = ld.like().lower()
-        distro = ld.id().lower()
-        version = ld.major_version()
+        import distro
+        like = distro.like().lower()
+        distribution_id = distro.id().lower()
+        version = distro.major_version()
         # init (upstart 1.12.1)
-        if distro in ('arch'):
+        if distribution_id in ('arch'):
             version = 'any'
         elif like in ('arch'):
             version = 'any'
-        d = const.DIST_TO_INITSYS.get(distro, const.DIST_TO_INITSYS.get(like))
+        d = const.DIST_TO_INITSYS.get(
+            distribution_id, const.DIST_TO_INITSYS.get(like))
         if d:
             return [d.get(version)] or []
 
diff --git a/serv/utils.py b/serv/utils.py
index 44155fe..51dc328 100644
--- a/serv/utils.py
+++ b/serv/utils.py
@@ -1,7 +1,7 @@
-import sys
 import os
-import subprocess
+import sys
 import tempfile
+import subprocess
 
 PLATFORM = sys.platform
 IS_WIN = (os.name == 'nt')
diff --git a/setup.py b/setup.py
index 58611a8..4498272 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def _get_package_data():
 IS_WIN = (os.name == 'nt')
 install_requires = [
     "click==6.2",
-    "ld==0.5.0",
+    "distro==0.6.0",
     "jinja2==2.8"
 ]
 if not IS_WIN:
@@ -35,7 +35,7 @@ def _get_package_data():
 
 setup(
     name='Serv',
-    version="0.1.3",
+    version="0.1.4",
     url='https://github.com/nir0s/serv',
     author='nir0s',
     author_email='nir36g@gmail.com',