Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bigquery-udf-resources'
Browse files Browse the repository at this point in the history
  • Loading branch information
necnec committed Nov 28, 2016
2 parents 9a16a8c + f9fae0c commit 42dc9e6
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pandas/io/gbq.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ def run_query(self, query, **kwargs):
if query_config is not None:
job_data['configuration']['query'].update(query_config)


self._start_timer()
try:
self._print('Requesting query... ', end="")
Expand Down Expand Up @@ -625,8 +624,8 @@ def _parse_entry(field_value, field_type):
return field_value


def read_gbq(query, project_id=None, index_col=None, col_order=None,
reauth=False, verbose=True, private_key=None, dialect='legacy',
def read_gbq(query, project_id=None, index_col=None, col_order=None,
reauth=False, verbose=True, private_key=None, dialect='legacy',
**kwargs):
"""Load data from Google BigQuery.
Expand Down

0 comments on commit 42dc9e6

Please sign in to comment.