diff --git a/pywb/apps/cdx_server.py b/pywb/apps/cdx_server.py index 396d5490..b3149c32 100644 --- a/pywb/apps/cdx_server.py +++ b/pywb/apps/cdx_server.py @@ -13,6 +13,7 @@ application = init_app(create_cdx_server_app, load_yaml=True, config_file=DEFAULT_CONFIG) + def main(): start_wsgi_server(application, 'CDX Server') diff --git a/pywb/apps/wayback.py b/pywb/apps/wayback.py index 82a3ca19..6d276b66 100644 --- a/pywb/apps/wayback.py +++ b/pywb/apps/wayback.py @@ -6,6 +6,7 @@ from pywb.core.pywb_init import create_wb_router #================================================================= application = init_app(create_wb_router, load_yaml=True) + def main(): start_wsgi_server(application, 'Wayback') diff --git a/pywb/core/cdx_handler.py b/pywb/core/cdx_api_handler.py similarity index 100% rename from pywb/core/cdx_handler.py rename to pywb/core/cdx_api_handler.py diff --git a/pywb/core/pywb_init.py b/pywb/core/pywb_init.py index c46c06c2..55ea8a20 100644 --- a/pywb/core/pywb_init.py +++ b/pywb/core/pywb_init.py @@ -16,7 +16,7 @@ from query_handler import QueryHandler from handlers import WBHandler from handlers import StaticHandler from handlers import DebugEchoHandler, DebugEchoEnvHandler -from cdx_handler import CDXAPIHandler +from cdx_api_handler import CDXAPIHandler import os diff --git a/pywb/core/indexreader.py b/pywb/core/query_handler.py similarity index 100% rename from pywb/core/indexreader.py rename to pywb/core/query_handler.py diff --git a/pywb/core/views.py b/pywb/core/views.py index 760c07ef..244746f8 100644 --- a/pywb/core/views.py +++ b/pywb/core/views.py @@ -9,18 +9,6 @@ from itertools import imap from jinja2 import Environment, FileSystemLoader, PackageLoader -#================================================================= -class StaticTextView: - def __init__(self, text): - self.text = text - - def render_to_string(self, **kwargs): - return self.text - - def render_response(self, **kwargs): - return WbResponse.text_stream(self.text) - - #================================================================= class J2TemplateView: def __init__(self, filename):