From e78f8d1f13f40e2a0628fb3b9d78d005292cc97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Mon, 8 Oct 2018 14:06:06 +0200
Subject: [PATCH] Remove extra dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is a sorted dict implementation in Productmd used to achieve the
exact same thing as Pungi does here. No need for an extra dependency.
While we're at it, we can also sort the imports.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 pungi.spec      |  2 --
 pungi/gather.py | 31 ++++++++++---------------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/pungi.spec b/pungi.spec
index d75a6db4..a85295b4 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -21,7 +21,6 @@ BuildRequires:  python2-libcomps
 BuildRequires:  python2-six
 BuildRequires:  python2-multilib
 BuildRequires:  python2-dogpile-cache
-BuildRequires:  python2-dict-sorted
 
 Requires:       createrepo >= 0.4.11
 Requires:       yum => 3.4.3-28
@@ -52,7 +51,6 @@ Requires:       python2-multilib
 Requires:       python2-libcomps
 Requires:       python2-six
 Requires:       python2-dogpile-cache
-Requires:       python2-dict-sorted
 
 BuildArch:      noarch
 
diff --git a/pungi/gather.py b/pungi/gather.py
index a6a9bd6c..4dcb720c 100644
--- a/pungi/gather.py
+++ b/pungi/gather.py
@@ -14,23 +14,23 @@
 # along with this program; if not, see <https://gnu.org/licenses/>.
 
 
-import yum
+import logging
 import os
 import re
 import shutil
-import sys
-import pungi.util
-import lockfile
-import logging
-import urlgrabber.progress
 import subprocess
-import createrepo
-import ConfigParser
-from sdict import AlphaSortedDict
+import sys
 from fnmatch import fnmatch
 
+import createrepo
+import lockfile
+import urlgrabber.progress
+import yum
+from productmd.common import SortedConfigParser
+
 import arch as arch_module
 import multilib_yum as multilib
+import pungi.util
 
 
 class ReentrantYumLock(object):
@@ -87,17 +87,6 @@ def is_package(po):
     return True
 
 
-class MyConfigParser(ConfigParser.ConfigParser):
-    """A subclass of ConfigParser which does not lowercase options"""
-
-    def __init__(self, *args, **kwargs):
-        kwargs['dict_type'] = AlphaSortedDict
-        ConfigParser.ConfigParser.__init__(self, *args, **kwargs)
-
-    def optionxform(self, optionstr):
-        return optionstr
-
-
 FLAGS = {
     'EQ': '=',
     'GE': '>=',
@@ -1611,7 +1600,7 @@ class Pungi(PungiBase):
 
         # Create a ConfigParser object out of the contents so that we can
         # write it back out later and not worry about formatting
-        treeinfo = MyConfigParser()
+        treeinfo = SortedConfigParser()
         treeinfo.readfp(treefile)
         treefile.close()
         treeinfo.add_section('checksums')