diff --git a/DjangoBlog/utils.py b/DjangoBlog/utils.py index 6b44ff3..ae17059 100644 --- a/DjangoBlog/utils.py +++ b/DjangoBlog/utils.py @@ -107,7 +107,7 @@ def block_code(text, lang, inlinestyles=False, linenos=False): class BlogMarkDownRenderer(mistune.Renderer): - def block_code(self, text, lang): + def block_code(self, text, lang=None): # renderer has an options inlinestyles = self.options.get('inlinestyles') linenos = self.options.get('linenos') diff --git a/blog/views.py b/blog/views.py index 9c9fe13..cb2d7c2 100644 --- a/blog/views.py +++ b/blog/views.py @@ -84,7 +84,7 @@ class ArticleDetailView(DetailView): pk_url_kwarg = 'article_id' context_object_name = "article" - def get_object(self): + def get_object(self, queryset=None): obj = super(ArticleDetailView, self).get_object() obj.viewed() self.object = obj diff --git a/requirements.txt b/requirements.txt index 4dbb299..90da994 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,31 +1,32 @@ appdirs==1.4.3 -Django==1.11.5 +coverage==4.4.1 +Django==1.11.7 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.2 -django-debug-toolbar==1.8 +django-debug-toolbar==1.9.1 django-haystack==2.6.1 django-ipware==1.1.6 django-pagedown==0.1.3 django-uuslug==1.1.8 jieba==0.39 jsonpickle==0.9.5 -markdown2==2.3.4 -mistune==0.7.4 +markdown2==2.3.5 +mistune==0.8.1 olefile==0.44 packaging==16.8 -Pillow==4.2.1 +Pillow==4.3.0 Pygments==2.2.0 PyMySQL==0.7.11 pyparsing==2.2.0 python-memcached==1.58 python-slugify==1.2.4 -pytz==2017.2 +pytz==2017.3 rcssmin==1.0.6 requests==2.18.4 rjsmin==1.0.12 -six==1.10.0 -sqlparse==0.2.3 +six==1.11.0 +sqlparse==0.2.4 Unidecode==0.4.21 urllib3==1.22 webencodings==0.5.1 diff --git a/servermanager/tests.py b/servermanager/tests.py index f3aceb0..d7f58a7 100644 --- a/servermanager/tests.py +++ b/servermanager/tests.py @@ -63,10 +63,9 @@ class ServerManagerTest(TestCase): s.source = 'u' s.content = 'test' msghandler = MessageHandler(s, {}) - d = msghandler.is_admin - e = msghandler.is_password_set - msghandler.userinfo.isPasswordSet = True - msghandler.userinfo.isAdmin = True + + #msghandler.userinfo.isPasswordSet = True + #msghandler.userinfo.isAdmin = True msghandler.handler() s.content = 'y' msghandler.handler() @@ -77,4 +76,7 @@ class ServerManagerTest(TestCase): s.content='admin' msghandler.handler() s.content='123' + msghandler.handler() + + s.content = 'exit' msghandler.handler() \ No newline at end of file diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt index bf78591..92dd7d0 100644 --- a/travis_test/requirements.txt +++ b/travis_test/requirements.txt @@ -1,30 +1,31 @@ appdirs==1.4.3 -Django==1.11.5 +coverage==4.4.1 +Django==1.11.7 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.2 -django-debug-toolbar==1.8 +django-debug-toolbar==1.9.1 django-haystack==2.6.1 django-ipware==1.1.6 django-pagedown==0.1.3 django-uuslug==1.1.8 jieba==0.39 jsonpickle==0.9.5 -markdown2==2.3.4 -mistune==0.7.4 +markdown2==2.3.5 +mistune==0.8.1 olefile==0.44 packaging==16.8 -Pillow==4.2.1 +Pillow==4.3.0 Pygments==2.2.0 PyMySQL==0.7.11 pyparsing==2.2.0 python-slugify==1.2.4 -pytz==2017.2 +pytz==2017.3 rcssmin==1.0.6 requests==2.18.4 rjsmin==1.0.12 -six==1.10.0 -sqlparse==0.2.3 +six==1.11.0 +sqlparse==0.2.4 Unidecode==0.4.21 urllib3==1.22 webencodings==0.5.1