testing a new API

8 files changed, 9 insertions, 8 deletions

diff --git a/src/web/views/__init__.py b/src/web/views/__init__.py
index 6de83818..4af8975b 100644
--- a/src/web/views/__init__.py
+++ b/src/web/views/__init__.py
@@ -1,4 +1,5 @@
-from web.views import views, home, session_mgmt, api
+from web.views.api import v2
+from web.views import views, home, session_mgmt
 from web.views.article import article_bp, articles_bp
 from web.views.feed import feed_bp, feeds_bp
 from web.views.category import category_bp, categories_bp
@@ -6,7 +7,7 @@ from web.views.icon import icon_bp
 from web.views.admin import admin_bp
 from web.views.user import user_bp, users_bp
 
-__all__ = ['views', 'home', 'session_mgmt', 'api',
+__all__ = ['views', 'home', 'session_mgmt', 'v2',
            'article_bp', 'articles_bp', 'feed_bp', 'feeds_bp',
            'category_bp', 'categories_bp', 'icon_bp',
            'admin_bp', 'user_bp', 'users_bp']
diff --git a/src/web/views/api/__init__.py b/src/web/views/api/__init__.py
index 458e031b..e69de29b 100644
--- a/src/web/views/api/__init__.py
+++ b/src/web/views/api/__init__.py
@@ -1,3 +0,0 @@
-from web.views.api import article, feed, category
-
-__all__ = ['article', 'feed', 'category']
diff --git a/src/web/views/api/v2/__init__.py b/src/web/views/api/v2/__init__.py
new file mode 100644
index 00000000..46760261
--- /dev/null
+++ b/src/web/views/api/v2/__init__.py
@@ -0,0 +1,3 @@
+from web.views.api.v2 import article, feed, category
+
+__all__ = ['article', 'feed', 'category']
diff --git a/src/web/views/api/article.py b/src/web/views/api/v2/article.py
index 5971f47d..71201538 100644
--- a/src/web/views/api/article.py
+++ b/src/web/views/api/v2/article.py
@@ -6,7 +6,7 @@ from flask.ext.restful import Api
 
 from web.views.common import api_permission
 from web.controllers import ArticleController
-from web.views.api.common import (PyAggAbstractResource,
+from web.views.api.v2.common import (PyAggAbstractResource,
         PyAggResourceNew, PyAggResourceExisting, PyAggResourceMulti)
 
 
diff --git a/src/web/views/api/category.py b/src/web/views/api/v2/category.py
index eecfa785..21459fc5 100644
--- a/src/web/views/api/category.py
+++ b/src/web/views/api/v2/category.py
@@ -3,7 +3,7 @@ from flask import current_app
 from flask.ext.restful import Api
 
 from web.controllers.category import CategoryController
-from web.views.api.common import (PyAggResourceNew,
+from web.views.api.v2.common import (PyAggResourceNew,
                                   PyAggResourceExisting,
                                   PyAggResourceMulti)
 
diff --git a/src/web/views/api/common.py b/src/web/views/api/v2/common.py
index ace6ba3a..ace6ba3a 100644
--- a/src/web/views/api/common.py
+++ b/src/web/views/api/v2/common.py
diff --git a/src/web/views/api/feed.py b/src/web/views/api/v2/feed.py
index 774bff5f..686dcd76 100644
--- a/src/web/views/api/feed.py
+++ b/src/web/views/api/v2/feed.py
@@ -8,7 +8,7 @@ from web.controllers.feed import (FeedController,
                                   DEFAULT_LIMIT,
                                   DEFAULT_REFRESH_RATE)
 
-from web.views.api.common import PyAggAbstractResource, \
+from web.views.api.v2.common import PyAggAbstractResource, \
                                  PyAggResourceNew, \
                                  PyAggResourceExisting, \
                                  PyAggResourceMulti
diff --git a/src/web/views/api/v3/__init__.py b/src/web/views/api/v3/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/web/views/api/v3/__init__.py