From 984c958b0bc66de145563769452829c3f8f6d4bf Mon Sep 17 00:00:00 2001
From: Dominic Bruno <dominicbruno@gmail.com>
Date: Tue, 23 Jul 2024 13:25:52 -0500
Subject: [PATCH] Update python-spoke for Python 3.6

---
 .travis.yml       | 2 +-
 setup.py          | 6 +++---
 spoke/__init__.py | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa406ae..d642cc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - "2.7"
+  - "3.6"
 # command to install dependencies
 install:
   - python setup.py install
diff --git a/setup.py b/setup.py
index e80f785..6c6678c 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name             = 'Python-Spoke',
-    version          = '1.0.27',
+    version          = '1.0.28',
     packages         = find_packages(),
     description      = 'API bindings for Spoke API',
     long_description = open(os.path.join(os.path.dirname(__file__), 'README.md'), 'r').read(),
@@ -12,6 +12,6 @@
     author_email     = 'rob.hoelz@skinnycorp.com',
     url              = 'https://github.com/Threadless/python-spoke',
     keywords         = 'spoke',
-    install_requires = ['lxml==3.3.5', 'requests==2.20.0'],
-    tests_require    = ['nose==1.3.1', 'python-termstyle==0.1.10', 'rednose==0.4.1'],
+    install_requires = ['lxml==4.9.3', 'requests==2.27.0'],
+    tests_require    = ['nose==1.3.7', 'rednose==1.3.0'],
 )
diff --git a/spoke/__init__.py b/spoke/__init__.py
index df8241d..a4953e7 100644
--- a/spoke/__init__.py
+++ b/spoke/__init__.py
@@ -7,8 +7,9 @@
 
 from lxml import etree
 import requests
+import six
 
-__version__ = '1.0.27'
+__version__ = '1.0.28'
 
 __all__ = ['Case', 'Comment', 'Image', 'OrderInfo', 'PackSlipCustomInfo', 'Spoke', 'ValidationError', 'SpokeError']
 
@@ -449,7 +450,7 @@ def _generate_tree(self, tag_name, serializers, node):
         else:
             element = etree.Element(tag_name)
 
-            if not isinstance(node, basestring):
+            if not isinstance(node, str):
                 node = str(node)
             element.text = node
 
@@ -474,11 +475,11 @@ def serialize_it(tag_name, value):
             Key         = self.Key,
             Order       = Order,
         ))
-        return etree.tostring(request, pretty_print=True)
+        return etree.tostring(request, encoding='utf-8', pretty_print=True)
 
     def _send_request(self, request):
         res    = self.transport.send(request)
-        tree   = etree.fromstring(res)
+        tree   = etree.fromstring(res.decode('utf-8'))
         result = tree.xpath('//result')[0].text
 
         if result == 'Success':