Hopiu/django-ddp
1
0
Fork 0
mirror of https://github.com/jazzband/django-ddp.git synced 2026-03-16 22:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[MQ-683] Ran 2to3 over package.

Browse source
This commit is contained in:
Adamos Kyriakou 2021-03-04 08:42:56 +02:00
parent a145a823fb
commit 81a289b788
22 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dddp/__init__.py
View file

@ -1,5 +1,5 @@
"""Django/PostgreSQL implementation of the Meteor server."""
from __future__ import unicode_literals
import sys
from gevent.local import local
from dddp import alea
@ -71,9 +71,9 @@ class MeteorError(Exception):
error, reason, details, err_kwargs = self.args
result = {
key: val
for key, val in {
for key, val in list({
'error': error, 'reason': reason, 'details': details,
}.items()
}.items())
if val is not None
}
result.update(err_kwargs)
@ -165,7 +165,7 @@ THREAD_LOCAL_FACTORIES = {
'user': lambda: None,
}
THREAD_LOCAL = this = ThreadLocal() # pylint: disable=invalid-name
METEOR_ID_CHARS = u'23456789ABCDEFGHJKLMNPQRSTWXYZabcdefghijkmnopqrstuvwxyz'
METEOR_ID_CHARS = '23456789ABCDEFGHJKLMNPQRSTWXYZabcdefghijkmnopqrstuvwxyz'
def meteor_random_id(name=None, length=17):

16
dddp/accounts/ddp.py
View file

@ -85,7 +85,7 @@ def iter_auth_hashes(user, purpose, minutes_valid):
def get_auth_hash(user, purpose):
"""Generate a user hash for a particular purpose."""
return iter_auth_hashes(user, purpose, minutes_valid=1).next()
return next(iter_auth_hashes(user, purpose, minutes_valid=1))
def calc_expiry_time(minutes_valid):
@ -185,7 +185,7 @@ class Users(Collection):
"""Return name prefixed by `key_prefix`."""
return '%s%s' % (key_prefix, name)
for key in profile.keys():
for key in list(profile.keys()):
val = getter(key)
if key == prefixed('name'):
result['full_name'] = val
@ -208,7 +208,7 @@ class Users(Collection):
if len(update['$set']) != 0:
raise MeteorError(400, 'Invalid update fields: %r')
for key, val in profile_update.items():
for key, val in list(profile_update.items()):
setattr(user, key, val)
user.save()
@ -275,7 +275,7 @@ class Auth(APIMixin):
])
# first pass, send `added` for objs unique to `post`
for col_post, query in post.items():
for col_post, query in list(post.items()):
try:
qs_pre = pre[col_post]
query = query.exclude(
@ -288,7 +288,7 @@ class Auth(APIMixin):
this.ws.send(col_post.obj_change_as_msg(obj, ADDED))
# second pass, send `removed` for objs unique to `pre`
for col_pre, query in pre.items():
for col_pre, query in list(pre.items()):
try:
qs_post = post[col_pre]
query = query.exclude(
@ -343,10 +343,10 @@ class Auth(APIMixin):
def get_username(self, user):
"""Retrieve username from user selector."""
if isinstance(user, basestring):
if isinstance(user, str):
return user
elif isinstance(user, dict) and len(user) == 1:
[(key, val)] = user.items()
[(key, val)] = list(user.items())
if key == 'username' or (key == self.user_model.USERNAME_FIELD):
# username provided directly
return val
@ -373,7 +373,7 @@ class Auth(APIMixin):
@staticmethod
def get_password(password):
"""Return password in plain-text from string/dict."""
if isinstance(password, basestring):
if isinstance(password, str):
# regular Django authentication - plaintext password... but you're
# using HTTPS (SSL) anyway so it's protected anyway, right?
return password

2
dddp/accounts/tests.py
View file

@ -1,5 +1,5 @@
"""Django DDP Accounts test suite."""
from __future__ import unicode_literals
import sys
from dddp import tests

4
dddp/admin.py
View file

@ -1,4 +1,4 @@
from __future__ import unicode_literals
from django.contrib import admin
from django.core.urlresolvers import reverse, NoReverseMatch
from django.utils.html import format_html
@ -7,7 +7,7 @@ from dddp import models
def object_admin_link(obj):
kwargs = {
'format_string': u'{app_label}.{model} {object_id}: {object}',
'format_string': '{app_label}.{model} {object_id}: {object}',
'app_label': obj.content_type.app_label,
'model': obj.content_type.model,
'object_id': obj.object_id,

2
dddp/alea.py
View file

@ -49,7 +49,7 @@ True
True
"""
from __future__ import unicode_literals
from math import floor
import os

24
dddp/api.py
View file

@ -1,5 +1,5 @@
"""Django DDP API, Collections, Cursors and Publications."""
from __future__ import absolute_import, unicode_literals, print_function
# standard library
import collections
@ -241,7 +241,7 @@ class Collection(APIMixin):
if user_rels:
if user is None:
return qs.none() # no user but we need one: return no objects.
if isinstance(user_rels, basestring):
if isinstance(user_rels, str):
user_rels = [user_rels]
user_filter = None
# Django supports model._meta -> pylint: disable=W0212
@ -283,7 +283,7 @@ class Collection(APIMixin):
if obj.pk is None:
return user_ids # nobody can see objects that don't exist
user_rels = self.user_rel
if isinstance(user_rels, basestring):
if isinstance(user_rels, str):
user_rels = [user_rels]
user_rel_map = {
'_user_rel_%d' % index: ArrayAgg(user_rel)
@ -303,7 +303,7 @@ class Collection(APIMixin):
).annotate(
**user_rel_map
).values_list(
*user_rel_map.keys()
*list(user_rel_map.keys())
).get():
user_ids.update(rel_user_ids)
user_ids.difference_update([None])
@ -411,15 +411,15 @@ class Collection(APIMixin):
"""Generate a DDP msg for obj with specified msg type."""
# check for F expressions
exps = [
name for name, val in vars(obj).items()
name for name, val in list(vars(obj).items())
if isinstance(val, ExpressionNode)
]
if exps:
# clone/update obj with values but only for the expression fields
obj = deepcopy(obj)
for name, val in self.model.objects.values(*exps).get(
for name, val in list(self.model.objects.values(*exps).get(
pk=obj.pk,
).items():
).items()):
setattr(obj, name, val)
# run serialization now all fields are "concrete" (not F expressions)
@ -448,9 +448,9 @@ class Collection(APIMixin):
# This will be sent as the `id`, don't send it in `fields`.
fields.pop(field.name)
for field in meta.local_many_to_many:
fields['%s_ids' % field.name] = get_meteor_ids(
fields['%s_ids' % field.name] = list(get_meteor_ids(
field.rel.to, fields.pop(field.name),
).values()
).values())
return data
def obj_change_as_msg(self, obj, msg, meteor_ids=None):
@ -572,7 +572,7 @@ class DDP(APIMixin):
@property
def api_providers(self):
"""Return an iterable of API providers."""
return self._registry.values()
return list(self._registry.values())
def qs_and_collection(self, qs):
"""Return (qs, collection) from qs (which may be a tuple)."""
@ -608,7 +608,7 @@ class DDP(APIMixin):
),
)
for col, qs
in queries.items()
in list(queries.items())
)
for other in Subscription.objects.filter(
connection=obj.connection_id,
@ -628,7 +628,7 @@ class DDP(APIMixin):
*args, **kwargs
).values('pk'),
)
for col, qs in to_send.items():
for col, qs in list(to_send.items()):
yield col, qs.distinct()
@api_endpoint

2
dddp/apps.py
View file

@ -19,7 +19,7 @@ class DjangoDDPConfig(AppConfig):
"""Initialisation for django-ddp (setup lookups and signal handlers)."""
if not settings.DATABASES:
raise ImproperlyConfigured('No databases configured.')
for (alias, conf) in settings.DATABASES.items():
for (alias, conf) in list(settings.DATABASES.items()):
engine = conf['ENGINE']
if engine not in [
'django.db.backends.postgresql',

2
dddp/logging.py
View file

@ -1,5 +1,5 @@
"""Django DDP logging helpers."""
from __future__ import absolute_import, print_function
import datetime
import logging

6
dddp/main.py
View file

@ -1,7 +1,5 @@
"""Django DDP WebSocket service."""
from __future__ import absolute_import, print_function
import argparse
import collections
import os
@ -157,7 +155,7 @@ class DDPLauncher(object):
listen_addr,
self.resource,
debug=debug,
**{key: val for key, val in ssl_args.items() if val is not None}
**{key: val for key, val in list(ssl_args.items()) if val is not None}
)
def get_backdoor_server(self, listen_addr, **context):
@ -286,7 +284,7 @@ def serve(listen, verbosity=1, debug_port=0, **ssl_args):
sigmap = {
val: name
for name, val
in vars(signal).items()
in list(vars(signal).items())
if name.startswith('SIG')
}

2
dddp/migrations/0001_initial.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import dddp.models

2
dddp/migrations/0002_auto_20150408_0321.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings

2
dddp/migrations/0003_auto_20150413_1328.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
dddp/migrations/0004_connection_server_addr.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
dddp/migrations/0005_auto_20150427_1209.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings

2
dddp/migrations/0006_auto_20150428_2245.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
dddp/migrations/0007_auto_20150505_1302.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
dddp/migrations/0008_remove_subscription_publication_class.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
dddp/migrations/0009_auto_20150812_0856.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import dddp.models

10
dddp/models.py
View file

@ -1,5 +1,5 @@
"""Django DDP models."""
from __future__ import absolute_import
import collections
import os
@ -109,7 +109,7 @@ def get_meteor_ids(model, object_ids):
).values_list('object_id', 'meteor_id')
for obj_pk, meteor_id in query:
result[str(obj_pk)] = meteor_id
for obj_pk, meteor_id in result.items():
for obj_pk, meteor_id in list(result.items()):
if meteor_id is None:
result[obj_pk] = get_meteor_id(model, obj_pk)
return result
@ -309,7 +309,7 @@ class Connection(models.Model, object):
def __str__(self):
"""Text representation of subscription."""
return u'%s/\u200b%s' % (
return '%s/\u200b%s' % (
self.connection_id,
self.remote_addr,
)
@ -337,7 +337,7 @@ class Subscription(models.Model, object):
def __str__(self):
"""Text representation of subscription."""
return u'%s/\u200b%s/\u200b%s: %s%s' % (
return '%s/\u200b%s/\u200b%s: %s%s' % (
self.user,
self.connection_id,
self.sub_id,
@ -367,7 +367,7 @@ class SubscriptionCollection(models.Model):
def __str__(self):
"""Human readable representation of colleciton for a subscription."""
return u'%s \u200b %s (%s)' % (
return '%s \u200b %s (%s)' % (
self.subscription,
self.collection_name,
self.model_name,

6
dddp/tests.py
View file

@ -1,5 +1,5 @@
"""Django DDP test suite."""
from __future__ import absolute_import, unicode_literals
import doctest
import errno
@ -136,7 +136,7 @@ class DDPTestServer(object):
"""DDP server with auto start and stop."""
server_addr = '127.0.0.1'
server_port_range = range(8000, 8080)
server_port_range = list(range(8000, 8080))
ssl_certfile_path = None
ssl_keyfile_path = None
@ -404,7 +404,7 @@ def load_tests(loader, tests, pattern):
del pattern
suite = unittest.TestSuite()
# add all TestCase classes from this (current) module
for attr in globals().values():
for attr in list(globals().values()):
if attr is DDPServerTestCase:
continue # not meant to be executed, is has no tests.
try:

8
dddp/views.py
View file

@ -1,5 +1,5 @@
"""Django DDP Server views."""
from __future__ import absolute_import, unicode_literals
from copy import deepcopy
import io
@ -26,7 +26,7 @@ def dict_merge(lft, rgt):
if not isinstance(rgt, dict):
return rgt
result = deepcopy(lft)
for key, val in rgt.iteritems():
for key, val in rgt.items():
if key in result and isinstance(result[key], dict):
result[key] = dict_merge(result[key], val)
else:
@ -233,11 +233,11 @@ class MeteorView(View):
'inline': None,
'head': read(
self.internal_map.get('head', {}).get('path_full', None),
default=u'',
default='',
),
'body': read(
self.internal_map.get('body', {}).get('path_full', None),
default=u'',
default='',
),
}
tmpl_raw = read(self.template_path, encoding='utf8')

4
dddp/websocket.py
View file

@ -1,6 +1,6 @@
"""Django DDP WebSocket service."""
from __future__ import absolute_import, print_function
import atexit
import collections
@ -332,7 +332,7 @@ class DDPWebSocketApplication(geventwebsocket.WebSocketApplication):
safe_call(self.logger.debug, 'TX found %d', self._tx_next_id)
# advance next message ID
self._tx_next_id = next(self._tx_next_id_gen)
if not isinstance(data, basestring):
if not isinstance(data, str):
# ejson payload
msg = data.get('msg', None)
if msg in (ADDED, CHANGED, REMOVED):