diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-25 12:39:23 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-25 12:39:23 (GMT) |
| commit | 23daade028eca9287f7072a6af26871f99088fe9 (patch) | |
| tree | 50ecab74c1f0d7235c31af2bef7756962f381d89 /Objects | |
| parent | ecbac8f38f2900ccbcc1d6d1c38d8d2dc1055618 (diff) | |
| download | cpython-23daade028eca9287f7072a6af26871f99088fe9.zip cpython-23daade028eca9287f7072a6af26871f99088fe9.tar.gz cpython-23daade028eca9287f7072a6af26871f99088fe9.tar.bz2 | |
Merged revisions 61038,61042-61045,61047,61049-61053,61055-61057 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61049 | christian.heimes | 2008-02-24 13:26:16 +0100 (Sun, 24 Feb 2008) | 1 line
Use PY_FORMAT_SIZE_T instead of z for string formatting. Thanks Neal.
........
r61051 | mark.dickinson | 2008-02-24 19:12:36 +0100 (Sun, 24 Feb 2008) | 2 lines
Remove duplicate 'import re' in decimal.py
........
r61052 | neal.norwitz | 2008-02-24 19:47:03 +0100 (Sun, 24 Feb 2008) | 11 lines
Create a db_home directory with a unique name so multiple users can
run the test simultaneously. The simplest thing I found that worked
on both Windows and Unix was to use the PID. It's unique so should be
sufficient. This should prevent many of the spurious failures of
the automated tests since they run as different users.
Also cleanup the directory consistenly in the tearDown methods.
It would be nice if someone ensured that the directories are always
created with a consistent name.
........
r61057 | christian.heimes | 2008-02-24 23:48:05 +0100 (Sun, 24 Feb 2008) | 2 lines
Added dependency rules for Objects/stringlib/*.h
stringobject, unicodeobject and the two formatters are rebuild whenever a header files changes
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 6 | ||||
| -rw-r--r-- | Objects/listobject.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 3365c47..fc2c8f0 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -172,8 +172,10 @@ static size_t count_reuse = 0; static void show_alloc(void) { - fprintf(stderr, "Dict allocations: %zd\n", count_alloc); - fprintf(stderr, "Dict reuse through freelist: %zd\n", count_reuse); + fprintf(stderr, "Dict allocations: %" PY_FORMAT_SIZE_T "d\n", + count_alloc); + fprintf(stderr, "Dict reuse through freelist: %" PY_FORMAT_SIZE_T + "d\n", count_reuse); fprintf(stderr, "%.2f%% reuse rate\n\n", (100.0*count_reuse/(count_alloc+count_reuse))); } diff --git a/Objects/listobject.c b/Objects/listobject.c index d2917d2..eec1c22 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -72,8 +72,10 @@ static size_t count_reuse = 0; static void show_alloc(void) { - fprintf(stderr, "List allocations: %zd\n", count_alloc); - fprintf(stderr, "List reuse through freelist: %zd\n", count_reuse); + fprintf(stderr, "List allocations: %" PY_FORMAT_SIZE_T "d\n", + count_alloc); + fprintf(stderr, "List reuse through freelist: %" PY_FORMAT_SIZE_T + "d\n", count_reuse); fprintf(stderr, "%.2f%% reuse rate\n\n", (100.0*count_reuse/(count_alloc+count_reuse))); } |