Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/_pydecimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1674,13 +1674,13 @@ def __int__(self):

__trunc__ = __int__

@property
def real(self):
return self
real = property(real)

@property
def imag(self):
return Decimal(0)
imag = property(imag)

def conjugate(self):
return self
Expand Down
16 changes: 8 additions & 8 deletions Lib/lib2to3/pytree.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,20 +271,20 @@ def pre_order(self):
for child in self.children:
yield from child.pre_order()

def _prefix_getter(self):
@property
def prefix(self):
"""
The whitespace and comments preceding this node in the input.
"""
if not self.children:
return ""
return self.children[0].prefix

def _prefix_setter(self, prefix):
@prefix.setter
def prefix(self, prefix):
if self.children:
self.children[0].prefix = prefix

prefix = property(_prefix_getter, _prefix_setter)

def set_child(self, i, child):
"""
Equivalent to 'node.children[i] = child'. This method also sets the
Expand Down Expand Up @@ -380,18 +380,18 @@ def pre_order(self):
"""Return a pre-order iterator for the tree."""
yield self

def _prefix_getter(self):
@property
def prefix(self):
"""
The whitespace and comments preceding this token in the input.
"""
return self._prefix

def _prefix_setter(self, prefix):
@prefix.setter
def prefix(self, prefix):
self.changed()
self._prefix = prefix

prefix = property(_prefix_getter, _prefix_setter)

def convert(gr, raw_node):
"""
Convert raw node information to a Node or Leaf instance.
Expand Down
9 changes: 7 additions & 2 deletions Lib/multiprocessing/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,13 @@ def close(self):
self._listener = None
listener.close()

address = property(lambda self: self._listener._address)
last_accepted = property(lambda self: self._listener._last_accepted)
@property
def address(self):
return self._listener._address

@property
def last_accepted(self):
return self._listener._last_accepted

def __enter__(self):
return self
Expand Down
10 changes: 7 additions & 3 deletions Lib/multiprocessing/dummy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,15 @@ class Value(object):
def __init__(self, typecode, value, lock=True):
self._typecode = typecode
self._value = value
def _get(self):

@property
def value(self):
return self._value
def _set(self, value):

@value.setter
def value(self, value):
self._value = value
value = property(_get, _set)

def __repr__(self):
return '<%s(%r, %r)>'%(type(self).__name__,self._typecode,self._value)

Expand Down
4 changes: 3 additions & 1 deletion Lib/multiprocessing/dummy/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def accept(self):
def close(self):
self._backlog_queue = None

address = property(lambda self: self._backlog_queue)
@property
def address(self):
return self._backlog_queue

def __enter__(self):
return self
Expand Down
4 changes: 3 additions & 1 deletion Lib/multiprocessing/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,9 @@ def _finalize_manager(process, address, authkey, state, _Client):
except KeyError:
pass

address = property(lambda self: self._address)
@property
def address(self):
return self._address

@classmethod
def register(cls, typeid, callable=None, proxytype=None, exposed=None,
Expand Down
9 changes: 7 additions & 2 deletions Lib/pydoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1868,8 +1868,13 @@ def __init__(self, input=None, output=None):
self._input = input
self._output = output

input = property(lambda self: self._input or sys.stdin)
output = property(lambda self: self._output or sys.stdout)
@property
def input(self):
return self._input or sys.stdin

@property
def output(self):
return self._output or sys.stdout

def __repr__(self):
if inspect.stack()[1][3] == '?':
Expand Down
16 changes: 10 additions & 6 deletions Lib/tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -761,17 +761,21 @@ def __init__(self, name=""):

# In pax headers the "name" and "linkname" field are called
# "path" and "linkpath".
def _getpath(self):
@property
def path(self):
return self.name
def _setpath(self, name):

@path.setter
def path(self, name):
self.name = name
path = property(_getpath, _setpath)

def _getlinkpath(self):
@property
def linkpath(self):
return self.linkname
def _setlinkpath(self, linkname):

@linkpath.setter
def linkpath(self, linkname):
self.linkname = linkname
linkpath = property(_getlinkpath, _setlinkpath)

def __repr__(self):
return "<%s %r at %#x>" % (self.__class__.__name__,self.name,id(self))
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_pyclbr.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def test_others(self):
cm('aifc', ignore=('openfp', '_aifc_params')) # set with = in module
cm('sre_parse', ignore=('dump', 'groups', 'pos')) # from sre_constants import *; property
cm('pdb')
cm('pydoc')
cm('pydoc', ignore=('input', 'output',)) # properties

# Tests for modules inside packages
cm('email.parser')
Expand Down
11 changes: 4 additions & 7 deletions Lib/tkinter/ttk.py
Original file line number Diff line number Diff line change
Expand Up @@ -1577,20 +1577,17 @@ def adjust_label():
self.label['text'] = newval
self.after_idle(adjust_label)


def _get_value(self):
@property
def value(self):
"""Return current scale value."""
return self._variable.get()


def _set_value(self, val):
@value.setter
def value(self, val):
"""Set new scale value."""
self._variable.set(val)


value = property(_get_value, _set_value)


class OptionMenu(Menubutton):
"""Themed OptionMenu, based after tkinter's OptionMenu, which allows
the user to select a value from a menu."""
Expand Down