pyflakes and python3 cleanup of the website code

Author: fchapoton

conf/__init__.py

@@ -1,7 +1,6 @@
 # coding: utf8
 import yaml
-from os.path import join, dirname, splitext, split
-from glob import glob
+from os.path import join, dirname
 
 config = mirrors = packages = None
 

cont.py

@@ -17,7 +17,6 @@
 IN_MODIFY = pyinotify.IN_MODIFY
 IN_CREATE = pyinotify.IN_CREATE
 IN_DELETE = pyinotify.IN_DELETE
-from os.path import exists, abspath
 import time
 
 
@@ -71,7 +70,7 @@ def autocompile(paths, cmd):
                  IN_MODIFY,  # but still all?!
                  rec=True,
                  auto_add=True)
-    print '==> Start monitoring %s (type CTRL-c to exit)' % paths
+    print('==> Start monitoring %s (type CTRL-c to exit)' % paths)
 
     try:
         notifier.loop()

publish.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env bash
 # After the website has been built successfully, it is in the "www" subdirectory.
 # This script synchronizes this build with the Git repository at GitHub.
 # From there, the website is served.
@@ -25,4 +25,3 @@ $GIT reset --soft github/master # <- non destructive
 $GIT add -A -- .
 $GIT commit -m "auto publish `date -u --rfc-3339=seconds`"
 $GIT push github master -f
-

render.py

@@ -10,11 +10,7 @@
 import sys
 from os.path import join, normpath, exists, islink, basename, splitext
 from glob import glob
-import datetime
-import shutil
-import yaml
 import jinja2 as j2
-import multiprocessing as mp
 import markdown
 
 from scripts import log

scripts/apache_stats.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf8 -*-
+# -*- coding: utf-8 -*-
 """
 This file parses the boxen specific apache logfiles for www_sagemath_org
 It generates a statistic for all SPKGes, which are not standard and
@@ -73,7 +73,7 @@ def apachetime(s):
 
 
 def analyze(logfile):
-    print 'scanning', logfile
+    print('scanning', logfile)
 
     for line_no, line in enumerate(file(logfile, 'r')):
         # check if there is a newer line (newer than in the Data (data_fn) dump)

scripts/attic/old-sources-update.py

@@ -17,10 +17,10 @@
 
 #F = os.listdir(PATH)
 #G = [(os.path.getctime(f), f) for f in F]
-#print G
+#print(G)
 #G.sort(reverse=True)
-#print "-----\n\n"
-#print G
+#print("-----\n\n")
+#print(G)
 #F = [f for _, f in G]
 
 #F.sort()
@@ -68,7 +68,7 @@
     size = int(os.path.getsize(PATH + "/" + x)/1000000)
     if x == "sage.tar.bz2" or not x[:5] == 'sage-':
         continue
-    print x
+    print(x)
     name = x.replace("_"," ").replace("sage-","")
     i = name.find("-src")
     if i != -1:

scripts/attic/source_download.py

@@ -3,7 +3,7 @@
 Populate all the source code releases inside download-source.html
 """
 
-print "no longer used"
+print("no longer used")
 import sys
 sys.exit(0)
 
@@ -23,7 +23,7 @@
 table_body = None
 
 if not os.path.exists(src_html):
-    print 'File Not Found: %s' % src_html
+    print('File Not Found: %s' % src_html)
     sys.exit(1)
 
 source_xml = minidom.parse(src_html) 
@@ -34,14 +34,14 @@
         source = d
 
 if source is None:
-    print '<div id="source">...</div> not found!'
+    print('<div id="source">...</div> not found!')
     sys.exit(1)
 
 def initContent():
     global table_body
     #delete everything
     for o in source_xml.getElementsByTagName(r'table'):
-       print "deleting", o
+       print("deleting", o)
        o.parentNode.removeChild(o)
     table = source_xml.createElement(r'table')
     table.setAttribute(r'class', 'xsmall')
@@ -81,7 +81,7 @@ def writeToSource():
        tr = source_xml.createElement(r'tr')
        if first:
            tr.setAttribute(r'class','first')
-	   first = False
+           first = False
        elif release % 2 == 0:
            tr.setAttribute(r'class', 'even')
        else:
@@ -92,7 +92,7 @@ def writeToSource():
        tr.appendChild(td)
 
        td = source_xml.createElement(r'td')
-       print name 
+       print(name)
        a = source_xml.createElement(r'a')
        a.setAttribute(r'href', F.replace(os.path.sep + r'www', ''))
        a.appendChild(source_xml.createTextNode(name))
@@ -135,7 +135,7 @@ def writeToSource():
        tr.appendChild(td)
 
        td = source_xml.createElement(r'td')
-       print name, F
+       print(name, F)
        a = source_xml.createElement(r'a')
        a.setAttribute(r'href', 'http://www.sagemath.org/src-old' + F.replace(src_old, ''))
        a.appendChild(source_xml.createTextNode(name))
@@ -156,7 +156,7 @@ def writeToSource():
 initContent()
 writeToSource()
 
-#print source_xml.toxml()
+#print(source_xml.toxml())
 #xml.dom.ext.PrettyPrint(source_xml, open(src_html, 'w'))
 
 source_xml.writexml(utils.UnicodeFileWriter( open(src_html, "w")))

scripts/export.py

@@ -51,7 +51,7 @@ def usage():
     """
     Print the usage information for this script.
     """
-    print "".join(["Usage: ", sys.argv[0], " /path/to/SAGE_ROOT/"])
+    print("".join(["Usage: ", sys.argv[0], " /path/to/SAGE_ROOT/"]))
     sys.stdout.flush()
 
 ##############################

scripts/geocode.py

@@ -12,6 +12,7 @@
 BUGS:
  * devcloud tag get's shortend, firefox&co cannot cope with it :( ... make it full again
 """
+from __future__ import print_function
 
 import xml.dom.minidom as minidom
 from xml.dom.minidom import parse, parseString
@@ -180,9 +181,9 @@ def getGeo(loc):
     """
     loc = loc.replace(" ", "+")
     loc = urllib2.quote(loc.encode('UTF-8'))
-    print loc, ">>>",
+    print(loc, ">>>", end="")
     global timeout
-    print "[doing query, %s secs break] >>>" % timeout,
+    print("[doing query, %s secs break] >>>" % timeout, end="")
     sys.stdout.flush()
     time.sleep(timeout)
     #url = 'http://maps.google.com/maps/geo?q=%s&output=csv&key=%s' % (loc, gkey)
@@ -199,7 +200,7 @@ def getGeo(loc):
     loc = geo["results"][0]["geometry"]["location"]
     lng = str(loc["lng"])
     lat = str(loc["lat"])
-    print acc, lat, lng
+    print(acc, lat, lng)
     return "200", acc, lng, lat
 
 
@@ -209,19 +210,19 @@ def addGeo(place):
     if not lcache:
         geo = getGeo(place)
         while geo is None and attempts > 0:
-            print "[no result, trying again] >>>",
+            print("[no result, trying again] >>>", end="")
             sys.stdout.flush()
             geo = getGeo(place)
             attempts -= 1
         if geo is None and attempts == 0:
-            print "FAILURE AFTER TOO MANY ATTEMPTS"
+            print("FAILURE AFTER TOO MANY ATTEMPTS")
             return
         g = outxml.createElement("loc")
         statuscode = geo[0]
         # http://code.google.com/apis/maps/documentation/reference.html#GGeoStatusCode
         # 620 means too fast, we need to slow down!
         if "620" == statuscode:
-            print "we were too fast, error code 620 by google!"
+            print("we were too fast, error code 620 by google!")
             global timeout
             timeout *= 2
             addGeo(place)
@@ -234,7 +235,7 @@ def addGeo(place):
             g.setAttribute("loclat", geo[3])
             out.appendChild(g)
     else:
-        print "cache"
+        print("cache")
         out.appendChild(lcache)
 
 
@@ -247,34 +248,34 @@ def getStatistics():
     #        c.replaceChild(devmap.createTextNode(str(nbContribs)), c.childNodes[0])
     #    elif c.getAttribute("id") == "contrib-places":
     #        c.replaceChild(devmap.createTextNode(str(nbPlaces)), c.childNodes[0])
-    print "contributors =", str(nbContribs), "places =", str(nbPlaces)
+    print("contributors =", str(nbContribs), "places =", str(nbPlaces))
     return nbContribs, nbPlaces
 
 # read through ack.xml
 for c in ack.getElementsByTagName("contributor"):
-    print c.getAttribute("name"), ">>>",
+    print(c.getAttribute("name"), ">>>", end="")
     if c.hasAttribute("location"):
         addGeo(c.getAttribute("location"))
     else:
-        print "  <--- UNKNOWN LOCATION !!!"
+        print("  <--- UNKNOWN LOCATION !!!")
 
 
-print
-print "This is now written to file %s:" % geocode_xml_outfn
-print out.toprettyxml()
+print()
+print("This is now written to file %s:" % geocode_xml_outfn)
+print(out.toprettyxml())
 
 #xml.dom.ext.PrettyPrint(out, open(geocode_xml_outfn, "w"))
 out.writexml(utils.UnicodeFileWriter(open(geocode_xml_outfn, "w")), newl="\n")
 
-print
-print "calculating statistics and writing to description"
+print()
+print("calculating statistics and writing to description")
 nbContribs, nbPlaces = getStatistics()
 
-print
-print "now writing table entries for search engines and javascript disabled ones"
+print()
+print("now writing table entries for search engines and javascript disabled ones")
 writeToDevmap()
 
-print "file written to %s" % devmap_tmpl
+print("file written to %s" % devmap_tmpl)
 #xml.dom.ext.PrettyPrint(devmap, open(devmap_xml, "w"))
 #devmap.writexml(utils.UnicodeFileWriter(open(devmap_tmpl, "w")), newl="\n")
 # utils.delFirstLine(devmap_xml)

scripts/index-documentation.py

@@ -50,7 +50,7 @@
 
     for link in sp.Popen("find -type l -name _static".split(), stdout=sp.PIPE).stdout:
         d = os.path.normpath(os.path.join(ROOT, link.rsplit("/", 1)[0]))
-        print d
+        print(d)
         os.chdir(d)
         os.system(
             r'find -type f -name "*.html" -exec sed -i "s/_static/..\/_static/" {} \;')