Changeset 114

Timestamp:

01/29/06 10:56:47 (3 years ago)

Author:

tim

Message:

updated a lot of stuff for a 0.3 tag release

Files:

• branches/timadditionaltypes/pyramid/build.py (modified) (3 diffs)
• branches/timadditionaltypes/pyramid/flatteners.py (modified) (1 diff)
• branches/timadditionaltypes/pyramid/pyramid (added)
• branches/timadditionaltypes/pyramid/restParser.py (modified) (2 diffs)
• branches/timadditionaltypes/pyramid/test/testdata/build_tests/firstpythontest/expected/.cache.dump (modified) (1 diff)
• branches/timadditionaltypes/pyramid/test/testdata/build_tests/firstpythontest/expected/index.html (modified) (1 diff)
• branches/timadditionaltypes/pyramid/test/tests.py (modified) (3 diffs)
• branches/timadditionaltypes/setup.py (modified) (2 diffs)

branches/timadditionaltypes/pyramid/build.py

@@ -130 +130 @@
-
-def main(options,args):
-    
-    if options.resources:
-        resourcedirs = options.resources.split(',')
@@ -144 +143 @@
-    build(options.data,options.out,verbose=options.verbose,resourcedirs=resourcedirs,rebuilddirs=rebuilddirs)
-
-
+
+
-    parser = OptionParser()
-    parser.add_option("-d", "--data", dest="data", help="directory in which the fragment data is stored", metavar="DATA")
@@ -152 +152 @@
-    parser.add_option("-R", "--rebuilddirs",dest="rebuilddirs",help="only rebuild below these comma separated directories",metavar="REBUILDDIRS")
-    (options, args) = parser.parse_args()
-    
-    main(options,args)
+
+if __name__ == "__main__":
+    parseOptions()

branches/timadditionaltypes/pyramid/flatteners.py

@@ -62 +62 @@
-            fp = open(restfile)
-        except IOError:
-
-
-
+
+
+
+
+
+
+
+
-
-class HtmlFileFlattener(components.Adapter):

branches/timadditionaltypes/pyramid/restParser.py

@@ -51 +51 @@
-
-def html_fragment(input_string, source_path=None, destination_path=None,
-iso-8859-1
+unicode
-                  doctitle=0, initial_header_level=1):
-    """
@@ -64 +64 @@
-      string is desired, use the default value of "unicode" .
-    """
+    try:
+        input_string = input_string.decode('utf-8')
+    except:
+        input_string = input_string.decode('iso-8859-1')
+        
-    parts = html_parts(
-        input_string=input_string, source_path=source_path,

branches/timadditionaltypes/pyramid/test/testdata/build_tests/firstpythontest/expected/.cache.dump

@@ -145 +145 @@
-(g50
-g6
-
+83\xc2\x
-tRp67
-sS'href'

branches/timadditionaltypes/pyramid/test/testdata/build_tests/firstpythontest/expected/index.html

@@ -145 +145 @@
-
-<h2 class="news"><a href="/news/europython-2004">Europython in Göteborg, Sweden</a></h2>
-
+ƒÂ
-Sweden from June 7-9 2004. Register today or view the programme</p>
-

branches/timadditionaltypes/pyramid/test/tests.py

@@ -23 +23 @@
-        removeTemp(dir)
-    os.mkdir(dir)     
+
+def tree_from_stream(stream,
+                     norm_sp=1, ext_ges=0, ext_pes=0, include_comment=1,
+                     encoding='UTF-8', html=0):
+    """
+    create internal tree from xml stream (open file or IOString)
+    if norm_sp = 1, normalize space and new line
+    """
+    from xml.sax import make_parser, SAXNotRecognizedException
+    from xml.sax.handler import feature_namespaces, feature_external_ges, \
+         feature_external_pes, property_lexical_handler
+    from logilab.xmldiff.parser import SaxHandler
+    handler = SaxHandler(norm_sp, include_comment, encoding)
+    if html:
+        parser = make_parser(["xml.sax.drivers2.drv_sgmlop_html"])
+    else:
+        parser = make_parser()
+        # do not perform Namespace processing
+        parser.setFeature(feature_namespaces, 0)
+    # do not include any external entities
+    try:
+        parser.setFeature(feature_external_ges, ext_ges)
+        #xml.sax._exceptions.
+    except SAXNotRecognizedException:
+        pass
+    try:
+        parser.setFeature(feature_external_pes, ext_pes)
+        #xml.sax._exceptions.
+    except SAXNotRecognizedException:
+        pass
+    # add lexical handler for comments,  entities, dtd and cdata
+    parser.setProperty(property_lexical_handler, handler)
+    parser.setContentHandler(handler)
+    parser.parse(stream)
+    return handler.get_tree()
+
+
+from logilab.xmldiff.format import AbstractFormatter
+from logilab.xmldiff.objects import f_xpath,A_N2
+import types
+
+class InternalPrinter(AbstractFormatter):
+    """ print actions in the internal format """
+
+    def add_action(self, action):
+        """
+        See AbstractFormatter interface
+        """
+        if len(action) > 2 and type(action[A_N2]) == types.ListType:
+            if type(action[A_N1]) == types.ListType:
+                #swap or move node
+                action[A_N1] = f_xpath(action[A_N1])
+                action[A_N2] = f_xpath(action[A_N2])
+        AbstractFormatter.add_action(self, action)
+
+    def format_action(self, action):
+        """
+        See AbstractFormatter interface
+        """
+        pass
+def htmldiff(text1, text2, norm_sp=1, xupd=0, ezs=0, verbose=0, ext_ges=0, ext_pes=0, include_comment=0, encoding='UTF-8', html=1):
+    """  Computes the diff between two files.
+    """
+    from xml.sax import SAXParseException
+    from cStringIO import StringIO
+    fh1 = StringIO(text1)
+    fh2 = StringIO(text2)
+    
+    # convert xml files to tree
+    try:
+        #from logilab.xmldiff.input import tree_from_stream
+        tree1 = tree_from_stream(fh1, norm_sp, ext_ges,
+                                 ext_pes, include_comment,
+                                 encoding, html)
+        tree2 = tree_from_stream(fh2, norm_sp, ext_ges,
+                                 ext_pes, include_comment,
+                                 encoding, html)
+        fh1.close ()
+        fh2.close ()
+    except SAXParseException, msg:
+        print msg
+        return -1
+
+    if verbose:
+        from logilab.xmldiff.objects import repr, N_ISSUE, N_CHILDS
+        print "Source tree\n", repr(tree1)
+        print "Destination tree\n", repr(tree2)
+        print 'Source tree has', tree1[N_ISSUE], 'nodes'
+        print 'Destination tree has', tree2[N_ISSUE], 'nodes'
+    # output formatter
+    if xupd:
+        from logilab.xmldiff.format import XUpdatePrinter
+        formatter = XUpdatePrinter()
+    else:
+        formatter = InternalPrinter()
+    # choose and apply tree to tree algorithm
+    if ezs:
+        from logilab.xmldiff.ezs import EzsCorrector
+        strategy = EzsCorrector(formatter)
+    else:
+        from logilab.xmldiff.fmes import FmesCorrector
+        #import gc
+        #gc.set_debug(gc.DEBUG_LEAK|gc.DEBUG_STATS)
+        strategy = FmesCorrector(formatter)
+    strategy.process_trees(tree1, tree2)
+    return formatter.edit_s
+
+
-
-def compareDirs(actual,expected,skipdirs=[],skipfiles=[]):
@@ -42 +150 @@
-                        return False
-                else:
-
-
+
+
+
-                    if len(result) > 0:
+                        print '#'*80
+                        print filetext1
+                        print '<'*80
+                        print filetext2
+                        print '#'*80
-                        print '%s\n Differences in generated output for %s\n%s' % ('='*70,relpath / file,'='*70)  
-
+
+
-                        print '='*70
-                        return False
@@ -125 +240 @@
-        """ remove all test folders
-        """
-
+#
-    
-if __name__ == "__main__":

branches/timadditionaltypes/setup.py

@@ -1 @@
-
+
+
-setup(name='pyramid',
-2
+3
-      description='Pydotorg Website Build System',
-      author='Tim Parkin',
@@ -7 +8 @@
-      url='http://pyramid.pollenation.net',
-      packages=['pyramid'],
-
+,'pyramid/pyramid'
-      )