chore: remove use of six and mock

mypy-baseline.txt

@@ -1,6 +1,4 @@
-posthog/utils.py:0: error: Library stubs not installed for "six"  [import-untyped]
 posthog/utils.py:0: error: Library stubs not installed for "dateutil.tz"  [import-untyped]
-posthog/utils.py:0: error: Statement is unreachable  [unreachable]
 posthog/request.py:0: error: Library stubs not installed for "requests"  [import-untyped]
 posthog/request.py:0: note: Hint: "python3 -m pip install types-requests"
 posthog/request.py:0: error: Library stubs not installed for "dateutil.tz"  [import-untyped]
@@ -18,8 +16,6 @@ posthog/client.py:0: error: Library stubs not installed for "dateutil.tz"  [impo
 posthog/client.py:0: note: Hint: "python3 -m pip install types-python-dateutil"
 posthog/client.py:0: note: (or run "mypy --install-types" to install all missing stub packages)
 posthog/client.py:0: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports
-posthog/client.py:0: error: Library stubs not installed for "six"  [import-untyped]
-posthog/client.py:0: note: Hint: "python3 -m pip install types-six"
 posthog/client.py:0: error: Name "queue" already defined (by an import)  [no-redef]
 posthog/client.py:0: error: Need type annotation for "queue"  [var-annotated]
 posthog/client.py:0: error: Incompatible types in assignment (expression has type "Any | list[Any]", variable has type "None")  [assignment]

posthog/client.py

@@ -8,7 +8,6 @@
 from uuid import uuid4
 
 from dateutil.tz import tzutc
-from six import string_types
 from typing_extensions import Unpack
 
 from posthog.args import ID_TYPES, ExceptionArg, OptionalCaptureArgs, OptionalSetArgs
@@ -2348,6 +2347,6 @@ def _add_local_person_and_group_properties(
 def stringify_id(val):
     if val is None:
         return None
-    if isinstance(val, string_types):
+    if isinstance(val, str):
         return val
     return str(val)

posthog/test/test_before_send.py

@@ -1,7 +1,7 @@
 import importlib
 import unittest
+from unittest import mock
 
-import mock
 import posthog
 
 from posthog.client import Client

posthog/test/test_client.py

@@ -3,8 +3,7 @@
 from datetime import datetime
 from uuid import uuid4
 
-import mock
-import six
+from unittest import mock
 from parameterized import parameterized
 
 from posthog.client import Client
@@ -1728,7 +1727,7 @@ def test_overflow(self):
         self.assertIsNone(msg_uuid)
 
     def test_unicode(self):
-        Client(six.u("unicode_key"))
+        Client("unicode_key")
 
     def test_numeric_distinct_id(self):
         self.client.capture("python event", distinct_id=1234)

posthog/test/test_consumer.py

@@ -3,7 +3,7 @@
 import unittest
 from typing import Any
 
-import mock
+from unittest import mock
 from parameterized import parameterized
 
 try:

posthog/test/test_feature_flag_result.py

@@ -1,6 +1,5 @@
 import unittest
-
-import mock
+from unittest import mock
 
 from posthog.client import Client
 from posthog.test.test_utils import FAKE_TEST_API_KEY

posthog/test/test_feature_flags.py

@@ -1,7 +1,7 @@
 import datetime
 import unittest
 
-import mock
+from unittest import mock
 from dateutil import parser, tz
 from freezegun import freeze_time
 

posthog/test/test_request.py

@@ -1,8 +1,8 @@
 import json
 import unittest
 from datetime import date, datetime
+from unittest import mock
 
-import mock
 import pytest
 import requests
 

posthog/test/test_utils.py

@@ -7,7 +7,6 @@
 from typing import Optional
 from uuid import UUID
 
-import six
 from dateutil.tz import tzutc
 from parameterized import parameterized
 from pydantic import BaseModel
@@ -48,7 +47,7 @@ def test_timezone_utils(self):
     def test_clean(self):
         simple = {
             "decimal": Decimal("0.142857"),
-            "unicode": six.u("woo"),
+            "unicode": "woo",
             "date": datetime.now(),
             "long": 200000000,
             "integer": 1,

posthog/utils.py

@@ -13,7 +13,6 @@
 import platform
 import distro  # For Linux OS detection
 
-import six
 from dateutil.tz import tzlocal, tzutc
 
 log = logging.getLogger("posthog")
@@ -58,9 +57,7 @@ def clean(item):
         return float(item)
     if isinstance(item, UUID):
         return str(item)
-    if isinstance(
-        item, (six.string_types, bool, numbers.Number, datetime, date, type(None))
-    ):
+    if isinstance(item, (str, bool, numbers.Number, datetime, date, type(None))):
         return item
     if isinstance(item, (set, list, tuple)):
         return _clean_list(item)
@@ -88,7 +85,7 @@ def _clean_list(list_):
 
 def _clean_dict(dict_):
     data = {}
-    for k, v in six.iteritems(dict_):
+    for k, v in dict_.items():
         try:
             data[k] = clean(v)
         except TypeError:

pyproject.toml

@@ -25,7 +25,6 @@ classifiers = [
 ]
 dependencies = [
     "requests>=2.7,<3.0",
-    "six>=1.5",
     "python-dateutil>=2.2",
     "backoff>=1.10.0",
     "distro>=1.5.0",
@@ -47,11 +46,9 @@ dev = [
     "lxml",
     "mypy",
     "mypy-baseline",
-    "types-mock",
     "types-python-dateutil",
     "types-requests",
     "types-setuptools",
-    "types-six",
     "pre-commit",
     "pydantic>=2.12.0",
     "ruff",
@@ -63,7 +60,6 @@ dev = [
     "tomli_w",
 ]
 test = [
-    "mock>=2.0.0",
     "freezegun==1.5.1",
     "coverage",
     "pytest",