Author: neal.norwitz
Date: Wed May 30 08:53:05 2007
New Revision: 55675
Modified:
python/branches/p3yk/Lib/bsddb/test/test_thread.py
python/branches/p3yk/Lib/optparse.py
python/branches/p3yk/Lib/subprocess.py
python/branches/p3yk/Lib/test/test_optparse.py
python/branches/p3yk/Lib/test/test_tokenize.py
python/branches/p3yk/Lib/textwrap.py
python/branches/p3yk/Lib/wsgiref/handlers.py
python/branches/p3yk/Lib/xmlrpclib.py
python/branches/p3yk/Python/graminit.c
Log:
Try to fix up all the other places that were assigning to True/False.
There's at least one more problem in test.test_xmlrpc. I have other
changes in that file and that should be fixed soon (I hope).
Modified: python/branches/p3yk/Lib/bsddb/test/test_thread.py
==============================================================================
--- python/branches/p3yk/Lib/bsddb/test/test_thread.py (original)
+++ python/branches/p3yk/Lib/bsddb/test/test_thread.py Wed May 30 08:53:05 2007
@@ -10,12 +10,6 @@
from pprint import pprint
from random import random
-try:
- True, False
-except NameError:
- True = 1
- False = 0
-
DASH = '-'
try:
Modified: python/branches/p3yk/Lib/optparse.py
==============================================================================
--- python/branches/p3yk/Lib/optparse.py (original)
+++ python/branches/p3yk/Lib/optparse.py Wed May 30 08:53:05 2007
@@ -816,12 +816,6 @@
SUPPRESS_HELP = "SUPPRESS"+"HELP"
SUPPRESS_USAGE = "SUPPRESS"+"USAGE"
-# For compatibility with Python 2.2
-try:
- True, False
-except NameError:
- (True, False) = (1, 0)
-
def isbasestring(x):
return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType)
Modified: python/branches/p3yk/Lib/subprocess.py
==============================================================================
--- python/branches/p3yk/Lib/subprocess.py (original)
+++ python/branches/p3yk/Lib/subprocess.py Wed May 30 08:53:05 2007
@@ -340,13 +340,6 @@
except:
MAXFD = 256
-# True/False does not exist on 2.2.0
-try:
- False
-except NameError:
- False = 0
- True = 1
-
_active = []
def _cleanup():
Modified: python/branches/p3yk/Lib/test/test_optparse.py
==============================================================================
--- python/branches/p3yk/Lib/test/test_optparse.py (original)
+++ python/branches/p3yk/Lib/test/test_optparse.py Wed May 30 08:53:05 2007
@@ -27,12 +27,6 @@
from optparse import _match_abbrev
from optparse import _parse_num
-# Do the right thing with boolean values for all known Python versions.
-try:
- True, False
-except NameError:
- (True, False) = (1, 0)
-
retype = type(re.compile(''))
class InterceptedError(Exception):
Modified: python/branches/p3yk/Lib/test/test_tokenize.py
==============================================================================
--- python/branches/p3yk/Lib/test/test_tokenize.py (original)
+++ python/branches/p3yk/Lib/test/test_tokenize.py Wed May 30 08:53:05 2007
@@ -19,7 +19,7 @@
>>> dump_tokens("if False:\\n"
... " # NL\\n"
-... " True = False # NEWLINE\\n")
+... " a = False # NEWLINE\\n")
NAME 'if' (1, 0) (1, 2)
NAME 'False' (1, 3) (1, 8)
OP ':' (1, 8) (1, 9)
@@ -27,7 +27,7 @@
COMMENT '# NL' (2, 4) (2, 8)
NL '\\n' (2, 8) (2, 9)
INDENT ' ' (3, 0) (3, 4)
-NAME 'True' (3, 4) (3, 8)
+NAME 'a' (3, 4) (3, 5)
OP '=' (3, 9) (3, 10)
NAME 'False' (3, 11) (3, 16)
COMMENT '# NEWLINE' (3, 17) (3, 26)
Modified: python/branches/p3yk/Lib/textwrap.py
==============================================================================
--- python/branches/p3yk/Lib/textwrap.py (original)
+++ python/branches/p3yk/Lib/textwrap.py Wed May 30 08:53:05 2007
@@ -9,14 +9,6 @@
import string, re
-# Do the right thing with boolean values for all known Python versions
-# (so this module can be copied to projects that don't depend on Python
-# 2.3, e.g. Optik and Docutils).
-try:
- True, False
-except NameError:
- (True, False) = (1, 0)
-
__all__ = ['TextWrapper', 'wrap', 'fill']
# Hardcode the recognized whitespace characters to the US-ASCII
Modified: python/branches/p3yk/Lib/wsgiref/handlers.py
==============================================================================
--- python/branches/p3yk/Lib/wsgiref/handlers.py (original)
+++ python/branches/p3yk/Lib/wsgiref/handlers.py Wed May 30 08:53:05 2007
@@ -8,23 +8,6 @@
__all__ = ['BaseHandler', 'SimpleHandler', 'BaseCGIHandler', 'CGIHandler']
-try:
- dict
-except NameError:
- def dict(items):
- d = {}
- for k,v in items:
- d[k] = v
- return d
-
-try:
- True
- False
-except NameError:
- True = not None
- False = not True
-
-
# Weekday and month names for HTTP date/time formatting; always English!
_weekdayname = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
_monthname = [None, # Dummy so we can use 1-based month numbers
Modified: python/branches/p3yk/Lib/xmlrpclib.py
==============================================================================
--- python/branches/p3yk/Lib/xmlrpclib.py (original)
+++ python/branches/p3yk/Lib/xmlrpclib.py Wed May 30 08:53:05 2007
@@ -283,8 +283,6 @@
# all other values are interpreted as False.
boolean = Boolean = bool
-# to avoid breaking code which references xmlrpclib.{True,False}
-True, False = True, False
##
# Wrapper for XML-RPC DateTime values. This converts a time value to
Modified: python/branches/p3yk/Python/graminit.c
==============================================================================
--- python/branches/p3yk/Python/graminit.c (original)
+++ python/branches/p3yk/Python/graminit.c Wed May 30 08:53:05 2007
@@ -1285,7 +1285,7 @@
{1, arcs_62_2},
{1, arcs_62_3},
};
-static arc arcs_63_0[7] = {
+static arc arcs_63_0[10] = {
{13, 1},
{146, 2},
{148, 3},
@@ -1293,6 +1293,9 @@
{151, 4},
{152, 5},
{77, 4},
+ {153, 4},
+ {154, 4},
+ {155, 4},
};
static arc arcs_63_1[3] = {
{46, 6},
@@ -1324,7 +1327,7 @@
{150, 4},
};
static state states_63[9] = {
- {7, arcs_63_0},
+ {10, arcs_63_0},
{3, arcs_63_1},
{2, arcs_63_2},
{2, arcs_63_3},
@@ -1338,7 +1341,7 @@
{24, 1},
};
static arc arcs_64_1[3] = {
- {153, 2},
+ {156, 2},
{30, 3},
{0, 1},
};
@@ -1370,7 +1373,7 @@
{15, 5},
};
static arc arcs_65_2[1] = {
- {154, 6},
+ {157, 6},
};
static arc arcs_65_3[1] = {
{21, 5},
@@ -1394,14 +1397,14 @@
{1, arcs_65_6},
};
static arc arcs_66_0[1] = {
- {155, 1},
+ {158, 1},
};
static arc arcs_66_1[2] = {
{30, 2},
{0, 1},
};
static arc arcs_66_2[2] = {
- {155, 1},
+ {158, 1},
{0, 2},
};
static state states_66[3] = {
@@ -1419,11 +1422,11 @@
};
static arc arcs_67_2[3] = {
{24, 3},
- {156, 4},
+ {159, 4},
{0, 2},
};
static arc arcs_67_3[2] = {
- {156, 4},
+ {159, 4},
{0, 3},
};
static arc arcs_67_4[1] = {
@@ -1488,7 +1491,7 @@
};
static arc arcs_71_1[4] = {
{25, 2},
- {153, 3},
+ {156, 3},
{30, 4},
{0, 1},
};
@@ -1529,7 +1532,7 @@
{1, arcs_71_8},
};
static arc arcs_72_0[1] = {
- {157, 1},
+ {160, 1},
};
static arc arcs_72_1[1] = {
{21, 2},
@@ -1565,7 +1568,7 @@
{1, arcs_72_7},
};
static arc arcs_73_0[3] = {
- {158, 1},
+ {161, 1},
{31, 2},
{32, 3},
};
@@ -1580,7 +1583,7 @@
{24, 6},
};
static arc arcs_73_4[4] = {
- {158, 1},
+ {161, 1},
{31, 2},
{32, 3},
{0, 4},
@@ -1609,7 +1612,7 @@
{24, 1},
};
static arc arcs_74_1[3] = {
- {153, 2},
+ {156, 2},
{29, 3},
{0, 1},
};
@@ -1626,8 +1629,8 @@
{1, arcs_74_3},
};
static arc arcs_75_0[2] = {
- {153, 1},
- {160, 1},
+ {156, 1},
+ {163, 1},
};
static arc arcs_75_1[1] = {
{0, 1},
@@ -1649,7 +1652,7 @@
{105, 4},
};
static arc arcs_76_4[2] = {
- {159, 5},
+ {162, 5},
{0, 4},
};
static arc arcs_76_5[1] = {
@@ -1670,7 +1673,7 @@
{107, 2},
};
static arc arcs_77_2[2] = {
- {159, 3},
+ {162, 3},
{0, 2},
};
static arc arcs_77_3[1] = {
@@ -1704,7 +1707,7 @@
{1, arcs_79_1},
};
static arc arcs_80_0[1] = {
- {163, 1},
+ {166, 1},
};
static arc arcs_80_1[2] = {
{9, 2},
@@ -1720,11 +1723,11 @@
};
static dfa dfas[81] = {
{256, "single_input", 0, 3, states_0,
-
"\004\050\060\200\000\000\000\050\170\052\034\144\011\040\004\000\200\041\224\041\010"},
+
"\004\050\060\200\000\000\000\050\170\052\034\144\011\040\004\000\200\041\224\017\101"},
{257, "file_input", 0, 2, states_1,
-
"\204\050\060\200\000\000\000\050\170\052\034\144\011\040\004\000\200\041\224\041\010"},
+
"\204\050\060\200\000\000\000\050\170\052\034\144\011\040\004\000\200\041\224\017\101"},
{258, "eval_input", 0, 3, states_2,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{259, "decorator", 0, 7, states_3,
"\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{260, "decorators", 0, 2, states_4,
@@ -1744,13 +1747,13 @@
{267, "vfpdef", 0, 2, states_11,
"\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{268, "stmt", 0, 2, states_12,
-
"\000\050\060\200\000\000\000\050\170\052\034\144\011\040\004\000\200\041\224\041\010"},
+
"\000\050\060\200\000\000\000\050\170\052\034\144\011\040\004\000\200\041\224\017\101"},
{269, "simple_stmt", 0, 4, states_13,
-
"\000\040\040\200\000\000\000\050\170\052\034\000\000\040\004\000\200\041\224\001\010"},
+
"\000\040\040\200\000\000\000\050\170\052\034\000\000\040\004\000\200\041\224\017\100"},
{270, "small_stmt", 0, 2, states_14,
-
"\000\040\040\200\000\000\000\050\170\052\034\000\000\040\004\000\200\041\224\001\010"},
+
"\000\040\040\200\000\000\000\050\170\052\034\000\000\040\004\000\200\041\224\017\100"},
{271, "expr_stmt", 0, 6, states_15,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{272, "augassign", 0, 2, states_16,
"\000\000\000\000\000\200\377\007\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{273, "del_stmt", 0, 3, states_17,
@@ -1758,7 +1761,7 @@
{274, "pass_stmt", 0, 2, states_18,
"\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{275, "flow_stmt", 0, 2, states_19,
-
"\000\000\000\000\000\000\000\000\170\000\000\000\000\000\000\000\000\000\000\000\010"},
+
"\000\000\000\000\000\000\000\000\170\000\000\000\000\000\000\000\000\000\000\000\100"},
{276, "break_stmt", 0, 2, states_20,
"\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000"},
{277, "continue_stmt", 0, 2, states_21,
@@ -1766,7 +1769,7 @@
{278, "return_stmt", 0, 3, states_22,
"\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"},
{279, "yield_stmt", 0, 2, states_23,
-
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"},
+
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"},
{280, "raise_stmt", 0, 7, states_24,
"\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000"},
{281, "import_stmt", 0, 2, states_25,
@@ -1792,7 +1795,7 @@
{291, "assert_stmt", 0, 5, states_35,
"\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
{292, "compound_stmt", 0, 2, states_36,
-
"\000\010\020\000\000\000\000\000\000\000\000\144\011\000\000\000\000\000\000\040\000"},
+
"\000\010\020\000\000\000\000\000\000\000\000\144\011\000\000\000\000\000\000\000\001"},
{293, "if_stmt", 0, 8, states_37,
"\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
{294, "while_stmt", 0, 8, states_38,
@@ -1808,67 +1811,67 @@
{299, "except_clause", 0, 5, states_43,
"\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
{300, "suite", 0, 5, states_44,
-
"\004\040\040\200\000\000\000\050\170\052\034\000\000\040\004\000\200\041\224\001\010"},
+
"\004\040\040\200\000\000\000\050\170\052\034\000\000\040\004\000\200\041\224\017\100"},
{301, "test", 0, 6, states_45,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{302, "test_nocond", 0, 2, states_46,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{303, "lambdef", 0, 5, states_47,
"\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000"},
{304, "lambdef_nocond", 0, 5, states_48,
"\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000"},
{305, "or_test", 0, 2, states_49,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\004\000\200\041\224\017\000"},
{306, "and_test", 0, 2, states_50,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\004\000\200\041\224\017\000"},
{307, "not_test", 0, 3, states_51,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\004\000\200\041\224\017\000"},
{308, "comparison", 0, 2, states_52,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{309, "comp_op", 0, 4, states_53,
"\000\000\000\000\000\000\000\000\000\000\000\200\000\000\304\037\000\000\000\000\000"},
{310, "star_expr", 0, 3, states_54,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{311, "expr", 0, 2, states_55,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{312, "xor_expr", 0, 2, states_56,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{313, "and_expr", 0, 2, states_57,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{314, "shift_expr", 0, 2, states_58,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{315, "arith_expr", 0, 2, states_59,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{316, "term", 0, 2, states_60,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{317, "factor", 0, 3, states_61,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{318, "power", 0, 4, states_62,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\224\017\000"},
{319, "atom", 0, 9, states_63,
-
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\224\001\000"},
+
"\000\040\040\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\224\017\000"},
{320, "testlist_comp", 0, 5, states_64,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{321, "trailer", 0, 7, states_65,
"\000\040\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\004\000\000"},
{322, "subscriptlist", 0, 3, states_66,
-
"\000\040\040\202\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\202\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{323, "subscript", 0, 5, states_67,
-
"\000\040\040\202\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\202\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{324, "sliceop", 0, 3, states_68,
"\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{325, "exprlist", 0, 3, states_69,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\000\000\000\200\041\224\017\000"},
{326, "testlist", 0, 3, states_70,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{327, "dictorsetmaker", 0, 9, states_71,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{328, "classdef", 0, 8, states_72,
-
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000"},
+
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"},
{329, "arglist", 0, 8, states_73,
-
"\000\040\040\200\001\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\001\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{330, "argument", 0, 4, states_74,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{331, "comp_iter", 0, 2, states_75,
"\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"},
{332, "comp_for", 0, 6, states_76,
@@ -1876,13 +1879,13 @@
{333, "comp_if", 0, 4, states_77,
"\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
{334, "testlist1", 0, 2, states_78,
-
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\001\000"},
+
"\000\040\040\200\000\000\000\000\000\040\000\000\000\040\004\000\200\041\224\017\000"},
{335, "encoding_decl", 0, 2, states_79,
"\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{336, "yield_expr", 0, 3, states_80,
-
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"},
+
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"},
};
-static label labels[164] = {
+static label labels[167] = {
{0, "EMPTY"},
{256, 0},
{4, 0},
@@ -2036,6 +2039,9 @@
{27, 0},
{2, 0},
{3, 0},
+ {1, "None"},
+ {1, "True"},
+ {1, "False"},
{332, 0},
{322, 0},
{323, 0},
@@ -2051,6 +2057,6 @@
grammar _PyParser_Grammar = {
81,
dfas,
- {164, labels},
+ {167, labels},
256
};
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
