[Checkins] SVN: zopyx.convert2/trunk/src/zopyx/convert2/ removed pointless zope.interface usage

Andreas Jung andreas at andreas-jung.com
Sat Oct 4 13:03:33 EDT 2008


Log message for revision 91753:
  removed pointless zope.interface usage
  

Changed:
  U   zopyx.convert2/trunk/src/zopyx/convert2/__init__.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/convert.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/fo.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/fop.py
  D   zopyx.convert2/trunk/src/zopyx/convert2/interfaces.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/prince.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/xfc.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/xinc.py

-=-
Modified: zopyx.convert2/trunk/src/zopyx/convert2/__init__.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/__init__.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/__init__.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -4,7 +4,6 @@
 # (C) 2007, 2008, ZOPYX Ltd & Co. KG, Tuebingen, Germany
 ##########################################################################
 
-from interfaces import IFOConverter, IHTML2FOConverter, IXSLFOConverter
 
 import fo
 import xinc

Modified: zopyx.convert2/trunk/src/zopyx/convert2/convert.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/convert.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/convert.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -6,9 +6,6 @@
 
 import os
 
-from zope.interface import implements
-
-from interfaces import IXSLFOConverter
 from fo import HTML2FO
 import registry
 
@@ -42,7 +39,6 @@
 class BaseConverter(object):
     """High-level OO interface to XSL-FO conversions """
 
-    implements(IXSLFOConverter)
 
     def __init__(self, filename, encoding='utf-8', cleanup=False, verbose=False):
         self.filename = filename

Modified: zopyx.convert2/trunk/src/zopyx/convert2/fo.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/fo.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/fo.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -8,9 +8,6 @@
 import sys
 from elementtree.ElementTree import parse, tostring, SubElement        
 
-from zope.interface import implements
-
-from interfaces import IFOConverter
 from config import java
 from tidy import tidyhtml
 from util import newTempfile, runcmd, which, win32, checkEnvironment

Modified: zopyx.convert2/trunk/src/zopyx/convert2/fop.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/fop.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/fop.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -11,9 +11,6 @@
 from util import runcmd, which, win32, checkEnvironment
 from logger import LOG
 
-from zope.interface import implements
-from interfaces import IFOConverter
-
 fop_home = os.environ.get('FOP_HOME')
 
 def _check_fop():

Deleted: zopyx.convert2/trunk/src/zopyx/convert2/interfaces.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/interfaces.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/interfaces.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -1,43 +0,0 @@
-##########################################################################
-# zopyx.convert - XSL-FO related functionalities
-#
-# (C) 2007, 2008, ZOPYX Ltd & Co. KG, Tuebingen, Germany
-##########################################################################
-
-from zope.interface import Interface
-
-class IHTMLConverter(Interface):
-
-    def convertHtml(html_filename, output_filename=None):
-        """ Converts the HTML stored in file references as
-            ``html_filename`` to some output format. The conversion
-            result is also stored on the filesystem. The filename 
-            of the converted is file is returned.
-        """
-            
-
-class IFOConverter(Interface):
-
-    def convert(fo_filename):
-        """ Convert a XSL-FO file (stored on the filesystem) to some output format.
-            Returns the filename of the output file. 
-        """
-
-
-class IHTML2FOConverter(Interface):
-        
-    def convert(html_filename):
-        """ Convert a HTML file (stored on the filesystem to XSL-FO.    
-        """
-
-
-class IXSLFOConverter(Interface):
-    """ A converter that converts HTML to some output format using
-        XSL-FO.
-    """
-
-    def __init__(filename, encoding='utf-8', cleanup=False, verbose=False):
-        """ Initialize a converter with the 'filename' of a HTML file """
-
-    def convert(format, output_filename=None):
-        """ Convert HTML to output 'format' """

Modified: zopyx.convert2/trunk/src/zopyx/convert2/prince.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/prince.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/prince.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -11,8 +11,6 @@
 from util import runcmd, which, win32, checkEnvironment
 from logger import LOG
 
-from zope.interface import implements
-from interfaces import IFOConverter
 from tidy import tidyhtml
 
 def _check_prince():

Modified: zopyx.convert2/trunk/src/zopyx/convert2/xfc.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/xfc.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/xfc.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -11,11 +11,8 @@
 from util import runcmd, which, win32, checkEnvironment
 from logger import LOG
 
-from zope.interface import implements
-from interfaces import IFOConverter
+/bin/bash: :qa: command not found
 
-xfc_dir = os.environ.get('XFC_DIR')
-
 def _check_xfc():
     if not checkEnvironment('XFC_DIR'):
         return False

Modified: zopyx.convert2/trunk/src/zopyx/convert2/xinc.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/xinc.py	2008-10-04 16:39:29 UTC (rev 91752)
+++ zopyx.convert2/trunk/src/zopyx/convert2/xinc.py	2008-10-04 17:03:33 UTC (rev 91753)
@@ -11,8 +11,6 @@
 from util import runcmd, which, win32, checkEnvironment
 from logger import LOG
 
-from zope.interface import implements
-from interfaces import IFOConverter
 
 xinc_home = os.environ.get('XINC_HOME')
 



More information about the Checkins mailing list