tree_parse.py
author Tero Marttila <terom@fixme.fi>
Mon, 16 Feb 2009 19:08:17 +0200
changeset 78 a46d2fc07951
parent 77 bef7196f7682
permissions -rw-r--r--
add test for tree_parse filesystem stuff
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     1
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     2
"""
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     3
    Parsing trees of node stored using a python-like syntax.
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     4
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     5
    A file consists of a number of lines, and each line consists of indenting whitespace and data. Each line has a parent
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     6
"""
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     7
17
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
     8
class TreeParseError (Exception) :
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
     9
    """
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
    10
        Error parsing a tree file
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
    11
    """
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
    12
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
    13
    pass
b538e1f7011c add some better error checking to the page_tree stuff
Tero Marttila <terom@fixme.fi>
parents: 16
diff changeset
    14
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    15
def _read_lines (file, stop_tokens=None, charset='utf8') :
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    16
    """
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    17
        Reads lines from the given path, ignoring empty lines, and yielding (line_number, indent, line) tuples, where 
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    18
        line_number is the line number, indent counts the amount of leading whitespace, and line is the actual line
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    19
        data with whitespace stripped.
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    20
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    21
        File is either a str with the filesystem path, or a something that supports iterating over lines. 
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    22
        
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    23
        Charset is what to decode the lines with, or pass None to not decode.
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    24
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    25
        Stop tokens is a list of chars to stop counting indentation on - if such a line begins with such a char, its
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    26
        indentation is taken as zero. Ignored if empty.
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    27
    """
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    28
    
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    29
    # open path?
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    30
    if isinstance(file, str) :
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    31
        file = open(file, 'rb')
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    32
    
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    33
    # iterate over lines
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    34
    for line_number, line in enumerate(file) :
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    35
        if charset :
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    36
            # decode to unicode
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    37
            line = line.decode(charset)
21
b05979822dee some unicode fixes, layout tweaks, a link icon
Tero Marttila <terom@fixme.fi>
parents: 17
diff changeset
    38
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    39
        indent = 0
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    40
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    41
        # count indent
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    42
        for char in line :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    43
            # tabs break things
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    44
            assert char != '\t'
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    45
            
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    46
            # increment up to first non-space char
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    47
            if char == ' ' :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    48
                indent += 1
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    49
            
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    50
            elif stop_tokens and char in stop_tokens :
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    51
                # consider line as not having any indentation at all
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    52
                indent = 0
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    53
                break
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    54
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    55
            else :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    56
                break
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    57
        
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    58
        # strip whitespace
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    59
        line = line.strip()
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    60
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    61
        # ignore empty lines
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    62
        if not line :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    63
            continue
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    64
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    65
        # yield
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    66
        yield line_number + 1, indent, line
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    67
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    68
def parse (file, stop_tokens='', charset='utf8') :
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    69
    """
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    70
        Reads and parses the file at the given path, returning a list of (line_number, line, children) tuples.
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    71
    """
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    72
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    73
    # stack of (indent, PageInfo) items
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    74
    stack = []
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    75
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    76
    # the root item
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    77
    root = None
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    78
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    79
    # the previous item processed, None for first one
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    80
    prev = None
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    81
    
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    82
    # read lines
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
    83
    for line_number, indent, line in _read_lines(file, stop_tokens, charset) :
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    84
        # create item
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    85
        item = (line_number, line, [])
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    86
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    87
        # are we the first item?
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    88
        if not prev :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    89
            # root node does not have a parent
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    90
            parent = None
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    91
            
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    92
            # set root
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    93
            root = item
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    94
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    95
            # initialize stack
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    96
            stack.append((0, root))
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    97
            
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    98
        else :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    99
            # peek stack
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   100
            stack_indent, stack_parent = stack[-1]
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   101
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   102
            # new indent level?
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   103
            if indent > stack_indent :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   104
                # set parent to previous item, and push new indent level + parent to stack
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   105
                parent = prev
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   106
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   107
                # push new indent level + its parent
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   108
                stack.append((indent, parent))
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   109
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   110
            # same indent level as previous
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   111
            elif indent == stack_indent :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   112
                # parent is the one of the current stack level, stack doesn't change
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   113
                parent = stack_parent
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   114
            
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   115
            # unravel stack
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   116
            elif indent < stack_indent :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   117
                while True :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   118
                    # remove current stack level
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   119
                    stack.pop(-1)
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   120
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   121
                    # peek next level
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   122
                    stack_indent, stack_parent = stack[-1]
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   123
                    
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   124
                    # found the level to return to?
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   125
                    if stack_indent == indent :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   126
                        # restore prev
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   127
                        parent = stack_parent
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   128
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   129
                        break
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   130
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   131
                    elif stack_indent < indent :
77
bef7196f7682 add tree_parse test and fix treeparse to handle other than filesystem paths
Tero Marttila <terom@fixme.fi>
parents: 46
diff changeset
   132
                        raise TreeParseError("Bad unindent on %s:%d, %d < %d" % (file, line_number, stack_indent, indent))
16
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   133
        
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   134
        # add to parent?
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   135
        if parent :
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   136
            parent[2].append(item)
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   137
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   138
        # update prev
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   139
        prev = item
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   140
    
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   141
    # return the root
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   142
    return root
4a40718c7b4b better error handling of import errors in CGI, and split PageTree out from page.py into page_tree.py and tree_parse.py
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   143