Adding sandbox support for Admin API

Author: Craig Christenson

setup.py

@@ -3,7 +3,7 @@
 from distutils.core import setup
 setup(
     name="twocheckout",
-    version='0.2.0',
+    version='0.2.1',
     description="2Checkout Python Library",
     author="Craig Christenson",
     author_email="christensoncraig@gmail.com",

test/test_twocheckout.py

@@ -28,7 +28,7 @@
 }
 
 EXAMPLE_SALE = {
-    'sale_id': 4774380224
+    'sale_id': 9093717691800
 }
 
 EXAMPLE_COMMENT = {
@@ -62,7 +62,7 @@
 
 EXAMPLE_AUTH = {
     'merchantOrderId': '123',
-    'token': 'ZDBiNGFkYzMtZGIzNi00MDMwLWIwMTctNTAzOGFhOTU1ODJm',
+    'token': 'NTQyZTQyOTMtNjA0Ni00NzM4LTkyNDItNjVlMmUzZTU2NTNj',
     'currency': 'USD',
     'total': '1.00',
     'billingAddr': {
@@ -82,14 +82,15 @@ def setUp(self):
         super(TwocheckoutTestCase, self).setUp()
 
         twocheckout.Api.credentials({
-            'username': 'APIuser1817037',
-            'password': 'APIpass1817037'
+            'username': 'testlibraryapi901248204',
+            'password': 'testlibraryapi901248204PASS',
+            'mode': 'sandbox'
         })
 
         twocheckout.Api.auth_credentials({
-            'private_key': '9999999',
-            'seller_id': '532001',
-            'mode': 'production'
+            'private_key': 'BE632CB0-BB29-11E3-AFB6-D99C28100996',
+            'seller_id': '901248204',
+            'mode': 'sandbox'
         })
 
 class SaleTest(TwocheckoutTestCase):
@@ -99,22 +100,22 @@ def setUp(self):
     def test_1_find_sale(self):
         try:
             sale = twocheckout.Sale.find(EXAMPLE_SALE)
-            self.assertEqual(int(sale.sale_id), 4774380224)
+            self.assertEqual(int(sale.sale_id), 9093717691800)
         except TwocheckoutError as error:
             self.assertEqual(error.message, "Unable to find record.")
 
     def test_2_list_sale(self):
-        params = {'pagesize': 3}
+        params = {'pagesize': 2}
         list = twocheckout.Sale.list(params)
-        self.assertEqual(len(list), 3)
+        self.assertEqual(len(list), 2)
 
     def test_3_refund_sale(self):
         try:
             sale = twocheckout.Sale.find(EXAMPLE_SALE)
             result = sale.refund(EXAMPLE_REFUND)
             self.assertEqual(result.message, "refund added to invoice")
         except TwocheckoutError as error:
-            self.assertEqual(error.message, "Invoice too old to refund.")
+            self.assertEqual(error.message, "Invoice was already refunded.")
 
     def test_4_refund_invoice(self):
         try:
@@ -123,7 +124,7 @@ def test_4_refund_invoice(self):
             result = invoice.refund(EXAMPLE_REFUND)
             self.assertEqual(result.message, "refund added to invoice")
         except TwocheckoutError as error:
-            self.assertEqual(error.message, "Invoice too old to refund.")
+            self.assertEqual(error.message, "Invoice was already refunded.")
 
     def test_5_refund_lineitem(self):
         try:
@@ -199,9 +200,9 @@ def test_4_delete(self):
         self.assertEqual(result.response_message, "Product successfully deleted.")
 
     def test_5_list(self):
-        params = {'pagesize': 3}
+        params = {'pagesize': 2}
         list = twocheckout.Product.list(params)
-        self.assertEqual(len(list), 3)
+        self.assertEqual(len(list), 2)
 
 class OptionTest(TwocheckoutTestCase):
     def setUp(self):
@@ -263,23 +264,23 @@ def setUp(self):
 
     def test_1_retrieve(self):
         company = twocheckout.Company.retrieve()
-        self.assertEqual(company.vendor_id, "1817037")
+        self.assertEqual(company.vendor_id, "901248204")
 
 class ContactTest(TwocheckoutTestCase):
     def setUp(self):
         super(ContactTest, self).setUp()
 
     def test_1_create(self):
         contact = twocheckout.Contact.retrieve()
-        self.assertEqual(contact.vendor_id, "1817037")
+        self.assertEqual(contact.vendor_id, "901248204")
 
 class PaymentTest(TwocheckoutTestCase):
     def setUp(self):
         super(PaymentTest, self).setUp()
 
     def test_1_pending(self):
         payment = twocheckout.Payment.pending()
-        self.assertEqual(payment.release_level, "100")
+        self.assertEqual(payment.release_level, "300")
 
     def test_2_list(self):
         payments = twocheckout.Payment.list()

twocheckout/api_request.py

@@ -49,10 +49,14 @@ def set_opts(cls, method, params=None):
         else:
             username = cls.username
             password = cls.password
+            if cls.mode == 'sandbox':
+                passwd_url = 'https://sandbox.2checkout.com'
+            else:
+                passwd_url = 'https://www.2checkout.com'
             data = urllib.urlencode(params)
             password_manager = urllib2.HTTPPasswordMgrWithDefaultRealm()
             password_manager.add_password(
-                None, 'https://www.2checkout.com', username, password
+                None, passwd_url, username, password
             )
             auth_handler = urllib2.HTTPBasicAuthHandler(password_manager)
             opener = urllib2.build_opener(auth_handler)
@@ -76,12 +80,12 @@ def build_headers(cls, method):
 
     @classmethod
     def build_url(cls, method):
+        if cls.mode == 'sandbox':
+            url = 'https://sandbox.2checkout.com'
+        else:
+            url = 'https://www.2checkout.com'
         if method == 'authService':
-            if cls.mode == 'sandbox':
-                url = 'https://sandbox.2checkout.com/checkout/api/'
-            else:
-                url = 'https://www.2checkout.com/checkout/api/'
-            url += cls.version + '/' + cls.seller_id + '/rs/' + method
+            url += '/checkout/api/' + cls.version + '/' + cls.seller_id + '/rs/' + method
         else:
-            url = 'https://www.2checkout.com/api/' + method
+            url += '/api/' + method
         return url