Merge pull request #92 from GoogleCloudPlatform/mainify-storage

Reorganizing storage samples.

Author: Jonathan Wayne Parrott

README.md

@@ -8,16 +8,6 @@ This repository holds the samples used in the python documentation on [cloud.goo
 For more detailed introduction to a product, check the README in the
 corresponding folder.
 
-## Running the samples
-
-Most samples must be run as modules instead of directly, for example:
-
-```
-$ python -m bigquery.samples.async_query [your-project-id] [your-query]
-```
-
-Refer to the README in the corresponding folder for any special instructions.
-
 ## Contributing changes
 
 * See [CONTRIBUTING.md](CONTRIBUTING.md)

bigquery/README.md

@@ -2,14 +2,6 @@
 
 This section contains samples for [Google BigQuery](https://cloud.google.com/bigquery).
 
-## Running the samples
-
-These samples must be run as modules, for example:
-
-```
-$ python -m bigquery.samples.async_query [your-project-id] [your-query]
-```
-
 ## Other Samples
 
 * [Using BigQuery from Google App Engine](../appengine/bigquery).

storage/api/__init__.py

@@ -13,7 +13,7 @@
 #
 import os
 
-from storage.compose_objects import main
+from .compose_objects import main
 from tests import CloudBaseTest
 
 

storage/compose_objects.py renamed to storage/api/compose_objects.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from storage.list_objects import main
+from .list_objects import main
 from tests import CloudBaseTest