Skip to content

Commit 6ccba22

Browse files
committed
升级依赖包
1 parent 63c5ae8 commit 6ccba22

5 files changed

Lines changed: 26 additions & 22 deletions

File tree

‎DjangoBlog/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def block_code(text, lang, inlinestyles=False, linenos=False):
107107

108108

109109
class BlogMarkDownRenderer(mistune.Renderer):
110-
def block_code(self, text, lang):
110+
def block_code(self, text, lang=None):
111111
# renderer has an options
112112
inlinestyles = self.options.get('inlinestyles')
113113
linenos = self.options.get('linenos')

‎blog/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ArticleDetailView(DetailView):
8484
pk_url_kwarg = 'article_id'
8585
context_object_name = "article"
8686

87-
def get_object(self):
87+
def get_object(self, queryset=None):
8888
obj = super(ArticleDetailView, self).get_object()
8989
obj.viewed()
9090
self.object = obj

‎requirements.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
appdirs==1.4.3
2-
Django==1.11.5
2+
coverage==4.4.1
3+
Django==1.11.7
34
django-appconf==1.0.2
45
django-autoslug==1.9.3
56
django-compressor==2.2
6-
django-debug-toolbar==1.8
7+
django-debug-toolbar==1.9.1
78
django-haystack==2.6.1
89
django-ipware==1.1.6
910
django-pagedown==0.1.3
1011
django-uuslug==1.1.8
1112
jieba==0.39
1213
jsonpickle==0.9.5
13-
markdown2==2.3.4
14-
mistune==0.7.4
14+
markdown2==2.3.5
15+
mistune==0.8.1
1516
olefile==0.44
1617
packaging==16.8
17-
Pillow==4.2.1
18+
Pillow==4.3.0
1819
Pygments==2.2.0
1920
PyMySQL==0.7.11
2021
pyparsing==2.2.0
2122
python-memcached==1.58
2223
python-slugify==1.2.4
23-
pytz==2017.2
24+
pytz==2017.3
2425
rcssmin==1.0.6
2526
requests==2.18.4
2627
rjsmin==1.0.12
27-
six==1.10.0
28-
sqlparse==0.2.3
28+
six==1.11.0
29+
sqlparse==0.2.4
2930
Unidecode==0.4.21
3031
urllib3==1.22
3132
webencodings==0.5.1

‎servermanager/tests.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ def test_validate_comment(self):
6363
s.source = 'u'
6464
s.content = 'test'
6565
msghandler = MessageHandler(s, {})
66-
d = msghandler.is_admin
67-
e = msghandler.is_password_set
68-
msghandler.userinfo.isPasswordSet = True
69-
msghandler.userinfo.isAdmin = True
66+
67+
#msghandler.userinfo.isPasswordSet = True
68+
#msghandler.userinfo.isAdmin = True
7069
msghandler.handler()
7170
s.content = 'y'
7271
msghandler.handler()
@@ -77,4 +76,7 @@ def test_validate_comment(self):
7776
s.content='admin'
7877
msghandler.handler()
7978
s.content='123'
79+
msghandler.handler()
80+
81+
s.content = 'exit'
8082
msghandler.handler()

‎travis_test/requirements.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
appdirs==1.4.3
2-
Django==1.11.5
2+
coverage==4.4.1
3+
Django==1.11.7
34
django-appconf==1.0.2
45
django-autoslug==1.9.3
56
django-compressor==2.2
6-
django-debug-toolbar==1.8
7+
django-debug-toolbar==1.9.1
78
django-haystack==2.6.1
89
django-ipware==1.1.6
910
django-pagedown==0.1.3
1011
django-uuslug==1.1.8
1112
jieba==0.39
1213
jsonpickle==0.9.5
13-
markdown2==2.3.4
14-
mistune==0.7.4
14+
markdown2==2.3.5
15+
mistune==0.8.1
1516
olefile==0.44
1617
packaging==16.8
17-
Pillow==4.2.1
18+
Pillow==4.3.0
1819
Pygments==2.2.0
1920
PyMySQL==0.7.11
2021
pyparsing==2.2.0
2122
python-slugify==1.2.4
22-
pytz==2017.2
23+
pytz==2017.3
2324
rcssmin==1.0.6
2425
requests==2.18.4
2526
rjsmin==1.0.12
26-
six==1.10.0
27-
sqlparse==0.2.3
27+
six==1.11.0
28+
sqlparse==0.2.4
2829
Unidecode==0.4.21
2930
urllib3==1.22
3031
webencodings==0.5.1

0 commit comments

Comments
 (0)