From 098dbcbae4a74d41d67f4a9811f01a7d61e7b1f6 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 11 Jan 2020 17:16:26 +0100
Subject: [PATCH] Remove six

The repo does not support python2 anymore, remove usage of python2/3
compatability library.

Change-Id: Ifa95482b219bcf143762e9328c4200f1ffc772be
---
 gerrit_dash_creator/cmd/bugs.py    | 5 ++---
 gerrit_dash_creator/cmd/creator.py | 8 ++++----
 requirements.txt                   | 1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gerrit_dash_creator/cmd/bugs.py b/gerrit_dash_creator/cmd/bugs.py
index e567f96..cfc54ab 100755
--- a/gerrit_dash_creator/cmd/bugs.py
+++ b/gerrit_dash_creator/cmd/bugs.py
@@ -13,12 +13,11 @@
 # under the License.
 
 import argparse
+import configparser
 import os
 import sys
 
 from launchpadlib import launchpad
-import six
-from six.moves import configparser
 
 from gerrit_dash_creator.cmd import creator
 
@@ -71,7 +70,7 @@ def review_id_from_bug(bug, project_name):
     reviews_ignored = set()
     for msg in bug.bug.messages:
         try:
-            lines = six.text_type(msg.content).split('\n')
+            lines = str(msg.content).split('\n')
         except UnicodeEncodeError:
             print('non-ascii in bug %s' % bug.web_link)
             continue
diff --git a/gerrit_dash_creator/cmd/creator.py b/gerrit_dash_creator/cmd/creator.py
index 39c363b..2188f6e 100755
--- a/gerrit_dash_creator/cmd/creator.py
+++ b/gerrit_dash_creator/cmd/creator.py
@@ -13,14 +13,14 @@
 # under the License.
 
 import argparse
+import configparser
+import io
 import os
 import os.path
 import sys
+from urllib import parse as urllib_parse
 
 import jinja2
-import six
-from six.moves import configparser
-from six.moves.urllib import parse as urllib_parse
 
 
 def escape(buff):
@@ -128,7 +128,7 @@ def load_template(template_file=None, template_directory=None,
 
 def get_configuration(dashboard):
     """Returns the configuration of a dashboard as string."""
-    configuration = six.StringIO()
+    configuration = io.StringIO()
     dashboard.write(configuration)
     result = configuration.getvalue()
     configuration.close()
diff --git a/requirements.txt b/requirements.txt
index a0540d4..906e576 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,5 +4,4 @@
 
 jinja2
 pbr>=1.6
-six>=1.9.0
 simplejson>=2.2.0