morango 0.7.1__py2.py3-none-any.whl → 0.8.1__py2.py3-none-any.whl

morango/migrations/0006_instanceidmodel_system_id.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2017-06-30 00:15
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0007_auto_20171018_1615.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.13 on 2017-10-18 21:15
-from __future__ import unicode_literals
-
 import datetime
 
 import django.db.models.deletion

morango/migrations/0008_auto_20171114_2217.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-11-14 22:17
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 import django.db.models.manager
 from django.db import migrations

morango/migrations/0009_auto_20171205_0252.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-12-05 08:52
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

morango/migrations/0010_auto_20171206_1615.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.13 on 2017-12-06 22:15
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0011_sharedkey.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.13 on 2018-06-12 18:38
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0012_auto_20180927_1658.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.15 on 2018-09-27 16:58
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0013_auto_20190627_1513.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.21 on 2019-06-27 22:13
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import morango.models.fields.uuids

morango/migrations/0014_syncsession_extra_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.27 on 2019-12-30 18:28
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0015_auto_20200508_2104.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2020-05-08 21:04
-from __future__ import unicode_literals
-
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

morango/migrations/0016_store_deserialization_error.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.28 on 2020-06-10 23:48
-from __future__ import unicode_literals
-
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

morango/migrations/0017_store_last_transfer_session_id.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.28 on 2021-06-25 23:13
-from __future__ import unicode_literals
-
 from django.db import migrations
+
 import morango.models.fields.uuids
 
 

morango/migrations/0018_auto_20210714_2216.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2021-07-14 22:16
-from __future__ import unicode_literals
-
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

morango/migrations/0019_auto_20220113_1807.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2022-01-13 18:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

morango/migrations/0020_postgres_fix_nullable.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2022-01-13 18:07
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

morango/migrations/0021_store_partition_index_create.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2022-04-27 16:59
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0022_rename_instance_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2023-01-31 18:53
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

morango/migrations/0023_add_instance_id_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2023-01-31 19:03
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

morango/migrations/0024_auto_20240129_1757.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.23 on 2024-01-29 17:57
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('morango', '0023_add_instance_id_fields'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='certificate',
+            name='level',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='certificate',
+            name='lft',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='certificate',
+            name='rght',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+    ]

morango/models/__init__.py

@@ -21,9 +21,6 @@ from morango.models.fields import __all__ as fields_all
 from morango.models.fields.crypto import SharedKey
 from morango.models.fields.uuids import UUIDModelMixin
 from morango.models.manager import SyncableModelManager
-from morango.models.morango_mptt import MorangoMPTTModel
-from morango.models.morango_mptt import MorangoMPTTTreeManager
-from morango.models.morango_mptt import MorangoTreeQuerySet
 from morango.models.query import SyncableModelQuerySet
 from morango.registry import syncable_models
 
@@ -41,9 +38,6 @@ __all__ += [
     "SyncableModelManager",
     "SyncableModelQuerySet",
     "syncable_models",
-    "MorangoTreeQuerySet",
-    "MorangoMPTTTreeManager",
-    "MorangoMPTTModel",
     "DatabaseIDModel",
     "InstanceIDModel",
     "SyncSession",

morango/models/certificates.py

@@ -3,8 +3,6 @@
 Each certificate has a ``private_key`` used for signing (child) certificates (thus giving certain permissions)
 and a ``public_key`` used for verifying that a certificate(s) was properly signed.
 """
-from __future__ import unicode_literals
-
 import json
 import string
 
@@ -13,8 +11,6 @@ from django.core.management import call_command
 from django.db import models
 from django.db import transaction
 from django.utils import timezone
-from django.utils.six import string_types
-from future.utils import python_2_unicode_compatible
 
 from .fields.crypto import Key
 from .fields.crypto import PrivateKeyField
@@ -30,7 +26,6 @@ from morango.errors import NonceExpired
 from morango.utils import _assert
 
 
-@python_2_unicode_compatible
 class Certificate(mptt.models.MPTTModel, UUIDModelMixin):
 
     uuid_input_fields = ("public_key", "profile", "salt")
@@ -199,7 +194,7 @@ class Certificate(mptt.models.MPTTModel, UUIDModelMixin):
     def save_certificate_chain(cls, cert_chain, expected_last_id=None):
 
         # parse the chain from json if needed
-        if isinstance(cert_chain, string_types):
+        if isinstance(cert_chain, str):
             cert_chain = json.loads(cert_chain)
 
         # start from the bottom of the chain
@@ -324,16 +319,15 @@ class ScopeDefinition(models.Model):
         return Scope(definition=self, params=params)
 
     def get_description(self, params):
-        if isinstance(params, string_types):
+        if isinstance(params, str):
             params = json.loads(params)
         return string.Template(self.description).safe_substitute(params)
 
 
-@python_2_unicode_compatible
 class Filter(object):
     def __init__(self, template, params={}):
         # ensure params have been deserialized
-        if isinstance(params, string_types):
+        if isinstance(params, str):
             params = json.loads(params)
         self._template = template
         self._params = params

morango/models/core.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import functools
 import json
 import logging
@@ -24,7 +22,6 @@ from django.db.models.deletion import Collector
 from django.db.models.expressions import CombinedExpression
 from django.db.models.fields.related import ForeignKey
 from django.db.models.functions import Cast
-from django.utils import six
 from django.utils import timezone
 from django.utils.functional import cached_property
 
@@ -39,7 +36,6 @@ from morango.models.fields.uuids import UUIDField
 from morango.models.fields.uuids import UUIDModelMixin
 from morango.models.fsic_utils import remove_redundant_instance_counters
 from morango.models.manager import SyncableModelManager
-from morango.models.morango_mptt import MorangoMPTTModel
 from morango.models.utils import get_0_4_system_parameters
 from morango.models.utils import get_0_5_mac_address
 from morango.models.utils import get_0_5_system_id
@@ -355,10 +351,10 @@ class TransferSession(models.Model):
 
     def get_touched_record_ids_for_model(self, model):
         if isinstance(model, SyncableModel) or (
-            isinstance(model, six.class_types) and issubclass(model, SyncableModel)
+            isinstance(model, type) and issubclass(model, SyncableModel)
         ):
             model = model.morango_model_name
-        _assert(isinstance(model, six.string_types), "Model must resolve to string")
+        _assert(isinstance(model, str), "Model must resolve to string")
         return Store.objects.filter(
             model_name=model, last_transfer_session_id=self.id
         ).values_list("id", flat=True)
@@ -422,7 +418,7 @@ class StoreQueryset(models.QuerySet):
             self.annotate(id_cast=Cast("id", TextField()))
             # remove dashes from char uuid
             .annotate(
-                fixed_id=Func(F("id_cast"), Value("-"), Value(""), function="replace")
+                fixed_id=Func(F("id_cast"), Value("-"), Value(""), function="replace", output_field=TextField())
             )
             # return as list
             .values_list("fixed_id", flat=True)
@@ -612,7 +608,7 @@ class DatabaseMaxCounter(AbstractCounter):
                         )
         else:
             updated_fsic = {}
-            for key, value in six.iteritems(fsics):
+            for key, value in fsics.items():
                 if key in internal_fsic:
                     # if same instance id, update fsic with larger value
                     if fsics[key] > internal_fsic[key]:
@@ -622,7 +618,7 @@ class DatabaseMaxCounter(AbstractCounter):
                     updated_fsic[key] = fsics[key]
 
             # load database max counters
-            for (key, value) in six.iteritems(updated_fsic):
+            for (key, value) in updated_fsic.items():
                 for f in sync_filter:
                     DatabaseMaxCounter.objects.update_or_create(
                         instance_id=key, partition=f, defaults={"counter": value}
@@ -845,10 +841,8 @@ class SyncableModel(UUIDModelMixin):
         with transaction.atomic():
             if hard_delete:
                 # set hard deletion for all related models
-                for model, instances in six.iteritems(collector.data):
-                    if issubclass(model, SyncableModel) or issubclass(
-                        model, MorangoMPTTModel
-                    ):
+                for model, instances in collector.data.items():
+                    if issubclass(model, SyncableModel):
                         for obj in instances:
                             obj._update_hard_deleted_models()
             return collector.delete()
@@ -932,15 +926,8 @@ class SyncableModel(UUIDModelMixin):
                 continue
             if f.attname in self._morango_internal_fields_not_to_serialize:
                 continue
-            # case if model is morango mptt
-            if f.attname in getattr(
-                self,
-                "_internal_mptt_fields_not_to_serialize",
-                "_internal_fields_not_to_serialize",
-            ):
-                continue
-            if hasattr(f, "value_from_object_json_compatible"):
-                data[f.attname] = f.value_from_object_json_compatible(self)
+            if getattr(f, "morango_serialize_to_string", False):
+                data[f.attname] = f.value_to_string(self)
             else:
                 data[f.attname] = f.value_from_object(self)
         return data
@@ -951,7 +938,10 @@ class SyncableModel(UUIDModelMixin):
         kwargs = {}
         for f in cls._meta.concrete_fields:
             if f.attname in dict_model:
-                kwargs[f.attname] = dict_model[f.attname]
+                if getattr(f, "morango_serialize_to_string", False):
+                    kwargs[f.attname] = f.to_python(dict_model[f.attname])
+                else:
+                    kwargs[f.attname] = dict_model[f.attname]
         return cls(**kwargs)
 
     @classmethod

morango/models/fields/crypto.py

@@ -6,7 +6,6 @@ desirability/efficiency from left to right). We have a base ``Key`` class which
 """
 import hashlib
 import re
-import sys
 
 import rsa as PYRSA
 from django.db import models
@@ -41,10 +40,8 @@ try:
 except ImportError:
     CRYPTOGRAPHY_EXISTS = False
 
-if sys.version_info[0] < 3:
-    from base64 import encodestring as b64encode, decodestring as b64decode
-else:
-    from base64 import encodebytes as b64encode, decodebytes as b64decode
+
+from base64 import encodebytes as b64encode, decodebytes as b64decode
 
 
 PKCS8_HEADER = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A"
@@ -347,7 +344,7 @@ class RSAKeyBaseField(models.TextField):
 
 
 class PublicKeyField(RSAKeyBaseField):
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection):
         if not value:
             return None
         return Key(public_key_string=value)
@@ -366,7 +363,7 @@ class PublicKeyField(RSAKeyBaseField):
 
 
 class PrivateKeyField(RSAKeyBaseField):
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection):
         if not value:
             return None
         return Key(private_key_string=value)

morango/models/fields/uuids.py

@@ -2,6 +2,7 @@ import hashlib
 import uuid
 
 from django.db import models
+
 from morango.utils import _assert
 
 
@@ -41,7 +42,7 @@ class UUIDField(models.CharField):
                 raise TypeError(self.error_messages["invalid"] % {"value": value})
         return value.hex
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection):
         return self.to_python(value)
 
     def to_python(self, value):

morango/models/utils.py

@@ -1,5 +1,4 @@
 import hashlib
-import ifcfg
 import os
 import platform
 import socket
@@ -7,10 +6,10 @@ import subprocess
 import sys
 import uuid
 
-from .fields.uuids import sha2_uuid
-
+import ifcfg
 from django.conf import settings
-from django.utils import six
+
+from .fields.uuids import sha2_uuid
 
 
 def _get_database_path():
@@ -109,7 +108,7 @@ def _get_android_uuid():
 def _do_salted_hash(value):
     if not value:
         return ""
-    if not isinstance(value, six.string_types):
+    if not isinstance(value, str):
         value = str(value)
     try:
         value = value.encode()
@@ -185,7 +184,7 @@ def _get_mac_address_flags(mac):
     """
     See: https://en.wikipedia.org/wiki/MAC_address#Universal_vs._local
     """
-    if isinstance(mac, six.integer_types):
+    if isinstance(mac, int):
         mac = _mac_int_to_ether(mac)
 
     first_octet = int(mac[:2], base=16)

morango/proquint.py

@@ -4,7 +4,6 @@ The simplest ways to use this module are the :func:`humanize` and :func:`uuid`
 functions. For tighter control over the output, see :class:`HumanHasher`.
 """
 import uuid
-from django.utils import six
 
 # Copyright (c) 2014 SUNET. All rights reserved.
 #
@@ -59,7 +58,7 @@ def from_int(data):
     :type data: int
     :rtype: string
     """
-    if not isinstance(data, six.integer_types):
+    if not isinstance(data, int):
         raise TypeError("Input must be integer")
 
     res = []
@@ -84,7 +83,7 @@ def to_int(data):
     :type data: string
     :rtype: int
     """
-    if not isinstance(data, six.string_types):
+    if not isinstance(data, str):
         raise TypeError("Input must be string")
 
     res = 0

morango/registry.py

@@ -7,7 +7,6 @@ import sys
 from collections import OrderedDict
 
 from django.db.models.fields.related import ForeignKey
-from django.utils import six
 
 from morango.constants import transfer_stages
 from morango.errors import InvalidMorangoModelConfiguration
@@ -111,36 +110,6 @@ class SyncableModelRegistry(object):
                     raise InvalidMorangoModelConfiguration(
                         "Syncing models with more than 1 self referential ForeignKey is not supported."
                     )
-                try:
-                    from mptt import models
-                    from morango.models.morango_mptt import (
-                        MorangoMPTTModel,
-                        MorangoMPTTTreeManager,
-                        MorangoTreeQuerySet,
-                    )
-
-                    # mptt syncable model checks
-                    if issubclass(model, models.MPTTModel):
-                        if not issubclass(model, MorangoMPTTModel):
-                            raise InvalidMorangoModelConfiguration(
-                                "{} that inherits from MPTTModel, should instead inherit from MorangoMPTTModel.".format(
-                                    name
-                                )
-                            )
-                        if not isinstance(model.objects, MorangoMPTTTreeManager):
-                            raise InvalidMorangoModelConfiguration(
-                                "Manager for {} must inherit from MorangoMPTTTreeManager.".format(
-                                    name
-                                )
-                            )
-                        if not isinstance(model.objects.none(), MorangoTreeQuerySet):
-                            raise InvalidMorangoModelConfiguration(
-                                "Queryset for {} model must inherit from MorangoTreeQuerySet.".format(
-                                    name
-                                )
-                            )
-                except ImportError:
-                    pass
                 # syncable model checks
                 if not isinstance(model.objects, SyncableModelManager):
                     raise InvalidMorangoModelConfiguration(
@@ -178,7 +147,7 @@ class SyncableModelRegistry(object):
                     self._insert_model_in_dependency_order(model, profile)
 
         # for each profile, create a dict mapping from morango_model_name to model class
-        for profile, model_list in six.iteritems(self.profile_models):
+        for profile, model_list in self.profile_models.items():
             mapping = OrderedDict()
             for model in model_list:
                 mapping[model.morango_model_name] = model

morango/sync/backends/utils.py

@@ -1,8 +1,7 @@
 import sqlite3
+from functools import lru_cache
 from importlib import import_module
 
-from django.utils.lru_cache import lru_cache
-
 from morango.errors import MorangoError
 
 
@@ -110,15 +109,15 @@ class TemporaryTable(object):
         """
         fields = []
         params = []
-        with self.connection.schema_editor() as schema_editor:
-            for field in self.fields:
-                # generates the SQL expression for the table column
-                field_sql, field_params = schema_editor.column_sql(
-                    self, field, include_default=True
-                )
-                field_sql_name = self.connection.ops.quote_name(field.column)
-                fields.append("{name} {sql}".format(name=field_sql_name, sql=field_sql))
-                params.extend(field_params)
+        schema_editor = self.connection.schema_editor()
+        for field in self.fields:
+            # generates the SQL expression for the table column
+            field_sql, field_params = schema_editor.column_sql(
+                self, field, include_default=True
+            )
+            field_sql_name = self.connection.ops.quote_name(field.column)
+            fields.append("{name} {sql}".format(name=field_sql_name, sql=field_sql))
+            params.extend(field_params)
         with self.connection.cursor() as c:
             self.backend._create_temporary_table(c, self.sql_name, fields, params)
 

morango/sync/syncsession.py

@@ -7,12 +7,10 @@ import os
 import socket
 import uuid
 from io import BytesIO
+from urllib.parse import urljoin
+from urllib.parse import urlparse
 
 from django.utils import timezone
-from django.utils.six import iteritems
-from django.utils.six import raise_from
-from django.utils.six.moves.urllib.parse import urljoin
-from django.utils.six.moves.urllib.parse import urlparse
 from requests.adapters import HTTPAdapter
 from requests.exceptions import HTTPError
 from requests.packages.urllib3.util.retry import Retry
@@ -299,7 +297,7 @@ class NetworkSyncConnection(Connection):
         try:
             self._get_sync_session(sync_session)
         except HTTPError as e:
-            raise_from(MorangoResumeSyncError("Failure resuming sync session"), e)
+            raise MorangoResumeSyncError("Failure resuming sync session") from e
 
         # update process id
         sync_session.process_id = os.getpid()
@@ -440,7 +438,7 @@ class NetworkSyncConnection(Connection):
         # convert user arguments into query str for passing to auth layer
         if isinstance(userargs, dict):
             userargs = "&".join(
-                ["{}={}".format(key, val) for (key, val) in iteritems(userargs)]
+                ["{}={}".format(key, val) for (key, val) in userargs.items()]
             )
         return self.session.post(
             self.urlresolve(api_urls.CERTIFICATE), json=data, auth=(userargs, password)
@@ -627,12 +625,9 @@ class TransferClient(object):
         """
         result = self.controller.proceed_to_and_wait_for(stage, callback=callback)
         if result == transfer_statuses.ERRORED:
-            raise_from(
-                MorangoError(
-                    error_msg or "Stage `{}` failed".format(self.context.stage)
-                ),
-                self.context.error,
-            )
+            raise MorangoError(
+                error_msg or "Stage `{}` failed".format(self.context.stage)
+            ) from self.context.error
 
     def initialize(self, sync_filter):
         """

morango/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
-from django.conf.urls import url
+from django.urls import include
+from django.urls import path
 
-urlpatterns = [url(r"^api/morango/v1/", include("morango.api.urls"))]
+urlpatterns = [path("api/morango/v1/", include("morango.api.urls"))]