Benjamin Peterson 9aebc61ad8 Merged revisions 67030-67031 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67030 | benjamin.peterson | 2008-10-26 15:21:13 -0500 (Sun, 26 Oct 2008) | 1 line

  fix __future__ imports when multiple features are given
........
  r67031 | benjamin.peterson | 2008-10-26 15:33:19 -0500 (Sun, 26 Oct 2008) | 1 line

  add forgotten test for r67030
........

2008-10-26 20:58:53 +00:00

..

acceler.c

[Patch #974633] Check PyObject_MALLOC return for error

2004-06-29 14:03:04 +00:00

asdl_c.py

Merged revisions 66974,66977,66984,66989,66992,66994-66996,66998-67000,67007,67015 via svnmerge from

2008-10-25 15:49:17 +00:00

asdl.py

Remove __metaclass__ remains.

2008-05-27 20:34:09 +00:00

bitset.c

Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

2006-04-21 10:40:58 +00:00

firstsets.c

Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

2006-04-21 10:40:58 +00:00

grammar1.c

PyGrammar_LabelRepr(): sprintf -> PyOS_snprintf.

2001-12-04 03:36:01 +00:00

grammar.c

Remove RISCOS support

2007-08-16 14:35:24 +00:00

grammar.mak

Merge ast-branch to head

2005-10-20 19:59:25 +00:00

intrcheck.c

Merged revisions 64212 via svnmerge from

2008-06-13 00:26:50 +00:00

listnode.c

REMOVED all CWI, CNRI and BeOpen copyright markings.

2000-09-01 23:29:29 +00:00

metagrammar.c

Changes from Jonathan Riehl to allow his pgen extension (PEP 269) to

2003-04-17 14:55:42 +00:00

myreadline.c

Remove RISCOS support

2007-08-16 14:35:24 +00:00

node.c

Merged revisions 64114 via svnmerge from

2008-06-18 00:47:36 +00:00

parser.c

Merged revisions 67030-67031 via svnmerge from

2008-10-26 20:58:53 +00:00

parser.h

Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60969,60971-60976 via svnmerge from

2008-02-23 13:18:03 +00:00

parsetok.c

Remove meaning of -ttt, but still accept -t option on cmdline for compatibility.

2008-06-04 13:06:58 +00:00

pgen.c

Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from

2008-01-18 09:56:22 +00:00

pgenmain.c

Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

2006-04-21 10:40:58 +00:00

printgrammar.c

Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62128,62130,62132,62134-62135,62137,62139-62140,62144,62146,62151,62155,62157,62162-62166,62171-62172,62175-62176,62178,62181-62186,62188-62192,62196,62200-62203,62206,62211-62213,62215-62218,62222,62224-62226,62228,62232,62236,62240-62245,62248,62250-62254,62256-62258,62262,62264-62265,62267-62270,62272-62276,62280-62288,62291-62292,62299-62301,62307,62312,62316-62318,62322-62331,62333-62337,62339-62344,62346-62348 via svnmerge from

2008-04-15 06:43:13 +00:00

Python.asdl

Merged revisions 62047 via svnmerge from

2008-03-31 05:14:30 +00:00

spark.py

Merged revisions 60990-61002 via svnmerge from

2008-02-23 18:30:17 +00:00

tokenizer_pgen.c

Patch #534304: Implement phase 1 of PEP 263.

2002-08-04 17:29:52 +00:00

tokenizer.c

Latin-1 source code was not being properly decoded when passed through

2008-10-17 03:38:50 +00:00

tokenizer.h

Latin-1 source code was not being properly decoded when passed through

2008-10-17 03:38:50 +00:00