⬆️ Initial upgrade to Python 2/3

Author: albireox

python/Centroid.py

@@ -1,4 +1,5 @@
-from __future__ import division, absolute_import, print_function
+from __future__ import division, absolute_import, print_function, unicode_literals
+
 """Measure centroids.
 
 Note: as with all PyGuide routines, the coordinate system origin
@@ -131,7 +132,7 @@ def _fmtList(alist):
 _MaxIter = 40       # max # of iterations
 _MinPixForStats = 20    # minimum # of pixels needed to measure med and std dev
 
-class CentroidData:
+class CentroidData(object):
     """Centroid data, including the following fields:
 
     flags; check before paying attention to the remaining data:

python/Constants.py

@@ -1,4 +1,6 @@
 from __future__ import division, absolute_import, print_function
+from __future__ import unicode_literals
+
 """Constants and parameters
 
 History:
@@ -36,7 +38,7 @@
 NaN = float("nan")
 
 # Misc
-class CCDInfo:
+class CCDInfo(object):
     """Info about the CCD
 
     - bias      ccd bias (ADU)

python/FakeData.py

@@ -1,4 +1,11 @@
-from __future__ import division, absolute_import, print_function
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import numpy
+import numpy.random
+
+from . import ImUtil
+
+
 """Generates fake ccd data
 
 History:
@@ -12,12 +19,10 @@
 2005-05-16 ROwen    Modified addNoise to take ccdInfo instead of 3 args.
 2009-11-20 ROwen    Modified to use numpy.
 """
+
 __all__ = ["fakeStar", "addNoise"]
 
-import numpy
-import numpy.random
 
-from . import ImUtil
 
 _MaxValUInt16 = 2**16 - 1
 

python/FindStars.py

@@ -1,4 +1,6 @@
 from __future__ import division, absolute_import, print_function
+from __future__ import unicode_literals
+
 """Find Stars.
 
 Note: as with all PyGuide routines, the coordinate system origin

python/ImUtil.py

@@ -1,4 +1,7 @@
 from __future__ import division, absolute_import, print_function
+from __future__ import unicode_literals
+
+
 """Image processing utilities.
 
 History:
@@ -65,7 +68,7 @@ def getQuartile(sortedData, qnum):
     return ((sortedData[ind0] * ratios[0]) + (sortedData[ind0+1] * ratios[1])) / (ratios[0] + ratios[1])
 
 
-class ImStats:
+class ImStats(object):
     """Information about an image
     (including the settings use to obtain that info).
 
@@ -166,7 +169,7 @@ def skyStats(
     )
 
 
-class SubFrame:
+class SubFrame(object):
     """Create a subframe and provide useful utility methods.
 
     Inputs:

python/StarShape.py

@@ -1,4 +1,8 @@
 from __future__ import division, absolute_import, print_function
+from __future__ import unicode_literals
+
+
+
 """StarShape
 
 Fit a a star to a symmetrical double gaussian.
@@ -102,7 +106,7 @@
 # minimum radius
 _MinRad = 3.0
 
-class StarShapeData:
+class StarShapeData(object):
     """Guide star fit data
 
     Attributes:

python/Version.py

@@ -1 +1,2 @@
+from __future__ import unicode_literals
 __version__ = "2.3.0"

python/__init__.py

@@ -26,6 +26,7 @@
   some of the subtleties.
 """
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from .Version import __version__
 from .Constants import *
 from .Centroid import *

releaseNewVersion.py

@@ -4,6 +4,9 @@
 To use:
     ./releaseNewVersion.py
 """
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from __future__ import with_statement
 import os
 import re
@@ -18,7 +21,7 @@
 import Version  # noqa  must come after modifying sys.path
 
 queryStr = "Version from %s.Version = %s; is this OK? (y/[n]) " % (PkgName, Version.__version__,)
-versOK = raw_input(queryStr)
+versOK = input(queryStr)
 if not versOK.lower() == "y":
     sys.exit(0)
 
@@ -29,24 +32,24 @@
         if versMatch:
             histVersStr = versMatch.groups()[0]
             if histVersStr == Version.__version__:
-                print "Version in VersionHistory.html matches"
+                print("Version in VersionHistory.html matches")
                 break
             else:
-                print "Error: version in VersionHistory.html = %s != %s" % (histVersStr, Version.__version__)
+                print("Error: version in VersionHistory.html = %s != %s" % (histVersStr, Version.__version__))
                 sys.exit(0)
 
-print "Status of git repository:"
+print("Status of git repository:")
 
 subprocess.call(["git", "status"])
 
-versOK = raw_input("Is the git repository up to date? (y/[n]) ")
+versOK = input("Is the git repository up to date? (y/[n]) ")
 if not versOK.lower() == "y":
     sys.exit(0)
 
-print "Git repository OK"
+print("Git repository OK")
 
 if UploadToPyPI:
-    print "Uploading to PyPI"
+    print("Uploading to PyPI")
     status = subprocess.call(["python", "setup.py", "sdist", "upload"])
     if status != 0:
-        print "Build and upload failed!"
+        print("Build and upload failed!")

scripts/doPyGuide.py

@@ -40,6 +40,7 @@
 2009-11-20 ROwen    Modified to use numpy.
                     Stop setting NUMERIX.
 """
+from __future__ import unicode_literals
 import sys
 import pyfits
 import PyGuide
@@ -341,7 +342,7 @@ def showDef():
     globalDict = globals()
     for paramName in FindParamNames:
         print("%s = %s" % (paramName, globalDict[paramName]))
-    print
+    print()
 
 def help():
     print("""The following variables are available: