tests/getRaw.py: Use print_function

lsst · Sep 29, 2015 · 0e47a44 · 0e47a44
1 parent bd5c3ec
commit 0e47a44
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/tests/getRaw.py b/tests/getRaw.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+from __future__ import print_function
 #
 # LSST Data Management System
 # Copyright 2012, 2015 LSST Corporation.
@@ -62,10 +62,10 @@ def testRaw(self):
         """Test retrieval of raw image"""
         exp = self.butler.get("raw", self.dataId)
 
-        print "dataId: ", self.dataId
-        print "width: ", exp.getWidth()
-        print "height: ", exp.getHeight()
-        print "detector id: ", exp.getDetector().getId()
+        print("dataId: %s" % self.dataId)
+        print("width: %s" % exp.getWidth())
+        print("height: %s" % exp.getHeight())
+        print("detector id: %s" % exp.getDetector().getId())
 
         self.assertEqual(exp.getWidth(), self.size[0])
         self.assertEqual(exp.getHeight(), self.size[1])
@@ -75,33 +75,33 @@ def testRaw(self):
     def testRawMetadata(self):
         """Test retrieval of metadata"""
         md = self.butler.get("raw_md", self.dataId)
-        print "EXPNUM(visit): ",md.get('EXPNUM')
-        print "ccdnum:", md.get('CCDNUM')
+        print("EXPNUM(visit): %s" % md.get('EXPNUM'))
+        print("ccdnum: %s" % md.get('CCDNUM'))
         self.assertEqual(md.get('EXPNUM'), self.dataId["visit"])
         self.assertEqual(md.get('CCDNUM'), self.dataId["ccdnum"])
 
     def testBias(self):
         """Test retrieval of bias image"""
         exp = self.butler.get("bias", self.dataId)
-        print "dataId: ", self.dataId
-        print "detector id: ", exp.getDetector().getId()
+        print("dataId: %s" % self.dataId)
+        print("detector id: %s" % exp.getDetector().getId())
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
 
     def testFlat(self):
         """Test retrieval of flat image"""
         exp = self.butler.get("flat", self.dataId)
-        print "dataId: ", self.dataId
-        print "detector id: ", exp.getDetector().getId()
-        print "filter: ", self.filter
+        print("dataId: %s" % self.dataId)
+        print("detector id: %s" % exp.getDetector().getId())
+        print("filter: %s" % self.filter)
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
         self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)
 
     def testFringe(self):
         """Test retrieval of fringe image"""
         exp = self.butler.get("fringe", self.dataId)
-        print "dataId: ", self.dataId
-        print "detector id: ", exp.getDetector().getId()
-        print "filter: ", self.filter
+        print("dataId: %s" % self.dataId)
+        print("detector id: %s" % exp.getDetector().getId())
+        print("filter: %s" % self.filter)
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
         self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)