From a442b8e0ee8b2d0b8083386137f83dcb02358e45 Mon Sep 17 00:00:00 2001 From: Martin Zimmermann Date: Fri, 8 Nov 2013 19:03:08 +0100 Subject: [PATCH] remove dead code --- isso/__init__.py | 24 +----------------------- isso/utils/http.py | 2 -- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/isso/__init__.py b/isso/__init__.py index 41d56a7..58614f6 100644 --- a/isso/__init__.py +++ b/isso/__init__.py @@ -46,11 +46,6 @@ import logging from os.path import dirname, join from argparse import ArgumentParser -try: - import httplib -except ImportError: - import http.client as httplib - import misaka from itsdangerous import URLSafeTimedSerializer @@ -61,7 +56,7 @@ from werkzeug.wsgi import SharedDataMiddleware from werkzeug.serving import run_simple, WSGIRequestHandler from werkzeug.contrib.fixers import ProxyFix -from isso import db, migrate, views, wsgi +from isso import db, migrate, wsgi from isso.core import ThreadedMixin, uWSGIMixin, Config from isso.utils import parse, http, JSONRequest from isso.views import comments @@ -92,23 +87,6 @@ class Isso(object): Rule('/check-ip', endpoint=comments.checkip) ]) - @classmethod - def CORS(cls, request, response, hosts): - for host in hosts: - if request.environ.get("HTTP_ORIGIN", None) == host.rstrip("/"): - origin = host.rstrip("/") - break - else: - origin = host.rstrip("/") - - hdrs = response.headers - hdrs["Access-Control-Allow-Origin"] = origin - hdrs["Access-Control-Allow-Headers"] = "Origin, Content-Type" - hdrs["Access-Control-Allow-Credentials"] = "true" - hdrs["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE" - - return response - def __init__(self, conf): self.conf = conf diff --git a/isso/utils/http.py b/isso/utils/http.py index f579c4b..cbd179c 100644 --- a/isso/utils/http.py +++ b/isso/utils/http.py @@ -2,8 +2,6 @@ import socket -from contextlib import closing - try: import httplib except ImportError: