TR13204/Infrastructure/python 3

HttpRequestGovernor.py

@@ -1,4 +1,3 @@
-# Name: HttpRequestGovernor.py
 # Purpose: provides a class for managing the frequency with which we can make HTTP requests,
 #    to ensure a configurable amount of "niceness" when reading from other sites
 # Notes:
@@ -14,7 +13,7 @@
 #    You can also ask the governor to report on its statistics so far.
 
 import time
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 import runCommand
 
 # constants for convenience
@@ -31,7 +30,7 @@
 def readURL (url):
     # Purpose: given constraints on reading from https connections in python 2.7, we're just going
     #    to shell out and use curl for this
-    # Returns: string returned
+    # Returns: str.returned
     # Throws: Exception if we have problems reading from 'url'
 
     stdout, stderr, statusCode = runCommand.runCommand("curl '%s'" % url)
@@ -135,7 +134,7 @@ def get (self, url):
 
         try:
             response = readURL(url)
-        except Exception, e:
+        except Exception as e:
             raise Exception('The server could not fulfill the request: %s' % str(e))
         return response
 
@@ -150,4 +149,4 @@ def getStatistics (self):
             'Average wait time:  %6.3f sec' % (sum(self.timesWaited) / self.requestCount),
             'Maximum wait time:  %6.3f sec' % max(self.timesWaited),
             ]
-        return stats
+        return stats

Install

@@ -48,7 +48,7 @@ fi
 #
 # Compile all Python scripts.
 #
-python -c 'import compileall; compileall.compile_dir(".")'
+${PYTHON} -m compileall -l -f .
 if [ $? -ne 0 ]
 then
     echo "Error compiling Python source"
@@ -59,12 +59,11 @@ fi
 # Set the proper permissions on the Python files.
 #
 chmod 775 *.py
-chmod 664 *.pyc
 
 #
 # Copy the Python files to the given library directory.
 #
-for FILE in `ls *.py *.pyc`
+for FILE in `ls *.py`
 do
     rm -f ${LIBRARY_DIRECTORY}/${FILE}
     cp -p ${FILE} ${LIBRARY_DIRECTORY}