[Python-modules-commits] [python-pysolar] 25/42: Revered query_usno.py, keep that as Py2

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag 0.6
in repository python-pysolar.

commit a4855119586c7fb3ec6be090270908d96ed8cad0
Author: Robin Wilson <robin at rtwilson.com>
Date:   Sat Apr 19 03:05:14 2014 +0000

    Revered query_usno.py, keep that as Py2
---
 Pysolar/query_usno.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Pysolar/query_usno.py b/Pysolar/query_usno.py
index bd9f506..2906268 100644
--- a/Pysolar/query_usno.py
+++ b/Pysolar/query_usno.py
@@ -20,7 +20,7 @@
 """Tool for requesting data from US Naval Observatory
 
 """
-import datetime, random, time, urllib.request, urllib.parse, urllib.error, urllib.request, urllib.error, urllib.parse
+import datetime, random, time, urllib, urllib2
 import Pysolar as solar
 
 class Ephemeris:
@@ -50,16 +50,16 @@ class EphemerisComparison:
 def RequestEphemerisData(datum):
 	data = EncodeRequest(datum.latitude, datum.longitude, datum.timestamp, datum.elevation)
 	url = 'http://aa.usno.navy.mil/cgi-bin/aa_topocentric2.pl'
-	req = urllib.request.Request(url, data)
-	response = urllib.request.urlopen(req)
+	req = urllib2.Request(url, data)
+	response = urllib2.urlopen(req)
 
 	lines = response.readlines()
 	response.close()
 	#print lines
 	#print lines[21] # should not we do some try catch here?
 	result = lines[21]
-	tokens = [x for x in result.split(' ') if x not in ' ']
-	print('Tokens: \n', tokens)
+	tokens = filter(lambda x: x not in ' ', result.split(' '))
+	print 'Tokens: \n', tokens
 
 	usno_alt = float(tokens[4]) + float(tokens[5])/60.0 + float(tokens[6])/3600.0
 	usno_az = float(tokens[7]) + float(tokens[8])/60.0 + float(tokens[9])/3600.0
@@ -121,7 +121,7 @@ def EncodeRequest(latitude, longitude, timestamp, elevation):
 	
 	params['hh1'] = str(elevation) # height above sea level in meters
 	params['ZZZ'] = 'END'
-	data = urllib.parse.urlencode(params)
+	data = urllib.urlencode(params)
 	return data
 
 def GatherRandomEphemeris():
@@ -136,7 +136,7 @@ def GatherRandomEphemeris():
 	WriteEphemerisDatumToFile(d, 'usno_data.txt')
 
 def PrintEphemerisDatum(datum):
-	print(datum.timestamp, datum.latitude, datum.longitude, datum.elevation, datum.azimuth, datum.altitude)
+	print datum.timestamp, datum.latitude, datum.longitude, datum.elevation, datum.azimuth, datum.altitude
 
 def ReadEphemeridesLog(logname):
 	data = []
@@ -181,19 +181,19 @@ if __name__ == '__main__':
 	az_errors = np.array([c.az_error for c in comps])
 	alt_errors = np.array([c.alt_error for c in comps])
 
-	print('---------------------')
-	print('Azimuth stats')
-	print('Mean error: ' + str(np.mean(az_errors)))
-	print('Std dev: ' + str(np.std(az_errors)))
-	print('Min error: ' + str(stats.tmin(az_errors, None)))
-	print('Max error: ' + str(stats.tmax(az_errors, None)))
+	print '---------------------'
+	print 'Azimuth stats'
+	print 'Mean error: ' + str(np.mean(az_errors))
+	print 'Std dev: ' + str(np.std(az_errors))
+	print 'Min error: ' + str(stats.tmin(az_errors, None))
+	print 'Max error: ' + str(stats.tmax(az_errors, None))
 
-	print('----------------------')
-	print('Altitude stats')
+	print '----------------------'
+	print 'Altitude stats'
 	
-	print('Mean error: ' + str(np.mean(alt_errors)))
-	print('Std dev: '+ str(np.std(alt_errors)))
-	print('Min error: ' + str(stats.tmin(alt_errors, None)))
-	print('Max error: ' + str(stats.tmax(alt_errors, None)))
+	print 'Mean error: ' + str(np.mean(alt_errors))
+	print 'Std dev: '+ str(np.std(alt_errors))
+	print 'Min error: ' + str(stats.tmin(alt_errors, None))
+	print 'Max error: ' + str(stats.tmax(alt_errors, None))
 
 	WriteComparisonsToCSV(comps, 'pysolar_v_usno.csv')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pysolar.git