Tool/ContributionOpener: Moved its content (DirectoryFileHandler class) to...

Tool/ContributionOpener: Moved its content (DirectoryFileHandler class) to ContributionTool as this is not a Tool. As this is only used in ContributionTool, it does not seem necessary to create a separate module for that. Also: * Fix undefined variable `splitport`. * Use cStringIO instead of StringIO (as the rest of ContributionTool code does).

Tool/ContributionOpener: Moved its content (DirectoryFileHandler class) to...
Tool/ContributionOpener: Moved its content (DirectoryFileHandler class) to ContributionTool as this is not a Tool. As this is only used in ContributionTool, it does not seem necessary to create a separate module for that. Also: * Fix undefined variable `splitport`. * Use cStringIO instead of StringIO (as the rest of ContributionTool code does).
af07ce4e · Arnaud Fontaine · 4ee585d8 · 4ee585d8 · af07ce4e
Commit af07ce4e authored Apr 08, 2020 by Arnaud Fontaine
Hide whitespace changes
Inline Side-by-side

Showing with 52 additions and 73 deletions

product/ERP5/Tool/ContributionOpener.py product/ERP5/Tool/ContributionOpener.py +0 -71

product/ERP5/Tool/ContributionTool.py product/ERP5/Tool/ContributionTool.py +52 -2

No files found.
--- a/product/ERP5/Tool/ContributionOpener.py
+++ b/product/ERP5/Tool/ContributionOpener.py
-##############################################################################
-#
-# Copyright (c) 2007 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets <jp@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the Python Software Foundation License (PSFL)
-#
-##############################################################################
-import urllib2, os, dircache, urllib
-from StringIO import StringIO
-from urllib2 import FileHandler, url2pathname, addinfourl, URLError
-import mimetypes, mimetools
-from email.utils import formatdate
-class DirectoryFileHandler(FileHandler):
-    """
-    Extends the file handler to provide an HTML
-    representation of local directories.
-    """
-    # Use local file or FTP depending on form of URL
-    def file_open(self, req):
-        url = req.get_selector()
-        if url[:2] == '//' and url[2:3] != '/':
-            req.type = 'ftp'
-            return self.parent.open(req)
-        else:
-            return self.open_local_file(req)
-    # not entirely sure what the rules are here
-    def open_local_file(self, req):
-        host = req.get_host()
-        file = req.get_selector()
-        localfile = url2pathname(file)
-        stats = os.stat(localfile)
-        size = stats.st_size
-        modified = formatdate(stats.st_mtime, usegmt=True)
-        mtype = mimetypes.guess_type(file)[0]
-        headers = mimetools.Message(StringIO(
-            'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
-            (mtype or 'text/plain', size, modified)))
-        if host:
-            host, port = splitport(host)
-        if not host or \
-           (not port and socket.gethostbyname(host) in self.get_names()):
-            try:
-              file_list = dircache.listdir(localfile)
-              s = StringIO()
-              s.write('<html><head><base href="%s"/></head><body>' % ('file:' + file))
-              s.write('<p>Directory Content:</p>')
-              for f in file_list:
-                s.write('<p><a href="%s">%s</a></p>\n' % (urllib.quote(f), f))
-              s.write('</body></html>')
-              s.seek(0)
-              headers = mimetools.Message(StringIO(
-                  'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
-                  ('text/html', size, modified)))
-              return addinfourl(s, headers, 'file:' + file)
-            except OSError:
-              return addinfourl(open(localfile, 'rb'),
-                                headers, 'file:'+file)
-        raise URLError('file not on local host')
--- a/product/ERP5/Tool/ContributionTool.py
+++ b/product/ERP5/Tool/ContributionTool.py
@@ -50,8 +50,58 @@ from DateTime import DateTime
 import warnings
 # Install openers
-import ContributionOpener
+import dircache
-opener = urllib2.build_opener(ContributionOpener.DirectoryFileHandler)
+import mimetypes, mimetools
+from email.utils import formatdate
+class DirectoryFileHandler(urllib2.FileHandler):
+    """
+    Extends the file handler to provide an HTML
+    representation of local directories.
+    """
+    # Use local file or FTP depending on form of URL
+    def file_open(self, req):
+        url = req.get_selector()
+        if url[:2] == '//' and url[2:3] != '/':
+            req.type = 'ftp'
+            return self.parent.open(req)
+        else:
+            return self.open_local_file(req)
+    # not entirely sure what the rules are here
+    def open_local_file(self, req):
+        host = req.get_host()
+        file = req.get_selector()
+        localfile = urllib2.url2pathname(file)
+        stats = os.stat(localfile)
+        size = stats.st_size
+        modified = formatdate(stats.st_mtime, usegmt=True)
+        mtype = mimetypes.guess_type(file)[0]
+        headers = mimetools.Message(cStringIO.StringIO(
+            'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
+            (mtype or 'text/plain', size, modified)))
+        if host:
+            host, port = urllib.splitport(host)
+        if not host or \
+           (not port and socket.gethostbyname(host) in self.get_names()):
+            try:
+              file_list = dircache.listdir(localfile)
+              s = cStringIO.StringIO()
+              s.write('<html><head><base href="%s"/></head><body>' % ('file:' + file))
+              s.write('<p>Directory Content:</p>')
+              for f in file_list:
+                s.write('<p><a href="%s">%s</a></p>\n' % (urllib.quote(f), f))
+              s.write('</body></html>')
+              s.seek(0)
+              headers = mimetools.Message(cStringIO.StringIO(
+                  'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
+                  ('text/html', size, modified)))
+              return urllib2.addinfourl(s, headers, 'file:' + file)
+            except OSError:
+              return urllib2.addinfourl(open(localfile, 'rb'),
+                                        headers, 'file:'+file)
+        raise urllib2.URLError('file not on local host')
+opener = urllib2.build_opener(DirectoryFileHandler)
 urllib2.install_opener(opener)
 # Global parameters