diff --git a/gcl.py b/gcl.py index f8b31aae3c..bbcba87ec9 100755 --- a/gcl.py +++ b/gcl.py @@ -987,12 +987,12 @@ def Lint(change_info, args): def DoPresubmitChecks(change_info, committing): """Imports presubmit, then calls presubmit.DoPresubmitChecks.""" # Need to import here to avoid circular dependency. - import presubmit - result = presubmit.DoPresubmitChecks(change_info, - committing, - verbose=False, - output_stream=sys.stdout, - input_stream=sys.stdin) + import presubmit_support + result = presubmit_support.DoPresubmitChecks(change_info, + committing, + verbose=False, + output_stream=sys.stdout, + input_stream=sys.stdin) if not result: print "\nPresubmit errors, can't continue (use --no_presubmit to bypass)" return result diff --git a/presubmit.py b/presubmit_support.py similarity index 100% rename from presubmit.py rename to presubmit_support.py diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index 5f9e735dc2..68760ee76c 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -12,7 +12,7 @@ import unittest # Local imports import gcl import gclient -import presubmit +import presubmit_support as presubmit import presubmit_canned_checks