Restore license position that got screwed up
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c0bc5840 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c0bc5840 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c0bc5840 Branch: refs/heads/master Commit: c0bc5840084e46e68d9fcff38aacf125f01a8613 Parents: cd702b3 Author: Holden Karau <hol...@us.ibm.com> Authored: Fri Sep 1 21:43:35 2017 -0700 Committer: Robert Bradshaw <rober...@gmail.com> Committed: Thu Oct 12 15:50:09 2017 -0700 ---------------------------------------------------------------------- .../io/gcp/datastore/v1/datastoreio_test.py | 30 ++++++++++---------- sdks/python/run_pylint.sh | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/c0bc5840/sdks/python/apache_beam/io/gcp/datastore/v1/datastoreio_test.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/io/gcp/datastore/v1/datastoreio_test.py b/sdks/python/apache_beam/io/gcp/datastore/v1/datastoreio_test.py index b1d18fe..e131f93 100644 --- a/sdks/python/apache_beam/io/gcp/datastore/v1/datastoreio_test.py +++ b/sdks/python/apache_beam/io/gcp/datastore/v1/datastoreio_test.py @@ -1,18 +1,3 @@ -from __future__ import print_function - -import unittest - -from mock import MagicMock -from mock import call -from mock import patch - -from apache_beam.io.gcp.datastore.v1 import fake_datastore -from apache_beam.io.gcp.datastore.v1 import helper -from apache_beam.io.gcp.datastore.v1 import query_splitter -from apache_beam.io.gcp.datastore.v1.datastoreio import ReadFromDatastore -from apache_beam.io.gcp.datastore.v1.datastoreio import WriteToDatastore -from apache_beam.io.gcp.datastore.v1.datastoreio import _Mutate - # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -30,6 +15,21 @@ from apache_beam.io.gcp.datastore.v1.datastoreio import _Mutate # limitations under the License. # +from __future__ import print_function + +import unittest + +from mock import MagicMock +from mock import call +from mock import patch + +from apache_beam.io.gcp.datastore.v1 import fake_datastore +from apache_beam.io.gcp.datastore.v1 import helper +from apache_beam.io.gcp.datastore.v1 import query_splitter +from apache_beam.io.gcp.datastore.v1.datastoreio import ReadFromDatastore +from apache_beam.io.gcp.datastore.v1.datastoreio import WriteToDatastore +from apache_beam.io.gcp.datastore.v1.datastoreio import _Mutate + # Protect against environments where datastore library is not available. # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports http://git-wip-us.apache.org/repos/asf/beam/blob/c0bc5840/sdks/python/run_pylint.sh ---------------------------------------------------------------------- diff --git a/sdks/python/run_pylint.sh b/sdks/python/run_pylint.sh index d53bb14..ccd2e31 100755 --- a/sdks/python/run_pylint.sh +++ b/sdks/python/run_pylint.sh @@ -92,3 +92,4 @@ if [ "$count" != "0" ]; then echo "$futurize_filtered" exit 1 fi +echo "No future changes needed"