From e37f56b0c4d90a6919f1fa5e5f0a74e505c10594 Mon Sep 17 00:00:00 2001
From: Mat Kelly <me@matkelly.com>
Date: Wed, 8 Nov 2023 12:59:02 -0500
Subject: [PATCH] Rm six module for #816

Closes #816
---
 ipwb/indexer.py  | 6 +-----
 ipwb/replay.py   | 2 +-
 requirements.txt | 1 -
 setup.py         | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ipwb/indexer.py b/ipwb/indexer.py
index 835ded4a..30baba12 100755
--- a/ipwb/indexer.py
+++ b/ipwb/indexer.py
@@ -28,10 +28,6 @@
 from ipfshttpclient.exceptions import ConnectionError
 # from requests.exceptions import ConnectionError
 
-from six.moves import input
-from six import PY2
-from six import PY3
-
 from ipwb.util import iso8601_to_digits14, ipfs_client
 
 import requests
@@ -49,7 +45,7 @@
 
 
 def s2b(s):  # Convert str to bytes, cross-py
-    return bytes(s) if PY2 else bytes(s, 'utf-8')
+    return bytes(s, 'utf-8')
 
 
 # TODO: put this method definition below index_file_at()
diff --git a/ipwb/replay.py b/ipwb/replay.py
index acd39b1e..8608d861 100755
--- a/ipwb/replay.py
+++ b/ipwb/replay.py
@@ -28,7 +28,7 @@
 from socket import gaierror
 from socket import error as socketerror
 
-from six.moves.urllib_parse import urlsplit, urlunsplit
+from urllib.parse import urlsplit, urlunsplit
 
 
 from requests.exceptions import HTTPError
diff --git a/requirements.txt b/requirements.txt
index a767acf8..ae88d1df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,5 @@ Flask==2.3.2
 pycryptodome>=3.4.11
 requests>=2.19.1
 beautifulsoup4>=4.6.3
-six==1.11.0
 surt>=0.3.0
 multiaddr >= 0.0.9
diff --git a/setup.py b/setup.py
index f8ef0b7f..fd657e29 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,6 @@
         'pycryptodome>=3.4.11',
         'requests>=2.19.1',
         'beautifulsoup4>=4.6.3',
-        'six==1.11.0',
         'surt>=0.3.0'
     ],
     tests_require=[