Repository: beam Updated Branches: refs/heads/master 4867c995f -> b8131fe93
[BEAM-1441] remove manual join from apiclient Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/7976f885 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/7976f885 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/7976f885 Branch: refs/heads/master Commit: 7976f8855122f4716473c4909785811fa16af9cd Parents: 4867c99 Author: Sourabh Bajaj <[email protected]> Authored: Mon May 1 11:47:34 2017 -0700 Committer: Ahmet Altay <[email protected]> Committed: Mon May 1 16:59:43 2017 -0700 ---------------------------------------------------------------------- sdks/python/apache_beam/runners/dataflow/internal/apiclient.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/7976f885/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py index 0270cbe..188cda1 100644 --- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py +++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py @@ -389,12 +389,12 @@ class DataflowApplicationClient(object): mime_type='application/octet-stream'): """Stages a file at a GCS or local path with stream-supplied contents.""" if not gcs_or_local_path.startswith('gs://'): - local_path = os.path.join(gcs_or_local_path, file_name) + local_path = FileSystems.join(gcs_or_local_path, file_name) logging.info('Staging file locally to %s', local_path) with open(local_path, 'wb') as f: f.write(stream.read()) return - gcs_location = gcs_or_local_path + '/' + file_name + gcs_location = FileSystems.join(gcs_or_local_path, file_name) bucket, name = gcs_location[5:].split('/', 1) request = storage.StorageObjectsInsertRequest(
