Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
Pyston
Commits
573777ef
Commit
573777ef
authored
Apr 06, 2016
by
Kevin Modzelewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a few property() issues
parent
02f6fd95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/runtime/descr.cpp
src/runtime/descr.cpp
+3
-3
test/tests/property.py
test/tests/property.py
+0
-1
No files found.
src/runtime/descr.cpp
View file @
573777ef
...
...
@@ -52,6 +52,7 @@ static void propertyDocCopy(BoxedProperty* prop, Box* fget) {
if
(
!
e
.
matches
(
Exception
))
{
throw
e
;
}
e
.
clear
();
get_doc
=
NULL
;
}
...
...
@@ -60,7 +61,6 @@ static void propertyDocCopy(BoxedProperty* prop, Box* fget) {
Py_XDECREF
(
prop
->
prop_doc
);
prop
->
prop_doc
=
get_doc
;
}
else
{
AUTO_DECREF
(
get_doc
);
/* If this is a property subclass, put __doc__
in dict of the subclass instance instead,
otherwise it gets shadowed by __doc__ in the
...
...
@@ -122,9 +122,9 @@ static Box* propertySet(Box* self, Box* obj, Box* val) {
}
if
(
val
==
NULL
)
{
runtimeCall
(
func
,
ArgPassSpec
(
1
),
obj
,
NULL
,
NULL
,
NULL
,
NULL
);
autoDecref
(
runtimeCall
(
func
,
ArgPassSpec
(
1
),
obj
,
NULL
,
NULL
,
NULL
,
NULL
)
);
}
else
{
runtimeCall
(
func
,
ArgPassSpec
(
2
),
obj
,
val
,
NULL
,
NULL
,
NULL
);
autoDecref
(
runtimeCall
(
func
,
ArgPassSpec
(
2
),
obj
,
val
,
NULL
,
NULL
,
NULL
)
);
}
return
incref
(
None
);
}
...
...
test/tests/property.py
View file @
573777ef
# expected: reffail
# I think pypa has an issue parsing decorator expressions if they aren't simple names
# https://github.com/vinzenz/libpypa/issues/15
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment