Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update python-spoke for Python 3.6 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dominicbruno merged 1 commit into from
Aug 22, 2024
Merged

Update python-spoke for Python 3.6 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- "2.7"
- "3.6"
# command to install dependencies
install:
- python setup.py install
Expand Down
6 changes: 3 additions & 3 deletions 6 setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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'],
)
9 changes: 5 additions & 4 deletions 9 spoke/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down Expand Up @@ -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

Expand All @@ -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':
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.