Commit bfcd5842 authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Remove unused url_manager

parent 6e08a31e
...@@ -20,12 +20,6 @@ CELERY_BROKER_URL = "redis://localhost:6379/0" ...@@ -20,12 +20,6 @@ CELERY_BROKER_URL = "redis://localhost:6379/0"
CELERY_TASK_SERIALIZER = "pickle" # do not change CELERY_TASK_SERIALIZER = "pickle" # do not change
CELERY_ACCEPT_CONTENT = ["pickle"] # do not change CELERY_ACCEPT_CONTENT = ["pickle"] # do not change
# this websites address
URL_ROOT = "protokolle.example.com"
URL_PROTO = "https"
URL_PATH = "/"
URL_PARAMS = ""
# CUPS printserver (optional) # CUPS printserver (optional)
PRINTING_ACTIVE = True PRINTING_ACTIVE = True
PRINTING_SERVER = "printsrv.example.com:631" PRINTING_SERVER = "printsrv.example.com:631"
......
...@@ -7,7 +7,7 @@ from enum import Enum ...@@ -7,7 +7,7 @@ from enum import Enum
from uuid import uuid4 from uuid import uuid4
from shared import db, date_filter, date_filter_short, escape_tex, DATE_KEY, START_TIME_KEY, END_TIME_KEY, current_user from shared import db, date_filter, date_filter_short, escape_tex, DATE_KEY, START_TIME_KEY, END_TIME_KEY, current_user
from utils import random_string, url_manager, get_etherpad_url, split_terms, check_ip_in_networks from utils import random_string, get_etherpad_url, split_terms, check_ip_in_networks
from models.errors import DateNotMatchingException from models.errors import DateNotMatchingException
import os import os
......
...@@ -21,7 +21,7 @@ import mimetypes ...@@ -21,7 +21,7 @@ import mimetypes
import config import config
from shared import db, date_filter, datetime_filter, date_filter_long, date_filter_short, time_filter, time_filter_short, user_manager, security_manager, current_user, check_login, login_required, group_required, class_filter, needs_date_test, todostate_name_filter, code_filter, indent_tab_filter from shared import db, date_filter, datetime_filter, date_filter_long, date_filter_short, time_filter, time_filter_short, user_manager, security_manager, current_user, check_login, login_required, group_required, class_filter, needs_date_test, todostate_name_filter, code_filter, indent_tab_filter
from utils import is_past, mail_manager, url_manager, get_first_unused_int, set_etherpad_text, get_etherpad_text, split_terms, optional_int_arg, fancy_join, footnote_hash from utils import is_past, mail_manager, get_first_unused_int, set_etherpad_text, get_etherpad_text, split_terms, optional_int_arg, fancy_join, footnote_hash
from decorators import db_lookup, require_public_view_right, require_private_view_right, require_modify_right, require_publish_right, require_admin_right from decorators import db_lookup, require_public_view_right, require_private_view_right, require_modify_right, require_publish_right, require_admin_right
from models.database import ProtocolType, Protocol, DefaultTOP, TOP, LocalTOP, Document, Todo, Decision, MeetingReminder, Error, TodoMail, DecisionDocument, TodoState, Meta, DefaultMeta, DecisionCategory, Like from models.database import ProtocolType, Protocol, DefaultTOP, TOP, LocalTOP, Document, Todo, Decision, MeetingReminder, Error, TodoMail, DecisionDocument, TodoState, Meta, DefaultMeta, DecisionCategory, Like
from views.forms import LoginForm, ProtocolTypeForm, DefaultTopForm, MeetingReminderForm, NewProtocolForm, DocumentUploadForm, KnownProtocolSourceUploadForm, NewProtocolSourceUploadForm, generate_protocol_form, TopForm, LocalTopForm, SearchForm, DecisionSearchForm, ProtocolSearchForm, TodoSearchForm, NewProtocolFileUploadForm, NewTodoForm, TodoForm, TodoMailForm, DefaultMetaForm, MetaForm, MergeTodosForm, DecisionCategoryForm, DocumentEditForm from views.forms import LoginForm, ProtocolTypeForm, DefaultTopForm, MeetingReminderForm, NewProtocolForm, DocumentUploadForm, KnownProtocolSourceUploadForm, NewProtocolSourceUploadForm, generate_protocol_form, TopForm, LocalTopForm, SearchForm, DecisionSearchForm, ProtocolSearchForm, TodoSearchForm, NewProtocolFileUploadForm, NewTodoForm, TodoForm, TodoMailForm, DefaultMetaForm, MetaForm, MergeTodosForm, DecisionCategoryForm, DocumentEditForm
...@@ -54,7 +54,7 @@ app.jinja_env.filters["timify"] = time_filter ...@@ -54,7 +54,7 @@ app.jinja_env.filters["timify"] = time_filter
app.jinja_env.filters["timify_short"] = time_filter_short app.jinja_env.filters["timify_short"] = time_filter_short
app.jinja_env.filters["datify_short"] = date_filter_short app.jinja_env.filters["datify_short"] = date_filter_short
app.jinja_env.filters["datify_long"] = date_filter_long app.jinja_env.filters["datify_long"] = date_filter_long
app.jinja_env.filters["url_complete"] = url_manager.complete #app.jinja_env.filters["url_complete"] = url_manager.complete
app.jinja_env.filters["class"] = class_filter app.jinja_env.filters["class"] = class_filter
app.jinja_env.filters["todo_get_name"] = todostate_name_filter app.jinja_env.filters["todo_get_name"] = todostate_name_filter
app.jinja_env.filters["code"] = code_filter app.jinja_env.filters["code"] = code_filter
......
...@@ -12,7 +12,7 @@ from models.database import Document, Protocol, Error, Todo, Decision, TOP, Defa ...@@ -12,7 +12,7 @@ from models.database import Document, Protocol, Error, Todo, Decision, TOP, Defa
from models.errors import DateNotMatchingException 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, encode_kwargs, decode_kwargs, add_line_numbers, set_etherpad_text, get_etherpad_text, footnote_hash
from protoparser 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
...@@ -31,7 +31,7 @@ texenv.filters["escape_tex"] = escape_tex ...@@ -31,7 +31,7 @@ texenv.filters["escape_tex"] = escape_tex
texenv.filters["unhyphen"] = unhyphen texenv.filters["unhyphen"] = unhyphen
texenv.trim_blocks = True texenv.trim_blocks = True
texenv.lstrip_blocks = True texenv.lstrip_blocks = True
texenv.filters["url_complete"] = url_manager.complete #texenv.filters["url_complete"] = url_manager.complete
texenv.filters["datify"] = date_filter texenv.filters["datify"] = date_filter
texenv.filters["datify_long"] = date_filter_long texenv.filters["datify_long"] = date_filter_long
texenv.filters["datify_short"] = date_filter_short texenv.filters["datify_short"] = date_filter_short
...@@ -60,7 +60,7 @@ texenv.globals["latex_header_footer"] = latex_header_footer ...@@ -60,7 +60,7 @@ texenv.globals["latex_header_footer"] = latex_header_footer
mailenv = app.create_jinja_environment() mailenv = app.create_jinja_environment()
mailenv.trim_blocks = True mailenv.trim_blocks = True
mailenv.lstrip_blocks = True mailenv.lstrip_blocks = True
mailenv.filters["url_complete"] = url_manager.complete #mailenv.filters["url_complete"] = url_manager.complete
mailenv.filters["datify"] = date_filter mailenv.filters["datify"] = date_filter
mailenv.filters["datetimify"] = datetime_filter mailenv.filters["datetimify"] = datetime_filter
......
...@@ -63,7 +63,7 @@ class UrlManager: ...@@ -63,7 +63,7 @@ class UrlManager:
params = match.group("params") or self.params params = match.group("params") or self.params
return self.base.format(proto, root, path, "?" + params if len(params) > 0 else "") return self.base.format(proto, root, path, "?" + params if len(params) > 0 else "")
url_manager = UrlManager(config) #url_manager = UrlManager(config)
class MailManager: class MailManager:
def __init__(self, config): def __init__(self, config):
......
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