[Checkins] SVN: z3c.pypimirror/trunk/ renamed full.html, index.html

Andreas Jung andreas at andreas-jung.com
Thu Aug 28 08:18:29 EDT 2008


Log message for revision 90547:
  renamed full.html, index.html
  

Changed:
  U   z3c.pypimirror/trunk/CHANGES.txt
  U   z3c.pypimirror/trunk/setup.py
  U   z3c.pypimirror/trunk/src/z3c/pypimirror/README.txt
  U   z3c.pypimirror/trunk/src/z3c/pypimirror/mirror.py

-=-
Modified: z3c.pypimirror/trunk/CHANGES.txt
===================================================================
--- z3c.pypimirror/trunk/CHANGES.txt	2008-08-28 10:21:56 UTC (rev 90546)
+++ z3c.pypimirror/trunk/CHANGES.txt	2008-08-28 12:18:29 UTC (rev 90547)
@@ -1,5 +1,13 @@
 Change history
 ~~~~~~~~~~~~~~
+
+0.2.2 (2008-08-28)
+------------------
+
+- renamed index.html to index2.html
+- renamed full.html to index.html
+- some internal cleanup
+
 0.2.1 (2008-08-28)
 ------------------
 

Modified: z3c.pypimirror/trunk/setup.py
===================================================================
--- z3c.pypimirror/trunk/setup.py	2008-08-28 10:21:56 UTC (rev 90546)
+++ z3c.pypimirror/trunk/setup.py	2008-08-28 12:18:29 UTC (rev 90547)
@@ -15,7 +15,7 @@
 
 setup(
     name='z3c.pypimirror',
-    version='0.2.1',
+    version='0.2.2',
     author='Daniel Kraft et al.',
     author_email='dk at d9t.de',
     description='A module for building a complete or a partial PyPI mirror',

Modified: z3c.pypimirror/trunk/src/z3c/pypimirror/README.txt
===================================================================
--- z3c.pypimirror/trunk/src/z3c/pypimirror/README.txt	2008-08-28 10:21:56 UTC (rev 90546)
+++ z3c.pypimirror/trunk/src/z3c/pypimirror/README.txt	2008-08-28 12:18:29 UTC (rev 90547)
@@ -35,10 +35,10 @@
 >>> packagename in open(path_package_index, 'r').read()
 True
 
-Now we create a `index.html` for the mirror.
+Now we create a `index2.html` for the mirror.
 
 >>> mirror.index_html()
->>> path_index = join(mirror.base_path, 'index.html')
+>>> path_index = join(mirror.base_path, 'index2.html')
 >>> packagename in open(path_index, 'r').read()
 True
 

Modified: z3c.pypimirror/trunk/src/z3c/pypimirror/mirror.py
===================================================================
--- z3c.pypimirror/trunk/src/z3c/pypimirror/mirror.py	2008-08-28 10:21:56 UTC (rev 90546)
+++ z3c.pypimirror/trunk/src/z3c/pypimirror/mirror.py	2008-08-28 12:18:29 UTC (rev 90547)
@@ -288,21 +288,28 @@
         return filenames
 
     def _html_link(self, filename):
-        return "<a href='%s/'>%s</a>" % (filename, filename)
+        return '<a href="%s/">%s</a>' % (filename, filename)
 
     def _index_html(self):
         header = "<html><body><h1>PyPi Mirror</h1><h2>Last update: " + \
-                 time.strftime("%c %Z")+"</h2>"
+                 time.strftime("%c %Z")+"</h2>\n"
         links = "<br />\n".join([self._html_link(link) for link in self.ls()])
-        footer = "</body></html>"
+        footer = "</body></html>\n"
         return "%s%s%s" % (header, links, footer)
 
     def index_html(self):
         content = self._index_html()
-        open(os.path.join(self.base_path, "index.html"), "wb").write(content)
+        open(os.path.join(self.base_path, "index2.html"), "wb").write(content)
 
     def full_html(self, full_list):
-        open(os.path.join(self.base_path, "full.html"), "wb").write("<br />\n".join(full_list))
+        header = "<html><body><h1>PyPi Mirror</h1><h2>Last update: " + \
+                 time.strftime("%c %Z")+"</h2>\n"
+        footer = "</body></html>\n"
+        fp = file(os.path.join(self.base_path, "index.html"), "wb")
+        fp.write(header)
+        fp.write("<br />\n".join(full_list))
+        fp.write(footer)
+        fp.close()
 
     def mirror(self, package_list, filename_matches, verbose, cleanup, create_indexes, external_links, base_url):
         stats = Stats()
@@ -414,7 +421,7 @@
         return filenames
 
     def _html_link(self, base_url, filename, md5_hash):
-        return "<a href='%s%s/%s#md5=%s'>%s</a>" % (base_url, self.package_name, filename, md5_hash, filename)
+        return '<a href="%s%s/%s#md5=%s">%s</a>' % (base_url, self.package_name, filename, md5_hash, filename)
 
     def _index_html(self, base_url):
         header = "<html><body>"



More information about the Checkins mailing list