From 0de4dcc3078f7a17af97fa9107cef81bd8bde3a1 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 15 Nov 2023 23:27:14 +0100
Subject: [PATCH] Make __all__ exports static and internal modules private

---
 src/brreg/__init__.py                         | 11 ++++----
 src/brreg/{exceptions.py => _exceptions.py}   |  3 ---
 src/brreg/enhetsregisteret/__init__.py        | 25 +++++++++++++------
 .../{client.py => _client.py}                 |  4 +--
 .../enhetsregisteret/{types.py => _types.py}  |  0
 5 files changed, 24 insertions(+), 19 deletions(-)
 rename src/brreg/{exceptions.py => _exceptions.py} (92%)
 rename src/brreg/enhetsregisteret/{client.py => _client.py} (93%)
 rename src/brreg/enhetsregisteret/{types.py => _types.py} (100%)

diff --git a/src/brreg/__init__.py b/src/brreg/__init__.py
index e3b2bd1..d07d307 100644
--- a/src/brreg/__init__.py
+++ b/src/brreg/__init__.py
@@ -1,8 +1,9 @@
 __version__ = "1.0.0a1"
 
-from brreg.exceptions import *  # noqa: F403, I001
+from brreg._exceptions import BrregError, BrregRestError
 
-# Must come after reexport
-from brreg import exceptions
-
-__all__ = exceptions.__all__
+__all__ = [
+    # From _exceptions module:
+    "BrregError",
+    "BrregRestError",
+]
diff --git a/src/brreg/exceptions.py b/src/brreg/_exceptions.py
similarity index 92%
rename from src/brreg/exceptions.py
rename to src/brreg/_exceptions.py
index f438f9d..a63d062 100644
--- a/src/brreg/exceptions.py
+++ b/src/brreg/_exceptions.py
@@ -1,6 +1,3 @@
-__all__ = ["BrregError", "BrregRestError"]
-
-
 from typing import Optional
 
 
diff --git a/src/brreg/enhetsregisteret/__init__.py b/src/brreg/enhetsregisteret/__init__.py
index 5075351..ea17f7c 100644
--- a/src/brreg/enhetsregisteret/__init__.py
+++ b/src/brreg/enhetsregisteret/__init__.py
@@ -3,13 +3,22 @@
 See https://data.brreg.no/enhetsregisteret/api/docs/index.html for API details.
 """
 
-from brreg.enhetsregisteret.client import *  # noqa: F403, I001
-from brreg.enhetsregisteret.types import *  # noqa: F403
-
-# Must come after reexport imports
-from brreg.enhetsregisteret import (
-    client,
-    types,
+from brreg.enhetsregisteret._client import get_enhet
+from brreg.enhetsregisteret._types import (
+    Adresse,
+    Enhet,
+    InstitusjonellSektorkode,
+    Naeringskode,
+    Organisasjonsform,
 )
 
-__all__ = client.__all__ + types.__all__
+__all__ = [
+    # From _client module:
+    "get_enhet",
+    # From _types module:
+    "Adresse",
+    "Enhet",
+    "InstitusjonellSektorkode",
+    "Naeringskode",
+    "Organisasjonsform",
+]
diff --git a/src/brreg/enhetsregisteret/client.py b/src/brreg/enhetsregisteret/_client.py
similarity index 93%
rename from src/brreg/enhetsregisteret/client.py
rename to src/brreg/enhetsregisteret/_client.py
index 32c63c3..fba8714 100644
--- a/src/brreg/enhetsregisteret/client.py
+++ b/src/brreg/enhetsregisteret/_client.py
@@ -3,10 +3,8 @@
 import requests
 
 from brreg import BrregError, BrregRestError
-from brreg.enhetsregisteret.types import Enhet
-
-__all__ = ["get_enhet"]
 
+from ._types import Enhet
 
 BASE_URL = "https://data.brreg.no/enhetsregisteret/api"
 
diff --git a/src/brreg/enhetsregisteret/types.py b/src/brreg/enhetsregisteret/_types.py
similarity index 100%
rename from src/brreg/enhetsregisteret/types.py
rename to src/brreg/enhetsregisteret/_types.py