Refactored flask.py -> flaskext.py. Fixes #6

ColtonProvias · ColtonProvias · commit abab5aac06f1 · 2015-09-16T21:56:50.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: python
 python:
   - "3.4"
+  - "2.7"
+  - "3.5"
 install:
   - "pip install ."
   - "pip install -r requirements.txt"
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # SQLAlchemy-JSONAPI Changelog
 
+## 2.0.1
+
+*2015-09-16*
+
+* Fixed #6 where flask may conflict with flask package on Python 2.7.
+
 ## 2.0.0 - Interface Fix
 
 *2015-08-29*
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 from setuptools import setup
 
 setup(name='SQLAlchemy-JSONAPI',
-      version='2.0.0',
+      version='2.0.1',
       url='http://github.com/coltonprovias/sqlalchemy-jsonapi',
       license='MIT',
       author='Colton J. Provias',
diff --git a/sqlalchemy_jsonapi/__init__.py b/sqlalchemy_jsonapi/__init__.py
@@ -1,4 +1,4 @@
-from .flask import FlaskJSONAPI
+from .flaskext import FlaskJSONAPI
 from .serializer import (JSONAPI, AttributeActions, RelationshipActions,
                          Permissions, attr_descriptor, relationship_descriptor,
                          permission_test)
diff --git a/sqlalchemy_jsonapi/flaskext.py b/sqlalchemy_jsonapi/flaskext.py
diff --git a/sqlalchemy_jsonapi/tests/app.py b/sqlalchemy_jsonapi/tests/app.py
@@ -79,6 +79,7 @@ def view_password(self):
 
     @permission_test(Permissions.EDIT)
     def prevent_edit(self):
+        """ Prevent editing for no reason. """
         if request.view_args['api_type'] == 'posts':
             return True
         return False
