Fix various warnings relating to Django upgrade from tox and testing.

Author: atombrella

django_nyt/decorators.py

@@ -28,7 +28,7 @@ def login_required_ajax(f):
 
     @wraps(f)
     def wrapper(request, *args, **kwargs):
-        if request.is_ajax():
+        if request.headers.get('x-requested-with') == 'XMLHttpRequest':
             if not request.user or not request.user.is_authenticated:
                 return json_view(lambda *a,
                                  **kw: {'error': 'not logged in'})(request,

django_nyt/tests/test_management.py

@@ -41,7 +41,8 @@ def test_notifymail(self):
             # It's normal for this command to exit
             pass
 
-        pid = open(pid_file.name, 'r').read()
+        with open(pid_file.name, 'r') as fp:
+            pid = fp.read()
         os.unlink(pid_file.name)
 
         # Give it a second to start

django_nyt/urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import include
-from django.conf.urls import url
+from django.urls import include, re_path as url
 
 from . import views
 

test-project/testapp/urls.py

@@ -1,7 +1,4 @@
-try:
-    from django.urls import include, re_path as url
-except ImportError:
-    from django.conf.urls import include, url
+from django.urls import include, re_path as url
 
 from . import views
 

test-project/testproject/settings/__init__.py

@@ -142,7 +142,7 @@
 # django-nyt options
 ##########################################
 
-_enable_channels = True
+_enable_channels = False
 if _enable_channels:
     INSTALLED_APPS.append('channels')
     CHANNEL_LAYERS = {

test-project/testproject/urls.py

@@ -2,11 +2,7 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-try:
-    from django.urls import include, re_path as url
-except ImportError:
-    from django.conf.urls import include, url
+from django.urls import include, re_path as url
 
 
 admin.autodiscover()

tox.ini

@@ -9,7 +9,7 @@ whitelist_externals=
   sh
 
 commands =
-  sh -c '! python test-project/manage.py makemigrations --dry-run --exit --noinput'
+  sh -c '! python test-project/manage.py makemigrations --dry-run --noinput'
   python -W all:"":"":"":0 -m coverage run --source=django_nyt runtests.py
   codecov