diff -r 1dc58f44d556 -r 8eb83f200486 parse.py --- a/parse.py Mon Dec 11 00:46:35 2017 +0200 +++ b/parse.py Tue Dec 12 11:50:18 2017 +0200 @@ -1,7 +1,7 @@ import linetypes import re from geometry import * -from ldraw import Color +from ldraw import Colour class BadLdrawLine(Exception): pass @@ -34,19 +34,19 @@ raise BadLdrawLine('unable to parse') groups = list(match.groups()) indices = { - 'color_index': 0, + 'colour_index': 0, 'anchor': slice(1, 4), 'matrix': slice(4, 13), 'subfile_path': 13 } try: - color = Color(groups[indices['color_index']]) + colour = Colour(groups[indices['colour_index']]) vertex_values = [float(x) for x in groups[indices['anchor']]] matrix_values = [float(x) for x in groups[indices['matrix']]] except ValueError: raise BadLdrawLine('bad numeric values') return linetypes.SubfileReference( - color = color, + colour = colour, anchor = Vertex(*vertex_values), matrix = TransformationMatrix(matrix_values), subfile_path = groups[indices['subfile_path']] @@ -73,35 +73,35 @@ raise BadLdrawLine('bad numeric values') vertices.append(Vertex(*coordinates)) return { - 'color': Color(match.group(1)), + 'colour': Colour(match.group(1)), 'vertices': vertices, } def parse_ldraw_line(line): parse_result = generic_parse_polygon(line, type_code = 2, vertex_count = 2) return linetypes.LineSegment( - color = parse_result['color'], + colour = parse_result['colour'], geometry = LineSegment(*parse_result['vertices']), ) def parse_ldraw_triangle(line): parse_result = generic_parse_polygon(line, type_code = 3, vertex_count = 3) return linetypes.Triangle( - color = parse_result['color'], + colour = parse_result['colour'], geometry = Polygon(parse_result['vertices']), ) def parse_ldraw_quadrilateral(line): parse_result = generic_parse_polygon(line, type_code = 4, vertex_count = 4) return linetypes.Quadrilateral( - color = parse_result['color'], + colour = parse_result['colour'], geometry = Polygon(parse_result['vertices']), ) def parse_ldraw_contour(line): parse_result = generic_parse_polygon(line, type_code = 5, vertex_count = 4) return linetypes.Contour( - color = parse_result['color'], + colour = parse_result['colour'], geometry = LineSegment(*parse_result['vertices'][0:2]), control_points = parse_result['vertices'][2:], )