Skip to content

Commit

Permalink
Refactor Wrapper_[repr,str,unicode]
Browse files Browse the repository at this point in the history
Just the right indentation.
  • Loading branch information
stephan-hof committed Feb 22, 2017
1 parent 9822ab6 commit 11103f7
Showing 1 changed file with 22 additions and 31 deletions.
53 changes: 22 additions & 31 deletions src/Acquisition/_Acquisition.c
Original file line number Diff line number Diff line change
Expand Up @@ -938,58 +938,49 @@ Wrapper_richcompare(Wrapper *self, PyObject *w, int op)
static PyObject *
Wrapper_repr(Wrapper *self)
{
PyObject *r;
PyObject *r;

if ((r=PyObject_GetAttr(OBJECT(self),py__repr__)))
{
ASSIGN(r,PyObject_CallFunction(r,NULL,NULL));
return r;
}
else
{
PyErr_Clear();
return PyObject_Repr(self->obj);
if ((r = PyObject_GetAttr(OBJECT(self), py__repr__))) {
ASSIGN(r, PyObject_CallFunction(r, NULL, NULL));
return r;
} else {
PyErr_Clear();
return PyObject_Repr(self->obj);
}
}

static PyObject *
Wrapper_str(Wrapper *self)
{
PyObject *r;
PyObject *r;

if ((r=PyObject_GetAttr(OBJECT(self),py__str__)))
{
ASSIGN(r,PyObject_CallFunction(r,NULL,NULL));
return r;
}
else
{
PyErr_Clear();
return PyObject_Str(self->obj);
if ((r = PyObject_GetAttr(OBJECT(self), py__str__))) {
ASSIGN(r, PyObject_CallFunction(r,NULL,NULL));
return r;
} else {
PyErr_Clear();
return PyObject_Str(self->obj);
}
}

static PyObject *
Wrapper_unicode(Wrapper *self)
{
PyObject *r;
PyObject *r;

if ((r=PyObject_GetAttr(OBJECT(self),py__unicode__)))
{
ASSIGN(r,PyObject_CallFunction(r,NULL,NULL));
return r;
}
else
{
PyErr_Clear();
return Wrapper_str(self);
if ((r = PyObject_GetAttr(OBJECT(self), py__unicode__))) {
ASSIGN(r, PyObject_CallFunction(r, NULL, NULL));
return r;
} else {
PyErr_Clear();
return Wrapper_str(self);
}
}

static long
Wrapper_hash(Wrapper *self)
{
return PyObject_Hash(self->obj);
return PyObject_Hash(self->obj);
}

static PyObject *
Expand Down

0 comments on commit 11103f7

Please sign in to comment.