Mailman 3 May 2005 - Python-checkins

python/dist/src/Doc/lib libstdtypes.tex, 1.170.2.7, 1.170.2.8
by rhettinger＠users.sourceforge.net May 27, 2005

May 27, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19754 Modified Files: Tag: release24-maint libstdtypes.tex Log Message: SF bug #1209671: dict.popitem documentation should mention empty dict case Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.170.2.7 retrieving revision 1.170.2.8 diff -u -d -r1.170.2.7 -r1.170.2.8 --- libstdtypes.tex 19 Apr 2005 04:31:38 -0000 1.170.2.7 +++ libstdtypes.tex 27 May 2005 10:45:14 -0000 1.170.2.8 @@ -1398,7 +1398,8 @@ the dictionary as the value of \var{k}. \var{x} defaults to \var{None}. \item[(6)] \function{popitem()} is useful to destructively iterate -over a dictionary, as often used in set algorithms. +over a dictionary, as often used in set algorithms. If the dictionary +is empty, calling \function{popitem()} raises a \exception{KeyError}. \item[(7)] \function{fromkeys()} is a class method that returns a new dictionary. \var{value} defaults to \code{None}. \versionadded{2.3}

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.177, 1.178
by rhettinger＠users.sourceforge.net May 27, 2005

May 27, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19557 Modified Files: libstdtypes.tex Log Message: SF bug #1209671: dict.popitem documentation should mention empty dict case Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.177 retrieving revision 1.178 diff -u -d -r1.177 -r1.178 --- libstdtypes.tex 19 Apr 2005 04:29:44 -0000 1.177 +++ libstdtypes.tex 27 May 2005 10:43:55 -0000 1.178 @@ -1398,7 +1398,8 @@ the dictionary as the value of \var{k}. \var{x} defaults to \var{None}. \item[(6)] \function{popitem()} is useful to destructively iterate -over a dictionary, as often used in set algorithms. +over a dictionary, as often used in set algorithms. If the dictionary +is empty, calling \function{popitem()} raises a \exception{KeyError}. \item[(7)] \function{fromkeys()} is a class method that returns a new dictionary. \var{value} defaults to \code{None}. \versionadded{2.3}

1 0

python/dist/src/Doc/ref ref7.tex,1.44,1.45
by mwh＠users.sourceforge.net May 26, 2005

May 26, 2005

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16924 Modified Files: ref7.tex Log Message: Fix: [ 1207501 ] Issue in grammar We didn't define dotted_name in the pseudo-grammar in the reference docs. Backport candidate. Index: ref7.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref7.tex,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- ref7.tex 9 Apr 2005 03:03:00 -0000 1.44 +++ ref7.tex 26 May 2005 07:58:22 -0000 1.45 @@ -323,6 +323,8 @@ {\token{decorator}+} \production{decorator} {"@" \token{dotted_name} ["(" [\token{argument_list} [","]] ")"] NEWLINE} + \production{dotted_name} + {\token{identifier} ("." \token{identifier})*} \production{parameter_list} {(\token{defparameter} ",")*} \productioncont{(~~"*" \token{identifier} [, "**" \token{identifier}]}

1 0

python/dist/src/Doc/lib libfuncs.tex, 1.175.2.2, 1.175.2.3
by fdrake＠users.sourceforge.net May 25, 2005

May 25, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14537/lib Modified Files: Tag: release24-maint libfuncs.tex Log Message: fix description of the input range of unichr() (closes SF bug #1120777) Index: libfuncs.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libfuncs.tex,v retrieving revision 1.175.2.2 retrieving revision 1.175.2.3 diff -u -d -r1.175.2.2 -r1.175.2.3 --- libfuncs.tex 7 Jan 2005 04:35:08 -0000 1.175.2.2 +++ libfuncs.tex 25 May 2005 05:42:51 -0000 1.175.2.3 @@ -1039,7 +1039,8 @@ Return the Unicode string of one character whose Unicode code is the integer \var{i}. For example, \code{unichr(97)} returns the string \code{u'a'}. This is the inverse of \function{ord()} for Unicode - strings. The argument must be in the range [0..65535], inclusive. + strings. The valid range for the argument depends how Python was + configured -- it may be either UCS2 [0..0xFFFF] or UCS4 [0..0x10FFFF]. \exception{ValueError} is raised otherwise. \versionadded{2.0} \end{funcdesc}

1 0

python/dist/src/Doc/lib libfuncs.tex, 1.181, 1.182
by fdrake＠users.sourceforge.net May 25, 2005

May 25, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14039/lib Modified Files: libfuncs.tex Log Message: fix description of the input range of unichr() (closes SF bug #1120777) Index: libfuncs.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libfuncs.tex,v retrieving revision 1.181 retrieving revision 1.182 diff -u -d -r1.181 -r1.182 --- libfuncs.tex 19 Mar 2005 16:27:33 -0000 1.181 +++ libfuncs.tex 25 May 2005 05:39:36 -0000 1.182 @@ -1077,7 +1077,8 @@ Return the Unicode string of one character whose Unicode code is the integer \var{i}. For example, \code{unichr(97)} returns the string \code{u'a'}. This is the inverse of \function{ord()} for Unicode - strings. The argument must be in the range [0..65535], inclusive. + strings. The valid range for the argument depends how Python was + configured -- it may be either UCS2 [0..0xFFFF] or UCS4 [0..0x10FFFF]. \exception{ValueError} is raised otherwise. \versionadded{2.0} \end{funcdesc}

1 0

python/dist/src/Doc/ref ref2.tex,1.56,1.56.2.1
by fdrake＠users.sourceforge.net May 25, 2005

May 25, 2005

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12708/ref Modified Files: Tag: release24-maint ref2.tex Log Message: update documentation on what constitutes a line in a source file (closes SF bug #1167922) Index: ref2.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref2.tex,v retrieving revision 1.56 retrieving revision 1.56.2.1 diff -u -d -r1.56 -r1.56.2.1 --- ref2.tex 10 Nov 2004 16:51:17 -0000 1.56 +++ ref2.tex 25 May 2005 05:30:36 -0000 1.56.2.1 @@ -54,11 +54,18 @@ \subsection{Physical lines\label{physical}} -A physical line ends in whatever the current platform's convention is -for terminating lines. On \UNIX, this is the \ASCII{} LF (linefeed) -character. On Windows, it is the \ASCII{} sequence CR LF (return -followed by linefeed). On Macintosh, it is the \ASCII{} CR (return) -character. +A physical line is a sequence of characters terminated by an end-of-line +sequence. In source files, any of the standard platform line +termination sequences can be used - the \UNIX form using \ASCII{} LF +(linefeed), the Windows form using the \ASCII{} sequence CR LF (return +followed by linefeed), or the Macintosh form using the \ASCII{} CR +(return) character. All of these forms can be used equally, regardless +of platform. + +When embedding Python, source code strings should be passed to Python +APIs using the standard C conventions for newline characters (the +\code{\e n} character, representing \ASCII{} LF, is the line +terminator). \subsection{Comments\label{comments}}

1 0

python/dist/src/Doc/ref ref2.tex,1.56,1.57
by fdrake＠users.sourceforge.net May 25, 2005

May 25, 2005

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12418/ref Modified Files: ref2.tex Log Message: update documentation on what constitutes a line in a source file (closes SF bug #1167922) Index: ref2.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref2.tex,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- ref2.tex 10 Nov 2004 16:51:17 -0000 1.56 +++ ref2.tex 25 May 2005 05:29:17 -0000 1.57 @@ -54,11 +54,18 @@ \subsection{Physical lines\label{physical}} -A physical line ends in whatever the current platform's convention is -for terminating lines. On \UNIX, this is the \ASCII{} LF (linefeed) -character. On Windows, it is the \ASCII{} sequence CR LF (return -followed by linefeed). On Macintosh, it is the \ASCII{} CR (return) -character. +A physical line is a sequence of characters terminated by an end-of-line +sequence. In source files, any of the standard platform line +termination sequences can be used - the \UNIX form using \ASCII{} LF +(linefeed), the Windows form using the \ASCII{} sequence CR LF (return +followed by linefeed), or the Macintosh form using the \ASCII{} CR +(return) character. All of these forms can be used equally, regardless +of platform. + +When embedding Python, source code strings should be passed to Python +APIs using the standard C conventions for newline characters (the +\code{\e n} character, representing \ASCII{} LF, is the line +terminator). \subsection{Comments\label{comments}}

1 0

python/nondist/sandbox/setuptools pkg_resources.py, 1.19, 1.20
by pje＠users.sourceforge.net May 24, 2005

May 24, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25376 Modified Files: pkg_resources.py Log Message: Fix some typos and a missing import Index: pkg_resources.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- pkg_resources.py 25 May 2005 03:06:53 -0000 1.19 +++ pkg_resources.py 25 May 2005 03:22:32 -0000 1.20 @@ -24,7 +24,7 @@ 'split_sections', # 'glob_resources' ] -import sys, os, zipimport, time, re +import sys, os, zipimport, time, re, imp from sets import ImmutableSet class ResolutionError(Exception): @@ -842,6 +842,8 @@ def _handle_ns(packageName, path_item): """Ensure that named package includes a subpath of path_item (if needed)""" importer = get_importer(path_item) + if importer is None: + return None loader = importer.find_module(packageName) if loader is None: return None @@ -850,12 +852,10 @@ if not hasattr(module,'__path__'): raise TypeError("Not a package:", packageName) - handler = _find_adapter(_distribution_finders, importer) + handler = _find_adapter(_namespace_handlers, importer) subpath = handler(importer,path_item,packageName,module) - if subpath is not None: module.__path__.append(subpath) - return subpath @@ -876,12 +876,12 @@ path = sys.modules[parent].__path__ except AttributeError: raise TypeError("Not a package:", parent) - + for path_item in path: # Ensure all the parent's path items are reflected in the child, # if they apply _handle_ns(packageName, path_item) - + # Track what packages are namespaces, so when new path items are added, # they can be updated _namespace_packages.setdefault(parent,[]).append(packageName) @@ -916,10 +916,10 @@ register_namespace_handler(zipimport.zipimporter,file_ns_handler) +def null_ns_handler(importer, path_item, packageName, module): + return None - - - +register_namespace_handler(object,null_ns_handler)

1 0

python/nondist/sandbox/setuptools pkg_resources.py, 1.18, 1.19
by pje＠users.sourceforge.net May 24, 2005

May 24, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22070 Modified Files: pkg_resources.py Log Message: Implement draft support for namespace packages, both declaring them initially and fixing them up when new eggs are added to sys.path. At the moment, all namespace packages are fixed up whenever any new egg is added to sys.path, but this might not scale well if there are lots of eggs and lots of namespace packages. Perhaps we should limit namespace fixups to namespace packages explicitly declared in the egg? Index: pkg_resources.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- pkg_resources.py 25 May 2005 00:50:39 -0000 1.18 +++ pkg_resources.py 25 May 2005 03:06:53 -0000 1.19 @@ -742,7 +742,7 @@ """Register `distribution_finder` to find distributions in sys.path items `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item - handler), and `distribution_finder_type` is a callable that, passed a path + handler), and `distribution_finder` is a callable that, passed a path item and the importer instance, yields ``Distribution`` instances found on that path item. See ``pkg_resources.find_on_path`` for an example.""" _distribution_finders[importer_type] = distribution_finder @@ -818,6 +818,129 @@ +_namespace_handlers = {} +_namespace_packages = {} + +def register_namespace_handler(importer_type, namespace_handler): + """Register `namespace_handler` to declare namespace packages + + `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item + handler), and `namespace_handler` is a callable like this:: + + def namespace_handler(importer,path_entry,moduleName,module): + # return a path_entry to use for child packages + + Namespace handlers are only called if the importer object has already + agreed that it can handle the relevant path item, and they should only + return a subpath if the module __path__ does not already contain an + equivalent subpath. For an example namespace handler, see + ``pkg_resources.file_ns_handler``. + """ + _namespace_handlers[importer_type] = namespace_handler + + +def _handle_ns(packageName, path_item): + """Ensure that named package includes a subpath of path_item (if needed)""" + importer = get_importer(path_item) + loader = importer.find_module(packageName) + if loader is None: + return None + + module = sys.modules.get(packageName) or loader.load_module(packageName) + if not hasattr(module,'__path__'): + raise TypeError("Not a package:", packageName) + + handler = _find_adapter(_distribution_finders, importer) + subpath = handler(importer,path_item,packageName,module) + + if subpath is not None: + module.__path__.append(subpath) + + return subpath + + +def declare_namespace(packageName): + """Declare that package 'packageName' is a namespace package""" + + # XXX nslock.acquire() + try: + if packageName in _namespace_packages: + return + + path, parent = sys.path, None + if '.' in packageName: + parent = '.'.join(package.split('.')[:-1]) + declare_namespace(parent) + __import__(parent) + try: + path = sys.modules[parent].__path__ + except AttributeError: + raise TypeError("Not a package:", parent) + + for path_item in path: + # Ensure all the parent's path items are reflected in the child, + # if they apply + _handle_ns(packageName, path_item) + + # Track what packages are namespaces, so when new path items are added, + # they can be updated + _namespace_packages.setdefault(parent,[]).append(packageName) + _namespace_packages.setdefault(packageName,[]) + + finally: + pass # XXX nslock.release() + +def fixup_namespace_packages(path_item, parent=None): + """Ensure that previously-declared namespace packages include path_item""" + # XXX nslock.acquire() + try: + for package in _namespace_packages.get(parent,()): + subpath = _handle_ns(package, path_item) + if subpath: fixup_namespace_packages(subpath,package) + finally: + pass # XXX nslock.release() + +def file_ns_handler(importer, path_item, packageName, module): + """Compute an ns-package subpath for a filesystem or zipfile importer""" + + subpath = os.path.join(path_item, packageName.split('.')[-1]) + normalized = os.path.normpath(os.path.normcase(subpath)) + for item in module.__path__: + if os.path.normpath(os.path.normcase(item))==normalized: + break + else: + # Only return the path if it's not already there + return subpath + +register_namespace_handler(ImpWrapper,file_ns_handler) +register_namespace_handler(zipimport.zipimporter,file_ns_handler) + + + + + + + + + + + + + + + + + + + + + + + + + + + def yield_lines(strs): """Yield non-empty/non-comment lines of a ``basestring`` or sequence""" if isinstance(strs,basestring): @@ -988,11 +1111,10 @@ return self.__dep_map except AttributeError: dm = self.__dep_map = {None: []} - if self.metadata.has_metadata('depends.txt'): - for section,contents in split_sections( - self.metadata.get_metadata_lines('depends.txt') - ): - dm[section] = list(parse_requirements(contents)) + for section,contents in split_sections( + self._get_metadata('depends.txt') + ): + dm[section] = list(parse_requirements(contents)) return dm _dep_map = property(_dep_map) @@ -1010,18 +1132,19 @@ raise InvalidOption("No such option", self, opt) return deps + def _get_metadata(self,name): + if self.metadata.has_metadata(name): + for line in self.metadata.get_metadata_lines(name): + yield line + def install_on(self,path=None): - # XXX this needs to interface with namespace packages and such + """Ensure distribution is importable on `path` (default=sys.path)""" if path is None: path = sys.path if self.path not in path: path.append(self.path) - - -def _sort_dists(dists): - tmp = [(dist.version,dist) for dist in dists] - tmp.sort() - dists[::-1] = [d for v,d in tmp] - + if path is sys.path: + fixup_namespace_packages(self.path) + map(declare_namespace, self._get_metadata('namespace_packages.txt')) def parse_requirements(strs): """Yield ``Requirement`` objects for each specification in `strs` @@ -1083,10 +1206,10 @@ yield Requirement(distname.replace('_','-'), specs, options) - - - - +def _sort_dists(dists): + tmp = [(dist.version,dist) for dist in dists] + tmp.sort() + dists[::-1] = [d for v,d in tmp]

1 0

python/nondist/sandbox/setuptools pkg_resources.py, 1.17, 1.18
by pje＠users.sourceforge.net May 24, 2005

May 24, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32239 Modified Files: pkg_resources.py Log Message: Support registering distribution finders for arbitrary PEP 302 importer types, so that the directory scanner isn't a hardcoded case. Index: pkg_resources.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- pkg_resources.py 24 May 2005 01:15:24 -0000 1.17 +++ pkg_resources.py 25 May 2005 00:50:39 -0000 1.18 @@ -1,5 +1,4 @@ -"""\ -Package resource API +"""Package resource API -------------------- A resource is a logical file contained within a package, or a logical @@ -21,6 +20,7 @@ 'compatible_platforms', 'get_platform', 'IMetadataProvider', 'ResolutionError', 'VersionConflict', 'DistributionNotFound', 'InvalidOption', 'Distribution', 'Requirement', 'yield_lines', + 'get_importer', 'find_distributions', 'find_on_path', 'register_finder', 'split_sections', # 'glob_resources' ] @@ -654,6 +654,107 @@ self.egg_info = os.path.join(self.module_path, 'EGG-INFO') +class ImpWrapper: + """PEP 302 Importer that wraps Python's "normal" import algorithm""" + + def __init__(self, path=None): + if path is not None and not os.path.isdir(path): + raise ImportError + self.path = path + + def find_module(self, fullname, path=None): + subname = fullname.split(".")[-1] + if subname != fullname and self.path is None: + return None + if self.path is None: + path = None + else: + path = [self.path] + try: + file, filename, etc = imp.find_module(subname, path) + except ImportError: + return None + return ImpLoader(file, filename, etc) + + +class ImpLoader: + """PEP 302 Loader that wraps Python's "normal" import algorithm""" + + def __init__(self, file, filename, etc): + self.file = file + self.filename = filename + self.etc = etc + + def load_module(self, fullname): + try: + mod = imp.load_module(fullname, self.file, self.filename, self.etc) + finally: + if self.file: self.file.close() + # Note: we don't set __loader__ because we want the module to look + # normal; i.e. this is just a wrapper for standard import machinery + return mod + + +def get_importer(path_item): + """Retrieve a PEP 302 "importer" for the given path item + + If there is no importer, this returns a wrapper around the builtin import + machinery. The returned importer is only cached if it was created by a + path hook. + """ + try: + importer = sys.path_importer_cache[path_item] + except KeyError: + for hook in sys.path_hooks: + try: + importer = hook(path_item) + except ImportError: + pass + else: + break + else: + importer = None + + sys.path_importer_cache.setdefault(path_item,importer) + if importer is None: + try: + importer = ImpWrapper(path_item) + except ImportError: + pass + return importer + + + + + + + + + + + + + + +_distribution_finders = {} + +def register_finder(importer_type, distribution_finder): + """Register `distribution_finder` to find distributions in sys.path items + + `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item + handler), and `distribution_finder_type` is a callable that, passed a path + item and the importer instance, yields ``Distribution`` instances found on + that path item. See ``pkg_resources.find_on_path`` for an example.""" + _distribution_finders[importer_type] = distribution_finder + + +def find_distributions(path_item): + """Yield distributions accessible via `path_item`""" + importer = get_importer(path_item) + finder = _find_adapter(_distribution_finders, importer) + return finder(importer,path_item) + + def StringIO(*args, **kw): """Thunk to load the real StringIO on demand""" global StringIO @@ -664,8 +765,26 @@ return StringIO(*args,**kw) -def find_distributions(path_item): - """Yield distributions accessible via `path_item`""" + + + + + + + + + + + + +def find_nothing(importer,path_item): + return () + +register_finder(object,find_nothing) + + +def find_on_path(importer,path_item): + """Yield distributions accessible on a sys.path directory""" if not os.path.exists(path_item): return elif os.path.isdir(path_item): @@ -681,7 +800,7 @@ for entry in os.listdir(path_item): fullpath = os.path.join(path_item, entry) if entry.lower().endswith('.egg'): - for dist in find_distributions(fullpath): + for dist in find_on_path(importer,fullpath): yield dist elif entry.lower().endswith('.egg-info'): if os.path.isdir(fullpath): @@ -694,6 +813,10 @@ metadata = EggMetadata(zipimport.zipimporter(path_item)) yield Distribution.from_filename(path_item, metadata=metadata) +register_finder(ImpWrapper,find_on_path) + + + def yield_lines(strs): """Yield non-empty/non-comment lines of a ``basestring`` or sequence"""

1 0