Eliminate improper moment code, fix a decode translation error, fix updatedoc, fix bad rebase change in setup.py

Author: Mike Alexander

setup.py

@@ -66,13 +66,3 @@
   test_suite = "v1pysdk.tests",
 
 )
-
-
-
-
-
->>>>>>> updated setup.py and package __init__ to support PyPi upload
-
-  test_suite = "v1pysdk.tests",
-
-)

v1pysdk/base_asset.py

@@ -58,9 +58,9 @@ def create(Class, **newdata):
     "create new asset on server and return created asset proxy instance"
     return Class._v1_v1meta.create_asset(Class._v1_asset_type_name, newdata)
 
-  def __new__(Class, oid, moment=None):
+  def __new__(Class, oid):
     "Tries to get an instance out of the cache first, otherwise creates one"
-    cache_key = (Class._v1_asset_type_name, oid, moment)
+    cache_key = (Class._v1_asset_type_name, int(oid))
     cache = Class._v1_v1meta.global_cache
     self = cache.get(cache_key, None)
     if self is None:
@@ -89,10 +89,7 @@ def idref(self):
 
   @property
   def reprref(self):
-      if self._v1_moment:
-        return "{0}({1}:{2})".format(self._v1_asset_type_name, self._v1_oid, self._v1_moment)
-      else:
-        return "{0}({1})".format(self._v1_asset_type_name, self._v1_oid)
+      return "{0}({1})".format(self._v1_asset_type_name, self._v1_oid)
 
   @property
   def url(self):
@@ -182,11 +179,11 @@ def _v1_commit(self):
 
   def _v1_refresh(self):
     'Syncs the objects from current server data'
-    self._v1_current_data = self._v1_v1meta.read_asset(self._v1_asset_type_name, self._v1_oid, self._v1_moment)
+    self._v1_current_data = self._v1_v1meta.read_asset(self._v1_asset_type_name, self._v1_oid)
     self._v1_needs_refresh = False
 
   def _v1_get_single_attr(self, attr):
-    return self._v1_v1meta.get_attr(self._v1_asset_type_name, self._v1_oid, attr, self._v1_moment)
+    return self._v1_v1meta.get_attr(self._v1_asset_type_name, self._v1_oid, attr)
 
   def _v1_execute_operation(self, opname):
     result = self._v1_v1meta.execute_operation(self._v1_asset_type_name, self._v1_oid, opname)

v1pysdk/client.py

@@ -5,7 +5,7 @@
 if (sys.version_info < (3,0)):
     #Python2 way of doing this
     import urllib2 as theUrlLib  #must be a name matching the Python3 urllib.request
-    from urllib2 import Request, urlopen, HTTPBasicAuthHandler, HTTPCookieProcessor
+    from urllib2 import Request, urlopen, HTTPError, HTTPBasicAuthHandler, HTTPCookieProcessor
     from urllib import urlencode
     from urlparse import urlunparse,urlparse
 else:

v1pysdk/v1meta.py

@@ -124,8 +124,8 @@ def generate_update_doc(self, newdata):
         if ((sys.version_info >= (3,0)) and not isinstance(newvalue, str)) or ((sys.version_info < (3,0)) and isinstance(newvalue, unicode)):
             node.text = str(newvalue).decode('utf-8')
         else:
-            node.text = newvalue
-        update_doc.append(node)
+            node.text = str(newvalue)
+      update_doc.append(node)
     return update_doc
 
   def create_asset(self, asset_type_name, newdata):
@@ -141,17 +141,17 @@ def update_asset(self, asset_type_name, asset_oid, newdata):
   def execute_operation(self, asset_type_name, oid, opname):
     return self.server.execute_operation(asset_type_name, oid, opname)
 
-  def get_attr(self, asset_type_name, oid, attrname, moment=None):
-    xml = self.server.get_attr(asset_type_name, oid, attrname, moment)
+  def get_attr(self, asset_type_name, oid, attrname):
+    xml = self.server.get_attr(asset_type_name, oid, attrname)
     dummy_asset = ElementTree.Element('Asset')
     dummy_asset.append(xml)
     return self.unpack_asset(dummy_asset)[attrname]
 
   def query(self, asset_type_name, wherestring, selstring):
     return self.server.get_query_xml(asset_type_name, wherestring, selstring)
 
-  def read_asset(self, asset_type_name, asset_oid, moment=None):
-    xml = self.server.get_asset_xml(asset_type_name, asset_oid, moment)
+  def read_asset(self, asset_type_name, asset_oid):
+    xml = self.server.get_asset_xml(asset_type_name, asset_oid)
     return self.unpack_asset(xml)
 
   def unpack_asset(self, xml):
@@ -242,10 +242,9 @@ def get_related_asset(self, output, relation):
       return None
 
   def asset_from_oid(self, oidtoken):
-    oid_parts = oidtoken.split(":")
-    (asset_type, asset_id, moment) = oid_parts if len(oid_parts)>2 else (oid_parts[0], oid_parts[1], None)
+    asset_type, asset_id = oidtoken.split(':')[:2]
     AssetClass = self.asset_class(asset_type)
-    instance = AssetClass(asset_id, moment)
+    instance = AssetClass(asset_id)
     return instance
 
   def set_attachment_blob(self, attachment, data=None):