Skip to content

Adjust to use with python3 #16

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

Open
akolpakov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adjust to use with python3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f63e4
adjust to use with python3
akolpakov Apr 23, 2019
972d8ed
edit README according to python3 changes
akolpakov Apr 23, 2019
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 ClassicUPS/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from ups import UPSConnection
from .ups import UPSConnection
15 changes: 7 additions & 8 deletions ClassicUPS/ups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import json
import urllib
import urllib.request
import xmltodict

from binascii import a2b_base64
from datetime import datetime
from dict2xml import dict2xml
from dicttoxml import dicttoxml


class UPSConnection(object):
Expand Down Expand Up @@ -39,15 +39,13 @@ def _generate_xml(self, url_action, ups_request):
}

xml = u'''
<?xml version="1.0"?>
{access_request_xml}

<?xml version="1.0"?>
{api_xml}
'''.format(
request_type=url_action,
access_request_xml=dict2xml(access_request),
api_xml=dict2xml(ups_request),
access_request_xml=dicttoxml(access_request, root=False),
api_xml=dicttoxml(ups_request, root=False),
)

return xml
Expand All @@ -58,8 +56,9 @@ def _transmit_request(self, url_action, ups_request):
url = self.test_urls[url_action]

xml = self._generate_xml(url_action, ups_request)
resp = urllib.urlopen(url, xml.encode('ascii', 'xmlcharrefreplace'))\
.read()

with urllib.request.urlopen(url, xml.encode('ascii', 'xmlcharrefreplace')) as url:
resp = url.read()

return UPSResult(resp)

Expand Down
8 changes: 4 additions & 4 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Check the delivery date of a package.
.. code-block:: python

tracking = ups.tracking_info('1Z12345E0291980793')
print tracking.in_transit
print tracking.delivered
print(tracking.in_transit)
print(tracking.delivered)

Create shipment and save shipping label as GIF file:

Expand Down Expand Up @@ -85,8 +85,8 @@ Create shipment and save shipping label as GIF file:
file_format='GIF')

# Print information about our shipment
print shipment.cost
print shipment.tracking_number
print(shipment.cost)
print(shipment.tracking_number)

# Save the shipping label to print, email, etc
shipment.save_label(open('label.gif', 'wb'))
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
long_description=open('README.rst').read(),
keywords=['UPS'],
install_requires=[
'dict2xml==1.0',
'dicttoxml==1.7.4',
'xmltodict==0.4.2'
],
classifiers=[
Expand Down