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
ac9a2bb0
Commit
ac9a2bb0
authored
Nov 29, 2010
by
Georg Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use booleans where applicable.
parent
2660747a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
21 deletions
+21
-21
Lib/bdb.py
Lib/bdb.py
+11
-11
Lib/pdb.py
Lib/pdb.py
+10
-10
No files found.
Lib/bdb.py
View file @
ac9a2bb0
...
@@ -168,7 +168,7 @@ class Bdb:
...
@@ -168,7 +168,7 @@ class Bdb:
def
_set_stopinfo
(
self
,
stopframe
,
returnframe
,
stoplineno
=
0
):
def
_set_stopinfo
(
self
,
stopframe
,
returnframe
,
stoplineno
=
0
):
self
.
stopframe
=
stopframe
self
.
stopframe
=
stopframe
self
.
returnframe
=
returnframe
self
.
returnframe
=
returnframe
self
.
quitting
=
0
self
.
quitting
=
False
# stoplineno >= 0 means: stop at line >= the stoplineno
# stoplineno >= 0 means: stop at line >= the stoplineno
# stoplineno -1 means: don't stop at all
# stoplineno -1 means: don't stop at all
self
.
stoplineno
=
stoplineno
self
.
stoplineno
=
stoplineno
...
@@ -225,7 +225,7 @@ class Bdb:
...
@@ -225,7 +225,7 @@ class Bdb:
def
set_quit
(
self
):
def
set_quit
(
self
):
self
.
stopframe
=
self
.
botframe
self
.
stopframe
=
self
.
botframe
self
.
returnframe
=
None
self
.
returnframe
=
None
self
.
quitting
=
1
self
.
quitting
=
True
sys
.
settrace
(
None
)
sys
.
settrace
(
None
)
# Derived classes and clients can call the following methods
# Derived classes and clients can call the following methods
...
@@ -235,7 +235,7 @@ class Bdb:
...
@@ -235,7 +235,7 @@ class Bdb:
# Call self.get_*break*() to see the breakpoints or better
# Call self.get_*break*() to see the breakpoints or better
# for bp in Breakpoint.bpbynumber: if bp: bp.bpprint().
# for bp in Breakpoint.bpbynumber: if bp: bp.bpprint().
def
set_break
(
self
,
filename
,
lineno
,
temporary
=
0
,
cond
=
None
,
def
set_break
(
self
,
filename
,
lineno
,
temporary
=
False
,
cond
=
None
,
funcname
=
None
):
funcname
=
None
):
filename
=
self
.
canonic
(
filename
)
filename
=
self
.
canonic
(
filename
)
import
linecache
# Import as late as possible
import
linecache
# Import as late as possible
...
@@ -391,7 +391,7 @@ class Bdb:
...
@@ -391,7 +391,7 @@ class Bdb:
except
BdbQuit
:
except
BdbQuit
:
pass
pass
finally
:
finally
:
self
.
quitting
=
1
self
.
quitting
=
True
sys
.
settrace
(
None
)
sys
.
settrace
(
None
)
def
runeval
(
self
,
expr
,
globals
=
None
,
locals
=
None
):
def
runeval
(
self
,
expr
,
globals
=
None
,
locals
=
None
):
...
@@ -407,7 +407,7 @@ class Bdb:
...
@@ -407,7 +407,7 @@ class Bdb:
except
BdbQuit
:
except
BdbQuit
:
pass
pass
finally
:
finally
:
self
.
quitting
=
1
self
.
quitting
=
True
sys
.
settrace
(
None
)
sys
.
settrace
(
None
)
def
runctx
(
self
,
cmd
,
globals
,
locals
):
def
runctx
(
self
,
cmd
,
globals
,
locals
):
...
@@ -425,7 +425,7 @@ class Bdb:
...
@@ -425,7 +425,7 @@ class Bdb:
except
BdbQuit
:
except
BdbQuit
:
pass
pass
finally
:
finally
:
self
.
quitting
=
1
self
.
quitting
=
True
sys
.
settrace
(
None
)
sys
.
settrace
(
None
)
return
res
return
res
...
@@ -457,7 +457,7 @@ class Breakpoint:
...
@@ -457,7 +457,7 @@ class Breakpoint:
# index 0 is unused, except for marking an
# index 0 is unused, except for marking an
# effective break .... see effective()
# effective break .... see effective()
def
__init__
(
self
,
file
,
line
,
temporary
=
0
,
cond
=
None
,
funcname
=
None
):
def
__init__
(
self
,
file
,
line
,
temporary
=
False
,
cond
=
None
,
funcname
=
None
):
self
.
funcname
=
funcname
self
.
funcname
=
funcname
# Needed if funcname is not None.
# Needed if funcname is not None.
self
.
func_first_executable_line
=
None
self
.
func_first_executable_line
=
None
...
@@ -465,11 +465,11 @@ class Breakpoint:
...
@@ -465,11 +465,11 @@ class Breakpoint:
self
.
line
=
line
self
.
line
=
line
self
.
temporary
=
temporary
self
.
temporary
=
temporary
self
.
cond
=
cond
self
.
cond
=
cond
self
.
enabled
=
1
self
.
enabled
=
True
self
.
ignore
=
0
self
.
ignore
=
0
self
.
hits
=
0
self
.
hits
=
0
self
.
number
=
Breakpoint
.
next
self
.
number
=
Breakpoint
.
next
Breakpoint
.
next
=
Breakpoint
.
next
+
1
Breakpoint
.
next
+=
1
# Build the two lists
# Build the two lists
self
.
bpbynumber
.
append
(
self
)
self
.
bpbynumber
.
append
(
self
)
if
(
file
,
line
)
in
self
.
bplist
:
if
(
file
,
line
)
in
self
.
bplist
:
...
@@ -486,10 +486,10 @@ class Breakpoint:
...
@@ -486,10 +486,10 @@ class Breakpoint:
del
self
.
bplist
[
index
]
del
self
.
bplist
[
index
]
def
enable
(
self
):
def
enable
(
self
):
self
.
enabled
=
1
self
.
enabled
=
True
def
disable
(
self
):
def
disable
(
self
):
self
.
enabled
=
0
self
.
enabled
=
False
def
bpprint
(
self
,
out
=
None
):
def
bpprint
(
self
,
out
=
None
):
if
out
is
None
:
if
out
is
None
:
...
...
Lib/pdb.py
View file @
ac9a2bb0
...
@@ -94,14 +94,14 @@ def find_function(funcname, filename):
...
@@ -94,14 +94,14 @@ def find_function(funcname, filename):
# consumer of this info expects the first line to be 1
# consumer of this info expects the first line to be 1
lineno
=
1
lineno
=
1
answer
=
None
answer
=
None
while
1
:
while
True
:
line
=
fp
.
readline
()
line
=
fp
.
readline
()
if
line
==
''
:
if
line
==
''
:
break
break
if
cre
.
match
(
line
):
if
cre
.
match
(
line
):
answer
=
funcname
,
filename
,
lineno
answer
=
funcname
,
filename
,
lineno
break
break
lineno
=
lineno
+
1
lineno
+=
1
fp
.
close
()
fp
.
close
()
return
answer
return
answer
...
@@ -140,7 +140,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
...
@@ -140,7 +140,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
self
.
prompt
=
'(Pdb) '
self
.
prompt
=
'(Pdb) '
self
.
aliases
=
{}
self
.
aliases
=
{}
self
.
mainpyfile
=
''
self
.
mainpyfile
=
''
self
.
_wait_for_mainpyfile
=
0
self
.
_wait_for_mainpyfile
=
False
self
.
tb_lineno
=
{}
self
.
tb_lineno
=
{}
# Try to load readline if it exists
# Try to load readline if it exists
try
:
try
:
...
@@ -235,9 +235,9 @@ class Pdb(bdb.Bdb, cmd.Cmd):
...
@@ -235,9 +235,9 @@ class Pdb(bdb.Bdb, cmd.Cmd):
"""This function is called when we stop or break at this line."""
"""This function is called when we stop or break at this line."""
if
self
.
_wait_for_mainpyfile
:
if
self
.
_wait_for_mainpyfile
:
if
(
self
.
mainpyfile
!=
self
.
canonic
(
frame
.
f_code
.
co_filename
)
if
(
self
.
mainpyfile
!=
self
.
canonic
(
frame
.
f_code
.
co_filename
)
or
frame
.
f_lineno
<=
0
):
or
frame
.
f_lineno
<=
0
):
return
return
self
.
_wait_for_mainpyfile
=
0
self
.
_wait_for_mainpyfile
=
False
if
self
.
bp_commands
(
frame
):
if
self
.
bp_commands
(
frame
):
self
.
interaction
(
frame
,
None
)
self
.
interaction
(
frame
,
None
)
...
@@ -337,7 +337,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
...
@@ -337,7 +337,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
for
tmpArg
in
args
[
1
:]:
for
tmpArg
in
args
[
1
:]:
line
=
line
.
replace
(
"%"
+
str
(
ii
),
line
=
line
.
replace
(
"%"
+
str
(
ii
),
tmpArg
)
tmpArg
)
ii
=
ii
+
1
ii
+=
1
line
=
line
.
replace
(
"%*"
,
' '
.
join
(
args
[
1
:]))
line
=
line
.
replace
(
"%*"
,
' '
.
join
(
args
[
1
:]))
args
=
line
.
split
()
args
=
line
.
split
()
# split into ';;' separated commands
# split into ';;' separated commands
...
@@ -962,7 +962,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
...
@@ -962,7 +962,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
"""q(uit)
\
n
exit
"""q(uit)
\
n
exit
Quit from the debugger. The program being executed is aborted.
Quit from the debugger. The program being executed is aborted.
"""
"""
self
.
_user_requested_quit
=
1
self
.
_user_requested_quit
=
True
self
.
set_quit
()
self
.
set_quit
()
return
1
return
1
...
@@ -974,7 +974,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
...
@@ -974,7 +974,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
Handles the receipt of EOF as a command.
Handles the receipt of EOF as a command.
"""
"""
self
.
message
(
''
)
self
.
message
(
''
)
self
.
_user_requested_quit
=
1
self
.
_user_requested_quit
=
True
self
.
set_quit
()
self
.
set_quit
()
return
1
return
1
...
@@ -1326,9 +1326,9 @@ class Pdb(bdb.Bdb, cmd.Cmd):
...
@@ -1326,9 +1326,9 @@ class Pdb(bdb.Bdb, cmd.Cmd):
# events depends on python version). So we take special measures to
# events depends on python version). So we take special measures to
# avoid stopping before we reach the main script (see user_line and
# avoid stopping before we reach the main script (see user_line and
# user_call for details).
# user_call for details).
self
.
_wait_for_mainpyfile
=
1
self
.
_wait_for_mainpyfile
=
True
self
.
mainpyfile
=
self
.
canonic
(
filename
)
self
.
mainpyfile
=
self
.
canonic
(
filename
)
self
.
_user_requested_quit
=
0
self
.
_user_requested_quit
=
False
with
open
(
filename
,
"rb"
)
as
fp
:
with
open
(
filename
,
"rb"
)
as
fp
:
statement
=
"exec(compile(%r, %r, 'exec'))"
%
\
statement
=
"exec(compile(%r, %r, 'exec'))"
%
\
(
fp
.
read
(),
self
.
mainpyfile
)
(
fp
.
read
(),
self
.
mainpyfile
)
...
...
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