valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 17:38:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: import should be global

Browse Source
This commit is contained in:
Arik Fraimovich 2015-03-08 12:23:51 +02:00
parent 40335a0e21
commit fca034ac0d
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
redash/query_runner/big_query.py
View File

@ -10,6 +10,19 @@ from redash.utils import JSONEncoder
logger = logging.getLogger(__name__)
try:
import apiclient.errors
from apiclient.discovery import build
from apiclient.errors import HttpError
from oauth2client.client import SignedJwtAssertionCredentials
enabled = True
except ImportError:
logger.warning("Missing dependencies. Please install google-api-python-client and oauth2client.")
logger.warning("You can use pip: pip install google-api-python-client oauth2client")
enabled = False
types_map = {
'INTEGER': TYPE_INTEGER,
'FLOAT': TYPE_FLOAT,
@ -45,21 +58,6 @@ def transform_row(row, fields):
return row_data
def _import():
try:
import apiclient.errors
from apiclient.discovery import build
from apiclient.errors import HttpError
from oauth2client.client import SignedJwtAssertionCredentials
return True
except ImportError:
logger.warning("Missing dependencies. Please install google-api-python-client and oauth2client.")
logger.warning("You can use pip: pip install google-api-python-client oauth2client")
return False
def _load_key(filename):
f = file(filename, "rb")
try:
@ -93,7 +91,7 @@ def _get_query_results(jobs, project_id, job_id, start_index):
class BigQuery(BaseQueryRunner):
@classmethod
def enabled(cls):
return _import()
return enabled
@classmethod
def configuration_schema(cls):
@ -118,7 +116,6 @@ class BigQuery(BaseQueryRunner):
def __init__(self, configuration_json):
super(BigQuery, self).__init__(configuration_json)
_import()
self.private_key = _load_key(self.configuration["privateKey"])

22
redash/query_runner/mongodb.py
View File

@ -9,18 +9,15 @@ from redash.query_runner import *
logger = logging.getLogger(__name__)
try:
import pymongo
from bson.objectid import ObjectId
enabled = True
def _import():
try:
import pymongo
from bson.objectid import ObjectId
return True
except ImportError:
logger.warning("Missing dependencies. Please install pymongo.")
logger.warning("You can use pip: pip install pymongo")
return False
except ImportError:
logger.warning("Missing dependencies. Please install pymongo.")
logger.warning("You can use pip: pip install pymongo")
enabled = False
TYPES_MAP = {
@ -77,14 +74,13 @@ class MongoDB(BaseQueryRunner):
@classmethod
def enabled(cls):
return _import()
return enabled
@classmethod
def annotate_query(cls):
return False
def __init__(self, configuration_json):
_import()
super(MongoDB, self).__init__(configuration_json)
self.db_name = self.configuration["dbName"]