@@ -409,24 +409,24 @@ def chart_marker(marker, color, dataset_index, data_point, size): marker = marker_types.get(marker, marker) return {"chm": smart_join(",", marker, color, dataset_index, data_point, size)} -@option("chart-makers", multi="|") +@option("chart-markers", multi="|") def chart_markers(dataset_index, iterable): """Provide an iterable yielding (type, color, point, size)""" try: it = iter(iterable) except TypeError: return {} - + markers = [] for m in it: try: - marker, color, point, size = m + marker, color, data_point, size = m except ValueError: continue - marker - marker_types.get(marker, marker) + marker = marker_types.get(marker, marker) markers.append(smart_join(",", marker, color, dataset_index, data_point, size)) - - return {"chm": smart_join("|", markers)} + + return {"chm": smart_join("|", *flatten(markers))} @option("chart-map-area") def chart_map_area(where): googlecharts/templatetags/charts.py 562c0e5a4d6e65b78900d016293defd1158bd10f palewire ben.welsh@latimes.com http://github.com/jacobian/django-googlecharts/commit/9bbb63d5b89dbab11c172c63d1b2702af95105a2 9bbb63d5b89dbab11c172c63d1b2702af95105a2 2009-01-09T12:43:10-08:00 2009-01-09T12:33:50-08:00 Fixed some itty bitty problems with chart_markers Signed-off-by: Jacob Kaplan-Moss <jacob@jacobian.org> 558d5fdc1606776fd96f57f0561e9823e23d53fc Jacob Kaplan-Moss jacob@jacobian.org