Eric Smith 625cbf28ee Modified parsing of format strings, so that we always return ...

a tuple (literal, field_name, format_spec, conversion).

literal will always be a string, but might be of zero length.
field_name will be None if there is no markup text
format_spec will be a (possibly zero length) string if
  field_name is non-None
conversion will be a one character string, or None

This makes the Formatter class, and especially it's parse()
method, easier to understand.

Suggestion was by Jim Jewett, inspired by the "tail" of an
elementtree node.

Also, fixed a reference leak in fieldnameiter_next.

2007-08-29 03:22:59 +00:00

..

bsddb

some test suite cleanup, use tempfile.mkdtemp() in setUp and

2007-08-28 08:05:56 +00:00

ctypes

Merge the trunk changes in. Breaks socket.ssl for now.

2007-08-28 21:37:11 +00:00

curses

…

distutils

Merged revisions 57221-57391 via svnmerge from

2007-08-24 16:32:05 +00:00

encodings

Fix stupid typo in Lib/encodings/utf_32.py which led to failing tests

2007-08-17 16:23:21 +00:00

hotshot

Fix raise statements in hotshot.

2007-08-22 21:45:02 +00:00

idlelib

os.getcwd() now returns a normal string (ie, unicode)

2007-08-26 23:37:53 +00:00

lib-tk

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

logging

Merged revisions 57221-57391 via svnmerge from

2007-08-24 16:32:05 +00:00

msilib

Change a bunch of file encodings from Latin-1 to UTF-8.

2007-07-16 23:10:57 +00:00

plat-aix4

…

plat-atheos

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

plat-darwin

…

plat-freebsd4

…

plat-freebsd5

…

plat-freebsd6

…

plat-freebsd7

…

plat-generic

…

plat-linux2

…

plat-mac

Remove unneeded import.

2007-08-28 06:07:49 +00:00

plat-netbsd1

…

plat-next3

…

plat-os2emx

Convert raise statements in Lib/plat-{mac,os2emx}.

2007-08-23 00:01:55 +00:00

plat-sunos5

Merged revisions 56492-56752 via svnmerge from

2007-08-05 15:29:28 +00:00

plat-unixware7

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

site-packages

…

sqlite3

Make the sqlite tests pass.

2007-08-10 18:15:11 +00:00

test

Fix this test. How could it ever have worked?!

2007-08-29 02:57:31 +00:00

wsgiref

Switch wsgiref to io.{StringIO,BytesIO}. This shuts up the test failures.

2007-08-08 17:01:45 +00:00

xml

r698@Silves: collinwinter | 2007-08-24 10:57:15 -0700

2007-08-24 18:57:22 +00:00

__future__.py

…

__phello__.foo.py

…

_abcoll.py

Merged revisions 55962-56019 via svnmerge from

2007-06-18 17:58:50 +00:00

_LWPCookieJar.py

…

_MozillaCookieJar.py

…

_strptime.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

_threading_local.py

…

abc.py

Rename __whatever variables defined by ABCMeta to _abc_whatever, so as

2007-08-20 19:29:24 +00:00

aifc.py

Merged revisions 55328-55341 via svnmerge from

2007-05-15 18:46:22 +00:00

anydbm.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

asynchat.py

Merged revisions 56753-56781 via svnmerge from

2007-08-06 23:33:07 +00:00

asyncore.py

Fix test_asyncore after merge. It needs to use bytes.

2007-07-18 20:57:44 +00:00

base64.py

Forgot one. This makes test_urllib2.py pass.

2007-08-29 02:30:49 +00:00

BaseHTTPServer.py

Fixes by John Reese and Jacques Frechet that make test_xmlrpc pass.

2007-08-22 23:45:42 +00:00

bdb.py

Merged revisions 55328-55341 via svnmerge from

2007-05-15 18:46:22 +00:00

binhex.py

Style/idiom cleanup of binhex module.

2007-08-28 06:06:33 +00:00

bisect.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

build_class.py

Implement PEP 3115 -- new metaclass syntax and semantics.

2007-03-18 15:41:51 +00:00

calendar.py

Merged revisions 55007-55179 via svnmerge from

2007-05-07 22:24:25 +00:00

cgi.py

My wish for TempFile is fulfilled.

2007-08-28 03:32:38 +00:00

CGIHTTPServer.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

cgitb.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

chunk.py

Make a few more tests pass with the new I/O library.

2007-04-12 22:55:07 +00:00

cmd.py

Fix pdb help command.

2007-06-07 22:37:45 +00:00

code.py

Merged revisions 56492-56752 via svnmerge from

2007-08-05 15:29:28 +00:00

codecs.py

Make the BOM constants in codecs.py bytes.

2007-05-04 13:05:09 +00:00

codeop.py

…

collections.py

Getting rid of cPickle. Mmm, feels good!

2007-07-20 00:22:32 +00:00

colorsys.py

…

commands.py

Merged revisions 55225-55227,55229-55269 via svnmerge from

2007-05-11 16:50:42 +00:00

compileall.py

Improve error handling; don't die from unicode errors or syntax errors.

2007-07-15 13:01:48 +00:00

ConfigParser.py

Merged revisions 55325-55327 via svnmerge from

2007-05-14 22:51:27 +00:00

contextlib.py

Merged revisions 57221-57391 via svnmerge from

2007-08-24 16:32:05 +00:00

Cookie.py

Fix test_cookie.py.

2007-07-20 00:30:38 +00:00

cookielib.py

SF patch# 1770008 by Christian Heimes (plus some extras).

2007-08-09 01:03:29 +00:00

copy_reg.py

Getting rid of cPickle. Mmm, feels good!

2007-07-20 00:22:32 +00:00

copy.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

cProfile.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

csv.py

Merged revisions 56125-56153 via svnmerge from

2007-07-03 08:25:58 +00:00

dbhash.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

decimal.py

First merge from the trunk straight into the py3k branch. I'm not

2007-08-16 23:48:43 +00:00

difflib.py

Merged revisions 56125-56153 via svnmerge from

2007-07-03 08:25:58 +00:00

dircache.py

…

dis.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

doctest.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

DocXMLRPCServer.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

dumbdbm.py

Make dumbdbm use bytes for keys consistently.

2007-08-28 00:09:54 +00:00

dummy_thread.py

…

dummy_threading.py

…

filecmp.py

Merged revisions 56125-56153 via svnmerge from

2007-07-03 08:25:58 +00:00

fileinput.py

Remove RISCOS support

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

fnmatch.py

…

formatter.py

Merged revisions 55328-55341 via svnmerge from

2007-05-15 18:46:22 +00:00

fpformat.py

…

ftplib.py

Minimal changes to make ftplib work. Basically, this opens the stream in

2007-07-17 20:45:57 +00:00

functools.py

…

genericpath.py

Merged revisions 55325-55327 via svnmerge from

2007-05-14 22:51:27 +00:00

getopt.py

Change a bunch of file encodings from Latin-1 to UTF-8.

2007-07-16 23:10:57 +00:00

getpass.py

…

gettext.py

Make gettext work with strict str/bytes.

2007-08-29 03:08:55 +00:00

glob.py

Rip out all the u"..." literals and calls to unicode().

2007-05-02 19:09:54 +00:00

gzip.py

Retouch my last change after a comment on style from Guido.

2007-08-13 09:05:16 +00:00

hashlib.py

More changes needed to make things work once bytes and str are truly divorced.

2007-08-27 23:09:25 +00:00

heapq.py

Merged revisions 56125-56153 via svnmerge from

2007-07-03 08:25:58 +00:00

hmac.py

Changes in anticipation of stricter str vs. bytes enforcement.

2007-08-27 17:23:59 +00:00

htmlentitydefs.py

…

htmllib.py

…

HTMLParser.py

Rename 'unicode' to 'str' in its tp_name field. Rename 'str' to 'str8'.

2007-05-03 17:18:26 +00:00

httplib.py

Make test_urllib be strict about str/bytes.

2007-08-29 01:53:26 +00:00

ihooks.py

Merged revisions 55631-55794 via svnmerge from

2007-06-06 23:52:48 +00:00

imaplib.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

imghdr.py

Improved patches for sndhdr and imghdr by Victor Stinner, who writes:

2007-08-13 17:50:00 +00:00

imputil.py

Use the str builtin

2007-08-24 23:17:28 +00:00

inspect.py

Merged revisions 56301-56442 via svnmerge from

2007-07-18 18:15:48 +00:00

io.py

Changes to io.py and socket.py by Christian Heimes.

2007-08-27 17:39:33 +00:00

keyword.py

Merged revisions 56020-56124 via svnmerge from

2007-06-30 05:01:58 +00:00

linecache.py

Be even more lenient when catching errors from readlines().

2007-07-10 11:34:31 +00:00

locale.py

Merged revisions 55325-55327 via svnmerge from

2007-05-14 22:51:27 +00:00

macpath.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

macurl2path.py

…

mailbox.py

SF patch# 1770008 by Christian Heimes (plus some extras).

2007-08-09 01:03:29 +00:00

mailcap.py

…

markupbase.py

…

mhlib.py

Merged revisions 56125-56153 via svnmerge from

2007-07-03 08:25:58 +00:00

mimetools.py

Changes in anticipation of stricter str vs. bytes enforcement.

2007-08-27 17:23:59 +00:00

mimetypes.py

Merged revisions 55325-55327 via svnmerge from

2007-05-14 22:51:27 +00:00

modulefinder.py

Some quick fixes of code that was sorting dict.keys() etc.

2007-06-12 00:25:08 +00:00

multifile.py

…

mutex.py

…

netrc.py

…

new.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

nntplib.py

…

ntpath.py

Merged revisions 57221-57391 via svnmerge from

2007-08-24 16:32:05 +00:00

nturl2path.py

…

opcode.py

Hide list comp variables and support set comprehensions

2007-04-15 12:05:43 +00:00

optparse.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

os2emxpath.py

…

os.py

some RiscOS stuff I missed before (was only looking for "RISCOS")

2007-08-17 02:30:27 +00:00

pdb.doc

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

pdb.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

pickle.py

More str/bytes fixes.

2007-08-27 23:18:54 +00:00

pickletools.py

More str/bytes fixes.

2007-08-27 23:18:54 +00:00

pipes.py

…

pkgutil.py

Remove RISCOS support

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

platform.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

poplib.py

Fix test_poplib failures.

2007-07-23 00:24:10 +00:00

posixpath.py

Merged revisions 57221-57391 via svnmerge from

2007-08-24 16:32:05 +00:00

pprint.py

SF patch# 1770008 by Christian Heimes (plus some extras).

2007-08-09 01:03:29 +00:00

profile.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

pstats.py

PEP 3114: rename .next() to .__next__() and add next() builtin.

2007-04-21 15:47:16 +00:00

pty.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

py_compile.py

A small tweak to avoid calling traceback.format_exception_only() with

2007-08-10 17:36:34 +00:00

pyclbr.py

PEP 3114: rename .next() to .__next__() and add next() builtin.

2007-04-21 15:47:16 +00:00

pydoc.py

SF patch# 1770008 by Christian Heimes (plus some extras).

2007-08-09 01:03:29 +00:00

Queue.py

…

quopri.py

Fix quopri to operate consistently on bytes.

2007-07-28 17:52:25 +00:00

random.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

re.py

Merged revisions 55407-55513 via svnmerge from

2007-05-22 18:11:13 +00:00

repr.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

rfc822.py

…

rlcompleter.py

…

robotparser.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

runpy.py

Merge the trunk changes in. Breaks socket.ssl for now.

2007-08-28 21:37:11 +00:00

sched.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

sgmllib.py

Merged revisions 56782-56847 via svnmerge from

2007-08-09 14:26:58 +00:00

shelve.py

Change shelve to require a bytes-oriented dict as

2007-08-11 06:57:14 +00:00

shlex.py

Merged revisions 55631-55794 via svnmerge from

2007-06-06 23:52:48 +00:00

shutil.py

…

SimpleHTTPServer.py

Change some uses of cStringIO.StringIO to io.StringIO.

2007-05-18 00:51:22 +00:00

SimpleXMLRPCServer.py

Merged revisions 57152-57220 via svnmerge from

2007-08-20 19:06:03 +00:00

site.py

some RiscOS stuff I missed before (was only looking for "RISCOS")

2007-08-17 02:30:27 +00:00

smtpd.py

Merged revisions 56753-56781 via svnmerge from

2007-08-06 23:33:07 +00:00

smtplib.py

Merged revisions 57221-57391 via svnmerge from

2007-08-24 16:32:05 +00:00

sndhdr.py

Improved patches for sndhdr and imghdr by Victor Stinner, who writes:

2007-08-13 17:50:00 +00:00

socket.py

Merge the trunk changes in. Breaks socket.ssl for now.

2007-08-28 21:37:11 +00:00

SocketServer.py

SF patch# 1764815 by Paul Colomiets.

2007-08-03 19:03:39 +00:00

sre_compile.py

Merged revisions 56154-56264 via svnmerge from

2007-07-11 13:09:30 +00:00

sre_constants.py

…

sre_parse.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

sre.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

ssl.py

Merge the trunk changes in. Breaks socket.ssl for now.

2007-08-28 21:37:11 +00:00

stat.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

statvfs.py

…

string.py

Modified parsing of format strings, so that we always return

2007-08-29 03:22:59 +00:00

stringprep.py

Merged revisions 55007-55179 via svnmerge from

2007-05-07 22:24:25 +00:00

struct.py

Make struct tests pass.

2007-05-27 09:19:04 +00:00

subprocess.py

More str/bytes goodness.

2007-08-27 23:58:21 +00:00

sunau.py

Merged revisions 55328-55341 via svnmerge from

2007-05-15 18:46:22 +00:00

sunaudio.py

Convert sunaudio.py to bytes. (It has no unit test of its own!)

2007-08-21 22:49:52 +00:00

symbol.py

Merged revisions 55407-55513 via svnmerge from

2007-05-22 18:11:13 +00:00

symtable.py

…

tabnanny.py

…

tarfile.py

Merge the trunk changes in. Breaks socket.ssl for now.

2007-08-28 21:37:11 +00:00

telnetlib.py

Merged revisions 53952-54987 via svnmerge from

2007-04-27 19:54:29 +00:00

tempfile.py

Patch # 1033 by Adam Hupp:

2007-08-28 03:29:45 +00:00

textwrap.py

Quick fix for a new problem here -- using string.lowercase somehow caused

2007-08-11 16:40:13 +00:00

this.py

…

threading.py

Get rid of all __private variables and methods in the threading module.

2007-08-20 19:25:41 +00:00

timeit.py

Merged revisions 55407-55513 via svnmerge from

2007-05-22 18:11:13 +00:00

token.py

Make ELLIPSIS a separate token. This makes it a syntax error to write ". . ." for Ellipsis.

2007-03-18 19:01:53 +00:00

tokenize.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

trace.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

traceback.py

Merged revisions 56492-56752 via svnmerge from

2007-08-05 15:29:28 +00:00

tty.py

…

types.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

unittest.py

Add the function/method name to assertRaises.

2007-07-10 09:10:40 +00:00

urllib2.py

Fix a few places that broke due to a recent change to io.py.

2007-08-27 18:10:06 +00:00

urllib.py

Get the urllib tests to pass without the email package

2007-08-25 19:00:31 +00:00

urlparse.py

Change some uses of cStringIO.StringIO to io.StringIO.

2007-05-18 00:51:22 +00:00

user.py

Kill execfile(), use exec() instead

2007-08-12 00:43:29 +00:00

UserDict.py

PEP 3114: rename .next() to .__next__() and add next() builtin.

2007-04-21 15:47:16 +00:00

UserList.py

…

UserString.py

Merge the trunk changes in. Breaks socket.ssl for now.

2007-08-28 21:37:11 +00:00

uu.py

Changes in anticipation of stricter str vs. bytes enforcement.

2007-08-27 17:23:59 +00:00

uuid.py

Make uuid.py thread-safe. Fix by Yuri Ginsburg.

2007-08-24 04:13:42 +00:00

warnings.py

Merged revisions 55795-55816 via svnmerge from

2007-06-07 23:15:56 +00:00

wave.py

Changes in anticipation of stricter str vs. bytes enforcement.

2007-08-27 20:40:10 +00:00

weakref.py

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

webbrowser.py

Merged revisions 56154-56264 via svnmerge from

2007-07-11 13:09:30 +00:00

whichdb.py

Remove RISCOS support

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

wsgiref.egg-info

…

xdrlib.py

Move xdrlib over to the bytes type.

2007-07-26 03:19:46 +00:00

xmlrpclib.py

One further change.

2007-08-27 22:31:36 +00:00

zipfile.py

Changes preparing for stricter enforcement of bytes vs. str.

2007-08-27 17:03:28 +00:00