Migrate to pydantic v2 (closes #85)

sanjacob · Sep 17, 2023 · ee9db4e · ee9db4e
1 parent c49fea7
commit ee9db4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/blackboard_sync/blackboard/api.py b/blackboard_sync/blackboard/api.py
@@ -912,7 +912,7 @@ def fetch_current_active_user(self, response):
         return response
 
     @property
-    def base_url(self):
+    def base_url(self) -> str:
         """API base URL."""
         return self._base_url
 

diff --git a/blackboard_sync/blackboard/blackboard.py b/blackboard_sync/blackboard/blackboard.py
@@ -22,17 +22,13 @@
 from datetime import datetime
 from typing import Union, Optional
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator, ConfigDict
 from pathvalidate import sanitize_filename
 
 
 class ImmutableModel(BaseModel):
     """Model with const attributes."""
-
-    class Config:
-        """Modify default configuration."""
-
-        allow_mutation = False
+    model_config = ConfigDict(frozen=True)
 
 
 class BBLocale(ImmutableModel):
@@ -136,7 +132,7 @@ class BBContentHandler(ImmutableModel):
     assessmentId: Optional[str] = None
     proctoring: Optional[BBProctoring] = None
 
-    @validator('id')
+    @field_validator('id')
     def resource_parser(cls, v: Union[BBResourceType, str]):
         """Validate and parse an id resource type."""
         return BBResourceType(v.replace('resource/', ''))

diff --git a/blackboard_sync/sync.py b/blackboard_sync/sync.py
@@ -124,7 +124,7 @@ def auth(self, cookie_jar: RequestsCookieJar) -> bool:
         self._cookies = cookie_jar
 
         try:
-            u_sess = BlackboardSession(self.university.api_url, cookie_jar)
+            u_sess = BlackboardSession(str(self.university.api_url), cookie_jar)
         except ValueError:
             self.logger.warning("Credentials are incorrect")
         else: