Blob Blame History Raw
From c63842257e8b850be9ef7c0f7c96a0f169d5bba3 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 30 Aug 2017 11:33:21 -0400
Subject: [PATCH] Revert "Flask-Common" and flask_limiter

This reverts commit a39de83be1b7330f6a99981bf54152c525847299. We
don't have flask-common in Fedora at the moment. Although this
code looks like it does nothing, it actually *is* used, so this
reversion removes functionality; we should package flask-common.
See https://github.com/kennethreitz/httpbin/issues/381 . This
also drops the bogus requirement for flask_limiter - see
https://github.com/kennethreitz/httpbin/pull/399 .
---
 httpbin/core.py | 4 ----
 setup.py        | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/httpbin/core.py b/httpbin/core.py
index 73adcb6..39516c6 100644
--- a/httpbin/core.py
+++ b/httpbin/core.py
@@ -16,7 +16,6 @@ import uuid
 import argparse
 
 from flask import Flask, Response, request, render_template, redirect, jsonify as flask_jsonify, make_response, url_for
-from flask_common import Common
 from six.moves import range as xrange
 from werkzeug.datastructures import WWWAuthenticate, MultiDict
 from werkzeug.http import http_date
@@ -57,9 +56,6 @@ tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
 app = Flask(__name__, template_folder=tmpl_dir)
 app.debug = bool(os.environ.get('DEBUG'))
 
-# Setup Flask-Common.
-common = Common(app)
-
 # Send app errors to Sentry.
 if 'SENTRY_DSN' in os.environ:
     sentry = Sentry(app, dsn=os.environ['SENTRY_DSN'])
diff --git a/setup.py b/setup.py
index 229d434..7c395c1 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,6 @@ setup(
     include_package_data = True, # include files listed in MANIFEST.in
     install_requires=[
         'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotli',
-        'raven[flask]', 'flask_limiter', 'Flask-Common'
+        'raven[flask]'
     ],
 )
-- 
2.13.5