Update for exceptions and print statements for python 3.x

Author: Miguel Leon

odm2api/ODM1_1_1/services/edit_service.py

@@ -457,7 +457,7 @@ def updateSeries(self, var=None, method=None, qcl=None, is_new_series=False):
                 print("Save existing series ID: %s" % str(series.id))
                 series = tseries
             else:
-                print "Series doesn't exist (if you are not, you should be running SaveAs)"
+                print("Series doesn't exist (if you are not, you should be running SaveAs)")
 
         if is_new_series:
 

odm2api/ODM1_1_1/services/export_service.py

@@ -19,7 +19,7 @@ def export_series_data(self, series_id, filename, utc=False, site=False, var=Fal
             return False
 
         writer = csv.writer(open(filename, 'wb'))
-        print "filename: ", filename
+        print("filename: ", filename)
         self.write_data_header(writer, utc, site, var, offset, qual, src, qcl)
         for dv in series.data_values:
             self.write_data_row(writer, series, dv, utc, site, var, offset, qual, src, qcl)

odm2api/ODM1_1_1/services/series_service.py

@@ -286,7 +286,7 @@ def get_series_by_id(self, series_id):
         try:
             return self._session.query(ODM.Series).filter_by(id=series_id).first()
         except Exception as e:
-            print e
+            print(e)
             return None
 
     def get_series_by_id_quint(self, site_id, var_id, method_id, source_id, qcl_id):

odm2api/ODM2/services/createService.py

@@ -262,7 +262,7 @@ def createAffiliation(self, personid, organizationid, email, phone=None, address
         #self._session.flush()
         # self._session.refresh(a)
 
-        print a.OrganizationID
+        print(a.OrganizationID)
 
         return a
 
@@ -523,8 +523,8 @@ def createTimeSeriesResultValues(self, datavalues):
 
 
             return datavalues
-        except Exception, e:
-            print e
+        except(Exception, e):
+            print(e)
             return None
 
 

odm2api/ODM2/services/readService.py

@@ -331,8 +331,8 @@ def getProcessingLevelByCode(self, processingCode):
         """
         try:
             return self._session.query(ProcessingLevels).filter_by(ProcessingLevelCode=str(processingCode)).first()
-        except Exception, e:
-            print e
+        except Exception as e:
+            print(e)
             return None
 
     """
@@ -387,7 +387,7 @@ def getSamplingFeaturesByType(self, samplingFeatureTypeCV):
         try:
             return self._session.query(SamplingFeatures).filter_by(SamplingFeatureTypeCV=samplingFeatureTypeCV).all()
         except Exception as e:
-            print e
+            print(e)
             return None
 
     def getSamplingFeatureByGeometry(self, wkt_geometry):
@@ -396,17 +396,17 @@ def getSamplingFeatureByGeometry(self, wkt_geometry):
             # ST_Equals(geometry, geometry)
             return self._session.query(SamplingFeatures).filter(
                 func.ST_AsText(SamplingFeatures.FeatureGeometry) == func.ST_AsText(wkt_geometry)).first()
-        except Exception, e:
-            print e
+        except Exception as e:
+            print(e)
             return None
 
     def getGeometryTest(self, TestGeom):
         Geom = self._session.query(SamplingFeatures).first()
-        print "Queried Geometry: ", self._session.query(Geom.FeatureGeometry.ST_AsText()).first()
+        print("Queried Geometry: ", self._session.query(Geom.FeatureGeometry.ST_AsText()).first())
         GeomText = self._session.query(
             func.ST_Union(Geom.FeatureGeometry, func.ST_GeomFromText(TestGeom)).ST_AsText()).first()
 
-        print GeomText
+        print(GeomText)
 
     """
     Action
@@ -773,13 +773,13 @@ def getTimeSeriesResultValuesByResultId(self, resultId):
         """
         try:
             q = self._session.query(TimeSeriesResultValues).filter_by(ResultID=resultId).all()
-            print type(q[0]), q[0]
+            print(type(q[0]), q[0])
             df = pd.DataFrame([dv.list_repr() for dv in q])
             df.columns = q[0].get_columns()
             return df
             # return self._session.query(Timeseriesresultvalue).filter_by(ResultID=resultId).all()
         except Exception as e:
-            print e
+            print(e)
             return None
 
     def getTimeSeriesResultValuesByCode(self, timeSeriesCode):
@@ -945,8 +945,8 @@ def getRelatedModelsByID(self, modelid):
         """
         try:
             return self._session.query(RelatedModels).filter_by(RelatedModelID=modelid).all()
-        except Exception, e:
-            print e
+        except Exception as e:
+            print(e)
         return None
 
     def getRelatedModelsByCode(self, modelcode):
@@ -958,8 +958,8 @@ def getRelatedModelsByCode(self, modelcode):
         try:
             return self._session.query(RelatedModels).join(Models, RelatedModels.RelatedModelID == Models.ModelID) \
                 .filter(Models.ModelCode == modelcode).all()
-        except Exception, e:
-            print e
+        except Exception as e:
+            print(e)
         return None
 
     def getResultsBySimulationID(self, simulationID):
@@ -969,8 +969,8 @@ def getResultsBySimulationID(self, simulationID):
                     .join(Actions) \
                     .join(Simulations) \
                     .filter(Simulations.SimulationID == simulationID).all()
-        except Exception, e:
-            print e
+        except Exception as e:
+            print(e)
         return None
 
 # ################################################################################

odm2api/ODMconnection.py

@@ -117,7 +117,7 @@ def testEngine(self, connection_string):
             s.test_Session().query(Variable2.VariableCode).limit(1).first()
 
         except Exception as e:
-            print "Connection was unsuccessful ", e.message
+            print("Connection was unsuccessful ", e.message)
             return False
         return True
 
@@ -129,7 +129,7 @@ def testEngine1_1(self, connection_string):
             s.test_Session().query(ODM.Variable.code).limit(1).first()
 
         except Exception as e:
-            print "Connection was unsuccessful ", e.message
+            print("Connection was unsuccessful ", e.message)
             return False
         return True