升级依赖 close liangliangyy#229 liangliangyy#232

Author: liangliangyy

DjangoBlog/spider_notify.py

@@ -27,7 +27,7 @@ def baidu_notify(urls):
         try:
             data = '\n'.join(urls)
             result = requests.post(settings.BAIDU_NOTIFY_URL, data=data)
-            print(result.text)
+            logger.info(result.text)
         except Exception as e:
             logger.error(e)
 

accounts/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render
-
+import logging
 from .forms import RegisterForm, LoginForm
 from django.contrib.auth import authenticate, login, logout
 # from django.views.generic.edit import FormView
@@ -17,6 +17,8 @@
 from django.views.decorators.debug import sensitive_post_parameters
 from django.utils.http import is_safe_url
 
+logger = logging.getLogger(__name__)
+
 
 # Create your views here.
 
@@ -73,7 +75,7 @@ def form_valid(self, form):
             from DjangoBlog.utils import cache
             if cache and cache is not None:
                 cache.clear()
-            print(self.redirect_field_name)
+            logger.info(self.redirect_field_name)
             redirect_to = self.request.GET.get(self.redirect_field_name)
             auth.login(self.request, form.get_user())
             return super(LoginView, self).form_valid(form)

blog/forms.py

@@ -15,7 +15,9 @@
 
 from haystack.forms import SearchForm
 from django import forms
-from blog.models import Article, Category
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class BlogSearchForm(SearchForm):
@@ -27,5 +29,5 @@ def search(self):
             return self.no_query_found()
 
         if self.cleaned_data['querydata']:
-            print(self.cleaned_data['querydata'])
+            logger.info(self.cleaned_data['querydata'])
         return datas

blog/search_indexes.py

@@ -18,23 +18,11 @@
 
 
 class ArticleIndex(indexes.SearchIndex, indexes.Indexable):
-    # title = indexes.CharField(document=True, use_template=True)
     text = indexes.CharField(document=True, use_template=True)
+    author = indexes.CharField(model_attr='author')
 
     def get_model(self):
         return Article
 
     def index_queryset(self, using=None):
         return self.get_model().objects.filter(status='p')
-
-
-"""
-class CategoryIndex(indexes.SearchIndex, indexes.Indexable):
-    name = indexes.CharField(document=True, use_template=True)
-
-    def get_model(self):
-        return Article
-
-    def index_queryset(self, using=None):
-        return self.get_model().objects.filter(status='p')
-"""

blog/views.py

@@ -188,7 +188,7 @@ def get_queryset_cache_key(self):
 
     def get_queryset_data(self):
         author_name = self.kwargs['author_name']
-        article_list = Article.objects.filter(author__username=author_name)
+        article_list = Article.objects.filter(author__username=author_name, type='a', status='p')
         return article_list
 
     def get_context_data(self, **kwargs):
@@ -209,7 +209,7 @@ def get_queryset_data(self):
         tag = get_object_or_404(Tag, slug=slug)
         tag_name = tag.name
         self.name = tag_name
-        article_list = Article.objects.filter(tags__name=tag_name)
+        article_list = Article.objects.filter(tags__name=tag_name, type='a', status='p')
         return article_list
 
     def get_queryset_cache_key(self):

requirements.txt

@@ -5,7 +5,7 @@ bottle==0.12.16
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4
-coverage==4.5.2
+coverage==4.5.3
 cryptography==2.6.1
 Django==2.1.7
 django-appconf==1.0.3
@@ -17,7 +17,7 @@ django-ipware==2.1.0
 django-mdeditor==0.1.13
 django-uuslug==1.1.8
 idna==2.8
-isort==4.3.14
+isort==4.3.15
 jieba==0.39
 jsonpickle==1.1
 lazy-object-proxy==1.3.1
@@ -40,7 +40,7 @@ rcssmin==1.0.6
 requests==2.21.0
 rjsmin==1.1.0
 six==1.12.0
-sqlparse==0.2.4
+sqlparse==0.3.0
 text-unidecode==1.2
 typed-ast==1.3.1
 Unidecode==1.0.23

travis_test/requirements.txt

@@ -5,7 +5,7 @@ bottle==0.12.16
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4
-coverage==4.5.2
+coverage==4.5.3
 cryptography==2.6.1
 Django==2.1.7
 django-appconf==1.0.3
@@ -17,7 +17,7 @@ django-ipware==2.1.0
 django-mdeditor==0.1.13
 django-uuslug==1.1.8
 idna==2.8
-isort==4.3.14
+isort==4.3.15
 jieba==0.39
 jsonpickle==1.1
 lazy-object-proxy==1.3.1
@@ -32,14 +32,15 @@ Pygments==2.3.1
 pylint==2.3.1
 PyMySQL==0.9.3
 pyparsing==2.3.1
+python-memcached==1.59
 python-slugify==3.0.0
 pytz==2018.9
 raven==6.10.0
 rcssmin==1.0.6
 requests==2.21.0
 rjsmin==1.1.0
 six==1.12.0
-sqlparse==0.2.4
+sqlparse==0.3.0
 text-unidecode==1.2
 typed-ast==1.3.1
 Unidecode==1.0.23