Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Feb 27, 2019
1 parent 4600e21 commit 066d79d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 23 deletions.
9 changes: 3 additions & 6 deletions edc_model_wrapper/tests/model_wrapper_test_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,14 @@ def __init__(
if app_label:
model = self.model_wrapper.model or model
self.model_wrapper.model = f'{app_label}.{model.split(".")[1]}'
self.model_wrapper.next_url_name = model_wrapper.next_url_name.split(":")[
1]
self.model_wrapper.next_url_name = model_wrapper.next_url_name.split(":")[1]
self.options = kwargs
if model_obj:
self.model_cls = model_obj.__class__
self.model_obj = model_obj
else:
self.model_cls = django_apps.get_model(
model_wrapper.model)
self.model_obj = self.model_cls.objects.create(
**self.options)
self.model_cls = django_apps.get_model(model_wrapper.model)
self.model_obj = self.model_cls.objects.create(**self.options)

def test(self, testcase):
# add admin url
Expand Down
18 changes: 6 additions & 12 deletions edc_model_wrapper/tests/test_model_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ def test_model_wrapper(self):
"""Asserts can construct.
"""
obj = Example()
ModelWrapper(model_obj=obj, model_cls=Example,
next_url_name="thenexturl")
ModelWrapper(model_obj=obj, model_cls=Example, next_url_name="thenexturl")

def test_model_wrapper_assumes_model_cls(self):
"""Asserts can construct.
Expand Down Expand Up @@ -78,8 +77,7 @@ def test_model_wrapper_raises_on_wrong_model_not_string(self):

def test_model_wrapper_adds_kwargs_to_self(self):
obj = Example()
wrapper = ModelWrapper(
model_obj=obj, next_url_name="thenexturl", erik="silly")
wrapper = ModelWrapper(model_obj=obj, next_url_name="thenexturl", erik="silly")
self.assertEqual(wrapper.erik, "silly")

def test_model_wrapper_bool(self):
Expand Down Expand Up @@ -112,8 +110,7 @@ def test_model_wrapper_meta(self):
wrapper = ModelWrapper(
model_obj=obj, model_cls=Example, next_url_name="thenexturl"
)
self.assertEqual(wrapper._meta.label_lower,
"edc_model_wrapper.example")
self.assertEqual(wrapper._meta.label_lower, "edc_model_wrapper.example")

def test_model_wrapper_repr(self):
"""Asserts wrapper maintains _meta.
Expand Down Expand Up @@ -200,8 +197,7 @@ def test_model_wrapper_model_querystring(self):
def test_model_wrapper_model_next_url(self):
model_obj = Example(f1=1, f2=2, f3=3)
wrapper = self.wrapper_cls(model_obj=model_obj)
self.assertEqual(wrapper.next_url,
"edc-model-wrapper:listboard_url,f1&f1=1")
self.assertEqual(wrapper.next_url, "edc-model-wrapper:listboard_url,f1&f1=1")

def test_example_href_add(self):
model_obj = Example(f1=1, f2=2, f3=3)
Expand Down Expand Up @@ -297,8 +293,7 @@ def visit(self):
try:
model_obj = self.object.subjectvisit
except ObjectDoesNotExist:
model_obj = SubjectVisit(
appointment=Appointment(a1=1), v1=1)
model_obj = SubjectVisit(appointment=Appointment(a1=1), v1=1)
return SubjectVisitModelWrapper1(model_obj=model_obj)

class AppointmentModelWrapper2(ModelWrapper):
Expand Down Expand Up @@ -330,8 +325,7 @@ def test_wrapper_visit(self):
def test_wrapper_appointment_href(self):
model_obj = Appointment.objects.create(a1=1)
wrapper = self.appointment_model_wrapper1_cls(model_obj=model_obj)
self.assertIn(
"next=edc-model-wrapper:listboard_url,a1&a1=1", wrapper.href)
self.assertIn("next=edc-model-wrapper:listboard_url,a1&a1=1", wrapper.href)

def test_wrapper_visit_href(self):
model_obj = Appointment.objects.create(a1=1)
Expand Down
9 changes: 4 additions & 5 deletions edc_model_wrapper/wrappers/model_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ def __init__(

self.next_url_name = next_url_name or self.next_url_name
if not self.next_url_name:
raise ModelWrapperError(
f"Missing next_url_name. See {repr(self)}.")
raise ModelWrapperError(f"Missing next_url_name. See {repr(self)}.")

self.next_url_attrs = next_url_attrs or self.next_url_attrs
self.querystring_attrs = querystring_attrs or self.querystring_attrs
Expand Down Expand Up @@ -157,8 +156,7 @@ def reverse(self, model_wrapper=None):
"""Returns the reversed next_url_name or None.
"""
try:
next_url = self.next_url_parser.reverse(
model_wrapper=model_wrapper or self)
next_url = self.next_url_parser.reverse(model_wrapper=model_wrapper or self)
except NoReverseMatch as e:
raise ModelWrapperNoReverseMatch(
f"next_url_name={self.next_url_name}. Got {e} {repr(self)}"
Expand Down Expand Up @@ -194,4 +192,5 @@ def history_url(self):
return None
return reverse(
f"{admin}:{self.object._meta.app_label}_{self.object._meta.model_name}_history",
args=(str(self.object.id), ))
args=(str(self.object.id),),
)

0 comments on commit 066d79d

Please sign in to comment.