Skip to content

Commit 3e2612b

Browse files
007gzs007gzs
committed
flake8 check all source
1 parent 6aa1acc commit 3e2612b

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ install:
3939
- pip install flake8
4040

4141
before_script:
42-
- python setup.py flake8
42+
- "flake8 ."
4343

4444
script:
4545
tox -e $TOX_ENV

‎docs/conf.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
#
1717
import os
1818
import sys
19-
sys.path.insert(0, os.path.abspath('./../dingtalk'))
20-
2119
import dingtalk
2220

21+
22+
sys.path.insert(0, os.path.abspath('./../dingtalk'))
23+
2324
# -- Project information -----------------------------------------------------
2425

2526
project = 'dingtalk-sdk'

‎tests/test_crypto.py

+19-7
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ def test_encrypt_message(self):
2929
msg = """{"EventType":"check_create_suite_url","Random":"LPIdSnlF","TestSuiteKey":"suite4xxxxxxxxxxxxxxx"}"""
3030

3131
expected = {
32-
'msg_signature':'bcf6dcefa4ce2dbaf7b0666c7264d46fd9aad4bd',
33-
'encrypt': '5DJFWzjRNOQk+5GSZxW+VrFMDWCIidPjEjg3//gm5x556BedVi62rDj1F9uXU97a4jw1R4FACUv9RCpoDobNqxhxRB2YtW901k4KHbP1/wpFJ3xdLG0n0A8U1VhENg80zKJd+YROR0YMGum4WYuoXJ6J98vt0ihYeIFoapNddLML5MyNAGM9saSpkouDMSvD+iU14i7V8ix1ia1Tb9ogog==',
32+
'msg_signature': 'bcf6dcefa4ce2dbaf7b0666c7264d46fd9aad4bd',
33+
'encrypt': '5DJFWzjRNOQk+5GSZxW+VrFMDWCIidPjEjg3//gm5x556BedVi62rDj1F9uXU97a4jw1R4FACUv9RCpoDobNqxhxRB2Yt'
34+
'W901k4KHbP1/wpFJ3xdLG0n0A8U1VhENg80zKJd+YROR0YMGum4WYuoXJ6J98vt0ihYeIFoapNddLML5MyNAGM9saSpko'
35+
'uDMSvD+iU14i7V8ix1ia1Tb9ogog==',
3436
'timeStamp': '1445827045067',
3537
'nonce': 'nEXhMP4r'
3638
}
@@ -45,7 +47,9 @@ def test_encrypt_message(self):
4547

4648
def test_decrypt_message(self):
4749
from dingtalk.core.utils import to_text
48-
jsonstr = """{"encrypt":"1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=="}"""
50+
jsonstr = '{"encrypt":"1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7g' \
51+
'TRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9Ph' \
52+
'SBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=="}'
4953

5054
signature = '5a65ceeef9aab2d149439f82dc191dd6c5cbe2c0'
5155
timestamp = '1445827045067'
@@ -60,7 +64,9 @@ def test_decrypt_message(self):
6064

6165
def test_decrypt_binary_message(self):
6266
from dingtalk.core.utils import to_text
63-
jsonbinary = b"""{"encrypt":"1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=="}"""
67+
jsonbinary = b'{"encrypt":"1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMei' \
68+
b'ZI7gTRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrf' \
69+
b'gnNOS9PhSBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=="}'
6470

6571
signature = '5a65ceeef9aab2d149439f82dc191dd6c5cbe2c0'
6672
timestamp = '1445827045067'
@@ -78,7 +84,9 @@ def test_decrypt_encrypt_str(self):
7884
signature = '5a65ceeef9aab2d149439f82dc191dd6c5cbe2c0'
7985
timestamp = '1445827045067'
8086
nonce = 'nEXhMP4r'
81-
encrypt_str = '1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=='
87+
encrypt_str = '1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUBm' \
88+
'fxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSBdH' \
89+
'legK+AGGanfwjXuQ9+0pZcy0w9lQ=='
8290

8391
crypto = DingTalkCrypto(self.token, self.encoding_aes_key, self.suite_key)
8492
msg = crypto.decrypt_encrypt_str(
@@ -97,7 +105,9 @@ def test_decrypt_encrypt_binary(self):
97105
signature = '5a65ceeef9aab2d149439f82dc191dd6c5cbe2c0'
98106
timestamp = '1445827045067'
99107
nonce = 'nEXhMP4r'
100-
encrypt_str = b'1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=='
108+
encrypt_str = b'1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUB' \
109+
b'mfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSB' \
110+
b'dHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=='
101111

102112
crypto = DingTalkCrypto(self.token, self.encoding_aes_key, self.suite_key)
103113
msg = crypto.decrypt_encrypt_str(
@@ -116,7 +126,9 @@ def test_decrypt_encrypt_str_should_fail(self):
116126
signature = '5a65ceeef9aab2d149439f82dc191dd6c5cbe2c0'
117127
timestamp = '1445827045067'
118128
nonce = 'xxxxx'
119-
encrypt_str = b'1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUBmfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSBdHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=='
129+
encrypt_str = b'1a3NBxmCFwkCJvfoQ7WhJHB+iX3qHPsc9JbaDznE1i03peOk1LaOQoRz3+nlyGNhwmwJ3vDMG+OzrHMeiZI7gTRWVdUB' \
130+
b'mfxjZ8Ej23JVYa9VrYeJ5as7XM/ZpulX8NEQis44w53h1qAgnC3PRzM7Zc/D6Ibr0rgUathB6zRHP8PYrfgnNOS9PhSB' \
131+
b'dHlegK+AGGanfwjXuQ9+0pZcy0w9lQ=='
120132

121133
crypto = DingTalkCrypto(self.token, self.encoding_aes_key, self.suite_key)
122134

‎tests/test_message.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_file_message(self):
2323
self.assertEqual('file', msg['msgtype'])
2424
self.assertEqual('123456', msg['file']['media_id'])
2525

26-
def test_file_message(self):
26+
def test_image_message(self):
2727
from dingtalk.model.message import ImageBody
2828

2929
msgbody = ImageBody('123456')
@@ -107,7 +107,8 @@ def test_single_action_card_message(self):
107107
def test_button_action_card_message(self):
108108
from dingtalk.model.message import BtnActionCardBody
109109

110-
msgbody = BtnActionCardBody('title', 'markdown', '0', [{'title': 'title1', 'action_url': 'action_url1'}, {'title': 'title2', 'action_url': 'action_url2'}])
110+
msgbody = BtnActionCardBody('title', 'markdown', '0', [{'title': 'title1', 'action_url': 'action_url1'},
111+
{'title': 'title2', 'action_url': 'action_url2'}])
111112
msgbody.add_btn('title3', 'action_url3')
112113
msg = msgbody.get_dict()
113114

‎tests/test_storage.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import absolute_import, unicode_literals
3-
import os
4-
import platform
53
import unittest
64

75

8-
96
class WeChatSessionTestCase(unittest.TestCase):
107

118
def test_dingtalk_cache(self, storage=None):
@@ -65,7 +62,7 @@ def test_redis_storage(self):
6562
storage = KvStorage(redis)
6663
self.test_caches(storage)
6764

68-
def test_redis_storage(self):
65+
def test_memcache_storage(self):
6966
from pymemcache.client import Client
7067
from dingtalk.storage.kvstorage import KvStorage
7168
servers = ("127.0.0.1", 11211)

‎tests/test_utils.py

-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ def test_wechat_card_signer(self):
2222
signature = signer.signature
2323

2424
self.assertEqual('f7c3bc1d808e04732adf679965ccc34ca7ae3441', signature)
25-

0 commit comments

Comments
 (0)