Skip to content

Commit

Permalink
linting
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Apr 7, 2016
1 parent 7525ab7 commit 28d9454
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions caravel/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ def slice_url(self):
slice_params['slice_name'] = self.slice_name
from werkzeug.urls import Href
href = Href(
"/caravel/explore/{self.datasource_type}/"
"{self.datasource_id}/".format(self=self))
"/caravel/explore/{obj.datasource_type}/"
"{obj.datasource_id}/".format(obj=self))
return href(slice_params)

@property
Expand All @@ -206,8 +206,8 @@ def edit_url(self):
@property
def slice_link(self):
url = self.slice_url
return '<a href="{url}">{self.slice_name}</a>'.format(
url=url, self=self)
return '<a href="{url}">{obj.slice_name}</a>'.format(
url=url, obj=self)


dashboard_slices = Table(
Expand Down Expand Up @@ -248,7 +248,7 @@ def metadata_dejson(self):
return {}

def dashboard_link(self):
return '<a href="{self.url}">{self.dashboard_title}</a>'.format(self=self)
return '<a href="{obj.url}">{obj.dashboard_title}</a>'.format(obj=self)

@property
def json_data(self):
Expand Down Expand Up @@ -436,12 +436,12 @@ def link(self):
@property
def perm(self):
return (
"[{self.database}].[{self.table_name}]"
"(id:{self.id})").format(self=self)
"[{obj.database}].[{obj.table_name}]"
"(id:{obj.id})").format(obj=self)

@property
def full_name(self):
return "[{self.database}].[{self.table_name}]".format(self=self)
return "[{obj.database}].[{obj.table_name}]".format(obj=self)

@property
def dttm_cols(self):
Expand Down Expand Up @@ -476,11 +476,11 @@ def explore_url(self):
if self.default_endpoint:
return self.default_endpoint
else:
return "/caravel/explore/{self.type}/{self.id}/".format(self=self)
return "/caravel/explore/{obj.type}/{obj.id}/".format(obj=self)

@property
def table_link(self):
return '<a href="{self.explore_url}">{self.table_name}</a>'.format(self=self)
return '<a href="{obj.explore_url}">{obj.table_name}</a>'.format(obj=self)

@property
def metrics_combo(self):
Expand Down Expand Up @@ -820,9 +820,9 @@ def get_pydruid_client(self):

def refresh_datasources(self):
endpoint = (
"http://{self.coordinator_host}:{self.coordinator_port}/"
"{self.coordinator_endpoint}/datasources"
).format(self=self)
"http://{obj.coordinator_host}:{obj.coordinator_port}/"
"{obj.coordinator_endpoint}/datasources"
).format(obj=self)

datasources = json.loads(requests.get(endpoint).text)
for datasource in datasources:
Expand Down Expand Up @@ -866,8 +866,8 @@ def name(self):
@property
def perm(self):
return (
"[{self.cluster_name}].[{self.datasource_name}]"
"(id:{self.id})").format(self=self)
"[{obj.cluster_name}].[{obj.datasource_name}]"
"(id:{obj.id})").format(obj=self)

@property
def url(self):
Expand All @@ -882,17 +882,17 @@ def link(self):
@property
def full_name(self):
return (
"[{self.cluster_name}]."
"[{self.datasource_name}]").format(self=self)
"[{obj.cluster_name}]."
"[{obj.datasource_name}]").format(obj=self)

def __repr__(self):
return self.datasource_name

@property
def datasource_link(self):
url = "/caravel/explore/{self.type}/{self.id}/".format(self=self)
return '<a href="{url}">{self.datasource_name}</a>'.format(
url=url, self=self)
url = "/caravel/explore/{obj.type}/{obj.id}/".format(obj=self)
return '<a href="{url}">{obj.datasource_name}</a>'.format(
url=url, obj=self)

def get_metric_obj(self, metric_name):
return [
Expand Down

0 comments on commit 28d9454

Please sign in to comment.