Skip to content

Commit

Permalink
Updating accessor code so system tests update.
Browse files Browse the repository at this point in the history
Based on removing many @Property's since not used
in upstream.
  • Loading branch information
dhermes committed Dec 16, 2015
1 parent 08b901e commit f168b90
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gcloud_bigtable/column_family.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def client(self):
:rtype: :class:`.client.Client`
:returns: The client that owns this column family.
"""
return self.table.client
return self.table._cluster._client

@property
def timeout_seconds(self):
Expand All @@ -207,7 +207,7 @@ def timeout_seconds(self):
:rtype: int
:returns: The timeout seconds default.
"""
return self.table.timeout_seconds
return self.table._cluster._client.timeout_seconds

@property
def name(self):
Expand Down
4 changes: 2 additions & 2 deletions gcloud_bigtable/happybase/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def open(self):
:class:`.Client` bound to the :class:`.Cluster` owned by
this connection.
"""
self._cluster.client.start()
self._cluster._client.start()

def close(self):
"""Close the underlying transport to Cloud Bigtable.
Expand All @@ -254,7 +254,7 @@ def close(self):
:class:`.Client` bound to the :class:`.Cluster` owned by
this connection.
"""
self._cluster.client.stop()
self._cluster._client.stop()

def __del__(self):
try:
Expand Down
4 changes: 2 additions & 2 deletions gcloud_bigtable/row.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def client(self):
:rtype: :class:`.client.Client`
:returns: The client that owns this row.
"""
return self.table.client
return self.table._cluster._client

@property
def timeout_seconds(self):
Expand All @@ -122,7 +122,7 @@ def timeout_seconds(self):
:rtype: int
:returns: The timeout seconds default.
"""
return self.table.timeout_seconds
return self.table._cluster._client.timeout_seconds

def _get_mutations(self, state=None):
"""Gets the list of mutations for a given state.
Expand Down

0 comments on commit f168b90

Please sign in to comment.