udata 9.1.2.dev30355__py2.py3-none-any.whl → 9.1.2.dev30382__py2.py3-none-any.whl

udata/features/identicon/backends.py

@@ -2,137 +2,130 @@ import hashlib
 import io
 
 import pydenticon
-
-from flask import redirect, send_file, current_app
+from flask import current_app, redirect, send_file
 
 from udata import entrypoints
 from udata.app import cache
 
-ADORABLE_AVATARS_URL = 'https://api.adorable.io/avatars/{size}/{identifier}.png'  # noqa
-ROBOHASH_URL = 'https://robohash.org/{identifier}.png?size={size}x{size}&set={skin}&bgset={bg}'  # noqa
+ADORABLE_AVATARS_URL = "https://api.adorable.io/avatars/{size}/{identifier}.png"  # noqa
+ROBOHASH_URL = "https://robohash.org/{identifier}.png?size={size}x{size}&set={skin}&bgset={bg}"  # noqa
 
 
 # Default values overriden by theme default and local config
 DEFAULTS = {
-    'AVATAR_PROVIDER': 'internal',
+    "AVATAR_PROVIDER": "internal",
     # Internal provider
-    'AVATAR_INTERNAL_SIZE': 7,
-    'AVATAR_INTERNAL_FOREGROUND': [
-        'rgb(45,79,255)',
-        'rgb(254,180,44)',
-        'rgb(226,121,234)',
-        'rgb(30,179,253)',
-        'rgb(232,77,65)',
-        'rgb(49,203,115)',
-        'rgb(141,69,170)'
+    "AVATAR_INTERNAL_SIZE": 7,
+    "AVATAR_INTERNAL_FOREGROUND": [
+        "rgb(45,79,255)",
+        "rgb(254,180,44)",
+        "rgb(226,121,234)",
+        "rgb(30,179,253)",
+        "rgb(232,77,65)",
+        "rgb(49,203,115)",
+        "rgb(141,69,170)",
     ],
-    'AVATAR_INTERNAL_BACKGROUND': 'rgb(224,224,224)',
-    'AVATAR_INTERNAL_PADDING': 10,
-
+    "AVATAR_INTERNAL_BACKGROUND": "rgb(224,224,224)",
+    "AVATAR_INTERNAL_PADDING": 10,
     # robohash prodiver
-    'AVATAR_ROBOHASH_SKIN': 'set1',
-    'AVATAR_ROBOHASH_BACKGROUND': 'bg1',
+    "AVATAR_ROBOHASH_SKIN": "set1",
+    "AVATAR_ROBOHASH_BACKGROUND": "bg1",
 }
 
 
 def get_config(key):
-    '''
+    """
     Get an identicon configuration parameter.
 
     Precedance order is:
         - application config (`udata.cfg`)
         - default
-    '''
-    key = 'AVATAR_{0}'.format(key.upper())
+    """
+    key = "AVATAR_{0}".format(key.upper())
     local_config = current_app.config.get(key)
     return local_config or DEFAULTS[key]
 
 
 def get_internal_config(key):
-    return get_config('internal_{0}'.format(key))
+    return get_config("internal_{0}".format(key))
 
 
 def get_provider():
-    '''Get the current provider from config'''
-    name = get_config('provider')
-    available = entrypoints.get_all('udata.avatars')
+    """Get the current provider from config"""
+    name = get_config("provider")
+    available = entrypoints.get_all("udata.avatars")
     if name not in available:
-        raise ValueError('Unknown avatar provider: {0}'.format(name))
+        raise ValueError("Unknown avatar provider: {0}".format(name))
     return available[name]
 
 
 def get_identicon(identifier, size):
-    '''
+    """
     Get an identicon for a given identifier at a given size.
 
     Automatically select the provider from `AVATAR_PROVIDER`
 
     :returns: a HTTP response, either an image or a redirect
-    '''
+    """
     return get_provider()(identifier, size)
 
 
 @cache.memoize()
 def generate_pydenticon(identifier, size):
-    '''
+    """
     Use pydenticon to generate an identicon image.
     All parameters are extracted from configuration.
-    '''
-    blocks_size = get_internal_config('size')
-    foreground = get_internal_config('foreground')
-    background = get_internal_config('background')
-    generator = pydenticon.Generator(blocks_size, blocks_size,
-                                     digest=hashlib.sha1,
-                                     foreground=foreground,
-                                     background=background)
+    """
+    blocks_size = get_internal_config("size")
+    foreground = get_internal_config("foreground")
+    background = get_internal_config("background")
+    generator = pydenticon.Generator(
+        blocks_size, blocks_size, digest=hashlib.sha1, foreground=foreground, background=background
+    )
 
     # Pydenticon adds padding to the size and as a consequence
     # we need to compute the size without the padding
-    padding = int(round(get_internal_config('padding') * size / 100.))
+    padding = int(round(get_internal_config("padding") * size / 100.0))
     size = size - 2 * padding
-    padding = (padding, ) * 4
-    return generator.generate(identifier, size, size,
-                              padding=padding,
-                              output_format='png')
+    padding = (padding,) * 4
+    return generator.generate(identifier, size, size, padding=padding, output_format="png")
 
 
 def internal(identifier, size):
-    '''
+    """
     Internal provider
 
     Use pydenticon to generate an identicon.
-    '''
+    """
     identicon = generate_pydenticon(identifier, size)
-    response = send_file(io.BytesIO(identicon), mimetype='image/png')
+    response = send_file(io.BytesIO(identicon), mimetype="image/png")
     etag = hashlib.sha1(identicon).hexdigest()
     response.set_etag(etag)
     return response
 
 
 def adorable(identifier, size):
-    '''
+    """
     Adorable Avatars provider
 
     Simply redirect to the external API.
 
     See: http://avatars.adorable.io/
-    '''
+    """
     url = ADORABLE_AVATARS_URL.format(identifier=identifier, size=size)
     return redirect(url)
 
 
 def robohash(identifier, size):
-    '''
+    """
     Robohash provider
 
     Redirect to the Robohash API
     with parameters extracted from configuration.
 
     See: https://robohash.org/
-    '''
-    skin = get_config('robohash_skin')
-    background = get_config('robohash_background')
-    url = ROBOHASH_URL.format(
-        identifier=identifier, size=size, skin=skin, bg=background
-    )
+    """
+    skin = get_config("robohash_skin")
+    background = get_config("robohash_background")
+    url = ROBOHASH_URL.format(identifier=identifier, size=size, skin=skin, bg=background)
     return redirect(url)

udata/features/identicon/tests/test_backends.py

@@ -1,10 +1,10 @@
 import pytest
 
 from udata.features.identicon.backends import internal
-from udata.utils import faker
 from udata.tests.helpers import assert200
+from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures('app')
+pytestmark = pytest.mark.usefixtures("app")
 
 
 def assert_stream_equal(response1, response2):
@@ -18,12 +18,11 @@ class InternalBackendTest:
     def test_base_rendering(self):
         response = internal(faker.word(), 32)
         assert200(response)
-        assert response.mimetype == 'image/png'
+        assert response.mimetype == "image/png"
         assert response.is_streamed
         etag, weak = response.get_etag()
         assert etag is not None
 
     def test_render_twice_the_same(self):
         identifier = faker.word()
-        assert_stream_equal(internal(identifier, 32),
-                            internal(identifier, 32))
+        assert_stream_equal(internal(identifier, 32), internal(identifier, 32))

udata/features/notifications/__init__.py

@@ -1,4 +1,3 @@
-
 import logging
 
 log = logging.getLogger(__name__)

udata/features/notifications/actions.py

@@ -6,32 +6,32 @@ _providers = {}
 
 
 def register_provider(name, func):
-    '''Register a notification provder'''
+    """Register a notification provder"""
     _providers[name] = func
 
 
 def list_providers():
-    '''List registere notifcation provider'''
+    """List registere notifcation provider"""
     return _providers.keys()
 
 
 def notifier(name):
-    '''A decorator registering a function as provider'''
+    """A decorator registering a function as provider"""
+
     def wrapper(func):
         register_provider(name, func)
         return func
+
     return wrapper
 
 
 def get_notifications(user):
-    '''List notification for a given user'''
+    """List notification for a given user"""
     notifications = []
 
     for name, func in _providers.items():
-        notifications.extend([{
-            'type': name,
-            'created_on': dt,
-            'details': details
-        } for dt, details in func(user)])
+        notifications.extend(
+            [{"type": name, "created_on": dt, "details": details} for dt, details in func(user)]
+        )
 
     return notifications

udata/features/notifications/api.py

@@ -1,26 +1,30 @@
-from udata.api import api, fields, API
+from udata.api import API, api, fields
 from udata.auth import current_user
 
 from .actions import get_notifications
 
-notifs = api.namespace('notifications', 'Notifications API')
+notifs = api.namespace("notifications", "Notifications API")
 
-notifications_fields = api.model('Notification', {
-    'type': fields.String(description='The notification type', readonly=True),
-    'created_on': fields.ISODateTime(
-        description='The notification creation datetime', readonly=True),
-    'details': fields.Raw(
-        description='Key-Value details depending on notification type',
-        readonly=True)
-})
+notifications_fields = api.model(
+    "Notification",
+    {
+        "type": fields.String(description="The notification type", readonly=True),
+        "created_on": fields.ISODateTime(
+            description="The notification creation datetime", readonly=True
+        ),
+        "details": fields.Raw(
+            description="Key-Value details depending on notification type", readonly=True
+        ),
+    },
+)
 
 
-@notifs.route('/', endpoint='notifications')
+@notifs.route("/", endpoint="notifications")
 class NotificationsAPI(API):
     @api.secure
-    @api.doc('get_notifications')
+    @api.doc("get_notifications")
     @api.marshal_list_with(notifications_fields)
     def get(self):
-        '''List all current user pending notifications'''
+        """List all current user pending notifications"""
         user = current_user._get_current_object()
         return get_notifications(user)

udata/features/territories/__init__.py

@@ -1,6 +1,6 @@
 from flask import current_app
 
-from udata.models import db, GeoZone
+from udata.models import GeoZone, db
 
 
 def check_for_territories(query):
@@ -9,26 +9,28 @@ def check_for_territories(query):
 
     Results are sorted by population and area (biggest first).
     """
-    if not query or not current_app.config.get('ACTIVATE_TERRITORIES'):
+    if not query or not current_app.config.get("ACTIVATE_TERRITORIES"):
         return []
 
     dbqs = db.Q()
     query = query.lower()
     is_digit = query.isdigit()
     query_length = len(query)
-    for level in current_app.config.get('HANDLED_LEVELS'):
-        if level == 'country':
+    for level in current_app.config.get("HANDLED_LEVELS"):
+        if level == "country":
             continue  # Level not fully handled yet.
         q = db.Q(level=level)
-        if (query_length == 2 and level == 'fr:departement' and
-                (is_digit or query in ('2a', '2b'))):
+        if query_length == 2 and level == "fr:departement" and (is_digit or query in ("2a", "2b")):
             # Counties + Corsica.
             q &= db.Q(code=query)
-        elif query_length == 3 and level == 'fr:departement' and is_digit:
+        elif query_length == 3 and level == "fr:departement" and is_digit:
             # French DROM-COM.
             q &= db.Q(code=query)
-        elif query_length == 5 and level == 'fr:commune' and (
-                is_digit or query.startswith('2a') or query.startswith('2b')):
+        elif (
+            query_length == 5
+            and level == "fr:commune"
+            and (is_digit or query.startswith("2a") or query.startswith("2b"))
+        ):
             # INSEE code then postal codes with Corsica exceptions.
             q &= db.Q(code=query)
         elif query_length >= 4:
@@ -44,4 +46,4 @@ def check_for_territories(query):
         return []
 
     # Sort matching results by population and area.
-    return GeoZone.objects(dbqs).order_by('-population', '-area')
+    return GeoZone.objects(dbqs).order_by("-population", "-area")

udata/features/territories/api.py

@@ -1,26 +1,25 @@
-from udata.api import api, API
+from udata.api import API, api
 from udata.features.territories import check_for_territories
 
 suggest_parser = api.parser()
 suggest_parser.add_argument(
-    'q', type=str, help='The string to autocomplete/suggest',
-    location='args', required=True)
+    "q", type=str, help="The string to autocomplete/suggest", location="args", required=True
+)
 suggest_parser.add_argument(
-    'size', type=int, help='The maximum result size',
-    location='args', required=False)
+    "size", type=int, help="The maximum result size", location="args", required=False
+)
 
 
-@api.route('/territory/suggest/', endpoint='suggest_territory')
+@api.route("/territory/suggest/", endpoint="suggest_territory")
 class SuggestTerritoriesAPI(API):
-    @api.doc('suggest_territory')
+    @api.doc("suggest_territory")
     @api.expect(suggest_parser)
     def get(self):
         args = suggest_parser.parse_args()
-        territories = check_for_territories(args['q'])
-        if args['size']:
-            territories = territories[:args['size']]
-        return [{
-            'id': territory.id,
-            'title': territory.name,
-            'page': territory.external_url
-        } for territory in territories]
+        territories = check_for_territories(args["q"])
+        if args["size"]:
+            territories = territories[: args["size"]]
+        return [
+            {"id": territory.id, "title": territory.name, "page": territory.external_url}
+            for territory in territories
+        ]

udata/features/territories/models.py

@@ -2,27 +2,20 @@ from flask import url_for
 
 from udata.models import License, Organization
 
-__all__ = (
-    'TerritoryDataset', 'ResourceBasedTerritoryDataset', 'TERRITORY_DATASETS'
-)
+__all__ = ("TerritoryDataset", "ResourceBasedTerritoryDataset", "TERRITORY_DATASETS")
 
 
-TERRITORY_DATASETS = {
-    'commune': {},
-    'departement': {},
-    'region': {},
-    'country': {}
-}
+TERRITORY_DATASETS = {"commune": {}, "departement": {}, "region": {}, "country": {}}
 
 
 class TerritoryDataset(object):
     order = 0
-    id = ''
-    title = ''
-    organization_id = ''
-    url_template = ''
-    description = ''
-    license_id = 'fr-lo'
+    id = ""
+    title = ""
+    organization_id = ""
+    url_template = ""
+    description = ""
+    license_id = "fr-lo"
 
     def __init__(self, territory):
         self.territory = territory
@@ -33,8 +26,7 @@ class TerritoryDataset(object):
 
     @property
     def slug(self):
-        return '{territory_id}:{id}'.format(
-            territory_id=self.territory.id, id=self.id)
+        return "{territory_id}:{id}".format(territory_id=self.territory.id, id=self.id)
 
     @property
     def organization(self):
@@ -46,19 +38,22 @@ class TerritoryDataset(object):
 
 
 class ResourceBasedTerritoryDataset(TerritoryDataset):
-    dataset_id = ''
-    resource_id = ''
-    territory_attr = ''
-    csv_column = ''
+    dataset_id = ""
+    resource_id = ""
+    territory_attr = ""
+    csv_column = ""
 
     def url_for(self, external=False):
-        return url_for('territories.territory_dataset_resource',
-                       territory=self.territory,
-                       dataset=self.dataset_id,
-                       resource_id=self.resource_id,
-                       territory_attr=self.territory_attr,
-                       csv_column=self.csv_column,
-                       _external=external)
+        return url_for(
+            "territories.territory_dataset_resource",
+            territory=self.territory,
+            dataset=self.dataset_id,
+            resource_id=self.resource_id,
+            territory_attr=self.territory_attr,
+            csv_column=self.csv_column,
+            _external=external,
+        )
+
     url = property(url_for)
 
     @property

udata/features/transfer/actions.py

@@ -1,9 +1,7 @@
 import logging
-
 from datetime import datetime
 
-
-from udata.auth import login_required, current_user
+from udata.auth import current_user, login_required
 from udata.models import Organization, User
 
 from .models import Transfer
@@ -14,28 +12,27 @@ log = logging.getLogger(__name__)
 
 @login_required
 def request_transfer(subject, recipient, comment):
-    '''Initiate a transfer request'''
+    """Initiate a transfer request"""
     TransferPermission(subject).test()
     if recipient == (subject.organization or subject.owner):
-        raise ValueError(
-            'Recipient should be different than the current owner')
+        raise ValueError("Recipient should be different than the current owner")
     transfer = Transfer.objects.create(
         owner=subject.organization or subject.owner,
         recipient=recipient,
         subject=subject,
-        comment=comment
+        comment=comment,
     )
     return transfer
 
 
 @login_required
 def accept_transfer(transfer, comment=None):
-    '''Accept an incoming a transfer request'''
+    """Accept an incoming a transfer request"""
     TransferResponsePermission(transfer).test()
 
     transfer.responded = datetime.utcnow()
     transfer.responder = current_user._get_current_object()
-    transfer.status = 'accepted'
+    transfer.status = "accepted"
     transfer.response_comment = comment
     transfer.save()
 
@@ -53,12 +50,12 @@ def accept_transfer(transfer, comment=None):
 
 @login_required
 def refuse_transfer(transfer, comment=None):
-    '''Refuse an incoming a transfer request'''
+    """Refuse an incoming a transfer request"""
     TransferResponsePermission(transfer).test()
 
     transfer.responded = datetime.utcnow()
     transfer.responder = current_user._get_current_object()
-    transfer.status = 'refused'
+    transfer.status = "refused"
     transfer.response_comment = comment
     transfer.save()