simplified __init__.py files

Author: daniel-sanche

google/cloud/bigtable/__init__.py

@@ -1,9 +1,21 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
 import importlib
 import sys
-import warnings
-
 
-_LEGACY_MODULE_NAMES = {
+_CLASSIC_CLIENT_MODULE_NAMES = {
      "app_profile",
     "backup",
     "batcher",
@@ -24,34 +36,16 @@
     "table",
 }
 
-# Eagerly create aliases in sys.modules for full backward compatibility.
-# This is more robust than the lazy __getattr__ approach because it handles
-# direct submodule imports (e.g., `import google.cloud.bigtable.row_data`).
-for module_name in _LEGACY_MODULE_NAMES:
-    # Define the old and new module paths
+# update sys.modules to add an alias from old path to new
+for module_name in _CLASSIC_CLIENT_MODULE_NAMES:
     old_path = f"google.cloud.bigtable.{module_name}"
     new_path = f".classic.{module_name}"
 
-    # Import the module from its new location
     module = importlib.import_module(new_path, __name__)
-
-    # Inject the loaded module into sys.modules under its old path.
-    # This makes Python's import machinery find it automatically.
     sys.modules[old_path] = module
-
     # Attach the module as an attribute to the current package
     setattr(sys.modules[__name__], module_name, module)
 
-# You can also issue a single, general warning that some modules were moved.
-warnings.warn(
-    (
-        "Several modules have been moved to the `google.cloud.bigtable.classic` "
-        "subpackage. The top-level aliases will be removed in a future version."
-    ),
-    DeprecationWarning,
-    stacklevel=2,
-)
-
 # previously exported classes
 from google.cloud.bigtable.classic.client import Client
 from . import gapic_version

google/cloud/bigtable_admin_v2/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,39 +15,22 @@
 import sys
 import importlib
 import pkgutil
-import warnings
 
 _new_path = "google.cloud.bigtable.admin"
-_old_path = __name__  # This will be 'google.cloud.bigtable_admin_v2'
 
-# Issue a warning to users that the old path is deprecated.
-warnings.warn(
-    f"The '{_old_path}' package is deprecated and will be removed in a future "
-    f"version. Please use '{_new_path}' instead.",
-    DeprecationWarning,
-    stacklevel=2,
-)
-
-# 1. Import the real top-level package from its new location.
+# update sys.modules to add an alias from this path to new
 _real_package = importlib.import_module(_new_path)
+sys.modules[__name__] = _real_package
 
-# 2. Immediately replace this alias package in the module cache with the real one.
-sys.modules[_old_path] = _real_package
-
-# 3. Eagerly walk and import all submodules of the real package.
-#    This populates sys.modules with all the canonical submodule paths
-#    (e.g., 'google.cloud.bigtable.admin.types', etc.).
+# iterate and import all submodules to populate sys.modules
 for _, name, _ in pkgutil.walk_packages(
     path=_real_package.__path__,
     prefix=_real_package.__name__ + ".",
 ):
     importlib.import_module(name)
 
-# 4. Now that they're all loaded, create an alias for each submodule.
-#    We iterate over a copy of the keys, as the dictionary size will change.
+# create an alias for each submodule
 for name in list(sys.modules.keys()):
-    # Check if a loaded module is a submodule of our new package...
     if name.startswith(_new_path + "."):
-        # ...and create a corresponding alias using the old path prefix.
-        old_submodule_path = name.replace(_new_path, _old_path, 1)
+        old_submodule_path = name.replace(_new_path, __name__, 1)
         sys.modules[old_submodule_path] = sys.modules[name]