From fd1e5fe4d9fe014cfdf90fdaa3cca1a780949aa9 Mon Sep 17 00:00:00 2001
From: Alexandre Ferland <alf@pixmob.com>
Date: Sun, 5 Jun 2016 00:43:54 -0400
Subject: [PATCH] drop flask 0.9 support, remove unused code
---
.travis.yml | 1 -
README.md | 2 +-
docs/index.rst | 2 +-
flask_simpleldap/__init__.py | 5 -----
setup.py | 2 +-
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 951eaf4..ac4ff93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ python:
env:
- FLASK=0.11
- FLASK=0.10.1
- - FLASK=0.9
install:
- pip install Flask==$FLASK
- pip install -r dev_requirements.txt
diff --git a/README.md b/README.md
index 722f405..9909b43 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ First, install Flask-SimpleLDAP:
$ pip install flask-simpleldap
Flask-SimpleLDAP depends, and will install for you, recent versions of Flask
-(0.9 or later) and [pyldap](https://github.com/pyldap/pyldap). Flask-SimpleLDAP is compatible
+(0.10.1 or later) and [pyldap](https://github.com/pyldap/pyldap). Flask-SimpleLDAP is compatible
with and tested on Python 2.7, 3.4 and 3.5.
Next, add a ``LDAP`` instance to your code and at least the three
diff --git a/docs/index.rst b/docs/index.rst
index ada76e8..9e130a9 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,7 +19,7 @@ First, install Flask-SimpleLDAP:
$ pip install flask-simpleldap
Flask-SimpleLDAP depends, and will install for you, recent versions of Flask
-(0.9 or later) and pyldap. Flask-SimpleLDAP is compatible
+(0.10.1 or later) and pyldap. Flask-SimpleLDAP is compatible
with and tested on Python 2.7, 3.4 and 3.5.
Next, add a :class:`~flask_simpleldap.LDAP` to your code and at least the three
diff --git a/flask_simpleldap/__init__.py b/flask_simpleldap/__init__.py
index 843097c..76584c4 100644
--- a/flask_simpleldap/__init__.py
+++ b/flask_simpleldap/__init__.py
@@ -8,11 +8,6 @@ from flask import abort, current_app, g, make_response, redirect, url_for, \
__all__ = ['LDAP']
-try:
- from flask import _app_ctx_stack as stack
-except ImportError:
- from flask import _request_ctx_stack as stack
-
class LDAPException(RuntimeError):
message = None
diff --git a/setup.py b/setup.py
index b36df43..fd8959f 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
include_package_data=True,
platforms='any',
install_requires=[
- 'Flask>=0.10',
+ 'Flask>=0.10.1',
'pyldap'
],
classifiers=[
--
GitLab