django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-07-14 09:52:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Patchinator/django fixes

Browse Source
This commit is contained in:
Andrew Godwin 2016-04-05 16:20:49 -07:00
parent 2eb8e9277e
commit d29f02fb33
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/handler.py
View File

@ -17,7 +17,7 @@ from django.http import FileResponse, HttpResponse, HttpResponseServerError
from django.utils import six
from django.utils.functional import cached_property
from .exceptions import ResponseLater as ResponseLaterOuter, RequestTimeout, RequestAborted
from channels.exceptions import ResponseLater as ResponseLaterOuter, RequestTimeout, RequestAborted
logger = logging.getLogger('django.request')

2
channels/tests/test_database_layer.py
View File

@ -1,6 +1,6 @@
from __future__ import unicode_literals
from asgiref.conformance import ConformanceTestCase
from ..database_layer import DatabaseChannelLayer
from channels.database_layer import DatabaseChannelLayer
class DatabaseLayerTests(ConformanceTestCase):

1
channels/tests/test_routing.py
View File

@ -80,6 +80,7 @@ class RoutingTests(SimpleTestCase):
Ensures the test consumers don't compare equal, as if this ever happens
this test file will pass and miss most bugs.
"""
self.assertEqual(consumer_1, consumer_1)
self.assertNotEqual(consumer_1, consumer_2)
self.assertNotEqual(consumer_1, consumer_3)

16
patchinator.py
View File

@ -105,14 +105,17 @@ global_transforms = [
Replacement(r"import channels.([a-zA-Z0-9_\.]+)$", r"import django.channels.\1 as channels"),
Replacement(r"from channels import", r"from django.channels import"),
Replacement(r"from channels.([a-zA-Z0-9_\.]+) import", r"from django.channels.\1 import"),
Replacement(r"from .handler import", r"from django.core.handlers.asgi import")
Replacement(r"from .handler import", r"from django.core.handlers.asgi import"),
Replacement(r"from django.channels.tests import", r"from django.test.channels import"),
Replacement(r"from django.channels.handler import", r"from django.core.handlers.asgi import"),
Replacement(r"channels.tests.test_routing", r"channels_tests.test_routing")
]
docs_transforms = global_transforms + [
Replacement(r":doc:`concepts`", r":doc:`topics/channels/concepts`"),
Replacement(r":doc:`deploying`", r":doc:`topics/channels/deploying`"),
Replacement(r":doc:`scaling`", r":doc:`topics/channels/scaling`"),
Replacement(r":doc:`getting-started`", r":doc:`intro/channels`"),
Replacement(r":doc:`concepts`", r":doc:`/topics/channels/concepts`"),
Replacement(r":doc:`deploying`", r":doc:`/topics/channels/deploying`"),
Replacement(r":doc:`scaling`", r":doc:`/topics/channels/scaling`"),
Replacement(r":doc:`getting-started`", r":doc:`/intro/channels`"),
Replacement(r"\n\(.*installation>`\)\n", r""),
]
@ -141,6 +144,9 @@ class Patchinator(object):
FileMap(
"channels/routing.py", "django/channels/routing.py", global_transforms,
),
FileMap(
"channels/message.py", "django/channels/message.py", global_transforms,
),
FileMap(
"channels/sessions.py", "django/channels/sessions.py", global_transforms,
),