Switch to single-line API/TEST_API definitions.

R=mohrr@google.com Bug: b/446916327 Change-Id: I4fc651325566ffe67956750e35363a6718d9a15b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6981222 Reviewed-by: Rob Mohr <mohrr@google.com> Commit-Queue: Robbie Iannucci <iannucci@google.com>
2026-01-11 10:41:31 +00:00 · 2025-09-24 16:36:06 -07:00
parent dfd4523a42
commit b723b89856
13 changed files with 34 additions and 55 deletions
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -53,7 +53,7 @@

 ### *recipe_modules* / [bot\_update](/recipes/recipe_modules/bot_update)

-[DEPS](/recipes/recipe_modules/bot_update/__init__.py#4): [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [gerrit](#recipe_modules-gerrit), [gitiles](#recipe_modules-gitiles), [gsutil](#recipe_modules-gsutil), [tryserver](#recipe_modules-tryserver), [recipe\_engine/archive][recipe_engine/recipe_modules/archive], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/commit\_position][recipe_engine/recipe_modules/commit_position], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/milo][recipe_engine/recipe_modules/milo], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/warning][recipe_engine/recipe_modules/warning]
+[DEPS](/recipes/recipe_modules/bot_update/__init__.py#2): [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [gerrit](#recipe_modules-gerrit), [gitiles](#recipe_modules-gitiles), [gsutil](#recipe_modules-gsutil), [tryserver](#recipe_modules-tryserver), [recipe\_engine/archive][recipe_engine/recipe_modules/archive], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/commit\_position][recipe_engine/recipe_modules/commit_position], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/milo][recipe_engine/recipe_modules/milo], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/warning][recipe_engine/recipe_modules/warning]


 Recipe module to ensure a checkout is consistent on a bot.
@@ -130,7 +130,7 @@ properties.
 &mdash; **def [step\_name](/recipes/recipe_modules/bot_update/api.py#696)(self, patch, suffix):**
 ### *recipe_modules* / [depot\_tools](/recipes/recipe_modules/depot_tools)

-[DEPS](/recipes/recipe_modules/depot_tools/__init__.py#7): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime]
+[DEPS](/recipes/recipe_modules/depot_tools/__init__.py#6): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime]


 The `depot_tools` module provides safe functions to access paths within
@@ -168,7 +168,7 @@ Returns (Path): The "depot_tools" root directory.
 &emsp; **@property**<br>&mdash; **def [upload\_to\_google\_storage\_path](/recipes/recipe_modules/depot_tools/api.py#21)(self):**
 ### *recipe_modules* / [gclient](/recipes/recipe_modules/gclient)

-[DEPS](/recipes/recipe_modules/gclient/__init__.py#3): [git](#recipe_modules-git), [gitiles](#recipe_modules-gitiles), [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/gclient/__init__.py#1): [git](#recipe_modules-git), [gitiles](#recipe_modules-gitiles), [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 #### **class [GclientApi](/recipes/recipe_modules/gclient/api.py#71)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -272,7 +272,7 @@ revision map. This doesn't overwrite the revision if it was already set.
 &emsp; **@use_mirror.setter**<br>&mdash; **def [use\_mirror](/recipes/recipe_modules/gclient/api.py#110)(self, val):**
 ### *recipe_modules* / [gerrit](/recipes/recipe_modules/gerrit)

-[DEPS](/recipes/recipe_modules/gerrit/__init__.py#4): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time]
+[DEPS](/recipes/recipe_modules/gerrit/__init__.py#2): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time]


 #### **class [GerritApi](/recipes/recipe_modules/gerrit/api.py#9)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -437,7 +437,7 @@ Returns:
      https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#submit-change
 ### *recipe_modules* / [git](/recipes/recipe_modules/git)

-[DEPS](/recipes/recipe_modules/git/__init__.py#4): [depot\_tools](#recipe_modules-depot_tools), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/git/__init__.py#2): [depot\_tools](#recipe_modules-depot_tools), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 #### **class [GitApi](/recipes/recipe_modules/git/api.py#10)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -594,7 +594,7 @@ Args:
  * remote_name (str): the remote name to rebase from if not origin
 ### *recipe_modules* / [git\_cl](/recipes/recipe_modules/git_cl)

-[DEPS](/recipes/recipe_modules/git_cl/__init__.py#3): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/git_cl/__init__.py#2): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 #### **class [GitClApi](/recipes/recipe_modules/git_cl/api.py#11)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -619,7 +619,7 @@ If you set `path` to None, this will remove the default.
 &mdash; **def [upload](/recipes/recipe_modules/git_cl/api.py#54)(self, message, upload_args=None, \*\*kwargs):**
 ### *recipe_modules* / [gitiles](/recipes/recipe_modules/gitiles)

-[DEPS](/recipes/recipe_modules/gitiles/__init__.py#8): [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/url][recipe_engine/recipe_modules/url]
+[DEPS](/recipes/recipe_modules/gitiles/__init__.py#5): [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/url][recipe_engine/recipe_modules/url]


 #### **class [Gitiles](/recipes/recipe_modules/gitiles/api.py#11)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -709,7 +709,7 @@ Returns a list of refs in the remote repository.
 Generates a Gitiles repo URL. See also parse_repo_url.
 ### *recipe_modules* / [gsutil](/recipes/recipe_modules/gsutil)

-[DEPS](/recipes/recipe_modules/gsutil/__init__.py#5): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/gsutil/__init__.py#4): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 #### **class [GSUtilApi](/recipes/recipe_modules/gsutil/api.py#10)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -767,7 +767,7 @@ Args:
 &mdash; **def [upload](/recipes/recipe_modules/gsutil/api.py#99)(self, source, bucket, dest, args=None, link_name='gsutil.upload', metadata=None, unauthenticated_url=False, \*\*kwargs):**
 ### *recipe_modules* / [osx\_sdk](/recipes/recipe_modules/osx_sdk)

-[DEPS](/recipes/recipe_modules/osx_sdk/__init__.py#8): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/version][recipe_engine/recipe_modules/version]
+[DEPS](/recipes/recipe_modules/osx_sdk/__init__.py#5): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/version][recipe_engine/recipe_modules/version]


 The `osx_sdk` module provides safe functions to access a semi-hermetic
@@ -830,7 +830,7 @@ Raises:
 &mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#56)(self):**
 ### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit)

-[DEPS](/recipes/recipe_modules/presubmit/__init__.py#14): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/findings][recipe_engine/recipe_modules/findings], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/presubmit/__init__.py#12): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/findings][recipe_engine/recipe_modules/findings], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 #### **class [PresubmitApi](/recipes/recipe_modules/presubmit/api.py#17)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -880,7 +880,7 @@ Args:
  result_json: the json result output from presubmit step.
 ### *recipe_modules* / [tryserver](/recipes/recipe_modules/tryserver)

-[DEPS](/recipes/recipe_modules/tryserver/__init__.py#8): [gerrit](#recipe_modules-gerrit), [git](#recipe_modules-git), [git\_cl](#recipe_modules-git_cl), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/tryserver/__init__.py#6): [gerrit](#recipe_modules-gerrit), [git](#recipe_modules-git), [git\_cl](#recipe_modules-git_cl), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 #### **class [TryserverApi](/recipes/recipe_modules/tryserver/api.py#27)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
@@ -1045,7 +1045,7 @@ timeout.
 &emsp; **@property**<br>&mdash; **def [valid\_footers](/recipes/recipe_modules/tryserver/api.py#47)(self):**
 ### *recipe_modules* / [windows\_sdk](/recipes/recipe_modules/windows_sdk)

-[DEPS](/recipes/recipe_modules/windows_sdk/__init__.py#7): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/windows_sdk/__init__.py#6): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/step][recipe_engine/recipe_modules/step]


 The `windows_sdk` module provides safe functions to access a hermetic
--- a/recipes/recipe_modules/bot_update/init.py
+++ b/recipes/recipe_modules/bot_update/init.py
@@ -1,6 +1,4 @@

-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
    'depot_tools',
    'gclient',
@@ -44,5 +42,5 @@ PROPERTIES = {
 # Forward these types so that they can be used without importing api
 from .api import RelativeRoot, Result

-API = _api.BotUpdateApi
-TEST_API = _test_api.BotUpdateTestApi
+from .api import BotUpdateApi as API
+from .test_api import BotUpdateTestApi as TEST_API
--- a/recipes/recipe_modules/depot_tools/init.py
+++ b/recipes/recipe_modules/depot_tools/init.py
@@ -3,7 +3,6 @@
 # found in the LICENSE file.


-from . import api as _api
 DEPS = [
  'recipe_engine/cipd',
  'recipe_engine/context',
@@ -11,4 +10,4 @@ DEPS = [
  'recipe_engine/runtime',
 ]

-API = _api.DepotToolsApi
+from .api import DepotToolsApi as API
--- a/recipes/recipe_modules/gclient/init.py
+++ b/recipes/recipe_modules/gclient/init.py
@@ -1,5 +1,3 @@
-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
    'git',
    'gitiles',
@@ -17,7 +15,8 @@ DEPS = [

 from .config import config_ctx as CONFIG_CTX

-__all__ = ['CONFIG_CTX']
+from .api import GclientApi as API
+from .test_api import GclientTestApi as TEST_API
+
+__all__ = ['CONFIG_CTX', 'API', 'TEST_API']

-API = _api.GclientApi
-TEST_API = _test_api.GclientTestApi
--- a/recipes/recipe_modules/gerrit/init.py
+++ b/recipes/recipe_modules/gerrit/init.py
@@ -1,6 +1,4 @@

-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
    'recipe_engine/context',
    'recipe_engine/file',
@@ -11,5 +9,5 @@ DEPS = [
    'recipe_engine/time',
 ]

-API = _api.GerritApi
-TEST_API = _test_api.GerritTestApi
+from .api import GerritApi as API
+from .test_api import GerritTestApi as TEST_API
--- a/recipes/recipe_modules/git/init.py
+++ b/recipes/recipe_modules/git/init.py
@@ -1,6 +1,4 @@

-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
  'depot_tools',
  'recipe_engine/buildbucket',
@@ -13,5 +11,5 @@ DEPS = [
  'recipe_engine/step',
 ]

-API = _api.GitApi
-TEST_API = _test_api.GitTestApi
+from .api import GitApi as API
+from .test_api import GitTestApi as TEST_API
--- a/recipes/recipe_modules/git_cl/init.py
+++ b/recipes/recipe_modules/git_cl/init.py
@@ -1,9 +1,8 @@

-from . import api as _api
 DEPS = [
    'recipe_engine/context',
    'recipe_engine/raw_io',
    'recipe_engine/step',
 ]

-API = _api.GitClApi
+from .api import GitClApi as API
--- a/recipes/recipe_modules/gitiles/init.py
+++ b/recipes/recipe_modules/gitiles/init.py
@@ -2,9 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

-
-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
    'recipe_engine/json',
    'recipe_engine/path',
@@ -13,5 +10,5 @@ DEPS = [
    'recipe_engine/url',
 ]

-API = _api.Gitiles
-TEST_API = _test_api.GitilesTestApi
+from .api import Gitiles as API
+from .test_api import GitilesTestApi as TEST_API
--- a/recipes/recipe_modules/gsutil/init.py
+++ b/recipes/recipe_modules/gsutil/init.py
@@ -1,4 +1,3 @@
-from . import api as _api
 from PB.recipe_modules.depot_tools.gsutil import properties


@@ -12,4 +11,4 @@ DEPS = [

 ENV_PROPERTIES = properties.EnvProperties

-API = _api.GSUtilApi
+from .api import GSUtilApi as API
--- a/recipes/recipe_modules/osx_sdk/init.py
+++ b/recipes/recipe_modules/osx_sdk/init.py
@@ -2,9 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

-
-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
    'recipe_engine/cipd',
    'recipe_engine/context',
@@ -40,5 +37,5 @@ PROPERTIES = {
  )
 }

-API = _api.OSXSDKApi
-TEST_API = _test_api.OSXSDKTestApi
+from .api import OSXSDKApi as API
+from .test_api import OSXSDKTestApi as TEST_API
--- a/recipes/recipe_modules/presubmit/init.py
+++ b/recipes/recipe_modules/presubmit/init.py
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

-from . import api as _api
-from . import test_api as _test_api
 from recipe_engine.config import ConfigGroup, Single
 from recipe_engine.recipe_api import Property

@@ -32,5 +30,5 @@ DEPS = [

 PROPERTIES = properties.InputProperties

-API = _api.PresubmitApi
-TEST_API = _test_api.PresubmitTestApi
+from .api import PresubmitApi as API
+from .test_api import PresubmitTestApi as TEST_API
--- a/recipes/recipe_modules/tryserver/init.py
+++ b/recipes/recipe_modules/tryserver/init.py
@@ -3,8 +3,6 @@
 # found in the LICENSE file.


-from . import api as _api
-from . import test_api as _test_api
 DEPS = [
  'gerrit',
  'git',
@@ -20,5 +18,5 @@ DEPS = [
  'recipe_engine/step',
 ]

-API = _api.TryserverApi
-TEST_API = _test_api.TryserverTestApi
+from .api import TryserverApi as API
+from .test_api import TryserverTestApi as TEST_API
--- a/recipes/recipe_modules/windows_sdk/init.py
+++ b/recipes/recipe_modules/windows_sdk/init.py
@@ -3,7 +3,6 @@
 # found in the LICENSE file.


-from . import api as _api
 DEPS = [
    'recipe_engine/cipd',
    'recipe_engine/context',
@@ -26,4 +25,4 @@ PROPERTIES = {
  )
 }

-API = _api.WindowsSDKApi
+from .api import WindowsSDKApi as API