Skip to content

Commit

Permalink
Refactored Breadcrumb
Browse files Browse the repository at this point in the history
  • Loading branch information
PonteIneptique committed May 17, 2016
1 parent 014be35 commit 17ba588
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion flask_nemo/__init__.py
Expand Up @@ -23,7 +23,7 @@
import flask_nemo._data
import flask_nemo.filters
from flask_nemo.chunker import default_chunker as __default_chunker__
from flask_nemo.default import Breadcrumb
from flask_nemo.plugins.default import Breadcrumb
from flask_nemo.common import resource_qualifier, ASSETS_STRUCTURE


Expand Down
2 changes: 0 additions & 2 deletions flask_nemo/plugins/annotations_api.py
Expand Up @@ -52,7 +52,6 @@ def r_annotations_by_target(self,target_urn):
response['annotations'] = mapped
return jsonify(response)


def r_annotation_get(self,uri):
""" Route to retrieve contents of an annotation resource
:param uri: The uri of the annotation resource
Expand All @@ -67,4 +66,3 @@ def r_annotation_get(self,uri):
# set appropriate Content-Type headers
# and return the actual content
return jsonify(annotation)

File renamed without changes.
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -3,7 +3,7 @@
setup(
name='flask_nemo',
version="1.0.0a",
packages=find_packages(exclude=["examples"]),
packages=find_packages(exclude=["examples", "tests"]),
url='https://github.com/capitains/flask-capitains-nemo',
license='GNU GPL',
author='Thibault Clerice',
Expand All @@ -25,4 +25,4 @@
},
include_package_data=True,
zip_safe=False
)
)
2 changes: 1 addition & 1 deletion tests/test_default/test_breadcrumb.py
@@ -1,6 +1,6 @@
from ..resources import NemoResource
from mock import patch
from flask_nemo.default import Breadcrumb
from flask_nemo.plugins.default import Breadcrumb


class TestBreadcrumb(NemoResource):
Expand Down
1 change: 1 addition & 0 deletions tests/test_plugins/resources.py
@@ -1,6 +1,7 @@
from flask import Flask
from flask_nemo import Nemo


def make_client(*args, **kwargs):
app = Flask("Nemo")
app.debug = True
Expand Down
1 change: 0 additions & 1 deletion tests/test_plugins/test_annotations_api.py
Expand Up @@ -12,7 +12,6 @@ def setUp(self):
self.ann_plugin = AnnotationsApiPlugin(name="testplugin",queryinterface=QueryPrototype(lambda x:x))
self.client = make_client(self.ann_plugin)


def test_route_by_target_valid_urn(self):
""" Check empty response for valid urn target (given prototype query interface which knows nothing)
"""
Expand Down
2 changes: 1 addition & 1 deletion tests/test_routes.py
Expand Up @@ -5,7 +5,7 @@
from .resources import NemoResource
from .test_controller import NemoTestControllers
from flask_nemo import Nemo
from flask_nemo.default import Breadcrumb
from flask_nemo.plugins.default import Breadcrumb
from flask import Markup, Flask
from lxml import etree
from mock import Mock, patch, call
Expand Down

0 comments on commit 17ba588

Please sign in to comment.