Merge pull request #111 from CristopherH95/mentions-update

Use get_user_model and QuerySet filter in mention extension

Author: agusmakmun

.travis.yml

@@ -3,15 +3,6 @@ sudo: false
 
 matrix:
   include:
-    - python: 2.7
-      env: DJANGO="==1.8.*"
-    - python: 2.7
-      env: DJANGO="==1.9.*"
-    - python: 2.7
-      env: DJANGO="==1.10.*"
-    - python: 2.7
-      env: DJANGO="==1.11.*"
-
     - python: 3.4
       env: DJANGO="==1.8.*"
     - python: 3.4

martor/extensions/mention.py

@@ -1,5 +1,5 @@
 import markdown
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from ..settings import (
     MARTOR_ENABLE_CONFIGS,
     MARTOR_MARKDOWN_BASE_MENTION_URL
@@ -23,10 +23,11 @@ class MentionPattern(markdown.inlinepatterns.Pattern):
 
     def handleMatch(self, m):
         username = self.unescape(m.group(2))
+        users = get_user_model().objects.filter(username=username, is_active=True)
 
         """Makesure `username` is registered and actived."""
         if MARTOR_ENABLE_CONFIGS['mention'] == 'true':
-            if username in [u.username for u in User.objects.exclude(is_active=False)]:
+            if users.exists():
                 url = '{0}{1}/'.format(MARTOR_MARKDOWN_BASE_MENTION_URL, username)
                 el = markdown.util.etree.Element('a')
                 el.set('href', url)

setup.py

@@ -35,7 +35,6 @@ def get_requirements():
         'Operating System :: OS Independent',
         'Programming Language :: JavaScript',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',