Merge 4bee113 into 70ebdbe

.travis.yml

@@ -4,36 +4,38 @@ language: python
 # Use tox -l to list available tox environments
 matrix:
   include:
-  - python: 2.7
-    env: TOXENV=py27-django18
-  - python: 2.7
-    env: TOXENV=py27-django19
-  - python: 2.7
-    env: TOXENV=py27-django110
   - python: 2.7
     env: TOXENV=py27-django111
 
-  - python: 3.5
-    env: TOXENV=py35-django18
-  - python: 3.5
-    env: TOXENV=py35-django19
-  - python: 3.5
-    env: TOXENV=py35-django110
   - python: 3.5
     env: TOXENV=py35-django111
   - python: 3.5
     env: TOXENV=py35-django20
+  - python: 3.5
+    env: TOXENV=py35-django21
+  - python: 3.5
+    env: TOXENV=py35-django22
 
-  - python: 3.6
-    env: TOXENV=py36-django18
-  - python: 3.6
-    env: TOXENV=py36-django19
-  - python: 3.6
-    env: TOXENV=py36-django110
   - python: 3.6
     env: TOXENV=py36-django111
   - python: 3.6
     env: TOXENV=py36-django20
+  - python: 3.6
+    env: TOXENV=py36-django21
+  - python: 3.6
+    env: TOXENV=py36-django22
+
+  - python: 3.7
+    env: TOXENV=py37-django111
+  - python: 3.7
+    env: TOXENV=py37-django20
+  - python: 3.7
+    env: TOXENV=py37-django21
+  - python: 3.7
+    env: TOXENV=py37-django22
+
+  - python: 3.8
+    env: TOXENV=py38-django22
 
 install:
     - pip install tox-travis

hijack/templatetags/hijack_tags.py

@@ -30,7 +30,7 @@ def _render_hijack_notification(request, template_name=None):
         else:
             template_name = 'hijack/notifications.html'
     ans = ''
-    if request is not None and all([
+    if request is not None and getattr(request, "session", None) is not None and all([
         hijack_settings.HIJACK_DISPLAY_WARNING,
         request.session.get('is_hijacked_user', False),
         request.session.get('display_hijack_warning', False),
@@ -51,7 +51,9 @@ def can_hijack(hijacker, hijacked):
 
 @register.filter
 def is_hijacked(request):
-    return request.session.get('is_hijacked_user', False)
+    return (request is not None and
+            getattr(request, "session", None) is not None and
+            request.session.get('is_hijacked_user', False))
 
 try:
     from django_jinja import library

tox.ini

@@ -1,18 +1,17 @@
 [tox]
 envlist =
-    py{27}-django{18,19,110,111}
-    py{35,36}-django{18,19,110,111,20,21}
+    py{27}-django{111}
+    py{35,36,37}-django{111,20,21,22}
+    py{38}-django{22}
 
 [testenv]
 deps =
     -r{toxinidir}/requirements-test.txt
     -r{toxinidir}/requirements.txt
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
-    django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
 
 commands =
     pip freeze