Misc code cleanup

Author: Archmonger

src/reactpy_django/hooks.py

@@ -15,7 +15,7 @@
 )
 from uuid import uuid4
 
-import orjson as pickle
+import orjson
 from channels import DEFAULT_CHANNEL_LAYER
 from channels.db import database_sync_to_async
 from channels.layers import InMemoryChannelLayer, get_channel_layer
@@ -351,7 +351,7 @@ async def _set_user_data(data: dict):
 
         pk = get_pk(user)
         model, _ = await UserDataModel.objects.aget_or_create(user_pk=pk)
-        model.data = pickle.dumps(data)
+        model.data = orjson.dumps(data)
         await model.asave()
 
     query: Query[dict | None] = use_query(
@@ -471,7 +471,7 @@ async def _get_user_data(
 
     pk = get_pk(user)
     model, _ = await UserDataModel.objects.aget_or_create(user_pk=pk)
-    data = pickle.loads(model.data) if model.data else {}
+    data = orjson.loads(model.data) if model.data else {}
 
     if not isinstance(data, dict):
         raise TypeError(f"Expected dict while loading user data, got {type(data)}")

src/reactpy_django/models.py

@@ -3,6 +3,8 @@
 from django.db.models.signals import pre_delete
 from django.dispatch import receiver
 
+from reactpy_django.utils import get_pk
+
 
 class ComponentSession(models.Model):
     """A model for storing component sessions."""
@@ -41,6 +43,6 @@ class UserDataModel(models.Model):
 @receiver(pre_delete, sender=get_user_model(), dispatch_uid="reactpy_delete_user_data")
 def delete_user_data(sender, instance, **kwargs):
     """Delete ReactPy's `UserDataModel` when a Django `User` is deleted."""
-    pk = getattr(instance, instance._meta.pk.name)
+    pk = get_pk(instance)
 
     UserDataModel.objects.filter(user_pk=pk).delete()

src/reactpy_django/router/resolvers.py

@@ -52,7 +52,7 @@ def parse_path(path: str) -> tuple[re.Pattern[str], ConverterMapping]:
     pattern += f"{re.escape(path[last_match_end:])}$"
 
     # Replace literal `*` with "match anything" regex pattern, if it's at the end of the path
-    if pattern.endswith("\*$"):
+    if pattern.endswith(r"\*$"):
         pattern = f"{pattern[:-3]}.*$"
 
     return re.compile(pattern), converters