Visitar URL original
A bit of house keeping · strixcode/assembla@0b7d078 · GitHub
Skip to content

Commit 0b7d078

Browse files
committed
A bit of house keeping
1 parent fcd1388 commit 0b7d078

4 files changed

Lines changed: 16 additions & 23 deletions

File tree

‎assembla/api.py‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def _get_json(self, model, space=None, rel_path=None, extra_params=None, get_all
8282
if response.status_code == 200: # OK
8383
results = []
8484
json_response = response.json()
85-
for json in json_response:
86-
instance=model(data=json)
85+
for obj in json_response:
86+
instance = model(data=obj)
8787
instance.api = self
8888
if space:
8989
instance.space = space
@@ -97,8 +97,7 @@ def _get_json(self, model, space=None, rel_path=None, extra_params=None, get_all
9797
and len(json_response)
9898
and per_page == len(json_response)
9999
):
100-
import pdb; pdb.set_trace()
101-
extra_params['page'] = extra_params['page'] + 1
100+
extra_params['page'] += 1
102101
results = results + self._get_json(model, space, rel_path, extra_params, get_all=get_all)
103102
return results
104103
elif response.status_code == 204: # No Content
@@ -463,20 +462,16 @@ def write(self):
463462
if not hasattr(self, 'space'):
464463
raise AttributeError("A ticket must have a 'space' attribute before you can write it to Assembla.")
465464

466-
self.api = self.space.api
467-
468-
if self.get('number'): # We are modifying an existing ticket
469-
return self.api._put_json(
470-
self,
471-
space=self.space,
472-
rel_path=self.space._build_rel_path('tickets'),
473-
)
465+
if self.get('number'): # Modifying an existing ticket
466+
method = self.space.api._put_json
474467
else: # Creating a new ticket
475-
return self.api._post_json(
476-
self,
477-
space=self.space,
478-
rel_path=self.space._build_rel_path('tickets'),
479-
)
468+
method = self.space.api._post_json
469+
470+
return method(
471+
self,
472+
space=self.space,
473+
rel_path=self.space._build_rel_path('tickets'),
474+
)
480475

481476
def delete(self):
482477
"""
@@ -485,9 +480,7 @@ def delete(self):
485480
if not hasattr(self, 'space'):
486481
raise AttributeError("A ticket must have a 'space' attribute before you can remove it from Assembla.")
487482

488-
self.api = self.space.api
489-
490-
return self.api._delete_json(
483+
return self.space.api._delete_json(
491484
self,
492485
space=self.space,
493486
rel_path=self.space._build_rel_path('tickets'),

‎assembla/tests/auth.tmpl.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# These details are available from https://www.assembla.com/user/edit/manage_clients
12
auth = (
23
'', # API key, ex: `8a71541e5fb2e4741120`
34
'' # API key secret, ex: `a260dc4448c81c907fc7c85ad09d31306c425417`

‎assembla/tests/retrieval_tests.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ def test_milestone_tickets(self):
177177
self.assertIsNotNone(ticket.space)
178178
self.assertEqual(ticket.api, self.assembla)
179179

180-
181180
def test_user_tickets(self):
182181
for space in self.assembla.spaces():
183182
for user in space.users():

‎assembla/tests/write_tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ def test_new_ticket(self):
4545

4646
ticket = ticket.write()
4747

48-
#ticket now has a number
48+
# ticket now has a number
4949
self.assertTrue(ticket['number'])
5050
self.assertTrue(ticket['id'])
5151

52-
#tidy up (oh and test delete)
52+
# tidy up (oh and test delete)
5353
ticket.delete()
5454

5555
def _get_space_with_wiki_tools(self):

0 commit comments

Comments
 (0)