MambuPy 2.1.1__tar.gz → 2.3.0__tar.gz

{mambupy-2.1.1 → mambupy-2.3.0}/MambuPy/__init__.py

@@ -8,15 +8,13 @@
     MambuPy.api
     MambuPy.api.connector
     MambuPy.orm
-    MambuPy.rest
 
 
 Currently, there are two different ways to access Mambu objects:
 
 1) Objects using `Mambu REST API
    <https://developer.mambu.com/customer/en/portal/articles/1162276-rest-apis-overview/>`_
-   , they live at the :any:`MambuPy.api` package (the old-and-soon-to-be-deprecated,
-   V1-compatible code lives at :any:`MambuPy.rest`
+   , they live at the :any:`MambuPy.api` package
 
 2) An ORM using a `DB backup retrieved from Mambu
    <https://support.mambu.com/docs/mambu-data-dictionary>`_
@@ -39,7 +37,7 @@ import sys
 from importlib.abc import MetaPathFinder
 from importlib.util import spec_from_file_location
 
-__version__ = "2.1.1"
+__version__ = "2.3.0"
 """The version of this module."""
 
 

{mambupy-2.1.1/mambupy → mambupy-2.3.0/MambuPy}/mambuconfig.py

@@ -105,20 +105,10 @@ You may edit this to your own liking. But beware of pricking eyes!
 """
 
 import os
+import configparser
+from configparser import NoSectionError
 
-# import ConfigParser depending on Python version
-import sys
-
-if sys.version_info.major < 3:
-    import ConfigParser
-    from ConfigParser import NoSectionError
-
-    config = ConfigParser.ConfigParser(defaults=default_configs)
-else:
-    import configparser
-    from configparser import NoSectionError
-
-    config = configparser.ConfigParser(defaults=default_configs)
+config = configparser.ConfigParser(defaults=default_configs)
 
 # argparse for command line arguments overriding
 import argparse

{mambupy-2.1.1/mambupy → mambupy-2.3.0/MambuPy}/mambuutil.py

@@ -31,13 +31,6 @@ import yaml
 from .mambuconfig import apipagination, apipwd, apiurl, apiuser, loggingconf, activate_request_session_objects
 from .mambugeturl import getmambuurl
 
-try:
-    # python2
-    unicode
-except NameError:
-    # python3
-    unicode = str
-
 import json
 import sys
 from datetime import datetime, timezone
@@ -186,21 +179,23 @@ def date_format(field, formato=None, as_utc=False):
 
     if not formato:
         formato = "%Y-%m-%dT%H:%M:%S"
-    if sys.version_info < (3, 0):
-        return datetime.strptime(
-            datetime.strptime(field, "%Y-%m-%dT%H:%M:%S+0000").strftime(formato),
+
+    field_with_tz = datetime.fromisoformat(field)
+
+    if as_utc and field_with_tz.tzinfo is not None:
+        # Convertir a UTC mientras aún tiene tzinfo
+        field_as_dt = field_with_tz.astimezone(timezone.utc)
+        field_as_dt = datetime.strptime(
+            field_as_dt.strftime(formato),
             formato,
         )
     else:
         field_as_dt = datetime.strptime(
-            datetime.fromisoformat(field).strftime(formato),
+            field_with_tz.strftime(formato),
             formato,
         )
-        if as_utc:
-            field_as_dt = field_as_dt.astimezone(
-                timezone.utc
-            ).replace(tzinfo=None)
-        return field_as_dt
+
+    return field_as_dt
 
 
 def strip_tags(html):
@@ -221,10 +216,7 @@ def strip_tags(html):
         """
 
         def __init__(self):
-            try:
-                super().__init__()  # required for python3
-            except TypeError:  # pragma: no cover
-                pass  # with python2 raises TypeError
+            super().__init__()
             self.reset()
             self.fed = []
 
@@ -256,12 +248,7 @@ def strip_consecutive_repeated_char(s, ch):
     return sdest
 
 
-if sys.version_info >= (3, 0):
-    # python3
-    from urllib import parse as urlparse
-else:  # pragma: no cover
-    # python2
-    import urlparse
+from urllib import parse as urlparse
 
 
 def iri_to_uri(iri):
@@ -277,35 +264,9 @@ def iri_to_uri(iri):
     unicode chars there. Using this I solved the problem.
     """
 
-    def url_encode_non_ascii(b):
-        """Encode Non ASCII chars to URL-friendly chars.
-
-        Sometimes unicode gets in the way. A shame, I know. And perhaps the
-        biggest shame is not me correctly handling it.
-        """
-        import re
-
-        return re.sub("[\x80-\xFF]", lambda c: "%%%02x" % ord(c.group(0)), b)
-
     parts = urlparse.urlparse(iri)
-    if sys.version_info < (3, 0):  # pragma: no cover
-        # python2
-        partes = []
-        for parti, part in enumerate(parts):
-            try:
-                if parti != 1:
-                    partes.append(url_encode_non_ascii(part.encode("utf-8")))
-                else:
-                    partes.append(part.encode("idna"))
-            except UnicodeDecodeError:
-                partes.append(url_encode_non_ascii(part.decode("latin")))
-            except Exception:
-                raise Exception
-        return urlparse.urlunparse(partes)
-    else:
-        # python3
-        uri = [part.decode("utf8") for parti, part in enumerate(parts.encode("utf8"))]
-        return urlparse.urlunparse(uri)
+    uri = [part.decode("utf8") for parti, part in enumerate(parts.encode("utf8"))]
+    return urlparse.urlunparse(uri)
 
 
 def encoded_dict(in_dict):
@@ -315,13 +276,6 @@ def encoded_dict(in_dict):
     """
     out_dict = {}
     for k, v in in_dict.items():
-        if isinstance(v, unicode):
-            if sys.version_info < (3, 0):  # pragma: no cover
-                v = v.encode("utf8")
-        elif isinstance(v, str):
-            # Must be encoded in UTF-8
-            if sys.version_info < (3, 0):  # pragma: no cover
-                v.decode("utf8")
         out_dict[k] = v
     return out_dict
 

{mambupy-2.1.1/mambupy → mambupy-2.3.0/MambuPy}/orm/schema_groups.py

@@ -15,10 +15,9 @@ from .schema_users import User
 
 # technical debt, cannot import name schema_clients
 try:
-    from . import \
-        schema_clients  # this should work for python2 and python3, but doesnt
-except Exception as e:
-    import schema_clients  # python 2
+    from . import schema_clients
+except Exception:
+    import schema_clients
 
 from sqlalchemy import (Column, DateTime, ForeignKey, Integer, Numeric, String,
                         Text)

{mambupy-2.1.1/mambupy → mambupy-2.3.0/MambuPy}/orm/schema_orm.py

@@ -23,8 +23,6 @@ every schema_*.py you need.
 This last requirement also applies for the Base, or for the engine and
 the sessionmaker for that matter.
 """
-from __future__ import absolute_import
-
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, scoped_session
 

mambupy-2.3.0/MambuPy/rest/__init__.py

@@ -0,0 +1,31 @@
+# coding: utf-8
+"""MambuPy REST module - DEPRECATED.
+
+.. warning::
+
+   DEPRECATED: This module uses Mambu API v1 which is no longer supported.
+   This code is maintained only for backwards compatibility with legacy systems.
+   It will be removed in a future version of MambuPy.
+
+   Only mambuactivity is available in this legacy module.
+"""
+import warnings
+
+warnings.warn(
+    "MambuPy.rest module is deprecated and will be removed in a future version. "
+    "Mambu API v1 is no longer supported by Mambu.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
+from .mambuactivity import (
+    MambuActivity,
+    MambuActivities,
+    getactivitiesurl,
+)
+
+__all__ = [
+    "MambuActivity",
+    "MambuActivities",
+    "getactivitiesurl",
+]