Commit 45f7ff40 authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Rename parser -> protoparser

Avoids a name clash in celery
/close #143
parent a8125ec6
...@@ -13,7 +13,7 @@ from models.errors import DateNotMatchingException ...@@ -13,7 +13,7 @@ from models.errors import DateNotMatchingException
from server import celery, app from server import celery, app
from shared import db, escape_tex, unhyphen, date_filter, datetime_filter, date_filter_long, date_filter_short, time_filter, class_filter, KNOWN_KEYS from shared import db, escape_tex, unhyphen, date_filter, datetime_filter, date_filter_long, date_filter_short, time_filter, class_filter, KNOWN_KEYS
from utils import mail_manager, url_manager, encode_kwargs, decode_kwargs, add_line_numbers, set_etherpad_text, get_etherpad_text, footnote_hash from utils import mail_manager, url_manager, encode_kwargs, decode_kwargs, add_line_numbers, set_etherpad_text, get_etherpad_text, footnote_hash
from parser import parse, ParserException, Element, Content, Text, Tag, Remark, Fork, RenderType from protoparser import parse, ParserException, Element, Content, Text, Tag, Remark, Fork, RenderType
from wiki import WikiClient, WikiException from wiki import WikiClient, WikiException
from calendarpush import Client as CalendarClient, CalendarException from calendarpush import Client as CalendarClient, CalendarException
from legacy import lookup_todo_id, import_old_todos from legacy import lookup_todo_id, import_old_todos
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment