[Python-3000-checkins] r61643 - in python/branches/py3k: Doc/library/hashlib.rst Lib/distutils/sysconfig.py Lib/hashlib.py Lib/test/regrtest.py Lib/test/test_extcall.py Lib/test/test_import.py Lib/test/test_int_literal.py Lib/test/test_nis.py Lib/test/test_posix.py Lib/test/test_print.py Lib/test/test_winsound.py Lib/test/test_zlib.py Lib/zipfile.py Misc/ACKS Misc/developers.txt Modules/binascii.c Modules/posixmodule.c Objects/abstract.c Objects/cellobject.c PCbuild/_bsddb.vcproj PCbuild/_sqlite3.vcproj PCbuild/_tkinter.vcproj PCbuild/pcbuild.sln PCbuild/pyproject.vsprops Python/ast.c Tools/buildbot/external-amd64.bat Tools/buildbot/external.bat
christian.heimes
python-3000-checkins at python.org
Wed Mar 19 22:50:52 CET 2008
Author: christian.heimes
Date: Wed Mar 19 22:50:51 2008
New Revision: 61643
Added:
python/branches/py3k/Lib/test/test_extcall.py
- copied, changed from r61635, python/trunk/Lib/test/test_extcall.py
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/library/hashlib.rst
python/branches/py3k/Lib/distutils/sysconfig.py
python/branches/py3k/Lib/hashlib.py
python/branches/py3k/Lib/test/regrtest.py
python/branches/py3k/Lib/test/test_import.py
python/branches/py3k/Lib/test/test_int_literal.py
python/branches/py3k/Lib/test/test_nis.py
python/branches/py3k/Lib/test/test_posix.py
python/branches/py3k/Lib/test/test_print.py
python/branches/py3k/Lib/test/test_winsound.py
python/branches/py3k/Lib/test/test_zlib.py
python/branches/py3k/Lib/zipfile.py
python/branches/py3k/Misc/ACKS
python/branches/py3k/Misc/developers.txt
python/branches/py3k/Modules/binascii.c
python/branches/py3k/Modules/posixmodule.c
python/branches/py3k/Objects/abstract.c
python/branches/py3k/Objects/cellobject.c
python/branches/py3k/PCbuild/_bsddb.vcproj
python/branches/py3k/PCbuild/_sqlite3.vcproj
python/branches/py3k/PCbuild/_tkinter.vcproj
python/branches/py3k/PCbuild/pcbuild.sln
python/branches/py3k/PCbuild/pyproject.vsprops
python/branches/py3k/Python/ast.c
python/branches/py3k/Tools/buildbot/external-amd64.bat
python/branches/py3k/Tools/buildbot/external.bat
Log:
Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61538 | steven.bethard | 2008-03-18 20:03:50 +0100 (Di, 18 Mär 2008) | 1 line
cell_compare needs to return -2 instead of NULL.
........
r61539 | steven.bethard | 2008-03-18 20:04:32 +0100 (Di, 18 Mär 2008) | 1 line
_have_soundcard() is a bad check for winsound.Beep, since you can have a soundcard but have the beep driver disabled. This revision basically disables the beep tests by wrapping them in a try/except. The Right Way To Do It is to come up with a _have_enabled_beep_driver() and use that.
........
r61540 | gregory.p.smith | 2008-03-18 20:05:32 +0100 (Di, 18 Mär 2008) | 8 lines
Fix chown on 64-bit linux. It needed to take a long (64-bit on 64bit linux) as
uid and gid input to accept values >=2**31 as valid while still accepting
negative numbers to pass -1 to chown for "no change".
Fixes issue1747858.
This should be backported to release25-maint.
........
r61556 | steven.bethard | 2008-03-18 20:59:14 +0100 (Di, 18 Mär 2008) | 1 line
Fix test_atexit so that it still passes when -3 is supplied. (It was catching the warning messages on stdio from using the reload() function.)
........
r61559 | neal.norwitz | 2008-03-18 21:30:38 +0100 (Di, 18 Mär 2008) | 1 line
Import the test properly. This is especially important for py3k.
........
r61560 | gregory.p.smith | 2008-03-18 21:40:01 +0100 (Di, 18 Mär 2008) | 2 lines
news entry for the chown fix
........
r61563 | brett.cannon | 2008-03-18 22:12:42 +0100 (Di, 18 Mär 2008) | 2 lines
Ignore BIG5HKSCS-2004.TXT which is downloaded as part of a test.
........
r61565 | steven.bethard | 2008-03-18 22:30:13 +0100 (Di, 18 Mär 2008) | 1 line
Have regrtest skip test_py3kwarn when the -3 flag is missing.
........
r61571 | gregory.p.smith | 2008-03-18 23:27:41 +0100 (Di, 18 Mär 2008) | 4 lines
Add a test to make sure zlib.crc32 and binascii.crc32 return the same thing.
Fix a buglet in binascii.crc32, the second optional argument could previously
have a signedness mismatch with the C variable its going into.
........
r61575 | raymond.hettinger | 2008-03-19 00:22:29 +0100 (Mi, 19 Mär 2008) | 1 line
Speed-up isinstance() for one easy case.
........
r61576 | raymond.hettinger | 2008-03-19 00:33:08 +0100 (Mi, 19 Mär 2008) | 1 line
Issue: 2354: Add 3K warning for the cmp argument to list.sort() and sorted().
........
r61580 | andrew.kuchling | 2008-03-19 02:05:35 +0100 (Mi, 19 Mär 2008) | 1 line
Add Jeff Rush
........
r61581 | gregory.p.smith | 2008-03-19 02:38:35 +0100 (Mi, 19 Mär 2008) | 3 lines
Mention that crc32 and adler32 are available in a different module (zlib).
Some people look for them in hashlib.
........
r61582 | gregory.p.smith | 2008-03-19 02:46:10 +0100 (Mi, 19 Mär 2008) | 3 lines
Use zlib's crc32 routine instead of binascii when available. zlib's is faster
when compiled properly optimized and about the same speed otherwise.
........
r61586 | david.wolever | 2008-03-19 03:26:57 +0100 (Mi, 19 Mär 2008) | 1 line
Added my name to ACKS
........
r61591 | gregory.p.smith | 2008-03-19 04:14:41 +0100 (Mi, 19 Mär 2008) | 5 lines
Fix the struct module DeprecationWarnings that zipfile was triggering by
removing all use of signed struct values.
test_zipfile and test_zipfile64 pass. no more warnings.
........
r61593 | raymond.hettinger | 2008-03-19 04:56:59 +0100 (Mi, 19 Mär 2008) | 1 line
Fix compiler warning.
........
r61595 | martin.v.loewis | 2008-03-19 05:39:13 +0100 (Mi, 19 Mär 2008) | 2 lines
Issue #2400: Allow relative imports to "import *".
........
r61605 | martin.v.loewis | 2008-03-19 07:00:28 +0100 (Mi, 19 Mär 2008) | 2 lines
Import relimport using a relative import.
........
r61606 | trent.nelson | 2008-03-19 07:28:24 +0100 (Mi, 19 Mär 2008) | 1 line
Issue2290: Support x64 Windows builds that live in pcbuild/amd64. Without it, sysutils._python_build() returns the wrong directory, which causes the test_get_config_h_filename method in Lib/distutils/tests/test_sysconfig.py to fail.
........
r61613 | trent.nelson | 2008-03-19 08:45:19 +0100 (Mi, 19 Mär 2008) | 3 lines
Refine the Visual Studio 2008 build solution in order to improve how we deal with external components, as well as fixing outstanding issues with Windows x64 build support. Introduce two new .vcproj files, _bsddb44.vcproj and sqlite3.vcproj, which replace the previous pre-link event scripts for _bsddb and _sqlite3 respectively. The new project files inherit from our property files as if they were any other Python module. This has numerous benefits. First, the components get built with exactly the same compiler flags and settings as the rest of Python. Second, it makes it much easier to debug problems in the external components when they're part of the build system. Third, they'll benefit from profile guided optimisation in the release builds, just like the rest of Python core.
I've also introduced a slightly new pattern for managing externals in subversion. New components get checked in as <name>-<version>.x, where <version> matches the exact vendor version string. After the initial import of the external component, the .x is tagged as .0 (i.e. tcl-8.4.18.x -> tcl-8.4.18.0). Some components may not need any tweaking, whereas there are others that might (tcl/tk fall into this bucket). In that case, the relevant modifications are made to the .x branch, which will be subsequently tagged as .1 (and then n+1 going forward) when they build successfully and all tests pass. Buildbots will be converted to rely on these explicit tags only, which makes it easy for us to switch them over to a new version as and when required. (Simple change to external(-amd64).bat: if we've bumped tcl to 8.4.18.1, change the .bat to rmdir 8.4.18.0 if it exists and check out a new .1 copy.)
........
r61614 | trent.nelson | 2008-03-19 08:56:39 +0100 (Mi, 19 Mär 2008) | 1 line
Remove extraneous apostrophe and semi-colon from AdditionalIncludeDirectories.
........
r61615 | georg.brandl | 2008-03-19 08:56:40 +0100 (Mi, 19 Mär 2008) | 2 lines
Remove footnote from versionchanged as it upsets LaTeX.
........
r61616 | georg.brandl | 2008-03-19 08:57:57 +0100 (Mi, 19 Mär 2008) | 2 lines
Another one.
........
r61618 | trent.nelson | 2008-03-19 09:06:03 +0100 (Mi, 19 Mär 2008) | 1 line
Fix the tcl-8.4.18.1 path and make sure we cd into the right directory when building tcl/tk.
........
r61621 | trent.nelson | 2008-03-19 10:23:08 +0100 (Mi, 19 Mär 2008) | 1 line
Lets have another try at getting the Windows buildbots in a consistent state before rebuilding using the new process.
........
r61622 | eric.smith | 2008-03-19 13:09:55 +0100 (Mi, 19 Mär 2008) | 2 lines
Use test.test_support.captured_stdout instead of a custom contextmanager.
Thanks Nick Coghlan.
........
r61623 | eric.smith | 2008-03-19 13:15:10 +0100 (Mi, 19 Mär 2008) | 1 line
Trivial typo.
........
r61625 | thomas.heller | 2008-03-19 17:10:57 +0100 (Mi, 19 Mär 2008) | 2 lines
Checkout sqlite-source when it is not there.
........
r61627 | brett.cannon | 2008-03-19 17:50:13 +0100 (Mi, 19 Mär 2008) | 5 lines
test_nis would fail if test.test_support.verbose was true but NIS was not set
up on the machine.
Closes issue2411. Thanks Michael Bishop.
........
r61631 | brett.cannon | 2008-03-19 18:37:43 +0100 (Mi, 19 Mär 2008) | 2 lines
Use sys.py3kwarning instead of trying to trigger a Py3k-related warning.
........
r61632 | raymond.hettinger | 2008-03-19 18:45:19 +0100 (Mi, 19 Mär 2008) | 1 line
Issue 2354: Fix-up compare warning. Patch contributed by Jeff Balogh.
........
r61633 | raymond.hettinger | 2008-03-19 18:58:59 +0100 (Mi, 19 Mär 2008) | 1 line
The filter() function does support a None argument in Py3.0.
........
r61634 | raymond.hettinger | 2008-03-19 19:01:58 +0100 (Mi, 19 Mär 2008) | 1 line
Remove itertools warnings I had added before the 2-to-3 handled the migration.
........
Modified: python/branches/py3k/Doc/library/hashlib.rst
==============================================================================
--- python/branches/py3k/Doc/library/hashlib.rst (original)
+++ python/branches/py3k/Doc/library/hashlib.rst Wed Mar 19 22:50:51 2008
@@ -19,6 +19,10 @@
"message digest" are interchangeable. Older algorithms were called message
digests. The modern term is secure hash.
+.. note::
+ If you want the adler32 or crc32 hash functions they are available in
+ the :mod:`zlib` module.
+
.. warning::
Some algorithms have known hash collision weaknesses, see the FAQ at the end.
Modified: python/branches/py3k/Lib/distutils/sysconfig.py
==============================================================================
--- python/branches/py3k/Lib/distutils/sysconfig.py (original)
+++ python/branches/py3k/Lib/distutils/sysconfig.py Wed Mar 19 22:50:51 2008
@@ -23,7 +23,8 @@
EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
# Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild9
+# live in project/PCBuild9. If we're dealing with an x64 Windows build,
+# it'll live in project/PCbuild/amd64.
project_base = os.path.dirname(os.path.abspath(sys.executable))
if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
@@ -31,6 +32,10 @@
if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
os.path.pardir))
+# PC/AMD64
+if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
+ project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+ os.path.pardir))
# python_build: (Boolean) if true, we're either building Python or
# building an extension with an un-installed Python, so we use
Modified: python/branches/py3k/Lib/hashlib.py
==============================================================================
--- python/branches/py3k/Lib/hashlib.py (original)
+++ python/branches/py3k/Lib/hashlib.py Wed Mar 19 22:50:51 2008
@@ -18,6 +18,9 @@
More algorithms may be available on your platform but the above are
guaranteed to exist.
+NOTE: If you want the adler32 or crc32 hash functions they are available in
+the zlib module.
+
Choose your hash function wisely. Some have known collision weaknesses.
sha384 and sha512 will be slow on 32 bit platforms.
Modified: python/branches/py3k/Lib/test/regrtest.py
==============================================================================
--- python/branches/py3k/Lib/test/regrtest.py (original)
+++ python/branches/py3k/Lib/test/regrtest.py Wed Mar 19 22:50:51 2008
@@ -1157,6 +1157,14 @@
if sys.platform != 'sunos5':
self.expected.add('test_nis')
+ # TODO: This is a hack to raise TestSkipped if -3 is not enabled.
+ # Instead of relying on callable to have a warning, we should expose
+ # the -3 flag to Python code somehow
+ with test_support.catch_warning() as w:
+ callable(int)
+ if w.message is None:
+ self.expected.add('test_py3kwarn')
+
self.valid = True
def isvalid(self):
Copied: python/branches/py3k/Lib/test/test_extcall.py (from r61635, python/trunk/Lib/test/test_extcall.py)
==============================================================================
--- python/trunk/Lib/test/test_extcall.py (original)
+++ python/branches/py3k/Lib/test/test_extcall.py Wed Mar 19 22:50:51 2008
@@ -2,22 +2,22 @@
We're going the use these types for extra testing
- >>> from UserList import UserList
- >>> from UserDict import UserDict
+ >>> from collections import UserList
+ >>> from collections import UserDict
We're defining four helper functions
>>> def e(a,b):
- ... print a, b
+ ... print(a, b)
>>> def f(*a, **k):
- ... print a, test_support.sortdict(k)
+ ... print(a, test_support.sortdict(k))
>>> def g(x, *y, **z):
- ... print x, y, test_support.sortdict(z)
+ ... print(x, y, test_support.sortdict(z))
>>> def h(j=1, a=2, h=3):
- ... print j, a, h
+ ... print(j, a, h)
Argument list examples
@@ -65,17 +65,17 @@
>>> g()
Traceback (most recent call last):
...
- TypeError: g() takes at least 1 argument (0 given)
+ TypeError: g() takes at least 1 positional argument (0 given)
>>> g(*())
Traceback (most recent call last):
...
- TypeError: g() takes at least 1 argument (0 given)
+ TypeError: g() takes at least 1 positional argument (0 given)
>>> g(*(), **{})
Traceback (most recent call last):
...
- TypeError: g() takes at least 1 argument (0 given)
+ TypeError: g() takes at least 1 positional argument (0 given)
>>> g(1)
1 () {}
@@ -91,7 +91,7 @@
>>> g(*Nothing())
Traceback (most recent call last):
...
- TypeError: g() argument after * must be a sequence, not instance
+ TypeError: g() argument after * must be a sequence, not Nothing
>>> class Nothing:
... def __len__(self): return 5
@@ -100,7 +100,7 @@
>>> g(*Nothing())
Traceback (most recent call last):
...
- TypeError: g() argument after * must be a sequence, not instance
+ TypeError: g() argument after * must be a sequence, not Nothing
>>> class Nothing():
... def __len__(self): return 5
@@ -115,7 +115,7 @@
>>> class Nothing:
... def __init__(self): self.c = 0
... def __iter__(self): return self
- ... def next(self):
+ ... def __next__(self):
... if self.c == 4:
... raise StopIteration
... c = self.c
@@ -206,7 +206,7 @@
>>> d = {}
- >>> for i in xrange(512):
+ >>> for i in range(512):
... key = 'k%d' % i
... d[key] = i
>>> a, b = f2(1, *(2,3), **d)
@@ -223,16 +223,9 @@
>>> Foo.method(x, *(1, 2))
3
>>> Foo.method(*(1, 2, 3))
- Traceback (most recent call last):
- ...
- TypeError: unbound method method() must be called with Foo instance as \
-first argument (got int instance instead)
-
+ 5
>>> Foo.method(1, *[2, 3])
- Traceback (most recent call last):
- ...
- TypeError: unbound method method() must be called with Foo instance as \
-first argument (got int instance instead)
+ 5
A PyCFunction that takes only positional parameters shoud allow an
empty keyword dictionary to pass without a complaint, but raise a
Modified: python/branches/py3k/Lib/test/test_import.py
==============================================================================
--- python/branches/py3k/Lib/test/test_import.py (original)
+++ python/branches/py3k/Lib/test/test_import.py Wed Mar 19 22:50:51 2008
@@ -255,8 +255,20 @@
self.assertEqual(mod.testdata, 'test_trailing_slash')
unload("test_trailing_slash")
+class RelativeImport(unittest.TestCase):
+ def tearDown(self):
+ try:
+ del sys.modules["test.relimport"]
+ except:
+ pass
+
+ def test_relimport_star(self):
+ # This will import * from .test_import.
+ from . import relimport
+ self.assertTrue(hasattr(relimport, "RelativeImport"))
+
def test_main(verbose=None):
- run_unittest(ImportTest, PathsTests)
+ run_unittest(ImportTest, PathsTests, RelativeImport)
if __name__ == '__main__':
test_main()
Modified: python/branches/py3k/Lib/test/test_int_literal.py
==============================================================================
--- python/branches/py3k/Lib/test/test_int_literal.py (original)
+++ python/branches/py3k/Lib/test/test_int_literal.py Wed Mar 19 22:50:51 2008
@@ -6,7 +6,7 @@
import unittest
from test import test_support
-class TextHexOctBin(unittest.TestCase):
+class TestHexOctBin(unittest.TestCase):
def test_hex_baseline(self):
# A few upper/lowercase tests
@@ -141,7 +141,7 @@
self.assertEqual(-0b1111111111111111111111111111111111111111111111111111111111111111, -18446744073709551615)
def test_main():
- test_support.run_unittest(TextHexOctBin)
+ test_support.run_unittest(TestHexOctBin)
if __name__ == "__main__":
test_main()
Modified: python/branches/py3k/Lib/test/test_nis.py
==============================================================================
--- python/branches/py3k/Lib/test/test_nis.py (original)
+++ python/branches/py3k/Lib/test/test_nis.py Wed Mar 19 22:50:51 2008
@@ -1,4 +1,4 @@
-from test.test_support import verbose, run_unittest
+from test import test_support
import unittest
import nis
@@ -8,8 +8,10 @@
maps = nis.maps()
except nis.error as msg:
# NIS is probably not active, so this test isn't useful
- if verbose:
- self.fail("(failing because of verbose mode) %s" % msg)
+ if test_support.verbose:
+ print("Test Skipped:", msg)
+ # Can't raise TestSkipped as regrtest only recognizes the exception
+ # import time.
return
try:
# On some systems, this map is only accessible to the
@@ -35,7 +37,7 @@
break
def test_main():
- run_unittest(NisTests)
+ test_support.run_unittest(NisTests)
if __name__ == '__main__':
test_main()
Modified: python/branches/py3k/Lib/test/test_posix.py
==============================================================================
--- python/branches/py3k/Lib/test/test_posix.py (original)
+++ python/branches/py3k/Lib/test/test_posix.py Wed Mar 19 22:50:51 2008
@@ -9,6 +9,7 @@
import time
import os
+import pwd
import unittest
import warnings
warnings.filterwarnings('ignore', '.* potential security risk .*',
@@ -141,6 +142,33 @@
if hasattr(posix, 'stat'):
self.assert_(posix.stat(test_support.TESTFN))
+ if hasattr(posix, 'chown'):
+ def test_chown(self):
+ # raise an OSError if the file does not exist
+ os.unlink(test_support.TESTFN)
+ self.assertRaises(OSError, posix.chown, test_support.TESTFN, -1, -1)
+
+ # re-create the file
+ open(test_support.TESTFN, 'w').close()
+ if os.getuid() == 0:
+ try:
+ # Many linux distros have a nfsnobody user as MAX_UID-2
+ # that makes a good test case for signedness issues.
+ # http://bugs.python.org/issue1747858
+ # This part of the test only runs when run as root.
+ # Only scary people run their tests as root.
+ ent = pwd.getpwnam('nfsnobody')
+ posix.chown(test_support.TESTFN, ent.pw_uid, ent.pw_gid)
+ except KeyError:
+ pass
+ else:
+ # non-root cannot chown to root, raises OSError
+ self.assertRaises(OSError, posix.chown,
+ test_support.TESTFN, 0, 0)
+
+ # test a successful chown call
+ posix.chown(test_support.TESTFN, os.getuid(), os.getgid())
+
def test_chdir(self):
if hasattr(posix, 'chdir'):
posix.chdir(os.curdir)
Modified: python/branches/py3k/Lib/test/test_print.py
==============================================================================
--- python/branches/py3k/Lib/test/test_print.py (original)
+++ python/branches/py3k/Lib/test/test_print.py Wed Mar 19 22:50:51 2008
@@ -12,8 +12,6 @@
# 2.x
from StringIO import StringIO
-from contextlib import contextmanager
-
NotDefined = object()
# A dispatch table all 8 combinations of providing
@@ -40,15 +38,6 @@
lambda args, sep, end, file: print(sep=sep, end=end, file=file, *args),
}
- at contextmanager
-def stdout_redirected(new_stdout):
- save_stdout = sys.stdout
- sys.stdout = new_stdout
- try:
- yield None
- finally:
- sys.stdout = save_stdout
-
# Class used to test __str__ and print
class ClassWith__str__:
def __init__(self, x):
@@ -69,8 +58,7 @@
end is not NotDefined,
file is not NotDefined)]
- t = StringIO()
- with stdout_redirected(t):
+ with test_support.captured_stdout() as t:
fn(args, sep, end, file)
self.assertEqual(t.getvalue(), expected)
Modified: python/branches/py3k/Lib/test/test_winsound.py
==============================================================================
--- python/branches/py3k/Lib/test/test_winsound.py (original)
+++ python/branches/py3k/Lib/test/test_winsound.py Wed Mar 19 22:50:51 2008
@@ -23,25 +23,27 @@
self.assertRaises(ValueError, winsound.Beep, 32768, 75)
def test_extremes(self):
- if _have_soundcard():
- winsound.Beep(37, 75)
- winsound.Beep(32767, 75)
- else:
- # The behaviour of winsound.Beep() seems to differ between
- # different versions of Windows when there's either a) no
- # sound card entirely, b) legacy beep driver has been disabled,
- # or c) the legacy beep driver has been uninstalled. Sometimes
- # RuntimeErrors are raised, sometimes they're not. Meh.
- try:
- winsound.Beep(37, 75)
- winsound.Beep(32767, 75)
- except RuntimeError:
- pass
+ self._beep(37, 75)
+ self._beep(32767, 75)
def test_increasingfrequency(self):
- if _have_soundcard():
- for i in range(100, 2000, 100):
- winsound.Beep(i, 75)
+ for i in xrange(100, 2000, 100):
+ self._beep(i, 75)
+
+ def _beep(self, *args):
+ # these tests used to use _have_soundcard(), but it's quite
+ # possible to have a soundcard, and yet have the beep driver
+ # disabled. So basically, we have no way of knowing whether
+ # a beep should be produced or not, so currently if these
+ # tests fail we're ignoring them
+ #
+ # XXX the right fix for this is to define something like
+ # _have_enabled_beep_driver() and use that instead of the
+ # try/except below
+ try:
+ winsound.Beep(*args)
+ except RuntimeError:
+ pass
class MessageBeepTest(unittest.TestCase):
Modified: python/branches/py3k/Lib/test/test_zlib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_zlib.py (original)
+++ python/branches/py3k/Lib/test/test_zlib.py Wed Mar 19 22:50:51 2008
@@ -1,6 +1,7 @@
import unittest
from test import test_support
import zlib
+import binascii
import random
@@ -46,6 +47,12 @@
self.assertEqual(zlib.adler32(foo+foo), 3573550353)
self.assertEqual(zlib.adler32('spam'), 72286642)
+ def test_same_as_binascii_crc32(self):
+ foo = 'abcdefghijklmnop'
+ crc = -1808088941
+ self.assertEqual(binascii.crc32(foo), crc)
+ self.assertEqual(zlib.crc32(foo), crc)
+ self.assertEqual(binascii.crc32('spam'), zlib.crc32('spam'))
Modified: python/branches/py3k/Lib/zipfile.py
==============================================================================
--- python/branches/py3k/Lib/zipfile.py (original)
+++ python/branches/py3k/Lib/zipfile.py Wed Mar 19 22:50:51 2008
@@ -8,8 +8,10 @@
try:
import zlib # We may need its compression method
+ crc32 = zlib.crc32
except ImportError:
zlib = None
+ crc32 = binascii.crc32
__all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile",
"ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile" ]
@@ -36,13 +38,13 @@
# Here are some struct module formats for reading headers
structEndArchive = "<4s4H2LH" # 9 items, end of archive, 22 bytes
stringEndArchive = b"PK\005\006" # magic number for end of archive record
-structCentralDir = "<4s4B4HlLL5HLL"# 19 items, central directory, 46 bytes
+structCentralDir = "<4s4B4HLLL5HLL"# 19 items, central directory, 46 bytes
stringCentralDir = b"PK\001\002" # magic number for central directory
-structFileHeader = "<4s2B4HlLL2H" # 12 items, file header record, 30 bytes
+structFileHeader = "<4s2B4HLLL2H" # 12 items, file header record, 30 bytes
stringFileHeader = b"PK\003\004" # magic number for file header
-structEndArchive64Locator = "<4slql" # 4 items, locate Zip64 header, 20 bytes
+structEndArchive64Locator = "<4sLQL" # 4 items, locate Zip64 header, 20 bytes
stringEndArchive64Locator = b"PK\x06\x07" # magic token for locator header
-structEndArchive64 = "<4sqhhllqqqq" # 10 items, end of archive (Zip64), 56 bytes
+structEndArchive64 = "<4sQHHLLQQQQ" # 10 items, end of archive (Zip64), 56 bytes
stringEndArchive64 = b"PK\x06\x06" # magic token for Zip64 header
@@ -140,7 +142,7 @@
endrec = list(endrec)
endrec.append("") # Append the archive comment
endrec.append(filesize - 22) # Append the record start offset
- if endrec[-4] == -1 or endrec[-4] == 0xffffffff:
+ if endrec[-4] == 0xffffffff:
return _EndRecData64(fpin, -22, endrec)
return endrec
# Search the last END_BLOCK bytes of the file for the record signature.
@@ -160,7 +162,7 @@
# Append the archive comment and start offset
endrec.append(comment)
endrec.append(filesize - END_BLOCK + start)
- if endrec[-4] == -1 or endrec[-4] == 0xffffffff:
+ if endrec[-4] == 0xffffffff:
return _EndRecData64(fpin, - END_BLOCK + start, endrec)
return endrec
return # Error, return None
@@ -247,7 +249,7 @@
if file_size > ZIP64_LIMIT or compress_size > ZIP64_LIMIT:
# File is larger than what fits into a 4 byte integer,
# fall back to the ZIP64 extension
- fmt = '<hhqq'
+ fmt = '<HHQQ'
extra = extra + struct.pack(fmt,
1, struct.calcsize(fmt)-4, file_size, compress_size)
file_size = 0xffffffff # -1
@@ -267,14 +269,14 @@
extra = self.extra
unpack = struct.unpack
while extra:
- tp, ln = unpack('<hh', extra[:4])
+ tp, ln = unpack('<HH', extra[:4])
if tp == 1:
if ln >= 24:
- counts = unpack('<qqq', extra[4:28])
+ counts = unpack('<QQQ', extra[4:28])
elif ln == 16:
- counts = unpack('<qq', extra[4:20])
+ counts = unpack('<QQ', extra[4:20])
elif ln == 8:
- counts = unpack('<q', extra[4:12])
+ counts = unpack('<Q', extra[4:12])
elif ln == 0:
counts = ()
else:
@@ -283,7 +285,8 @@
idx = 0
# ZIP64 extension (large files and/or large archives)
- if self.file_size == -1 or self.file_size == 0xFFFFFFFF:
+ # XXX Is this correct? won't this exclude 2**32-1 byte files?
+ if self.file_size in (0xffffffffffffffff, 0xffffffff):
self.file_size = counts[idx]
idx += 1
@@ -950,7 +953,7 @@
if not buf:
break
file_size = file_size + len(buf)
- CRC = binascii.crc32(buf, CRC)
+ CRC = crc32(buf, CRC) & 0xffffffff
if cmpr:
buf = cmpr.compress(buf)
compress_size = compress_size + len(buf)
@@ -968,7 +971,7 @@
# Seek backwards and write CRC and file sizes
position = self.fp.tell() # Preserve current position in file
self.fp.seek(zinfo.header_offset + 14, 0)
- self.fp.write(struct.pack("<lLL", zinfo.CRC, zinfo.compress_size,
+ self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
zinfo.file_size))
self.fp.seek(position, 0)
self.filelist.append(zinfo)
@@ -997,7 +1000,7 @@
zinfo.header_offset = self.fp.tell() # Start of header data
self._writecheck(zinfo)
self._didModify = True
- zinfo.CRC = binascii.crc32(data) # CRC-32 checksum
+ zinfo.CRC = crc32(data) & 0xffffffff # CRC-32 checksum
if zinfo.compress_type == ZIP_DEFLATED:
co = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
zlib.DEFLATED, -15)
@@ -1047,7 +1050,7 @@
if zinfo.header_offset > ZIP64_LIMIT:
extra.append(zinfo.header_offset)
- header_offset = -1 # struct "l" format: 32 one bits
+ header_offset = 0xffffffff # -1 32 bit
else:
header_offset = zinfo.header_offset
@@ -1055,7 +1058,7 @@
if extra:
# Append a ZIP64 field to the extra's
extra_data = struct.pack(
- '<hh' + 'q'*len(extra),
+ '<HH' + 'Q'*len(extra),
1, 8*len(extra), *extra) + extra_data
extract_version = max(45, zinfo.extract_version)
@@ -1064,14 +1067,25 @@
extract_version = zinfo.extract_version
create_version = zinfo.create_version
- centdir = struct.pack(structCentralDir,
- stringCentralDir, create_version,
- zinfo.create_system, extract_version, zinfo.reserved,
- zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
- zinfo.CRC, compress_size, file_size,
- len(zinfo.filename), len(extra_data), len(zinfo.comment),
- 0, zinfo.internal_attr, zinfo.external_attr,
- header_offset)
+ try:
+ centdir = struct.pack(structCentralDir,
+ stringCentralDir, create_version,
+ zinfo.create_system, extract_version, zinfo.reserved,
+ zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+ zinfo.CRC, compress_size, file_size,
+ len(zinfo.filename), len(extra_data), len(zinfo.comment),
+ 0, zinfo.internal_attr, zinfo.external_attr,
+ header_offset)
+ except DeprecationWarning:
+ print >>sys.stderr, (structCentralDir,
+ stringCentralDir, create_version,
+ zinfo.create_system, extract_version, zinfo.reserved,
+ zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+ zinfo.CRC, compress_size, file_size,
+ len(zinfo.filename), len(extra_data), len(zinfo.comment),
+ 0, zinfo.internal_attr, zinfo.external_attr,
+ header_offset)
+ raise
self.fp.write(centdir)
self.fp.write(zinfo.filename.encode("utf-8"))
self.fp.write(extra_data)
@@ -1091,10 +1105,8 @@
stringEndArchive64Locator, 0, pos2, 1)
self.fp.write(zip64locrec)
- # XXX Why is `pos3` computed next? It's never referenced.
- pos3 = self.fp.tell()
endrec = struct.pack(structEndArchive, stringEndArchive,
- 0, 0, count, count, pos2 - pos1, -1, 0)
+ 0, 0, count, count, pos2 - pos1, 0xffffffff, 0)
self.fp.write(endrec)
else:
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS (original)
+++ python/branches/py3k/Misc/ACKS Wed Mar 19 22:50:51 2008
@@ -736,6 +736,7 @@
Stefan Witzel
Klaus-Juergen Wolf
Dan Wolfe
+David Wolever
Richard Wolff
Gordon Worley
Thomas Wouters
Modified: python/branches/py3k/Misc/developers.txt
==============================================================================
--- python/branches/py3k/Misc/developers.txt (original)
+++ python/branches/py3k/Misc/developers.txt Wed Mar 19 22:50:51 2008
@@ -17,6 +17,8 @@
Permissions History
-------------------
+- Jeff Rush was given SVN access on 18 March 2008 by AMK, for Distutils work.
+
- David Wolever was given SVN access on 17 March 2008 by MvL,
for 2to3 work.
Modified: python/branches/py3k/Modules/binascii.c
==============================================================================
--- python/branches/py3k/Modules/binascii.c (original)
+++ python/branches/py3k/Modules/binascii.c Wed Mar 19 22:50:51 2008
@@ -902,7 +902,7 @@
Py_ssize_t len;
long result;
- if ( !PyArg_ParseTuple(args, "s#|l:crc32", &bin_data, &len, &crc) )
+ if ( !PyArg_ParseTuple(args, "s#|k:crc32", &bin_data, &len, &crc) )
return NULL;
crc = ~ crc;
Modified: python/branches/py3k/Modules/posixmodule.c
==============================================================================
--- python/branches/py3k/Modules/posixmodule.c (original)
+++ python/branches/py3k/Modules/posixmodule.c Wed Mar 19 22:50:51 2008
@@ -1906,9 +1906,9 @@
posix_chown(PyObject *self, PyObject *args)
{
char *path = NULL;
- int uid, gid;
+ long uid, gid;
int res;
- if (!PyArg_ParseTuple(args, "etii:chown",
+ if (!PyArg_ParseTuple(args, "etll:chown",
Py_FileSystemDefaultEncoding, &path,
&uid, &gid))
return NULL;
Modified: python/branches/py3k/Objects/abstract.c
==============================================================================
--- python/branches/py3k/Objects/abstract.c (original)
+++ python/branches/py3k/Objects/abstract.c Wed Mar 19 22:50:51 2008
@@ -2600,6 +2600,11 @@
static PyObject *name = NULL;
PyObject *t, *v, *tb;
PyObject *checker;
+
+ /* Quick test for an exact match */
+ if (Py_TYPE(inst) == (PyTypeObject *)cls)
+ return 1;
+
PyErr_Fetch(&t, &v, &tb);
if (name == NULL) {
Modified: python/branches/py3k/Objects/cellobject.c
==============================================================================
--- python/branches/py3k/Objects/cellobject.c (original)
+++ python/branches/py3k/Objects/cellobject.c Wed Mar 19 22:50:51 2008
@@ -51,6 +51,18 @@
PyObject_GC_Del(op);
}
+static int
+cell_compare(PyCellObject *a, PyCellObject *b)
+{
+ if (a->ob_ref == NULL) {
+ if (b->ob_ref == NULL)
+ return 0;
+ return -1;
+ } else if (b->ob_ref == NULL)
+ return 1;
+ return PyObject_Compare(a->ob_ref, b->ob_ref);
+}
+
static PyObject *
cell_repr(PyCellObject *op)
{
@@ -102,7 +114,7 @@
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
- 0, /* tp_compare */
+ (cmpfunc)cell_compare, /* tp_compare */
(reprfunc)cell_repr, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
Modified: python/branches/py3k/PCbuild/_bsddb.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/_bsddb.vcproj (original)
+++ python/branches/py3k/PCbuild/_bsddb.vcproj Wed Mar 19 22:50:51 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_bsddb"
ProjectGUID="{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
RootNamespace="_bsddb"
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -52,11 +52,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug|Win32"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -105,7 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -115,11 +113,11 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist "x64\Debug AMD64\db_static.lib" exit 0
vcbuild /useenv db_static.vcproj "Debug AMD64|x64"
"
+ CommandLine=""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies=""$(bsddbDir)x64\Debug AMD64\db_static.lib""
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -168,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -178,11 +176,10 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -232,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -242,11 +239,11 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist x64\Release AMD64\db_static.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
"
+ CommandLine=""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -295,7 +292,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -305,11 +302,10 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -359,7 +355,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -369,11 +365,10 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist "x64\Release AMD64\db_static.lib" exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
@@ -423,7 +418,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -433,11 +428,10 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -487,7 +481,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -497,11 +491,10 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist x64\Release AMD64\db_static.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
Modified: python/branches/py3k/PCbuild/_sqlite3.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/_sqlite3.vcproj (original)
+++ python/branches/py3k/PCbuild/_sqlite3.vcproj Wed Mar 19 22:50:51 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_sqlite3"
ProjectGUID="{13CECB97-4119-4316-9D42-8534019A5A44}"
RootNamespace="_sqlite3"
@@ -53,12 +53,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -118,12 +115,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -183,12 +177,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -249,12 +240,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -314,12 +302,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -380,12 +365,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
@@ -446,12 +428,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -512,12 +491,9 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
Modified: python/branches/py3k/PCbuild/_tkinter.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/_tkinter.vcproj (original)
+++ python/branches/py3k/PCbuild/_tkinter.vcproj Wed Mar 19 22:50:51 2008
@@ -56,7 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
+ AdditionalDependencies="$(tcltkLibDebug)"
/>
<Tool
Name="VCALinkTool"
@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
+ AdditionalDependencies="$(tcltk64LibDebug)"
/>
<Tool
Name="VCALinkTool"
@@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
@@ -354,7 +354,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
@@ -480,7 +480,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
Modified: python/branches/py3k/PCbuild/pcbuild.sln
==============================================================================
--- python/branches/py3k/PCbuild/pcbuild.sln (original)
+++ python/branches/py3k/PCbuild/pcbuild.sln Wed Mar 19 22:50:51 2008
@@ -36,6 +36,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
ProjectSection(ProjectDependencies) = postProject
+ {62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19}
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -67,6 +68,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
@@ -114,6 +116,10 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -486,6 +492,38 @@
{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32
{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64
{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.Build.0 = Debug|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.ActiveCfg = Release|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: python/branches/py3k/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild/pyproject.vsprops (original)
+++ python/branches/py3k/PCbuild/pyproject.vsprops Wed Mar 19 22:50:51 2008
@@ -46,23 +46,43 @@
/>
<UserMacro
Name="bsddbDir"
- Value="..\..\db-4.4.20\build_win32\"
+ Value="$(bsddb44Dir)"
+ />
+ <UserMacro
+ Name="bsddbDepLibs"
+ Value="$(bsddb44DepLibs)"
+ />
+ <UserMacro
+ Name="bsddb44Dir"
+ Value="..\..\db-4.4.20\build_win32"
+ />
+ <UserMacro
+ Name="bsddb44DepLibs"
+ Value=""
+ />
+ <UserMacro
+ Name="bsddb45Dir"
+ Value="..\..\db-4.5.20.x\build_windows"
+ />
+ <UserMacro
+ Name="bsddb45DepLibs"
+ Value="ws2_32.lib"
/>
<UserMacro
Name="sqlite3Dir"
- Value="..\..\sqlite-source-3.3.4\"
+ Value="..\..\sqlite-source-3.3.4"
/>
<UserMacro
Name="bz2Dir"
- Value="..\..\bzip2-1.0.3\"
+ Value="..\..\bzip2-1.0.3"
/>
<UserMacro
Name="opensslDir"
- Value="..\..\openssl-0.9.8g\"
+ Value="..\..\openssl-0.9.8g"
/>
<UserMacro
Name="tcltkDir"
- Value="..\..\tcltk\"
+ Value="..\..\tcltk"
/>
<UserMacro
Name="tcltk64Dir"
@@ -73,7 +93,15 @@
Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
/>
<UserMacro
+ Name="tcltkLibDebug"
+ Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
+ />
+ <UserMacro
Name="tcltk64Lib"
Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
/>
+ <UserMacro
+ Name="tcltk64LibDebug"
+ Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
+ />
</VisualStudioPropertySheet>
Modified: python/branches/py3k/Python/ast.c
==============================================================================
--- python/branches/py3k/Python/ast.c (original)
+++ python/branches/py3k/Python/ast.c Wed Mar 19 22:50:51 2008
@@ -2386,10 +2386,6 @@
/* from ... import * */
n = CHILD(n, idx);
n_children = 1;
- if (ndots) {
- ast_error(n, "'import *' not allowed with 'from .'");
- return NULL;
- }
break;
case LPAR:
/* from ... import (x, y, z) */
Modified: python/branches/py3k/Tools/buildbot/external-amd64.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/external-amd64.bat (original)
+++ python/branches/py3k/Tools/buildbot/external-amd64.bat Wed Mar 19 22:50:51 2008
@@ -1,48 +1,17 @@
@rem Fetches (and builds if necessary) external dependencies
- at REM XXX FIXME - building for x64 disabled for now.
-
@rem Assume we start inside the Python source directory
-cd ..
-call "%VS90COMNTOOLS%vsvars32.bat"
-
- at rem bzip
-if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
-
- at rem Sleepycat db
- at rem Remove VS 2003 builds
-if exist db-4.4.20 if not exist db-4.4.20\build_win32\this_is_for_vs9 (
- echo Removing old build
- rd /s/q db-4.4.20
-)
-if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
-if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
- vcbuild db-4.4.20\build_win32\db_static.vcproj "Debug AMD64|x64"
-)
+call "Tools\buildbot\external-common.bat"
+call "%VS90COMNTOOLS%\vsvars32.bat"
- at rem OpenSSL
-if not exist openssl-0.9.8g (
- if exist openssl-0.9.8a rd /s/q openssl-0.9.8a
- svn export http://svn.python.org/projects/external/openssl-0.9.8g
+if not exist tcltk64\bin\tcl84g.dll (
+ cd tcl-8.4.18.2\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk64 clean all install
+ cd ..\..
)
- at rem tcltk
-if not exist tcl8.4.16 (
- if exist tcltk rd /s/q tcltk
- if exist tcl8.4.12 rd /s/q tcl8.4.12
- if exist tk8.4.12 rd /s/q tk8.4.12
- svn export http://svn.python.org/projects/external/tcl8.4.16
- svn export http://svn.python.org/projects/external/tk8.4.16
- at REM cd tcl8.4.16\win
- at REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500
- at REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 INSTALLDIR=..\..\tcltk install
- at REM cd ..\..
- at REM cd tk8.4.16\win
- at REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16
- at REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install
- at REM cd ..\..
+if not exist tcltk64\bin\tk84g.dll (
+ cd tk-8.4.18.1\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.4.18.2 clean all install
+ cd ..\..
)
-
- at rem sqlite
-if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
- at REM if not exist build\PCbuild\sqlite3.dll copy sqlite-source-3.3.4\sqlite3.dll build\PCbuild
Modified: python/branches/py3k/Tools/buildbot/external.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/external.bat (original)
+++ python/branches/py3k/Tools/buildbot/external.bat Wed Mar 19 22:50:51 2008
@@ -1,46 +1,17 @@
@rem Fetches (and builds if necessary) external dependencies
@rem Assume we start inside the Python source directory
-cd ..
-call "%VS90COMNTOOLS%vsvars32.bat"
+call "Tools\buildbot\external-common.bat"
+call "%VS90COMNTOOLS%\vsvars32.bat"
- at rem bzip
-if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
-
- at rem Sleepycat db
- at rem Remove VS 2003 builds
-if exist db-4.4.20 if not exist db-4.4.20\build_win32\this_is_for_vs9 (
- echo Removing old build
- rd /s/q db-4.4.20
-)
-if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
-if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
- vcbuild db-4.4.20\build_win32\db_static.vcproj "Debug|Win32"
+if not exist tcltk\bin\tcl84g.dll (
+ cd tcl-8.4.18.2\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all install
+ cd ..\..
)
- at rem OpenSSL
-if not exist openssl-0.9.8g (
- if exist openssl-0.9.8a rd /s/q openssl-0.9.8a
- svn export http://svn.python.org/projects/external/openssl-0.9.8g
+if not exist tcltk\bin\tk84g.dll (
+ cd tk-8.4.18.1\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.4.18.2 clean all install
+ cd ..\..
)
-
- at rem tcltk
-if not exist tcl8.4.16 (
- if exist tcltk rd /s/q tcltk
- if exist tcl8.4.12 rd /s/q tcl8.4.12
- if exist tk8.4.12 rd /s/q tk8.4.12
- svn export http://svn.python.org/projects/external/tcl8.4.16
- svn export http://svn.python.org/projects/external/tk8.4.16
- cd tcl8.4.16\win
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 INSTALLDIR=..\..\tcltk install
- cd ..\..
- cd tk8.4.16\win
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install
- cd ..\..
-)
-
- at rem sqlite
-if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
-if not exist build\PCbuild\sqlite3.dll copy sqlite-source-3.3.4\sqlite3.dll build\PCbuild
More information about the Python-3000-checkins
mailing list