From a5e22c1aea10d13a9c05decff1d9d99b69808acc Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 4 Jul 2026 05:46:27 -0400 Subject: [PATCH] import the import fix to fix the import ports --- src/gam/util/api.py | 1 + src/gam/util/args.py | 2 +- src/gam/util/display.py | 2 +- src/gam/util/email.py | 1 + src/gam/util/errors.py | 2 +- src/gam/util/fileio.py | 2 +- src/gam/util/gdoc.py | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gam/util/api.py b/src/gam/util/api.py index 2ac988bb..36a17c1e 100644 --- a/src/gam/util/api.py +++ b/src/gam/util/api.py @@ -47,6 +47,7 @@ from gamlib import glgdata as GDATA from gamlib import glglobals as GM from gamlib import glmsgs as Msg from gamlib import yubikey +from gam.var import Ent, Ind from gam.constants import API_ACCESS_DENIED_RC, GOOGLE_API_ERROR_RC, HTTP_ERROR_RC, NETWORK_ERROR_RC, NO_SCOPES_FOR_API_RC, REFRESH_EXPIRY, SOCKET_ERROR_RC, SYSTEM_ERROR_RC from util.args import UTF8, YYYYMMDDTHHMMSSZ_FORMAT, formatHTTPError from util.display import FIRST_ITEM_MARKER, LAST_ITEM_MARKER, SERVICE_NOT_APPLICABLE_RC, TOTAL_ITEMS_MARKER, entityActionFailedWarning, printBlankLine, printKeyValueList, userServiceNotEnabledWarning diff --git a/src/gam/util/args.py b/src/gam/util/args.py index 644943cb..bfdb547f 100644 --- a/src/gam/util/args.py +++ b/src/gam/util/args.py @@ -100,7 +100,7 @@ from util.errors import ( ) from util.fileio import readFile -from gam.var import Cmd +from gam.var import Cmd, Ent # Lazy accessor for Ent (runtime instance) def _getEnt(): diff --git a/src/gam/util/display.py b/src/gam/util/display.py index 66e9ad54..f1419449 100644 --- a/src/gam/util/display.py +++ b/src/gam/util/display.py @@ -12,7 +12,7 @@ from gamlib import glglobals as GM from gamlib import glmsgs as Msg -from gam.var import Act, Ind +from gam.var import Act, Ent, Ind from util.output import ( currentCountNL, formatKeyValueList, diff --git a/src/gam/util/email.py b/src/gam/util/email.py index edb74ced..c86e5241 100644 --- a/src/gam/util/email.py +++ b/src/gam/util/email.py @@ -17,6 +17,7 @@ from email.mime.image import MIMEImage from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText +from gam.var import Act, Ent from gamlib import glapi as API from gamlib import glcfg as GC from gamlib import glgapi as GAPI diff --git a/src/gam/util/errors.py b/src/gam/util/errors.py index 22c6014b..41f1074b 100644 --- a/src/gam/util/errors.py +++ b/src/gam/util/errors.py @@ -8,7 +8,7 @@ from gamlib import glglobals as GM from gamlib import glmsgs as Msg -from gam.var import Act, Cmd, Ind +from gam.var import Act, Cmd, Ent, Ind from util.output import ( currentCountNL, formatKeyValueList, diff --git a/src/gam/util/fileio.py b/src/gam/util/fileio.py index 574ef370..ed8b1ed3 100644 --- a/src/gam/util/fileio.py +++ b/src/gam/util/fileio.py @@ -19,7 +19,7 @@ from gamlib import glglobals as GM from gamlib import glmsgs as Msg -from gam.var import Act, Ind +from gam.var import Act, Ent, Ind from util.output import ( stderrErrorMsg, stderrWarningMsg, diff --git a/src/gam/util/gdoc.py b/src/gam/util/gdoc.py index 46558aef..c61aef8d 100644 --- a/src/gam/util/gdoc.py +++ b/src/gam/util/gdoc.py @@ -22,6 +22,7 @@ Ent = glentity.GamEntity() from gamlib import glgapi as GAPI from gamlib import glglobals as GM from gamlib import glmsgs as Msg +from gam.var import Cmd from gam.constants import DEFAULT_CSV_READ_MODE, NO_ENTITIES_FOUND_RC from util.args import UTF8, checkArgumentPresent, getBoolean, getCharSet, getCharacter, getEmailAddress, getSheetEntity, getSheetIdFromSheetEntity, getString, shlexSplitList from util.display import ACTION_NOT_PERFORMED_RC, userDriveServiceNotEnabledWarning