From e2d60eef290219e50a6637ddd3601f4538207d93 Mon Sep 17 00:00:00 2001
From: Jan-Benedikt Jagusch <jan.jagusch@gmail.com>
Date: Sat, 18 Feb 2023 21:10:07 +0100
Subject: [PATCH] Enable pyright reportPrivateImportUsage.

---
 pyproject.toml        |  2 +-
 quetz/main.py         | 15 +++++++--------
 quetz/pkgstores.py    |  4 +++-
 quetz/tasks/mirror.py |  5 ++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 7833921f..67af0535 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,7 @@ reportMissingTypeStubs = false
 reportOptionalMemberAccess = false
 reportOptionalOperand = false
 reportOptionalSubscript = false
-reportPrivateImportUsage = false
+reportPrivateImportUsage = true
 reportUnboundVariable = false
 reportUndefinedVariable = false
 venv = ".venv"
diff --git a/quetz/main.py b/quetz/main.py
index 673d4545..c4401e15 100644
--- a/quetz/main.py
+++ b/quetz/main.py
@@ -17,6 +17,7 @@
 from typing import List, Optional, Tuple, Type
 
 import pydantic
+import pydantic.error_wrappers
 import requests
 from fastapi import (
     APIRouter,
@@ -41,13 +42,11 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware.httpsredirect import HTTPSRedirectMiddleware
 from starlette.middleware.sessions import SessionMiddleware
-from tenacity import (
-    after_log,
-    retry,
-    retry_if_result,
-    stop_after_attempt,
-    wait_exponential,
-)
+from tenacity import retry
+from tenacity.after import after_log
+from tenacity.retry import retry_if_result
+from tenacity.stop import stop_after_attempt
+from tenacity.wait import wait_exponential
 
 from quetz import (
     authorization,
@@ -1596,7 +1595,7 @@ def _delete_file(condainfo, filename):
                     summary=str(condainfo.about.get("summary", "n/a")),
                     description=str(condainfo.about.get("description", "n/a")),
                 )
-            except pydantic.main.ValidationError as err:
+            except pydantic.error_wrappers.ValidationError as err:
                 _delete_file(condainfo, file.filename)
                 raise errors.ValidationError(
                     "Validation Error for package: "
diff --git a/quetz/pkgstores.py b/quetz/pkgstores.py
index 26502281..0caf0fad 100644
--- a/quetz/pkgstores.py
+++ b/quetz/pkgstores.py
@@ -19,7 +19,9 @@
 from typing import IO, List, Tuple, Union
 
 import fsspec
-from tenacity import retry, retry_if_exception_type, stop_after_attempt
+from tenacity import retry
+from tenacity.retry import retry_if_exception_type
+from tenacity.stop import stop_after_attempt
 
 try:
     import xattr
diff --git a/quetz/tasks/mirror.py b/quetz/tasks/mirror.py
index f5042201..e0b7fa18 100644
--- a/quetz/tasks/mirror.py
+++ b/quetz/tasks/mirror.py
@@ -10,7 +10,10 @@
 
 import requests
 from fastapi import HTTPException, status
-from tenacity import TryAgain, after_log, retry, stop_after_attempt, wait_exponential
+from tenacity import TryAgain, retry
+from tenacity.after import after_log
+from tenacity.stop import stop_after_attempt
+from tenacity.wait import wait_exponential
 
 from quetz import authorization, rest_models
 from quetz.condainfo import CondaInfo, get_subdir_compat