Skip to content

Commit dd3a41f

Browse files
author
Josh Mervine
committed
Adding update for logs fix, allowing for data.
1 parent d80840c commit dd3a41f

File tree

5 files changed

+43
-5
lines changed

5 files changed

+43
-5
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ nose_opts=-v
99
nose=python $(source)/nose/bin/nosetests
1010
cov_opts= --with-coverage --cover-package=maxcdn
1111

12+
benchmark=./test/benchmark.py
1213
tests=./test/test.py
1314
int=./test/int.py
1415

@@ -26,6 +27,9 @@ clean:
2627
coverage: build/coverage
2728
$(pypath) python $(nose) $(cov_opts) $(tests)
2829

30+
benchmark:
31+
$(pypath) python $(benchmark)
32+
2933
test:
3034
$(pypath) python $(tests)
3135

maxcdn/maxcdn.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ def _data_request(self, method, end_point, data, **kwargs):
3434
return action(self._get_url(end_point), data=data,
3535
headers=self._get_headers(json=True), **kwargs).json()
3636

37-
def get(self, end_point, **kwargs):
38-
return self.client.get(self._get_url(end_point), data=None,
39-
headers=self._get_headers(json=False),
40-
**kwargs).json()
37+
def get(self, end_point, data=None, **kwargs):
38+
return self._data_request("post", end_point, data=data, **kwargs)
39+
#return self.client.get(self._get_url(end_point), data,
40+
#headers=self._get_headers(json=False),
41+
#**kwargs).json()
4142

4243
def patch(self, end_point, data=None, **kwargs):
4344
return self._data_request("post", end_point, data=data, **kwargs)

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ requests
22
requests_oauthlib
33
certifi
44
mock
5+
benchmark

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
]
2121
tests_require = [
2222
"nose",
23-
"mock"
23+
"mock",
24+
"benchmark"
2425
]
2526
include_package_data = True
2627

test/benchmark.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import os
2+
from maxcdn import MaxCDN
3+
4+
alias = os.environ["ALIAS"]
5+
key = os.environ["KEY"]
6+
secret = os.environ["SECRET"]
7+
maxcdn = MaxCDN(alias, key, secret)
8+
9+
def get_logs():
10+
maxcdn.get("v3/reporing/logs.json")
11+
12+
def get_users():
13+
maxcdn.get("users.json")
14+
15+
def get_account():
16+
maxcdn.get("account.json")
17+
18+
def get_pullzones():
19+
maxcdn.get("zones/pull.json")
20+
21+
22+
if __name__ == '__main__':
23+
import timeit
24+
25+
for f in [ 'get_logs',
26+
'get_users',
27+
'get_account',
28+
'get_pullzones' ]:
29+
t = timeit.Timer(f + "()", setup = "from __main__ import " + f)
30+
print("%-20s %5.0fms" % (f + ":", (t.timeit(number=1) * 1000)))
31+

0 commit comments

Comments
 (0)