X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfascan.py;h=136835db755bea2d223a56a84ae4d9302fe04bc8;hb=5a6cbf4fa6837c81354b616d4cfa0352ec5367be;hp=f7f5ddabb2ed33cb7a4780042ec0e8ba31a702b9;hpb=f7f57707d12dd626d4293dc1e34451fc23763052;p=sfa.git diff --git a/sfa/client/sfascan.py b/sfa/client/sfascan.py index f7f5ddab..136835db 100644 --- a/sfa/client/sfascan.py +++ b/sfa/client/sfascan.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import sys, os.path import pickle import time @@ -8,7 +10,7 @@ from urlparse import urlparse try: import pygraphviz except: - print 'Warning, could not import pygraphviz, test mode only' + print('Warning, could not import pygraphviz, test mode only') from optparse import OptionParser @@ -49,7 +51,7 @@ class VersionCache: def load (self): try: - infile=file(self.filename,'r') + infile=open(self.filename,'r') self.url2version=pickle.load(infile) infile.close() except: @@ -59,7 +61,7 @@ class VersionCache: def save (self): try: - outfile=file(self.filename,'w') + outfile=open(self.filename,'w') pickle.dump(self.url2version,outfile) outfile.close() except: @@ -73,7 +75,7 @@ class VersionCache: def show (self): entries=len(self.url2version) - print "version cache from file %s has %d entries"%(self.filename,entries) + print("version cache from file %s has %d entries"%(self.filename,entries)) key_values=self.url2version.items() def old_first (kv1,kv2): return int(kv1[1][0]-kv2[1][0]) key_values.sort(old_first) @@ -82,9 +84,9 @@ class VersionCache: (timestamp,version) = tuple how_old = time.time()-timestamp if how_old<=self.expires: - print url,"-- %d seconds ago"%how_old + print(url,"-- %d seconds ago"%how_old) else: - print "OUTDATED",url,"(%d seconds ago, expires=%d)"%(how_old,self.expires) + print("OUTDATED",url,"(%d seconds ago, expires=%d)"%(how_old,self.expires)) # turns out we might have trailing slashes or not def normalize (self, url): @@ -366,5 +368,5 @@ class SfaScan: # test mode when pygraphviz is not available except: entry=entries[0] - print "GetVersion at %s returned %s"%(entry.url(),entry.get_version()) + print("GetVersion at %s returned %s"%(entry.url(),entry.get_version()))