Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
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
Kirill Smelkov
cpython
Commits
33a8fb99
Commit
33a8fb99
authored
May 15, 2016
by
Terry Jan Reedy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23977: Tweak IDLE Delegator and its test.
parent
5f4ac9fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
12 deletions
+23
-12
Lib/idlelib/Delegator.py
Lib/idlelib/Delegator.py
+10
-2
Lib/idlelib/idle_test/test_delegator.py
Lib/idlelib/idle_test/test_delegator.py
+13
-10
No files found.
Lib/idlelib/Delegator.py
View file @
33a8fb99
class
Delegator
:
class
Delegator
:
# The cache is only used to be able to change delegates!
def
__init__
(
self
,
delegate
=
None
):
def
__init__
(
self
,
delegate
=
None
):
self
.
delegate
=
delegate
self
.
delegate
=
delegate
self
.
__cache
=
set
()
self
.
__cache
=
set
()
# Cache is used to only remove added attributes
# when changing the delegate.
def
__getattr__
(
self
,
name
):
def
__getattr__
(
self
,
name
):
attr
=
getattr
(
self
.
delegate
,
name
)
# May raise AttributeError
attr
=
getattr
(
self
.
delegate
,
name
)
# May raise AttributeError
...
@@ -13,6 +13,9 @@ class Delegator:
...
@@ -13,6 +13,9 @@ class Delegator:
return
attr
return
attr
def
resetcache
(
self
):
def
resetcache
(
self
):
"Removes added attributes while leaving original attributes."
# Function is really about resetting delagator dict
# to original state. Cache is just a means
for
key
in
self
.
__cache
:
for
key
in
self
.
__cache
:
try
:
try
:
delattr
(
self
,
key
)
delattr
(
self
,
key
)
...
@@ -21,5 +24,10 @@ class Delegator:
...
@@ -21,5 +24,10 @@ class Delegator:
self
.
__cache
.
clear
()
self
.
__cache
.
clear
()
def
setdelegate
(
self
,
delegate
):
def
setdelegate
(
self
,
delegate
):
"Reset attributes and change delegate."
self
.
resetcache
()
self
.
resetcache
()
self
.
delegate
=
delegate
self
.
delegate
=
delegate
if
__name__
==
'__main__'
:
from
unittest
import
main
main
(
'idlelib.idle_test.test_delegator'
,
verbosity
=
2
)
Lib/idlelib/idle_test/test_delegator.py
View file @
33a8fb99
...
@@ -4,34 +4,37 @@ from idlelib.Delegator import Delegator
...
@@ -4,34 +4,37 @@ from idlelib.Delegator import Delegator
class
DelegatorTest
(
unittest
.
TestCase
):
class
DelegatorTest
(
unittest
.
TestCase
):
def
test_mydel
(
self
):
def
test_mydel
(
self
):
#
test a simple use scenario
#
Test a simple use scenario.
#
initialize
#
Initialize an int delegator.
mydel
=
Delegator
(
int
)
mydel
=
Delegator
(
int
)
self
.
assertIs
(
mydel
.
delegate
,
int
)
self
.
assertIs
(
mydel
.
delegate
,
int
)
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
set
())
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
set
())
# Trying to access a non-attribute of int fails.
# add an attribute:
self
.
assertRaises
(
AttributeError
,
mydel
.
__getattr__
,
'xyz'
)
self
.
assertRaises
(
AttributeError
,
mydel
.
__getattr__
,
'xyz'
)
# Add real int attribute 'bit_length' by accessing it.
bl
=
mydel
.
bit_length
bl
=
mydel
.
bit_length
self
.
assertIs
(
bl
,
int
.
bit_length
)
self
.
assertIs
(
bl
,
int
.
bit_length
)
self
.
assertIs
(
mydel
.
__dict__
[
'bit_length'
],
int
.
bit_length
)
self
.
assertIs
(
mydel
.
__dict__
[
'bit_length'
],
int
.
bit_length
)
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
{
'bit_length'
})
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
{
'bit_length'
})
#
add a second attribute
#
Add attribute 'numerator'.
mydel
.
numerator
mydel
.
numerator
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
{
'bit_length'
,
'numerator'
})
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
{
'bit_length'
,
'numerator'
})
#
delete the second (which, however, leaves it in the name cache)
#
Delete 'numerator'.
del
mydel
.
numerator
del
mydel
.
numerator
self
.
assertNotIn
(
'numerator'
,
mydel
.
__dict__
)
self
.
assertNotIn
(
'numerator'
,
mydel
.
__dict__
)
self
.
assertIn
(
'numerator'
,
mydel
.
_Delegator__cache
)
# The current implementation leaves it in the name cache.
# self.assertIn('numerator', mydel._Delegator__cache)
# However, this is not required and not part of the specification
# reset by calling .setdelegate, which calls .resetcache
# Change delegate to float, first resetting the attributes.
mydel
.
setdelegate
(
float
)
mydel
.
setdelegate
(
float
)
# calls resetcache
self
.
assertIs
(
mydel
.
delegate
,
float
)
self
.
assertNotIn
(
'bit_length'
,
mydel
.
__dict__
)
self
.
assertNotIn
(
'bit_length'
,
mydel
.
__dict__
)
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
set
())
self
.
assertEqual
(
mydel
.
_Delegator__cache
,
set
())
self
.
assertIs
(
mydel
.
delegate
,
float
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
unittest
.
main
(
verbosity
=
2
,
exit
=
2
)
unittest
.
main
(
verbosity
=
2
,
exit
=
2
)
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