resolve import variable conflict (#1534)

pinterest · Mar 19, 2024 · 8b5a466 · 8b5a466
1 parent cd4f5e9
commit 8b5a466
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/deploy-board/deploy_board/webapp/deploy_views.py b/deploy-board/deploy_board/webapp/deploy_views.py
@@ -17,7 +17,7 @@
 """
 from deploy_board.settings import SITE_METRICS_CONFIGS, TELETRAAN_DISABLE_CREATE_ENV_PAGE, TELETRAAN_REDIRECT_CREATE_ENV_PAGE_URL
 from django.middleware.csrf import get_token
-from . import accounts
+from .accounts import get_accounts_from_deploy
 import json
 from django.shortcuts import render
 from django.views.generic import View
@@ -149,7 +149,7 @@ def get(self, request, deploy_id):
         deploy_accounts = []
         if deploy.get('envId'):
             env = environs_helper.get(request, deploy['envId'])
-            deploy_accounts = accounts.get_accounts_from_deploy(request, env, deploy, build_with_tag)
+            deploy_accounts = get_accounts_from_deploy(request, env, deploy, build_with_tag)
         return render(request, 'deploys/deploy_details.html', {
             "deploy": deploy,
             "build": build_with_tag['build'],

diff --git a/deploy-board/deploy_board/webapp/env_views.py b/deploy-board/deploy_board/webapp/env_views.py
@@ -32,7 +32,7 @@
 from . import agent_report
 from . import service_add_ons
 from . import common
-from . import accounts
+from .accounts import get_accounts, get_accounts_from_deploy
 import random
 import json
 import requests
@@ -264,7 +264,7 @@ def update_deploy_progress(request, name, stage):
 
 
 def add_legacy_accounts(accounts, report):
-    accounts_from_report = accounts.get_accounts(report)
+    accounts_from_report = get_accounts(report)
     for account in accounts:
         if account["ownerId"] in accounts_from_report:
             accounts_from_report.remove(account["ownerId"])
@@ -1318,7 +1318,7 @@ def get_deploy(request, name, stage, deploy_id):
     deploy = deploys_helper.get(request, deploy_id)
     build_with_tag = builds_helper.get_build_and_tag(request, deploy['buildId'])
     env = environs_helper.get_env_by_stage(request, name, stage)
-    deploy_accounts = accounts.get_accounts_from_deploy(request, env, deploy, build_with_tag)
+    deploy_accounts = get_accounts_from_deploy(request, env, deploy, build_with_tag)
     return render(request, 'environs/env_deploy_details.html', {
         "deploy": deploy,
         "csrf_token": get_token(request),