Rename function so it doesn't shadow module name.

Doug Greiman · Doug Greiman · commit 336e42a16fd9 · 2017-06-19T16:07:13.000-07:00
diff --git a/scripts/gen_dockerfile.py b/scripts/gen_dockerfile.py
@@ -192,7 +192,7 @@ def generate_files(app_config):
     }
 
 
-def gen_dockerfile(base_image, config_file, source_dir):
+def generate_dockerfile_command(base_image, config_file, source_dir):
     """Write a Dockerfile and helper files for an application.
 
     Args:
@@ -247,7 +247,7 @@ def parse_args(argv):
 
 def main():
     args = parse_args(sys.argv)
-    gen_dockerfile(args.base_image, args.config, args.source_dir)
+    generate_dockerfile_command(args.base_image, args.config, args.source_dir)
 
 
 if __name__ == '__main__':
diff --git a/scripts/gen_dockerfile_test.py b/scripts/gen_dockerfile_test.py
@@ -151,7 +151,7 @@ def test_generate_files(self):
                 else:
                     self.assertNotIn(test_string, dockerfile)
 
-    def test_gen_dockerfile(self):
+    def test_generate_dockerfile_command(self):
         """Generates output and compares against a set of golden files.
 
         Optionally runs 'gcloud app gen-config' and compares against that.
@@ -167,7 +167,7 @@ def test_gen_dockerfile(self):
                 # Copy sample app to writable temp dir, and generate Dockerfile.
                 config_dir = os.path.join(temp_dir, 'config')
                 shutil.copytree(app_dir, config_dir)
-                gen_dockerfile.gen_dockerfile(
+                gen_dockerfile.generate_dockerfile_command(
                     base_image='gcr.io/google-appengine/python',
                     config_file=os.path.join(config_dir, 'app.yaml'),
                     source_dir=config_dir)
