From caf88ab7e730939f79894be205a6309358415a3e Mon Sep 17 00:00:00 2001 From: Pavel Lutskov Date: Sun, 10 Jun 2018 13:07:28 +0200 Subject: [PATCH] Made read_config robuster against CWD --- pykick/imagereaders.py | 5 ++++- pykick/utils.py | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pykick/imagereaders.py b/pykick/imagereaders.py index 0a77967..8ac0f2a 100644 --- a/pykick/imagereaders.py +++ b/pykick/imagereaders.py @@ -2,7 +2,10 @@ from __future__ import division import numpy as np import cv2 -from naoqi import ALProxy +try: + from naoqi import ALProxy +except: + ALProxy = None class NaoImageReader(object): diff --git a/pykick/utils.py b/pykick/utils.py index 1309631..0da75a9 100644 --- a/pykick/utils.py +++ b/pykick/utils.py @@ -1,7 +1,11 @@ +import os import json -def read_config(): - with open('nao_defaults.json') as f: +HERE = os.path.dirname(os.path.realpath(__file__)) + + +def read_config(cfg_file=os.path.join(HERE, 'nao_defaults.json')): + with open(cfg_file) as f: cfg = json.load(f) return cfg