Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 24 additions & 18 deletions usps/address.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class Address(object):

def __init__(self, name, address_1, city, state, zipcode,
def __init__(self, name=None, address_1=None, city=None, state=None, zipcode=None,
zipcode_ext='', company='', address_2='', phone=''):
self.name = name
self.company = company
Expand All @@ -15,32 +15,38 @@ def __init__(self, name, address_1, city, state, zipcode,
self.zipcode_ext = zipcode_ext
self.phone = phone

def add_to_xml(self, root, prefix='To', validate=False):
if not validate:
def add_to_xml(self, root, prefix='To', validate=False, ziplookup=False):
if not validate or ziplookup:
name = etree.SubElement(root, prefix + 'Name')
name.text = self.name

company = etree.SubElement(root, prefix + 'Firm' + ('Name' if validate else ''))
company.text = self.company

address_1 = etree.SubElement(root, prefix + 'Address1')
address_1.text = self.address_1
if not ziplookup:
company = etree.SubElement(root, prefix + 'Firm' + ('Name' if validate else ''))
company.text = self.company

if self.address_1 is not None:
address_1 = etree.SubElement(root, prefix + 'Address1')
address_1.text = self.address_1

address_2 = etree.SubElement(root, prefix + 'Address2')
address_2.text = self.address_2 or '-'

city = etree.SubElement(root, prefix + 'City')
city.text = self.city

state = etree.SubElement(root, prefix + 'State')
state.text = self.state
if self.city is not None:
city = etree.SubElement(root, prefix + 'City')
city.text = self.city

if self.state is not None:
state = etree.SubElement(root, prefix + 'State')
state.text = self.state

zipcode = etree.SubElement(root, prefix + 'Zip5')
zipcode.text = self.zipcode
if self.zipcode is not None:
zipcode = etree.SubElement(root, prefix + 'Zip5')
zipcode.text = self.zipcode

zipcode_ext = etree.SubElement(root, prefix + 'Zip4')
zipcode_ext.text = self.zipcode_ext
if self.zipcode_ext is not None:
zipcode_ext = etree.SubElement(root, prefix + 'Zip4')
zipcode_ext.text = self.zipcode_ext

if not validate:
if not validate or ziplookup:
phone = etree.SubElement(root, prefix + 'Phone')
phone.text = self.phone
7 changes: 5 additions & 2 deletions usps/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_get_url(self):
usps.get_url('validate', 'test'),
'https://secure.shippingapis.com/ShippingAPI.dll?API=Verify&XML=test'
)

@mock.patch('requests.get')
def test_send_request_error(self, requests_mock):
requests_mock.return_value.content = b'<Error><Description>Test Error</Description></Error>'
Expand Down Expand Up @@ -70,7 +70,7 @@ def test_wrapper_methods(self, address_mock, track_mock, ship_mock):


class AddressTestCase(TestCase):

def test_address_xml(self):
address = Address('Test', '123 Test St.', 'Test', 'NE', '55555')
root = etree.Element('Test')
Expand All @@ -95,3 +95,6 @@ class TrackingInfoTestCase(TestCase):
class ShippingLabelTestCase(TestCase):
pass


class ZipCodeLookupTestCase(TestCase):
pass
13 changes: 13 additions & 0 deletions usps/usps.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class USPSApi(object):
'tracking': 'TrackV2{test}&XML={xml}',
'label': 'eVS{test}&XML={xml}',
'validate': 'Verify&XML={xml}',
'zipcode': 'ZipCodeLookup&XML={xml}',
}

def __init__(self, api_user_id, test=False):
Expand All @@ -42,6 +43,9 @@ def send_request(self, action, xml):
def validate_address(self, *args, **kwargs):
return AddressValidate(self, *args, **kwargs)

def zipcode_lookup(self, *args, **kwargs):
return ZipCodeLookup(self, *args, **kwargs)

def track(self, *args, **kwargs):
return TrackingInfo(self, *args, **kwargs)

Expand All @@ -59,6 +63,15 @@ def __init__(self, usps, address):
self.result = usps.send_request('validate', xml)


class ZipCodeLookup(object):

def __init__(self, usps, address):
xml = etree.Element('ZipCodeLookupRequest', {'USERID': usps.api_user_id})
_address = etree.SubElement(xml, 'Address', {'ID': '0'})
address.add_to_xml(_address, prefix='', validate=True)
self.result = usps.send_request('zipcode', xml)


class TrackingInfo(object):

def __init__(self, usps, tracking_number,**kwargs):
Expand Down