Mailman 3 June 2007 - Python-checkins

r55948 - python/trunk/Include/pyport.h
by martin.v.loewis June 13, 2007

June 13, 2007

Author: martin.v.loewis Date: Wed Jun 13 05:42:19 2007 New Revision: 55948 Modified: python/trunk/Include/pyport.h Log: Provide PY_LLONG_MAX on all systems having long long. Will backport to 2.5. Modified: python/trunk/Include/pyport.h ============================================================================== --- python/trunk/Include/pyport.h (original) +++ python/trunk/Include/pyport.h Wed Jun 13 05:42:19 2007 @@ -62,14 +62,20 @@ #ifndef PY_LONG_LONG #define PY_LONG_LONG long long #if defined(LLONG_MAX) +/* If LLONG_MAX is defined in limits.h, use that. */ #define PY_LLONG_MIN LLONG_MIN #define PY_LLONG_MAX LLONG_MAX #define PY_ULLONG_MAX ULLONG_MAX -#elif defined(__s390__) -/* Apparently, S390 Linux has long long, but no LLONG_MAX */ -#define PY_LLONG_MAX 9223372036854775807LL +#elif defined(__LONG_LONG_MAX__) +/* Otherwise, if GCC has a builtin define, use that. */ +#define PY_LLONG_MAX __LONG_LONG_MAX__ +#define PY_LLONG_MIN (-PY_LLONG_MAX-1) +#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL) +#else +/* Otherwise, rely on two's complement. */ +#define PY_ULLONG_MAX (~0ULL) +#define PY_LLONG_MAX ((long long)(PY_ULLONG_MAX>>1)) #define PY_LLONG_MIN (-PY_LLONG_MAX-1) -#define PY_ULLONG_MAX 18446744073709551615ULL #endif /* LLONG_MAX */ #endif #endif /* HAVE_LONG_LONG */

2 1

r55958 - python/trunk/Tools/buildbot/external-amd64.bat
by thomas.heller June 13, 2007

June 13, 2007

Author: thomas.heller Date: Wed Jun 13 09:54:57 2007 New Revision: 55958 Modified: python/trunk/Tools/buildbot/external-amd64.bat Log: Build bzip2. Modified: python/trunk/Tools/buildbot/external-amd64.bat ============================================================================== --- python/trunk/Tools/buildbot/external-amd64.bat (original) +++ python/trunk/Tools/buildbot/external-amd64.bat Wed Jun 13 09:54:57 2007 @@ -25,6 +25,11 @@ @rem bzip if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3 +if not exist bzip2-1.0.3\libbz2.lib ( + cd bzip2-1.0.3 + nmake /f makefile.msc CFLAGS="-DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo /GS-" + cd .. +) @rem Sleepycat db if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20

1 0

r55957 - python/trunk/Tools/buildbot/README.tcltk-AMD64
by thomas.heller June 13, 2007

June 13, 2007

Author: thomas.heller Date: Wed Jun 13 09:07:41 2007 New Revision: 55957 Added: python/trunk/Tools/buildbot/README.tcltk-AMD64 (contents, props changed) Log: Notes about building tcl/tk for windows/AMD64. Added: python/trunk/Tools/buildbot/README.tcltk-AMD64 ============================================================================== --- (empty file) +++ python/trunk/Tools/buildbot/README.tcltk-AMD64 Wed Jun 13 09:07:41 2007 @@ -0,0 +1,36 @@ +Comments on building tcl/tk for AMD64 with the MS SDK compiler +============================================================== + +I did have to build tcl/tk manually. + +First, I had to build the nmakehlp.exe helper utility manually by executing + cl nmakehlp.c /link bufferoverflowU.lib +in both the tcl8.4.12\win and tk8.4.12\win directories. + +Second, the AMD64 compiler refuses to compile the file +tcl8.4.12\generic\tclExecute.c because it insists on using intrinsics +for the 'ceil' and 'floor' functions: + + ..\generic\tclExecute.c(394) : error C2099: initializer is not a constant + ..\generic\tclExecute.c(398) : error C2099: initializer is not a constant + +I did comment out these lines; an alternative would have been to use +the /Oi- compiler flag to disable the intrinsic functions. +The commands then used were these: + + svn export http://svn.python.org/projects/external/tcl8.4.12 + cd tcl8.4.12\win + REM + echo patch the tcl8.4.12\generic\tclExecute.c file + pause + REM + cl nmakehlp.c /link bufferoverflowU.lib + nmake -f makefile.vc MACHINE=AMD64 + nmake -f makefile.vc INSTALLDIR=..\..\tcltk install + cd ..\.. + svn export http://svn.python.org/projects/external/tk8.4.12 + cd tk8.4.12\win + cl nmakehlp.c /link bufferoverflowU.lib + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 MACHINE=AMD64 + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install + cd ..\..

1 0

r55956 - python/trunk/Tools/buildbot/external-amd64.bat
by thomas.heller June 13, 2007

June 13, 2007

Author: thomas.heller Date: Wed Jun 13 09:07:03 2007 New Revision: 55956 Modified: python/trunk/Tools/buildbot/external-amd64.bat Log: Do not hardcode the buildbot's directory name. Modified: python/trunk/Tools/buildbot/external-amd64.bat ============================================================================== --- python/trunk/Tools/buildbot/external-amd64.bat (original) +++ python/trunk/Tools/buildbot/external-amd64.bat Wed Jun 13 09:07:03 2007 @@ -7,19 +7,20 @@ call "%MSSdk%\SetEnv" /XP64 /RETAIL @rem Assume we start inside the Python source directory +for %%i in (.) do set CWD=%%~fi cd .. @rem sqlite if not exist sqlite-source-3.3.4 ( svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 - if exist build\PCbuild\sqlite3.dll del build\PCbuild\sqlite3.dll + if exist %CWD%\PCbuild\sqlite3.dll del %CWD%\PCbuild\sqlite3.dll ) -if not exist build\PCbuild\sqlite3.dll ( +if not exist %CWD%\PCbuild\sqlite3.dll ( cd sqlite-source-3.3.4\amd64 cl ..\*.c link /def:..\sqlite3.def /dll *.obj /out:sqlite3.dll bufferoverflowU.lib cd ..\.. - copy sqlite-source-3.3.4\amd64\sqlite3.dll build\PCbuild + copy sqlite-source-3.3.4\amd64\sqlite3.dll %CWD%\PCbuild ) @rem bzip

1 0

r55955 - sandbox/trunk/import_in_py/pseudocode.py
by brett.cannon June 13, 2007

June 13, 2007

Author: brett.cannon Date: Wed Jun 13 07:53:18 2007 New Revision: 55955 Modified: sandbox/trunk/import_in_py/pseudocode.py Log: Add support for __path__ searching. Modified: sandbox/trunk/import_in_py/pseudocode.py ============================================================================== --- sandbox/trunk/import_in_py/pseudocode.py (original) +++ sandbox/trunk/import_in_py/pseudocode.py Wed Jun 13 07:53:18 2007 @@ -25,10 +25,17 @@ # Since loaders are required to set the module in sys.modules, a successful # import should be followed by 'continue' to let the next module be # imported. - for parent in each_parent(name): + for name in each_parent(name): # If the module is already cached in sys.modules then move along. - if parent in sys.modules: + if name in sys.modules: continue + # Try to find a __path__ attribute on the (possibly non-existent) + # parent. + immediate_parent = name.rsplit('.', 1)[0] + try: + path = sys.modules[immediate_parent].__path__ + except (KeyError, AttributeError): + path = None # Search sys.meta_path. for meta_importer in sys.meta_path: loader = meta_importer.find_module(name, path) @@ -43,8 +50,9 @@ loader.load_module(name) continue # With sys.meta_path, built-ins, and frozen modules checked, now look - # at sys.path. - for path_entry in sys.path: + # at sys.path or parent.__path__. + search_path = path if path else sys.path + for path_entry in search_path # Look for a cached importer. if path_entry in sys.path_importer_cache: importer = sys.path_importer_cache[path_entry]

1 0

r55953 - sandbox/trunk/import_in_py/pseudocode.py
by brett.cannon June 12, 2007

June 12, 2007

Author: brett.cannon Date: Wed Jun 13 06:56:08 2007 New Revision: 55953 Modified: sandbox/trunk/import_in_py/pseudocode.py Log: Add stub for loader of Python source and bytecode. Modified: sandbox/trunk/import_in_py/pseudocode.py ============================================================================== --- sandbox/trunk/import_in_py/pseudocode.py (original) +++ sandbox/trunk/import_in_py/pseudocode.py Wed Jun 13 06:56:08 2007 @@ -1,7 +1,6 @@ raise ImportError("module is just pseudocode") import sys - def __import__(name, globals, locals, fromlist, level): """Pseudocode to explain how importing works. @@ -159,8 +158,12 @@ pkg_init_path = os.path.join(path_entry, immediate_name, '__init__' + suffix) if os.path.isfile(pkg_init_path): # I/O - return package_loader(name, pkg_init_path) + return py_loader(name, pkg_init_path, is_pkg=True) # If module is not a package, see if it is a file by itself. file_path = os.path.join(path_entry, immediate_name + suffix) if os.path.isfile(file_path): # I/O - return py_loader(name, file_path) + return py_loader(name, file_path, is_pkg=False) + + +def py_loader(name, file_path, is_pkg): + pass

1 0

r55952 - sandbox/trunk/import_in_py/pseudocode.py
by brett.cannon June 12, 2007

June 12, 2007

Author: brett.cannon Date: Wed Jun 13 06:53:24 2007 New Revision: 55952 Modified: sandbox/trunk/import_in_py/pseudocode.py Log: Add pseudocode for how import looks for extension, Python source, and Python bytecode files. Modified: sandbox/trunk/import_in_py/pseudocode.py ============================================================================== --- sandbox/trunk/import_in_py/pseudocode.py (original) +++ sandbox/trunk/import_in_py/pseudocode.py Wed Jun 13 06:53:24 2007 @@ -127,8 +127,40 @@ return module +from imp import get_suffixes, C_EXTENSION def find_extension_module(name, path_entry): - pass + """Try to locate a C extension module for the requested module.""" + # Get the immediate name of the module being searched for as the extension + # module's file name will be based on it. + immediate_name = name.rsplit('.', 1)[-1] + # Check every possible C extension suffix with the immediate module name + # (typically two; '.so' and 'module.so'). + for suffix in (suffix[0] for suffix in get_suffixes() + if suffix[2] == C_EXTENSION): + file_path = os.path.join(path_entry, immediate_name + suffix) + if os.path.isfile(file_path): # I/O + return extension_loader(name, file_path) + else: + return None + +from imp import PY_SOURCE, PY_COMPILED def find_py_pyc_module(name, path_entry): - pass + """Try to locate a Python source code or bytecode module for the requested + module.""" + # Get the immediate name of the module being imported as the Python file's + # name will be based on it. + immediate_name = name.rsplit('.', 1)[-1] + # Check every valid Python code suffix for possible files (typically two; + # '.py' and either '.pyc' or '.pyo'). + for suffix in (suffix[0] for suffix in get_suffixes() + if suffix[2] in (PY_SOURCE, PY_COMPILED)): + # See if the module is actually a package. + pkg_init_path = os.path.join(path_entry, immediate_name, + '__init__' + suffix) + if os.path.isfile(pkg_init_path): # I/O + return package_loader(name, pkg_init_path) + # If module is not a package, see if it is a file by itself. + file_path = os.path.join(path_entry, immediate_name + suffix) + if os.path.isfile(file_path): # I/O + return py_loader(name, file_path)

1 0

r55951 - sandbox/trunk/import_in_py/importlib.py
by brett.cannon June 12, 2007

June 12, 2007

Author: brett.cannon Date: Wed Jun 13 06:51:50 2007 New Revision: 55951 Modified: sandbox/trunk/import_in_py/importlib.py Log: Add a comment about moving over to using imp.get_suffixes() for specifying the suffices for Python source and bytecode files. Modified: sandbox/trunk/import_in_py/importlib.py ============================================================================== --- sandbox/trunk/import_in_py/importlib.py (original) +++ sandbox/trunk/import_in_py/importlib.py Wed Jun 13 06:51:50 2007 @@ -419,6 +419,8 @@ Not specifying handles will lead to reasonable defaults being used. """ + # XXX Move over to use imp.get_suffixes(); make sure no bad assumptions + # made about suffix being a one-item tuple. if source_handles is None: self.source_handles = ('.py',) else:

1 0

buildbot warnings in S-390 Debian trunk
by buildbot＠python.org June 12, 2007

June 12, 2007

The Buildbot has detected a new failure of S-390 Debian trunk. Full details are available at: http://www.python.org/dev/buildbot/all/S-390%2520Debian%2520trunk/builds/10… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis Build had warnings: warnings test Excerpt from the test logfile: 1 test failed: test_urllibnet make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r55950 - sandbox/trunk/import_in_py/pseudocode.py
by brett.cannon June 12, 2007

June 12, 2007

Author: brett.cannon Date: Wed Jun 13 06:30:56 2007 New Revision: 55950 Modified: sandbox/trunk/import_in_py/pseudocode.py Log: Clean up comments. Modified: sandbox/trunk/import_in_py/pseudocode.py ============================================================================== --- sandbox/trunk/import_in_py/pseudocode.py (original) +++ sandbox/trunk/import_in_py/pseudocode.py Wed Jun 13 06:30:56 2007 @@ -8,14 +8,17 @@ Caveats: + Classic relative import semantics are not covered. + Assume all code runs with the import lock held. + + Some structure (e.g., using importers for built-in and frozen + modules) is purely conceptual and not used in the C + implementation of import. """ path = globals.get('__path__') # If a relative import, figure out absolute name of requested module. if level != 0: # Adjust relative import based on whether caller is a package and - # the specified level. - # Make sure import does not go beyond top-level. + # the specified level in the call. + # Also make sure import does not go beyond top-level. name = resolve_name(name, globals['__name__'], path, level) # Import each parent in the name, starting at the top. # Assume each_parent iterates through each parent of the module request, @@ -24,6 +27,7 @@ # import should be followed by 'continue' to let the next module be # imported. for parent in each_parent(name): + # If the module is already cached in sys.modules then move along. if parent in sys.modules: continue # Search sys.meta_path. @@ -89,19 +93,18 @@ # With the module now imported and store in sys.modules, figure out exactly # what module to return based on fromlist and how the module name was # specified. - # If fromlist is empty, return the module top-most parent module based on - # whether the import was relative or not. if not fromlist: + # The fromlist is empty, so return the top-most parent module. + # Whether the import was relative or absolute must be considered. if level: return top_relative_name(name, level) else: return sys.modules[name.split('.', 1)[0]] - # If fromlist is not empty, return the module as directly specified in the - # import. - # Must also handle possible imports of modules if the module imported was a - # package and thus names in the fromlist are modules within the package and - # not object within a module. else: + # As fromlist is not empty, return the module specified by the import. + # Must also handle possible imports of modules if the module imported + # was a package and thus names in the fromlist are modules within the + # package and not object within a module. module = sys.modules[name] # If not a module, then can just return the module as the names # specified in fromlist are supposed to be attributes on the module.

1 0