From c95ad759d314707bc9790b32c0912195eaa7260c Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Fri, 3 Jul 2026 11:04:58 -0400
Subject: [PATCH] I got a fever and the only cure is more import fixes

---
 src/gam/cmd/drive/copymove/copymove_move.py | 2 ++
 src/gam/cmd/drive/copymove/copymove_util.py | 2 ++
 src/gam/cmd/drive/files.py                  | 2 +-
 src/gam/cmd/drive/transfer/fileops.py       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gam/cmd/drive/copymove/copymove_move.py b/src/gam/cmd/drive/copymove/copymove_move.py
index 724eaff5..88574a76 100644
--- a/src/gam/cmd/drive/copymove/copymove_move.py
+++ b/src/gam/cmd/drive/copymove/copymove_move.py
@@ -11,6 +11,8 @@ Part of the drive sub-package, extracted from drive.py."""
 import re
 import sys
 
+from gam.cmd.drive.core import DFA_SEARCHARGS
+
 from gam.cmd.drive.copymove.copymove_util import _checkForDuplicateTargetFile, _checkForExistingShortcut, _copyPermissions, _getCopyFolderNonInheritedPermissions, _getCopyMoveParentInfo, _getCopyMoveTargetInfo, _getUniqueFilename, _identicalSourceTarget, _printStatistics, _targetFilenameExists, _verifyUserIsOrganizer, getCopyMoveOptions, initCopyMoveOptions
 
 from gamlib import glaction
diff --git a/src/gam/cmd/drive/copymove/copymove_util.py b/src/gam/cmd/drive/copymove/copymove_util.py
index 76ca7600..ed65696d 100644
--- a/src/gam/cmd/drive/copymove/copymove_util.py
+++ b/src/gam/cmd/drive/copymove/copymove_util.py
@@ -10,6 +10,8 @@ Part of the drive sub-package, extracted from drive.py."""
 
 import re
 import sys
+
+from gam.cmd.drive.core import DFA_IGNORE_DEFAULT_VISIBILITY, DFA_KEEP_REVISION_FOREVER, DFA_SEARCHARGS
 import os
 
 from gamlib import glaction
diff --git a/src/gam/cmd/drive/files.py b/src/gam/cmd/drive/files.py
index bdae1f34..8d645dc3 100644
--- a/src/gam/cmd/drive/files.py
+++ b/src/gam/cmd/drive/files.py
@@ -7,7 +7,7 @@ Part of the drive sub-package, extracted from drive.py."""
 import re
 import sys
 
-from gam.cmd.drive.core import _getDriveFileAddRemoveParentInfo, _getDriveFileParentInfo, _validateUserGetFileIDs, escapeDriveFileName, getDriveFileAddRemoveParentAttribute, getDriveFileAttribute, getDriveFileEntity, getDriveFileParentAttribute, getMediaBody, initDriveFileAttributes, setPreservedFileTimes
+from gam.cmd.drive.core import DFA_IGNORE_DEFAULT_VISIBILITY, DFA_KEEP_REVISION_FOREVER, DFA_LOCALFILENAME, DFA_LOCALFILEPATH, DFA_LOCALMIMETYPE, DFA_OCRLANGUAGE, DFA_PARENTID, DFA_PRESERVE_FILE_TIMES, DFA_REPLACEFILENAME, DFA_SHAREDDRIVE_PARENT, DFA_STRIPNAMEPREFIX, DFA_TIMEFORMAT, DFA_TIMESTAMP, DFA_URL, DFA_USE_CONTENT_AS_INDEXABLE_TEXT, _getDriveFileAddRemoveParentInfo, _getDriveFileParentInfo, _validateUserGetFileIDs, escapeDriveFileName, getDriveFileAddRemoveParentAttribute, getDriveFileAttribute, getDriveFileEntity, getDriveFileParentAttribute, getMediaBody, initDriveFileAttributes, setPreservedFileTimes
 from gam.cmd.drive.fileinfo import writeReturnIdLink
 import time
 
diff --git a/src/gam/cmd/drive/transfer/fileops.py b/src/gam/cmd/drive/transfer/fileops.py
index 0e2127e5..845d29ca 100644
--- a/src/gam/cmd/drive/transfer/fileops.py
+++ b/src/gam/cmd/drive/transfer/fileops.py
@@ -12,7 +12,7 @@ import re
 import json
 import sys
 
-from gam.cmd.drive.core import _validateUserGetFileIDs, getDriveFileEntity
+from gam.cmd.drive.core import DFA_PARENTID, DFA_PARENTQUERY, _validateUserGetFileIDs, getDriveFileEntity
 import os
 import time