merge changes to the base function

Author: sreeder

odm2api/ODM2/models.py

@@ -1773,6 +1773,7 @@ class SpectraResultValues(Base):
     )
 
 
+
 class TimeSeriesResultValues(Base):
 
     ValueID = Column('valueid', BigIntegerType, primary_key=True)

odm2api/ODM2/services/readService.py

@@ -527,8 +527,13 @@ def getUnits(self, ids=None, name=None, type=None):
         try:
             return q.all()
         except Exception as e:
+<<<<<<< Updated upstream
             print('Error running Query: {}'.format(e))
             return None
+=======
+            print("Error running Query: %s" % e)
+            return []
+>>>>>>> Stashed changes
 
     # Organization
     def getOrganizations(self, ids=None, codes=None):

odm2api/base.py

@@ -41,8 +41,11 @@ def __repr__(self):
         for v in valuedict.keys():
             if 'obj' in v.lower():
                 del valuedict[v]
-        # del valuedict["_sa_instance_state"]
-        return '<%s(%s)>' % (self.__class__.__name__, str(valuedict))
+
+            if v == "_sa_instance_state":
+                del valuedict["_sa_instance_state"]
+        return "<%s(%s)>" % (self.__class__.__name__, str(valuedict))
+
 
 
 class modelBase():