Minor cleanup

benweatherman · Jun 6, 2010 · d49a73b · d49a73b
1 parent ba38833
commit d49a73b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 26 deletions.
diff --git a/__init__.py b/__init__.py
@@ -1 +1 @@
-__all__ = [ 'UPS', 'USPS', 'endicia' ]
+__all__ = [ 'UPS', 'USPS', 'endicia', 'shipping_common' ]
diff --git a/endicia/__init__.py b/endicia/__init__.py
@@ -1,4 +1,4 @@
-from endicia import package
+from endicia import package, error
 from endicia import label_request, label_response
 from endicia import rate_request, rate_response
 from endicia import account_status_request, account_status_response

diff --git a/endicia/endicia.py b/endicia/endicia.py
@@ -4,7 +4,7 @@
 import xml.etree.ElementTree as etree
 
 class package(object):
-    types = [
+    shipment_types = [
                 'Priority',
                 'Express',
                 'First',
@@ -26,7 +26,7 @@ class package(object):
              ]
 
     def __init__(self, weight_oz, shape, length, width, height, description='', value=0):
-        self.mail_class = self.types[0]
+        self.mail_class = self.shipment_types[0]
         self.weight_oz = str(weight_oz)
         self.shape = shape
         self.dimensions = ( str(length), str(width), str(height) )
@@ -67,7 +67,7 @@ def __ParseResponse(self, response_text):
         status = int(root.findtext(status_path))
         response = None
         if status != 0:
-            response = Error(status, root, namespace)
+            response = error(status, root, namespace)
         else:
             response = self._parse_response_body(root, namespace)
         return response

diff --git a/python-ship.tmproj b/python-ship.tmproj
@@ -35,14 +35,14 @@
 			<key>firstVisibleLine</key>
 			<integer>254</integer>
 		</dict>
-		<key>common.py</key>
+		<key>endicia/__init__.py</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>26</integer>
+				<integer>34</integer>
 				<key>line</key>
-				<integer>29</integer>
+				<integer>0</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -54,36 +54,21 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>25</integer>
-				<key>line</key>
 				<integer>24</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>test.py</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>56</integer>
 				<key>line</key>
-				<integer>86</integer>
+				<integer>69</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>64</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>openDocuments</key>
 	<array>
 		<string>USPS/USPS.py</string>
 		<string>endicia/endicia.py</string>
-		<string>test.py</string>
-		<string>common.py</string>
+		<string>endicia/__init__.py</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<true/>

diff --git a/common.py → shipping_common.py b/common.py → shipping_common.py