Skip to content

fixed wrong import #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cehberlin wants to merge 2 commits into
base: gopher-devel
Choose a base branch
from
Open

fixed wrong import #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
821e940
fixed wrong import
cehberlin Aug 31, 2017
3f07a88
fixed wrong local imports, made them global
cehberlin Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rostful/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def pyros_start(config, ros_args='', pyros_ctx_impl=None):
try:
from pyros.server.ctx_server import pyros_ctx
from pyros.client.client import PyrosClient
from pyros_interfaces_ros import PyrosROS
from pyros_interfaces_ros.pyros_ros import PyrosROS

except Exception as e:
logging.error("pyros module is not accessible in sys.path. It is required to run rostful.", exc_info=True)
Expand Down
7 changes: 3 additions & 4 deletions rostful/api_0_1/flask_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ def get_query_bool(query_string, param_name):

from webargs.flaskparser import FlaskParser, use_kwargs

from pyros_interfaces_ros import definitions
from pyros.client.client import PyrosServiceTimeout, PyrosServiceNotFound

parser = FlaskParser()

import urllib
Expand Down Expand Up @@ -102,10 +105,6 @@ class BackEnd(restful.Resource): # TODO : unit test that stuff !!! http://flas
def __init__(self):
super(BackEnd, self).__init__()

# dynamic import
from pyros_interfaces_ros import definitions
from pyros.client.client import PyrosServiceTimeout, PyrosServiceNotFound

self.node_client = context.get_pyros_client() # we retrieve pyros client from app context

# TODO: think about login rest service before disabling REST services if not logged in
Expand Down