From python-checkins at python.org Mon Oct 1 00:05:33 2012 From: python-checkins at python.org (nadeem.vawda) Date: Mon, 1 Oct 2012 00:05:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MzA0?= =?utf-8?q?=3A_Further_performance_improvements_for_BZ2File=2E?= Message-ID: <3XVLKT13rYzNZb@mail.python.org> http://hg.python.org/cpython/rev/4258248a44c7 changeset: 79349:4258248a44c7 branch: 3.3 parent: 79347:51175f1e67fd user: Nadeem Vawda date: Sun Sep 30 23:58:01 2012 +0200 summary: Issue #16304: Further performance improvements for BZ2File. Optimizations suggested by Serhiy Storchaka. files: Lib/bz2.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/bz2.py b/Lib/bz2.py --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -159,15 +159,21 @@ raise ValueError("I/O operation on closed file") def _check_can_read(self): - if not self.readable(): + if self.closed: + raise ValueError("I/O operation on closed file") + if self._mode not in (_MODE_READ, _MODE_READ_EOF): raise io.UnsupportedOperation("File not open for reading") def _check_can_write(self): - if not self.writable(): + if self.closed: + raise ValueError("I/O operation on closed file") + if self._mode != _MODE_WRITE: raise io.UnsupportedOperation("File not open for writing") def _check_can_seek(self): - if not self.readable(): + if self.closed: + raise ValueError("I/O operation on closed file") + if self._mode not in (_MODE_READ, _MODE_READ_EOF): raise io.UnsupportedOperation("Seeking is only supported " "on files open for reading") if not self._fp.seekable(): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 00:05:34 2012 From: python-checkins at python.org (nadeem.vawda) Date: Mon, 1 Oct 2012 00:05:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_=2316304=3A_Further_performance_improvements_fo?= =?utf-8?q?r_BZ2File=2E?= Message-ID: <3XVLKV3cY6zQSF@mail.python.org> http://hg.python.org/cpython/rev/abb5c5bde872 changeset: 79350:abb5c5bde872 parent: 79348:5876a24b613a parent: 79349:4258248a44c7 user: Nadeem Vawda date: Mon Oct 01 00:04:46 2012 +0200 summary: Merge: #16304: Further performance improvements for BZ2File. Optimizations suggested by Serhiy Storchaka. files: Lib/bz2.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/bz2.py b/Lib/bz2.py --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -159,15 +159,21 @@ raise ValueError("I/O operation on closed file") def _check_can_read(self): - if not self.readable(): + if self.closed: + raise ValueError("I/O operation on closed file") + if self._mode not in (_MODE_READ, _MODE_READ_EOF): raise io.UnsupportedOperation("File not open for reading") def _check_can_write(self): - if not self.writable(): + if self.closed: + raise ValueError("I/O operation on closed file") + if self._mode != _MODE_WRITE: raise io.UnsupportedOperation("File not open for writing") def _check_can_seek(self): - if not self.readable(): + if self.closed: + raise ValueError("I/O operation on closed file") + if self._mode not in (_MODE_READ, _MODE_READ_EOF): raise io.UnsupportedOperation("Seeking is only supported " "on files open for reading") if not self._fp.seekable(): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 00:21:52 2012 From: python-checkins at python.org (brett.cannon) Date: Mon, 1 Oct 2012 00:21:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Chameleon_requires_pkg?= =?utf-8?q?=5Fresources=2E?= Message-ID: <3XVLhJ6ghVzQfD@mail.python.org> http://hg.python.org/benchmarks/rev/ea0b385dd675 changeset: 183:ea0b385dd675 user: Brett Cannon date: Sun Sep 30 18:21:40 2012 -0400 summary: Chameleon requires pkg_resources. Keep a Python 3 version from distribute in lib3 that can be copied over the copy kept in Chameleon 2.9.2's source as Chameleon is compatible with Python 3 as-is otherwise. files: lib/Chameleon-2.9.2/src/pkg_resources.py | 2837 +++++++++ lib3/pkg_resources.py | 2838 ++++++++++ make_perf3.sh | 3 + 3 files changed, 5678 insertions(+), 0 deletions(-) diff --git a/lib/Chameleon-2.9.2/src/pkg_resources.py b/lib/Chameleon-2.9.2/src/pkg_resources.py new file mode 100644 --- /dev/null +++ b/lib/Chameleon-2.9.2/src/pkg_resources.py @@ -0,0 +1,2837 @@ +"""Package resource API +-------------------- + +A resource is a logical file contained within a package, or a logical +subdirectory thereof. The package resource API expects resource names +to have their path parts separated with ``/``, *not* whatever the local +path separator is. Do not use os.path operations to manipulate resource +names being passed into the API. + +The package resource API is designed to work with normal filesystem packages, +.egg files, and unpacked .egg files. It can also work in a limited way with +.zip files and with custom PEP 302 loaders that support the ``get_data()`` +method. +""" + +import sys, os, zipimport, time, re, imp, types +from urlparse import urlparse, urlunparse + +try: + frozenset +except NameError: + from sets import ImmutableSet as frozenset + +# capture these to bypass sandboxing +from os import utime +try: + from os import mkdir, rename, unlink + WRITE_SUPPORT = True +except ImportError: + # no write support, probably under GAE + WRITE_SUPPORT = False + +from os import open as os_open +from os.path import isdir, split + +# This marker is used to simplify the process that checks is the +# setuptools package was installed by the Setuptools project +# or by the Distribute project, in case Setuptools creates +# a distribution with the same version. +# +# The bootstrapping script for instance, will check if this +# attribute is present to decide wether to reinstall the package +_distribute = True + +def _bypass_ensure_directory(name, mode=0777): + # Sandbox-bypassing version of ensure_directory() + if not WRITE_SUPPORT: + raise IOError('"os.mkdir" not supported on this platform.') + dirname, filename = split(name) + if dirname and filename and not isdir(dirname): + _bypass_ensure_directory(dirname) + mkdir(dirname, mode) + + +_state_vars = {} + +def _declare_state(vartype, **kw): + g = globals() + for name, val in kw.iteritems(): + g[name] = val + _state_vars[name] = vartype + +def __getstate__(): + state = {} + g = globals() + for k, v in _state_vars.iteritems(): + state[k] = g['_sget_'+v](g[k]) + return state + +def __setstate__(state): + g = globals() + for k, v in state.iteritems(): + g['_sset_'+_state_vars[k]](k, g[k], v) + return state + +def _sget_dict(val): + return val.copy() + +def _sset_dict(key, ob, state): + ob.clear() + ob.update(state) + +def _sget_object(val): + return val.__getstate__() + +def _sset_object(key, ob, state): + ob.__setstate__(state) + +_sget_none = _sset_none = lambda *args: None + + + +def get_supported_platform(): + """Return this platform's maximum compatible version. + + distutils.util.get_platform() normally reports the minimum version + of Mac OS X that would be required to *use* extensions produced by + distutils. But what we want when checking compatibility is to know the + version of Mac OS X that we are *running*. To allow usage of packages that + explicitly require a newer version of Mac OS X, we must also know the + current version of the OS. + + If this condition occurs for any other platform with a version in its + platform strings, this function should be extended accordingly. + """ + plat = get_build_platform(); m = macosVersionString.match(plat) + if m is not None and sys.platform == "darwin": + try: + plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3)) + except ValueError: + pass # not Mac OS X + return plat + + + + + + + + + + + + + + + + + + + + + +__all__ = [ + # Basic resource access and distribution/entry point discovery + 'require', 'run_script', 'get_provider', 'get_distribution', + 'load_entry_point', 'get_entry_map', 'get_entry_info', 'iter_entry_points', + 'resource_string', 'resource_stream', 'resource_filename', + 'resource_listdir', 'resource_exists', 'resource_isdir', + + # Environmental control + 'declare_namespace', 'working_set', 'add_activation_listener', + 'find_distributions', 'set_extraction_path', 'cleanup_resources', + 'get_default_cache', + + # Primary implementation classes + 'Environment', 'WorkingSet', 'ResourceManager', + 'Distribution', 'Requirement', 'EntryPoint', + + # Exceptions + 'ResolutionError','VersionConflict','DistributionNotFound','UnknownExtra', + 'ExtractionError', + + # Parsing functions and string utilities + 'parse_requirements', 'parse_version', 'safe_name', 'safe_version', + 'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections', + 'safe_extra', 'to_filename', + + # filesystem utilities + 'ensure_directory', 'normalize_path', + + # Distribution "precedence" constants + 'EGG_DIST', 'BINARY_DIST', 'SOURCE_DIST', 'CHECKOUT_DIST', 'DEVELOP_DIST', + + # "Provider" interfaces, implementations, and registration/lookup APIs + 'IMetadataProvider', 'IResourceProvider', 'FileMetadata', + 'PathMetadata', 'EggMetadata', 'EmptyProvider', 'empty_provider', + 'NullProvider', 'EggProvider', 'DefaultProvider', 'ZipProvider', + 'register_finder', 'register_namespace_handler', 'register_loader_type', + 'fixup_namespace_packages', 'get_importer', + + # Deprecated/backward compatibility only + 'run_main', 'AvailableDistributions', +] +class ResolutionError(Exception): + """Abstract base for dependency resolution errors""" + def __repr__(self): + return self.__class__.__name__+repr(self.args) + +class VersionConflict(ResolutionError): + """An already-installed version conflicts with the requested version""" + +class DistributionNotFound(ResolutionError): + """A requested distribution was not found""" + +class UnknownExtra(ResolutionError): + """Distribution doesn't have an "extra feature" of the given name""" +_provider_factories = {} + +PY_MAJOR = sys.version[:3] +EGG_DIST = 3 +BINARY_DIST = 2 +SOURCE_DIST = 1 +CHECKOUT_DIST = 0 +DEVELOP_DIST = -1 + +def register_loader_type(loader_type, provider_factory): + """Register `provider_factory` to make providers for `loader_type` + + `loader_type` is the type or class of a PEP 302 ``module.__loader__``, + and `provider_factory` is a function that, passed a *module* object, + returns an ``IResourceProvider`` for that module. + """ + _provider_factories[loader_type] = provider_factory + +def get_provider(moduleOrReq): + """Return an IResourceProvider for the named module or requirement""" + if isinstance(moduleOrReq,Requirement): + return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0] + try: + module = sys.modules[moduleOrReq] + except KeyError: + __import__(moduleOrReq) + module = sys.modules[moduleOrReq] + loader = getattr(module, '__loader__', None) + return _find_adapter(_provider_factories, loader)(module) + +def _macosx_vers(_cache=[]): + if not _cache: + import platform + version = platform.mac_ver()[0] + # fallback for MacPorts + if version == '': + import plistlib + plist = '/System/Library/CoreServices/SystemVersion.plist' + if os.path.exists(plist): + if hasattr(plistlib, 'readPlist'): + plist_content = plistlib.readPlist(plist) + if 'ProductVersion' in plist_content: + version = plist_content['ProductVersion'] + + _cache.append(version.split('.')) + return _cache[0] + +def _macosx_arch(machine): + return {'PowerPC':'ppc', 'Power_Macintosh':'ppc'}.get(machine,machine) + +def get_build_platform(): + """Return this platform's string for platform-specific distributions + + XXX Currently this is the same as ``distutils.util.get_platform()``, but it + needs some hacks for Linux and Mac OS X. + """ + try: + from distutils.util import get_platform + except ImportError: + from sysconfig import get_platform + + plat = get_platform() + if sys.platform == "darwin" and not plat.startswith('macosx-'): + try: + version = _macosx_vers() + machine = os.uname()[4].replace(" ", "_") + return "macosx-%d.%d-%s" % (int(version[0]), int(version[1]), + _macosx_arch(machine)) + except ValueError: + # if someone is running a non-Mac darwin system, this will fall + # through to the default implementation + pass + return plat + +macosVersionString = re.compile(r"macosx-(\d+)\.(\d+)-(.*)") +darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)") +get_platform = get_build_platform # XXX backward compat + +def compatible_platforms(provided,required): + """Can code for the `provided` platform run on the `required` platform? + + Returns true if either platform is ``None``, or the platforms are equal. + + XXX Needs compatibility checks for Linux and other unixy OSes. + """ + if provided is None or required is None or provided==required: + return True # easy case + + # Mac OS X special cases + reqMac = macosVersionString.match(required) + if reqMac: + provMac = macosVersionString.match(provided) + + # is this a Mac package? + if not provMac: + # this is backwards compatibility for packages built before + # setuptools 0.6. All packages built after this point will + # use the new macosx designation. + provDarwin = darwinVersionString.match(provided) + if provDarwin: + dversion = int(provDarwin.group(1)) + macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2)) + if dversion == 7 and macosversion >= "10.3" or \ + dversion == 8 and macosversion >= "10.4": + + #import warnings + #warnings.warn("Mac eggs should be rebuilt to " + # "use the macosx designation instead of darwin.", + # category=DeprecationWarning) + return True + return False # egg isn't macosx or legacy darwin + + # are they the same major version and machine type? + if provMac.group(1) != reqMac.group(1) or \ + provMac.group(3) != reqMac.group(3): + return False + + + + # is the required OS major update >= the provided one? + if int(provMac.group(2)) > int(reqMac.group(2)): + return False + + return True + + # XXX Linux and other platforms' special cases should go here + return False + + +def run_script(dist_spec, script_name): + """Locate distribution `dist_spec` and run its `script_name` script""" + ns = sys._getframe(1).f_globals + name = ns['__name__'] + ns.clear() + ns['__name__'] = name + require(dist_spec)[0].run_script(script_name, ns) + +run_main = run_script # backward compatibility + +def get_distribution(dist): + """Return a current distribution object for a Requirement or string""" + if isinstance(dist,basestring): dist = Requirement.parse(dist) + if isinstance(dist,Requirement): dist = get_provider(dist) + if not isinstance(dist,Distribution): + raise TypeError("Expected string, Requirement, or Distribution", dist) + return dist + +def load_entry_point(dist, group, name): + """Return `name` entry point of `group` for `dist` or raise ImportError""" + return get_distribution(dist).load_entry_point(group, name) + +def get_entry_map(dist, group=None): + """Return the entry point map for `group`, or the full entry map""" + return get_distribution(dist).get_entry_map(group) + +def get_entry_info(dist, group, name): + """Return the EntryPoint object for `group`+`name`, or ``None``""" + return get_distribution(dist).get_entry_info(group, name) + + +class IMetadataProvider: + + def has_metadata(name): + """Does the package's distribution contain the named metadata?""" + + def get_metadata(name): + """The named metadata resource as a string""" + + def get_metadata_lines(name): + """Yield named metadata resource as list of non-blank non-comment lines + + Leading and trailing whitespace is stripped from each line, and lines + with ``#`` as the first non-blank character are omitted.""" + + def metadata_isdir(name): + """Is the named metadata a directory? (like ``os.path.isdir()``)""" + + def metadata_listdir(name): + """List of metadata names in the directory (like ``os.listdir()``)""" + + def run_script(script_name, namespace): + """Execute the named script in the supplied namespace dictionary""" + + + + + + + + + + +class IResourceProvider(IMetadataProvider): + """An object that provides access to package resources""" + + def get_resource_filename(manager, resource_name): + """Return a true filesystem path for `resource_name` + + `manager` must be an ``IResourceManager``""" + + def get_resource_stream(manager, resource_name): + """Return a readable file-like object for `resource_name` + + `manager` must be an ``IResourceManager``""" + + def get_resource_string(manager, resource_name): + """Return a string containing the contents of `resource_name` + + `manager` must be an ``IResourceManager``""" + + def has_resource(resource_name): + """Does the package contain the named resource?""" + + def resource_isdir(resource_name): + """Is the named resource a directory? (like ``os.path.isdir()``)""" + + def resource_listdir(resource_name): + """List of resource names in the directory (like ``os.listdir()``)""" + + + + + + + + + + + + + + + +class WorkingSet(object): + """A collection of active distributions on sys.path (or a similar list)""" + + def __init__(self, entries=None): + """Create working set from list of path entries (default=sys.path)""" + self.entries = [] + self.entry_keys = {} + self.by_key = {} + self.callbacks = [] + + if entries is None: + entries = sys.path + + for entry in entries: + self.add_entry(entry) + + + def add_entry(self, entry): + """Add a path item to ``.entries``, finding any distributions on it + + ``find_distributions(entry,True)`` is used to find distributions + corresponding to the path entry, and they are added. `entry` is + always appended to ``.entries``, even if it is already present. + (This is because ``sys.path`` can contain the same value more than + once, and the ``.entries`` of the ``sys.path`` WorkingSet should always + equal ``sys.path``.) + """ + self.entry_keys.setdefault(entry, []) + self.entries.append(entry) + for dist in find_distributions(entry, True): + self.add(dist, entry, False) + + + def __contains__(self,dist): + """True if `dist` is the active distribution for its project""" + return self.by_key.get(dist.key) == dist + + + + + + def find(self, req): + """Find a distribution matching requirement `req` + + If there is an active distribution for the requested project, this + returns it as long as it meets the version requirement specified by + `req`. But, if there is an active distribution for the project and it + does *not* meet the `req` requirement, ``VersionConflict`` is raised. + If there is no active distribution for the requested project, ``None`` + is returned. + """ + dist = self.by_key.get(req.key) + if dist is not None and dist not in req: + raise VersionConflict(dist,req) # XXX add more info + else: + return dist + + def iter_entry_points(self, group, name=None): + """Yield entry point objects from `group` matching `name` + + If `name` is None, yields all entry points in `group` from all + distributions in the working set, otherwise only ones matching + both `group` and `name` are yielded (in distribution order). + """ + for dist in self: + entries = dist.get_entry_map(group) + if name is None: + for ep in entries.values(): + yield ep + elif name in entries: + yield entries[name] + + def run_script(self, requires, script_name): + """Locate distribution for `requires` and run `script_name` script""" + ns = sys._getframe(1).f_globals + name = ns['__name__'] + ns.clear() + ns['__name__'] = name + self.require(requires)[0].run_script(script_name, ns) + + + + def __iter__(self): + """Yield distributions for non-duplicate projects in the working set + + The yield order is the order in which the items' path entries were + added to the working set. + """ + seen = {} + for item in self.entries: + if item not in self.entry_keys: + # workaround a cache issue + continue + + for key in self.entry_keys[item]: + if key not in seen: + seen[key]=1 + yield self.by_key[key] + + def add(self, dist, entry=None, insert=True): + """Add `dist` to working set, associated with `entry` + + If `entry` is unspecified, it defaults to the ``.location`` of `dist`. + On exit from this routine, `entry` is added to the end of the working + set's ``.entries`` (if it wasn't already present). + + `dist` is only added to the working set if it's for a project that + doesn't already have a distribution in the set. If it's added, any + callbacks registered with the ``subscribe()`` method will be called. + """ + if insert: + dist.insert_on(self.entries, entry) + + if entry is None: + entry = dist.location + keys = self.entry_keys.setdefault(entry,[]) + keys2 = self.entry_keys.setdefault(dist.location,[]) + if dist.key in self.by_key: + return # ignore hidden distros + + self.by_key[dist.key] = dist + if dist.key not in keys: + keys.append(dist.key) + if dist.key not in keys2: + keys2.append(dist.key) + self._added_new(dist) + + def resolve(self, requirements, env=None, installer=None, replacement=True): + """List all distributions needed to (recursively) meet `requirements` + + `requirements` must be a sequence of ``Requirement`` objects. `env`, + if supplied, should be an ``Environment`` instance. If + not supplied, it defaults to all distributions available within any + entry or distribution in the working set. `installer`, if supplied, + will be invoked with each requirement that cannot be met by an + already-installed distribution; it should return a ``Distribution`` or + ``None``. + """ + + requirements = list(requirements)[::-1] # set up the stack + processed = {} # set of processed requirements + best = {} # key -> dist + to_activate = [] + + while requirements: + req = requirements.pop(0) # process dependencies breadth-first + if _override_setuptools(req) and replacement: + req = Requirement.parse('distribute') + + if req in processed: + # Ignore cyclic or redundant dependencies + continue + dist = best.get(req.key) + if dist is None: + # Find the best distribution and add it to the map + dist = self.by_key.get(req.key) + if dist is None: + if env is None: + env = Environment(self.entries) + dist = best[req.key] = env.best_match(req, self, installer) + if dist is None: + #msg = ("The '%s' distribution was not found on this " + # "system, and is required by this application.") + #raise DistributionNotFound(msg % req) + + # unfortunately, zc.buildout uses a str(err) + # to get the name of the distribution here.. + raise DistributionNotFound(req) + to_activate.append(dist) + if dist not in req: + # Oops, the "best" so far conflicts with a dependency + raise VersionConflict(dist,req) # XXX put more info here + requirements.extend(dist.requires(req.extras)[::-1]) + processed[req] = True + + return to_activate # return list of distros to activate + + def find_plugins(self, + plugin_env, full_env=None, installer=None, fallback=True + ): + """Find all activatable distributions in `plugin_env` + + Example usage:: + + distributions, errors = working_set.find_plugins( + Environment(plugin_dirlist) + ) + map(working_set.add, distributions) # add plugins+libs to sys.path + print 'Could not load', errors # display errors + + The `plugin_env` should be an ``Environment`` instance that contains + only distributions that are in the project's "plugin directory" or + directories. The `full_env`, if supplied, should be an ``Environment`` + contains all currently-available distributions. If `full_env` is not + supplied, one is created automatically from the ``WorkingSet`` this + method is called on, which will typically mean that every directory on + ``sys.path`` will be scanned for distributions. + + `installer` is a standard installer callback as used by the + ``resolve()`` method. The `fallback` flag indicates whether we should + attempt to resolve older versions of a plugin if the newest version + cannot be resolved. + + This method returns a 2-tuple: (`distributions`, `error_info`), where + `distributions` is a list of the distributions found in `plugin_env` + that were loadable, along with any other distributions that are needed + to resolve their dependencies. `error_info` is a dictionary mapping + unloadable plugin distributions to an exception instance describing the + error that occurred. Usually this will be a ``DistributionNotFound`` or + ``VersionConflict`` instance. + """ + + plugin_projects = list(plugin_env) + plugin_projects.sort() # scan project names in alphabetic order + + error_info = {} + distributions = {} + + if full_env is None: + env = Environment(self.entries) + env += plugin_env + else: + env = full_env + plugin_env + + shadow_set = self.__class__([]) + map(shadow_set.add, self) # put all our entries in shadow_set + + for project_name in plugin_projects: + + for dist in plugin_env[project_name]: + + req = [dist.as_requirement()] + + try: + resolvees = shadow_set.resolve(req, env, installer) + + except ResolutionError,v: + error_info[dist] = v # save error info + if fallback: + continue # try the next older version of project + else: + break # give up on this project, keep going + + else: + map(shadow_set.add, resolvees) + distributions.update(dict.fromkeys(resolvees)) + + # success, no need to try any more versions of this project + break + + distributions = list(distributions) + distributions.sort() + + return distributions, error_info + + + + + + def require(self, *requirements): + """Ensure that distributions matching `requirements` are activated + + `requirements` must be a string or a (possibly-nested) sequence + thereof, specifying the distributions and versions required. The + return value is a sequence of the distributions that needed to be + activated to fulfill the requirements; all relevant distributions are + included, even if they were already activated in this working set. + """ + + needed = self.resolve(parse_requirements(requirements)) + + for dist in needed: + self.add(dist) + + return needed + + + def subscribe(self, callback): + """Invoke `callback` for all distributions (including existing ones)""" + if callback in self.callbacks: + return + self.callbacks.append(callback) + for dist in self: + callback(dist) + + + def _added_new(self, dist): + for callback in self.callbacks: + callback(dist) + + def __getstate__(self): + return (self.entries[:], self.entry_keys.copy(), self.by_key.copy(), + self.callbacks[:]) + + def __setstate__(self, (entries, keys, by_key, callbacks)): + self.entries = entries[:] + self.entry_keys = keys.copy() + self.by_key = by_key.copy() + self.callbacks = callbacks[:] + + + + +class Environment(object): + """Searchable snapshot of distributions on a search path""" + + def __init__(self, search_path=None, platform=get_supported_platform(), python=PY_MAJOR): + """Snapshot distributions available on a search path + + Any distributions found on `search_path` are added to the environment. + `search_path` should be a sequence of ``sys.path`` items. If not + supplied, ``sys.path`` is used. + + `platform` is an optional string specifying the name of the platform + that platform-specific distributions must be compatible with. If + unspecified, it defaults to the current platform. `python` is an + optional string naming the desired version of Python (e.g. ``'2.4'``); + it defaults to the current version. + + You may explicitly set `platform` (and/or `python`) to ``None`` if you + wish to map *all* distributions, not just those compatible with the + running platform or Python version. + """ + self._distmap = {} + self._cache = {} + self.platform = platform + self.python = python + self.scan(search_path) + + def can_add(self, dist): + """Is distribution `dist` acceptable for this environment? + + The distribution must match the platform and python version + requirements specified when this environment was created, or False + is returned. + """ + return (self.python is None or dist.py_version is None + or dist.py_version==self.python) \ + and compatible_platforms(dist.platform,self.platform) + + def remove(self, dist): + """Remove `dist` from the environment""" + self._distmap[dist.key].remove(dist) + + def scan(self, search_path=None): + """Scan `search_path` for distributions usable in this environment + + Any distributions found are added to the environment. + `search_path` should be a sequence of ``sys.path`` items. If not + supplied, ``sys.path`` is used. Only distributions conforming to + the platform/python version defined at initialization are added. + """ + if search_path is None: + search_path = sys.path + + for item in search_path: + for dist in find_distributions(item): + self.add(dist) + + def __getitem__(self,project_name): + """Return a newest-to-oldest list of distributions for `project_name` + """ + try: + return self._cache[project_name] + except KeyError: + project_name = project_name.lower() + if project_name not in self._distmap: + return [] + + if project_name not in self._cache: + dists = self._cache[project_name] = self._distmap[project_name] + _sort_dists(dists) + + return self._cache[project_name] + + def add(self,dist): + """Add `dist` if we ``can_add()`` it and it isn't already added""" + if self.can_add(dist) and dist.has_version(): + dists = self._distmap.setdefault(dist.key,[]) + if dist not in dists: + dists.append(dist) + if dist.key in self._cache: + _sort_dists(self._cache[dist.key]) + + + def best_match(self, req, working_set, installer=None): + """Find distribution best matching `req` and usable on `working_set` + + This calls the ``find(req)`` method of the `working_set` to see if a + suitable distribution is already active. (This may raise + ``VersionConflict`` if an unsuitable version of the project is already + active in the specified `working_set`.) If a suitable distribution + isn't active, this method returns the newest distribution in the + environment that meets the ``Requirement`` in `req`. If no suitable + distribution is found, and `installer` is supplied, then the result of + calling the environment's ``obtain(req, installer)`` method will be + returned. + """ + dist = working_set.find(req) + if dist is not None: + return dist + for dist in self[req.key]: + if dist in req: + return dist + return self.obtain(req, installer) # try and download/install + + def obtain(self, requirement, installer=None): + """Obtain a distribution matching `requirement` (e.g. via download) + + Obtain a distro that matches requirement (e.g. via download). In the + base ``Environment`` class, this routine just returns + ``installer(requirement)``, unless `installer` is None, in which case + None is returned instead. This method is a hook that allows subclasses + to attempt other ways of obtaining a distribution before falling back + to the `installer` argument.""" + if installer is not None: + return installer(requirement) + + def __iter__(self): + """Yield the unique project names of the available distributions""" + for key in self._distmap.keys(): + if self[key]: yield key + + + + + def __iadd__(self, other): + """In-place addition of a distribution or environment""" + if isinstance(other,Distribution): + self.add(other) + elif isinstance(other,Environment): + for project in other: + for dist in other[project]: + self.add(dist) + else: + raise TypeError("Can't add %r to environment" % (other,)) + return self + + def __add__(self, other): + """Add an environment or distribution to an environment""" + new = self.__class__([], platform=None, python=None) + for env in self, other: + new += env + return new + + +AvailableDistributions = Environment # XXX backward compatibility + + +class ExtractionError(RuntimeError): + """An error occurred extracting a resource + + The following attributes are available from instances of this exception: + + manager + The resource manager that raised this exception + + cache_path + The base directory for resource extraction + + original_error + The exception instance that caused extraction to fail + """ + + + + +class ResourceManager: + """Manage resource extraction and packages""" + extraction_path = None + + def __init__(self): + self.cached_files = {} + + def resource_exists(self, package_or_requirement, resource_name): + """Does the named resource exist?""" + return get_provider(package_or_requirement).has_resource(resource_name) + + def resource_isdir(self, package_or_requirement, resource_name): + """Is the named resource an existing directory?""" + return get_provider(package_or_requirement).resource_isdir( + resource_name + ) + + def resource_filename(self, package_or_requirement, resource_name): + """Return a true filesystem path for specified resource""" + return get_provider(package_or_requirement).get_resource_filename( + self, resource_name + ) + + def resource_stream(self, package_or_requirement, resource_name): + """Return a readable file-like object for specified resource""" + return get_provider(package_or_requirement).get_resource_stream( + self, resource_name + ) + + def resource_string(self, package_or_requirement, resource_name): + """Return specified resource as a string""" + return get_provider(package_or_requirement).get_resource_string( + self, resource_name + ) + + def resource_listdir(self, package_or_requirement, resource_name): + """List the contents of the named resource directory""" + return get_provider(package_or_requirement).resource_listdir( + resource_name + ) + + def extraction_error(self): + """Give an error message for problems extracting file(s)""" + + old_exc = sys.exc_info()[1] + cache_path = self.extraction_path or get_default_cache() + + err = ExtractionError("""Can't extract file(s) to egg cache + +The following error occurred while trying to extract file(s) to the Python egg +cache: + + %s + +The Python egg cache directory is currently set to: + + %s + +Perhaps your account does not have write access to this directory? You can +change the cache directory by setting the PYTHON_EGG_CACHE environment +variable to point to an accessible directory. +""" % (old_exc, cache_path) + ) + err.manager = self + err.cache_path = cache_path + err.original_error = old_exc + raise err + + + + + + + + + + + + + + + + def get_cache_path(self, archive_name, names=()): + """Return absolute location in cache for `archive_name` and `names` + + The parent directory of the resulting path will be created if it does + not already exist. `archive_name` should be the base filename of the + enclosing egg (which may not be the name of the enclosing zipfile!), + including its ".egg" extension. `names`, if provided, should be a + sequence of path name parts "under" the egg's extraction location. + + This method should only be called by resource providers that need to + obtain an extraction location, and only for names they intend to + extract, as it tracks the generated names for possible cleanup later. + """ + extract_path = self.extraction_path or get_default_cache() + target_path = os.path.join(extract_path, archive_name+'-tmp', *names) + try: + _bypass_ensure_directory(target_path) + except: + self.extraction_error() + + self.cached_files[target_path] = 1 + return target_path + + + + + + + + + + + + + + + + + + + + def postprocess(self, tempname, filename): + """Perform any platform-specific postprocessing of `tempname` + + This is where Mac header rewrites should be done; other platforms don't + have anything special they should do. + + Resource providers should call this method ONLY after successfully + extracting a compressed resource. They must NOT call it on resources + that are already in the filesystem. + + `tempname` is the current (temporary) name of the file, and `filename` + is the name it will be renamed to by the caller after this routine + returns. + """ + + if os.name == 'posix': + # Make the resource executable + mode = ((os.stat(tempname).st_mode) | 0555) & 07777 + os.chmod(tempname, mode) + + + + + + + + + + + + + + + + + + + + + + + def set_extraction_path(self, path): + """Set the base path where resources will be extracted to, if needed. + + If you do not call this routine before any extractions take place, the + path defaults to the return value of ``get_default_cache()``. (Which + is based on the ``PYTHON_EGG_CACHE`` environment variable, with various + platform-specific fallbacks. See that routine's documentation for more + details.) + + Resources are extracted to subdirectories of this path based upon + information given by the ``IResourceProvider``. You may set this to a + temporary directory, but then you must call ``cleanup_resources()`` to + delete the extracted files when done. There is no guarantee that + ``cleanup_resources()`` will be able to remove all extracted files. + + (Note: you may not change the extraction path for a given resource + manager once resources have been extracted, unless you first call + ``cleanup_resources()``.) + """ + if self.cached_files: + raise ValueError( + "Can't change extraction path, files already extracted" + ) + + self.extraction_path = path + + def cleanup_resources(self, force=False): + """ + Delete all extracted resource files and directories, returning a list + of the file and directory names that could not be successfully removed. + This function does not have any concurrency protection, so it should + generally only be called when the extraction path is a temporary + directory exclusive to a single process. This method is not + automatically called; you must call it explicitly or register it as an + ``atexit`` function if you wish to ensure cleanup of a temporary + directory used for extractions. + """ + # XXX + + + +def get_default_cache(): + """Determine the default cache location + + This returns the ``PYTHON_EGG_CACHE`` environment variable, if set. + Otherwise, on Windows, it returns a "Python-Eggs" subdirectory of the + "Application Data" directory. On all other systems, it's "~/.python-eggs". + """ + try: + return os.environ['PYTHON_EGG_CACHE'] + except KeyError: + pass + + if os.name!='nt': + return os.path.expanduser('~/.python-eggs') + + app_data = 'Application Data' # XXX this may be locale-specific! + app_homes = [ + (('APPDATA',), None), # best option, should be locale-safe + (('USERPROFILE',), app_data), + (('HOMEDRIVE','HOMEPATH'), app_data), + (('HOMEPATH',), app_data), + (('HOME',), None), + (('WINDIR',), app_data), # 95/98/ME + ] + + for keys, subdir in app_homes: + dirname = '' + for key in keys: + if key in os.environ: + dirname = os.path.join(dirname, os.environ[key]) + else: + break + else: + if subdir: + dirname = os.path.join(dirname,subdir) + return os.path.join(dirname, 'Python-Eggs') + else: + raise RuntimeError( + "Please set the PYTHON_EGG_CACHE enviroment variable" + ) + +def safe_name(name): + """Convert an arbitrary string to a standard distribution name + + Any runs of non-alphanumeric/. characters are replaced with a single '-'. + """ + return re.sub('[^A-Za-z0-9.]+', '-', name) + + +def safe_version(version): + """Convert an arbitrary string to a standard version string + + Spaces become dots, and all other non-alphanumeric characters become + dashes, with runs of multiple dashes condensed to a single dash. + """ + version = version.replace(' ','.') + return re.sub('[^A-Za-z0-9.]+', '-', version) + + +def safe_extra(extra): + """Convert an arbitrary string to a standard 'extra' name + + Any runs of non-alphanumeric characters are replaced with a single '_', + and the result is always lowercased. + """ + return re.sub('[^A-Za-z0-9.]+', '_', extra).lower() + + +def to_filename(name): + """Convert a project or version name to its filename-escaped form + + Any '-' characters are currently replaced with '_'. + """ + return name.replace('-','_') + + + + + + + + +class NullProvider: + """Try to implement resources and metadata for arbitrary PEP 302 loaders""" + + egg_name = None + egg_info = None + loader = None + + def __init__(self, module): + self.loader = getattr(module, '__loader__', None) + self.module_path = os.path.dirname(getattr(module, '__file__', '')) + + def get_resource_filename(self, manager, resource_name): + return self._fn(self.module_path, resource_name) + + def get_resource_stream(self, manager, resource_name): + return StringIO(self.get_resource_string(manager, resource_name)) + + def get_resource_string(self, manager, resource_name): + return self._get(self._fn(self.module_path, resource_name)) + + def has_resource(self, resource_name): + return self._has(self._fn(self.module_path, resource_name)) + + def has_metadata(self, name): + return self.egg_info and self._has(self._fn(self.egg_info,name)) + + if sys.version_info <= (3,): + def get_metadata(self, name): + if not self.egg_info: + return "" + return self._get(self._fn(self.egg_info,name)) + else: + def get_metadata(self, name): + if not self.egg_info: + return "" + return self._get(self._fn(self.egg_info,name)).decode("utf-8") + + def get_metadata_lines(self, name): + return yield_lines(self.get_metadata(name)) + + def resource_isdir(self,resource_name): + return self._isdir(self._fn(self.module_path, resource_name)) + + def metadata_isdir(self,name): + return self.egg_info and self._isdir(self._fn(self.egg_info,name)) + + + def resource_listdir(self,resource_name): + return self._listdir(self._fn(self.module_path,resource_name)) + + def metadata_listdir(self,name): + if self.egg_info: + return self._listdir(self._fn(self.egg_info,name)) + return [] + + def run_script(self,script_name,namespace): + script = 'scripts/'+script_name + if not self.has_metadata(script): + raise ResolutionError("No script named %r" % script_name) + script_text = self.get_metadata(script).replace('\r\n','\n') + script_text = script_text.replace('\r','\n') + script_filename = self._fn(self.egg_info,script) + namespace['__file__'] = script_filename + if os.path.exists(script_filename): + execfile(script_filename, namespace, namespace) + else: + from linecache import cache + cache[script_filename] = ( + len(script_text), 0, script_text.split('\n'), script_filename + ) + script_code = compile(script_text,script_filename,'exec') + exec script_code in namespace, namespace + + def _has(self, path): + raise NotImplementedError( + "Can't perform this operation for unregistered loader type" + ) + + def _isdir(self, path): + raise NotImplementedError( + "Can't perform this operation for unregistered loader type" + ) + + def _listdir(self, path): + raise NotImplementedError( + "Can't perform this operation for unregistered loader type" + ) + + def _fn(self, base, resource_name): + if resource_name: + return os.path.join(base, *resource_name.split('/')) + return base + + def _get(self, path): + if hasattr(self.loader, 'get_data'): + return self.loader.get_data(path) + raise NotImplementedError( + "Can't perform this operation for loaders without 'get_data()'" + ) + +register_loader_type(object, NullProvider) + + +class EggProvider(NullProvider): + """Provider based on a virtual filesystem""" + + def __init__(self,module): + NullProvider.__init__(self,module) + self._setup_prefix() + + def _setup_prefix(self): + # we assume here that our metadata may be nested inside a "basket" + # of multiple eggs; that's why we use module_path instead of .archive + path = self.module_path + old = None + while path!=old: + if path.lower().endswith('.egg'): + self.egg_name = os.path.basename(path) + self.egg_info = os.path.join(path, 'EGG-INFO') + self.egg_root = path + break + old = path + path, base = os.path.split(path) + + + + + + +class DefaultProvider(EggProvider): + """Provides access to package resources in the filesystem""" + + def _has(self, path): + return os.path.exists(path) + + def _isdir(self,path): + return os.path.isdir(path) + + def _listdir(self,path): + return os.listdir(path) + + def get_resource_stream(self, manager, resource_name): + return open(self._fn(self.module_path, resource_name), 'rb') + + def _get(self, path): + stream = open(path, 'rb') + try: + return stream.read() + finally: + stream.close() + +register_loader_type(type(None), DefaultProvider) + +try: + # CPython >=3.3 + import _frozen_importlib +except ImportError: + pass +else: + register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider) + + +class EmptyProvider(NullProvider): + """Provider that returns nothing for all requests""" + + _isdir = _has = lambda self,path: False + _get = lambda self,path: '' + _listdir = lambda self,path: [] + module_path = None + + def __init__(self): + pass + +empty_provider = EmptyProvider() + + + + +class ZipProvider(EggProvider): + """Resource support for zips and eggs""" + + eagers = None + + def __init__(self, module): + EggProvider.__init__(self,module) + self.zipinfo = zipimport._zip_directory_cache[self.loader.archive] + self.zip_pre = self.loader.archive+os.sep + + def _zipinfo_name(self, fspath): + # Convert a virtual filename (full path to file) into a zipfile subpath + # usable with the zipimport directory cache for our target archive + if fspath.startswith(self.zip_pre): + return fspath[len(self.zip_pre):] + raise AssertionError( + "%s is not a subpath of %s" % (fspath,self.zip_pre) + ) + + def _parts(self,zip_path): + # Convert a zipfile subpath into an egg-relative path part list + fspath = self.zip_pre+zip_path # pseudo-fs path + if fspath.startswith(self.egg_root+os.sep): + return fspath[len(self.egg_root)+1:].split(os.sep) + raise AssertionError( + "%s is not a subpath of %s" % (fspath,self.egg_root) + ) + + def get_resource_filename(self, manager, resource_name): + if not self.egg_name: + raise NotImplementedError( + "resource_filename() only supported for .egg, not .zip" + ) + # no need to lock for extraction, since we use temp names + zip_path = self._resource_to_zip(resource_name) + eagers = self._get_eager_resources() + if '/'.join(self._parts(zip_path)) in eagers: + for name in eagers: + self._extract_resource(manager, self._eager_to_zip(name)) + return self._extract_resource(manager, zip_path) + + def _extract_resource(self, manager, zip_path): + + if zip_path in self._index(): + for name in self._index()[zip_path]: + last = self._extract_resource( + manager, os.path.join(zip_path, name) + ) + return os.path.dirname(last) # return the extracted directory name + + zip_stat = self.zipinfo[zip_path] + t,d,size = zip_stat[5], zip_stat[6], zip_stat[3] + date_time = ( + (d>>9)+1980, (d>>5)&0xF, d&0x1F, # ymd + (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1 # hms, etc. + ) + timestamp = time.mktime(date_time) + + try: + if not WRITE_SUPPORT: + raise IOError('"os.rename" and "os.unlink" are not supported ' + 'on this platform') + + real_path = manager.get_cache_path( + self.egg_name, self._parts(zip_path) + ) + + if os.path.isfile(real_path): + stat = os.stat(real_path) + if stat.st_size==size and stat.st_mtime==timestamp: + # size and stamp match, don't bother extracting + return real_path + + outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path)) + os.write(outf, self.loader.get_data(zip_path)) + os.close(outf) + utime(tmpnam, (timestamp,timestamp)) + manager.postprocess(tmpnam, real_path) + + try: + rename(tmpnam, real_path) + + except os.error: + if os.path.isfile(real_path): + stat = os.stat(real_path) + + if stat.st_size==size and stat.st_mtime==timestamp: + # size and stamp match, somebody did it just ahead of + # us, so we're done + return real_path + elif os.name=='nt': # Windows, del old file and retry + unlink(real_path) + rename(tmpnam, real_path) + return real_path + raise + + except os.error: + manager.extraction_error() # report a user-friendly error + + return real_path + + def _get_eager_resources(self): + if self.eagers is None: + eagers = [] + for name in ('native_libs.txt', 'eager_resources.txt'): + if self.has_metadata(name): + eagers.extend(self.get_metadata_lines(name)) + self.eagers = eagers + return self.eagers + + def _index(self): + try: + return self._dirindex + except AttributeError: + ind = {} + for path in self.zipinfo: + parts = path.split(os.sep) + while parts: + parent = os.sep.join(parts[:-1]) + if parent in ind: + ind[parent].append(parts[-1]) + break + else: + ind[parent] = [parts.pop()] + self._dirindex = ind + return ind + + def _has(self, fspath): + zip_path = self._zipinfo_name(fspath) + return zip_path in self.zipinfo or zip_path in self._index() + + def _isdir(self,fspath): + return self._zipinfo_name(fspath) in self._index() + + def _listdir(self,fspath): + return list(self._index().get(self._zipinfo_name(fspath), ())) + + def _eager_to_zip(self,resource_name): + return self._zipinfo_name(self._fn(self.egg_root,resource_name)) + + def _resource_to_zip(self,resource_name): + return self._zipinfo_name(self._fn(self.module_path,resource_name)) + +register_loader_type(zipimport.zipimporter, ZipProvider) + + + + + + + + + + + + + + + + + + + + + + + + +class FileMetadata(EmptyProvider): + """Metadata handler for standalone PKG-INFO files + + Usage:: + + metadata = FileMetadata("/path/to/PKG-INFO") + + This provider rejects all data and metadata requests except for PKG-INFO, + which is treated as existing, and will be the contents of the file at + the provided location. + """ + + def __init__(self,path): + self.path = path + + def has_metadata(self,name): + return name=='PKG-INFO' + + def get_metadata(self,name): + if name=='PKG-INFO': + f = open(self.path,'rU') + metadata = f.read() + f.close() + return metadata + raise KeyError("No metadata except PKG-INFO is available") + + def get_metadata_lines(self,name): + return yield_lines(self.get_metadata(name)) + + + + + + + + + + + + + + + + +class PathMetadata(DefaultProvider): + """Metadata provider for egg directories + + Usage:: + + # Development eggs: + + egg_info = "/path/to/PackageName.egg-info" + base_dir = os.path.dirname(egg_info) + metadata = PathMetadata(base_dir, egg_info) + dist_name = os.path.splitext(os.path.basename(egg_info))[0] + dist = Distribution(basedir,project_name=dist_name,metadata=metadata) + + # Unpacked egg directories: + + egg_path = "/path/to/PackageName-ver-pyver-etc.egg" + metadata = PathMetadata(egg_path, os.path.join(egg_path,'EGG-INFO')) + dist = Distribution.from_filename(egg_path, metadata=metadata) + """ + + def __init__(self, path, egg_info): + self.module_path = path + self.egg_info = egg_info + + +class EggMetadata(ZipProvider): + """Metadata provider for .egg files""" + + def __init__(self, importer): + """Create a metadata provider from a zipimporter""" + + self.zipinfo = zipimport._zip_directory_cache[importer.archive] + self.zip_pre = importer.archive+os.sep + self.loader = importer + if importer.prefix: + self.module_path = os.path.join(importer.archive, importer.prefix) + else: + self.module_path = importer.archive + self._setup_prefix() + + +class ImpWrapper: + """PEP 302 Importer that wraps Python's "normal" import algorithm""" + + def __init__(self, path=None): + 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 + +try: + from pkgutil import get_importer, ImpImporter +except ImportError: + pass # Python 2.3 or 2.4, use our own implementation +else: + ImpWrapper = ImpImporter # Python 2.5, use pkgutil's implementation + del ImpLoader, ImpImporter + + + + + + +_declare_state('dict', _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` 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, only=False): + """Yield distributions accessible via `path_item`""" + importer = get_importer(path_item) + finder = _find_adapter(_distribution_finders, importer) + return finder(importer, path_item, only) + +def find_in_zip(importer, path_item, only=False): + metadata = EggMetadata(importer) + if metadata.has_metadata('PKG-INFO'): + yield Distribution.from_filename(path_item, metadata=metadata) + if only: + return # don't yield nested distros + for subitem in metadata.resource_listdir('/'): + if subitem.endswith('.egg'): + subpath = os.path.join(path_item, subitem) + for dist in find_in_zip(zipimport.zipimporter(subpath), subpath): + yield dist + +register_finder(zipimport.zipimporter, find_in_zip) + +def StringIO(*args, **kw): + """Thunk to load the real StringIO on demand""" + global StringIO + try: + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO + return StringIO(*args,**kw) + +def find_nothing(importer, path_item, only=False): + return () +register_finder(object,find_nothing) + +def find_on_path(importer, path_item, only=False): + """Yield distributions accessible on a sys.path directory""" + path_item = _normalize_cached(path_item) + + if os.path.isdir(path_item) and os.access(path_item, os.R_OK): + if path_item.lower().endswith('.egg'): + # unpacked egg + yield Distribution.from_filename( + path_item, metadata=PathMetadata( + path_item, os.path.join(path_item,'EGG-INFO') + ) + ) + else: + # scan for .egg and .egg-info in directory + for entry in os.listdir(path_item): + lower = entry.lower() + if lower.endswith('.egg-info') or lower.endswith('.dist-info'): + fullpath = os.path.join(path_item, entry) + if os.path.isdir(fullpath): + # egg-info directory, allow getting metadata + metadata = PathMetadata(path_item, fullpath) + else: + metadata = FileMetadata(fullpath) + yield Distribution.from_location( + path_item,entry,metadata,precedence=DEVELOP_DIST + ) + elif not only and lower.endswith('.egg'): + for dist in find_distributions(os.path.join(path_item, entry)): + yield dist + elif not only and lower.endswith('.egg-link'): + for line in open(os.path.join(path_item, entry)): + if not line.strip(): continue + for item in find_distributions(os.path.join(path_item,line.rstrip())): + yield item + break +register_finder(ImpWrapper,find_on_path) + +try: + # CPython >=3.3 + import _frozen_importlib +except ImportError: + pass +else: + register_finder(_frozen_importlib.FileFinder, find_on_path) + +_declare_state('dict', _namespace_handlers={}) +_declare_state('dict', _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) + if importer is None: + return None + loader = importer.find_module(packageName) + if loader is None: + return None + module = sys.modules.get(packageName) + if module is None: + module = sys.modules[packageName] = types.ModuleType(packageName) + module.__path__ = []; _set_parent_ns(packageName) + elif not hasattr(module,'__path__'): + raise TypeError("Not a package:", packageName) + handler = _find_adapter(_namespace_handlers, importer) + subpath = handler(importer,path_item,packageName,module) + if subpath is not None: + path = module.__path__; path.append(subpath) + loader.load_module(packageName); module.__path__ = path + return subpath + +def declare_namespace(packageName): + """Declare that package 'packageName' is a namespace package""" + + imp.acquire_lock() + try: + if packageName in _namespace_packages: + return + + path, parent = sys.path, None + if '.' in packageName: + parent = '.'.join(packageName.split('.')[:-1]) + declare_namespace(parent) + if parent not in _namespace_packages: + __import__(parent) + try: + path = sys.modules[parent].__path__ + except AttributeError: + raise TypeError("Not a package:", parent) + + # 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,[]) + + 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) + + finally: + imp.release_lock() + +def fixup_namespace_packages(path_item, parent=None): + """Ensure that previously-declared namespace packages include path_item""" + imp.acquire_lock() + try: + for package in _namespace_packages.get(parent,()): + subpath = _handle_ns(package, path_item) + if subpath: fixup_namespace_packages(subpath,package) + finally: + imp.release_lock() + +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 = _normalize_cached(subpath) + for item in module.__path__: + if _normalize_cached(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) + +try: + # CPython >=3.3 + import _frozen_importlib +except ImportError: + pass +else: + register_namespace_handler(_frozen_importlib.FileFinder, file_ns_handler) + + +def null_ns_handler(importer, path_item, packageName, module): + return None + +register_namespace_handler(object,null_ns_handler) + + +def normalize_path(filename): + """Normalize a file/dir name for comparison purposes""" + return os.path.normcase(os.path.realpath(filename)) + +def _normalize_cached(filename,_cache={}): + try: + return _cache[filename] + except KeyError: + _cache[filename] = result = normalize_path(filename) + return result + +def _set_parent_ns(packageName): + parts = packageName.split('.') + name = parts.pop() + if parts: + parent = '.'.join(parts) + setattr(sys.modules[parent], name, sys.modules[packageName]) + + +def yield_lines(strs): + """Yield non-empty/non-comment lines of a ``basestring`` or sequence""" + if isinstance(strs,basestring): + for s in strs.splitlines(): + s = s.strip() + if s and not s.startswith('#'): # skip blank lines/comments + yield s + else: + for ss in strs: + for s in yield_lines(ss): + yield s + +LINE_END = re.compile(r"\s*(#.*)?$").match # whitespace and comment +CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match # line continuation +DISTRO = re.compile(r"\s*((\w|[-.])+)").match # Distribution or extra +VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match # ver. info +COMMA = re.compile(r"\s*,").match # comma between items +OBRACKET = re.compile(r"\s*\[").match +CBRACKET = re.compile(r"\s*\]").match +MODULE = re.compile(r"\w+(\.\w+)*$").match +EGG_NAME = re.compile( + r"(?P[^-]+)" + r"( -(?P[^-]+) (-py(?P[^-]+) (-(?P.+))? )? )?", + re.VERBOSE | re.IGNORECASE +).match + +component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE) +replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get + +def _parse_version_parts(s): + for part in component_re.split(s): + part = replace(part,part) + if part in ['', '.']: + continue + if part[:1] in '0123456789': + yield part.zfill(8) # pad for numeric comparison + else: + yield '*'+part + + yield '*final' # ensure that alpha/beta/candidate are before final + +def parse_version(s): + """Convert a version string to a chronologically-sortable key + + This is a rough cross between distutils' StrictVersion and LooseVersion; + if you give it versions that would work with StrictVersion, then it behaves + the same; otherwise it acts like a slightly-smarter LooseVersion. It is + *possible* to create pathological version coding schemes that will fool + this parser, but they should be very rare in practice. + + The returned value will be a tuple of strings. Numeric portions of the + version are padded to 8 digits so they will compare numerically, but + without relying on how numbers compare relative to strings. Dots are + dropped, but dashes are retained. Trailing zeros between alpha segments + or dashes are suppressed, so that e.g. "2.4.0" is considered the same as + "2.4". Alphanumeric parts are lower-cased. + + The algorithm assumes that strings like "-" and any alpha string that + alphabetically follows "final" represents a "patch level". So, "2.4-1" + is assumed to be a branch or patch of "2.4", and therefore "2.4.1" is + considered newer than "2.4-1", which in turn is newer than "2.4". + + Strings like "a", "b", "c", "alpha", "beta", "candidate" and so on (that + come before "final" alphabetically) are assumed to be pre-release versions, + so that the version "2.4" is considered newer than "2.4a1". + + Finally, to handle miscellaneous cases, the strings "pre", "preview", and + "rc" are treated as if they were "c", i.e. as though they were release + candidates, and therefore are not as new as a version string that does not + contain them, and "dev" is replaced with an '@' so that it sorts lower than + than any other pre-release tag. + """ + parts = [] + for part in _parse_version_parts(s.lower()): + if part.startswith('*'): + # remove trailing zeros from each series of numeric parts + while parts and parts[-1]=='00000000': + parts.pop() + parts.append(part) + return tuple(parts) + +class EntryPoint(object): + """Object representing an advertised importable object""" + + def __init__(self, name, module_name, attrs=(), extras=(), dist=None): + if not MODULE(module_name): + raise ValueError("Invalid module name", module_name) + self.name = name + self.module_name = module_name + self.attrs = tuple(attrs) + self.extras = Requirement.parse(("x[%s]" % ','.join(extras))).extras + self.dist = dist + + def __str__(self): + s = "%s = %s" % (self.name, self.module_name) + if self.attrs: + s += ':' + '.'.join(self.attrs) + if self.extras: + s += ' [%s]' % ','.join(self.extras) + return s + + def __repr__(self): + return "EntryPoint.parse(%r)" % str(self) + + def load(self, require=True, env=None, installer=None): + if require: self.require(env, installer) + entry = __import__(self.module_name, globals(),globals(), ['__name__']) + for attr in self.attrs: + try: + entry = getattr(entry,attr) + except AttributeError: + raise ImportError("%r has no %r attribute" % (entry,attr)) + return entry + + def require(self, env=None, installer=None): + if self.extras and not self.dist: + raise UnknownExtra("Can't require() without a distribution", self) + map(working_set.add, + working_set.resolve(self.dist.requires(self.extras),env,installer)) + + + + #@classmethod + def parse(cls, src, dist=None): + """Parse a single entry point from string `src` + + Entry point syntax follows the form:: + + name = some.module:some.attr [extra1,extra2] + + The entry name and module name are required, but the ``:attrs`` and + ``[extras]`` parts are optional + """ + try: + attrs = extras = () + name,value = src.split('=',1) + if '[' in value: + value,extras = value.split('[',1) + req = Requirement.parse("x["+extras) + if req.specs: raise ValueError + extras = req.extras + if ':' in value: + value,attrs = value.split(':',1) + if not MODULE(attrs.rstrip()): + raise ValueError + attrs = attrs.rstrip().split('.') + except ValueError: + raise ValueError( + "EntryPoint must be in 'name=module:attrs [extras]' format", + src + ) + else: + return cls(name.strip(), value.strip(), attrs, extras, dist) + + parse = classmethod(parse) + + + + + + + + + #@classmethod + def parse_group(cls, group, lines, dist=None): + """Parse an entry point group""" + if not MODULE(group): + raise ValueError("Invalid group name", group) + this = {} + for line in yield_lines(lines): + ep = cls.parse(line, dist) + if ep.name in this: + raise ValueError("Duplicate entry point", group, ep.name) + this[ep.name]=ep + return this + + parse_group = classmethod(parse_group) + + #@classmethod + def parse_map(cls, data, dist=None): + """Parse a map of entry point groups""" + if isinstance(data,dict): + data = data.items() + else: + data = split_sections(data) + maps = {} + for group, lines in data: + if group is None: + if not lines: + continue + raise ValueError("Entry points must be listed in groups") + group = group.strip() + if group in maps: + raise ValueError("Duplicate group name", group) + maps[group] = cls.parse_group(group, lines, dist) + return maps + + parse_map = classmethod(parse_map) + + +def _remove_md5_fragment(location): + if not location: + return '' + parsed = urlparse(location) + if parsed[-1].startswith('md5='): + return urlunparse(parsed[:-1] + ('',)) + return location + + +class Distribution(object): + """Wrap an actual or potential sys.path entry w/metadata""" + PKG_INFO = 'PKG-INFO' + + def __init__(self, + location=None, metadata=None, project_name=None, version=None, + py_version=PY_MAJOR, platform=None, precedence = EGG_DIST + ): + self.project_name = safe_name(project_name or 'Unknown') + if version is not None: + self._version = safe_version(version) + self.py_version = py_version + self.platform = platform + self.location = location + self.precedence = precedence + self._provider = metadata or empty_provider + + #@classmethod + def from_location(cls,location,basename,metadata=None,**kw): + project_name, version, py_version, platform = [None]*4 + basename, ext = os.path.splitext(basename) + if ext.lower() in _distributionImpl: + # .dist-info gets much metadata differently + match = EGG_NAME(basename) + if match: + project_name, version, py_version, platform = match.group( + 'name','ver','pyver','plat' + ) + cls = _distributionImpl[ext.lower()] + return cls( + location, metadata, project_name=project_name, version=version, + py_version=py_version, platform=platform, **kw + ) + from_location = classmethod(from_location) + + + hashcmp = property( + lambda self: ( + getattr(self,'parsed_version',()), + self.precedence, + self.key, + _remove_md5_fragment(self.location), + self.py_version, + self.platform + ) + ) + def __hash__(self): return hash(self.hashcmp) + def __lt__(self, other): + return self.hashcmp < other.hashcmp + def __le__(self, other): + return self.hashcmp <= other.hashcmp + def __gt__(self, other): + return self.hashcmp > other.hashcmp + def __ge__(self, other): + return self.hashcmp >= other.hashcmp + def __eq__(self, other): + if not isinstance(other, self.__class__): + # It's not a Distribution, so they are not equal + return False + return self.hashcmp == other.hashcmp + def __ne__(self, other): + return not self == other + + # These properties have to be lazy so that we don't have to load any + # metadata until/unless it's actually needed. (i.e., some distributions + # may not know their name or version without loading PKG-INFO) + + #@property + def key(self): + try: + return self._key + except AttributeError: + self._key = key = self.project_name.lower() + return key + key = property(key) + + #@property + def parsed_version(self): + try: + return self._parsed_version + except AttributeError: + self._parsed_version = pv = parse_version(self.version) + return pv + + parsed_version = property(parsed_version) + + #@property + def version(self): + try: + return self._version + except AttributeError: + for line in self._get_metadata(self.PKG_INFO): + if line.lower().startswith('version:'): + self._version = safe_version(line.split(':',1)[1].strip()) + return self._version + else: + raise ValueError( + "Missing 'Version:' header and/or %s file" % self.PKG_INFO, self + ) + version = property(version) + + + + + #@property + def _dep_map(self): + try: + return self.__dep_map + except AttributeError: + dm = self.__dep_map = {None: []} + for name in 'requires.txt', 'depends.txt': + for extra,reqs in split_sections(self._get_metadata(name)): + if extra: extra = safe_extra(extra) + dm.setdefault(extra,[]).extend(parse_requirements(reqs)) + return dm + _dep_map = property(_dep_map) + + def requires(self,extras=()): + """List of Requirements needed for this distro if `extras` are used""" + dm = self._dep_map + deps = [] + deps.extend(dm.get(None,())) + for ext in extras: + try: + deps.extend(dm[safe_extra(ext)]) + except KeyError: + raise UnknownExtra( + "%s has no such extra feature %r" % (self, ext) + ) + return deps + + def _get_metadata(self,name): + if self.has_metadata(name): + for line in self.get_metadata_lines(name): + yield line + + def activate(self,path=None): + """Ensure distribution is importable on `path` (default=sys.path)""" + if path is None: path = sys.path + self.insert_on(path) + if path is sys.path: + fixup_namespace_packages(self.location) + map(declare_namespace, self._get_metadata('namespace_packages.txt')) + + + def egg_name(self): + """Return what this distribution's standard .egg filename should be""" + filename = "%s-%s-py%s" % ( + to_filename(self.project_name), to_filename(self.version), + self.py_version or PY_MAJOR + ) + + if self.platform: + filename += '-'+self.platform + return filename + + def __repr__(self): + if self.location: + return "%s (%s)" % (self,self.location) + else: + return str(self) + + def __str__(self): + try: version = getattr(self,'version',None) + except ValueError: version = None + version = version or "[unknown version]" + return "%s %s" % (self.project_name,version) + + def __getattr__(self,attr): + """Delegate all unrecognized public attributes to .metadata provider""" + if attr.startswith('_'): + raise AttributeError,attr + return getattr(self._provider, attr) + + #@classmethod + def from_filename(cls,filename,metadata=None, **kw): + return cls.from_location( + _normalize_cached(filename), os.path.basename(filename), metadata, + **kw + ) + from_filename = classmethod(from_filename) + + def as_requirement(self): + """Return a ``Requirement`` that matches this distribution exactly""" + return Requirement.parse('%s==%s' % (self.project_name, self.version)) + + def load_entry_point(self, group, name): + """Return the `name` entry point of `group` or raise ImportError""" + ep = self.get_entry_info(group,name) + if ep is None: + raise ImportError("Entry point %r not found" % ((group,name),)) + return ep.load() + + def get_entry_map(self, group=None): + """Return the entry point map for `group`, or the full entry map""" + try: + ep_map = self._ep_map + except AttributeError: + ep_map = self._ep_map = EntryPoint.parse_map( + self._get_metadata('entry_points.txt'), self + ) + if group is not None: + return ep_map.get(group,{}) + return ep_map + + def get_entry_info(self, group, name): + """Return the EntryPoint object for `group`+`name`, or ``None``""" + return self.get_entry_map(group).get(name) + + + + + + + + + + + + + + + + + + + + def insert_on(self, path, loc = None): + """Insert self.location in path before its nearest parent directory""" + + loc = loc or self.location + + if self.project_name == 'setuptools': + try: + version = self.version + except ValueError: + version = '' + if '0.7' in version: + raise ValueError( + "A 0.7-series setuptools cannot be installed " + "with distribute. Found one at %s" % str(self.location)) + + if not loc: + return + + if path is sys.path: + self.check_version_conflict() + + nloc = _normalize_cached(loc) + bdir = os.path.dirname(nloc) + npath= map(_normalize_cached, path) + + bp = None + for p, item in enumerate(npath): + if item==nloc: + break + elif item==bdir and self.precedence==EGG_DIST: + # if it's an .egg, give it precedence over its directory + path.insert(p, loc) + npath.insert(p, nloc) + break + else: + path.append(loc) + return + + # p is the spot where we found or inserted loc; now remove duplicates + while 1: + try: + np = npath.index(nloc, p+1) + except ValueError: + break + else: + del npath[np], path[np] + p = np # ha! + + return + + + + def check_version_conflict(self): + if self.key=='distribute': + return # ignore the inevitable setuptools self-conflicts :( + + nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt')) + loc = normalize_path(self.location) + for modname in self._get_metadata('top_level.txt'): + if (modname not in sys.modules or modname in nsp + or modname in _namespace_packages + ): + continue + if modname in ('pkg_resources', 'setuptools', 'site'): + continue + fn = getattr(sys.modules[modname], '__file__', None) + if fn and (normalize_path(fn).startswith(loc) or + fn.startswith(self.location)): + continue + issue_warning( + "Module %s was already imported from %s, but %s is being added" + " to sys.path" % (modname, fn, self.location), + ) + + def has_version(self): + try: + self.version + except ValueError: + issue_warning("Unbuilt egg for "+repr(self)) + return False + return True + + def clone(self,**kw): + """Copy this distribution, substituting in any changed keyword args""" + for attr in ( + 'project_name', 'version', 'py_version', 'platform', 'location', + 'precedence' + ): + kw.setdefault(attr, getattr(self,attr,None)) + kw.setdefault('metadata', self._provider) + return self.__class__(**kw) + + + + + #@property + def extras(self): + return [dep for dep in self._dep_map if dep] + extras = property(extras) + + +class DistInfoDistribution(Distribution): + """Wrap an actual or potential sys.path entry w/metadata, .dist-info style""" + PKG_INFO = 'METADATA' + EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])") + + @property + def _parsed_pkg_info(self): + """Parse and cache metadata""" + try: + return self._pkg_info + except AttributeError: + from email.parser import Parser + self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO)) + return self._pkg_info + + @property + def _dep_map(self): + try: + return self.__dep_map + except AttributeError: + self.__dep_map = self._compute_dependencies() + return self.__dep_map + + def _preparse_requirement(self, requires_dist): + """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz') + Split environment marker, add == prefix to version specifiers as + necessary, and remove parenthesis. + """ + parts = requires_dist.split(';', 1) + [''] + distvers = parts[0].strip() + mark = parts[1].strip() + distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers) + distvers = distvers.replace('(', '').replace(')', '') + return (distvers, mark) + + def _compute_dependencies(self): + """Recompute this distribution's dependencies.""" + def dummy_marker(marker): + def marker_fn(environment=None, override=None): + return True + marker_fn.__doc__ = marker + return marker_fn + try: + from markerlib import as_function + except ImportError: + as_function = dummy_marker + dm = self.__dep_map = {None: []} + + reqs = [] + # Including any condition expressions + for req in self._parsed_pkg_info.get_all('Requires-Dist') or []: + distvers, mark = self._preparse_requirement(req) + parsed = parse_requirements(distvers).next() + parsed.marker_fn = as_function(mark) + reqs.append(parsed) + + def reqs_for_extra(extra): + for req in reqs: + if req.marker_fn(override={'extra':extra}): + yield req + + common = set(reqs_for_extra(None)) + dm[None].extend(common) + + for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []: + extra = safe_extra(extra.strip()) + dm[extra] = list(set(reqs_for_extra(extra)) - common) + + return dm + + +_distributionImpl = {'.egg': Distribution, + '.egg-info': Distribution, + '.dist-info': DistInfoDistribution } + + +def issue_warning(*args,**kw): + level = 1 + g = globals() + try: + # find the first stack frame that is *not* code in + # the pkg_resources module, to use for the warning + while sys._getframe(level).f_globals is g: + level += 1 + except ValueError: + pass + from warnings import warn + warn(stacklevel = level+1, *args, **kw) + + + + + + + + + + + + + + + + + + + + + + + +def parse_requirements(strs): + """Yield ``Requirement`` objects for each specification in `strs` + + `strs` must be an instance of ``basestring``, or a (possibly-nested) + iterable thereof. + """ + # create a steppable iterator, so we can handle \-continuations + lines = iter(yield_lines(strs)) + + def scan_list(ITEM,TERMINATOR,line,p,groups,item_name): + + items = [] + + while not TERMINATOR(line,p): + if CONTINUE(line,p): + try: + line = lines.next(); p = 0 + except StopIteration: + raise ValueError( + "\\ must not appear on the last nonblank line" + ) + + match = ITEM(line,p) + if not match: + raise ValueError("Expected "+item_name+" in",line,"at",line[p:]) + + items.append(match.group(*groups)) + p = match.end() + + match = COMMA(line,p) + if match: + p = match.end() # skip the comma + elif not TERMINATOR(line,p): + raise ValueError( + "Expected ',' or end-of-list in",line,"at",line[p:] + ) + + match = TERMINATOR(line,p) + if match: p = match.end() # skip the terminator, if any + return line, p, items + + for line in lines: + match = DISTRO(line) + if not match: + raise ValueError("Missing distribution spec", line) + project_name = match.group(1) + p = match.end() + extras = [] + + match = OBRACKET(line,p) + if match: + p = match.end() + line, p, extras = scan_list( + DISTRO, CBRACKET, line, p, (1,), "'extra' name" + ) + + line, p, specs = scan_list(VERSION,LINE_END,line,p,(1,2),"version spec") + specs = [(op,safe_version(val)) for op,val in specs] + yield Requirement(project_name, specs, extras) + + +def _sort_dists(dists): + tmp = [(dist.hashcmp,dist) for dist in dists] + tmp.sort() + dists[::-1] = [d for hc,d in tmp] + + + + + + + + + + + + + + + + + +class Requirement: + def __init__(self, project_name, specs, extras): + """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!""" + self.unsafe_name, project_name = project_name, safe_name(project_name) + self.project_name, self.key = project_name, project_name.lower() + index = [(parse_version(v),state_machine[op],op,v) for op,v in specs] + index.sort() + self.specs = [(op,ver) for parsed,trans,op,ver in index] + self.index, self.extras = index, tuple(map(safe_extra,extras)) + self.hashCmp = ( + self.key, tuple([(op,parsed) for parsed,trans,op,ver in index]), + frozenset(self.extras) + ) + self.__hash = hash(self.hashCmp) + + def __str__(self): + specs = ','.join([''.join(s) for s in self.specs]) + extras = ','.join(self.extras) + if extras: extras = '[%s]' % extras + return '%s%s%s' % (self.project_name, extras, specs) + + def __eq__(self,other): + return isinstance(other,Requirement) and self.hashCmp==other.hashCmp + + def __contains__(self,item): + if isinstance(item,Distribution): + if item.key <> self.key: return False + if self.index: item = item.parsed_version # only get if we need it + elif isinstance(item,basestring): + item = parse_version(item) + last = None + compare = lambda a, b: (a > b) - (a < b) # -1, 0, 1 + for parsed,trans,op,ver in self.index: + action = trans[compare(item,parsed)] # Indexing: 0, 1, -1 + if action=='F': return False + elif action=='T': return True + elif action=='+': last = True + elif action=='-' or last is None: last = False + if last is None: last = True # no rules encountered + return last + + + def __hash__(self): + return self.__hash + + def __repr__(self): return "Requirement.parse(%r)" % str(self) + + #@staticmethod + def parse(s, replacement=True): + reqs = list(parse_requirements(s)) + if reqs: + if len(reqs) == 1: + founded_req = reqs[0] + # if asked for setuptools distribution + # and if distribute is installed, we want to give + # distribute instead + if _override_setuptools(founded_req) and replacement: + distribute = list(parse_requirements('distribute')) + if len(distribute) == 1: + return distribute[0] + return founded_req + else: + return founded_req + + raise ValueError("Expected only one requirement", s) + raise ValueError("No requirements found", s) + + parse = staticmethod(parse) + +state_machine = { + # =>< + '<' : '--T', + '<=': 'T-T', + '>' : 'F+F', + '>=': 'T+F', + '==': 'T..', + '!=': 'F++', +} + + +def _override_setuptools(req): + """Return True when distribute wants to override a setuptools dependency. + + We want to override when the requirement is setuptools and the version is + a variant of 0.6. + + """ + if req.project_name == 'setuptools': + if not len(req.specs): + # Just setuptools: ok + return True + for comparator, version in req.specs: + if comparator in ['==', '>=', '>']: + if '0.7' in version: + # We want some setuptools not from the 0.6 series. + return False + return True + return False + + +def _get_mro(cls): + """Get an mro for a type or classic class""" + if not isinstance(cls,type): + class cls(cls,object): pass + return cls.__mro__[1:] + return cls.__mro__ + +def _find_adapter(registry, ob): + """Return an adapter factory for `ob` from `registry`""" + for t in _get_mro(getattr(ob, '__class__', type(ob))): + if t in registry: + return registry[t] + + +def ensure_directory(path): + """Ensure that the parent directory of `path` exists""" + dirname = os.path.dirname(path) + if not os.path.isdir(dirname): + os.makedirs(dirname) + +def split_sections(s): + """Split a string or iterable thereof into (section,content) pairs + + Each ``section`` is a stripped version of the section header ("[section]") + and each ``content`` is a list of stripped lines excluding blank lines and + comment-only lines. If there are any such lines before the first section + header, they're returned in a first ``section`` of ``None``. + """ + section = None + content = [] + for line in yield_lines(s): + if line.startswith("["): + if line.endswith("]"): + if section or content: + yield section, content + section = line[1:-1].strip() + content = [] + else: + raise ValueError("Invalid section heading", line) + else: + content.append(line) + + # wrap up last segment + yield section, content + +def _mkstemp(*args,**kw): + from tempfile import mkstemp + old_open = os.open + try: + os.open = os_open # temporarily bypass sandboxing + return mkstemp(*args,**kw) + finally: + os.open = old_open # and then put it back + + +# Set up global resource manager (deliberately not state-saved) +_manager = ResourceManager() +def _initialize(g): + for name in dir(_manager): + if not name.startswith('_'): + g[name] = getattr(_manager, name) +_initialize(globals()) + +# Prepare the master working set and make the ``require()`` API available +_declare_state('object', working_set = WorkingSet()) + +try: + # Does the main program list any requirements? + from __main__ import __requires__ +except ImportError: + pass # No: just use the default working set based on sys.path +else: + # Yes: ensure the requirements are met, by prefixing sys.path if necessary + try: + working_set.require(__requires__) + except VersionConflict: # try it without defaults already on sys.path + working_set = WorkingSet([]) # by starting with an empty path + for dist in working_set.resolve( + parse_requirements(__requires__), Environment() + ): + working_set.add(dist) + for entry in sys.path: # add any missing entries from sys.path + if entry not in working_set.entries: + working_set.add_entry(entry) + sys.path[:] = working_set.entries # then copy back to sys.path + +require = working_set.require +iter_entry_points = working_set.iter_entry_points +add_activation_listener = working_set.subscribe +run_script = working_set.run_script +run_main = run_script # backward compatibility +# Activate all distributions already on sys.path, and ensure that +# all distributions added to the working set in the future (e.g. by +# calling ``require()``) will get activated as well. +add_activation_listener(lambda dist: dist.activate()) +working_set.entries=[]; map(working_set.add_entry,sys.path) # match order + diff --git a/lib3/pkg_resources.py b/lib3/pkg_resources.py new file mode 100644 --- /dev/null +++ b/lib3/pkg_resources.py @@ -0,0 +1,2838 @@ +"""Package resource API +-------------------- + +A resource is a logical file contained within a package, or a logical +subdirectory thereof. The package resource API expects resource names +to have their path parts separated with ``/``, *not* whatever the local +path separator is. Do not use os.path operations to manipulate resource +names being passed into the API. + +The package resource API is designed to work with normal filesystem packages, +.egg files, and unpacked .egg files. It can also work in a limited way with +.zip files and with custom PEP 302 loaders that support the ``get_data()`` +method. +""" + +import sys, os, zipimport, time, re, imp, types +from urllib.parse import urlparse, urlunparse + +try: + frozenset +except NameError: + from sets import ImmutableSet as frozenset + +# capture these to bypass sandboxing +from os import utime +try: + from os import mkdir, rename, unlink + WRITE_SUPPORT = True +except ImportError: + # no write support, probably under GAE + WRITE_SUPPORT = False + +from os import open as os_open +from os.path import isdir, split + +# This marker is used to simplify the process that checks is the +# setuptools package was installed by the Setuptools project +# or by the Distribute project, in case Setuptools creates +# a distribution with the same version. +# +# The bootstrapping script for instance, will check if this +# attribute is present to decide wether to reinstall the package +_distribute = True + +def _bypass_ensure_directory(name, mode=0o777): + # Sandbox-bypassing version of ensure_directory() + if not WRITE_SUPPORT: + raise IOError('"os.mkdir" not supported on this platform.') + dirname, filename = split(name) + if dirname and filename and not isdir(dirname): + _bypass_ensure_directory(dirname) + mkdir(dirname, mode) + + +_state_vars = {} + +def _declare_state(vartype, **kw): + g = globals() + for name, val in kw.items(): + g[name] = val + _state_vars[name] = vartype + +def __getstate__(): + state = {} + g = globals() + for k, v in _state_vars.items(): + state[k] = g['_sget_'+v](g[k]) + return state + +def __setstate__(state): + g = globals() + for k, v in state.items(): + g['_sset_'+_state_vars[k]](k, g[k], v) + return state + +def _sget_dict(val): + return val.copy() + +def _sset_dict(key, ob, state): + ob.clear() + ob.update(state) + +def _sget_object(val): + return val.__getstate__() + +def _sset_object(key, ob, state): + ob.__setstate__(state) + +_sget_none = _sset_none = lambda *args: None + + + +def get_supported_platform(): + """Return this platform's maximum compatible version. + + distutils.util.get_platform() normally reports the minimum version + of Mac OS X that would be required to *use* extensions produced by + distutils. But what we want when checking compatibility is to know the + version of Mac OS X that we are *running*. To allow usage of packages that + explicitly require a newer version of Mac OS X, we must also know the + current version of the OS. + + If this condition occurs for any other platform with a version in its + platform strings, this function should be extended accordingly. + """ + plat = get_build_platform(); m = macosVersionString.match(plat) + if m is not None and sys.platform == "darwin": + try: + plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3)) + except ValueError: + pass # not Mac OS X + return plat + + + + + + + + + + + + + + + + + + + + + +__all__ = [ + # Basic resource access and distribution/entry point discovery + 'require', 'run_script', 'get_provider', 'get_distribution', + 'load_entry_point', 'get_entry_map', 'get_entry_info', 'iter_entry_points', + 'resource_string', 'resource_stream', 'resource_filename', + 'resource_listdir', 'resource_exists', 'resource_isdir', + + # Environmental control + 'declare_namespace', 'working_set', 'add_activation_listener', + 'find_distributions', 'set_extraction_path', 'cleanup_resources', + 'get_default_cache', + + # Primary implementation classes + 'Environment', 'WorkingSet', 'ResourceManager', + 'Distribution', 'Requirement', 'EntryPoint', + + # Exceptions + 'ResolutionError','VersionConflict','DistributionNotFound','UnknownExtra', + 'ExtractionError', + + # Parsing functions and string utilities + 'parse_requirements', 'parse_version', 'safe_name', 'safe_version', + 'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections', + 'safe_extra', 'to_filename', + + # filesystem utilities + 'ensure_directory', 'normalize_path', + + # Distribution "precedence" constants + 'EGG_DIST', 'BINARY_DIST', 'SOURCE_DIST', 'CHECKOUT_DIST', 'DEVELOP_DIST', + + # "Provider" interfaces, implementations, and registration/lookup APIs + 'IMetadataProvider', 'IResourceProvider', 'FileMetadata', + 'PathMetadata', 'EggMetadata', 'EmptyProvider', 'empty_provider', + 'NullProvider', 'EggProvider', 'DefaultProvider', 'ZipProvider', + 'register_finder', 'register_namespace_handler', 'register_loader_type', + 'fixup_namespace_packages', 'get_importer', + + # Deprecated/backward compatibility only + 'run_main', 'AvailableDistributions', +] +class ResolutionError(Exception): + """Abstract base for dependency resolution errors""" + def __repr__(self): + return self.__class__.__name__+repr(self.args) + +class VersionConflict(ResolutionError): + """An already-installed version conflicts with the requested version""" + +class DistributionNotFound(ResolutionError): + """A requested distribution was not found""" + +class UnknownExtra(ResolutionError): + """Distribution doesn't have an "extra feature" of the given name""" +_provider_factories = {} + +PY_MAJOR = sys.version[:3] +EGG_DIST = 3 +BINARY_DIST = 2 +SOURCE_DIST = 1 +CHECKOUT_DIST = 0 +DEVELOP_DIST = -1 + +def register_loader_type(loader_type, provider_factory): + """Register `provider_factory` to make providers for `loader_type` + + `loader_type` is the type or class of a PEP 302 ``module.__loader__``, + and `provider_factory` is a function that, passed a *module* object, + returns an ``IResourceProvider`` for that module. + """ + _provider_factories[loader_type] = provider_factory + +def get_provider(moduleOrReq): + """Return an IResourceProvider for the named module or requirement""" + if isinstance(moduleOrReq,Requirement): + return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0] + try: + module = sys.modules[moduleOrReq] + except KeyError: + __import__(moduleOrReq) + module = sys.modules[moduleOrReq] + loader = getattr(module, '__loader__', None) + return _find_adapter(_provider_factories, loader)(module) + +def _macosx_vers(_cache=[]): + if not _cache: + import platform + version = platform.mac_ver()[0] + # fallback for MacPorts + if version == '': + import plistlib + plist = '/System/Library/CoreServices/SystemVersion.plist' + if os.path.exists(plist): + if hasattr(plistlib, 'readPlist'): + plist_content = plistlib.readPlist(plist) + if 'ProductVersion' in plist_content: + version = plist_content['ProductVersion'] + + _cache.append(version.split('.')) + return _cache[0] + +def _macosx_arch(machine): + return {'PowerPC':'ppc', 'Power_Macintosh':'ppc'}.get(machine,machine) + +def get_build_platform(): + """Return this platform's string for platform-specific distributions + + XXX Currently this is the same as ``distutils.util.get_platform()``, but it + needs some hacks for Linux and Mac OS X. + """ + try: + from distutils.util import get_platform + except ImportError: + from sysconfig import get_platform + + plat = get_platform() + if sys.platform == "darwin" and not plat.startswith('macosx-'): + try: + version = _macosx_vers() + machine = os.uname()[4].replace(" ", "_") + return "macosx-%d.%d-%s" % (int(version[0]), int(version[1]), + _macosx_arch(machine)) + except ValueError: + # if someone is running a non-Mac darwin system, this will fall + # through to the default implementation + pass + return plat + +macosVersionString = re.compile(r"macosx-(\d+)\.(\d+)-(.*)") +darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)") +get_platform = get_build_platform # XXX backward compat + +def compatible_platforms(provided,required): + """Can code for the `provided` platform run on the `required` platform? + + Returns true if either platform is ``None``, or the platforms are equal. + + XXX Needs compatibility checks for Linux and other unixy OSes. + """ + if provided is None or required is None or provided==required: + return True # easy case + + # Mac OS X special cases + reqMac = macosVersionString.match(required) + if reqMac: + provMac = macosVersionString.match(provided) + + # is this a Mac package? + if not provMac: + # this is backwards compatibility for packages built before + # setuptools 0.6. All packages built after this point will + # use the new macosx designation. + provDarwin = darwinVersionString.match(provided) + if provDarwin: + dversion = int(provDarwin.group(1)) + macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2)) + if dversion == 7 and macosversion >= "10.3" or \ + dversion == 8 and macosversion >= "10.4": + + #import warnings + #warnings.warn("Mac eggs should be rebuilt to " + # "use the macosx designation instead of darwin.", + # category=DeprecationWarning) + return True + return False # egg isn't macosx or legacy darwin + + # are they the same major version and machine type? + if provMac.group(1) != reqMac.group(1) or \ + provMac.group(3) != reqMac.group(3): + return False + + + + # is the required OS major update >= the provided one? + if int(provMac.group(2)) > int(reqMac.group(2)): + return False + + return True + + # XXX Linux and other platforms' special cases should go here + return False + + +def run_script(dist_spec, script_name): + """Locate distribution `dist_spec` and run its `script_name` script""" + ns = sys._getframe(1).f_globals + name = ns['__name__'] + ns.clear() + ns['__name__'] = name + require(dist_spec)[0].run_script(script_name, ns) + +run_main = run_script # backward compatibility + +def get_distribution(dist): + """Return a current distribution object for a Requirement or string""" + if isinstance(dist,str): dist = Requirement.parse(dist) + if isinstance(dist,Requirement): dist = get_provider(dist) + if not isinstance(dist,Distribution): + raise TypeError("Expected string, Requirement, or Distribution", dist) + return dist + +def load_entry_point(dist, group, name): + """Return `name` entry point of `group` for `dist` or raise ImportError""" + return get_distribution(dist).load_entry_point(group, name) + +def get_entry_map(dist, group=None): + """Return the entry point map for `group`, or the full entry map""" + return get_distribution(dist).get_entry_map(group) + +def get_entry_info(dist, group, name): + """Return the EntryPoint object for `group`+`name`, or ``None``""" + return get_distribution(dist).get_entry_info(group, name) + + +class IMetadataProvider: + + def has_metadata(name): + """Does the package's distribution contain the named metadata?""" + + def get_metadata(name): + """The named metadata resource as a string""" + + def get_metadata_lines(name): + """Yield named metadata resource as list of non-blank non-comment lines + + Leading and trailing whitespace is stripped from each line, and lines + with ``#`` as the first non-blank character are omitted.""" + + def metadata_isdir(name): + """Is the named metadata a directory? (like ``os.path.isdir()``)""" + + def metadata_listdir(name): + """List of metadata names in the directory (like ``os.listdir()``)""" + + def run_script(script_name, namespace): + """Execute the named script in the supplied namespace dictionary""" + + + + + + + + + + +class IResourceProvider(IMetadataProvider): + """An object that provides access to package resources""" + + def get_resource_filename(manager, resource_name): + """Return a true filesystem path for `resource_name` + + `manager` must be an ``IResourceManager``""" + + def get_resource_stream(manager, resource_name): + """Return a readable file-like object for `resource_name` + + `manager` must be an ``IResourceManager``""" + + def get_resource_string(manager, resource_name): + """Return a string containing the contents of `resource_name` + + `manager` must be an ``IResourceManager``""" + + def has_resource(resource_name): + """Does the package contain the named resource?""" + + def resource_isdir(resource_name): + """Is the named resource a directory? (like ``os.path.isdir()``)""" + + def resource_listdir(resource_name): + """List of resource names in the directory (like ``os.listdir()``)""" + + + + + + + + + + + + + + + +class WorkingSet(object): + """A collection of active distributions on sys.path (or a similar list)""" + + def __init__(self, entries=None): + """Create working set from list of path entries (default=sys.path)""" + self.entries = [] + self.entry_keys = {} + self.by_key = {} + self.callbacks = [] + + if entries is None: + entries = sys.path + + for entry in entries: + self.add_entry(entry) + + + def add_entry(self, entry): + """Add a path item to ``.entries``, finding any distributions on it + + ``find_distributions(entry,True)`` is used to find distributions + corresponding to the path entry, and they are added. `entry` is + always appended to ``.entries``, even if it is already present. + (This is because ``sys.path`` can contain the same value more than + once, and the ``.entries`` of the ``sys.path`` WorkingSet should always + equal ``sys.path``.) + """ + self.entry_keys.setdefault(entry, []) + self.entries.append(entry) + for dist in find_distributions(entry, True): + self.add(dist, entry, False) + + + def __contains__(self,dist): + """True if `dist` is the active distribution for its project""" + return self.by_key.get(dist.key) == dist + + + + + + def find(self, req): + """Find a distribution matching requirement `req` + + If there is an active distribution for the requested project, this + returns it as long as it meets the version requirement specified by + `req`. But, if there is an active distribution for the project and it + does *not* meet the `req` requirement, ``VersionConflict`` is raised. + If there is no active distribution for the requested project, ``None`` + is returned. + """ + dist = self.by_key.get(req.key) + if dist is not None and dist not in req: + raise VersionConflict(dist,req) # XXX add more info + else: + return dist + + def iter_entry_points(self, group, name=None): + """Yield entry point objects from `group` matching `name` + + If `name` is None, yields all entry points in `group` from all + distributions in the working set, otherwise only ones matching + both `group` and `name` are yielded (in distribution order). + """ + for dist in self: + entries = dist.get_entry_map(group) + if name is None: + for ep in list(entries.values()): + yield ep + elif name in entries: + yield entries[name] + + def run_script(self, requires, script_name): + """Locate distribution for `requires` and run `script_name` script""" + ns = sys._getframe(1).f_globals + name = ns['__name__'] + ns.clear() + ns['__name__'] = name + self.require(requires)[0].run_script(script_name, ns) + + + + def __iter__(self): + """Yield distributions for non-duplicate projects in the working set + + The yield order is the order in which the items' path entries were + added to the working set. + """ + seen = {} + for item in self.entries: + if item not in self.entry_keys: + # workaround a cache issue + continue + + for key in self.entry_keys[item]: + if key not in seen: + seen[key]=1 + yield self.by_key[key] + + def add(self, dist, entry=None, insert=True): + """Add `dist` to working set, associated with `entry` + + If `entry` is unspecified, it defaults to the ``.location`` of `dist`. + On exit from this routine, `entry` is added to the end of the working + set's ``.entries`` (if it wasn't already present). + + `dist` is only added to the working set if it's for a project that + doesn't already have a distribution in the set. If it's added, any + callbacks registered with the ``subscribe()`` method will be called. + """ + if insert: + dist.insert_on(self.entries, entry) + + if entry is None: + entry = dist.location + keys = self.entry_keys.setdefault(entry,[]) + keys2 = self.entry_keys.setdefault(dist.location,[]) + if dist.key in self.by_key: + return # ignore hidden distros + + self.by_key[dist.key] = dist + if dist.key not in keys: + keys.append(dist.key) + if dist.key not in keys2: + keys2.append(dist.key) + self._added_new(dist) + + def resolve(self, requirements, env=None, installer=None, replacement=True): + """List all distributions needed to (recursively) meet `requirements` + + `requirements` must be a sequence of ``Requirement`` objects. `env`, + if supplied, should be an ``Environment`` instance. If + not supplied, it defaults to all distributions available within any + entry or distribution in the working set. `installer`, if supplied, + will be invoked with each requirement that cannot be met by an + already-installed distribution; it should return a ``Distribution`` or + ``None``. + """ + + requirements = list(requirements)[::-1] # set up the stack + processed = {} # set of processed requirements + best = {} # key -> dist + to_activate = [] + + while requirements: + req = requirements.pop(0) # process dependencies breadth-first + if _override_setuptools(req) and replacement: + req = Requirement.parse('distribute') + + if req in processed: + # Ignore cyclic or redundant dependencies + continue + dist = best.get(req.key) + if dist is None: + # Find the best distribution and add it to the map + dist = self.by_key.get(req.key) + if dist is None: + if env is None: + env = Environment(self.entries) + dist = best[req.key] = env.best_match(req, self, installer) + if dist is None: + #msg = ("The '%s' distribution was not found on this " + # "system, and is required by this application.") + #raise DistributionNotFound(msg % req) + + # unfortunately, zc.buildout uses a str(err) + # to get the name of the distribution here.. + raise DistributionNotFound(req) + to_activate.append(dist) + if dist not in req: + # Oops, the "best" so far conflicts with a dependency + raise VersionConflict(dist,req) # XXX put more info here + requirements.extend(dist.requires(req.extras)[::-1]) + processed[req] = True + + return to_activate # return list of distros to activate + + def find_plugins(self, + plugin_env, full_env=None, installer=None, fallback=True + ): + """Find all activatable distributions in `plugin_env` + + Example usage:: + + distributions, errors = working_set.find_plugins( + Environment(plugin_dirlist) + ) + map(working_set.add, distributions) # add plugins+libs to sys.path + print 'Could not load', errors # display errors + + The `plugin_env` should be an ``Environment`` instance that contains + only distributions that are in the project's "plugin directory" or + directories. The `full_env`, if supplied, should be an ``Environment`` + contains all currently-available distributions. If `full_env` is not + supplied, one is created automatically from the ``WorkingSet`` this + method is called on, which will typically mean that every directory on + ``sys.path`` will be scanned for distributions. + + `installer` is a standard installer callback as used by the + ``resolve()`` method. The `fallback` flag indicates whether we should + attempt to resolve older versions of a plugin if the newest version + cannot be resolved. + + This method returns a 2-tuple: (`distributions`, `error_info`), where + `distributions` is a list of the distributions found in `plugin_env` + that were loadable, along with any other distributions that are needed + to resolve their dependencies. `error_info` is a dictionary mapping + unloadable plugin distributions to an exception instance describing the + error that occurred. Usually this will be a ``DistributionNotFound`` or + ``VersionConflict`` instance. + """ + + plugin_projects = list(plugin_env) + plugin_projects.sort() # scan project names in alphabetic order + + error_info = {} + distributions = {} + + if full_env is None: + env = Environment(self.entries) + env += plugin_env + else: + env = full_env + plugin_env + + shadow_set = self.__class__([]) + list(map(shadow_set.add, self)) # put all our entries in shadow_set + + for project_name in plugin_projects: + + for dist in plugin_env[project_name]: + + req = [dist.as_requirement()] + + try: + resolvees = shadow_set.resolve(req, env, installer) + + except ResolutionError as v: + error_info[dist] = v # save error info + if fallback: + continue # try the next older version of project + else: + break # give up on this project, keep going + + else: + list(map(shadow_set.add, resolvees)) + distributions.update(dict.fromkeys(resolvees)) + + # success, no need to try any more versions of this project + break + + distributions = list(distributions) + distributions.sort() + + return distributions, error_info + + + + + + def require(self, *requirements): + """Ensure that distributions matching `requirements` are activated + + `requirements` must be a string or a (possibly-nested) sequence + thereof, specifying the distributions and versions required. The + return value is a sequence of the distributions that needed to be + activated to fulfill the requirements; all relevant distributions are + included, even if they were already activated in this working set. + """ + + needed = self.resolve(parse_requirements(requirements)) + + for dist in needed: + self.add(dist) + + return needed + + + def subscribe(self, callback): + """Invoke `callback` for all distributions (including existing ones)""" + if callback in self.callbacks: + return + self.callbacks.append(callback) + for dist in self: + callback(dist) + + + def _added_new(self, dist): + for callback in self.callbacks: + callback(dist) + + def __getstate__(self): + return (self.entries[:], self.entry_keys.copy(), self.by_key.copy(), + self.callbacks[:]) + + def __setstate__(self, xxx_todo_changeme): + (entries, keys, by_key, callbacks) = xxx_todo_changeme + self.entries = entries[:] + self.entry_keys = keys.copy() + self.by_key = by_key.copy() + self.callbacks = callbacks[:] + + + + +class Environment(object): + """Searchable snapshot of distributions on a search path""" + + def __init__(self, search_path=None, platform=get_supported_platform(), python=PY_MAJOR): + """Snapshot distributions available on a search path + + Any distributions found on `search_path` are added to the environment. + `search_path` should be a sequence of ``sys.path`` items. If not + supplied, ``sys.path`` is used. + + `platform` is an optional string specifying the name of the platform + that platform-specific distributions must be compatible with. If + unspecified, it defaults to the current platform. `python` is an + optional string naming the desired version of Python (e.g. ``'2.4'``); + it defaults to the current version. + + You may explicitly set `platform` (and/or `python`) to ``None`` if you + wish to map *all* distributions, not just those compatible with the + running platform or Python version. + """ + self._distmap = {} + self._cache = {} + self.platform = platform + self.python = python + self.scan(search_path) + + def can_add(self, dist): + """Is distribution `dist` acceptable for this environment? + + The distribution must match the platform and python version + requirements specified when this environment was created, or False + is returned. + """ + return (self.python is None or dist.py_version is None + or dist.py_version==self.python) \ + and compatible_platforms(dist.platform,self.platform) + + def remove(self, dist): + """Remove `dist` from the environment""" + self._distmap[dist.key].remove(dist) + + def scan(self, search_path=None): + """Scan `search_path` for distributions usable in this environment + + Any distributions found are added to the environment. + `search_path` should be a sequence of ``sys.path`` items. If not + supplied, ``sys.path`` is used. Only distributions conforming to + the platform/python version defined at initialization are added. + """ + if search_path is None: + search_path = sys.path + + for item in search_path: + for dist in find_distributions(item): + self.add(dist) + + def __getitem__(self,project_name): + """Return a newest-to-oldest list of distributions for `project_name` + """ + try: + return self._cache[project_name] + except KeyError: + project_name = project_name.lower() + if project_name not in self._distmap: + return [] + + if project_name not in self._cache: + dists = self._cache[project_name] = self._distmap[project_name] + _sort_dists(dists) + + return self._cache[project_name] + + def add(self,dist): + """Add `dist` if we ``can_add()`` it and it isn't already added""" + if self.can_add(dist) and dist.has_version(): + dists = self._distmap.setdefault(dist.key,[]) + if dist not in dists: + dists.append(dist) + if dist.key in self._cache: + _sort_dists(self._cache[dist.key]) + + + def best_match(self, req, working_set, installer=None): + """Find distribution best matching `req` and usable on `working_set` + + This calls the ``find(req)`` method of the `working_set` to see if a + suitable distribution is already active. (This may raise + ``VersionConflict`` if an unsuitable version of the project is already + active in the specified `working_set`.) If a suitable distribution + isn't active, this method returns the newest distribution in the + environment that meets the ``Requirement`` in `req`. If no suitable + distribution is found, and `installer` is supplied, then the result of + calling the environment's ``obtain(req, installer)`` method will be + returned. + """ + dist = working_set.find(req) + if dist is not None: + return dist + for dist in self[req.key]: + if dist in req: + return dist + return self.obtain(req, installer) # try and download/install + + def obtain(self, requirement, installer=None): + """Obtain a distribution matching `requirement` (e.g. via download) + + Obtain a distro that matches requirement (e.g. via download). In the + base ``Environment`` class, this routine just returns + ``installer(requirement)``, unless `installer` is None, in which case + None is returned instead. This method is a hook that allows subclasses + to attempt other ways of obtaining a distribution before falling back + to the `installer` argument.""" + if installer is not None: + return installer(requirement) + + def __iter__(self): + """Yield the unique project names of the available distributions""" + for key in list(self._distmap.keys()): + if self[key]: yield key + + + + + def __iadd__(self, other): + """In-place addition of a distribution or environment""" + if isinstance(other,Distribution): + self.add(other) + elif isinstance(other,Environment): + for project in other: + for dist in other[project]: + self.add(dist) + else: + raise TypeError("Can't add %r to environment" % (other,)) + return self + + def __add__(self, other): + """Add an environment or distribution to an environment""" + new = self.__class__([], platform=None, python=None) + for env in self, other: + new += env + return new + + +AvailableDistributions = Environment # XXX backward compatibility + + +class ExtractionError(RuntimeError): + """An error occurred extracting a resource + + The following attributes are available from instances of this exception: + + manager + The resource manager that raised this exception + + cache_path + The base directory for resource extraction + + original_error + The exception instance that caused extraction to fail + """ + + + + +class ResourceManager: + """Manage resource extraction and packages""" + extraction_path = None + + def __init__(self): + self.cached_files = {} + + def resource_exists(self, package_or_requirement, resource_name): + """Does the named resource exist?""" + return get_provider(package_or_requirement).has_resource(resource_name) + + def resource_isdir(self, package_or_requirement, resource_name): + """Is the named resource an existing directory?""" + return get_provider(package_or_requirement).resource_isdir( + resource_name + ) + + def resource_filename(self, package_or_requirement, resource_name): + """Return a true filesystem path for specified resource""" + return get_provider(package_or_requirement).get_resource_filename( + self, resource_name + ) + + def resource_stream(self, package_or_requirement, resource_name): + """Return a readable file-like object for specified resource""" + return get_provider(package_or_requirement).get_resource_stream( + self, resource_name + ) + + def resource_string(self, package_or_requirement, resource_name): + """Return specified resource as a string""" + return get_provider(package_or_requirement).get_resource_string( + self, resource_name + ) + + def resource_listdir(self, package_or_requirement, resource_name): + """List the contents of the named resource directory""" + return get_provider(package_or_requirement).resource_listdir( + resource_name + ) + + def extraction_error(self): + """Give an error message for problems extracting file(s)""" + + old_exc = sys.exc_info()[1] + cache_path = self.extraction_path or get_default_cache() + + err = ExtractionError("""Can't extract file(s) to egg cache + +The following error occurred while trying to extract file(s) to the Python egg +cache: + + %s + +The Python egg cache directory is currently set to: + + %s + +Perhaps your account does not have write access to this directory? You can +change the cache directory by setting the PYTHON_EGG_CACHE environment +variable to point to an accessible directory. +""" % (old_exc, cache_path) + ) + err.manager = self + err.cache_path = cache_path + err.original_error = old_exc + raise err + + + + + + + + + + + + + + + + def get_cache_path(self, archive_name, names=()): + """Return absolute location in cache for `archive_name` and `names` + + The parent directory of the resulting path will be created if it does + not already exist. `archive_name` should be the base filename of the + enclosing egg (which may not be the name of the enclosing zipfile!), + including its ".egg" extension. `names`, if provided, should be a + sequence of path name parts "under" the egg's extraction location. + + This method should only be called by resource providers that need to + obtain an extraction location, and only for names they intend to + extract, as it tracks the generated names for possible cleanup later. + """ + extract_path = self.extraction_path or get_default_cache() + target_path = os.path.join(extract_path, archive_name+'-tmp', *names) + try: + _bypass_ensure_directory(target_path) + except: + self.extraction_error() + + self.cached_files[target_path] = 1 + return target_path + + + + + + + + + + + + + + + + + + + + def postprocess(self, tempname, filename): + """Perform any platform-specific postprocessing of `tempname` + + This is where Mac header rewrites should be done; other platforms don't + have anything special they should do. + + Resource providers should call this method ONLY after successfully + extracting a compressed resource. They must NOT call it on resources + that are already in the filesystem. + + `tempname` is the current (temporary) name of the file, and `filename` + is the name it will be renamed to by the caller after this routine + returns. + """ + + if os.name == 'posix': + # Make the resource executable + mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777 + os.chmod(tempname, mode) + + + + + + + + + + + + + + + + + + + + + + + def set_extraction_path(self, path): + """Set the base path where resources will be extracted to, if needed. + + If you do not call this routine before any extractions take place, the + path defaults to the return value of ``get_default_cache()``. (Which + is based on the ``PYTHON_EGG_CACHE`` environment variable, with various + platform-specific fallbacks. See that routine's documentation for more + details.) + + Resources are extracted to subdirectories of this path based upon + information given by the ``IResourceProvider``. You may set this to a + temporary directory, but then you must call ``cleanup_resources()`` to + delete the extracted files when done. There is no guarantee that + ``cleanup_resources()`` will be able to remove all extracted files. + + (Note: you may not change the extraction path for a given resource + manager once resources have been extracted, unless you first call + ``cleanup_resources()``.) + """ + if self.cached_files: + raise ValueError( + "Can't change extraction path, files already extracted" + ) + + self.extraction_path = path + + def cleanup_resources(self, force=False): + """ + Delete all extracted resource files and directories, returning a list + of the file and directory names that could not be successfully removed. + This function does not have any concurrency protection, so it should + generally only be called when the extraction path is a temporary + directory exclusive to a single process. This method is not + automatically called; you must call it explicitly or register it as an + ``atexit`` function if you wish to ensure cleanup of a temporary + directory used for extractions. + """ + # XXX + + + +def get_default_cache(): + """Determine the default cache location + + This returns the ``PYTHON_EGG_CACHE`` environment variable, if set. + Otherwise, on Windows, it returns a "Python-Eggs" subdirectory of the + "Application Data" directory. On all other systems, it's "~/.python-eggs". + """ + try: + return os.environ['PYTHON_EGG_CACHE'] + except KeyError: + pass + + if os.name!='nt': + return os.path.expanduser('~/.python-eggs') + + app_data = 'Application Data' # XXX this may be locale-specific! + app_homes = [ + (('APPDATA',), None), # best option, should be locale-safe + (('USERPROFILE',), app_data), + (('HOMEDRIVE','HOMEPATH'), app_data), + (('HOMEPATH',), app_data), + (('HOME',), None), + (('WINDIR',), app_data), # 95/98/ME + ] + + for keys, subdir in app_homes: + dirname = '' + for key in keys: + if key in os.environ: + dirname = os.path.join(dirname, os.environ[key]) + else: + break + else: + if subdir: + dirname = os.path.join(dirname,subdir) + return os.path.join(dirname, 'Python-Eggs') + else: + raise RuntimeError( + "Please set the PYTHON_EGG_CACHE enviroment variable" + ) + +def safe_name(name): + """Convert an arbitrary string to a standard distribution name + + Any runs of non-alphanumeric/. characters are replaced with a single '-'. + """ + return re.sub('[^A-Za-z0-9.]+', '-', name) + + +def safe_version(version): + """Convert an arbitrary string to a standard version string + + Spaces become dots, and all other non-alphanumeric characters become + dashes, with runs of multiple dashes condensed to a single dash. + """ + version = version.replace(' ','.') + return re.sub('[^A-Za-z0-9.]+', '-', version) + + +def safe_extra(extra): + """Convert an arbitrary string to a standard 'extra' name + + Any runs of non-alphanumeric characters are replaced with a single '_', + and the result is always lowercased. + """ + return re.sub('[^A-Za-z0-9.]+', '_', extra).lower() + + +def to_filename(name): + """Convert a project or version name to its filename-escaped form + + Any '-' characters are currently replaced with '_'. + """ + return name.replace('-','_') + + + + + + + + +class NullProvider: + """Try to implement resources and metadata for arbitrary PEP 302 loaders""" + + egg_name = None + egg_info = None + loader = None + + def __init__(self, module): + self.loader = getattr(module, '__loader__', None) + self.module_path = os.path.dirname(getattr(module, '__file__', '')) + + def get_resource_filename(self, manager, resource_name): + return self._fn(self.module_path, resource_name) + + def get_resource_stream(self, manager, resource_name): + return StringIO(self.get_resource_string(manager, resource_name)) + + def get_resource_string(self, manager, resource_name): + return self._get(self._fn(self.module_path, resource_name)) + + def has_resource(self, resource_name): + return self._has(self._fn(self.module_path, resource_name)) + + def has_metadata(self, name): + return self.egg_info and self._has(self._fn(self.egg_info,name)) + + if sys.version_info <= (3,): + def get_metadata(self, name): + if not self.egg_info: + return "" + return self._get(self._fn(self.egg_info,name)) + else: + def get_metadata(self, name): + if not self.egg_info: + return "" + return self._get(self._fn(self.egg_info,name)).decode("utf-8") + + def get_metadata_lines(self, name): + return yield_lines(self.get_metadata(name)) + + def resource_isdir(self,resource_name): + return self._isdir(self._fn(self.module_path, resource_name)) + + def metadata_isdir(self,name): + return self.egg_info and self._isdir(self._fn(self.egg_info,name)) + + + def resource_listdir(self,resource_name): + return self._listdir(self._fn(self.module_path,resource_name)) + + def metadata_listdir(self,name): + if self.egg_info: + return self._listdir(self._fn(self.egg_info,name)) + return [] + + def run_script(self,script_name,namespace): + script = 'scripts/'+script_name + if not self.has_metadata(script): + raise ResolutionError("No script named %r" % script_name) + script_text = self.get_metadata(script).replace('\r\n','\n') + script_text = script_text.replace('\r','\n') + script_filename = self._fn(self.egg_info,script) + namespace['__file__'] = script_filename + if os.path.exists(script_filename): + exec(compile(open(script_filename).read(), script_filename, 'exec'), namespace, namespace) + else: + from linecache import cache + cache[script_filename] = ( + len(script_text), 0, script_text.split('\n'), script_filename + ) + script_code = compile(script_text,script_filename,'exec') + exec(script_code, namespace, namespace) + + def _has(self, path): + raise NotImplementedError( + "Can't perform this operation for unregistered loader type" + ) + + def _isdir(self, path): + raise NotImplementedError( + "Can't perform this operation for unregistered loader type" + ) + + def _listdir(self, path): + raise NotImplementedError( + "Can't perform this operation for unregistered loader type" + ) + + def _fn(self, base, resource_name): + if resource_name: + return os.path.join(base, *resource_name.split('/')) + return base + + def _get(self, path): + if hasattr(self.loader, 'get_data'): + return self.loader.get_data(path) + raise NotImplementedError( + "Can't perform this operation for loaders without 'get_data()'" + ) + +register_loader_type(object, NullProvider) + + +class EggProvider(NullProvider): + """Provider based on a virtual filesystem""" + + def __init__(self,module): + NullProvider.__init__(self,module) + self._setup_prefix() + + def _setup_prefix(self): + # we assume here that our metadata may be nested inside a "basket" + # of multiple eggs; that's why we use module_path instead of .archive + path = self.module_path + old = None + while path!=old: + if path.lower().endswith('.egg'): + self.egg_name = os.path.basename(path) + self.egg_info = os.path.join(path, 'EGG-INFO') + self.egg_root = path + break + old = path + path, base = os.path.split(path) + + + + + + +class DefaultProvider(EggProvider): + """Provides access to package resources in the filesystem""" + + def _has(self, path): + return os.path.exists(path) + + def _isdir(self,path): + return os.path.isdir(path) + + def _listdir(self,path): + return os.listdir(path) + + def get_resource_stream(self, manager, resource_name): + return open(self._fn(self.module_path, resource_name), 'rb') + + def _get(self, path): + stream = open(path, 'rb') + try: + return stream.read() + finally: + stream.close() + +register_loader_type(type(None), DefaultProvider) + +try: + # CPython >=3.3 + import _frozen_importlib +except ImportError: + pass +else: + register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider) + + +class EmptyProvider(NullProvider): + """Provider that returns nothing for all requests""" + + _isdir = _has = lambda self,path: False + _get = lambda self,path: '' + _listdir = lambda self,path: [] + module_path = None + + def __init__(self): + pass + +empty_provider = EmptyProvider() + + + + +class ZipProvider(EggProvider): + """Resource support for zips and eggs""" + + eagers = None + + def __init__(self, module): + EggProvider.__init__(self,module) + self.zipinfo = zipimport._zip_directory_cache[self.loader.archive] + self.zip_pre = self.loader.archive+os.sep + + def _zipinfo_name(self, fspath): + # Convert a virtual filename (full path to file) into a zipfile subpath + # usable with the zipimport directory cache for our target archive + if fspath.startswith(self.zip_pre): + return fspath[len(self.zip_pre):] + raise AssertionError( + "%s is not a subpath of %s" % (fspath,self.zip_pre) + ) + + def _parts(self,zip_path): + # Convert a zipfile subpath into an egg-relative path part list + fspath = self.zip_pre+zip_path # pseudo-fs path + if fspath.startswith(self.egg_root+os.sep): + return fspath[len(self.egg_root)+1:].split(os.sep) + raise AssertionError( + "%s is not a subpath of %s" % (fspath,self.egg_root) + ) + + def get_resource_filename(self, manager, resource_name): + if not self.egg_name: + raise NotImplementedError( + "resource_filename() only supported for .egg, not .zip" + ) + # no need to lock for extraction, since we use temp names + zip_path = self._resource_to_zip(resource_name) + eagers = self._get_eager_resources() + if '/'.join(self._parts(zip_path)) in eagers: + for name in eagers: + self._extract_resource(manager, self._eager_to_zip(name)) + return self._extract_resource(manager, zip_path) + + def _extract_resource(self, manager, zip_path): + + if zip_path in self._index(): + for name in self._index()[zip_path]: + last = self._extract_resource( + manager, os.path.join(zip_path, name) + ) + return os.path.dirname(last) # return the extracted directory name + + zip_stat = self.zipinfo[zip_path] + t,d,size = zip_stat[5], zip_stat[6], zip_stat[3] + date_time = ( + (d>>9)+1980, (d>>5)&0xF, d&0x1F, # ymd + (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1 # hms, etc. + ) + timestamp = time.mktime(date_time) + + try: + if not WRITE_SUPPORT: + raise IOError('"os.rename" and "os.unlink" are not supported ' + 'on this platform') + + real_path = manager.get_cache_path( + self.egg_name, self._parts(zip_path) + ) + + if os.path.isfile(real_path): + stat = os.stat(real_path) + if stat.st_size==size and stat.st_mtime==timestamp: + # size and stamp match, don't bother extracting + return real_path + + outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path)) + os.write(outf, self.loader.get_data(zip_path)) + os.close(outf) + utime(tmpnam, (timestamp,timestamp)) + manager.postprocess(tmpnam, real_path) + + try: + rename(tmpnam, real_path) + + except os.error: + if os.path.isfile(real_path): + stat = os.stat(real_path) + + if stat.st_size==size and stat.st_mtime==timestamp: + # size and stamp match, somebody did it just ahead of + # us, so we're done + return real_path + elif os.name=='nt': # Windows, del old file and retry + unlink(real_path) + rename(tmpnam, real_path) + return real_path + raise + + except os.error: + manager.extraction_error() # report a user-friendly error + + return real_path + + def _get_eager_resources(self): + if self.eagers is None: + eagers = [] + for name in ('native_libs.txt', 'eager_resources.txt'): + if self.has_metadata(name): + eagers.extend(self.get_metadata_lines(name)) + self.eagers = eagers + return self.eagers + + def _index(self): + try: + return self._dirindex + except AttributeError: + ind = {} + for path in self.zipinfo: + parts = path.split(os.sep) + while parts: + parent = os.sep.join(parts[:-1]) + if parent in ind: + ind[parent].append(parts[-1]) + break + else: + ind[parent] = [parts.pop()] + self._dirindex = ind + return ind + + def _has(self, fspath): + zip_path = self._zipinfo_name(fspath) + return zip_path in self.zipinfo or zip_path in self._index() + + def _isdir(self,fspath): + return self._zipinfo_name(fspath) in self._index() + + def _listdir(self,fspath): + return list(self._index().get(self._zipinfo_name(fspath), ())) + + def _eager_to_zip(self,resource_name): + return self._zipinfo_name(self._fn(self.egg_root,resource_name)) + + def _resource_to_zip(self,resource_name): + return self._zipinfo_name(self._fn(self.module_path,resource_name)) + +register_loader_type(zipimport.zipimporter, ZipProvider) + + + + + + + + + + + + + + + + + + + + + + + + +class FileMetadata(EmptyProvider): + """Metadata handler for standalone PKG-INFO files + + Usage:: + + metadata = FileMetadata("/path/to/PKG-INFO") + + This provider rejects all data and metadata requests except for PKG-INFO, + which is treated as existing, and will be the contents of the file at + the provided location. + """ + + def __init__(self,path): + self.path = path + + def has_metadata(self,name): + return name=='PKG-INFO' + + def get_metadata(self,name): + if name=='PKG-INFO': + f = open(self.path,'rU') + metadata = f.read() + f.close() + return metadata + raise KeyError("No metadata except PKG-INFO is available") + + def get_metadata_lines(self,name): + return yield_lines(self.get_metadata(name)) + + + + + + + + + + + + + + + + +class PathMetadata(DefaultProvider): + """Metadata provider for egg directories + + Usage:: + + # Development eggs: + + egg_info = "/path/to/PackageName.egg-info" + base_dir = os.path.dirname(egg_info) + metadata = PathMetadata(base_dir, egg_info) + dist_name = os.path.splitext(os.path.basename(egg_info))[0] + dist = Distribution(basedir,project_name=dist_name,metadata=metadata) + + # Unpacked egg directories: + + egg_path = "/path/to/PackageName-ver-pyver-etc.egg" + metadata = PathMetadata(egg_path, os.path.join(egg_path,'EGG-INFO')) + dist = Distribution.from_filename(egg_path, metadata=metadata) + """ + + def __init__(self, path, egg_info): + self.module_path = path + self.egg_info = egg_info + + +class EggMetadata(ZipProvider): + """Metadata provider for .egg files""" + + def __init__(self, importer): + """Create a metadata provider from a zipimporter""" + + self.zipinfo = zipimport._zip_directory_cache[importer.archive] + self.zip_pre = importer.archive+os.sep + self.loader = importer + if importer.prefix: + self.module_path = os.path.join(importer.archive, importer.prefix) + else: + self.module_path = importer.archive + self._setup_prefix() + + +class ImpWrapper: + """PEP 302 Importer that wraps Python's "normal" import algorithm""" + + def __init__(self, path=None): + 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 + +try: + from pkgutil import get_importer, ImpImporter +except ImportError: + pass # Python 2.3 or 2.4, use our own implementation +else: + ImpWrapper = ImpImporter # Python 2.5, use pkgutil's implementation + del ImpLoader, ImpImporter + + + + + + +_declare_state('dict', _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` 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, only=False): + """Yield distributions accessible via `path_item`""" + importer = get_importer(path_item) + finder = _find_adapter(_distribution_finders, importer) + return finder(importer, path_item, only) + +def find_in_zip(importer, path_item, only=False): + metadata = EggMetadata(importer) + if metadata.has_metadata('PKG-INFO'): + yield Distribution.from_filename(path_item, metadata=metadata) + if only: + return # don't yield nested distros + for subitem in metadata.resource_listdir('/'): + if subitem.endswith('.egg'): + subpath = os.path.join(path_item, subitem) + for dist in find_in_zip(zipimport.zipimporter(subpath), subpath): + yield dist + +register_finder(zipimport.zipimporter, find_in_zip) + +def StringIO(*args, **kw): + """Thunk to load the real StringIO on demand""" + global StringIO + try: + from io import StringIO + except ImportError: + from io import StringIO + return StringIO(*args,**kw) + +def find_nothing(importer, path_item, only=False): + return () +register_finder(object,find_nothing) + +def find_on_path(importer, path_item, only=False): + """Yield distributions accessible on a sys.path directory""" + path_item = _normalize_cached(path_item) + + if os.path.isdir(path_item) and os.access(path_item, os.R_OK): + if path_item.lower().endswith('.egg'): + # unpacked egg + yield Distribution.from_filename( + path_item, metadata=PathMetadata( + path_item, os.path.join(path_item,'EGG-INFO') + ) + ) + else: + # scan for .egg and .egg-info in directory + for entry in os.listdir(path_item): + lower = entry.lower() + if lower.endswith('.egg-info') or lower.endswith('.dist-info'): + fullpath = os.path.join(path_item, entry) + if os.path.isdir(fullpath): + # egg-info directory, allow getting metadata + metadata = PathMetadata(path_item, fullpath) + else: + metadata = FileMetadata(fullpath) + yield Distribution.from_location( + path_item,entry,metadata,precedence=DEVELOP_DIST + ) + elif not only and lower.endswith('.egg'): + for dist in find_distributions(os.path.join(path_item, entry)): + yield dist + elif not only and lower.endswith('.egg-link'): + for line in open(os.path.join(path_item, entry)): + if not line.strip(): continue + for item in find_distributions(os.path.join(path_item,line.rstrip())): + yield item + break +register_finder(ImpWrapper,find_on_path) + +try: + # CPython >=3.3 + import _frozen_importlib +except ImportError: + pass +else: + register_finder(_frozen_importlib.FileFinder, find_on_path) + +_declare_state('dict', _namespace_handlers={}) +_declare_state('dict', _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) + if importer is None: + return None + loader = importer.find_module(packageName) + if loader is None: + return None + module = sys.modules.get(packageName) + if module is None: + module = sys.modules[packageName] = types.ModuleType(packageName) + module.__path__ = []; _set_parent_ns(packageName) + elif not hasattr(module,'__path__'): + raise TypeError("Not a package:", packageName) + handler = _find_adapter(_namespace_handlers, importer) + subpath = handler(importer,path_item,packageName,module) + if subpath is not None: + path = module.__path__; path.append(subpath) + loader.load_module(packageName); module.__path__ = path + return subpath + +def declare_namespace(packageName): + """Declare that package 'packageName' is a namespace package""" + + imp.acquire_lock() + try: + if packageName in _namespace_packages: + return + + path, parent = sys.path, None + if '.' in packageName: + parent = '.'.join(packageName.split('.')[:-1]) + declare_namespace(parent) + if parent not in _namespace_packages: + __import__(parent) + try: + path = sys.modules[parent].__path__ + except AttributeError: + raise TypeError("Not a package:", parent) + + # 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,[]) + + 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) + + finally: + imp.release_lock() + +def fixup_namespace_packages(path_item, parent=None): + """Ensure that previously-declared namespace packages include path_item""" + imp.acquire_lock() + try: + for package in _namespace_packages.get(parent,()): + subpath = _handle_ns(package, path_item) + if subpath: fixup_namespace_packages(subpath,package) + finally: + imp.release_lock() + +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 = _normalize_cached(subpath) + for item in module.__path__: + if _normalize_cached(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) + +try: + # CPython >=3.3 + import _frozen_importlib +except ImportError: + pass +else: + register_namespace_handler(_frozen_importlib.FileFinder, file_ns_handler) + + +def null_ns_handler(importer, path_item, packageName, module): + return None + +register_namespace_handler(object,null_ns_handler) + + +def normalize_path(filename): + """Normalize a file/dir name for comparison purposes""" + return os.path.normcase(os.path.realpath(filename)) + +def _normalize_cached(filename,_cache={}): + try: + return _cache[filename] + except KeyError: + _cache[filename] = result = normalize_path(filename) + return result + +def _set_parent_ns(packageName): + parts = packageName.split('.') + name = parts.pop() + if parts: + parent = '.'.join(parts) + setattr(sys.modules[parent], name, sys.modules[packageName]) + + +def yield_lines(strs): + """Yield non-empty/non-comment lines of a ``basestring`` or sequence""" + if isinstance(strs,str): + for s in strs.splitlines(): + s = s.strip() + if s and not s.startswith('#'): # skip blank lines/comments + yield s + else: + for ss in strs: + for s in yield_lines(ss): + yield s + +LINE_END = re.compile(r"\s*(#.*)?$").match # whitespace and comment +CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match # line continuation +DISTRO = re.compile(r"\s*((\w|[-.])+)").match # Distribution or extra +VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match # ver. info +COMMA = re.compile(r"\s*,").match # comma between items +OBRACKET = re.compile(r"\s*\[").match +CBRACKET = re.compile(r"\s*\]").match +MODULE = re.compile(r"\w+(\.\w+)*$").match +EGG_NAME = re.compile( + r"(?P[^-]+)" + r"( -(?P[^-]+) (-py(?P[^-]+) (-(?P.+))? )? )?", + re.VERBOSE | re.IGNORECASE +).match + +component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE) +replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get + +def _parse_version_parts(s): + for part in component_re.split(s): + part = replace(part,part) + if part in ['', '.']: + continue + if part[:1] in '0123456789': + yield part.zfill(8) # pad for numeric comparison + else: + yield '*'+part + + yield '*final' # ensure that alpha/beta/candidate are before final + +def parse_version(s): + """Convert a version string to a chronologically-sortable key + + This is a rough cross between distutils' StrictVersion and LooseVersion; + if you give it versions that would work with StrictVersion, then it behaves + the same; otherwise it acts like a slightly-smarter LooseVersion. It is + *possible* to create pathological version coding schemes that will fool + this parser, but they should be very rare in practice. + + The returned value will be a tuple of strings. Numeric portions of the + version are padded to 8 digits so they will compare numerically, but + without relying on how numbers compare relative to strings. Dots are + dropped, but dashes are retained. Trailing zeros between alpha segments + or dashes are suppressed, so that e.g. "2.4.0" is considered the same as + "2.4". Alphanumeric parts are lower-cased. + + The algorithm assumes that strings like "-" and any alpha string that + alphabetically follows "final" represents a "patch level". So, "2.4-1" + is assumed to be a branch or patch of "2.4", and therefore "2.4.1" is + considered newer than "2.4-1", which in turn is newer than "2.4". + + Strings like "a", "b", "c", "alpha", "beta", "candidate" and so on (that + come before "final" alphabetically) are assumed to be pre-release versions, + so that the version "2.4" is considered newer than "2.4a1". + + Finally, to handle miscellaneous cases, the strings "pre", "preview", and + "rc" are treated as if they were "c", i.e. as though they were release + candidates, and therefore are not as new as a version string that does not + contain them, and "dev" is replaced with an '@' so that it sorts lower than + than any other pre-release tag. + """ + parts = [] + for part in _parse_version_parts(s.lower()): + if part.startswith('*'): + # remove trailing zeros from each series of numeric parts + while parts and parts[-1]=='00000000': + parts.pop() + parts.append(part) + return tuple(parts) + +class EntryPoint(object): + """Object representing an advertised importable object""" + + def __init__(self, name, module_name, attrs=(), extras=(), dist=None): + if not MODULE(module_name): + raise ValueError("Invalid module name", module_name) + self.name = name + self.module_name = module_name + self.attrs = tuple(attrs) + self.extras = Requirement.parse(("x[%s]" % ','.join(extras))).extras + self.dist = dist + + def __str__(self): + s = "%s = %s" % (self.name, self.module_name) + if self.attrs: + s += ':' + '.'.join(self.attrs) + if self.extras: + s += ' [%s]' % ','.join(self.extras) + return s + + def __repr__(self): + return "EntryPoint.parse(%r)" % str(self) + + def load(self, require=True, env=None, installer=None): + if require: self.require(env, installer) + entry = __import__(self.module_name, globals(),globals(), ['__name__']) + for attr in self.attrs: + try: + entry = getattr(entry,attr) + except AttributeError: + raise ImportError("%r has no %r attribute" % (entry,attr)) + return entry + + def require(self, env=None, installer=None): + if self.extras and not self.dist: + raise UnknownExtra("Can't require() without a distribution", self) + list(map(working_set.add, + working_set.resolve(self.dist.requires(self.extras),env,installer))) + + + + #@classmethod + def parse(cls, src, dist=None): + """Parse a single entry point from string `src` + + Entry point syntax follows the form:: + + name = some.module:some.attr [extra1,extra2] + + The entry name and module name are required, but the ``:attrs`` and + ``[extras]`` parts are optional + """ + try: + attrs = extras = () + name,value = src.split('=',1) + if '[' in value: + value,extras = value.split('[',1) + req = Requirement.parse("x["+extras) + if req.specs: raise ValueError + extras = req.extras + if ':' in value: + value,attrs = value.split(':',1) + if not MODULE(attrs.rstrip()): + raise ValueError + attrs = attrs.rstrip().split('.') + except ValueError: + raise ValueError( + "EntryPoint must be in 'name=module:attrs [extras]' format", + src + ) + else: + return cls(name.strip(), value.strip(), attrs, extras, dist) + + parse = classmethod(parse) + + + + + + + + + #@classmethod + def parse_group(cls, group, lines, dist=None): + """Parse an entry point group""" + if not MODULE(group): + raise ValueError("Invalid group name", group) + this = {} + for line in yield_lines(lines): + ep = cls.parse(line, dist) + if ep.name in this: + raise ValueError("Duplicate entry point", group, ep.name) + this[ep.name]=ep + return this + + parse_group = classmethod(parse_group) + + #@classmethod + def parse_map(cls, data, dist=None): + """Parse a map of entry point groups""" + if isinstance(data,dict): + data = list(data.items()) + else: + data = split_sections(data) + maps = {} + for group, lines in data: + if group is None: + if not lines: + continue + raise ValueError("Entry points must be listed in groups") + group = group.strip() + if group in maps: + raise ValueError("Duplicate group name", group) + maps[group] = cls.parse_group(group, lines, dist) + return maps + + parse_map = classmethod(parse_map) + + +def _remove_md5_fragment(location): + if not location: + return '' + parsed = urlparse(location) + if parsed[-1].startswith('md5='): + return urlunparse(parsed[:-1] + ('',)) + return location + + +class Distribution(object): + """Wrap an actual or potential sys.path entry w/metadata""" + PKG_INFO = 'PKG-INFO' + + def __init__(self, + location=None, metadata=None, project_name=None, version=None, + py_version=PY_MAJOR, platform=None, precedence = EGG_DIST + ): + self.project_name = safe_name(project_name or 'Unknown') + if version is not None: + self._version = safe_version(version) + self.py_version = py_version + self.platform = platform + self.location = location + self.precedence = precedence + self._provider = metadata or empty_provider + + #@classmethod + def from_location(cls,location,basename,metadata=None,**kw): + project_name, version, py_version, platform = [None]*4 + basename, ext = os.path.splitext(basename) + if ext.lower() in _distributionImpl: + # .dist-info gets much metadata differently + match = EGG_NAME(basename) + if match: + project_name, version, py_version, platform = match.group( + 'name','ver','pyver','plat' + ) + cls = _distributionImpl[ext.lower()] + return cls( + location, metadata, project_name=project_name, version=version, + py_version=py_version, platform=platform, **kw + ) + from_location = classmethod(from_location) + + + hashcmp = property( + lambda self: ( + getattr(self,'parsed_version',()), + self.precedence, + self.key, + _remove_md5_fragment(self.location), + self.py_version, + self.platform + ) + ) + def __hash__(self): return hash(self.hashcmp) + def __lt__(self, other): + return self.hashcmp < other.hashcmp + def __le__(self, other): + return self.hashcmp <= other.hashcmp + def __gt__(self, other): + return self.hashcmp > other.hashcmp + def __ge__(self, other): + return self.hashcmp >= other.hashcmp + def __eq__(self, other): + if not isinstance(other, self.__class__): + # It's not a Distribution, so they are not equal + return False + return self.hashcmp == other.hashcmp + def __ne__(self, other): + return not self == other + + # These properties have to be lazy so that we don't have to load any + # metadata until/unless it's actually needed. (i.e., some distributions + # may not know their name or version without loading PKG-INFO) + + #@property + def key(self): + try: + return self._key + except AttributeError: + self._key = key = self.project_name.lower() + return key + key = property(key) + + #@property + def parsed_version(self): + try: + return self._parsed_version + except AttributeError: + self._parsed_version = pv = parse_version(self.version) + return pv + + parsed_version = property(parsed_version) + + #@property + def version(self): + try: + return self._version + except AttributeError: + for line in self._get_metadata(self.PKG_INFO): + if line.lower().startswith('version:'): + self._version = safe_version(line.split(':',1)[1].strip()) + return self._version + else: + raise ValueError( + "Missing 'Version:' header and/or %s file" % self.PKG_INFO, self + ) + version = property(version) + + + + + #@property + def _dep_map(self): + try: + return self.__dep_map + except AttributeError: + dm = self.__dep_map = {None: []} + for name in 'requires.txt', 'depends.txt': + for extra,reqs in split_sections(self._get_metadata(name)): + if extra: extra = safe_extra(extra) + dm.setdefault(extra,[]).extend(parse_requirements(reqs)) + return dm + _dep_map = property(_dep_map) + + def requires(self,extras=()): + """List of Requirements needed for this distro if `extras` are used""" + dm = self._dep_map + deps = [] + deps.extend(dm.get(None,())) + for ext in extras: + try: + deps.extend(dm[safe_extra(ext)]) + except KeyError: + raise UnknownExtra( + "%s has no such extra feature %r" % (self, ext) + ) + return deps + + def _get_metadata(self,name): + if self.has_metadata(name): + for line in self.get_metadata_lines(name): + yield line + + def activate(self,path=None): + """Ensure distribution is importable on `path` (default=sys.path)""" + if path is None: path = sys.path + self.insert_on(path) + if path is sys.path: + fixup_namespace_packages(self.location) + list(map(declare_namespace, self._get_metadata('namespace_packages.txt'))) + + + def egg_name(self): + """Return what this distribution's standard .egg filename should be""" + filename = "%s-%s-py%s" % ( + to_filename(self.project_name), to_filename(self.version), + self.py_version or PY_MAJOR + ) + + if self.platform: + filename += '-'+self.platform + return filename + + def __repr__(self): + if self.location: + return "%s (%s)" % (self,self.location) + else: + return str(self) + + def __str__(self): + try: version = getattr(self,'version',None) + except ValueError: version = None + version = version or "[unknown version]" + return "%s %s" % (self.project_name,version) + + def __getattr__(self,attr): + """Delegate all unrecognized public attributes to .metadata provider""" + if attr.startswith('_'): + raise AttributeError(attr) + return getattr(self._provider, attr) + + #@classmethod + def from_filename(cls,filename,metadata=None, **kw): + return cls.from_location( + _normalize_cached(filename), os.path.basename(filename), metadata, + **kw + ) + from_filename = classmethod(from_filename) + + def as_requirement(self): + """Return a ``Requirement`` that matches this distribution exactly""" + return Requirement.parse('%s==%s' % (self.project_name, self.version)) + + def load_entry_point(self, group, name): + """Return the `name` entry point of `group` or raise ImportError""" + ep = self.get_entry_info(group,name) + if ep is None: + raise ImportError("Entry point %r not found" % ((group,name),)) + return ep.load() + + def get_entry_map(self, group=None): + """Return the entry point map for `group`, or the full entry map""" + try: + ep_map = self._ep_map + except AttributeError: + ep_map = self._ep_map = EntryPoint.parse_map( + self._get_metadata('entry_points.txt'), self + ) + if group is not None: + return ep_map.get(group,{}) + return ep_map + + def get_entry_info(self, group, name): + """Return the EntryPoint object for `group`+`name`, or ``None``""" + return self.get_entry_map(group).get(name) + + + + + + + + + + + + + + + + + + + + def insert_on(self, path, loc = None): + """Insert self.location in path before its nearest parent directory""" + + loc = loc or self.location + + if self.project_name == 'setuptools': + try: + version = self.version + except ValueError: + version = '' + if '0.7' in version: + raise ValueError( + "A 0.7-series setuptools cannot be installed " + "with distribute. Found one at %s" % str(self.location)) + + if not loc: + return + + if path is sys.path: + self.check_version_conflict() + + nloc = _normalize_cached(loc) + bdir = os.path.dirname(nloc) + npath= list(map(_normalize_cached, path)) + + bp = None + for p, item in enumerate(npath): + if item==nloc: + break + elif item==bdir and self.precedence==EGG_DIST: + # if it's an .egg, give it precedence over its directory + path.insert(p, loc) + npath.insert(p, nloc) + break + else: + path.append(loc) + return + + # p is the spot where we found or inserted loc; now remove duplicates + while 1: + try: + np = npath.index(nloc, p+1) + except ValueError: + break + else: + del npath[np], path[np] + p = np # ha! + + return + + + + def check_version_conflict(self): + if self.key=='distribute': + return # ignore the inevitable setuptools self-conflicts :( + + nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt')) + loc = normalize_path(self.location) + for modname in self._get_metadata('top_level.txt'): + if (modname not in sys.modules or modname in nsp + or modname in _namespace_packages + ): + continue + if modname in ('pkg_resources', 'setuptools', 'site'): + continue + fn = getattr(sys.modules[modname], '__file__', None) + if fn and (normalize_path(fn).startswith(loc) or + fn.startswith(self.location)): + continue + issue_warning( + "Module %s was already imported from %s, but %s is being added" + " to sys.path" % (modname, fn, self.location), + ) + + def has_version(self): + try: + self.version + except ValueError: + issue_warning("Unbuilt egg for "+repr(self)) + return False + return True + + def clone(self,**kw): + """Copy this distribution, substituting in any changed keyword args""" + for attr in ( + 'project_name', 'version', 'py_version', 'platform', 'location', + 'precedence' + ): + kw.setdefault(attr, getattr(self,attr,None)) + kw.setdefault('metadata', self._provider) + return self.__class__(**kw) + + + + + #@property + def extras(self): + return [dep for dep in self._dep_map if dep] + extras = property(extras) + + +class DistInfoDistribution(Distribution): + """Wrap an actual or potential sys.path entry w/metadata, .dist-info style""" + PKG_INFO = 'METADATA' + EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])") + + @property + def _parsed_pkg_info(self): + """Parse and cache metadata""" + try: + return self._pkg_info + except AttributeError: + from email.parser import Parser + self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO)) + return self._pkg_info + + @property + def _dep_map(self): + try: + return self.__dep_map + except AttributeError: + self.__dep_map = self._compute_dependencies() + return self.__dep_map + + def _preparse_requirement(self, requires_dist): + """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz') + Split environment marker, add == prefix to version specifiers as + necessary, and remove parenthesis. + """ + parts = requires_dist.split(';', 1) + [''] + distvers = parts[0].strip() + mark = parts[1].strip() + distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers) + distvers = distvers.replace('(', '').replace(')', '') + return (distvers, mark) + + def _compute_dependencies(self): + """Recompute this distribution's dependencies.""" + def dummy_marker(marker): + def marker_fn(environment=None, override=None): + return True + marker_fn.__doc__ = marker + return marker_fn + try: + from markerlib import as_function + except ImportError: + as_function = dummy_marker + dm = self.__dep_map = {None: []} + + reqs = [] + # Including any condition expressions + for req in self._parsed_pkg_info.get_all('Requires-Dist') or []: + distvers, mark = self._preparse_requirement(req) + parsed = next(parse_requirements(distvers)) + parsed.marker_fn = as_function(mark) + reqs.append(parsed) + + def reqs_for_extra(extra): + for req in reqs: + if req.marker_fn(override={'extra':extra}): + yield req + + common = set(reqs_for_extra(None)) + dm[None].extend(common) + + for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []: + extra = safe_extra(extra.strip()) + dm[extra] = list(set(reqs_for_extra(extra)) - common) + + return dm + + +_distributionImpl = {'.egg': Distribution, + '.egg-info': Distribution, + '.dist-info': DistInfoDistribution } + + +def issue_warning(*args,**kw): + level = 1 + g = globals() + try: + # find the first stack frame that is *not* code in + # the pkg_resources module, to use for the warning + while sys._getframe(level).f_globals is g: + level += 1 + except ValueError: + pass + from warnings import warn + warn(stacklevel = level+1, *args, **kw) + + + + + + + + + + + + + + + + + + + + + + + +def parse_requirements(strs): + """Yield ``Requirement`` objects for each specification in `strs` + + `strs` must be an instance of ``basestring``, or a (possibly-nested) + iterable thereof. + """ + # create a steppable iterator, so we can handle \-continuations + lines = iter(yield_lines(strs)) + + def scan_list(ITEM,TERMINATOR,line,p,groups,item_name): + + items = [] + + while not TERMINATOR(line,p): + if CONTINUE(line,p): + try: + line = next(lines); p = 0 + except StopIteration: + raise ValueError( + "\\ must not appear on the last nonblank line" + ) + + match = ITEM(line,p) + if not match: + raise ValueError("Expected "+item_name+" in",line,"at",line[p:]) + + items.append(match.group(*groups)) + p = match.end() + + match = COMMA(line,p) + if match: + p = match.end() # skip the comma + elif not TERMINATOR(line,p): + raise ValueError( + "Expected ',' or end-of-list in",line,"at",line[p:] + ) + + match = TERMINATOR(line,p) + if match: p = match.end() # skip the terminator, if any + return line, p, items + + for line in lines: + match = DISTRO(line) + if not match: + raise ValueError("Missing distribution spec", line) + project_name = match.group(1) + p = match.end() + extras = [] + + match = OBRACKET(line,p) + if match: + p = match.end() + line, p, extras = scan_list( + DISTRO, CBRACKET, line, p, (1,), "'extra' name" + ) + + line, p, specs = scan_list(VERSION,LINE_END,line,p,(1,2),"version spec") + specs = [(op,safe_version(val)) for op,val in specs] + yield Requirement(project_name, specs, extras) + + +def _sort_dists(dists): + tmp = [(dist.hashcmp,dist) for dist in dists] + tmp.sort() + dists[::-1] = [d for hc,d in tmp] + + + + + + + + + + + + + + + + + +class Requirement: + def __init__(self, project_name, specs, extras): + """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!""" + self.unsafe_name, project_name = project_name, safe_name(project_name) + self.project_name, self.key = project_name, project_name.lower() + index = [(parse_version(v),state_machine[op],op,v) for op,v in specs] + index.sort() + self.specs = [(op,ver) for parsed,trans,op,ver in index] + self.index, self.extras = index, tuple(map(safe_extra,extras)) + self.hashCmp = ( + self.key, tuple([(op,parsed) for parsed,trans,op,ver in index]), + frozenset(self.extras) + ) + self.__hash = hash(self.hashCmp) + + def __str__(self): + specs = ','.join([''.join(s) for s in self.specs]) + extras = ','.join(self.extras) + if extras: extras = '[%s]' % extras + return '%s%s%s' % (self.project_name, extras, specs) + + def __eq__(self,other): + return isinstance(other,Requirement) and self.hashCmp==other.hashCmp + + def __contains__(self,item): + if isinstance(item,Distribution): + if item.key != self.key: return False + if self.index: item = item.parsed_version # only get if we need it + elif isinstance(item,str): + item = parse_version(item) + last = None + compare = lambda a, b: (a > b) - (a < b) # -1, 0, 1 + for parsed,trans,op,ver in self.index: + action = trans[compare(item,parsed)] # Indexing: 0, 1, -1 + if action=='F': return False + elif action=='T': return True + elif action=='+': last = True + elif action=='-' or last is None: last = False + if last is None: last = True # no rules encountered + return last + + + def __hash__(self): + return self.__hash + + def __repr__(self): return "Requirement.parse(%r)" % str(self) + + #@staticmethod + def parse(s, replacement=True): + reqs = list(parse_requirements(s)) + if reqs: + if len(reqs) == 1: + founded_req = reqs[0] + # if asked for setuptools distribution + # and if distribute is installed, we want to give + # distribute instead + if _override_setuptools(founded_req) and replacement: + distribute = list(parse_requirements('distribute')) + if len(distribute) == 1: + return distribute[0] + return founded_req + else: + return founded_req + + raise ValueError("Expected only one requirement", s) + raise ValueError("No requirements found", s) + + parse = staticmethod(parse) + +state_machine = { + # =>< + '<' : '--T', + '<=': 'T-T', + '>' : 'F+F', + '>=': 'T+F', + '==': 'T..', + '!=': 'F++', +} + + +def _override_setuptools(req): + """Return True when distribute wants to override a setuptools dependency. + + We want to override when the requirement is setuptools and the version is + a variant of 0.6. + + """ + if req.project_name == 'setuptools': + if not len(req.specs): + # Just setuptools: ok + return True + for comparator, version in req.specs: + if comparator in ['==', '>=', '>']: + if '0.7' in version: + # We want some setuptools not from the 0.6 series. + return False + return True + return False + + +def _get_mro(cls): + """Get an mro for a type or classic class""" + if not isinstance(cls,type): + class cls(cls,object): pass + return cls.__mro__[1:] + return cls.__mro__ + +def _find_adapter(registry, ob): + """Return an adapter factory for `ob` from `registry`""" + for t in _get_mro(getattr(ob, '__class__', type(ob))): + if t in registry: + return registry[t] + + +def ensure_directory(path): + """Ensure that the parent directory of `path` exists""" + dirname = os.path.dirname(path) + if not os.path.isdir(dirname): + os.makedirs(dirname) + +def split_sections(s): + """Split a string or iterable thereof into (section,content) pairs + + Each ``section`` is a stripped version of the section header ("[section]") + and each ``content`` is a list of stripped lines excluding blank lines and + comment-only lines. If there are any such lines before the first section + header, they're returned in a first ``section`` of ``None``. + """ + section = None + content = [] + for line in yield_lines(s): + if line.startswith("["): + if line.endswith("]"): + if section or content: + yield section, content + section = line[1:-1].strip() + content = [] + else: + raise ValueError("Invalid section heading", line) + else: + content.append(line) + + # wrap up last segment + yield section, content + +def _mkstemp(*args,**kw): + from tempfile import mkstemp + old_open = os.open + try: + os.open = os_open # temporarily bypass sandboxing + return mkstemp(*args,**kw) + finally: + os.open = old_open # and then put it back + + +# Set up global resource manager (deliberately not state-saved) +_manager = ResourceManager() +def _initialize(g): + for name in dir(_manager): + if not name.startswith('_'): + g[name] = getattr(_manager, name) +_initialize(globals()) + +# Prepare the master working set and make the ``require()`` API available +_declare_state('object', working_set = WorkingSet()) + +try: + # Does the main program list any requirements? + from __main__ import __requires__ +except ImportError: + pass # No: just use the default working set based on sys.path +else: + # Yes: ensure the requirements are met, by prefixing sys.path if necessary + try: + working_set.require(__requires__) + except VersionConflict: # try it without defaults already on sys.path + working_set = WorkingSet([]) # by starting with an empty path + for dist in working_set.resolve( + parse_requirements(__requires__), Environment() + ): + working_set.add(dist) + for entry in sys.path: # add any missing entries from sys.path + if entry not in working_set.entries: + working_set.add_entry(entry) + sys.path[:] = working_set.entries # then copy back to sys.path + +require = working_set.require +iter_entry_points = working_set.iter_entry_points +add_activation_listener = working_set.subscribe +run_script = working_set.run_script +run_main = run_script # backward compatibility +# Activate all distributions already on sys.path, and ensure that +# all distributions added to the working set in the future (e.g. by +# calling ``require()``) will get activated as well. +add_activation_listener(lambda dist: dist.activate()) +working_set.entries=[]; list(map(working_set.add_entry,sys.path)) # match order + diff --git a/make_perf3.sh b/make_perf3.sh --- a/make_perf3.sh +++ b/make_perf3.sh @@ -51,6 +51,9 @@ cp -a "${srcdir}/lib3/${safe_lib}" lib/${safe_lib} done +# Touch-ups +cp ${srcdir}/lib3/pkg_resources.py lib/Chameleon-2.9.2/src + cp -a "${srcdir}/performance" performance # The 2to3 benchmark looks for sample data to run over behind the -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Mon Oct 1 01:00:42 2012 From: python-checkins at python.org (brett.cannon) Date: Mon, 1 Oct 2012 01:00:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Force_map_to_a_list_to_?= =?utf-8?q?guarantee_the_calculations_are_performed_under?= Message-ID: <3XVMY61gFXzQYR@mail.python.org> http://hg.python.org/benchmarks/rev/e9f911fd9bd3 changeset: 184:e9f911fd9bd3 user: Brett Cannon date: Sun Sep 30 19:00:32 2012 -0400 summary: Force map to a list to guarantee the calculations are performed under Python 3. files: performance/bm_spectral_norm.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/performance/bm_spectral_norm.py b/performance/bm_spectral_norm.py --- a/performance/bm_spectral_norm.py +++ b/performance/bm_spectral_norm.py @@ -11,14 +11,14 @@ import itertools import optparse -from compat import izip, xrange +from compat import imap, izip, xrange import util def eval_A(i, j): - return 1.0 / ((i + j) * (i + j + 1) / 2 + i + 1) + return 1.0 / ((i + j) * (i + j + 1) // 2 + i + 1) def eval_times_u(func, u): - return map(func, ((i,u) for i in xrange(len(list(u))))) + return list(imap(func, ((i,u) for i in xrange(len(list(u)))))) def eval_AtA_times_u(u): return eval_times_u(part_At_times_u, eval_times_u(part_A_times_u, u)) @@ -57,7 +57,7 @@ tk = time.time() times.append(tk - t0) return times - + if __name__ == "__main__": parser = optparse.OptionParser( usage="%prog [options]", -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Mon Oct 1 01:17:34 2012 From: python-checkins at python.org (brett.cannon) Date: Mon, 1 Oct 2012 01:17:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Use_a_list_comprehensio?= =?utf-8?q?n_over_list/imap=2E?= Message-ID: <3XVMwZ0yTNzQl5@mail.python.org> http://hg.python.org/benchmarks/rev/f12b4f8bcf29 changeset: 185:f12b4f8bcf29 user: Brett Cannon date: Sun Sep 30 19:17:26 2012 -0400 summary: Use a list comprehension over list/imap. files: performance/bm_spectral_norm.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/performance/bm_spectral_norm.py b/performance/bm_spectral_norm.py --- a/performance/bm_spectral_norm.py +++ b/performance/bm_spectral_norm.py @@ -11,14 +11,15 @@ import itertools import optparse -from compat import imap, izip, xrange +from compat import izip, xrange import util def eval_A(i, j): return 1.0 / ((i + j) * (i + j + 1) // 2 + i + 1) def eval_times_u(func, u): - return list(imap(func, ((i,u) for i in xrange(len(list(u)))))) + return [func((i,u)) for i in xrange(len(list(u)))] + def eval_AtA_times_u(u): return eval_times_u(part_At_times_u, eval_times_u(part_A_times_u, u)) -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Mon Oct 1 01:45:37 2012 From: python-checkins at python.org (brett.cannon) Date: Mon, 1 Oct 2012 01:45:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Add_in_telco_as_a_Pytho?= =?utf-8?q?n_3_benchmark_and_move_chameleon_to_a_2to3?= Message-ID: <3XVNXx3j3czNZP@mail.python.org> http://hg.python.org/benchmarks/rev/17cf5eaf5999 changeset: 186:17cf5eaf5999 user: Brett Cannon date: Sun Sep 30 19:45:30 2012 -0400 summary: Add in telco as a Python 3 benchmark and move chameleon to a 2to3 benchmarks thanks to its pkg_resources dependency. files: perf.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perf.py b/perf.py --- a/perf.py +++ b/perf.py @@ -2102,14 +2102,14 @@ "logging": ["silent_logging", "simple_logging", "formatted_logging"], # Benchmarks natively 2.x- and 3.x-compatible - "2n3": ["calls", "chameleon", "chaos", "fannkuch", "fastpickle", + "2n3": ["calls", "chaos", "fannkuch", "fastpickle", "fastunpickle", "go", "hexiom2", "json_dump_v2", "json_load", "math", "logging", "meteor_contest", "normal_startup", "nqueens", "pathlib", "raytrace", - "regex", "richards", "spectral_norm", "startup_nosite", - "threading", "unpack_sequence"], + "regex", "richards", "spectral_norm", "startup_nosite", + "telco", "threading", "unpack_sequence"], # After 2to3-conversion - "py3k": ["2to3", "2n3", "mako_v2"] + "py3k": ["2to3", "2n3", "chameleon", "mako_v2"] } -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Mon Oct 1 02:09:54 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 02:09:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_More_whatsnew_?= =?utf-8?q?adds=2C_especially_the_os_module=2E?= Message-ID: <3XVP4y0cmVzQgB@mail.python.org> http://hg.python.org/cpython/rev/5242ccd0a3f6 changeset: 79351:5242ccd0a3f6 branch: 3.3 parent: 79349:4258248a44c7 user: R David Murray date: Sun Sep 30 20:07:42 2012 -0400 summary: More whatsnew adds, especially the os module. I went through all the versionchanged/versionadded tags in the os doc page for this changeset. files: Doc/whatsnew/3.3.rst | 51 ++++++++++++++++++++++++++----- Misc/NEWS | 4 +- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1504,12 +1504,20 @@ :func:`~os.link`, :func:`~os.lstat`, :func:`~os.mkdir`, :func:`~os.mkfifo`, :func:`~os.mknod`, :func:`~os.open`, :func:`~os.readlink`, :func:`~os.remove`, :func:`~os.rename`, :func:`~os.replace`, :func:`~os.rmdir`, :func:`~os.stat`, - :func:`~os.symlink`, :func:`~os.unlink`, :func:`~os.utime`. + :func:`~os.symlink`, :func:`~os.unlink`, :func:`~os.utime`. Platform + support for using these parameters can be checked via the sets + :data:`os.supports_dir_fd` and :data:`os.supports_follows_symlinks`. - The following functions now support a file descriptor for their path argument: :func:`~os.chdir`, :func:`~os.chmod`, :func:`~os.chown`, :func:`~os.execve`, :func:`~os.listdir`, :func:`~os.pathconf`, :func:`~os.path.exists`, - :func:`~os.stat`, :func:`~os.statvfs`, :func:`~os.utime`. + :func:`~os.stat`, :func:`~os.statvfs`, :func:`~os.utime`. Platform support + for this can be checked via the :data:`os.supports_fd` set. + +* :func:`~os.access` accepts an ``effective_ids`` keyword argument to turn on + using the effective uid/gid rather than the real uid/gid in the access check. + Platform support for this can be checked via the + :data:`~os.supports_effective_ids` set. * The :mod:`os` module has two new functions: :func:`~os.getpriority` and :func:`~os.setpriority`. They can be used to get or set process @@ -1558,7 +1566,7 @@ for a file. * :func:`~os.sync`: Force write of everything to disk. -* Add some extra posix functions to the os module: +* Additional new posix functions: * :func:`~os.lockf`: Apply, test or remove a POSIX lock on an open file descriptor. * :func:`~os.pread`: Read from a file descriptor at an offset, the file @@ -1577,6 +1585,12 @@ * :func:`~os.times` and :func:`~os.uname`: Return type changed from a tuple to a tuple-like object with named attributes. +* Some platforms now support additional constants for the :func:`~os.lseek` + function, such as ``os.SEEK_HOLE`` and ``os.SEEK_DATA``. + +* :func:`os.symlink` now accepts (and ignores) the ``target_is_directory`` + keyword argument on non-Windows platforms, to ease cross-platform support. + pdb --- @@ -1703,6 +1717,14 @@ instead of a RuntimeError: OSError has an errno attribute. +smtp +---- + +:class:`~smtplib.SMTP` now supports the context manager protocol, allowing an +``SMTP`` instance to be used in a ``with`` statement. (Contributed +by Giampaolo Rodol? in :issue:`11289`.) + + smtpd ----- @@ -1810,6 +1832,18 @@ (Contributed by Giampaolo Rodol? in :issue:`14807`) + +subprocess +---------- + +Command strings can now be bytes objects on posix platforms. (Contributed by +Victor Stiner in :issue:`8513`.) + +A new constant :data:`~subprocess.DEVNULL` allows suppressing output in a +platform-independent fashion. (Contributed by Ross Lagerwall in +:issue:`5870`.) + + sys --- @@ -1872,10 +1906,11 @@ :meth:`.assertRaises`, :meth:`.assertRaisesRegex`, :meth:`.assertWarns`, and :meth:`.assertWarnsRegex` now accept a keyword argument *msg* when used as -context managers. - -(Contributed by Ezio Melotti and Winston Ewert in :issue:`10775`) - +context managers. (Contributed by Ezio Melotti and Winston Ewert in +:issue:`10775`) + +:meth:`unittest.TestCase.run` now returns the :class:`~unittest.TestResult` +object. urllib ------ @@ -1993,7 +2028,7 @@ * :meth:`ftplib.FTP.nlst` and :meth:`ftplib.FTP.dir`: use :meth:`ftplib.FTP.mlsd` * :func:`platform.popen`: use the :mod:`subprocess` module. Check especially - the :ref:`subprocess-replacements` section. + the :ref:`subprocess-replacements` section (:issue:`11377`). * :issue:`13374`: The Windows bytes API has been deprecated in the :mod:`os` module. Use Unicode filenames, instead of bytes filenames, to not depend on the ANSI code page anymore and to support any filename. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3690,7 +3690,7 @@ not installed. Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile. Patch by Natalia B. Bidart. -- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used +- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used in a `with` statement. Contributed by Giampaolo Rodola. - Issue #11554: Fixed support for Japanese codecs; previously the body output @@ -3702,7 +3702,7 @@ - Issue #11407: `TestCase.run` returns the result object used or created. Contributed by Janathan Hartley. -- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified +- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified IP addresses in the proxy exception list. - Issue #11491: dbm.error is no longer raised when dbm.open is called with -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 02:09:55 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 02:09:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_More_whatsnew_adds=2C_especially_the_os_module?= =?utf-8?q?=2E?= Message-ID: <3XVP4z4SL4zP8b@mail.python.org> http://hg.python.org/cpython/rev/cc79da8c8970 changeset: 79352:cc79da8c8970 parent: 79350:abb5c5bde872 parent: 79351:5242ccd0a3f6 user: R David Murray date: Sun Sep 30 20:09:04 2012 -0400 summary: Merge: More whatsnew adds, especially the os module. I went through all the versionchanged/versionadded tags in the os doc page for this changeset. files: Doc/whatsnew/3.3.rst | 51 ++++++++++++++++++++++++++----- Misc/NEWS | 4 +- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1504,12 +1504,20 @@ :func:`~os.link`, :func:`~os.lstat`, :func:`~os.mkdir`, :func:`~os.mkfifo`, :func:`~os.mknod`, :func:`~os.open`, :func:`~os.readlink`, :func:`~os.remove`, :func:`~os.rename`, :func:`~os.replace`, :func:`~os.rmdir`, :func:`~os.stat`, - :func:`~os.symlink`, :func:`~os.unlink`, :func:`~os.utime`. + :func:`~os.symlink`, :func:`~os.unlink`, :func:`~os.utime`. Platform + support for using these parameters can be checked via the sets + :data:`os.supports_dir_fd` and :data:`os.supports_follows_symlinks`. - The following functions now support a file descriptor for their path argument: :func:`~os.chdir`, :func:`~os.chmod`, :func:`~os.chown`, :func:`~os.execve`, :func:`~os.listdir`, :func:`~os.pathconf`, :func:`~os.path.exists`, - :func:`~os.stat`, :func:`~os.statvfs`, :func:`~os.utime`. + :func:`~os.stat`, :func:`~os.statvfs`, :func:`~os.utime`. Platform support + for this can be checked via the :data:`os.supports_fd` set. + +* :func:`~os.access` accepts an ``effective_ids`` keyword argument to turn on + using the effective uid/gid rather than the real uid/gid in the access check. + Platform support for this can be checked via the + :data:`~os.supports_effective_ids` set. * The :mod:`os` module has two new functions: :func:`~os.getpriority` and :func:`~os.setpriority`. They can be used to get or set process @@ -1558,7 +1566,7 @@ for a file. * :func:`~os.sync`: Force write of everything to disk. -* Add some extra posix functions to the os module: +* Additional new posix functions: * :func:`~os.lockf`: Apply, test or remove a POSIX lock on an open file descriptor. * :func:`~os.pread`: Read from a file descriptor at an offset, the file @@ -1577,6 +1585,12 @@ * :func:`~os.times` and :func:`~os.uname`: Return type changed from a tuple to a tuple-like object with named attributes. +* Some platforms now support additional constants for the :func:`~os.lseek` + function, such as ``os.SEEK_HOLE`` and ``os.SEEK_DATA``. + +* :func:`os.symlink` now accepts (and ignores) the ``target_is_directory`` + keyword argument on non-Windows platforms, to ease cross-platform support. + pdb --- @@ -1703,6 +1717,14 @@ instead of a RuntimeError: OSError has an errno attribute. +smtp +---- + +:class:`~smtplib.SMTP` now supports the context manager protocol, allowing an +``SMTP`` instance to be used in a ``with`` statement. (Contributed +by Giampaolo Rodol? in :issue:`11289`.) + + smtpd ----- @@ -1810,6 +1832,18 @@ (Contributed by Giampaolo Rodol? in :issue:`14807`) + +subprocess +---------- + +Command strings can now be bytes objects on posix platforms. (Contributed by +Victor Stiner in :issue:`8513`.) + +A new constant :data:`~subprocess.DEVNULL` allows suppressing output in a +platform-independent fashion. (Contributed by Ross Lagerwall in +:issue:`5870`.) + + sys --- @@ -1872,10 +1906,11 @@ :meth:`.assertRaises`, :meth:`.assertRaisesRegex`, :meth:`.assertWarns`, and :meth:`.assertWarnsRegex` now accept a keyword argument *msg* when used as -context managers. - -(Contributed by Ezio Melotti and Winston Ewert in :issue:`10775`) - +context managers. (Contributed by Ezio Melotti and Winston Ewert in +:issue:`10775`) + +:meth:`unittest.TestCase.run` now returns the :class:`~unittest.TestResult` +object. urllib ------ @@ -1993,7 +2028,7 @@ * :meth:`ftplib.FTP.nlst` and :meth:`ftplib.FTP.dir`: use :meth:`ftplib.FTP.mlsd` * :func:`platform.popen`: use the :mod:`subprocess` module. Check especially - the :ref:`subprocess-replacements` section. + the :ref:`subprocess-replacements` section (:issue:`11377`). * :issue:`13374`: The Windows bytes API has been deprecated in the :mod:`os` module. Use Unicode filenames, instead of bytes filenames, to not depend on the ANSI code page anymore and to support any filename. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3700,7 +3700,7 @@ not installed. Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile. Patch by Natalia B. Bidart. -- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used +- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used in a `with` statement. Contributed by Giampaolo Rodola. - Issue #11554: Fixed support for Japanese codecs; previously the body output @@ -3712,7 +3712,7 @@ - Issue #11407: `TestCase.run` returns the result object used or created. Contributed by Janathan Hartley. -- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified +- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified IP addresses in the proxy exception list. - Issue #11491: dbm.error is no longer raised when dbm.open is called with -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 02:50:43 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 02:50:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_sqlite3_cl?= =?utf-8?q?ass_markup=2E?= Message-ID: <3XVQ033fjmzQXD@mail.python.org> http://hg.python.org/cpython/rev/c8b94273c5ee changeset: 79353:c8b94273c5ee branch: 3.2 parent: 79344:cb988d601803 user: R David Murray date: Sun Sep 30 20:44:43 2012 -0400 summary: Fix sqlite3 class markup. files: Doc/library/sqlite3.rst | 430 ++++++++++++++-------------- 1 files changed, 215 insertions(+), 215 deletions(-) diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -222,238 +222,238 @@ A SQLite database connection has the following attributes and methods: -.. attribute:: Connection.isolation_level + .. attribute:: isolation_level - Get or set the current isolation level. :const:`None` for autocommit mode or - one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section - :ref:`sqlite3-controlling-transactions` for a more detailed explanation. + Get or set the current isolation level. :const:`None` for autocommit mode or + one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section + :ref:`sqlite3-controlling-transactions` for a more detailed explanation. -.. attribute:: Connection.in_transaction + .. attribute:: in_transaction - :const:`True` if a transaction is active (there are uncommitted changes), - :const:`False` otherwise. Read-only attribute. + :const:`True` if a transaction is active (there are uncommitted changes), + :const:`False` otherwise. Read-only attribute. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. method:: Connection.cursor([cursorClass]) + .. method:: cursor([cursorClass]) - The cursor method accepts a single optional parameter *cursorClass*. If - supplied, this must be a custom cursor class that extends - :class:`sqlite3.Cursor`. + The cursor method accepts a single optional parameter *cursorClass*. If + supplied, this must be a custom cursor class that extends + :class:`sqlite3.Cursor`. -.. method:: Connection.commit() + .. method:: commit() - This method commits the current transaction. If you don't call this method, - anything you did since the last call to ``commit()`` is not visible from - other database connections. If you wonder why you don't see the data you've - written to the database, please check you didn't forget to call this method. + This method commits the current transaction. If you don't call this method, + anything you did since the last call to ``commit()`` is not visible from + other database connections. If you wonder why you don't see the data you've + written to the database, please check you didn't forget to call this method. -.. method:: Connection.rollback() + .. method:: rollback() - This method rolls back any changes to the database since the last call to - :meth:`commit`. + This method rolls back any changes to the database since the last call to + :meth:`commit`. -.. method:: Connection.close() + .. method:: close() - This closes the database connection. Note that this does not automatically - call :meth:`commit`. If you just close your database connection without - calling :meth:`commit` first, your changes will be lost! + This closes the database connection. Note that this does not automatically + call :meth:`commit`. If you just close your database connection without + calling :meth:`commit` first, your changes will be lost! -.. method:: Connection.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`execute - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`execute + ` method with the parameters given. -.. method:: Connection.executemany(sql, [parameters]) + .. method:: executemany(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executemany - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executemany + ` method with the parameters given. -.. method:: Connection.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executescript - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executescript + ` method with the parameters given. -.. method:: Connection.create_function(name, num_params, func) + .. method:: create_function(name, num_params, func) - Creates a user-defined function that you can later use from within SQL - statements under the function name *name*. *num_params* is the number of - parameters the function accepts, and *func* is a Python callable that is called - as the SQL function. + Creates a user-defined function that you can later use from within SQL + statements under the function name *name*. *num_params* is the number of + parameters the function accepts, and *func* is a Python callable that is called + as the SQL function. - The function can return any of the types supported by SQLite: bytes, str, int, - float and None. + The function can return any of the types supported by SQLite: bytes, str, int, + float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/md5func.py + .. literalinclude:: ../includes/sqlite3/md5func.py -.. method:: Connection.create_aggregate(name, num_params, aggregate_class) + .. method:: create_aggregate(name, num_params, aggregate_class) - Creates a user-defined aggregate function. + Creates a user-defined aggregate function. - The aggregate class must implement a ``step`` method, which accepts the number - of parameters *num_params*, and a ``finalize`` method which will return the - final result of the aggregate. + The aggregate class must implement a ``step`` method, which accepts the number + of parameters *num_params*, and a ``finalize`` method which will return the + final result of the aggregate. - The ``finalize`` method can return any of the types supported by SQLite: - bytes, str, int, float and None. + The ``finalize`` method can return any of the types supported by SQLite: + bytes, str, int, float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/mysumaggr.py + .. literalinclude:: ../includes/sqlite3/mysumaggr.py -.. method:: Connection.create_collation(name, callable) + .. method:: create_collation(name, callable) - Creates a collation with the specified *name* and *callable*. The callable will - be passed two string arguments. It should return -1 if the first is ordered - lower than the second, 0 if they are ordered equal and 1 if the first is ordered - higher than the second. Note that this controls sorting (ORDER BY in SQL) so - your comparisons don't affect other SQL operations. + Creates a collation with the specified *name* and *callable*. The callable will + be passed two string arguments. It should return -1 if the first is ordered + lower than the second, 0 if they are ordered equal and 1 if the first is ordered + higher than the second. Note that this controls sorting (ORDER BY in SQL) so + your comparisons don't affect other SQL operations. - Note that the callable will get its parameters as Python bytestrings, which will - normally be encoded in UTF-8. + Note that the callable will get its parameters as Python bytestrings, which will + normally be encoded in UTF-8. - The following example shows a custom collation that sorts "the wrong way": + The following example shows a custom collation that sorts "the wrong way": - .. literalinclude:: ../includes/sqlite3/collation_reverse.py + .. literalinclude:: ../includes/sqlite3/collation_reverse.py - To remove a collation, call ``create_collation`` with None as callable:: + To remove a collation, call ``create_collation`` with None as callable:: - con.create_collation("reverse", None) + con.create_collation("reverse", None) -.. method:: Connection.interrupt() + .. method:: interrupt() - You can call this method from a different thread to abort any queries that might - be executing on the connection. The query will then abort and the caller will - get an exception. + You can call this method from a different thread to abort any queries that might + be executing on the connection. The query will then abort and the caller will + get an exception. -.. method:: Connection.set_authorizer(authorizer_callback) + .. method:: set_authorizer(authorizer_callback) - This routine registers a callback. The callback is invoked for each attempt to - access a column of a table in the database. The callback should return - :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL - statement should be aborted with an error and :const:`SQLITE_IGNORE` if the - column should be treated as a NULL value. These constants are available in the - :mod:`sqlite3` module. + This routine registers a callback. The callback is invoked for each attempt to + access a column of a table in the database. The callback should return + :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL + statement should be aborted with an error and :const:`SQLITE_IGNORE` if the + column should be treated as a NULL value. These constants are available in the + :mod:`sqlite3` module. - The first argument to the callback signifies what kind of operation is to be - authorized. The second and third argument will be arguments or :const:`None` - depending on the first argument. The 4th argument is the name of the database - ("main", "temp", etc.) if applicable. The 5th argument is the name of the - inner-most trigger or view that is responsible for the access attempt or - :const:`None` if this access attempt is directly from input SQL code. + The first argument to the callback signifies what kind of operation is to be + authorized. The second and third argument will be arguments or :const:`None` + depending on the first argument. The 4th argument is the name of the database + ("main", "temp", etc.) if applicable. The 5th argument is the name of the + inner-most trigger or view that is responsible for the access attempt or + :const:`None` if this access attempt is directly from input SQL code. - Please consult the SQLite documentation about the possible values for the first - argument and the meaning of the second and third argument depending on the first - one. All necessary constants are available in the :mod:`sqlite3` module. + Please consult the SQLite documentation about the possible values for the first + argument and the meaning of the second and third argument depending on the first + one. All necessary constants are available in the :mod:`sqlite3` module. -.. method:: Connection.set_progress_handler(handler, n) + .. method:: set_progress_handler(handler, n) - This routine registers a callback. The callback is invoked for every *n* - instructions of the SQLite virtual machine. This is useful if you want to - get called from SQLite during long-running operations, for example to update - a GUI. + This routine registers a callback. The callback is invoked for every *n* + instructions of the SQLite virtual machine. This is useful if you want to + get called from SQLite during long-running operations, for example to update + a GUI. - If you want to clear any previously installed progress handler, call the - method with :const:`None` for *handler*. + If you want to clear any previously installed progress handler, call the + method with :const:`None` for *handler*. -.. method:: Connection.enable_load_extension(enabled) + .. method:: enable_load_extension(enabled) - This routine allows/disallows the SQLite engine to load SQLite extensions - from shared libraries. SQLite extensions can define new functions, - aggregates or whole new virtual table implementations. One well-known - extension is the fulltext-search extension distributed with SQLite. + This routine allows/disallows the SQLite engine to load SQLite extensions + from shared libraries. SQLite extensions can define new functions, + aggregates or whole new virtual table implementations. One well-known + extension is the fulltext-search extension distributed with SQLite. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 - .. literalinclude:: ../includes/sqlite3/load_extension.py + .. literalinclude:: ../includes/sqlite3/load_extension.py -.. method:: Connection.load_extension(path) + .. method:: load_extension(path) - This routine loads a SQLite extension from a shared library. You have to - enable extension loading with :meth:`enable_load_extension` before you can - use this routine. + This routine loads a SQLite extension from a shared library. You have to + enable extension loading with :meth:`enable_load_extension` before you can + use this routine. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. attribute:: Connection.row_factory + .. attribute:: row_factory - You can change this attribute to a callable that accepts the cursor and the - original row as a tuple and will return the real result row. This way, you can - implement more advanced ways of returning results, such as returning an object - that can also access columns by name. + You can change this attribute to a callable that accepts the cursor and the + original row as a tuple and will return the real result row. This way, you can + implement more advanced ways of returning results, such as returning an object + that can also access columns by name. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/row_factory.py + .. literalinclude:: ../includes/sqlite3/row_factory.py - If returning a tuple doesn't suffice and you want name-based access to - columns, you should consider setting :attr:`row_factory` to the - highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both - index-based and case-insensitive name-based access to columns with almost no - memory overhead. It will probably be better than your own custom - dictionary-based approach or even a db_row based solution. + If returning a tuple doesn't suffice and you want name-based access to + columns, you should consider setting :attr:`row_factory` to the + highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both + index-based and case-insensitive name-based access to columns with almost no + memory overhead. It will probably be better than your own custom + dictionary-based approach or even a db_row based solution. - .. XXX what's a db_row-based solution? + .. XXX what's a db_row-based solution? -.. attribute:: Connection.text_factory + .. attribute:: text_factory - Using this attribute you can control what objects are returned for the ``TEXT`` - data type. By default, this attribute is set to :class:`str` and the - :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to - return bytestrings instead, you can set it to :class:`bytes`. + Using this attribute you can control what objects are returned for the ``TEXT`` + data type. By default, this attribute is set to :class:`str` and the + :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to + return bytestrings instead, you can set it to :class:`bytes`. - For efficiency reasons, there's also a way to return :class:`str` objects - only for non-ASCII data, and :class:`bytes` otherwise. To activate it, set - this attribute to :const:`sqlite3.OptimizedUnicode`. + For efficiency reasons, there's also a way to return :class:`str` objects + only for non-ASCII data, and :class:`bytes` otherwise. To activate it, set + this attribute to :const:`sqlite3.OptimizedUnicode`. - You can also set it to any other callable that accepts a single bytestring - parameter and returns the resulting object. + You can also set it to any other callable that accepts a single bytestring + parameter and returns the resulting object. - See the following example code for illustration: + See the following example code for illustration: - .. literalinclude:: ../includes/sqlite3/text_factory.py + .. literalinclude:: ../includes/sqlite3/text_factory.py -.. attribute:: Connection.total_changes + .. attribute:: total_changes - Returns the total number of database rows that have been modified, inserted, or - deleted since the database connection was opened. + Returns the total number of database rows that have been modified, inserted, or + deleted since the database connection was opened. -.. attribute:: Connection.iterdump + .. attribute:: iterdump - Returns an iterator to dump the database in an SQL text format. Useful when - saving an in-memory database for later restoration. This function provides - the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` - shell. + Returns an iterator to dump the database in an SQL text format. Useful when + saving an in-memory database for later restoration. This function provides + the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` + shell. - Example:: + Example:: - # Convert file existing_db.db to SQL dump file dump.sql - import sqlite3, os + # Convert file existing_db.db to SQL dump file dump.sql + import sqlite3, os - con = sqlite3.connect('existing_db.db') - with open('dump.sql', 'w') as f: - for line in con.iterdump(): - f.write('%s\n' % line) + con = sqlite3.connect('existing_db.db') + with open('dump.sql', 'w') as f: + for line in con.iterdump(): + f.write('%s\n' % line) .. _sqlite3-cursor-objects: @@ -465,110 +465,110 @@ A :class:`Cursor` instance has the following attributes and methods. -.. method:: Cursor.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - Executes an SQL statement. The SQL statement may be parametrized (i. e. - placeholders instead of SQL literals). The :mod:`sqlite3` module supports two - kinds of placeholders: question marks (qmark style) and named placeholders - (named style). + Executes an SQL statement. The SQL statement may be parametrized (i. e. + placeholders instead of SQL literals). The :mod:`sqlite3` module supports two + kinds of placeholders: question marks (qmark style) and named placeholders + (named style). - Here's an example of both styles: + Here's an example of both styles: - .. literalinclude:: ../includes/sqlite3/execute_1.py + .. literalinclude:: ../includes/sqlite3/execute_1.py - :meth:`execute` will only execute a single SQL statement. If you try to execute - more than one statement with it, it will raise a Warning. Use - :meth:`executescript` if you want to execute multiple SQL statements with one - call. + :meth:`execute` will only execute a single SQL statement. If you try to execute + more than one statement with it, it will raise a Warning. Use + :meth:`executescript` if you want to execute multiple SQL statements with one + call. -.. method:: Cursor.executemany(sql, seq_of_parameters) + .. method:: executemany(sql, seq_of_parameters) - Executes an SQL command against all parameter sequences or mappings found in - the sequence *sql*. The :mod:`sqlite3` module also allows using an - :term:`iterator` yielding parameters instead of a sequence. + Executes an SQL command against all parameter sequences or mappings found in + the sequence *sql*. The :mod:`sqlite3` module also allows using an + :term:`iterator` yielding parameters instead of a sequence. - .. literalinclude:: ../includes/sqlite3/executemany_1.py + .. literalinclude:: ../includes/sqlite3/executemany_1.py - Here's a shorter example using a :term:`generator`: + Here's a shorter example using a :term:`generator`: - .. literalinclude:: ../includes/sqlite3/executemany_2.py + .. literalinclude:: ../includes/sqlite3/executemany_2.py -.. method:: Cursor.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard convenience method for executing multiple SQL statements - at once. It issues a ``COMMIT`` statement first, then executes the SQL script it - gets as a parameter. + This is a nonstandard convenience method for executing multiple SQL statements + at once. It issues a ``COMMIT`` statement first, then executes the SQL script it + gets as a parameter. - *sql_script* can be an instance of :class:`str` or :class:`bytes`. + *sql_script* can be an instance of :class:`str` or :class:`bytes`. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/executescript.py + .. literalinclude:: ../includes/sqlite3/executescript.py -.. method:: Cursor.fetchone() + .. method:: fetchone() - Fetches the next row of a query result set, returning a single sequence, - or :const:`None` when no more data is available. + Fetches the next row of a query result set, returning a single sequence, + or :const:`None` when no more data is available. -.. method:: Cursor.fetchmany(size=cursor.arraysize) + .. method:: fetchmany(size=cursor.arraysize) - Fetches the next set of rows of a query result, returning a list. An empty - list is returned when no more rows are available. + Fetches the next set of rows of a query result, returning a list. An empty + list is returned when no more rows are available. - The number of rows to fetch per call is specified by the *size* parameter. - If it is not given, the cursor's arraysize determines the number of rows - to be fetched. The method should try to fetch as many rows as indicated by - the size parameter. If this is not possible due to the specified number of - rows not being available, fewer rows may be returned. + The number of rows to fetch per call is specified by the *size* parameter. + If it is not given, the cursor's arraysize determines the number of rows + to be fetched. The method should try to fetch as many rows as indicated by + the size parameter. If this is not possible due to the specified number of + rows not being available, fewer rows may be returned. - Note there are performance considerations involved with the *size* parameter. - For optimal performance, it is usually best to use the arraysize attribute. - If the *size* parameter is used, then it is best for it to retain the same - value from one :meth:`fetchmany` call to the next. + Note there are performance considerations involved with the *size* parameter. + For optimal performance, it is usually best to use the arraysize attribute. + If the *size* parameter is used, then it is best for it to retain the same + value from one :meth:`fetchmany` call to the next. -.. method:: Cursor.fetchall() + .. method:: fetchall() - Fetches all (remaining) rows of a query result, returning a list. Note that - the cursor's arraysize attribute can affect the performance of this operation. - An empty list is returned when no rows are available. + Fetches all (remaining) rows of a query result, returning a list. Note that + the cursor's arraysize attribute can affect the performance of this operation. + An empty list is returned when no rows are available. -.. attribute:: Cursor.rowcount + .. attribute:: rowcount - Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this - attribute, the database engine's own support for the determination of "rows - affected"/"rows selected" is quirky. + Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this + attribute, the database engine's own support for the determination of "rows + affected"/"rows selected" is quirky. - For :meth:`executemany` statements, the number of modifications are summed up - into :attr:`rowcount`. + For :meth:`executemany` statements, the number of modifications are summed up + into :attr:`rowcount`. - As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in - case no ``executeXX()`` has been performed on the cursor or the rowcount of the - last operation is not determinable by the interface". This includes ``SELECT`` - statements because we cannot determine the number of rows a query produced - until all rows were fetched. + As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in + case no ``executeXX()`` has been performed on the cursor or the rowcount of the + last operation is not determinable by the interface". This includes ``SELECT`` + statements because we cannot determine the number of rows a query produced + until all rows were fetched. - With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if - you make a ``DELETE FROM table`` without any condition. + With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if + you make a ``DELETE FROM table`` without any condition. -.. attribute:: Cursor.lastrowid + .. attribute:: lastrowid - This read-only attribute provides the rowid of the last modified row. It is - only set if you issued a ``INSERT`` statement using the :meth:`execute` - method. For operations other than ``INSERT`` or when :meth:`executemany` is - called, :attr:`lastrowid` is set to :const:`None`. + This read-only attribute provides the rowid of the last modified row. It is + only set if you issued a ``INSERT`` statement using the :meth:`execute` + method. For operations other than ``INSERT`` or when :meth:`executemany` is + called, :attr:`lastrowid` is set to :const:`None`. -.. attribute:: Cursor.description + .. attribute:: description - This read-only attribute provides the column names of the last query. To - remain compatible with the Python DB API, it returns a 7-tuple for each - column where the last six items of each tuple are :const:`None`. + This read-only attribute provides the column names of the last query. To + remain compatible with the Python DB API, it returns a 7-tuple for each + column where the last six items of each tuple are :const:`None`. - It is set for ``SELECT`` statements without any matching rows as well. + It is set for ``SELECT`` statements without any matching rows as well. .. _sqlite3-row-objects: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 02:50:45 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 02:50:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge=3A_Fix_sqlite3_class_markup=2E?= Message-ID: <3XVQ051v0jzQbv@mail.python.org> http://hg.python.org/cpython/rev/2299ebc0698b changeset: 79354:2299ebc0698b branch: 3.3 parent: 79351:5242ccd0a3f6 parent: 79353:c8b94273c5ee user: R David Murray date: Sun Sep 30 20:49:19 2012 -0400 summary: Merge: Fix sqlite3 class markup. files: Doc/library/sqlite3.rst | 448 ++++++++++++++------------- 1 files changed, 226 insertions(+), 222 deletions(-) diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -222,250 +222,254 @@ A SQLite database connection has the following attributes and methods: -.. attribute:: Connection.isolation_level + .. attribute:: isolation_level - Get or set the current isolation level. :const:`None` for autocommit mode or - one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section - :ref:`sqlite3-controlling-transactions` for a more detailed explanation. + Get or set the current isolation level. :const:`None` for autocommit mode or + one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section + :ref:`sqlite3-controlling-transactions` for a more detailed explanation. -.. attribute:: Connection.in_transaction + .. attribute:: in_transaction - :const:`True` if a transaction is active (there are uncommitted changes), - :const:`False` otherwise. Read-only attribute. + :const:`True` if a transaction is active (there are uncommitted changes), + :const:`False` otherwise. Read-only attribute. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. method:: Connection.cursor([cursorClass]) + .. method:: cursor([cursorClass]) - The cursor method accepts a single optional parameter *cursorClass*. If - supplied, this must be a custom cursor class that extends - :class:`sqlite3.Cursor`. + The cursor method accepts a single optional parameter *cursorClass*. If + supplied, this must be a custom cursor class that extends + :class:`sqlite3.Cursor`. -.. method:: Connection.commit() + .. method:: commit() - This method commits the current transaction. If you don't call this method, - anything you did since the last call to ``commit()`` is not visible from - other database connections. If you wonder why you don't see the data you've - written to the database, please check you didn't forget to call this method. + This method commits the current transaction. If you don't call this method, + anything you did since the last call to ``commit()`` is not visible from + other database connections. If you wonder why you don't see the data you've + written to the database, please check you didn't forget to call this method. -.. method:: Connection.rollback() + .. method:: rollback() - This method rolls back any changes to the database since the last call to - :meth:`commit`. + This method rolls back any changes to the database since the last call to + :meth:`commit`. -.. method:: Connection.close() + .. method:: close() - This closes the database connection. Note that this does not automatically - call :meth:`commit`. If you just close your database connection without - calling :meth:`commit` first, your changes will be lost! + This closes the database connection. Note that this does not automatically + call :meth:`commit`. If you just close your database connection without + calling :meth:`commit` first, your changes will be lost! -.. method:: Connection.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`execute - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`execute + ` method with the parameters given. -.. method:: Connection.executemany(sql, [parameters]) + .. method:: executemany(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executemany - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executemany + ` method with the parameters given. -.. method:: Connection.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executescript - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executescript + ` method with the parameters given. -.. method:: Connection.create_function(name, num_params, func) + .. method:: create_function(name, num_params, func) - Creates a user-defined function that you can later use from within SQL - statements under the function name *name*. *num_params* is the number of - parameters the function accepts, and *func* is a Python callable that is called - as the SQL function. + Creates a user-defined function that you can later use from within SQL + statements under the function name *name*. *num_params* is the number of + parameters the function accepts, and *func* is a Python callable that is called + as the SQL function. - The function can return any of the types supported by SQLite: bytes, str, int, - float and None. + The function can return any of the types supported by SQLite: bytes, str, int, + float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/md5func.py + .. literalinclude:: ../includes/sqlite3/md5func.py -.. method:: Connection.create_aggregate(name, num_params, aggregate_class) + .. method:: create_aggregate(name, num_params, aggregate_class) - Creates a user-defined aggregate function. + Creates a user-defined aggregate function. - The aggregate class must implement a ``step`` method, which accepts the number - of parameters *num_params*, and a ``finalize`` method which will return the - final result of the aggregate. + The aggregate class must implement a ``step`` method, which accepts the number + of parameters *num_params*, and a ``finalize`` method which will return the + final result of the aggregate. - The ``finalize`` method can return any of the types supported by SQLite: - bytes, str, int, float and None. + The ``finalize`` method can return any of the types supported by SQLite: + bytes, str, int, float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/mysumaggr.py + .. literalinclude:: ../includes/sqlite3/mysumaggr.py -.. method:: Connection.create_collation(name, callable) + .. method:: create_collation(name, callable) - Creates a collation with the specified *name* and *callable*. The callable will - be passed two string arguments. It should return -1 if the first is ordered - lower than the second, 0 if they are ordered equal and 1 if the first is ordered - higher than the second. Note that this controls sorting (ORDER BY in SQL) so - your comparisons don't affect other SQL operations. + Creates a collation with the specified *name* and *callable*. The callable will + be passed two string arguments. It should return -1 if the first is ordered + lower than the second, 0 if they are ordered equal and 1 if the first is ordered + higher than the second. Note that this controls sorting (ORDER BY in SQL) so + your comparisons don't affect other SQL operations. - Note that the callable will get its parameters as Python bytestrings, which will - normally be encoded in UTF-8. + Note that the callable will get its parameters as Python bytestrings, which will + normally be encoded in UTF-8. - The following example shows a custom collation that sorts "the wrong way": + The following example shows a custom collation that sorts "the wrong way": - .. literalinclude:: ../includes/sqlite3/collation_reverse.py + .. literalinclude:: ../includes/sqlite3/collation_reverse.py - To remove a collation, call ``create_collation`` with None as callable:: + To remove a collation, call ``create_collation`` with None as callable:: - con.create_collation("reverse", None) + con.create_collation("reverse", None) -.. method:: Connection.interrupt() + .. method:: interrupt() - You can call this method from a different thread to abort any queries that might - be executing on the connection. The query will then abort and the caller will - get an exception. + You can call this method from a different thread to abort any queries that might + be executing on the connection. The query will then abort and the caller will + get an exception. -.. method:: Connection.set_authorizer(authorizer_callback) + .. method:: set_authorizer(authorizer_callback) - This routine registers a callback. The callback is invoked for each attempt to - access a column of a table in the database. The callback should return - :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL - statement should be aborted with an error and :const:`SQLITE_IGNORE` if the - column should be treated as a NULL value. These constants are available in the - :mod:`sqlite3` module. + This routine registers a callback. The callback is invoked for each attempt to + access a column of a table in the database. The callback should return + :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL + statement should be aborted with an error and :const:`SQLITE_IGNORE` if the + column should be treated as a NULL value. These constants are available in the + :mod:`sqlite3` module. - The first argument to the callback signifies what kind of operation is to be - authorized. The second and third argument will be arguments or :const:`None` - depending on the first argument. The 4th argument is the name of the database - ("main", "temp", etc.) if applicable. The 5th argument is the name of the - inner-most trigger or view that is responsible for the access attempt or - :const:`None` if this access attempt is directly from input SQL code. + The first argument to the callback signifies what kind of operation is to be + authorized. The second and third argument will be arguments or :const:`None` + depending on the first argument. The 4th argument is the name of the database + ("main", "temp", etc.) if applicable. The 5th argument is the name of the + inner-most trigger or view that is responsible for the access attempt or + :const:`None` if this access attempt is directly from input SQL code. - Please consult the SQLite documentation about the possible values for the first - argument and the meaning of the second and third argument depending on the first - one. All necessary constants are available in the :mod:`sqlite3` module. + Please consult the SQLite documentation about the possible values for the first + argument and the meaning of the second and third argument depending on the first + one. All necessary constants are available in the :mod:`sqlite3` module. -.. method:: Connection.set_progress_handler(handler, n) + .. method:: set_progress_handler(handler, n) - This routine registers a callback. The callback is invoked for every *n* - instructions of the SQLite virtual machine. This is useful if you want to - get called from SQLite during long-running operations, for example to update - a GUI. + This routine registers a callback. The callback is invoked for every *n* + instructions of the SQLite virtual machine. This is useful if you want to + get called from SQLite during long-running operations, for example to update + a GUI. - If you want to clear any previously installed progress handler, call the - method with :const:`None` for *handler*. + If you want to clear any previously installed progress handler, call the + method with :const:`None` for *handler*. -.. method:: Connection.set_trace_callback(trace_callback) + .. method:: set_trace_callback(trace_callback) - Registers *trace_callback* to be called for each SQL statement that is - actually executed by the SQLite backend. + Registers *trace_callback* to be called for each SQL statement that is + actually executed by the SQLite backend. - The only argument passed to the callback is the statement (as string) that - is being executed. The return value of the callback is ignored. Note that - the backend does not only run statements passed to the :meth:`Cursor.execute` - methods. Other sources include the transaction management of the Python - module and the execution of triggers defined in the current database. + The only argument passed to the callback is the statement (as string) that + is being executed. The return value of the callback is ignored. Note that + the backend does not only run statements passed to the :meth:`Cursor.execute` + methods. Other sources include the transaction management of the Python + module and the execution of triggers defined in the current database. - Passing :const:`None` as *trace_callback* will disable the trace callback. + Passing :const:`None` as *trace_callback* will disable the trace callback. - .. versionadded:: 3.3 + .. versionadded:: 3.3 -.. method:: Connection.enable_load_extension(enabled) + .. method:: enable_load_extension(enabled) - This routine allows/disallows the SQLite engine to load SQLite extensions - from shared libraries. SQLite extensions can define new functions, - aggregates or whole new virtual table implementations. One well-known - extension is the fulltext-search extension distributed with SQLite. + This routine allows/disallows the SQLite engine to load SQLite extensions + from shared libraries. SQLite extensions can define new functions, + aggregates or whole new virtual table implementations. One well-known + extension is the fulltext-search extension distributed with SQLite. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 - .. literalinclude:: ../includes/sqlite3/load_extension.py + .. literalinclude:: ../includes/sqlite3/load_extension.py -.. method:: Connection.load_extension(path) + .. method:: load_extension(path) - This routine loads a SQLite extension from a shared library. You have to - enable extension loading with :meth:`enable_load_extension` before you can - use this routine. + This routine loads a SQLite extension from a shared library. You have to + enable extension loading with :meth:`enable_load_extension` before you can + use this routine. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. attribute:: Connection.row_factory + .. attribute:: row_factory - You can change this attribute to a callable that accepts the cursor and the - original row as a tuple and will return the real result row. This way, you can - implement more advanced ways of returning results, such as returning an object - that can also access columns by name. + You can change this attribute to a callable that accepts the cursor and the + original row as a tuple and will return the real result row. This way, you can + implement more advanced ways of returning results, such as returning an object + that can also access columns by name. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/row_factory.py + .. literalinclude:: ../includes/sqlite3/row_factory.py - If returning a tuple doesn't suffice and you want name-based access to - columns, you should consider setting :attr:`row_factory` to the - highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both - index-based and case-insensitive name-based access to columns with almost no - memory overhead. It will probably be better than your own custom - dictionary-based approach or even a db_row based solution. + If returning a tuple doesn't suffice and you want name-based access to + columns, you should consider setting :attr:`row_factory` to the + highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both + index-based and case-insensitive name-based access to columns with almost no + memory overhead. It will probably be better than your own custom + dictionary-based approach or even a db_row based solution. - .. XXX what's a db_row-based solution? + .. XXX what's a db_row-based solution? -.. attribute:: Connection.text_factory + .. attribute:: text_factory - Using this attribute you can control what objects are returned for the ``TEXT`` - data type. By default, this attribute is set to :class:`str` and the - :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to - return bytestrings instead, you can set it to :class:`bytes`. + Using this attribute you can control what objects are returned for the ``TEXT`` + data type. By default, this attribute is set to :class:`str` and the + :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to + return bytestrings instead, you can set it to :class:`bytes`. - You can also set it to any other callable that accepts a single bytestring - parameter and returns the resulting object. + For efficiency reasons, there's also a way to return :class:`str` objects + only for non-ASCII data, and :class:`bytes` otherwise. To activate it, set + this attribute to :const:`sqlite3.OptimizedUnicode`. - See the following example code for illustration: + You can also set it to any other callable that accepts a single bytestring + parameter and returns the resulting object. - .. literalinclude:: ../includes/sqlite3/text_factory.py + See the following example code for illustration: + .. literalinclude:: ../includes/sqlite3/text_factory.py -.. attribute:: Connection.total_changes - Returns the total number of database rows that have been modified, inserted, or - deleted since the database connection was opened. + .. attribute:: total_changes + Returns the total number of database rows that have been modified, inserted, or + deleted since the database connection was opened. -.. attribute:: Connection.iterdump - Returns an iterator to dump the database in an SQL text format. Useful when - saving an in-memory database for later restoration. This function provides - the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` - shell. + .. attribute:: iterdump - Example:: + Returns an iterator to dump the database in an SQL text format. Useful when + saving an in-memory database for later restoration. This function provides + the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` + shell. - # Convert file existing_db.db to SQL dump file dump.sql - import sqlite3, os + Example:: - con = sqlite3.connect('existing_db.db') - with open('dump.sql', 'w') as f: - for line in con.iterdump(): - f.write('%s\n' % line) + # Convert file existing_db.db to SQL dump file dump.sql + import sqlite3, os + + con = sqlite3.connect('existing_db.db') + with open('dump.sql', 'w') as f: + for line in con.iterdump(): + f.write('%s\n' % line) .. _sqlite3-cursor-objects: @@ -477,110 +481,110 @@ A :class:`Cursor` instance has the following attributes and methods. -.. method:: Cursor.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - Executes an SQL statement. The SQL statement may be parametrized (i. e. - placeholders instead of SQL literals). The :mod:`sqlite3` module supports two - kinds of placeholders: question marks (qmark style) and named placeholders - (named style). + Executes an SQL statement. The SQL statement may be parametrized (i. e. + placeholders instead of SQL literals). The :mod:`sqlite3` module supports two + kinds of placeholders: question marks (qmark style) and named placeholders + (named style). - Here's an example of both styles: + Here's an example of both styles: - .. literalinclude:: ../includes/sqlite3/execute_1.py + .. literalinclude:: ../includes/sqlite3/execute_1.py - :meth:`execute` will only execute a single SQL statement. If you try to execute - more than one statement with it, it will raise a Warning. Use - :meth:`executescript` if you want to execute multiple SQL statements with one - call. + :meth:`execute` will only execute a single SQL statement. If you try to execute + more than one statement with it, it will raise a Warning. Use + :meth:`executescript` if you want to execute multiple SQL statements with one + call. -.. method:: Cursor.executemany(sql, seq_of_parameters) + .. method:: executemany(sql, seq_of_parameters) - Executes an SQL command against all parameter sequences or mappings found in - the sequence *sql*. The :mod:`sqlite3` module also allows using an - :term:`iterator` yielding parameters instead of a sequence. + Executes an SQL command against all parameter sequences or mappings found in + the sequence *sql*. The :mod:`sqlite3` module also allows using an + :term:`iterator` yielding parameters instead of a sequence. - .. literalinclude:: ../includes/sqlite3/executemany_1.py + .. literalinclude:: ../includes/sqlite3/executemany_1.py - Here's a shorter example using a :term:`generator`: + Here's a shorter example using a :term:`generator`: - .. literalinclude:: ../includes/sqlite3/executemany_2.py + .. literalinclude:: ../includes/sqlite3/executemany_2.py -.. method:: Cursor.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard convenience method for executing multiple SQL statements - at once. It issues a ``COMMIT`` statement first, then executes the SQL script it - gets as a parameter. + This is a nonstandard convenience method for executing multiple SQL statements + at once. It issues a ``COMMIT`` statement first, then executes the SQL script it + gets as a parameter. - *sql_script* can be an instance of :class:`str` or :class:`bytes`. + *sql_script* can be an instance of :class:`str` or :class:`bytes`. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/executescript.py + .. literalinclude:: ../includes/sqlite3/executescript.py -.. method:: Cursor.fetchone() + .. method:: fetchone() - Fetches the next row of a query result set, returning a single sequence, - or :const:`None` when no more data is available. + Fetches the next row of a query result set, returning a single sequence, + or :const:`None` when no more data is available. -.. method:: Cursor.fetchmany(size=cursor.arraysize) + .. method:: fetchmany(size=cursor.arraysize) - Fetches the next set of rows of a query result, returning a list. An empty - list is returned when no more rows are available. + Fetches the next set of rows of a query result, returning a list. An empty + list is returned when no more rows are available. - The number of rows to fetch per call is specified by the *size* parameter. - If it is not given, the cursor's arraysize determines the number of rows - to be fetched. The method should try to fetch as many rows as indicated by - the size parameter. If this is not possible due to the specified number of - rows not being available, fewer rows may be returned. + The number of rows to fetch per call is specified by the *size* parameter. + If it is not given, the cursor's arraysize determines the number of rows + to be fetched. The method should try to fetch as many rows as indicated by + the size parameter. If this is not possible due to the specified number of + rows not being available, fewer rows may be returned. - Note there are performance considerations involved with the *size* parameter. - For optimal performance, it is usually best to use the arraysize attribute. - If the *size* parameter is used, then it is best for it to retain the same - value from one :meth:`fetchmany` call to the next. + Note there are performance considerations involved with the *size* parameter. + For optimal performance, it is usually best to use the arraysize attribute. + If the *size* parameter is used, then it is best for it to retain the same + value from one :meth:`fetchmany` call to the next. -.. method:: Cursor.fetchall() + .. method:: fetchall() - Fetches all (remaining) rows of a query result, returning a list. Note that - the cursor's arraysize attribute can affect the performance of this operation. - An empty list is returned when no rows are available. + Fetches all (remaining) rows of a query result, returning a list. Note that + the cursor's arraysize attribute can affect the performance of this operation. + An empty list is returned when no rows are available. -.. attribute:: Cursor.rowcount + .. attribute:: rowcount - Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this - attribute, the database engine's own support for the determination of "rows - affected"/"rows selected" is quirky. + Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this + attribute, the database engine's own support for the determination of "rows + affected"/"rows selected" is quirky. - For :meth:`executemany` statements, the number of modifications are summed up - into :attr:`rowcount`. + For :meth:`executemany` statements, the number of modifications are summed up + into :attr:`rowcount`. - As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in - case no ``executeXX()`` has been performed on the cursor or the rowcount of the - last operation is not determinable by the interface". This includes ``SELECT`` - statements because we cannot determine the number of rows a query produced - until all rows were fetched. + As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in + case no ``executeXX()`` has been performed on the cursor or the rowcount of the + last operation is not determinable by the interface". This includes ``SELECT`` + statements because we cannot determine the number of rows a query produced + until all rows were fetched. - With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if - you make a ``DELETE FROM table`` without any condition. + With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if + you make a ``DELETE FROM table`` without any condition. -.. attribute:: Cursor.lastrowid + .. attribute:: lastrowid - This read-only attribute provides the rowid of the last modified row. It is - only set if you issued a ``INSERT`` statement using the :meth:`execute` - method. For operations other than ``INSERT`` or when :meth:`executemany` is - called, :attr:`lastrowid` is set to :const:`None`. + This read-only attribute provides the rowid of the last modified row. It is + only set if you issued a ``INSERT`` statement using the :meth:`execute` + method. For operations other than ``INSERT`` or when :meth:`executemany` is + called, :attr:`lastrowid` is set to :const:`None`. -.. attribute:: Cursor.description + .. attribute:: description - This read-only attribute provides the column names of the last query. To - remain compatible with the Python DB API, it returns a 7-tuple for each - column where the last six items of each tuple are :const:`None`. + This read-only attribute provides the column names of the last query. To + remain compatible with the Python DB API, it returns a 7-tuple for each + column where the last six items of each tuple are :const:`None`. - It is set for ``SELECT`` statements without any matching rows as well. + It is set for ``SELECT`` statements without any matching rows as well. .. _sqlite3-row-objects: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 02:50:47 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 02:50:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Fix_sqlite3_class_markup=2E?= Message-ID: <3XVQ070p0JzQZh@mail.python.org> http://hg.python.org/cpython/rev/da6310c5da09 changeset: 79355:da6310c5da09 parent: 79352:cc79da8c8970 parent: 79354:2299ebc0698b user: R David Murray date: Sun Sep 30 20:50:12 2012 -0400 summary: Merge: Fix sqlite3 class markup. files: Doc/library/sqlite3.rst | 448 ++++++++++++++------------- 1 files changed, 226 insertions(+), 222 deletions(-) diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -222,250 +222,254 @@ A SQLite database connection has the following attributes and methods: -.. attribute:: Connection.isolation_level + .. attribute:: isolation_level - Get or set the current isolation level. :const:`None` for autocommit mode or - one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section - :ref:`sqlite3-controlling-transactions` for a more detailed explanation. + Get or set the current isolation level. :const:`None` for autocommit mode or + one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section + :ref:`sqlite3-controlling-transactions` for a more detailed explanation. -.. attribute:: Connection.in_transaction + .. attribute:: in_transaction - :const:`True` if a transaction is active (there are uncommitted changes), - :const:`False` otherwise. Read-only attribute. + :const:`True` if a transaction is active (there are uncommitted changes), + :const:`False` otherwise. Read-only attribute. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. method:: Connection.cursor([cursorClass]) + .. method:: cursor([cursorClass]) - The cursor method accepts a single optional parameter *cursorClass*. If - supplied, this must be a custom cursor class that extends - :class:`sqlite3.Cursor`. + The cursor method accepts a single optional parameter *cursorClass*. If + supplied, this must be a custom cursor class that extends + :class:`sqlite3.Cursor`. -.. method:: Connection.commit() + .. method:: commit() - This method commits the current transaction. If you don't call this method, - anything you did since the last call to ``commit()`` is not visible from - other database connections. If you wonder why you don't see the data you've - written to the database, please check you didn't forget to call this method. + This method commits the current transaction. If you don't call this method, + anything you did since the last call to ``commit()`` is not visible from + other database connections. If you wonder why you don't see the data you've + written to the database, please check you didn't forget to call this method. -.. method:: Connection.rollback() + .. method:: rollback() - This method rolls back any changes to the database since the last call to - :meth:`commit`. + This method rolls back any changes to the database since the last call to + :meth:`commit`. -.. method:: Connection.close() + .. method:: close() - This closes the database connection. Note that this does not automatically - call :meth:`commit`. If you just close your database connection without - calling :meth:`commit` first, your changes will be lost! + This closes the database connection. Note that this does not automatically + call :meth:`commit`. If you just close your database connection without + calling :meth:`commit` first, your changes will be lost! -.. method:: Connection.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`execute - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`execute + ` method with the parameters given. -.. method:: Connection.executemany(sql, [parameters]) + .. method:: executemany(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executemany - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executemany + ` method with the parameters given. -.. method:: Connection.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executescript - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executescript + ` method with the parameters given. -.. method:: Connection.create_function(name, num_params, func) + .. method:: create_function(name, num_params, func) - Creates a user-defined function that you can later use from within SQL - statements under the function name *name*. *num_params* is the number of - parameters the function accepts, and *func* is a Python callable that is called - as the SQL function. + Creates a user-defined function that you can later use from within SQL + statements under the function name *name*. *num_params* is the number of + parameters the function accepts, and *func* is a Python callable that is called + as the SQL function. - The function can return any of the types supported by SQLite: bytes, str, int, - float and None. + The function can return any of the types supported by SQLite: bytes, str, int, + float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/md5func.py + .. literalinclude:: ../includes/sqlite3/md5func.py -.. method:: Connection.create_aggregate(name, num_params, aggregate_class) + .. method:: create_aggregate(name, num_params, aggregate_class) - Creates a user-defined aggregate function. + Creates a user-defined aggregate function. - The aggregate class must implement a ``step`` method, which accepts the number - of parameters *num_params*, and a ``finalize`` method which will return the - final result of the aggregate. + The aggregate class must implement a ``step`` method, which accepts the number + of parameters *num_params*, and a ``finalize`` method which will return the + final result of the aggregate. - The ``finalize`` method can return any of the types supported by SQLite: - bytes, str, int, float and None. + The ``finalize`` method can return any of the types supported by SQLite: + bytes, str, int, float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/mysumaggr.py + .. literalinclude:: ../includes/sqlite3/mysumaggr.py -.. method:: Connection.create_collation(name, callable) + .. method:: create_collation(name, callable) - Creates a collation with the specified *name* and *callable*. The callable will - be passed two string arguments. It should return -1 if the first is ordered - lower than the second, 0 if they are ordered equal and 1 if the first is ordered - higher than the second. Note that this controls sorting (ORDER BY in SQL) so - your comparisons don't affect other SQL operations. + Creates a collation with the specified *name* and *callable*. The callable will + be passed two string arguments. It should return -1 if the first is ordered + lower than the second, 0 if they are ordered equal and 1 if the first is ordered + higher than the second. Note that this controls sorting (ORDER BY in SQL) so + your comparisons don't affect other SQL operations. - Note that the callable will get its parameters as Python bytestrings, which will - normally be encoded in UTF-8. + Note that the callable will get its parameters as Python bytestrings, which will + normally be encoded in UTF-8. - The following example shows a custom collation that sorts "the wrong way": + The following example shows a custom collation that sorts "the wrong way": - .. literalinclude:: ../includes/sqlite3/collation_reverse.py + .. literalinclude:: ../includes/sqlite3/collation_reverse.py - To remove a collation, call ``create_collation`` with None as callable:: + To remove a collation, call ``create_collation`` with None as callable:: - con.create_collation("reverse", None) + con.create_collation("reverse", None) -.. method:: Connection.interrupt() + .. method:: interrupt() - You can call this method from a different thread to abort any queries that might - be executing on the connection. The query will then abort and the caller will - get an exception. + You can call this method from a different thread to abort any queries that might + be executing on the connection. The query will then abort and the caller will + get an exception. -.. method:: Connection.set_authorizer(authorizer_callback) + .. method:: set_authorizer(authorizer_callback) - This routine registers a callback. The callback is invoked for each attempt to - access a column of a table in the database. The callback should return - :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL - statement should be aborted with an error and :const:`SQLITE_IGNORE` if the - column should be treated as a NULL value. These constants are available in the - :mod:`sqlite3` module. + This routine registers a callback. The callback is invoked for each attempt to + access a column of a table in the database. The callback should return + :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL + statement should be aborted with an error and :const:`SQLITE_IGNORE` if the + column should be treated as a NULL value. These constants are available in the + :mod:`sqlite3` module. - The first argument to the callback signifies what kind of operation is to be - authorized. The second and third argument will be arguments or :const:`None` - depending on the first argument. The 4th argument is the name of the database - ("main", "temp", etc.) if applicable. The 5th argument is the name of the - inner-most trigger or view that is responsible for the access attempt or - :const:`None` if this access attempt is directly from input SQL code. + The first argument to the callback signifies what kind of operation is to be + authorized. The second and third argument will be arguments or :const:`None` + depending on the first argument. The 4th argument is the name of the database + ("main", "temp", etc.) if applicable. The 5th argument is the name of the + inner-most trigger or view that is responsible for the access attempt or + :const:`None` if this access attempt is directly from input SQL code. - Please consult the SQLite documentation about the possible values for the first - argument and the meaning of the second and third argument depending on the first - one. All necessary constants are available in the :mod:`sqlite3` module. + Please consult the SQLite documentation about the possible values for the first + argument and the meaning of the second and third argument depending on the first + one. All necessary constants are available in the :mod:`sqlite3` module. -.. method:: Connection.set_progress_handler(handler, n) + .. method:: set_progress_handler(handler, n) - This routine registers a callback. The callback is invoked for every *n* - instructions of the SQLite virtual machine. This is useful if you want to - get called from SQLite during long-running operations, for example to update - a GUI. + This routine registers a callback. The callback is invoked for every *n* + instructions of the SQLite virtual machine. This is useful if you want to + get called from SQLite during long-running operations, for example to update + a GUI. - If you want to clear any previously installed progress handler, call the - method with :const:`None` for *handler*. + If you want to clear any previously installed progress handler, call the + method with :const:`None` for *handler*. -.. method:: Connection.set_trace_callback(trace_callback) + .. method:: set_trace_callback(trace_callback) - Registers *trace_callback* to be called for each SQL statement that is - actually executed by the SQLite backend. + Registers *trace_callback* to be called for each SQL statement that is + actually executed by the SQLite backend. - The only argument passed to the callback is the statement (as string) that - is being executed. The return value of the callback is ignored. Note that - the backend does not only run statements passed to the :meth:`Cursor.execute` - methods. Other sources include the transaction management of the Python - module and the execution of triggers defined in the current database. + The only argument passed to the callback is the statement (as string) that + is being executed. The return value of the callback is ignored. Note that + the backend does not only run statements passed to the :meth:`Cursor.execute` + methods. Other sources include the transaction management of the Python + module and the execution of triggers defined in the current database. - Passing :const:`None` as *trace_callback* will disable the trace callback. + Passing :const:`None` as *trace_callback* will disable the trace callback. - .. versionadded:: 3.3 + .. versionadded:: 3.3 -.. method:: Connection.enable_load_extension(enabled) + .. method:: enable_load_extension(enabled) - This routine allows/disallows the SQLite engine to load SQLite extensions - from shared libraries. SQLite extensions can define new functions, - aggregates or whole new virtual table implementations. One well-known - extension is the fulltext-search extension distributed with SQLite. + This routine allows/disallows the SQLite engine to load SQLite extensions + from shared libraries. SQLite extensions can define new functions, + aggregates or whole new virtual table implementations. One well-known + extension is the fulltext-search extension distributed with SQLite. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 - .. literalinclude:: ../includes/sqlite3/load_extension.py + .. literalinclude:: ../includes/sqlite3/load_extension.py -.. method:: Connection.load_extension(path) + .. method:: load_extension(path) - This routine loads a SQLite extension from a shared library. You have to - enable extension loading with :meth:`enable_load_extension` before you can - use this routine. + This routine loads a SQLite extension from a shared library. You have to + enable extension loading with :meth:`enable_load_extension` before you can + use this routine. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. attribute:: Connection.row_factory + .. attribute:: row_factory - You can change this attribute to a callable that accepts the cursor and the - original row as a tuple and will return the real result row. This way, you can - implement more advanced ways of returning results, such as returning an object - that can also access columns by name. + You can change this attribute to a callable that accepts the cursor and the + original row as a tuple and will return the real result row. This way, you can + implement more advanced ways of returning results, such as returning an object + that can also access columns by name. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/row_factory.py + .. literalinclude:: ../includes/sqlite3/row_factory.py - If returning a tuple doesn't suffice and you want name-based access to - columns, you should consider setting :attr:`row_factory` to the - highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both - index-based and case-insensitive name-based access to columns with almost no - memory overhead. It will probably be better than your own custom - dictionary-based approach or even a db_row based solution. + If returning a tuple doesn't suffice and you want name-based access to + columns, you should consider setting :attr:`row_factory` to the + highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both + index-based and case-insensitive name-based access to columns with almost no + memory overhead. It will probably be better than your own custom + dictionary-based approach or even a db_row based solution. - .. XXX what's a db_row-based solution? + .. XXX what's a db_row-based solution? -.. attribute:: Connection.text_factory + .. attribute:: text_factory - Using this attribute you can control what objects are returned for the ``TEXT`` - data type. By default, this attribute is set to :class:`str` and the - :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to - return bytestrings instead, you can set it to :class:`bytes`. + Using this attribute you can control what objects are returned for the ``TEXT`` + data type. By default, this attribute is set to :class:`str` and the + :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to + return bytestrings instead, you can set it to :class:`bytes`. - You can also set it to any other callable that accepts a single bytestring - parameter and returns the resulting object. + For efficiency reasons, there's also a way to return :class:`str` objects + only for non-ASCII data, and :class:`bytes` otherwise. To activate it, set + this attribute to :const:`sqlite3.OptimizedUnicode`. - See the following example code for illustration: + You can also set it to any other callable that accepts a single bytestring + parameter and returns the resulting object. - .. literalinclude:: ../includes/sqlite3/text_factory.py + See the following example code for illustration: + .. literalinclude:: ../includes/sqlite3/text_factory.py -.. attribute:: Connection.total_changes - Returns the total number of database rows that have been modified, inserted, or - deleted since the database connection was opened. + .. attribute:: total_changes + Returns the total number of database rows that have been modified, inserted, or + deleted since the database connection was opened. -.. attribute:: Connection.iterdump - Returns an iterator to dump the database in an SQL text format. Useful when - saving an in-memory database for later restoration. This function provides - the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` - shell. + .. attribute:: iterdump - Example:: + Returns an iterator to dump the database in an SQL text format. Useful when + saving an in-memory database for later restoration. This function provides + the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` + shell. - # Convert file existing_db.db to SQL dump file dump.sql - import sqlite3, os + Example:: - con = sqlite3.connect('existing_db.db') - with open('dump.sql', 'w') as f: - for line in con.iterdump(): - f.write('%s\n' % line) + # Convert file existing_db.db to SQL dump file dump.sql + import sqlite3, os + + con = sqlite3.connect('existing_db.db') + with open('dump.sql', 'w') as f: + for line in con.iterdump(): + f.write('%s\n' % line) .. _sqlite3-cursor-objects: @@ -477,110 +481,110 @@ A :class:`Cursor` instance has the following attributes and methods. -.. method:: Cursor.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - Executes an SQL statement. The SQL statement may be parametrized (i. e. - placeholders instead of SQL literals). The :mod:`sqlite3` module supports two - kinds of placeholders: question marks (qmark style) and named placeholders - (named style). + Executes an SQL statement. The SQL statement may be parametrized (i. e. + placeholders instead of SQL literals). The :mod:`sqlite3` module supports two + kinds of placeholders: question marks (qmark style) and named placeholders + (named style). - Here's an example of both styles: + Here's an example of both styles: - .. literalinclude:: ../includes/sqlite3/execute_1.py + .. literalinclude:: ../includes/sqlite3/execute_1.py - :meth:`execute` will only execute a single SQL statement. If you try to execute - more than one statement with it, it will raise a Warning. Use - :meth:`executescript` if you want to execute multiple SQL statements with one - call. + :meth:`execute` will only execute a single SQL statement. If you try to execute + more than one statement with it, it will raise a Warning. Use + :meth:`executescript` if you want to execute multiple SQL statements with one + call. -.. method:: Cursor.executemany(sql, seq_of_parameters) + .. method:: executemany(sql, seq_of_parameters) - Executes an SQL command against all parameter sequences or mappings found in - the sequence *sql*. The :mod:`sqlite3` module also allows using an - :term:`iterator` yielding parameters instead of a sequence. + Executes an SQL command against all parameter sequences or mappings found in + the sequence *sql*. The :mod:`sqlite3` module also allows using an + :term:`iterator` yielding parameters instead of a sequence. - .. literalinclude:: ../includes/sqlite3/executemany_1.py + .. literalinclude:: ../includes/sqlite3/executemany_1.py - Here's a shorter example using a :term:`generator`: + Here's a shorter example using a :term:`generator`: - .. literalinclude:: ../includes/sqlite3/executemany_2.py + .. literalinclude:: ../includes/sqlite3/executemany_2.py -.. method:: Cursor.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard convenience method for executing multiple SQL statements - at once. It issues a ``COMMIT`` statement first, then executes the SQL script it - gets as a parameter. + This is a nonstandard convenience method for executing multiple SQL statements + at once. It issues a ``COMMIT`` statement first, then executes the SQL script it + gets as a parameter. - *sql_script* can be an instance of :class:`str` or :class:`bytes`. + *sql_script* can be an instance of :class:`str` or :class:`bytes`. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/executescript.py + .. literalinclude:: ../includes/sqlite3/executescript.py -.. method:: Cursor.fetchone() + .. method:: fetchone() - Fetches the next row of a query result set, returning a single sequence, - or :const:`None` when no more data is available. + Fetches the next row of a query result set, returning a single sequence, + or :const:`None` when no more data is available. -.. method:: Cursor.fetchmany(size=cursor.arraysize) + .. method:: fetchmany(size=cursor.arraysize) - Fetches the next set of rows of a query result, returning a list. An empty - list is returned when no more rows are available. + Fetches the next set of rows of a query result, returning a list. An empty + list is returned when no more rows are available. - The number of rows to fetch per call is specified by the *size* parameter. - If it is not given, the cursor's arraysize determines the number of rows - to be fetched. The method should try to fetch as many rows as indicated by - the size parameter. If this is not possible due to the specified number of - rows not being available, fewer rows may be returned. + The number of rows to fetch per call is specified by the *size* parameter. + If it is not given, the cursor's arraysize determines the number of rows + to be fetched. The method should try to fetch as many rows as indicated by + the size parameter. If this is not possible due to the specified number of + rows not being available, fewer rows may be returned. - Note there are performance considerations involved with the *size* parameter. - For optimal performance, it is usually best to use the arraysize attribute. - If the *size* parameter is used, then it is best for it to retain the same - value from one :meth:`fetchmany` call to the next. + Note there are performance considerations involved with the *size* parameter. + For optimal performance, it is usually best to use the arraysize attribute. + If the *size* parameter is used, then it is best for it to retain the same + value from one :meth:`fetchmany` call to the next. -.. method:: Cursor.fetchall() + .. method:: fetchall() - Fetches all (remaining) rows of a query result, returning a list. Note that - the cursor's arraysize attribute can affect the performance of this operation. - An empty list is returned when no rows are available. + Fetches all (remaining) rows of a query result, returning a list. Note that + the cursor's arraysize attribute can affect the performance of this operation. + An empty list is returned when no rows are available. -.. attribute:: Cursor.rowcount + .. attribute:: rowcount - Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this - attribute, the database engine's own support for the determination of "rows - affected"/"rows selected" is quirky. + Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this + attribute, the database engine's own support for the determination of "rows + affected"/"rows selected" is quirky. - For :meth:`executemany` statements, the number of modifications are summed up - into :attr:`rowcount`. + For :meth:`executemany` statements, the number of modifications are summed up + into :attr:`rowcount`. - As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in - case no ``executeXX()`` has been performed on the cursor or the rowcount of the - last operation is not determinable by the interface". This includes ``SELECT`` - statements because we cannot determine the number of rows a query produced - until all rows were fetched. + As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in + case no ``executeXX()`` has been performed on the cursor or the rowcount of the + last operation is not determinable by the interface". This includes ``SELECT`` + statements because we cannot determine the number of rows a query produced + until all rows were fetched. - With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if - you make a ``DELETE FROM table`` without any condition. + With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if + you make a ``DELETE FROM table`` without any condition. -.. attribute:: Cursor.lastrowid + .. attribute:: lastrowid - This read-only attribute provides the rowid of the last modified row. It is - only set if you issued a ``INSERT`` statement using the :meth:`execute` - method. For operations other than ``INSERT`` or when :meth:`executemany` is - called, :attr:`lastrowid` is set to :const:`None`. + This read-only attribute provides the rowid of the last modified row. It is + only set if you issued a ``INSERT`` statement using the :meth:`execute` + method. For operations other than ``INSERT`` or when :meth:`executemany` is + called, :attr:`lastrowid` is set to :const:`None`. -.. attribute:: Cursor.description + .. attribute:: description - This read-only attribute provides the column names of the last query. To - remain compatible with the Python DB API, it returns a 7-tuple for each - column where the last six items of each tuple are :const:`None`. + This read-only attribute provides the column names of the last query. To + remain compatible with the Python DB API, it returns a 7-tuple for each + column where the last six items of each tuple are :const:`None`. - It is set for ``SELECT`` statements without any matching rows as well. + It is set for ``SELECT`` statements without any matching rows as well. .. _sqlite3-row-objects: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 03:09:18 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 03:09:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_sqlite3_cl?= =?utf-8?q?ass_markup=2E?= Message-ID: <3XVQPV47GxzMtd@mail.python.org> http://hg.python.org/cpython/rev/bf8f92580c54 changeset: 79356:bf8f92580c54 branch: 2.7 parent: 79343:8f07ab82de92 user: R David Murray date: Sun Sep 30 21:04:46 2012 -0400 summary: Fix sqlite3 class markup. files: Doc/library/sqlite3.rst | 426 ++++++++++++++-------------- 1 files changed, 213 insertions(+), 213 deletions(-) diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -231,236 +231,236 @@ A SQLite database connection has the following attributes and methods: -.. attribute:: Connection.isolation_level + .. attribute:: isolation_level - Get or set the current isolation level. :const:`None` for autocommit mode or - one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section - :ref:`sqlite3-controlling-transactions` for a more detailed explanation. + Get or set the current isolation level. :const:`None` for autocommit mode or + one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section + :ref:`sqlite3-controlling-transactions` for a more detailed explanation. -.. method:: Connection.cursor([cursorClass]) + .. method:: cursor([cursorClass]) - The cursor method accepts a single optional parameter *cursorClass*. If - supplied, this must be a custom cursor class that extends - :class:`sqlite3.Cursor`. + The cursor method accepts a single optional parameter *cursorClass*. If + supplied, this must be a custom cursor class that extends + :class:`sqlite3.Cursor`. -.. method:: Connection.commit() + .. method:: commit() - This method commits the current transaction. If you don't call this method, - anything you did since the last call to ``commit()`` is not visible from - other database connections. If you wonder why you don't see the data you've - written to the database, please check you didn't forget to call this method. + This method commits the current transaction. If you don't call this method, + anything you did since the last call to ``commit()`` is not visible from + other database connections. If you wonder why you don't see the data you've + written to the database, please check you didn't forget to call this method. -.. method:: Connection.rollback() + .. method:: rollback() - This method rolls back any changes to the database since the last call to - :meth:`commit`. + This method rolls back any changes to the database since the last call to + :meth:`commit`. -.. method:: Connection.close() + .. method:: close() - This closes the database connection. Note that this does not automatically - call :meth:`commit`. If you just close your database connection without - calling :meth:`commit` first, your changes will be lost! + This closes the database connection. Note that this does not automatically + call :meth:`commit`. If you just close your database connection without + calling :meth:`commit` first, your changes will be lost! -.. method:: Connection.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`execute - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`execute + ` method with the parameters given. -.. method:: Connection.executemany(sql, [parameters]) + .. method:: executemany(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executemany - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executemany + ` method with the parameters given. -.. method:: Connection.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executescript - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executescript + ` method with the parameters given. -.. method:: Connection.create_function(name, num_params, func) + .. method:: create_function(name, num_params, func) - Creates a user-defined function that you can later use from within SQL - statements under the function name *name*. *num_params* is the number of - parameters the function accepts, and *func* is a Python callable that is called - as the SQL function. + Creates a user-defined function that you can later use from within SQL + statements under the function name *name*. *num_params* is the number of + parameters the function accepts, and *func* is a Python callable that is called + as the SQL function. - The function can return any of the types supported by SQLite: unicode, str, int, - long, float, buffer and None. + The function can return any of the types supported by SQLite: unicode, str, int, + long, float, buffer and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/md5func.py + .. literalinclude:: ../includes/sqlite3/md5func.py -.. method:: Connection.create_aggregate(name, num_params, aggregate_class) + .. method:: create_aggregate(name, num_params, aggregate_class) - Creates a user-defined aggregate function. + Creates a user-defined aggregate function. - The aggregate class must implement a ``step`` method, which accepts the number - of parameters *num_params*, and a ``finalize`` method which will return the - final result of the aggregate. + The aggregate class must implement a ``step`` method, which accepts the number + of parameters *num_params*, and a ``finalize`` method which will return the + final result of the aggregate. - The ``finalize`` method can return any of the types supported by SQLite: - unicode, str, int, long, float, buffer and None. + The ``finalize`` method can return any of the types supported by SQLite: + unicode, str, int, long, float, buffer and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/mysumaggr.py + .. literalinclude:: ../includes/sqlite3/mysumaggr.py -.. method:: Connection.create_collation(name, callable) + .. method:: create_collation(name, callable) - Creates a collation with the specified *name* and *callable*. The callable will - be passed two string arguments. It should return -1 if the first is ordered - lower than the second, 0 if they are ordered equal and 1 if the first is ordered - higher than the second. Note that this controls sorting (ORDER BY in SQL) so - your comparisons don't affect other SQL operations. + Creates a collation with the specified *name* and *callable*. The callable will + be passed two string arguments. It should return -1 if the first is ordered + lower than the second, 0 if they are ordered equal and 1 if the first is ordered + higher than the second. Note that this controls sorting (ORDER BY in SQL) so + your comparisons don't affect other SQL operations. - Note that the callable will get its parameters as Python bytestrings, which will - normally be encoded in UTF-8. + Note that the callable will get its parameters as Python bytestrings, which will + normally be encoded in UTF-8. - The following example shows a custom collation that sorts "the wrong way": + The following example shows a custom collation that sorts "the wrong way": - .. literalinclude:: ../includes/sqlite3/collation_reverse.py + .. literalinclude:: ../includes/sqlite3/collation_reverse.py - To remove a collation, call ``create_collation`` with None as callable:: + To remove a collation, call ``create_collation`` with None as callable:: - con.create_collation("reverse", None) + con.create_collation("reverse", None) -.. method:: Connection.interrupt() + .. method:: interrupt() - You can call this method from a different thread to abort any queries that might - be executing on the connection. The query will then abort and the caller will - get an exception. + You can call this method from a different thread to abort any queries that might + be executing on the connection. The query will then abort and the caller will + get an exception. -.. method:: Connection.set_authorizer(authorizer_callback) + .. method:: set_authorizer(authorizer_callback) - This routine registers a callback. The callback is invoked for each attempt to - access a column of a table in the database. The callback should return - :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL - statement should be aborted with an error and :const:`SQLITE_IGNORE` if the - column should be treated as a NULL value. These constants are available in the - :mod:`sqlite3` module. + This routine registers a callback. The callback is invoked for each attempt to + access a column of a table in the database. The callback should return + :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL + statement should be aborted with an error and :const:`SQLITE_IGNORE` if the + column should be treated as a NULL value. These constants are available in the + :mod:`sqlite3` module. - The first argument to the callback signifies what kind of operation is to be - authorized. The second and third argument will be arguments or :const:`None` - depending on the first argument. The 4th argument is the name of the database - ("main", "temp", etc.) if applicable. The 5th argument is the name of the - inner-most trigger or view that is responsible for the access attempt or - :const:`None` if this access attempt is directly from input SQL code. + The first argument to the callback signifies what kind of operation is to be + authorized. The second and third argument will be arguments or :const:`None` + depending on the first argument. The 4th argument is the name of the database + ("main", "temp", etc.) if applicable. The 5th argument is the name of the + inner-most trigger or view that is responsible for the access attempt or + :const:`None` if this access attempt is directly from input SQL code. - Please consult the SQLite documentation about the possible values for the first - argument and the meaning of the second and third argument depending on the first - one. All necessary constants are available in the :mod:`sqlite3` module. + Please consult the SQLite documentation about the possible values for the first + argument and the meaning of the second and third argument depending on the first + one. All necessary constants are available in the :mod:`sqlite3` module. -.. method:: Connection.set_progress_handler(handler, n) + .. method:: set_progress_handler(handler, n) - This routine registers a callback. The callback is invoked for every *n* - instructions of the SQLite virtual machine. This is useful if you want to - get called from SQLite during long-running operations, for example to update - a GUI. + This routine registers a callback. The callback is invoked for every *n* + instructions of the SQLite virtual machine. This is useful if you want to + get called from SQLite during long-running operations, for example to update + a GUI. - If you want to clear any previously installed progress handler, call the - method with :const:`None` for *handler*. + If you want to clear any previously installed progress handler, call the + method with :const:`None` for *handler*. - .. versionadded:: 2.6 + .. versionadded:: 2.6 -.. method:: Connection.enable_load_extension(enabled) + .. method:: enable_load_extension(enabled) - This routine allows/disallows the SQLite engine to load SQLite extensions - from shared libraries. SQLite extensions can define new functions, - aggregates or whole new virtual table implementations. One well-known - extension is the fulltext-search extension distributed with SQLite. + This routine allows/disallows the SQLite engine to load SQLite extensions + from shared libraries. SQLite extensions can define new functions, + aggregates or whole new virtual table implementations. One well-known + extension is the fulltext-search extension distributed with SQLite. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 2.7 + .. versionadded:: 2.7 - .. literalinclude:: ../includes/sqlite3/load_extension.py + .. literalinclude:: ../includes/sqlite3/load_extension.py -.. method:: Connection.load_extension(path) + .. method:: load_extension(path) - This routine loads a SQLite extension from a shared library. You have to - enable extension loading with :meth:`enable_load_extension` before you can - use this routine. + This routine loads a SQLite extension from a shared library. You have to + enable extension loading with :meth:`enable_load_extension` before you can + use this routine. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 2.7 + .. versionadded:: 2.7 -.. attribute:: Connection.row_factory + .. attribute:: row_factory - You can change this attribute to a callable that accepts the cursor and the - original row as a tuple and will return the real result row. This way, you can - implement more advanced ways of returning results, such as returning an object - that can also access columns by name. + You can change this attribute to a callable that accepts the cursor and the + original row as a tuple and will return the real result row. This way, you can + implement more advanced ways of returning results, such as returning an object + that can also access columns by name. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/row_factory.py + .. literalinclude:: ../includes/sqlite3/row_factory.py - If returning a tuple doesn't suffice and you want name-based access to - columns, you should consider setting :attr:`row_factory` to the - highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both - index-based and case-insensitive name-based access to columns with almost no - memory overhead. It will probably be better than your own custom - dictionary-based approach or even a db_row based solution. + If returning a tuple doesn't suffice and you want name-based access to + columns, you should consider setting :attr:`row_factory` to the + highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both + index-based and case-insensitive name-based access to columns with almost no + memory overhead. It will probably be better than your own custom + dictionary-based approach or even a db_row based solution. - .. XXX what's a db_row-based solution? + .. XXX what's a db_row-based solution? -.. attribute:: Connection.text_factory + .. attribute:: text_factory - Using this attribute you can control what objects are returned for the ``TEXT`` - data type. By default, this attribute is set to :class:`unicode` and the - :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to - return bytestrings instead, you can set it to :class:`str`. + Using this attribute you can control what objects are returned for the ``TEXT`` + data type. By default, this attribute is set to :class:`unicode` and the + :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to + return bytestrings instead, you can set it to :class:`str`. - For efficiency reasons, there's also a way to return Unicode objects only for - non-ASCII data, and bytestrings otherwise. To activate it, set this attribute to - :const:`sqlite3.OptimizedUnicode`. + For efficiency reasons, there's also a way to return Unicode objects only for + non-ASCII data, and bytestrings otherwise. To activate it, set this attribute to + :const:`sqlite3.OptimizedUnicode`. - You can also set it to any other callable that accepts a single bytestring - parameter and returns the resulting object. + You can also set it to any other callable that accepts a single bytestring + parameter and returns the resulting object. - See the following example code for illustration: + See the following example code for illustration: - .. literalinclude:: ../includes/sqlite3/text_factory.py + .. literalinclude:: ../includes/sqlite3/text_factory.py -.. attribute:: Connection.total_changes + .. attribute:: total_changes - Returns the total number of database rows that have been modified, inserted, or - deleted since the database connection was opened. + Returns the total number of database rows that have been modified, inserted, or + deleted since the database connection was opened. -.. attribute:: Connection.iterdump + .. attribute:: iterdump - Returns an iterator to dump the database in an SQL text format. Useful when - saving an in-memory database for later restoration. This function provides - the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` - shell. + Returns an iterator to dump the database in an SQL text format. Useful when + saving an in-memory database for later restoration. This function provides + the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` + shell. - .. versionadded:: 2.6 + .. versionadded:: 2.6 - Example:: + Example:: - # Convert file existing_db.db to SQL dump file dump.sql - import sqlite3, os + # Convert file existing_db.db to SQL dump file dump.sql + import sqlite3, os - con = sqlite3.connect('existing_db.db') - with open('dump.sql', 'w') as f: - for line in con.iterdump(): - f.write('%s\n' % line) + con = sqlite3.connect('existing_db.db') + with open('dump.sql', 'w') as f: + for line in con.iterdump(): + f.write('%s\n' % line) .. _sqlite3-cursor-objects: @@ -472,110 +472,110 @@ A :class:`Cursor` instance has the following attributes and methods. -.. method:: Cursor.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - Executes an SQL statement. The SQL statement may be parameterized (i. e. - placeholders instead of SQL literals). The :mod:`sqlite3` module supports two - kinds of placeholders: question marks (qmark style) and named placeholders - (named style). + Executes an SQL statement. The SQL statement may be parameterized (i. e. + placeholders instead of SQL literals). The :mod:`sqlite3` module supports two + kinds of placeholders: question marks (qmark style) and named placeholders + (named style). - Here's an example of both styles: + Here's an example of both styles: - .. literalinclude:: ../includes/sqlite3/execute_1.py + .. literalinclude:: ../includes/sqlite3/execute_1.py - :meth:`execute` will only execute a single SQL statement. If you try to execute - more than one statement with it, it will raise a Warning. Use - :meth:`executescript` if you want to execute multiple SQL statements with one - call. + :meth:`execute` will only execute a single SQL statement. If you try to execute + more than one statement with it, it will raise a Warning. Use + :meth:`executescript` if you want to execute multiple SQL statements with one + call. -.. method:: Cursor.executemany(sql, seq_of_parameters) + .. method:: executemany(sql, seq_of_parameters) - Executes an SQL command against all parameter sequences or mappings found in - the sequence *sql*. The :mod:`sqlite3` module also allows using an - :term:`iterator` yielding parameters instead of a sequence. + Executes an SQL command against all parameter sequences or mappings found in + the sequence *sql*. The :mod:`sqlite3` module also allows using an + :term:`iterator` yielding parameters instead of a sequence. - .. literalinclude:: ../includes/sqlite3/executemany_1.py + .. literalinclude:: ../includes/sqlite3/executemany_1.py - Here's a shorter example using a :term:`generator`: + Here's a shorter example using a :term:`generator`: - .. literalinclude:: ../includes/sqlite3/executemany_2.py + .. literalinclude:: ../includes/sqlite3/executemany_2.py -.. method:: Cursor.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard convenience method for executing multiple SQL statements - at once. It issues a ``COMMIT`` statement first, then executes the SQL script it - gets as a parameter. + This is a nonstandard convenience method for executing multiple SQL statements + at once. It issues a ``COMMIT`` statement first, then executes the SQL script it + gets as a parameter. - *sql_script* can be a bytestring or a Unicode string. + *sql_script* can be a bytestring or a Unicode string. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/executescript.py + .. literalinclude:: ../includes/sqlite3/executescript.py -.. method:: Cursor.fetchone() + .. method:: fetchone() - Fetches the next row of a query result set, returning a single sequence, - or :const:`None` when no more data is available. + Fetches the next row of a query result set, returning a single sequence, + or :const:`None` when no more data is available. -.. method:: Cursor.fetchmany([size=cursor.arraysize]) + .. method:: fetchmany([size=cursor.arraysize]) - Fetches the next set of rows of a query result, returning a list. An empty - list is returned when no more rows are available. + Fetches the next set of rows of a query result, returning a list. An empty + list is returned when no more rows are available. - The number of rows to fetch per call is specified by the *size* parameter. - If it is not given, the cursor's arraysize determines the number of rows - to be fetched. The method should try to fetch as many rows as indicated by - the size parameter. If this is not possible due to the specified number of - rows not being available, fewer rows may be returned. + The number of rows to fetch per call is specified by the *size* parameter. + If it is not given, the cursor's arraysize determines the number of rows + to be fetched. The method should try to fetch as many rows as indicated by + the size parameter. If this is not possible due to the specified number of + rows not being available, fewer rows may be returned. - Note there are performance considerations involved with the *size* parameter. - For optimal performance, it is usually best to use the arraysize attribute. - If the *size* parameter is used, then it is best for it to retain the same - value from one :meth:`fetchmany` call to the next. + Note there are performance considerations involved with the *size* parameter. + For optimal performance, it is usually best to use the arraysize attribute. + If the *size* parameter is used, then it is best for it to retain the same + value from one :meth:`fetchmany` call to the next. -.. method:: Cursor.fetchall() + .. method:: fetchall() - Fetches all (remaining) rows of a query result, returning a list. Note that - the cursor's arraysize attribute can affect the performance of this operation. - An empty list is returned when no rows are available. + Fetches all (remaining) rows of a query result, returning a list. Note that + the cursor's arraysize attribute can affect the performance of this operation. + An empty list is returned when no rows are available. -.. attribute:: Cursor.rowcount + .. attribute:: rowcount - Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this - attribute, the database engine's own support for the determination of "rows - affected"/"rows selected" is quirky. + Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this + attribute, the database engine's own support for the determination of "rows + affected"/"rows selected" is quirky. - For :meth:`executemany` statements, the number of modifications are summed up - into :attr:`rowcount`. + For :meth:`executemany` statements, the number of modifications are summed up + into :attr:`rowcount`. - As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in - case no ``executeXX()`` has been performed on the cursor or the rowcount of the - last operation is not determinable by the interface". This includes ``SELECT`` - statements because we cannot determine the number of rows a query produced - until all rows were fetched. + As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in + case no ``executeXX()`` has been performed on the cursor or the rowcount of the + last operation is not determinable by the interface". This includes ``SELECT`` + statements because we cannot determine the number of rows a query produced + until all rows were fetched. - With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if - you make a ``DELETE FROM table`` without any condition. + With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if + you make a ``DELETE FROM table`` without any condition. -.. attribute:: Cursor.lastrowid + .. attribute:: lastrowid - This read-only attribute provides the rowid of the last modified row. It is - only set if you issued a ``INSERT`` statement using the :meth:`execute` - method. For operations other than ``INSERT`` or when :meth:`executemany` is - called, :attr:`lastrowid` is set to :const:`None`. + This read-only attribute provides the rowid of the last modified row. It is + only set if you issued a ``INSERT`` statement using the :meth:`execute` + method. For operations other than ``INSERT`` or when :meth:`executemany` is + called, :attr:`lastrowid` is set to :const:`None`. -.. attribute:: Cursor.description + .. attribute:: description - This read-only attribute provides the column names of the last query. To - remain compatible with the Python DB API, it returns a 7-tuple for each - column where the last six items of each tuple are :const:`None`. + This read-only attribute provides the column names of the last query. To + remain compatible with the Python DB API, it returns a 7-tuple for each + column where the last six items of each tuple are :const:`None`. - It is set for ``SELECT`` statements without any matching rows as well. + It is set for ``SELECT`` statements without any matching rows as well. .. _sqlite3-row-objects: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 04:00:46 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 04:00:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_More_additions?= =?utf-8?q?_to_whatsnew=2E?= Message-ID: <3XVRXt45WfzQW4@mail.python.org> http://hg.python.org/cpython/rev/0ab4257e685d changeset: 79357:0ab4257e685d branch: 3.3 parent: 79354:2299ebc0698b user: R David Murray date: Sun Sep 30 21:59:56 2012 -0400 summary: More additions to whatsnew. files: Doc/whatsnew/3.3.rst | 72 ++++++++++++++++++++++++------- Misc/NEWS | 8 +- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1325,6 +1325,11 @@ package transparently encodes and decodes the unicode to and from the RFC standard Content Transfer Encodings. +Other API Changes +~~~~~~~~~~~~~~~~~ + +Added :class:`email.parser.BytesHeaderParser`. + ftplib ------ @@ -1371,6 +1376,16 @@ (Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`) +http +---- + +:class:`http.server.BaseHTTPRequestHandler` now buffers the headers and writes +them all at once when :meth:`~http.server.BaseHTTPRequestHandler.end_headers` is +called. A new method :meth:`~http.server.BaseHTTPRequestHandler.flush_headers` +can be used to directly manage when the accumlated headers are sent. +(Contributed by Andrew Schaaf in :issue:`3709`.) + + html.parser ----------- @@ -1385,6 +1400,7 @@ :issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`, :issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`) + imaplib ------- @@ -1427,6 +1443,20 @@ underlying binary buffer. +itertools +--------- + +:func:`~itertools.accumulate` now takes an optional ``func`` argument for +providing a user-supplied binary function. + + +logging +------- + +:func:`~logging.basicConfig` now supports an optional ``handlers`` argument +taking an iterable of handlers to be added to the root logger. + + math ---- @@ -1775,6 +1805,15 @@ (Contributed by Ross Lagerwall in :issue:`10866`.) +sqlite3 +------- + +New :class:`sqlite3.Connection` method +:meth:`~sqlite3.Connection.set_trace_callback` can be used to capture a trace of +all sql commands processed by sqlite. (Contributed by Torsten Landschoff +in :issue:`11688`.) + + ssl --- @@ -1788,41 +1827,37 @@ * The :mod:`ssl` module now exposes a finer-grained exception hierarchy in order to make it easier to inspect the various kinds of errors. - (Contributed by Antoine Pitrou in :issue:`11183`) * :meth:`~ssl.SSLContext.load_cert_chain` now accepts a *password* argument to be used if the private key is encrypted. - (Contributed by Adam Simpkins in :issue:`12803`) * Diffie-Hellman key exchange, both regular and Elliptic Curve-based, is now supported through the :meth:`~ssl.SSLContext.load_dh_params` and :meth:`~ssl.SSLContext.set_ecdh_curve` methods. - (Contributed by Antoine Pitrou in :issue:`13626` and :issue:`13627`) * SSL sockets have a new :meth:`~ssl.SSLSocket.get_channel_binding` method allowing the implementation of certain authentication mechanisms such as - SCRAM-SHA-1-PLUS. - - (Contributed by Jacek Konieczny in :issue:`12551`) + SCRAM-SHA-1-PLUS. (Contributed by Jacek Konieczny in :issue:`12551`) * You can query the SSL compression algorithm used by an SSL socket, thanks to its new :meth:`~ssl.SSLSocket.compression` method. - (Contributed by Antoine Pitrou in :issue:`13634`) * Support has been added for the Next Procotol Negotiation extension using the :meth:`ssl.SSLContext.set_npn_protocols` method. - (Contributed by Colin Marc in :issue:`14204`) * SSL errors can now be introspected more easily thanks to :attr:`~ssl.SSLError.library` and :attr:`~ssl.SSLError.reason` attributes. - (Contributed by Antoine Pitrou in :issue:`14837`) +* The :func:`~ssl.get_server_certificate` function now supports IPv6. + (Contributed by Charles-Fran?ois Natali in :issue:`11811`.) + + stat ---- @@ -1837,7 +1872,7 @@ ---------- Command strings can now be bytes objects on posix platforms. (Contributed by -Victor Stiner in :issue:`8513`.) +Victor Stinner in :issue:`8513`.) A new constant :data:`~subprocess.DEVNULL` allows suppressing output in a platform-independent fashion. (Contributed by Ross Lagerwall in @@ -1848,18 +1883,15 @@ --- The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct -sequence` holding informations about the thread implementation. - -(:issue:`11223`) +sequence` holding informations about the thread implementation +(:issue:`11223`). textwrap -------- The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes it straightforward to add a common prefix to selected lines in a block -of text. - -(:issue:`13857`) +of text (:issue:`13857`). threading @@ -2222,6 +2254,14 @@ :exc:`poplib.error_proto` errors may need to be changed if errors on ``quit`` are encountered by a particular application (:issue:`11291`). +* The ``strict`` argument to :class:`email.parser.Parser`, deprecated since + Python 2.4, has finally been removed. + +* The deprecated method ``unittest.TestCase.assertSameElements`` has been + removed. + +* The deprecated variable ``time.accept2dyear`` has been removed. + Porting C code -------------- diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3386,9 +3386,9 @@ - Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, instead of a RuntimeError: OSError has an errno attribute. -- Issue #3709: a flush_headers method to BaseHTTPRequestHandler which manages - the sending of headers to output stream and flushing the internal headers - buffer. Patch contribution by Andrew Schaaf +- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which + manages the sending of headers to output stream and flushing the internal + headers buffer. Patch contribution by Andrew Schaaf - Issue #11743: Rewrite multiprocessing connection classes in pure Python. @@ -4982,7 +4982,7 @@ - Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to output stream only when end_headers is invoked. This is a speedup and an - internal optimization. Patch by endian. + internal optimization. Patch by Andrew Shaaf. - Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho Eckhardt. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 04:00:48 2012 From: python-checkins at python.org (r.david.murray) Date: Mon, 1 Oct 2012 04:00:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_More_additions_to_whatsnew=2E?= Message-ID: <3XVRXw17clzQcS@mail.python.org> http://hg.python.org/cpython/rev/7fd8f09ecf3c changeset: 79358:7fd8f09ecf3c parent: 79355:da6310c5da09 parent: 79357:0ab4257e685d user: R David Murray date: Sun Sep 30 22:00:29 2012 -0400 summary: Merge: More additions to whatsnew. files: Doc/whatsnew/3.3.rst | 72 ++++++++++++++++++++++++------- Misc/NEWS | 8 +- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1325,6 +1325,11 @@ package transparently encodes and decodes the unicode to and from the RFC standard Content Transfer Encodings. +Other API Changes +~~~~~~~~~~~~~~~~~ + +Added :class:`email.parser.BytesHeaderParser`. + ftplib ------ @@ -1371,6 +1376,16 @@ (Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`) +http +---- + +:class:`http.server.BaseHTTPRequestHandler` now buffers the headers and writes +them all at once when :meth:`~http.server.BaseHTTPRequestHandler.end_headers` is +called. A new method :meth:`~http.server.BaseHTTPRequestHandler.flush_headers` +can be used to directly manage when the accumlated headers are sent. +(Contributed by Andrew Schaaf in :issue:`3709`.) + + html.parser ----------- @@ -1385,6 +1400,7 @@ :issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`, :issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`) + imaplib ------- @@ -1427,6 +1443,20 @@ underlying binary buffer. +itertools +--------- + +:func:`~itertools.accumulate` now takes an optional ``func`` argument for +providing a user-supplied binary function. + + +logging +------- + +:func:`~logging.basicConfig` now supports an optional ``handlers`` argument +taking an iterable of handlers to be added to the root logger. + + math ---- @@ -1775,6 +1805,15 @@ (Contributed by Ross Lagerwall in :issue:`10866`.) +sqlite3 +------- + +New :class:`sqlite3.Connection` method +:meth:`~sqlite3.Connection.set_trace_callback` can be used to capture a trace of +all sql commands processed by sqlite. (Contributed by Torsten Landschoff +in :issue:`11688`.) + + ssl --- @@ -1788,41 +1827,37 @@ * The :mod:`ssl` module now exposes a finer-grained exception hierarchy in order to make it easier to inspect the various kinds of errors. - (Contributed by Antoine Pitrou in :issue:`11183`) * :meth:`~ssl.SSLContext.load_cert_chain` now accepts a *password* argument to be used if the private key is encrypted. - (Contributed by Adam Simpkins in :issue:`12803`) * Diffie-Hellman key exchange, both regular and Elliptic Curve-based, is now supported through the :meth:`~ssl.SSLContext.load_dh_params` and :meth:`~ssl.SSLContext.set_ecdh_curve` methods. - (Contributed by Antoine Pitrou in :issue:`13626` and :issue:`13627`) * SSL sockets have a new :meth:`~ssl.SSLSocket.get_channel_binding` method allowing the implementation of certain authentication mechanisms such as - SCRAM-SHA-1-PLUS. - - (Contributed by Jacek Konieczny in :issue:`12551`) + SCRAM-SHA-1-PLUS. (Contributed by Jacek Konieczny in :issue:`12551`) * You can query the SSL compression algorithm used by an SSL socket, thanks to its new :meth:`~ssl.SSLSocket.compression` method. - (Contributed by Antoine Pitrou in :issue:`13634`) * Support has been added for the Next Procotol Negotiation extension using the :meth:`ssl.SSLContext.set_npn_protocols` method. - (Contributed by Colin Marc in :issue:`14204`) * SSL errors can now be introspected more easily thanks to :attr:`~ssl.SSLError.library` and :attr:`~ssl.SSLError.reason` attributes. - (Contributed by Antoine Pitrou in :issue:`14837`) +* The :func:`~ssl.get_server_certificate` function now supports IPv6. + (Contributed by Charles-Fran?ois Natali in :issue:`11811`.) + + stat ---- @@ -1837,7 +1872,7 @@ ---------- Command strings can now be bytes objects on posix platforms. (Contributed by -Victor Stiner in :issue:`8513`.) +Victor Stinner in :issue:`8513`.) A new constant :data:`~subprocess.DEVNULL` allows suppressing output in a platform-independent fashion. (Contributed by Ross Lagerwall in @@ -1848,18 +1883,15 @@ --- The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct -sequence` holding informations about the thread implementation. - -(:issue:`11223`) +sequence` holding informations about the thread implementation +(:issue:`11223`). textwrap -------- The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes it straightforward to add a common prefix to selected lines in a block -of text. - -(:issue:`13857`) +of text (:issue:`13857`). threading @@ -2222,6 +2254,14 @@ :exc:`poplib.error_proto` errors may need to be changed if errors on ``quit`` are encountered by a particular application (:issue:`11291`). +* The ``strict`` argument to :class:`email.parser.Parser`, deprecated since + Python 2.4, has finally been removed. + +* The deprecated method ``unittest.TestCase.assertSameElements`` has been + removed. + +* The deprecated variable ``time.accept2dyear`` has been removed. + Porting C code -------------- diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3396,9 +3396,9 @@ - Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, instead of a RuntimeError: OSError has an errno attribute. -- Issue #3709: a flush_headers method to BaseHTTPRequestHandler which manages - the sending of headers to output stream and flushing the internal headers - buffer. Patch contribution by Andrew Schaaf +- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which + manages the sending of headers to output stream and flushing the internal + headers buffer. Patch contribution by Andrew Schaaf - Issue #11743: Rewrite multiprocessing connection classes in pure Python. @@ -4992,7 +4992,7 @@ - Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to output stream only when end_headers is invoked. This is a speedup and an - internal optimization. Patch by endian. + internal optimization. Patch by Andrew Shaaf. - Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho Eckhardt. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 06:11:04 2012 From: python-checkins at python.org (chris.jerdonek) Date: Mon, 1 Oct 2012 06:11:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2UgIzE2MDM2?= =?utf-8?q?=3A_Backport_3=2Ex_documentation_improvement=2E?= Message-ID: <3XVVRD6kSrzQn3@mail.python.org> http://hg.python.org/cpython/rev/ed76eac4491e changeset: 79359:ed76eac4491e branch: 2.7 parent: 79356:bf8f92580c54 user: Chris Jerdonek date: Sun Sep 30 21:07:56 2012 -0700 summary: Close #16036: Backport 3.x documentation improvement. See changeset 6ccb04c4cbae for the corresponding 3.3 change. files: Doc/library/functions.rst | 32 ++++++++++++++++---------- Misc/NEWS | 3 ++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -623,20 +623,26 @@ Consider using the :func:`raw_input` function for general input from users. -.. function:: int([x[, base]]) +.. function:: int(x=0) + int(x, base=10) - Convert a string or number to a plain integer. If the argument is a string, - it must contain a possibly signed decimal number representable as a Python - integer, possibly embedded in whitespace. The *base* parameter gives the - base for the conversion (which is 10 by default) and may be any integer in - the range [2, 36], or zero. If *base* is zero, the proper radix is - determined based on the contents of string; the interpretation is the same as - for integer literals. (See :ref:`numbers`.) If *base* is specified and *x* - is not a string, :exc:`TypeError` is raised. Otherwise, the argument may be a - plain or long integer or a floating point number. Conversion of floating - point numbers to integers truncates (towards zero). If the argument is - outside the integer range a long object will be returned instead. If no - arguments are given, returns ``0``. + Convert a number or string *x* to an integer, or return ``0`` if no + arguments are given. If *x* is a number, it can be a plain integer, a long + integer, or a floating point number. If *x* is floating point, the conversion + truncates towards zero. If the argument is outside the integer range, the + function returns a long object instead. + + If *x* is not a number or if *base* is given, then *x* must be a string or + Unicode object representing an :ref:`integer literal ` in radix + *base*. Optionally, the literal can be + preceded by ``+`` or ``-`` (with no space in between) and surrounded by + whitespace. A base-n literal consists of the digits 0 to n-1, with ``a`` + to ``z`` (or ``A`` to ``Z``) having + values 10 to 35. The default *base* is 10. The allowed values are 0 and 2-36. + Base-2, -8, and -16 literals can be optionally prefixed with ``0b``/``0B``, + ``0o``/``0O``/``0``, or ``0x``/``0X``, as with integer literals in code. + Base 0 means to interpret the string exactly as an integer literal, so that + the actual base is 2, 8, 10, or 16. The integer type is described in :ref:`typesnumeric`. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -459,6 +459,9 @@ Documentation ------------- +- Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + - Issue #15935: Clarification of argparse docs, re: add_argument() type and default arguments. Patch contributed by Chris Jerdonek. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 06:19:35 2012 From: python-checkins at python.org (ezio.melotti) Date: Mon, 1 Oct 2012 06:19:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Update_suspici?= =?utf-8?q?ous_ignore_file=2E?= Message-ID: <3XVVd325jqzQkl@mail.python.org> http://hg.python.org/cpython/rev/7877575a11ee changeset: 79360:7877575a11ee branch: 3.3 parent: 79357:0ab4257e685d user: Ezio Melotti date: Mon Oct 01 07:10:08 2012 +0300 summary: Update suspicious ignore file. files: Doc/tools/sphinxext/susp-ignored.csv | 12 ++++++++++++ Misc/NEWS | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -357,3 +357,15 @@ whatsnew/3.2,,:location,zope9-location = ${zope9:location} whatsnew/3.2,,:prefix,... zope-conf = ${custom:prefix}/etc/zope.conf whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf +whatsnew/news,,:platform,:platform: +whatsnew/news,,:password,: Unquote before b64encoding user:password during Basic +whatsnew/news,,:close,Connection:close header. +whatsnew/news,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused" +whatsnew/news,,:close,: Connection:close header is sent by requests using URLOpener +whatsnew/news,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""." +whatsnew/news,,:test,: test_subprocess:test_leaking_fds_on_error no longer gives a +whatsnew/news,,:test,: Fix test_posix:test_getgroups failure under Solaris. Patch +whatsnew/news,,:Olimit,Drop -OPT:Olimit compiler option. +whatsnew/news,,:MAXYEAR,timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. +whatsnew/news,,:bz2,with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or +whatsnew/news,,:db2,: Add configure option --with-dbmliborder=db1:db2:... to specify diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -354,7 +354,7 @@ 'Optional Operating System Services' section to use a more user-centric classification scheme (splitting them across the new CE section, IPC and text processing). Operating system limitatons can be reflected with - the Sphinx :platform: tag, it doesn't make sense as part of the Table of + the Sphinx ``:platform:`` tag, it doesn't make sense as part of the Table of Contents. - Issue #4966: Bring the sequence docs up to date for the Py3k transition -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 06:19:36 2012 From: python-checkins at python.org (ezio.melotti) Date: Mon, 1 Oct 2012 06:19:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_suspicious_ignore_file_updates_with_3=2E3=2E?= Message-ID: <3XVVd451w3zQlT@mail.python.org> http://hg.python.org/cpython/rev/3f739f42be51 changeset: 79361:3f739f42be51 parent: 79358:7fd8f09ecf3c parent: 79360:7877575a11ee user: Ezio Melotti date: Mon Oct 01 07:18:55 2012 +0300 summary: Merge suspicious ignore file updates with 3.3. files: Doc/tools/sphinxext/susp-ignored.csv | 12 ++++++++++++ Misc/NEWS | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -357,3 +357,15 @@ whatsnew/3.2,,:location,zope9-location = ${zope9:location} whatsnew/3.2,,:prefix,... zope-conf = ${custom:prefix}/etc/zope.conf whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf +whatsnew/news,,:platform,:platform: +whatsnew/news,,:password,: Unquote before b64encoding user:password during Basic +whatsnew/news,,:close,Connection:close header. +whatsnew/news,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused" +whatsnew/news,,:close,: Connection:close header is sent by requests using URLOpener +whatsnew/news,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""." +whatsnew/news,,:test,: test_subprocess:test_leaking_fds_on_error no longer gives a +whatsnew/news,,:test,: Fix test_posix:test_getgroups failure under Solaris. Patch +whatsnew/news,,:Olimit,Drop -OPT:Olimit compiler option. +whatsnew/news,,:MAXYEAR,timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. +whatsnew/news,,:bz2,with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or +whatsnew/news,,:db2,: Add configure option --with-dbmliborder=db1:db2:... to specify diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -361,7 +361,7 @@ 'Optional Operating System Services' section to use a more user-centric classification scheme (splitting them across the new CE section, IPC and text processing). Operating system limitatons can be reflected with - the Sphinx :platform: tag, it doesn't make sense as part of the Table of + the Sphinx ``:platform:`` tag, it doesn't make sense as part of the Table of Contents. - Issue #4966: Bring the sequence docs up to date for the Py3k transition -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 14:21:48 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 14:21:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_3=2E2_and_3=2E3_release_sched?= =?utf-8?q?ules=3A_add_information_on_bugfix_releases_and_release?= Message-ID: <3XVjKS1J7BzQfD@mail.python.org> http://hg.python.org/peps/rev/ba516220898f changeset: 4527:ba516220898f user: Georg Brandl date: Mon Oct 01 14:21:37 2012 +0200 summary: 3.2 and 3.3 release schedules: add information on bugfix releases and release lifespan. files: pep-0392.txt | 84 +++++++++++++++++++++++++++------------ pep-0398.txt | 50 ++++++++++++++++------- 2 files changed, 92 insertions(+), 42 deletions(-) diff --git a/pep-0392.txt b/pep-0392.txt --- a/pep-0392.txt +++ b/pep-0392.txt @@ -13,11 +13,13 @@ Abstract ======== -This document describes the development and release schedule for -Python 3.2. The schedule primarily concerns itself with PEP-sized -items. Small features may be added up to and including the first beta -release. Bugs may be fixed until the final release, which is planned -for February 2011. +This document describes the development and release schedule for the +Python 3.2 series. The schedule primarily concerns itself with PEP-sized +items. + +.. Small features may be added up to and including the first beta + release. Bugs may be fixed until the final release, which is planned + for February 2011. Release Manager and Crew @@ -29,30 +31,67 @@ - Documentation: Georg Brandl +3.2 Lifespan +============ + +3.2 will receive bugfix updates approximately every 4-6 months until +one release after the release of 3.3.0 final. After that, security +updates (source only) will be released until 5 years after the release +of 3.2 final, which will be February 2016. + + Release Schedule ================ -The current schedule is: +3.2 schedule +------------ - 3.2 alpha 1: August 1, 2010 -- 3.2 alpha 2: September 4, 2010 -- 3.2 alpha 3: October 9, 2010 -- 3.2 alpha 4: November 13, 2010 -- 3.2 beta 1: December 4, 2010 +- 3.2 alpha 2: September 6, 2010 +- 3.2 alpha 3: October 12, 2010 +- 3.2 alpha 4: November 16, 2010 +- 3.2 beta 1: December 6, 2010 (No new features beyond this point.) -- 3.2 beta 2: December 18, 2010 -- 3.2 candidate 1: January 15, 2011 -- 3.2 candidate 2: January 29, 2011 -- 3.2 candidate 3: February 12, 2011 -- 3.2 final: February 19, 2011 +- 3.2 beta 2: December 20, 2010 +- 3.2 candidate 1: January 16, 2011 +- 3.2 candidate 2: January 31, 2011 +- 3.2 candidate 3: February 14, 2011 +- 3.2 final: February 20, 2011 .. don't forget to update final date above as well -Every release day listed here is a Saturday; the actual availability -of the release for download on python.org will depend on the schedules -of the crew. +3.2.1 schedule +-------------- + +- 3.2.1 beta 1: May 8, 2011 +- 3.2.1 candidate 1: May 17, 2011 +- 3.2.1 candidate 2: July 3, 2011 +- 3.2.1 final: July 11, 2011 + +3.2.2 schedule +-------------- + +- 3.2.2 candidate 1: August 14, 2011 +- 3.2.2 final: September 4, 2011 + +3.2.3 schedule +-------------- + +- 3.2.3 candidate 1: February 25, 2012 +- 3.2.3 candidate 2: March 18, 2012 +- 3.2.3 final: April 11, 2012 + +3.2.4 schedule +-------------- + +- 3.2.4 beta 1: planned for Oct/Nov 2012 +- 3.2.4 candidate 1: following two weeks after beta 1 +- 3.2.4 final: following two weeks after candidate 1, if no further RC + are necessary + +-- Only security releases after 3.2.4 -- Features for 3.2 @@ -64,15 +103,6 @@ No large-scale changes have been recorded yet. -Bugfix Releases -=============== - -- 3.2.1: released July 10, 2011 -- 3.2.2: released September 4, 2011 - -- 3.2.3: planned February 10-17, 2012 - - References ========== diff --git a/pep-0398.txt b/pep-0398.txt --- a/pep-0398.txt +++ b/pep-0398.txt @@ -15,9 +15,11 @@ This document describes the development and release schedule for Python 3.3. The schedule primarily concerns itself with PEP-sized -items. Small features may be added up to and including the first beta -release. Bugs may be fixed until the final release, which is planned -for September 2012. +items. + +.. Small features may be added up to and including the first beta + release. Bugs may be fixed until the final release, which is planned + for September 2012. Release Manager and Crew @@ -29,30 +31,48 @@ - Documentation: Georg Brandl +3.3 Lifespan +============ + +3.3 will receive bugfix updates approximately every 4-6 months until +one release after the release of 3.4.0 final. After that, security +updates (source only) will be released until 5 years after the release +of 3.3.0 final, which will be September 2017. + + Release Schedule ================ -The schedule was: +3.3.0 schedule +-------------- -- 3.3.0 alpha 1: March 3, 2012 -- 3.3.0 alpha 2: April 1, 2012 +- 3.3.0 alpha 1: March 5, 2012 +- 3.3.0 alpha 2: April 2, 2012 - 3.3.0 alpha 3: May 1, 2012 -- 3.3.0 alpha 4: May 26, 2012 -- 3.3.0 beta 1: June 26, 2012 +- 3.3.0 alpha 4: May 31, 2012 +- 3.3.0 beta 1: June 27, 2012 (No new features beyond this point.) -- 3.3.0 beta 2: August 11, 2012 -- 3.3.0 candidate 1: August 25, 2012 -- 3.3.0 candidate 2: September 8, 2012 -- 3.3.0 candidate 3: September 22, 2012 +- 3.3.0 beta 2: August 12, 2012 +- 3.3.0 candidate 1: August 24, 2012 +- 3.3.0 candidate 2: September 9, 2012 +- 3.3.0 candidate 3: September 24, 2012 - 3.3.0 final: September 29, 2012 .. don't forget to update final date above as well -Every release day listed here was the prospective day of tagging the release; -the actual availability of the release for download on python.org depends -on the schedules of the crew. +.. Every release day listed here is the prospective day of tagging the release; + the actual availability of the release for download on python.org depends + on the schedules of the crew. + +3.3.1 schedule +-------------- + +- 3.3.1 beta 1: planned for Oct/Nov 2012 +- 3.3.1 candidate 1: following two weeks after beta 1 +- 3.3.1 final: following two weeks after candidate 1, if no further RC + are necessary Features for 3.3 -- Repository URL: http://hg.python.org/peps From ncoghlan at gmail.com Mon Oct 1 15:27:33 2012 From: ncoghlan at gmail.com (Nick Coghlan) Date: Mon, 1 Oct 2012 18:57:33 +0530 Subject: [Python-checkins] peps: 3.2 and 3.3 release schedules: add information on bugfix releases and release In-Reply-To: <3XVjKS1J7BzQfD@mail.python.org> References: <3XVjKS1J7BzQfD@mail.python.org> Message-ID: On Mon, Oct 1, 2012 at 5:51 PM, georg.brandl wrote: > +3.3.1 schedule > +-------------- > + > +- 3.3.1 beta 1: planned for Oct/Nov 2012 Copy and paste error from the 3.2 PEP? And thanks for adding these - very handy. Cheers, Nick. -- Nick Coghlan | ncoghlan at gmail.com | Brisbane, Australia From barry at python.org Mon Oct 1 16:06:44 2012 From: barry at python.org (Barry Warsaw) Date: Mon, 1 Oct 2012 10:06:44 -0400 Subject: [Python-checkins] peps: 3.2 and 3.3 release schedules: add information on bugfix releases and release In-Reply-To: References: <3XVjKS1J7BzQfD@mail.python.org> Message-ID: <20121001100644.1edeb937@limelight.wooz.org> On Oct 01, 2012, at 06:57 PM, Nick Coghlan wrote: >On Mon, Oct 1, 2012 at 5:51 PM, georg.brandl wrote: >> +3.3.1 schedule >> +-------------- >> + >> +- 3.3.1 beta 1: planned for Oct/Nov 2012 > >Copy and paste error from the 3.2 PEP? > >And thanks for adding these - very handy. Agreed. Perhaps the 2.7 RM would like to add something similar for that release? Cheers, -Barry From python-checkins at python.org Mon Oct 1 16:30:49 2012 From: python-checkins at python.org (brian.curtin) Date: Mon, 1 Oct 2012 16:30:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Correcting_my_?= =?utf-8?q?name_since_people_keep_bringing_it_up?= Message-ID: <3XVmBK3FV1zNbq@mail.python.org> http://hg.python.org/cpython/rev/05ae420053bc changeset: 79362:05ae420053bc branch: 3.3 parent: 79360:7877575a11ee user: Brian Curtin date: Mon Oct 01 09:29:36 2012 -0500 summary: Correcting my name since people keep bringing it up files: Doc/whatsnew/3.3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -313,7 +313,7 @@ In addition to the launcher, the Windows installer now includes an option to add the newly installed Python to the system PATH (contributed -by Brian Curtain in :issue:`3561`). +by Brian Curtin in :issue:`3561`). .. seealso:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 16:34:37 2012 From: python-checkins at python.org (barry.warsaw) Date: Mon, 1 Oct 2012 16:34:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Describe_the_Python_3=2E0_and?= =?utf-8?q?_2=2E6_lifespans=2E?= Message-ID: <3XVmGj75dczP8b@mail.python.org> http://hg.python.org/peps/rev/6d2e9d41dfaa changeset: 4528:6d2e9d41dfaa user: Barry Warsaw date: Mon Oct 01 10:34:32 2012 -0400 summary: Describe the Python 3.0 and 2.6 lifespans. files: pep-0361.txt | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/pep-0361.txt b/pep-0361.txt --- a/pep-0361.txt +++ b/pep-0361.txt @@ -45,6 +45,16 @@ RPMs: Sean Reifschneider +Release Lifespan + + Python 3.0 is no longer being maintained for any purpose. + + Python 2.6 is in security fix only maintenance mode until October + 1, 2013. Security fixes are released in source-only formats. + After this date, Python 2.6 will no longer be maintained for any + purpose. + + Release Schedule Note that this schedule is completely tentative. The number of alphas, -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Mon Oct 1 17:42:48 2012 From: python-checkins at python.org (tim.golden) Date: Mon, 1 Oct 2012 17:42:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Issue16097_Fix?= =?utf-8?q?_small_typo_in_comment_=28patch_by_Wael_Al_Jishi=29?= Message-ID: <3XVnnN4t5zzQq0@mail.python.org> http://hg.python.org/cpython/rev/bb77400af434 changeset: 79363:bb77400af434 branch: 3.3 user: Tim Golden date: Mon Oct 01 16:40:40 2012 +0100 summary: Issue16097 Fix small typo in comment (patch by Wael Al Jishi) files: Lib/codecs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/codecs.py b/Lib/codecs.py --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -461,7 +461,7 @@ # read until we get the required number of characters (if available) while True: - # can the request can be satisfied from the character buffer? + # can the request be satisfied from the character buffer? if chars < 0: if size < 0: if self.charbuffer: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 17:42:50 2012 From: python-checkins at python.org (tim.golden) Date: Mon, 1 Oct 2012 17:42:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue16097_Fix_small_typo_?= =?utf-8?q?in_comment_=28patch_by_Wael_Al_Jishi=29?= Message-ID: <3XVnnQ0xcxzQqf@mail.python.org> http://hg.python.org/cpython/rev/cbf651ab3e21 changeset: 79364:cbf651ab3e21 parent: 79361:3f739f42be51 user: Tim Golden date: Mon Oct 01 16:41:08 2012 +0100 summary: Issue16097 Fix small typo in comment (patch by Wael Al Jishi) files: Lib/codecs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/codecs.py b/Lib/codecs.py --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -461,7 +461,7 @@ # read until we get the required number of characters (if available) while True: - # can the request can be satisfied from the character buffer? + # can the request be satisfied from the character buffer? if chars < 0: if size < 0: if self.charbuffer: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 18:57:09 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 18:57:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_with_3=2E3?= Message-ID: <3XVqR957SpzQHq@mail.python.org> http://hg.python.org/cpython/rev/b76d29a381a9 changeset: 79365:b76d29a381a9 parent: 79364:cbf651ab3e21 parent: 79363:bb77400af434 user: Georg Brandl date: Mon Oct 01 18:56:55 2012 +0200 summary: merge with 3.3 files: Doc/whatsnew/3.3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -313,7 +313,7 @@ In addition to the launcher, the Windows installer now includes an option to add the newly installed Python to the system PATH (contributed -by Brian Curtain in :issue:`3561`). +by Brian Curtin in :issue:`3561`). .. seealso:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 18:59:23 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 18:59:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogTW92ZSAzLjEgYW5k?= =?utf-8?q?_3=2E2_NEWS_items_to_HISTORY=2E?= Message-ID: <3XVqTl2hkhzQpy@mail.python.org> http://hg.python.org/cpython/rev/7a7913a11350 changeset: 79366:7a7913a11350 branch: 3.3 parent: 79363:bb77400af434 user: Georg Brandl date: Mon Oct 01 18:55:32 2012 +0200 summary: Move 3.1 and 3.2 NEWS items to HISTORY. files: Misc/HISTORY | 5397 ++++++++++++++++++++++++++++++++++++++ Misc/NEWS | 5397 -------------------------------------- 2 files changed, 5397 insertions(+), 5397 deletions(-) diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -10,6 +10,5403 @@ ====================================================================== +What's New in Python 3.2? +========================= + +*Release date: 20-Feb-2011* + +Core and Builtins +----------------- + +- Issue #11249: Fix potential crashes when using the limited API. + +Build +----- + +- Issue #11222: Fix non-framework shared library build on Mac OS X. + +- Issue #11184: Fix large-file support on AIX. + +- Issue #941346: Fix broken shared library build on AIX. + +Documentation +------------- + +- Issue #10709: Add updated AIX notes in Misc/README.AIX. + + +What's New in Python 3.2 Release Candidate 3? +============================================= + +*Release date: 13-Feb-2011* + +Core and Builtins +----------------- + +- Issue #11134: Add missing fields to typeslots.h. + +- Issue #11135: Remove redundant doc field from PyType_Spec. + +- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited + ABI. + +- Issue #11118: Fix bogus export of None in python3.dll. + +Library +------- + +- Issue #11116: any error during addition of a message to a mailbox now causes a + rollback, instead of leaving the mailbox partially modified. + +- Issue #11132: Fix passing of "optimize" parameter when recursing in + compileall.compile_dir(). + +- Issue #11110: Fix a potential decref of a NULL in sqlite3. + +- Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch + by Stan Mihai. + +Build +----- + +- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X + installers now includes a link to the installed documentation and no longer + includes an Extras directory. The Tools directory is now installed in the + framework under share/doc. + +- Issue #11121: Fix building with --enable-shared. + +Tests +----- + +- Issue #10971: test_zipimport_support is once again compatible with the refleak + hunter feature of test.regrtest. + + +What's New in Python 3.2 Release Candidate 2? +============================================= + +*Release date: 30-Jan-2011* + +Core and Builtins +----------------- + +- Issue #10451: memoryview objects could allow to mutate a readable buffer. + Initial patch by Ross Lagerwall. + +Library +------- + +- Issue #9124: mailbox now accepts binary input and reads and writes mailbox + files in binary mode, using the email package's binary support to parse + arbitrary email messages. StringIO and text file input is deprecated, + and string input fails early if non-ASCII characters are used, where + previously it would fail when the email was processed in a later step. + +- Issue #10845: Mitigate the incompatibility between the multiprocessing + module on Windows and the use of package, zipfile or directory execution + by special casing main modules that actually *are* called __main__.py. + +- Issue #11045: Protect logging call against None argument. + +- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save + commands. + +- Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, + preventing a confusing hung appearance on OS X with the windows + obscured. + +- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the + menu accelerators for Open Module, Go to Line, and New Indent Width. + The accelerators still work but no longer appear in the menu items. + +- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True). + +- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 + conversion. + +- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message + with a None body. + +- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a + keyword-only argument. The preceding positional argument was deprecated, + so it made no sense to add filter as a positional argument. + +- Issue #11004: Repaired edge case in deque.count(). + +- Issue #10974: IDLE no longer crashes if its recent files list includes files + with non-ASCII characters in their path names. + +- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both + return sets instead of one returning a tuple and the other a frozenset. + +- Issue #10987: Fix the recursion limit handling in the _pickle module. + +- Issue #10983: Fix several bugs making tunnel requests in http.client. + +- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode + filenames, at bootstrap, if the codec registry is not ready yet. It is still + possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding) + for all file entries in the ZIP file. + +- Issue #10949: Improved robustness of rotating file handlers. + +- Issue #10955: Fix a potential crash when trying to mmap() a file past its + length. Initial patch by Ross Lagerwall. + +- Issue #10898: Allow compiling the posix module when the C library defines + a symbol named FSTAT. + +- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1) + encoding. This is the preferred encoding of PEP 3333 and the base encoding + of HTTP 1.1. + +- To match the behaviour of HTTP server, the HTTP client library now also + encodes headers with iso-8859-1 (latin1) encoding. It was already doing + that for incoming headers which makes this behaviour now consistent in + both incoming and outgoing direction. + +- Issue #9509: argparse now properly handles IOErrors raised by + argparse.FileType. + +- Issue #10961: The new pydoc server now better handles exceptions raised + during request handling. + +- Issue #10680: Fix mutually exclusive arguments for argument groups in + argparse. + +Build +----- + +- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with + the system-provided Python. + + +What's New in Python 3.2 Release Candidate 1 +============================================ + +*Release date: 16-Jan-2011* + +Core and Builtins +----------------- + +- Issue #10889: range indexing and slicing now works correctly on ranges with + a length that exceeds sys.maxsize. + +- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a + class. + +- Issue #8020: Avoid a crash where the small objects allocator would read + non-Python managed memory while it is being modified by another thread. Patch + by Matt Bandy. + +- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all + io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser + translates newlines (\r\n => \n). + +- Remove buffer API from stable ABI for now, see #10181. + +- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file + doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int + (length bigger than 2^31-1 bytes). + +- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and + stdprinter.write() clamp the length to INT_MAX on Windows. + +- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() + can now handle dates after 2038. + +- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and + PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the + filesystem encoding instead of UTF-8. + +- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem + encoding instead of UTF-8. + +- Add sys.flags attribute for the new -q command-line option. + +- Issue #11506: Trying to assign to a bytes literal should result in a + SyntaxError. + +Library +------- + +- Issue #10916: mmap should not segfault when a file is mapped using 0 as length + and a non-zero offset, and an attempt to read past the end of file is made + (IndexError is raised instead). Patch by Ross Lagerwall. + +- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead + of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. + +- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather + than the currently problematic Apple-supplied one, when running with the + 64-/32-bit installer variant. + +- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not + as unicode, and accept binary files. Add encoding and errors attributes to + cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn + Linderman). + +- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl(). + +- Issue #10899: No function type annotations in the standard library. Removed + function type annotations from _pyio.py. + +- Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'. + +- Issue #10872: The repr() of TextIOWrapper objects now includes the mode + if available. + +- Issue #10869: Fixed bug where ast.increment_lineno modified the root node + twice. + +- Issue #5871: email.header.Header.encode now raises an error if any + continuation line in the formatted value has no leading white space and looks + like a header. Since Generator uses Header to format all headers, this check + is made for all headers in any serialized message at serialization time. This + provides protection against header injection attacks. + +- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially + private by renaming it to ``_GeneratorContextManager``. + +- Issue #10042: Fixed the total_ordering decorator to handle cross-type + comparisons that could lead to infinite recursion. + +- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with + non-ASCII bytes (parsed by a BytesParser) when doing conversion to 7bit-clean + presentation, instead of replacing them with ?s. + +- email.header.Header was incorrectly encoding folding whitespace when + rfc2047-encoding header values with embedded newlines, leaving them without + folding whitespace. It now uses the continuation_ws, as it does for + continuation lines that it creates itself. + +- Issue #1777412, #10827: Changed the rules for 2-digit years. The + time.asctime(), time.ctime() and time.strftime() functions will now format + any year when ``time.accept2dyear`` is False and will accept years >= 1000 + otherwise. ``time.mktime`` and ``time.strftime`` now accept full range + supported by the OS. With Visual Studio or on Solaris, the year is limited to + the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated. + +- Issue #7858: Raise an error properly when os.utime() fails under Windows + on an existing file. + +- Issue #3839: wsgiref should not override a Content-Length header set by + the application. Initial patch by Clovis Fabricio. + +- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the + compilation (if the input is a string). + +- Issue #7995: When calling accept() on a socket with a timeout, the returned + socket is now always blocking, regardless of the operating system. + +- Issue #10756: atexit normalizes the exception before displaying it. Patch by + Andreas St?hrk. + +- Issue #10790: email.header.Header.append's charset logic now works correctly + for charsets whose output codec is different from its input codec. + +- Issue #10819: SocketIO.name property returns -1 when its closed, instead of + raising a ValueError, to fix repr(). + +- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if + the input buffer length doesn't fit into an unsigned int (length bigger than + 2^32-1 bytes). + +- Issue #6643: Reinitialize locks held within the threading module after fork to + avoid a potential rare deadlock or crash on some platforms. + +- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file + descriptors (0, 1, 2) are closed in the parent process. Initial patch by Ross + Lagerwall. + +- `unittest.TestCase` can be instantiated without a method name; for simpler + exploration from the interactive interpreter. + +- Issue #10798: Reject supporting concurrent.futures if the system has too + few POSIX semaphores. + +- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from + the codec aliases. They are still accessible via codecs.lookup(). + +- Issue #10801: In zipfile, support different encodings for the header and the + filenames. + +- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott + David Daniels. + +- Fix collections.OrderedDict.setdefault() so that it works in subclasses that + define __missing__(). + +- Issue #10786: unittest.TextTestRunner default stream no longer bound at import + time. `sys.stderr` now looked up at instantiation time. Fix contributed by + Mark Roddy. + +- Issue #10753: Characters ';', '=' and ',' in the PATH_INFO environment variable + won't be quoted when the URI is constructed by the wsgiref.util's request_uri + method. According to RFC 3986, these characters can be a part of params in + PATH component of URI and need not be quoted. + +- Issue #10738: Fix webbrowser.Opera.raise_opts. + +- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how + browsers actually parse cookies. + +- Issue #9333: os.symlink now available regardless of user privileges. The + function now raises OSError on Windows >=6.0 when the user is unable to create + symbolic links. XP and 2003 still raise NotImplementedError. + +- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8. + +- Issue #10730: Add SVG mime types to mimetypes module. + +- Issue #10768: Make the Tkinter ScrolledText widget work again. + +- Issue #10777: Fix "dictionary changed size during iteration" bug in + ElementTree register_namespace(). + +- Issue #10626: test_logging now preserves logger disabled states. + +- Issue #10774: test_logging now removes temp files created during tests. + +- Issue #5258/#10642: if site.py encounters a .pth file that generates an error, + it now prints the filename, line number, and traceback to stderr and skips + the rest of that individual file, instead of stopping processing entirely. + +- Issue #10763: subprocess.communicate() closes stdout and stderr if both are + pipes (bug specific to Windows). + +- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better + compliance (no "s around encoded values). + +- Improved the diff message in the unittest module's assertCountEqual(). + +- Issue #1155362: email.utils.parsedate_tz now handles a missing space before + the '-' of a timezone field as well as before a '+'. + +- Issue #4871: The zipfile module now gives a more useful error message if + an attempt is made to use a string to specify the archive password. + +- Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only. + +- Deprecated assertDictContainsSubset() in the unittest module. + +C-API +----- + +- PyObject_CallMethod now passes along any underlying AttributeError from + PyObject_GetAttr, instead of replacing it with something less informative + +- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and + PyEval_ReleaseLock(). The thread-state aware APIs should be used instead. + +- Issue #10333: Remove ancient GC API, which has been deprecated since Python + 2.2. + +Build +----- + +- Issue #10843: Update third-party library versions used in OS X 32-bit + installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4 + and RTREE enabled), and ncursesw 5.5 (wide-char support enabled). + +- Issue #10820: Fix OS X framework installs to support version-specific + scripts (#10679). + +- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in + the configure script but use $GREP instead. Patch by Fabian Groffen. + +- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD + and DragonFly BSD. Patch by Nicolas Joly. + +- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with + a version-specific suffix on "make altinstall". + +- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with + timestamp profiling (--with-tsc): the preprocessor test for the PowerPC + support now looks for "__powerpc__" as well as "__ppc__": the latter seems to + only be present on OS X; the former is the correct one for Linux with GCC. + +- Issue #1099: Fix the build on MacOSX when building a framework with pydebug + using GCC 4.0. + +Tools/Demos +----------- + +- Issue #10843: Install the Tools directory on OS X in the applications Extras + (/Applications/Python 3.n/Extras/) where the Demo directory had previous been + installed. + +- Issue #7962: The Demo directory is gone. Most of the old and unmaintained + demos have been removed, others integrated in documentation or a new + Tools/demo subdirectory. + +- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell. + Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian + Curtin. + +Tests +----- + +- Issue #11910: Fix test_heapq to skip the C tests when _heapq is missing. + +- Fix test_startfile to wait for child process to terminate before finishing. + +- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch + by Ross Lagerwall. + +- Make the --coverage flag work for test.regrtest. + +- Issue #1677694: Refactor and improve test_timeout. Original patch by + Bj?rn Lindqvist. + +- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects. + Patch by Jean-Paul Calderone and Sandro Tosi. + +- Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in + whole runs and enabled selectively using ``--header`` when running an explicit + list of tests. Original patch by Collin Winter. + + +What's New in Python 3.2 Beta 2? +================================ + +*Release date: 19-Dec-2010* + +Core and Builtins +----------------- + +- Issue #8844: Regular and recursive lock acquisitions can now be interrupted + by signals on platforms using pthreads. Patch by Reid Kleckner. + +- Issue #4236: PyModule_Create2 now checks the import machinery directly + rather than the Py_IsInitialized flag, avoiding a Fatal Python + error in certain circumstances when an import is done in __del__. + +- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and + Daniel Urban. + +Library +------- + +- Issue #3243: Support iterable bodies in httplib. Patch Contributions by + Xuanji Li and Chris AtLee. + +- Issue #10611: SystemExit exception will no longer kill a unittest run. + +- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean + up function. + +- Issue #10573: use actual/expected consistently in unittest methods. + The order of the args of assertCountEqual is also changed. + +- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated + words in the local part of email addresses, thereby preserving the input. + +- Issue #6791: Limit header line length (to 65535 bytes) in http.client + and http.server, to avoid denial of services from the other party. + +- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. + +- Issue #9907: Fix tab handling on OSX when using editline by calling + rl_initialize first, then setting our custom defaults, then reading .editrc. + +- Issue #4188: Avoid creating dummy thread objects when logging operations + from the threading module (with the internal verbose flag activated). + +- Issue #10711: Remove HTTP 0.9 support from http.client. The ``strict`` + parameter to HTTPConnection and friends is deprecated. + +- Issue #9721: Fix the behavior of urljoin when the relative url starts with a + ';' character. Patch by Wes Chow. + +- Issue #10714: Limit length of incoming request in http.server to 65536 bytes + for security reasons. Initial patch by Ross Lagerwall. + +- Issue #9558: Fix distutils.command.build_ext with VS 8.0. + +- Issue #10667: Fast path for collections.Counter(). + +- Issue #10695: passing the port as a string value to telnetlib no longer + causes debug mode to fail. + +- Issue #1078919: add_header now automatically RFC2231 encodes parameters + that contain non-ascii values. + +- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits + a warning on sys.stderr rather than throwing a misleading exception + if cleanup fails due to nulling out of modules during shutdown. + Also avoids an AttributeError when mkdtemp call fails and issues + a ResourceWarning on implicit cleanup via __del__. + +- Issue #10107: Warn about unsaved files in IDLE on OSX. + +- Issue #7213: subprocess.Popen's default for close_fds has been changed. + It is now True in most cases other than on Windows when input, output or + error handles are provided. + +- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually + added in 3.2beta1) to allow specifying a specific list of file descriptors + to keep open in the child process. + +- Issue #1731717: Fixed the problem where subprocess.wait() could cause an + OSError exception when The OS had been told to ignore SIGCLD in our process + or otherwise not wait for exiting child processes. + +Tests +----- + +- Issue #775964: test_grp now skips YP/NIS entries instead of failing when + encountering them. + +Tools/Demos +----------- + +- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and + Cocoa AquaTk. + +- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree. + +- Issue #10706: Remove outdated script runtests.sh. Either ``make test`` + or ``python -m test`` should be used instead. + +Build +----- + +- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4. + +- Issue #9234: argparse supports alias names for subparsers. + + +What's New in Python 3.2 Beta 1? +================================ + +*Release date: 05-Dec-2010* + +Core and Builtins +----------------- + +- Issue #10630: Return dict views from the dict proxy keys()/values()/items() + methods. + +- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__ + with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. + +- Issue #1772833: Add the -q command-line option to suppress copyright and + version output in interactive mode. + +- Provide an *optimize* parameter in the built-in compile() function. + +- Fixed several corner case issues on Windows in os.stat/os.lstat related to + reparse points. + +- PEP 384 (Defining a Stable ABI) is implemented. + +- Issue #2690: Range objects support negative indices and slicing. + +- Issue #9915: Speed up sorting with a key. + +- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much + larger than operand ``b``. Patch by Andrew Bennetts. + +- Issue #10518: Bring back the callable() builtin. + +- Issue #7094: Added alternate formatting (specified by '#') to ``__format__`` + method of float, complex, and Decimal. This allows more precise control over + when decimal points are displayed. + +- Issue #10474: range.count() should return integers. + +- Issue #1574217: isinstance now catches only AttributeError, rather than + masking all errors. + +Library +------- + +- logging: added "handler of last resort". See http://bit.ly/last-resort-handler + +- test.support: Added TestHandler and Matcher classes for better support of + assertions about logging. + +- Issue #4391: Use proper plural forms in argparse. + +- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on + UnicodeEncodeError. + +- Add the "display" and "undisplay" pdb commands. + +- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again + after a "continue" command. + +- Add the "interact" pdb command. + +- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf. + +- Issue #1569291: Speed up array.repeat(). + +- Provide an interface to set the optimization level of compilation in + py_compile, compileall and zipfile.PyZipFile. + +- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by + RFC3986. Anything before :// is considered a scheme and is followed by an + authority (or netloc) and by '/' led path, which is optional. + +- Issue #6045: dbm.gnu databases now support get() and setdefault() methods. + +- Issue #10620: `python -m unittest` can accept file paths instead of module + names for running specific tests. + +- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`, + `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_` + and replace them with the correct methods in the Python test suite. + +- Issue #10272: The ssl module now raises socket.timeout instead of a generic + SSLError on socket timeouts. + +- Issue #10528: Allow translators to reorder placeholders in localizable + messages from argparse. + +- Issue #10497: Fix incorrect use of gettext in argparse. + +- Issue #10478: Reentrant calls inside buffered IO objects (for example by + way of a signal handler) now raise a RuntimeError instead of freezing the + current process. + +- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests. + +- Issue #10549: Fix pydoc traceback when text-documenting certain classes. + +- Issue #2001: New HTML server with enhanced Web page features. Patch by Ron + Adam. + +- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership + of non-weakrefable objects. + +- Issue #940286: pydoc.Helper.help() ignores input/output init parameters. + +- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent + DoS attacks. Patch by Savio Sena. + +- Issue #4925: Add filename to error message when executable can't be found in + subprocess. + +- Issue #10391: Don't dereference invalid memory in error messages in the ast + module. + +- Issue #10027: st_nlink was not being set on Windows calls to os.stat or + os.lstat. Patch by Hirokazu Yamamoto. + +- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is + held by the user's account, i.e., when the function can actually be used. + +- Issue #8879: Add os.link support for Windows. + +- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved + failure messages by default. Patch by Mark Roddy. + +- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to + guess at the correct parsing of invalid html. + +- Issue #10554: Add context manager support to subprocess.Popen objects. + +- Issue #8989: email.utils.make_msgid now has a domain parameter that can + override the domain name used in the generated msgid. + +- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File + exists' exception when a target directory already exists with the specified + mode. Patch by Ray Allen. + +- Issue #9573: os.fork() now works correctly when triggered as a side effect of + a module import. + +- Issue #10464: netrc now correctly handles lines with embedded '#' characters. + +- Added itertools.accumulate(). + +- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``. + Original patch by Daniel Urban. + +- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to + `assertRegex` and `assertRaisesRegex`. + +- Issue #10535: Enable silenced warnings in unittest by default. + +- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte + sequences as input in addition to character strings. + +- Issue #10586: The statistics API for the new functools.lru_cache has been + changed to a single cache_info() method returning a named tuple. + +- Issue #10323: itertools.islice() now consumes the minimum number of inputs + before stopping. Formerly, the final state of the underlying iterator was + undefined. + +- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and + __next__. + +- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new + more informative name, unittest.CountEqual. + +- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. + +- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can + be set to False to turn off the previously undocumented 'popularity' + heuristic. Patch by Terry Reedy and Eli Bendersky. + +- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate + undocumented and now redundant isbjunk and isbpopular methods. + +- Issue #9846: zipfile is now correctly closing underlying file objects. + +- Issue #10459: Update CJK character names to Unicode 6.0. + +- Issue #4493: urllib.request adds '/' in front of path components which does not + start with '/. Common behavior exhibited by browsers and other clients. + +- Issue #6378: idle.bat now runs with the appropriate Python version rather than + the system default. Patch by Sridhar Ratnakumar. + +- Issue #10470: 'python -m unittest' will now run test discovery by default, + when no extra arguments have been provided. + +- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to + output stream only when end_headers is invoked. This is a speedup and an + internal optimization. Patch by Andrew Shaaf. + +- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho + Eckhardt. + +- Issue #10453: compileall now uses argparse instead of getopt, and thus + provides clean output when called with '-h'. + +- Issue #8078: Add constants for higher baud rates in the termios module. Patch + by Rodolpho Eckhardt. + +- Issue #10407: Fix two NameErrors in distutils. + +- Issue #10371: Deprecated undocumented functions in the trace module. + +- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the + end of the file. + +- configparser: 100% test coverage. + +- Issue #10499: configparser supports pluggable interpolation handlers. The + default classic interpolation handler is called BasicInterpolation. Another + interpolation handler added (ExtendedInterpolation) which supports the syntax + used by zc.buildout (e.g. interpolation between sections). + +- configparser: the SafeConfigParser class has been renamed to ConfigParser. + The legacy ConfigParser class has been removed but its interpolation mechanism + is still available as LegacyInterpolation. + +- configparser: Usage of RawConfigParser is now discouraged for new projects + in favor of ConfigParser(interpolation=None). + +- Issue #1682942: configparser supports alternative option/value delimiters. + +- Issue #5412: configparser supports mapping protocol access. + +- Issue #9411: configparser supports specifying encoding for read operations. + +- Issue #9421: configparser's getint(), getfloat() and getboolean() methods + accept vars and default arguments just like get() does. + +- Issue #9452: configparser supports reading from strings and dictionaries + (thanks to the mapping protocol API, the latter can be used to copy data + between parsers). + +- configparser: accepted INI file structure is now customizable, including + comment prefixes, name of the DEFAULT section, empty lines in multiline + values, and indentation. + +- Issue #10326: unittest.TestCase instances can be pickled. + +- Issue #9926: Wrapped TestSuite subclass does not get __call__ executed. + +- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex + zeros on systems where the log1p function fails to respect the sign of zero. + This fixes a test failure on AIX. + +- Issue #9732: Addition of getattr_static to the inspect module. + +- Issue #10446: Module documentation generated by pydoc now links to a + version-specific online reference manual. + +- Make the 'No module named' exception message from importlib consistent. + +- Issue #10443: Add the SSLContext.set_default_verify_paths() method. + +- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module. + Patch by Robert Collins. + +- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather + than strings. + +C-API +----- + +- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(), + which transforms non-ASCII decimal digits in a Unicode string to their ASCII + equivalents. + +- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly + zero-initialize all fields, fixing compiler warnings seen when building + extension modules with gcc with "-Wmissing-field-initializers" (implied by + "-W"). + +- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil + Schemenauer. + +- structseq.h is now included in Python.h. + +- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. + +Tests +----- + +- regrtest.py once again ensures the test directory is removed from sys.path + when it is invoked directly as the __main__ module. + +- `python -m test` can be used to run the test suite as well as `python -m + test.regrtest`. + +- Do not fail test_socket when the IP address of the local hostname cannot be + looked up. + +- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric + Carstensen. + +Build +----- + +- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and + PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals. + +Documentation +------------- + +- Issue #10299: List the built-in functions in a table in functions.rst. + + +What's New in Python 3.2 Alpha 4? +================================= + +*Release date: 13-Nov-2010* + +Core and Builtins +----------------- + +- Issue #10372: Import the warnings module only after the IO library is + initialized, so as to avoid bootstrap issues with the '-W' option. + +- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused + undocumented value PyBUF_SHADOW, and strangely-looking code in + PyMemoryView_GetContiguous. + +- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``. + +- If FileIO.__init__ fails, close the file descriptor. + +- Issue #10221: dict.pop(k) now has a key error message that includes the + missing key (same message d[k] returns for missing keys). + +- Issue #5437: A preallocated MemoryError instance should not keep traceback + data (including local variables caught in the stack trace) alive infinitely. + +- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length + of the offending line. + +- Issue #10089: Add support for arbitrary -X options on the command line. They + can be retrieved through a new attribute ``sys._xoptions``. + +- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of + the locale encoding. If the LANG (and LC_ALL and LC_CTYPE) environment + variable is not set, the locale encoding is ISO-8859-1, whereas most programs + (including Python) expect UTF-8. Python already uses UTF-8 for the filesystem + encoding and to encode command line arguments on this OS. + +- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect + filenames encoded to the filesystem encoding with the surrogateescape error + handler (to support undecodable bytes), instead of UTF-8 in strict mode. + +- Issue #9997: Don't let the name "top" have special significance in scope + resolution. + +- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as + the default 512 when compiling on AIX. + +- Use locale encoding instead of UTF-8 to encode and decode filenames if + Py_FileSystemDefaultEncoding is not set. + +- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file + descriptor. + +- Issue #9418: Moved private string methods ``_formatter_parser`` and + ``_formatter_field_name_split`` into a new ``_string`` module. + +- Issue #9992: Remove PYTHONFSENCODING environment variable. + +Library +------- + +- Issue #12943: python -m tokenize support has been added to tokenize. + +- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. + +- Issue #10356: Decimal.__hash__(-1) should return -2. + +- Issue #1553375: logging: Added stack_info kwarg to display stack information. + +- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru. + +- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See also issue + #10356.) + +- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard + IMAP4 connections. Original patch by Lorenzo M. Catucci. + +- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if + there are non-base64 alphabet characters in the input. + +- Issue #10386: Add __all__ to token module; this simplifies importing in + tokenize module and prevents leaking of private names through ``import *``. + +- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by Lorenzo + M. Catucci. + +- Fix IMAP.login() to work properly. + +- Issue #9244: multiprocessing pool worker processes could terminate + unexpectedly if the return value of a task could not be pickled. Only the + ``repr`` of such errors are now sent back, wrapped in an + ``MaybeEncodingError`` exception. + +- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of + ``multiprocessing.Pool`` now accepts a ``error_callback`` argument. This can + be a callback with the signature ``callback(exc)``, which will be called if + the target raises an exception. + +- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL + sockets now has additional items such as ``issuer`` and ``notBefore``. + +- ``usenetrc`` is now false by default for NNTP objects. + +- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS. + Patch by Andrew Vant. + +- Issue #10335: Add tokenize.open(), detect the file encoding using + tokenize.detect_encoding() and open it in read only mode. + +- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new + method send_message to send an email.message.Message object. + +- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error + handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source + code directory name contains a non-ASCII character and the locale encoding is + ASCII. + +- Issue #10329: The trace module writes reports using the input Python script + encoding, instead of the locale encoding. Patch written by Alexander + Belopolsky. + +- Issue #10126: Fix distutils' test_build when Python was built with + --enable-shared. + +- Issue #9281: Prevent race condition with mkdir in distutils. Patch by + Arfrever. + +- Issue #10229: Fix caching error in gettext. + +- Issue #10252: Close file objects in a timely manner in distutils code and + tests. Patch by Brian Brazil, completed by ?ric Araujo. + +- Issue #10180: Pickling file objects is now explicitly forbidden, since + unpickling them produced nonsensical results. + +- Issue #10311: The signal module now restores errno before returning from its + low-level signal handler. Patch by Hallvard B Furuseth. + +- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects. + +- Issue #10283: Add a ``group_pattern`` argument to NNTP.list(). + +- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI + environment better, and to correct unicode environment values for WSGI 1.0.1. + +- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER + response, instead of raising an exception. + +- wsgiref now implements and validates PEP 3333, rather than an experimental + extension of PEP 333. (Note: earlier versions of Python 3.x may have + incorrectly validated some non-compliant applications as WSGI compliant; if + your app validates with Python <3.2b1+, but not on this version, it is likely + the case that your app was not compliant.) + +- Issue #10280: NNTP.nntp_version should reflect the highest version advertised + by the server. + +- Issue #10184: Touch directories only once when extracting a tarfile. + +- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts + that were formerly found under Demo/turtle. + +- Issue #10265: Close file objects explicitly in sunau. Patch by Brian Brazil. + +- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a + filename. Patch by Brian Brazil. + +- Issue #10110: Queue objects didn't recognize full queues when the maxsize + parameter had been reduced. + +- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. + +- logging: Added style option to basicConfig() to allow %, {} or $-formatting. + +- Issue #5729: json.dumps() now supports using a string such as '\t' for + pretty-printing multilevel objects. + +- Issue #10253: FileIO leaks a file descriptor when trying to open a file for + append that isn't seekable. Patch by Brian Brazil. + +- Support context manager protocol for file-like objects returned by mailbox + ``get_file()`` methods. + +- Issue #10246: uu.encode didn't close file objects explicitly when filenames + were given to it. Patch by Brian Brazil. + +- Issue #10198: fix duplicate header written to wave files when writeframes() is + called without data. + +- Close file objects in modulefinder in a timely manner. + +- Close a io.TextIOWrapper object in email.parser in a timely manner. + +- Close a file object in distutils.sysconfig in a timely manner. + +- Close a file object in pkgutil in a timely manner. + +- Issue #10233: Close file objects in a timely manner in the tarfile module and + its test suite. + +- Issue #10093: ResourceWarnings are now issued when files and sockets are + deallocated without explicit closing. These warnings are silenced by default, + except in pydebug mode. + +- tarfile.py: Add support for all missing variants of the GNU sparse extensions + and create files with holes when extracting sparse members. + +- Issue #10218: Return timeout status from ``Condition.wait`` in threading. + +- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and + deprecate the old name ``zipfile.BadZipfile``. + +- Issue #5027: The standard ``xml`` namespace is now understood by + xml.sax.saxutils.XMLGenerator as being bound to + http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell. + +- Issue #5975: Add csv.unix_dialect class. + +- Issue #7761: telnetlib.interact failures on Windows fixed. + +- logging: Added style option to Formatter to allow %, {} or $-formatting. + +- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a + context manager. + +- Issue #1349106: Generator (and BytesGenerator) flatten method and Header + encode method now support a 'linesep' argument. + +- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in + order to support the TLS SNI extension. ``HTTPSConnection`` and ``urlopen()`` + also use this argument, so that HTTPS virtual hosts are now supported. + +- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items. + +- Issue #10163: Skip unreadable registry keys during mimetypes initialization. + +- logging: Made StreamHandler terminator configurable. + +- logging: Allowed filters to be just callables. + +- logging: Added tests for _logRecordClass changes. + +- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. + +- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to + increase flexibility of LogRecord creation. + +- Issue #5117: Case normalization was needed on ntpath.relpath(). Also fixed + root directory issue on posixpath.relpath(). (Ported working fixes from + ntpath.) + +- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option + short_empty_elements to direct it to use self-closing tags when appropriate. + +- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags. Add --abiflags + switch to python-config for command line access. + +- Issue #6098: Don't claim DOM level 3 conformance in minidom. + +- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty + XML namespace attribute is encountered. + +- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic + characters by default. Deprecate ``cgi.escape()``. + +- Issue #9409: Fix the regex to match all kind of filenames, for interactive + debugging in doctests. + +- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the + same instance as ``datetime.timezone.utc``. + +- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where + supported by the system. Patch by Nikita Vetoshkin. + +- Issue #10063: file:// scheme will stop accessing remote hosts via ftp + protocol. file:// urls had fallback to access remote hosts via ftp. This was + not correct, change is made to raise a URLError when a remote host is tried to + access via file:// scheme. + +- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is + created in modes 'a' or 'w' and then closed without adding any files. Raise + BadZipfile (rather than IOError) when opening small non-ZIP files. + +- Issue #10041: The signature of optional arguments in socket.makefile() didn't + match that of io.open(), and they also didn't get forwarded properly to + TextIOWrapper in text mode. Patch by Kai Zhu. + +- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and + urllib.request.urlopen now take optional arguments to allow for server + certificate checking, as recommended in public uses of HTTPS. + +- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the + current directory was deleted. Patch written by W. Trevor King. + +- Issue #3873: Speed up unpickling from file objects that have a peek() method. + +- Issue #10075: Add a session_stats() method to SSLContext objects. + +- Issue #9948: Fixed problem of losing filename case information. + +Extension Modules +----------------- + +- Issue #5109: array.array constructor will now use fast code when + initial data is provided in an array object with correct type. + +- Issue #6317: Now winsound.PlaySound only accepts unicode. + +- Issue #6317: Now winsound.PlaySound can accept non ascii filename. + +- Issue #9377: Use Unicode API for gethostname on Windows. + +- Issue #10143: Update "os.pathconf" values. + +- Issue #6518: Support context manager protcol for ossaudiodev types. + +- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. + +- Issue #9054: Fix a crash occurring when using the pyexpat module with expat + version 2.0.1. + +- Issue #5355: Provide mappings from Expat error numbers to string descriptions + and backwards, in order to actually make it possible to analyze error codes + provided by ExpatError. + +- The Unicode database was updated to 6.0.0. + +C-API +----- + +- Issue #10288: The deprecated family of "char"-handling macros + (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead. + +- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t + type has been introduced. + +Tools/Demos +----------- + +- Issue #10117: Tools/scripts/reindent.py now accepts source files that use + encoding other than ASCII or UTF-8. Source encoding is preserved when + reindented code is written to a file. + +- Issue #7287: Demo/imputil/knee.py was removed. + +Tests +----- + +- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well + as unicode strings. Initial patch by Sandro Tosi. + +- Issue #10294: Remove dead code form test_unicode_file. + +- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new + test specific to unicode (non-ascii name and filename). + +Build +----- + +- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure. + +- Issue #8852: Allow the socket module to build on OpenSolaris. + +- Drop -OPT:Olimit compiler option. + +- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. + +- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. + +- Issue #7473: avoid link errors when building a framework with a different set + of architectures than the one that is currently installed. + + +What's New in Python 3.2 Alpha 3? +================================= + +*Release date: 09-Oct-2010* + +Core and Builtins +----------------- + +- Issue #10068: Global objects which have reference cycles with their module's + dict are now cleared again. This causes issue #7140 to appear again. + +- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename() + encodings. + +- ast.literal_eval() can now handle negative numbers. It is also a little more + liberal in what it accepts without compromising the safety of the evaluation. + For example, 3j+4 and 3+4+5 are both accepted. + +- Issue #10006: type.__abstractmethods__ now raises an AttributeError. As a + result metaclasses can now be ABCs (see #9533). + +- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t. + +- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace + UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and + 32 bits wchar_t (eg. Linux in narrow build). + +- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression + introduced by issue #9324. + +- Issue #9979: Create function PyUnicode_AsWideCharString(). + +- Issue #7397: Mention that importlib.import_module() is probably what someone + really wants to be using in __import__'s docstring. + +- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg + to use named arguments. + +- Issue #9930: Remove bogus subtype check that was causing (e.g.) + float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. + +- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin. + +- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other + threads are still running. Instead, reinitialize the GIL on a second call to + Py_Initialize(). + +- All SyntaxErrors now have a column offset and therefore a caret when the error + is printed. + +- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the + module that was imported, but instead gets the module from sys.modules. + +- Issue #9213: The range type_items now provides index() and count() methods, to + conform to the Sequence ABC. Patch by Daniel Urban and Daniel Stutzbach. + +- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called + with a non-empty format string. This is an effort to future-proof user + code. If a derived class does not currently implement __format__ but later + adds its own __format__, it would most likely break user code that had + supplied a format string. This will be changed to a DeprecationWaring in + Python 3.3 and it will be an error in Python 3.4. + +- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly + re-created on a subsequent call to Py_Initialize(). The problem (a crash) + wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial. + +- Issue #9210: Configure option --with-wctype-functions was removed. Using the + functions from the libc caused the methods .upper() and lower() to become + locale aware and created subtly wrong results. + +- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a + non-ASCII byte in the format string. + +- Issue #4617: Previously it was illegal to delete a name from the local + namespace if it occurs as a free variable in a nested block. This limitation + of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). + +- Issue #9804: ascii() now always represents unicode surrogate pairs as a single + ``\UXXXXXXXX``, regardless of whether the character is printable or not. + Also, the "backslashreplace" error handler now joins surrogate pairs into a + single character on UCS-2 builds. + +- Issue #9757: memoryview objects get a release() method to release the + underlying buffer (previously this was only done when deallocating the + memoryview), and gain support for the context management protocol. + +- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid + thread-local storage key. + +Library +------- + +- Issue #2236: distutils' mkpath ignored the mode parameter. + +- Fix typo in one sdist option (medata-check). + +- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce. + +- Issue #1718574: Fix options that were supposed to accept arguments but did + not in build_clib. + +- Issue #9437: Fix building C extensions with non-default LDFLAGS. + +- Issue #4661: email can now parse bytes input and generate either converted + 7bit output or bytes output. Email version bumped to 5.1.0. + +- Issue #1589: Add ssl.match_hostname(), to help implement server identity + verification for higher-level protocols. + +- Issue #9759: GzipFile now raises ValueError when an operation is attempted + after the file is closed. Patch by Jeffrey Finkelstein. + +- Issue #9042: Fix interaction of custom translation classes and caching in + gettext. + +- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method + returning a (sock, addr) pair which is called when a connection has been + established with a new remote endpoint. This is supposed to be used as a + replacement for old handle_accept() and avoids the user to call accept() + directly. + +- Issue #9065: tarfile no longer uses "root" as the default for the uname and + gname field. + +- Issue #8980: Fixed a failure in distutils.command check that was shadowed by + an environment that does not have docutils. Patch by Arfrever. + +- Issue #1050268: parseaddr now correctly quotes double quote and backslash + characters that appear inside quoted strings in email addresses. + +- Issue #10004: quoprimime no longer generates a traceback when confronted with + invalid characters after '=' in a Q-encoded word. + +- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before + sending a 200 OK for the Expect: 100-continue request header. + +- Issue #9360: Cleanup and improvements to the nntplib module. The API now + conforms to the philosophy of bytes and unicode separation in Python 3. A + test suite has also been added. + +- Issue #9962: GzipFile now has the peek() method. + +- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, + retry the select() loop instead of bailing out. This is because select() can + incorrectly report a socket as ready for reading (for example, if it received + some data with an invalid checksum). + +- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) + +- Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is + received. Now sendall() properly calls signal handlers if necessary, and + retries sending if these returned successfully, including on sockets with a + timeout. + +- Issue #9947: logging: Fixed locking bug in stopListening. + +- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler. + +- Issue #9936: Fixed executable lines' search in the trace module. + +- Issue #9790: Rework imports necessary for samefile and sameopenfile + in ntpath. + +- Issue #9928: Properly initialize the types exported by the bz2 module. + +- Issue #1675951: Allow GzipFile to work with unseekable file objects. Patch by + Florian Festi. + +- Logging: Added QueueListener class to facilitate logging usage for + performance-critical threads. + +- Issue #9916: Add some missing errno symbols. + +- Issue #9877: Expose sysconfig.get_makefile_filename() + +- logging: Added hasHandlers() method to Logger and LoggerAdapter. + +- Issue #9908: Fix os.stat() on bytes paths under Windows 7. + +- Issue #2643: msync() is not called anymore when deallocating an open mmap + object, only munmap(). + +- logging: Changed LoggerAdapter implementation internally, to make it easier to + subclass in a useful way. + +- logging: hasHandlers method was added to Logger, and isEnabledFor, + getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter. + LoggerAdapter was introduced into the unit tests for logging. + +- Issue #1686: Fix string.Template when overriding the pattern attribute. + +- Issue #9854: SocketIO objects now observe the RawIOBase interface in + non-blocking mode: they return None when an operation would block (instead of + raising an exception). + +- Issue #1730136: Fix the comparison between a tk.font.Font and an object of + another kind. + +- Issue #9441: logging has better coverage for rotating file handlers. + +- Issue #9865: collections.OrderedDict now has a __sizeof__ method. + +- Issue #9854: The default read() implementation in io.RawIOBase now handles + non-blocking readinto() returning None correctly. + +- Issue #1552: socket.socketpair() now returns regular socket.socket objects + supporting the whole socket API (rather than the "raw" _socket.socket + objects). + +- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto() + to match the corresponding socket methods. + +- Issue #9840: Added a decorator to reprlib for wrapping __repr__ methods to make + them handle recursive calls within the same thread. + +- logging: Enhanced HTTPHandler with secure and credentials initializers. + +- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X. + +- Issue #9837: The read() method of ZipExtFile objects (as returned by + ZipFile.open()) could return more bytes than requested. + +- Issue #9826: OrderedDict.__repr__ can now handle self-referential values: + d['x'] = d. + +- Issue #9825: Using __del__ in the definition of collections.OrderedDict made + it possible for the user to create self-referencing ordered dictionaries which + become permanently uncollectable GC garbage. Reinstated the Python 3.1 + approach of using weakref proxies so that reference cycles never get created + in the first place. + +- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and + encode the value with filesystem encoding and surrogateescape (instead of + utf-8 in strict mode) . Patch written by David Watson. + +- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING + environment variable to set the filesystem encoding at Python startup. + sys.setfilesystemencoding() creates inconsistencies because it is unable to + reencode all filenames in all objects. + +- Issue #9410: Various optimizations to the pickle module, leading to speedups + up to 4x (depending on the benchmark). Mostly ported from Unladen Swallow; + initial patch by Alexandre Vassalotti. + +- The pprint module now supports printing OrderedDicts in their given order + (formerly, it would sort the keys). + +- Logging: Added QueueHandler class to facilitate logging usage with + multiprocessing. + +- Issue #9707: Rewritten reference implementation of threading.local which is + friendlier towards reference cycles. This change is not normally visible + since an optimized C implementation (_thread._local) is used instead. + +- Issue #6394: os.getppid() is now supported on Windows. Note that it will + still return the id of the parent process after it has exited. This process + id may even have been reused by another unrelated process. + +- Issue #9792: In case of connection failure, socket.create_connection() would + swallow the exception and raise a new one, making it impossible to fetch the + original errno, or to filter timeout errors. Now the original error is + re-raised. + +- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and + the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated + back after the system call. Original patch by Brian Brazil. + +- Updates to the random module: + + * Document which parts of the module are guaranteed to stay the same across + versions and which parts are subject to change. + + * Update the seed() method to use all of the bits in a string instead of just + the hash value. This makes better use of the seed value and assures the + seeding is platform independent. Issue #7889. + + * Improved the random()-->integer algorithm used in choice(), shuffle(), + sample(), randrange(), and randint(). Formerly, it used int(n*random()) + which has a slight bias whenever n is not a power of two. Issue #9025. + + * Improved documentation of arguments to randrange(). Issue #9379. + +- collections.OrderedDict now supports a new method for repositioning keys to + either end. + +- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test + cases now also have assertWarns and assertWarnsRegexp methods to check that a + given warning type was triggered by the code under test. + +- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of + their contents without duplicating them. The view is both readable and + writable. + +- Issue #7566: Implement os.path.sameopenfile for Windows. + +- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an + unsupported operation is attempted (for example, writing to a file open only + for reading). + +- hashlib has two new constant attributes: algorithms_guaranteed and + algorithms_avaiable that respectively list the names of hash algorithms + guaranteed to exist in all Python implementations and the names of hash + algorithms available in the current process. + +- A new package ``concurrent.futures`` as defined by PEP 3148. + +C-API +----- + +- Add PyErr_SyntaxLocationEx, which supports passing a column offset. + +- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or + PySequence_DelSlice when the object doesn't have any mapping operations + defined. + +Tools/Demos +----------- + +- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as + wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb) + and the interpreter under test. + +Tests +----- + +- Issue #9308: Added tests for importing encoded modules that do not + depend on specific stdlib modules being encoded in a certain way. + +- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom + certificate and private key files used by SSL-related certs. + +- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests + in test_os) + +- Issue #7110: regrtest now sends test failure reports and single-failure + tracebacks to stderr rather than stdout. + +- Issue #9628: fix runtests.sh -x option so more than one test can be excluded. + +- Issue #9899: Fix test_tkinter.test_font on various platforms. Patch by Ned + Deily. + +- Issue #9894: Do not hardcode ENOENT in test_subprocess. + +- Issue #9315: Added tests for the trace module. Patch by Eli Bendersky. + +- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the + case when running profile or trace, for example. + +- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. + +Build +----- + +- Issue #10062: Allow building on platforms which do not have sem_timedwait. + +- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by Akira + Kitada. + +- Issue #10055: Make json C89-compliant in UCS4 mode. + +- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows) + +- Issue #1633863: Don't ignore $CC under AIX. + +- Issue #9810: Compile bzip2 source files in Python's project file directly. It + used to be built with bzip2's makefile. + +- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in + module. + +- Issue #9806: python-config now has an ``--extension-suffix`` option that + outputs the suffix for dynamic libraries including the ABI version name + defined by PEP 3149. + +- Issue #941346: Improve the build process under AIX and allow Python to be + built as a shared library. Patch by S?bastien Sabl?. + +- Issue #4026: Make the fcntl extension build under AIX. Patch by S?bastien + Sabl?. + +- Issue #9701: The MacOSX installer can patch the shell profile to ensure that + the "bin" directory inside the framework is on the shell's search path. This + feature now also supports the ZSH shell. + + +What's New in Python 3.2 Alpha 2? +================================= + +*Release date: 05-Sep-2010* + +Core and Builtins +----------------- + +- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by + the new (and simpler) DUP_TOP_TWO. Performance isn't changed, but our + bytecode is a bit simplified. Patch by Demur Rumed. + +- Issue #9766: Rename poorly named variables exposed by _warnings to prevent + confusion with the proper variables names from 'warnings' itself. + +- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to + conform to the Set ABC. Patch by Daniel Urban. + +- Issue #9737: Fix a crash when trying to delete a slice or an item from a + memoryview object. + +- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are + now removed, since their effect was inexistent in 3.x (the default encoding is + hardcoded to utf-8 and cannot be changed). + +- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API + properly. Patch by Stefan Behnel. + +- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most + platforms. Previously, it inlined only when using Microsoft Visual C. + +- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. + +- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. + +- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match + the pyconfig.h generated by configure on other systems. + +- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that + occur during attribute lookup are now propagated to the caller. + +- Issue #8622: Add PYTHONFSENCODING environment variable to override the + filesystem encoding. + +- Issue #5127: The C functions that access the Unicode Database now accept and + return characters from the full Unicode range, even on narrow unicode builds + (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others). A visible difference + in Python is that unicodedata.numeric() now returns the correct value for + large code points, and repr() may consider more characters as printable. + +- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename + as a unicode object, instead of a byte string. Function needed to support + unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new + function. + +- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx(). + +- Issue #9612: The set object is now 64-bit clean under Windows. + +- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for + the module file to be executed with the -m command line option. + +- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to + write a message formatted by PyUnicode_FromFormatV() to sys.stdout and + sys.stderr. + +- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter: + decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str + objects are output as-is. + +- Issue #9203: Computed gotos are now enabled by default on supported compilers + (which are detected by the configure script). They can still be disable + selectively by specifying --without-computed-gotos. + +- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but + use PyUnicode_FromFormatV() to format the warning message. + +- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an + array. + +- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. + +- Issue #9337: The str() of a float or complex number is now identical to its + repr(). + +- Issue #9416: Fix some issues with complex formatting where the output with no + type specifier failed to match the str output: + + - format(complex(-0.0, 2.0), '-') omitted the real part from the output, + - format(complex(0.0, 2.0), '-') included a sign and parentheses. + +Extension Modules +----------------- + +- Issue #8013: time.asctime and time.ctime no longer call system + asctime and ctime functions. The year range for time.asctime is now + 1900 through maxint. The range for time.ctime is the same as for + time.localtime. The string produced by these functions is longer + than 24 characters when year is greater than 9999. + +- Issue #6608: time.asctime is now checking struct tm fields its input + before passing it to the system asctime. Patch by MunSic Jeong. + +- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file + descriptor is provided. Patch by Pascal Chambon. + +- Issue #7736: Release the GIL around calls to opendir() and closedir() in the + posix module. Patch by Marcin Bachry. + +- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the + socket module, and fix the width of socket descriptors to be correctly + detected under 64-bit Windows. + +- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo + and gethostbyaddr. getnameinfo is now restricted to numeric addresses as + input. + +- Issue #9214: Set operations on a KeysView or ItemsView in collections now + correctly return a set. Patch by Eli Bendersky. + +- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by + Matthew Ahrens. + +- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using + the surrogate error handler. + +- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other + than ``TypeError`` raised by the iterator argument. + +- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo. + +- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter + Lock around all system calls. Original patch by Ryan Kelly. + +- Issue #8524: Add a detach() method to socket objects, so as to put the socket + into the closed state without closing the underlying file descriptor. + +- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty. + +- Issue #6869: Fix a refcount problem in the _ctypes extension. + +- Issue #5504: ctypes should now work with systems where mmap can't be + PROT_WRITE and PROT_EXEC. + +- Issue #9507: Named tuple repr will now automatically display the right name in + a tuple subclass. + +- Issue #9324: Add parameter validation to signal.signal on Windows in order to + prevent crashes. + +- Issue #9526: Remove some outdated (int) casts that were preventing the array + module from working correctly with arrays of more than 2**31 elements. + +- Fix memory leak in ssl._ssl._test_decode_cert. + +- Issue #8065: Fix memory leak in readline module (from failure to free the + result of history_get_history_state()). + +- Issue #9450: Fix memory leak in readline.replace_history_item and + readline.remove_history_item for readline version >= 5.0. + +- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. + +- Issue #8046: Add context manager protocol support and .closed property to mmap + objects. + +Library +------- + +- Issue #7451: Improve decoding performance of JSON objects, and reduce the + memory consumption of said decoded objects when they use the same strings as + keys. + +- Issue #1100562: Fix deep-copying of objects derived from the list and dict + types. Patch by Michele Orr? and Bj?rn Lindqvist. + +- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows. + +- Issue #9421: Made the get methods consistently accept the vars and + default arguments on all parser classes. + +- Issue #7005: Fixed output of None values for RawConfigParser.write and + ConfigParser.write. + +- Issue #8990: array.fromstring() and array.tostring() get renamed to + frombytes() and tobytes(), respectively, to avoid confusion. Furthermore, + array.frombytes(), array.extend() as well as the array.array() constructor now + accept bytearray objects. Patch by Thomas Jollans. + +- Issue #808164: Fixed socket.close to avoid references to globals, to avoid + issues when socket.close is called from a __del__ method. + +- Issue #9706: ssl module provides a better error handling in various + circumstances. + +- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting + rid of the cached copy of thread-local attribute dictionary. + +- Issue #1512791: In setframerate() in the wave module, non-integral frame rates + are rounded to the nearest integer. + +- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of + falling into recursion. + +- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four + character years even if the message contains RFC822 two character years. + +- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive + operations on its self, namely x -= x and x ^= x. + +- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error + handling when accepting a new connection. + +- Issue #9601: ftplib now provides a workaround for non-compliant + implementations such as IIS shipped with Windows server 2003 returning invalid + response codes for MKD and PWD commands. + +- Issue #658749: asyncore's connect() method now correctly interprets winsock + errors. + +- Issue #9501: Fixed logging regressions in cleanup code. + +- Fix functools.total_ordering() to skip methods inherited from object. + +- Issue #9572: Importlib should not raise an exception if a directory it thought + it needed to create was done concurrently by another process. + +- Issue #9617: Signals received during a low-level write operation aren't + ignored by the buffered IO layer anymore. + +- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding. + +- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape + error handler, or strict error handler on Windows. + +- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and + ``gzip.decompress``. Original patch by Anand B. Pillai. + +- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a + ssl.SSLContext object allowing bundling SSL configuration options, + certificates and private keys into a single (potentially long-lived) + structure. + +- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as + single keyword arguments. + +- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py + compiler flag values over defining its own. + +- Issue #9147: Added dis.code_info() which is similar to show_code() but returns + formatted code information in a string rather than displaying on screen. + +- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute + pointing to the original callable. + +- Issue #3445: functools.update_wrapper now tolerates missing attributes on + wrapped callables. + +- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod. + +- Issue #9605: posix.getlogin() decodes the username with file filesystem + encoding and surrogateescape error handler. Patch written by David Watson. + +- Issue #9604: posix.initgroups() encodes the username using the fileystem + encoding and surrogateescape error handler. Patch written by David Watson. + +- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name + using the filesystem encoding and surrogateescape error handler. Patch written + by David Watson. + +- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants, + for use with the statvfs() function. Patch by Adam Jackson. + +- Issue #8688: MANIFEST files created by distutils now include a magic comment + indicating they are generated. Manually maintained MANIFESTs without this + marker will not be overwritten or removed. + +- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a + BadZipfile error is raised if it doesn't match (as used to be the case in + Python 2.5 and earlier). + +- Issue #9550: a BufferedReader could issue an additional read when the original + read request had been satisfied, which could block indefinitely when the + underlying raw IO channel was e.g. a socket. Report and original patch by + Jason V. Miller. + +- Issue #3757: thread-local objects now support cyclic garbage collection. + Thread-local objects involved in reference cycles will be deallocated timely + by the cyclic GC, even if the underlying thread is still running. + +- Issue #9452: Add read_file, read_string, and read_dict to the configparser + API; new source attribute to exceptions. + +- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current + node. + +- Issue #8047: Fix the xml.etree serializer to return bytes by default. Use + ``encoding="unicode"`` to generate a Unicode string. + +- Issue #8280: urllib2's Request method will remove fragments in the url. This + is how it is supposed to work, wget and curl do the same. Previous behavior + was wrong. + +- Issue #6683: For SMTP logins we now try all authentication methods advertised + by the server. Many servers are buggy and advertise authentication methods + they do not support in reality. + +- Issue #8814: function annotations (the ``__annotations__`` attribute) are now + included in the set of attributes copied by default by functools.wraps and + functools.update_wrapper. Patch by Terrence Cole. + +- Issue #2944: asyncore doesn't handle connection refused correctly. + +- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate + the private attributes. Add tests for smtpd module. + +- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word + encoded in base64 is lacking padding. + +- Issue #9444: Argparse now uses the first element of prefix_chars as the option + character for the added 'h/help' option if prefix_chars does not contain a + '-', instead of raising an error. + +- Issue #7372: Fix pstats regression when stripping paths from profile data + generated with the profile module. + +- Issue #9428: Fix running scripts with the profile/cProfile modules from the + command line. + +- Issue #7781: Fix restricting stats by entry counts in the pstats interactive + browser. + +- Issue #9209: Do not crash in the pstats interactive browser on invalid regular + expressions. + +- Update collections.OrderedDict to match the implementation in Py2.7 (based on + lists instead of weakly referenced Link objects). + +- Issue #8397: Raise an error when attempting to mix iteration and regular reads + on a BZ2File object, rather than returning incorrect results. + +- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when + re-initializing a buffered IO object by calling its ``__init__`` method. + +- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links + across devices. + +- Issue #8826: Properly load old-style "expires" attribute in http.cookies. + +- Issue #1690103: Fix initial namespace for code run with trace.main(). + +- Issue #7395: Fix tracebacks in pstats interactive browser. + +- Issue #8230: Fix Lib/test/sortperf.py. + +- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final + newline, it no longer truncates the last character of the last command line. + +- Issue #5146: Handle UID THREAD command correctly in imaplib. + +- Issue #5147: Fix the header generated for cookie files written by + http.cookiejar.MozillaCookieJar. + +- Issue #8198: In pydoc, output all help text to the correct stream when + sys.stdout is reassigned. + +- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` + in ntpath.normpath(). + +- Issue #1286: Allow using fileinput.FileInput as a context manager. + +- Add lru_cache() decorator to the functools module. + +Tools/Demos +----------- + +- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147. + +- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing + non-ASCII content. + +Tests +----- + +- Issue #9601: Provide a test case for ftplib.parse257. + +- Issue #8857: Provide a test case for socket.getaddrinfo. + +- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. + +- Issue #8433: Fix test_curses failure with newer versions of ncurses. + +- Issue #9496: Provide a test suite for the rlcompleter module. Patch by + Michele Orr?. + +- Issue #8687: provide a test suite for sched.py module. + +Build +----- + +- Issue #1303434: Generate ZIP file containing all PDBs. + +- Issue #9193: PEP 3149 is accepted. + +- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F() + become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively. + +- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by + S?bastien Sabl?. + +- Don't run pgen twice when using make -j. + + +What's New in Python 3.2 Alpha 1? +================================= + +*Release date: 01-Aug-2010* + +Core and Builtins +----------------- + +- Issue #8991: convertbuffer() rejects discontigious buffers. + +- Issue #7616: Fix copying of overlapping memoryview slices with the Intel + compiler. + +- Issue #8413: structsequence now subclasses tuple. + +- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the + start byte and the continuation byte(s) are now considered invalid, instead of + the number of bytes specified by the start byte. E.g.: + '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces + with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80') + even if '\xf1' is the start byte of a 4-bytes sequence. Previous versions + returned a single u'\ufffd'. + +- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0 + rather than 0.0. So "-7j" is now exactly equivalent to "-(7j)". + +- Be more specific in error messages about positional arguments. + +- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes + objects, as described in the documentation. + +- Issue #6543: Write the traceback in the terminal encoding instead of utf-8. + Fix the encoding of the modules filename. Patch written by Amaury Forgeot + d'Arc. + +- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code + dealing with unary minus applied to a constant. The removed code was mutating + the ST, causing a second compilation to fail. + +- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict + mode raises unicode errors. The encoder only supports "strict" and "replace" + error handlers, the decoder only supports "strict" and "ignore" error + handlers. Patch written by Mark Hammond. + +- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use + "w*" format instead. Add tests for "w*" format. + +- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z" + formats if the string contains a null byte/character. Write unit tests for + string formats. + +- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test + suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module + location of the raised exception. + +- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode + filenames and enable os.fsencode(). + +- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. + +- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the + interpreter with characters outside the Basic Multilingual Plane (higher than + 0x10000). + +- Issue #8950: (See also issue #5080). Py_ArgParse*() functions now raise + TypeError instead of giving a DeprecationWarning when a float is parsed using + the 'L' code (for long long). (All other integer codes already raise + TypeError in this case.) + +- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to + enable shortcuts for upper case encoding name. Add also a shortcut for + "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode(). + +- Issue #8838: Remove codecs.charbuffer_encode() function. The buffer protocol + doesn't support "char buffer" anymore in Python 3. + +- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*" + instead. codecs.charbuffer_encode() now accepts modifiable buffer objects + like bytearray. + +- Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no + used anymore and it was never documented. + +- In str.format(), raise a ValueError when indexes to arguments are too large. + +- Issue #2844: Make int('42', n) consistently raise ValueError for invalid + integers n (including n = -909). + +- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances + of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it + easy to maintain the invariant that hash(x) == hash(y) whenever x and y have + equal value. + +- Issue #8748: Fix two issues with comparisons between complex and integer + objects. (1) The comparison could incorrectly return True in some cases + (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality. + (2) The comparison raised an OverflowError for large integers, leading to + unpredictable exceptions when combining integers and complex objects in sets + or dicts. + +- Issue #8766: Initialize _warnings module before importing the first module. + Fix a crash if an empty directory called "encodings" exists in sys.path. + +- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system + encoding and surrogateescape error handler instead of the locale encoding to + be consistent with os.environ. Add PySys_AddWarnOptionUnicode() function. + +- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead + of strict) error handler to escape surrogates. + +- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode + object to Py_FileSystemDefaultEncoding with the "surrogateescape" error + handler, and return bytes. If Py_FileSystemDefaultEncoding is not set, fall + back to UTF-8. + +- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any + error handler, not only the default error handler (strict). + +- Issue #8610: Load file system codec at startup, and display a fatal error on + failure. Set the file system encoding to utf-8 (instead of None) if getting + the locale encoding failed, or if nl_langinfo(CODESET) function is missing. + +- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of + PyUnicode_FromString() to support surrogates in the filename and use the right + encoding. + +- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells. + +- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler. + +- Issue #8419: Prevent the dict constructor from accepting non-string keyword + arguments. + +- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute + indirectly Python signal handlers anymore because mywrite() ignores exceptions + (KeyboardInterrupt). + +- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing + unicode string (eg. backslashreplace). + +- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects + anymore, you have to convert your bytearray filenames to bytes. + +- Issue #7332: Remove the 16KB stack-based buffer in + PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit + compared to the dynamic memory allocation fallback. Patch by Charles-Fran?ois + Natali. + +- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is + passed to bytes or bytearray. + +- Issue #7301: Add environment variable $PYTHONWARNINGS. + +- Issue #8329: Don't return the same lists from select.select when no fds are + changed. + +- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on + 64-bit machines. The shift count for either left or right shift is permitted + to be up to sys.maxsize. + +- Ensure that tokenization of identifiers is not affected by locale. + +- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever. + +- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. + +- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it + is set. + +- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding + is unknown. + +- Issue #1583863: A str subclass can now override the __str__ method. + +- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with + PyMemberDefs could produce an internal error; raise TypeError instead. + +- Issue #7845: Rich comparison methods on the complex type now return + NotImplemented rather than raising a TypeError when comparing with an + incompatible type; this allows user-defined classes to implement their own + comparisons with complex. + +- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt + (SIGINT). If an error occurs while importing the site module, the error is + printed and Python exits. Initialize the GIL before importing the site module. + +- Issue #7173: Generator finalization could invalidate sys.exc_info(). + +- Issue #7544: Preallocate thread memory before creating the thread to avoid a + fatal error in low memory condition. + +- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM + check fails. + +- Handle errors from looking up __prepare__ correctly. + +- Issue #5939: Add additional runtime checking to ensure a valid capsule in + Modules/_ctypes/callproc.c. + +- Issue #7309: Fix unchecked attribute access when converting + UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings. + +- Issue #6902: Fix problem with built-in types format incorrectly with 0 + padding. + +- Issue #7988: Fix default alignment to be right aligned for complex.__format__. + Now it matches other numeric types. + +- Issue #5988: Remove deprecated functions PyOS_ascii_formatd, + PyOS_ascii_strtod, and PyOS_ascii_atof. Use PyOS_double_to_string and + PyOS_string_to_double instead. See issue #5835 for the original deprecations. + +- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` + fails. Patch by Florent Xicluna. + +- Issue #7788: Fix an interpreter crash produced by deleting a list slice with + very large step value. + +- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and + add the additional members returned in an OSVERSIONINFOEX structure. The new + members are service_pack_major, service_pack_minor, suite_mask, and + product_type. + +- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could + crash in many places because of the PyByteArray_AS_STRING() macro returning + NULL. The macro now returns a statically allocated empty string instead. + +- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`, + where the right hand operand is a set of constants, by turning the set into a + frozenset and pre-building it as a constant. The comparison operation is made + against the constant instead of building a new set each time it is executed (a + similar optimization already existed which turned a list of constants into a + pre-built tuple). Patch and additional tests by Dave Malcolm. + +- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods + of bytes, bytearray and unicode objects by using a common implementation based + on stringlib's fast search. Patch by Florent Xicluna. + +- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2, + including: (1) a serious 'wrong output' bug that could occur for long (> 40 + digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when + parsing certain long numeric strings corresponding to subnormal values, (3) a + memory leak for some values large enough to cause overflow, and (4) a number + of flaws that could lead to incorrectly rounded results. + +- The __complex__ method is now looked up on the class of instances to make it + consistent with other special methods. + +- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, + `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. + +- Issue #7604: Deleting an unset slotted attribute did not raise an + AttributeError. + +- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero) + in ** operator. The behaviour now conforms to that described in C99 Annex F. + +- Issue #1811: improve accuracy and cross-platform consistency for true division + of integers: the result of a/b is now correctly rounded for ints a and b (at + least on IEEE 754 platforms), and in particular does not depend on the + internal representation of an int. + +- Issue #6834: replace the implementation for the 'python' and 'pythonw' + executables on OSX. + + These executables now work properly with the arch(1) command: ``arch -ppc + python`` will start a universal binary version of python in PPC mode (unlike + previous releases). + +- Issue #7466: Segmentation fault when the garbage collector is called in the + middle of populating a tuple. Patch by Florent Xicluna. + +- Issue #7419: setlocale() could crash the interpreter on Windows when called + with invalid values. + +- Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+" + mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z). + +- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX + 10.6. + +- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding. + +- Issue #6970: Remove redundant calls when comparing objects that don't + implement the relevant rich comparison methods. + +- Issue #7298: Fixes for range and reversed(range(...)). Iteration over + range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C + long but the length of the range did not. Also fix several cases where + reversed(range(a, b, c)) gave wrong results, and fix a refleak for + reversed(range(a, b, c)) with large arguments. + +- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised + during the formation of an output tuple. + +- Issue #3297: On wide unicode builds, do not split unicode characters into + surrogates. + +- Remove length limitation when constructing a complex number from a string. + +- Issue #1087418: Boost performance of bitwise operations for longs. + +- Support for AtheOS has been completely removed from the code base. It was + disabled since Python 3.0. + +- Support for several legacy threading libraries has been disabled. These + libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code + will be entirely removed in 3.3. + +- Support for OSF* has been disabled. If nobody stands up, support will be + removed in 3.3. See . + +- Peephole constant folding had missed UNARY_POSITIVE. + +- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which + fixes the problem of some exceptions being thrown at shutdown when the + interpreter is killed. Patch by Adam Olsen. + +- Issue #7147: Remove support for compiling Python without complex number + support. + +- Issue #7120: logging: Removed import of multiprocessing which is causing crash + in GAE. + +- Issue #1754094: Improve the stack depth calculation in the compiler. There + should be no other effect than a small decrease in memory use. Patch by + Christopher Tur Lesniewski-Laas. + +- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using + byte values greater than 127. Patch by Derk Drukker. + +- Issue #1571184: The Unicode database contains properties for more characters. + The tables for code points representing numeric values, white spaces or line + breaks are now generated from the official Unicode Character Database files, + and include information from the Unihan.txt file. + +- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of + producing internally inconsistent Python longs. + +- Issue #6990: Fix threading.local subclasses leaving old state around after a + reference cycle GC which could be recycled by new locals. + +- Issue #5460: Fix an ambiguity in the grammar. + +- Issue #1766304: Improve performance of membership tests on range objects. + +- Issue #6713: Improve performance of integer -> string conversions. + +- Issue #6846: Fix bug where bytearray.pop() returns negative integers. + +- Issue #6750: A text file opened with io.open() could duplicate its output when + writing from multiple threads at the same time. + +- Issue #6707: dir() on an uninitialized module caused a crash. + +- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. + +- Issue #6573: set.union() stopped processing inputs if an instance of self + occurred in the argument chain. + +- Issue #6070: On posix platforms import no longer copies the execute bit from + the .py file to the .pyc file if it is set. + +- Issue #1616979: Added the cp720 (Arabic DOS) encoding. + +- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object, + and not an int. Fix the corresponding error message, and the documentation. + +- The deprecated PyCObject has been removed. + +- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h. This fixes a + build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead + of stdint.h on that platform. + +- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the + 'surrogateescape' error handler, a string which contains unpaired surrogates. + +- Issue #4856: Remove checks for win NT. + +- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument + to construct a null-initialized bytes object. + +- Issue #1023290: Add from_bytes() and to_bytes() methods to integers. These + methods allow the conversion of integers to bytes, and vice-versa. + +- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances + from being copied with copy.copy(), and bytes subclasses from being pickled + properly. + +- Code objects now support weak references. + +- Issue #7072: isspace(0xa0) is true on Mac OS X. + +- Issue #8084: PEP 370 now conforms to system conventions for framework builds + on MacOS X. That is, "python setup.py install --user" will install into + "~/Library/Python/2.7" instead of "~/.local". + +C-API +----- + +- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the + variable argument list. `Py_VA_COPY` is equivalent to C99 + `va_copy`, but available on all python platforms. + +- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX] + instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX]. This makes it safe to do + "step = -step" when reversing a slice. + +- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the + interpreter to set sys.argv without also modifying sys.path. This helps fix + `CVE-2008-5983 + `_. + +- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are + strings in an efficient manner. + +- Issue #8276: PyEval_CallObject() is now only available in macro form. The + function declaration, which was kept for backwards compatibility reasons, is + now removed (the macro was introduced in 1997!). + +- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to + PyLong_AsLongAndOverflow. + +- Make PyUnicode_CompareWithASCIIString return not equal if the Python string + has '\0' at the end. + +- Issue #5080: The argument parsing functions PyArg_ParseTuple, + PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and + PyArg_Parse now raise a DeprecationWarning for float arguments passed with the + 'L' format code. This will become a TypeError in a future version of Python, + to match the behaviour of the other integer format codes. + +- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added. + +- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in + PyArg_ParseTupleAndKeywords. + +- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and + PyErr_Format, on machines with HAVE_LONG_LONG defined. + +- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in + PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for + accessing the d_type and d_name members of structures using PyDescr_COMMON. + +- Issue #6405: Remove duplicate type declarations in descrobject.h. + +- The code flags for old __future__ features are now available again. + +- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of + PyCode_Addr2Line(). + +- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code + object at a specified file, function, and line number. + +- Issue #1419652: Change the first argument to PyImport_AppendInittab() to + ``const char *`` as the string is stored beyond the call. + +- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc + allocator will be automatically disabled when running under Valgrind. This + gives improved memory leak detection when running under Valgrind, while taking + advantage of pymalloc at other times. + +Library +------- + +- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the + old commands are restored. + +- For traceback debugging, the pdb listing now also shows the locations where + the exception was originally (re)raised, if it differs from the last line + executed (e.g. in case of finally clauses). + +- The pdb command "source" has been added. It displays the source code for a + given object, if possible. + +- The pdb command "longlist" has been added. It displays the whole source code + for the current function. + +- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error + output into methods. + +- Issue #809887: Make the output of pdb's breakpoint deletions more consistent; + emit a message when a breakpoint is enabled or disabled. + +- Issue #5294: Fix the behavior of pdb's "continue" command when called in the + top-level debugged frame. + +- Issue #5727: Restore the ability to use readline when calling into pdb in + doctests. + +- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the + source file to be debugged is in a non-builtin encoding. + +- Issue #8048: Prevent doctests from failing when sys.displayhook has been + reassigned. + +- Issue #8015: In pdb, do not crash when an empty line is entered as a + breakpoint command. + +- In pdb, allow giving a line number to the "until" command. + +- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc + files. Also, add a command-line option "-c" that runs a command as if given + in .pdbrc. + +- Issue #4179: In pdb, allow "list ." as a command to return to the currently + debugged line. + +- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *`` + entries, consider the first one. + +- Issue #6630: Allow customizing regex flags when subclassing the + string.Template class. + +- Issue #9411: Allow specifying an encoding for config files in the configparser + module. + +- Issue #1682942: Improvements to configparser: support alternate delimiters, + alternate comment prefixes and empty lines in values. + +- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. + +- Issue #8966: ctypes: Remove implicit bytes-unicode conversion. + +- Issue #9378: python -m pickle will now load and display the + first object in the pickle file. + +- Issue #4770: Restrict binascii module to accept only bytes (as specified). + And fix the email package to encode to ASCII instead of ``raw-unicode-escape`` + before ASCII-to-binary decoding. + +- Issue #9384: ``python -m tkinter`` will now display a simple demo applet. + +- The default size of the re module's compiled regular expression cache has been + increased from 100 to 500 and the cache replacement policy has changed from + simply clearing the entire cache on overflow to forgetting the least recently + used cached compiled regular expressions. This is a performance win for + applications that use a lot of regular expressions and limits the impact of + the performance hit anytime the cache is exceeded. + +- Issue #7113: Speed up loading in configparser. Patch by ?ukasz Langa. + +- Issue #9032: XML-RPC client retries the request on EPIPE error. The EPIPE + error occurs when the server closes the socket and the client sends a big + XML-RPC request. + +- Issue #4629: getopt raises an error if an argument ends with "=", whereas + getopt doesn't accept a value (eg. --help= is rejected if getopt uses + ['help='] long options). + +- Issue #7989: Added pure python implementation of the `datetime` module. The C + module is renamed to `_datetime` and if available, overrides all classes + defined in datetime with fast C impementation. Python implementation is based + on the original python prototype for the datetime module by Tim Peters with + minor modifications by the PyPy project. The test suite now tests `datetime` + module with and without `_datetime` acceleration using the same test cases. + +- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). + +- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the + script being traced. Patch by Eli Bendersky. + +- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for + the patch. + +- Issue #3704: http.cookiejar was not properly handling URLs with a / in the + parameters. + +- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument + which controls printing of opcode descriptions in ``dis()`` output. + +- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo + crosses an 8192 byte boundary. + +- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee. + +- ``ast.literal_eval()`` now allows byte literals. + +- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated + keyword arguments called 'self' or 'other' specially. + +- ``ast.literal_eval()`` now allows set literals. + +- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS. + +- Issue #7646: The fnmatch pattern cache no longer grows without bound. + +- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError + produced when profiling the decimal module. This was due to a dangerous + iteration over 'locals()' in Context.__init__. + +- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10 + and the exponent is tiny (for example, ``Decimal(10) ** + Decimal('1e-999999999')``). + +- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError. + +- Issue #9130: Fix validation of relative imports in parser module. + +- Issue #9128: Fix validation of class decorators in parser module. + +- Issue #9094: python -m pickletools will now disassemble pickle files listed in + the command line arguments. See output of python -m pickletools -h for more + details. + +- Issue #5468: urlencode to handle bytes type and other encodings in its query + parameter. Patch by Dan Mahn. + +- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, + ensure that the input string length is a multiple of the frame size. + +- Issue #6507: Accept source strings in dis.dis(). Original patch by Daniel + Urban. + +- Issue #7829: Clearly document that the dis module is exposing an + implementation detail that is not stable between Python VMs or releases. + +- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor + raises an exception. + +- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs + that act as both context managers and decorators. contextmanager changes to + use ContextDecorator. + +- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader + for removal in Python 3.4. + +- Issue #9064: pdb's "up" and "down" commands now accept an optional argument + giving the number of frames to go. + +- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not + ``str`` or ``bytes``. + +- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an + OpenSSL structure. + +- Issue #8682: The ssl module now temporary increments the reference count of a + socket object got through ``PyWeakref_GetObject``, so as to avoid possible + deallocation while the object is still being used. + +- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong + password instead of presenting an interactive prompt. Older behavior can be + obtained by passing retry=True to http_error_xxx methods of FancyURLOpener. + +- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile + smart enough to find source files in the linecache. + +- Issue #5610: feedparser no longer eats extra characters at the end of a body + part if the body part ends with a ``\r\n``. + +- Issue #8986: math.erfc was incorrectly raising OverflowError for values + between -27.3 and -30.0 on some platforms. + +- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows. + +- Issue #8966: If a ctypes structure field is an array of c_char, convert its + value to bytes instead of str (as done for c_char and c_char_p). + +- Issue #8188: Comparisons between Decimal and Fraction objects are now + permitted, returning a result based on the exact numerical values of the + operands. This builds on issue #2531, which allowed Decimal-to-float + comparisons; all comparisons involving numeric types (bool, int, float, + complex, Decimal, Fraction) should now act as expected. + +- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by + Thomas Jollans. + +- Issue #8899: time.struct_time now has class and attribute docstrings. + +- Issue #6470: Drop UNC prefix in FixTk. + +- Issue #4768: base64 encoded email body parts were incorrectly stored as binary + strings. They are now correctly converted to strings. + +- Issue #8833: tarfile created hard link entries with a size field != 0 by + mistake. + +- Charset.body_encode now correctly handles base64 encoding by encoding with the + output_charset before calling base64mime.encode. Passes the tests from 2.x + issue #1368247. + +- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction + attribute that is True iff there are uncommitted changes. + +- Issue #1289118: datetime.timedelta objects can now be multiplied by float and + divided by float and int objects. Results are rounded to the nearest multiple + of timedelta.resolution with ties resolved using round-half-to-even method. + +- Issue #7150: Raise OverflowError if the result of adding or subtracting + timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. + +- Issue #8806: add SSL contexts support to ftplib. + +- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer + and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes + API. + +- Issue #8770: Now sysconfig displays information when it's called as a script. + Initial idea by Sridhar Ratnakumar. + +- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by + Fredrik H??rd. + +- Issue #8540: Decimal module: rename the Context._clamp attribute to + Context.clamp and make it public. This is useful in creating contexts that + correspond to the decimal interchange formats specified in IEEE 754. + +- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM + twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and + StreamWriter classes. + +- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead + of the C file stderr, to use stderr encoding and error handler. + +- Issue #8782: Add a trailing newline in linecache.updatecache to the last line + of files without one. + +- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when + comparing to a non-mapping. + +- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the + correct encoding. + +- Issue #4870: Add an `options` attribute to SSL contexts, as well as several + ``OP_*`` constants to the `ssl` module. This allows to selectively disable + protocol versions, when used in combination with `PROTOCOL_SSLv23`. + +- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. + +- Issue #8663: distutils.log emulates backslashreplace error handler. Fix + compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if + stdout is not a TTY). + +- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value. + subprocess.Popen() and os._execvpe() support bytes program name. Add + os.supports_bytes_environ flag: True if the native OS type of the environment + is bytes (eg. False on Windows). + +- Issue #8633: tarfile is now able to read and write archives with "raw" binary + pax headers as described in POSIX.1-2008. + +- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes, + unquote, unquote_to_bytes. + +- Issue #8688: Distutils now recalculates MANIFEST everytime. + +- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with + surrogates and bytes for the filename. + +- Issue #8550: Add first class ``SSLContext`` objects to the ssl module. + +- Issue #8681: Make the zlib module's error messages more informative when the + zlib itself doesn't give any detailed explanation. + +- The audioop module now supports sound fragments of length greater than 2**31 + bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN. + +- Issue #4972: Add support for the context manager protocol to the ftplib.FTP + class. + +- Issue #8664: In py_compile, create __pycache__ when the compiled path is + given. + +- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes + for use in the file system, environment variables or the command line. + +- Issue #8571: Fix an internal error when compressing or decompressing a chunk + larger than 1GB with the zlib module's compressor and decompressor objects. + +- Issue #8603: Support bytes environmental variables on Unix: Add os.environb + mapping and os.getenvb() function. os.unsetenv() encodes str argument to the + file system encoding with the surrogateescape error handler (instead of + utf8/strict) and accepts bytes. posix.environ keys and values are now bytes. + +- Issue #8573: asyncore _strerror() function might throw ValueError. + +- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error + messages when accessing undefined class attributes because of the cheap + inheritance with the underlying socket object. The cheap inheritance has been + deprecated. + +- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. + Patch by Tres Seaver. + +- Issue #8390: tarfile uses surrogateescape as the default error handler + (instead of replace in read mode or strict in write mode). + +- Issue #7755: Use an unencumbered audio file for tests. + +- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent + and any children created using ``os.fork`` on MacOS X 10.6. + +- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal + operation raises multiple signals and more than one of those signals is + trapped, the specification determines the order in which the signals should be + handled. In many cases this order wasn't being followed, leading to the wrong + Python exception being raised. + +- Issue #7865: The close() method of ``io`` objects should not swallow + exceptions raised by the implicit flush(). Also qensure that calling close() + several times is supported. Patch by Pascal Chambon. + +- Issue #4687: Fix accuracy of garbage collection runtimes displayed with + gc.DEBUG_STATS. + +- Issue #8354: The siginterrupt setting is now preserved for all signals, not + just SIGCHLD. + +- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does + webbrowser.get("safari"). + +- Issue #8464: tarfile no longer creates files with execute permissions set when + mode="w|" is used. + +- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of + the Linux kernel. Patch by Yaniv Aknin. + +- Issue #8295: Added shutil.unpack_archive. + +- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. + It should correctly return an empty response now. + +- Issue #8546: Reject None given as the buffering argument to _pyio.open. + +- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by + Sridhar Ratnakumar. + +- Issue #6656: fix locale.format_string to handle escaped percents + and mappings. + +- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where + the method could block indefinitely if called just before the event loop + started running. This also fixes the occasional freezes witnessed in + test_httpservers. + +- Issue #8524: When creating an SSL socket, the timeout value of the original + socket wasn't retained (instead, a socket with a positive timeout would be + turned into a non-blocking SSL socket). + +- Issue #5103: SSL handshake would ignore the socket timeout and block + indefinitely if the other end didn't respond. + +- The do_handshake() method of SSL objects now adjusts the blocking mode of the + SSL structure if necessary (as other methods already do). + +- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and + bytes strings for environment keys and values. + +- Issue #8467: Pure Python implementation of subprocess encodes the error + message using surrogatepass error handler to support surrogates in the + message. + +- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames. + +- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the + string "python" as the *ident*. openlog() arguments are all optional and + keywords. + +- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a + non-infinite timeout. Also make that method friendlier with applications + wanting to continue using the socket in clear-text mode, by disabling + OpenSSL's internal readahead. Thanks to Darryl Miles for guidance. + +- Issue #8496: make mailcap.lookup() always return a list, rather than an + iterator. Patch by Gregory Nofi. + +- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the + collation name contains a surrogate character. + +- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl + extension, such that verification of some SSL certificates doesn't fail + because of an "unknown algorithm". + +- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree. + +- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree. + +- Issue #4814: timeout parameter is now applied also for connections resulting + from PORT/EPRT commands. + +- Issue #8463: added missing reference to bztar in shutil's documentation. + +- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as + long as the user didn't specify 'automatic proxy configuration'). + +- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code + as stated in RFC-959 at chapter 5.4. + +- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with + surrogates. + +- Issue #850728: Add a *timeout* parameter to the `acquire()` method of + `threading.Semaphore` objects. Original patch by Torsten Landschoff. + +- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the + available cipher list. Helps fix test_ssl with OpenSSL 1.0.0. + +- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for + the current working directory. + +- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII + using backslashreplace error handler. + +- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. + +- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony + Locke and Hans Ulrich Niedermann. + +- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. + +- Issue #7316: The acquire() method of lock objects in the ``threading`` + module now takes an optional timeout argument in seconds. Timeout support + relies on the system threading library, so as to avoid a semi-busy wait loop. + +- Issue #8383: pickle and pickletools use surrogatepass error handler when + encoding unicode as utf8 to support lone surrogates and stay compatible with + Python 2.x and 3.x. + +- Issue #7585: difflib context and unified diffs now place a tab between + filename and date, conforming to the 'standards' they were originally designed + to follow. This improves compatibility with patch tools. + +- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 + character sets will now consistently use a Content-Transfer-Encoding of 7bit + rather than sometimes being marked as 8bit. + +- Issue #8375: test_distutils now checks if the temporary directory are still + present before it cleans them. + +- Issue #8374: Update the internal alias table in the ``locale`` module to + cover recent locale changes and additions. + +- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module, + using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and + `ssl.OPENSSL_VERSION_NUMBER`. + +- Add functools.total_ordering() and functools.cmp_to_key(). + +- Issue #8257: The Decimal construct now accepts a float instance directly, + converting that float to a Decimal of equal value: + + >>> Decimal(1.1) + Decimal('1.100000000000000088817841970012523233890533447265625') + +- Issue #8294: The Fraction constructor now accepts Decimal and float instances + directly. + +- Issue #7279: Comparisons involving a Decimal signaling NaN now signal + InvalidOperation instead of returning False. (Comparisons involving a quiet + NaN are unchanged.) Also, Decimal quiet NaNs are now hashable; Decimal + signaling NaNs remain unhashable. + +- Issue #2531: Comparison operations between floats and Decimal instances now + return a result based on the numeric values of the operands; previously they + returned an arbitrary result based on the relative ordering of id(float) and + id(Decimal). See also issue #8188, which adds Decimal-to-Fraction + comparisons. + +- Added a subtract() method to collections.Counter(). + +- Issue #8233: When run as a script, py_compile.py optionally takes a single + argument `-` which tells it to read files to compile from stdin. Each line is + read on demand and the named file is compiled immediately. (Original patch by + Piotr O?arowski). + +- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and + form feed (0x0C) are now considered linebreaks, as specified in Unicode + Standard Annex #14. See issue #7643. http://www.unicode.org/reports/tr14/ + +- Comparisons using one of <, <=, >, >= between a complex instance and a + Fractions instance now raise TypeError instead of returning True/False. This + makes Fraction <=> complex comparisons consistent with int <=> complex, float + <=> complex, and complex <=> complex comparisons. + +- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some + methods (such as oss_mixer_device.fileno()) were not available. Initial patch + by Bertrand Janin. + +- Issue #8205: Remove the "Modules" directory from sys.path when Python is + running from the build directory (POSIX only). + +- Issue #7512: shutil.copystat() could raise an OSError when the filesystem + didn't support chflags() (for example ZFS under FreeBSD). The error is now + silenced. + +- Issue #7860: platform.uname now reports the correct 'machine' type when Python + is running in WOW64 mode on 64 bit Windows. + +- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets. + Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking + reads and writes are always retried by OpenSSL itself. + +- Issue #4282: Fix the main function of the profile module for a non-ASCII + script, open the file in binary mode and not in text mode with the default + (utf8) encoding. + +- Issue #8179: Fix macpath.realpath() on a non-existing path. + +- Issue #8024: Update the Unicode database to 5.2. + +- Issue #8168: py_compile now handles files with utf-8 BOMS. + +- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is + detected. + +- Issue #6716/2: Backslash-replace error output in compilall. + +- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox + with Tcl/Tk-8.5. + +- Issue #8140: extend compileall to compile single files. Add -i option. + +- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the + locale. + +- The internals of the subprocess module on POSIX systems have been replaced by + an extension module (_posixsubprocess) so that the fork()+exec() can be done + safely without the possibility of deadlock in multithreaded applications. + +- subprocess.Popen now has restore_signals and start_new_session features. The + default of restore_signals=True is a new behavior compared to earlier Python + versions. This means that signals such as SIGPIPE are not ignored by default + in subprocesses launched by Python (Issue #1652). + +- Issue #6472: The xml.etree package is updated to ElementTree 1.3. The + cElementTree module is updated too. + +- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to + an non existent program name and Python is unable to retrieve the real program + name. + +- Issue #7880: Fix sysconfig when the python executable is a symbolic link. + +- Issue #6509: fix re.sub to work properly when the pattern, the string, and the + replacement were all bytes. Patch by Antoine Pitrou. + +- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure + bugs and allows loading SQLite extensions from shared libraries. + +- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public + Review Issue #29 (http://unicode.org/review/pr-29.html). + +- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, + reset also the pointer to the current pointer context. + +- Issue #7232: Add support for the context manager protocol to the TarFile + class. + +- Issue #7250: Fix info leak of os.environ across multi-run uses of + wsgiref.handlers.CGIHandler. + +- Issue #1729305: Fix doctest to handle encode error with "backslashreplace". + +- Issue #691291: codecs.open() should not convert end of lines on reading and + writing. + +- Issue #7869: logging: improved diagnostic for format-time errors. + +- Issue #7868: logging: added loggerClass attribute to Manager. + +- logging: Implemented PEP 391. + +- Issue #1537721: Add a writeheader() method to csv.DictWriter. + +- Issue #7959: ctypes callback functions are now registered correctly with the + cycle garbage collector. + +- Issue #5801: removed spurious empty lines in wsgiref. + +- Issue #6666: fix bug in trace.py that applied the list of directories to be + ignored only to the first file. Noted by Bogdan Opanchuk. + +- Issue #7597: curses.use_env() can now be called before initscr(). Noted by + Kan-Ru Chen. + +- Issue #7310: fix the __repr__ of os.environ to show the environment variables. + +- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822 + messages parsed by email.Parser.HeaderParser. + +- Issue #7361: Importlib was not properly checking the number of bytes in + bytecode file when it was less then 8 bytes. + +- Issue #7633: In the decimal module, Context class methods (with the exception + of canonical and is_canonical) now accept instances of int and long wherever a + Decimal instance is accepted, and implicitly convert that argument to Decimal. + Previously only some arguments were converted. + +- Issue #7835: shelve should no longer produce mysterious warnings during + interpreter shutdown. + +- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML + processing instructions and comments. These raw characters are allowed by the + XML specification, and are necessary when outputting e.g. PHP code in a + processing instruction. Patch by Neil Muller. + +- Issue #6233: ElementTree failed converting unicode characters to XML entities + when they could't be represented in the requested output encoding. Patch by + Jerry Chen. + +- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the + compression type. + +- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is + specified, rather than fall through to AF_PACKET (in the `socket` module). + Also, raise ValueError rather than TypeError when an unknown TIPC address type + is specified. Patch by Brian Curtin. + +- Issue #6939: Fix file I/O objects in the `io` module to keep the original file + position when calling `truncate()`. It would previously change the file + position to the given argument, which goes against the tradition of + ftruncate() and other truncation APIs. Patch by Pascal Chambon. + +- Issue #7610: Reworked implementation of the internal + ``zipfile.ZipExtFile`` class used to represent files stored inside an + archive. The new implementation is significantly faster and can be wrapped in + a ``io.BufferedReader`` object for more speedups. It also solves an + issue where interleaved calls to `read()` and `readline()` give wrong results. + Patch by Nir Aides. + +- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, + allowing for a maximum number of tasks within the pool to be completed by the + worker before that worker is terminated, and a new one created to replace it. + +- Issue #7792: Registering non-classes to ABCs raised an obscure error. + +- Issue #7785: Don't accept bytes in FileIO.write(). + +- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. + +- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when + the release file is empty. + +- Issue #7561: Fix crashes when using bytearray objects with the posix + module. + +- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in + multipart/signed MIME parts, which fixes one of the sources of invalid + modifications to such parts by Generator. + +- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`. Patch + by Florent Xicluna, along with some additional tests. + +- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte + argument. Patch by Victor Stinner. + +- Issue #3299: Fix possible crash in the _sre module when given bad argument + values in debug mode. Patch by Victor Stinner. + +- Issue #2846: Add support for gzip.GzipFile reading zero-padded files. Patch + by Brian Curtin. + +- Issue #7681: Use floor division in appropiate places in the wave module. + +- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since + Extension extra options may change the output without changing the .c + file). Initial patch by Collin Winter. + +- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc + when it has a fully qualified configuration prefix. Initial patch by Arfrever. + +- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the + destruction of weakref'ed objects while iterating. + +- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor + Stinner. + +- Issue #1628205: Socket file objects returned by socket.socket.makefile() now + properly handles EINTR within the read, readline, write & flush methods. The + socket.sendall() method now properly handles interrupted system calls. + +- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and + make it implement the `io.BufferedIOBase` ABC to allow for further speedups by + wrapping it in an `io.BufferedReader`. Patch by Nir Aides. + +- Issue #3972: http.client.HTTPConnection now accepts an optional source_address + parameter to allow specifying where your connections come from. + +- socket.create_connection now accepts an optional source_address parameter. + +- Issue #5511: now zipfile.ZipFile can be used as a context manager. Initial + patch by Brian Curtin. + +- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML + Manifest file in text mode so string patterns can be used in regular + expressions. + +- Issue #7552: Removed line feed in the base64 Authorization header in the + Distutils upload command to avoid an error when PyPI reads it. This occurs on + long passwords. Initial patch by JP St. Pierre. + +- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by + Tatsuhiro Tsujikawa. + +- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a + TypeError when given an `str` object (rather than a `bytes`-like object). + Patch by Victor Stinner and Florent Xicluna. + +- Issue #7349: Make methods of file objects in the io module accept None as an + argument where file-like objects (ie StringIO and BytesIO) accept them to mean + the same as passing no argument. + +- Issue #7357: tarfile no longer suppresses fatal extraction errors by default. + +- Issue #5949: added check for correct lineends in input from IMAP server in + imaplib. + +- Add count() and reverse() methods to collections.deque(). + +- Fix variations of extending deques: d.extend(d) d.extendleft(d) d+=d + +- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong + parameter types. Patch by Victor Stinner. + +- Issue #7457: added a read_pkg_file method to + distutils.dist.DistributionMetadata. + +- logging: Added optional `secure` parameter to SMTPHandler, to enable use of + TLS with authentication credentials. + +- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated + in Distutils. Patch by Stephen Emslie. + +- Issue #4120: Drop reference to CRT from manifest when building extensions with + msvc9compiler. + +- Issue #7333: The `posix` module gains an `initgroups()` function providing + access to the initgroups(3) C library call on Unix systems which implement it. + Patch by Jean-Paul Calderone. + +- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group + ownership when the group is not forced, because the group may be different + from the user's group and inherit from its container when the test is run. + +- Issue #4486: When an exception has an explicit cause, do not print its + implicit context too. This affects the `traceback` module as well as built-in + exception printing. + +- Issue #1515: Enable use of deepcopy() with instance methods. Patch by Robert + Collins. + +- Issue #7403: logging: Fixed possible race condition in lock creation. + +- Issue #6845: Add restart support for binary upload in ftplib. The + `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` + argument. Patch by Pablo Mouzo. + +- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method + returning the total number of seconds in the duration. Patch by Brian + Quinlan. + +- Issue #7133: SSL objects now support the new buffer API. + +- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters. + +- Issue #6123: tarfile now opens empty archives correctly and consistently + raises ReadError on empty files. + +- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2. + +- Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead + of __str__. + +- Issue #7341: Close the internal file object in the TarFile constructor in case + of an error. + +- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh + Windows box. Help provided by David Bolen. + +- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS + or SSL. Patch by Giampaolo Rodola'. + +- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch. + +- Issue #4969: The mimetypes module now reads the MIME database from the + registry under Windows. Patch by Gabriel Genellina. + +- Issue #6816: runpy now provides a run_path function that allows Python code to + execute file paths that refer to source or compiled Python files as well as + zipfiles, directories and other valid sys.path entries that contain a + __main__.py file. This allows applications that run other Python scripts to + support the same flexibility as the CPython command line itself. + +- Issue #7318: multiprocessing now uses a timeout when it fails to establish a + connection with another process, rather than looping endlessly. The default + timeout is 20 seconds, which should be amply sufficient for local connections. + +- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and + unpickled. This fixes crashes under Windows when trying to run + test_multiprocessing in verbose mode. + +- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass`` + argument added to the TextTestRunner constructor allowing a different result + class to be used without having to subclass. + +- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test + name in failure reports even if the test has a docstring. + +- Issue #3001: Add a C implementation of recursive locks which is used by + default when instantiating a `threading.RLock` object. This makes recursive + locks as fast as regular non-recursive locks (previously, they were slower by + 10x to 15x). + +- Issue #7282: Fix a memory leak when an RLock was used in a thread other than + those started through `threading.Thread` (for example, using + `_thread.start_new_thread()`). + +- Issue #7187: Importlib would not silence the IOError raised when trying to + write new bytecode when it was made read-only. + +- Issue #7264: Fix a possible deadlock when deallocating thread-local objects + which are part of a reference cycle. + +- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent + objects on 64-bit systems. Patch by Michael Broghton. + +- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a + modification is done through it. This fixes inconsistencies and test failures + on systems with slightly bogus mtime behaviour. + +- Issue #7246 & Issue #7208: getpass now properly flushes input before reading + from stdin so that existing input does not confuse it and lead to incorrect + entry or an IOError. It also properly flushes it afterwards to avoid the + terminal echoing the input afterwards on OSes such as Solaris. + +- Issue #7233: Fix a number of two-argument Decimal methods to make sure that + they accept an int or long as the second argument. Also fix buggy handling of + large arguments (those with coefficient longer than the current precision) in + shift and rotate. + +- Issue #4750: Store the basename of the original filename in the gzip FNAME + header as required by RFC 1952. + +- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in + Distutils. + +- Issue #7218: Fix test_site for win32, the directory comparison was done with + an uppercase. + +- Issue #7205: Fix a possible deadlock when using a BZ2File object from + several threads at once. + +- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424. + +- Issue #7099: Decimal.is_normal now returns True for numbers with exponent + larger than emax. + +- Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows + platforms, and assorted locale fixes by Derk Drukker. + +- Issue #5833: Fix extra space character in readline completion with the GNU + readline library version 6.0. + +- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment. + +- Issue #7086: Added TCP support to SysLogHandler, and tidied up some + anachronisms in the code which were a relic of 1.5.2 compatibility. + +- Issue #7082: When falling back to the MIME 'name' parameter, the correct place + to look for it is the Content-Type header. + +- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the + builtin tokenizer. + +- Issue #7048: Force Decimal.logb to round its result when that result is too + large to fit in the current precision. + +- Issue #6236, #6348: Fix various failures in the I/O library under AIX and + other platforms, when using a non-gcc compiler. Patch by Derk Drukker. + +- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now + always result in NULL. + +- Issue #5042: Structure sub-subclass does now initialize correctly with base + class positional arguments. + +- Issue #6882: Import uuid creates zombies processes. + +- Issue #6635: Fix profiler printing usage message. + +- Issue #6856: Add a filter keyword argument to TarFile.add(). + +- Issue #6888: pdb's alias command was broken when no arguments were given. + +- Issue #6857: Default format() alignment should be '>' for Decimal instances. + +- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning + NaN or raising InvalidContext. Also, fix infinite recursion in + long(Decimal('nan')). + +- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no + type specifier. + +- Issue #6239: ctypes.c_char_p return value must return bytes. + +- Issue #6838: Use a list to accumulate the value instead of repeatedly + concatenating strings in http.client's HTTPResponse._read_chunked providing a + significant speed increase when downloading large files servend with a + Transfer-Encoding of 'chunked'. + +- Trying to import a submodule from a module that is not a package, ImportError + should be raised, not AttributeError. + +- When the globals past to importlib.__import__() has __package__ set to None, + fall back to computing what __package__ should be instead of giving up. + +- Raise a TypeError when the name of a module to be imported for + importlib.__import__ is not a string (was raising an AttributeError before). + +- Allow the fromlist passed into importlib.__import__ to be any iterable. + +- Have importlib raise ImportError if None is found in sys.modules. + +- Issue #6054: Do not normalize stored pathnames in tarfile. + +- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN + payloads are now ordered by integer value rather than lexicographically. + +- Issue #1356969: Add missing info methods in tix.HList. + +- Issue #1522587: New constants and methods for the tix.Grid widget. + +- Issue #1250469: Fix the return value of tix.PanedWindow.panes. + +- Issue #1119673: Do not override tkinter.Text methods when creating a + ScrolledText. + +- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. + +- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview* + and yview* methods. + +- Issue #6629: Fix a data corruption issue in the new I/O library, which could + occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or + "wb+" mode) after having buffered a certain amount of data for reading. This + bug was not present in the pure Python implementation. + +- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in + POP3.apop. + +- Issue #2715: Remove remnants of Carbon.File from binhex module. + +- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal + digits in input, as recommended by the standard. Previously it was restricted + to accepting [0-9]. + +- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT + DO/DONT correctly. + +- Issue #1424152: Fix for http.client, urllib.request to support SSL while + working through proxy. Original patch by Christopher Li, changes made by + Senthil Kumaran. + +- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for + loaders that allow for modules to be executed. Both importlib.abc.PyLoader and + PyPycLoader inherit from this class and provide implementations in relation to + other methods required by the ABCs. + +- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like + the documentation said it did even though the code in PyLoader relied on the + abstract method required by ResourceLoader. + +- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how + to handle a comparison without loss of precision. Also add correct handling + of infinities and nans for comparisons with float. + +- Issue #6415: Fixed warnings.warn segfault on bad formatted string. + +- Issue #6358: The exit status of a command started with os.popen() was reported + differently than it did with python 2.x. + +- Issue #6323: The pdb debugger did not exit when running a script with a syntax + error. + +- Issue #3392: The subprocess communicate() method no longer fails in select() + when file descriptors are large; communicate() now uses poll() when possible. + +- Issue #6369: Fix an RLE decompression bug in the binhex module. + +- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. + +- The deprecated function string.maketrans has been removed. + +- Issue #4005: Fixed a crash of pydoc when there was a zip file present in + sys.path. + +- Issue #6218: io.StringIO and io.BytesIO instances are now picklable. + +- The os.get_exec_path() function to return the list of directories that will be + searched for an executable when launching a subprocess was added. + +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + +- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid + and os.read system calls where appropriate. + +- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t. + +- Issue #6247: The argparse module has been added to the standard library. + +- Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is a socket + option available on FreeBSD 7.1 and newer. + +- Issue #9315: Fix for the trace module to record correct class name + for tracing methods. + +Extension Modules +----------------- + +- Issue #9959: Tweak formula used for computing math.log of an integer, + making it marginally more accurate for exact powers of 2. + +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + +- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly + compared to other unix systems. In particular, os.getgroups() does not reflect + any changes made using os.setgroups() but basicly always returns the same + information as the id command. os.getgroups() can now return more than 16 + groups on MacOSX. + +- Issue #6095: Make directory argument to os.listdir optional. + +- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g., + struct.pack('>?')): if conversion to bool raised an exception then that + exception wasn't properly propagated on machines where char is unsigned. + +- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when + they contain instances of old-style classes. + +- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany + existing isinf and isnan functions. + +- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason + R. Coombs. + +- In struct.pack, correctly propogate exceptions from computing the truth of an + object in the '?' format. + +- Issue #9000: datetime.timezone objects now have eval-friendly repr. + +- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as + special methods. + +- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000. + Prior to this change, timezone adjustment in utctimetuple() could produce + tm_year value of 0 or 10,000. Now an OverflowError is raised in these edge + cases. + +- Issue #6641: The ``datetime.strptime`` method now supports the ``%z`` + directive. When the ``%z`` directive is present in the format string, an + aware ``datetime`` object is returned with ``tzinfo`` bound to a + ``datetime.timezone`` instance constructed from the parsed offset. If both + ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone + name, but ``%Z`` data without ``%z`` is discarded. + +- Issue #5094: The ``datetime`` module now has a simple concrete class + implementing ``datetime.tzinfo`` interface. Instances of the new class, + ``datetime.timezone``, return fixed name and UTC offset from their + ``tzname(dt)`` and ``utcoffset(dt)`` methods. The ``dst(dt)`` method always + returns ``None``. A class attribute, ``utc`` contains an instance + representing the UTC timezone. Original patch by Rafe Kaplan. + +- Issue #8973: Add __all__ to struct module; this ensures that help(struct) + includes documentation for the struct.Struct class. + +- Issue #3129: Trailing digits in struct format string are no longer ignored. + For example, "1" or "ilib123" are now invalid formats and cause + ``struct.error`` to be raised. Patch by Caleb Deveraux. + +- Issue #7384: If the system readline library is linked against ncurses, the + curses module must be linked against ncurses as well. Otherwise it is not safe + to load both the readline and curses modules in an application. + +- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA, + requiring a re-try in order to get the complete result. + +- Issue #8692: Optimize math.factorial: replace the previous naive algorithm + with an improved 'binary-split' algorithm that uses fewer multiplications and + allows many of the multiplications to be performed using plain C integer + arithmetic instead of PyLong arithmetic. Also uses a lookup table for small + arguments. + +- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing + overflow checks in the audioop module. + +- Issue #8644: The accuracy of td.total_seconds() has been improved (by + calculating with integer arithmetic instead of float arithmetic internally): + the result is now always correctly rounded, and is equivalent to ``td / + timedelta(seconds=1)``. + +- Issue #2706: Allow division of a timedelta by another timedelta: timedelta / + timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta, + timedelta) are all supported. + +- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. + +- Issue #8300: When passing a non-integer argument to struct.pack with any + integer format code, struct.pack first attempts to convert the non-integer + using its __index__ method. If that method is non-existent or raises + TypeError it goes on to try the __int__ method, as described below. + +- Issue #8142: Update libffi to the 3.0.9 release. + +- Issue #6949: Allow the _dbm extension to be built with db 4.8.x. + +- Issue #6544: Fix a reference leak in the kqueue implementation's error + handling. + +- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as + msvcr100.dll is not a platform assembly anymore. + +- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. + +- Issue #7078: Set struct.__doc__ from _struct.__doc__. + +- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module. + +- Issue #6877: It is now possible to link the readline extension to the libedit + readline emulation on OSX 10.5 or later. + +- Issue #6848: Fix curses module build failure on OS X 10.6. + +- Fix a segfault that could be triggered by expat with specially formed input. + +- Issue #6561: '\d' in a regex now matches only characters with Unicode category + 'Nd' (Number, Decimal Digit). Previously it also matched characters with + category 'No'. + +- Issue #4509: Array objects are no longer modified after an operation failing + due to the resize restriction in-place when the object has exported buffers. + +- Issue #2389: Array objects are now pickled in a portable manner. + +- Expat: Fix DoS via XML document with malformed UTF-8 sequences + (CVE_2009_3560). + +- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread + could raise an incorrect RuntimeError about not holding the import lock. The + import lock is now reinitialized after fork. + +- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 + parameter on some platforms such as OS X. + +- Build the ossaudio extension on GNU/kFreeBSD. + +- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in + the return value of QueryReflectionKey. + +- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice. + +Build +----- + +- Use OpenSSL 1.0.0a on Windows. + +- Issue #9280: Make sharedinstall depend on sharedmods. + +- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting + override the configure and makefile defaults, without deleting options the + user didn't intend to override. Developers should no longer need to specify + OPT or EXTRA_CFLAGS, although those variables are still present for + backward-compatibility. + +- Issue #8854: Fix finding Visual Studio 2008 on Windows x64. + +- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for + multiprocessing only. + +- Issue #8625: Turn off optimization in --with-pydebug builds with gcc. + (Optimization was unintentionally turned on in gcc --with-pydebug builds as a + result of the issue #1628484 fix, combined with autoconf's strange choice of + default CFLAGS produced by AC_PROG_CC for gcc.) + +- Issue #3646: It is now easily possible to install a Python framework into your + home directory on MacOSX, see Mac/README for more information. + +- Issue #3928: os.mknod() now available in Solaris, also. + +- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not + give false warnings. + +- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable + anymore. It also forwards the LDFLAGS settings to the linker when building a + shared library. + +- Issue #6716: Quote -x arguments of compileall in MSI installer. Exclude 2to3 + tests from compileall. + +- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. + +- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private + memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free + instead. Also disable caching of powers of 5. + +- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built. + +- Issue #6943: Use pkg-config to find the libffi headers when the + --with-system-ffi flag is used. + +- Issue #7609: Add a --with-system-expat option that causes the system's expat + library to be used for the pyexpat module instead of the one included with + Python. + +- Issue #7589: Only build the nis module when the correct header files are + found. + +- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. + +- Issue #5792: Extend the short float repr support to x86 systems using + icc or suncc. + +- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles + correctly under gcc on x86-64. This fixes a reported problem with the + --with-tsc build on x86-64. + +- Issue #6802: Fix build issues on MacOSX 10.6. + +- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6. + +- Issue #4601: 'make install' did not set the appropriate permissions on + directories. + +- Issue #5390: Add uninstall icon independent of whether file extensions are + installed. + +- Issue #7541: When using ``python-config`` with a framework install the + compiler might use the wrong library. + +- python-config now supports multiple options on the same command line. + +- Issue #8509: Fix quoting in help strings and code snippets in configure.in. + +- Issue #8510: Update to autoconf2.65. + +Documentation +------------- + +- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses + to Doc/license.rst. + +- Issue #9524: Document that two CTRL* signals are meant for use only + with os.kill. + +- Issue #9255: Document that the 'test' package is meant for internal Python use + only. + +- A small WSGI server was added as Tools/scripts/serve.py, and is used to + implement a local documentation server via 'make serve' in the doc directory. + +- Updating `Using Python` documentation to include description of CPython's -J + and -X options. + +- Document that importing a module that has None in sys.modules triggers an + ImportError. + +- Issue #6556: Fixed the Distutils configuration files location explanation for + Windows. + +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). + +- Issue #8909: Added the size of the bitmap used in the installer created by + distutils' bdist_wininst. Patch by Anatoly Techtonik. + +Tests +----- + +- Issue #9251: test_threaded_import didn't fail when run through regrtest if the + import lock was disabled. + +- Issue #8605: Skip test_gdb if Python is compiled with optimizations. + +- Issue #7449: Skip test_socketserver if threading support is disabled. + +- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled + by a decompressor object without errors (it returns incomplete uncompressed + data). + +- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid + UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding). + +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + +- Issue #7449: Fix many tests to support Python compiled without thread + support. Patches written by Jerry Seutter. + +- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of + SSL shutdowns. + +- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written + by Dave Malcolm. + +- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any + thread was previously started, most likely due to a platform bug. + +- Issue #8193: Fix test_zlib failure with zlib 1.2.4. + +- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi. + +- Issue #8263: Now regrtest.py will report a failure if it receives a + KeyboardInterrupt (SIGINT). + +- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special + Unicode normalization cases. + +- Issue #7783: test.support.open_urlresource invalidates the outdated files from + the local cache. + +- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are + effectively raised. + +- The four path modules (genericpath, macpath, ntpath, posixpath) share a common + TestCase for some tests: test_genericpath.CommonTest. + +- Print platform information when running the whole test suite, or using the + --verbose flag. + +- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly + filesystem encoding. + +- Issue #6292: for the moment at least, the test suite runs cleanly if python is + run with the -OO flag. Tests requiring docstrings are skipped. + +- Issue #7712: test.support gained a new `temp_cwd` context manager which is now + also used by regrtest to run all the tests in a temporary directory. The + original CWD is saved in `support.SAVEDCWD`. Thanks to Florent Xicluna who + helped with the patch. + +- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi + (only seen so far on platforms where the curses module wasn't built), due to + an uncleared exception. + +- Issue #7728: test_timeout was changed to use support.bind_port instead of a + hard coded port. + +- Issue #7376: Instead of running a self-test (which was failing) when called + with no arguments, doctest.py now gives a usage message. + +- Issue #7396: fix regrtest -s, which was broken by the -j enhancement. + +- Issue #7498: test_multiprocessing now uses test.support.find_unused_port + instead of a hardcoded port number in test_rapid_restart. + +- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file + in the Lib/test directory, which might be read-only for the user running the + tests. + +- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case + of an option with no handler. + +- Issue #7312: Add a -F flag to run the selected tests in a loop until a test + fails. Can be combined with -j. + +- Issue #6551: test_zipimport could import and then destroy some modules of the + encodings package, which would make other tests fail further down the road + because the internally cached encoders and decoders would point to empty + global variables. + +- Issue #7295: Do not use a hardcoded file name in test_tarfile. + +- Issue #7270: Add some dedicated unit tests for multi-thread synchronization + primitives such as Lock, RLock, Condition, Event and Semaphore. + +- Issue #7248 (part 2): Use a unique temporary directory for importlib source + tests instead of tempfile.tempdir. This prevents the tests from sharing state + between concurrent executions on the same system. + +- Issue #7248: In importlib.test.source.util a try/finally block did not make + sure that some referenced objects actually were created in the block before + calling methods on the object. + +- Issue #7222: Make thread "reaping" more reliable so that reference + leak-chasing test runs give sensible results. The previous method of reaping + threads could return successfully while some Thread objects were still + referenced. This also introduces a new private function: + ``_thread._count()``. + +- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer + runs the risk of causing the worker thread to fail. + +- Issue #7055: test___all__ now greedily detects all modules which have an + __all__ attribute, rather than using a hardcoded and incomplete list. + +- Issue #7058: Added save/restore for things like sys.argv and cwd to + runtest_inner in regrtest, with warnings if the called test modifies them, and + a new section in the summary report at the end. + +- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. + +- Fixed tests in importlib.test.source.test_abc_loader that were masking the + proper exceptions that should be raised for missing or improper code object + bytecode. + +- Removed importlib's custom test discovery code and switched to + unittest.TestLoader.discover(). + +Tools/Demos +----------- + +- Issue #5464, #8974: Implement plural forms in msgfmt.py. + +- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were + added to the `Tools/` directory. They were previously living in the sandbox. + + +What's New in Python 3.1? +========================= + +*Release date: 27-June-2009* + +Core and Builtins +----------------- + +- Issue #6334: Fix bug in range length calculation for ranges with + large arguments. + +- Issue #6329: Fixed iteration for memoryview objects (it was being blocked + because it wasn't recognized as a sequence). + +Library +------- + +- Issue #6126: Fixed pdb command-line usage. + +- Issue #6314: logging: performs extra checks on the "level" argument. + +- Issue #6274: Fixed possible file descriptors leak in subprocess.py + +- Accessing io.StringIO.buffer now raises an AttributeError instead of + io.UnsupportedOperation. + +- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. + (On Unix) + +- Issue #1202: zipfile module would cause a struct.error when attempting to + store files with a CRC32 > 2**31-1. + +Extension Modules +----------------- + +- Issue #5590: Remove unused global variable in pyexpat extension. + + +What's New in Python 3.1 Release Candidate 2? +============================================= + +*Release date: 13-June-2009* + +Core and Builtins +----------------- + +- Fixed SystemError triggered by "range([], 1, -1)". + +- Issue #5924: On Windows, a large PYTHONPATH environment variable + (more than 255 characters) would be completely ignored. + +- Issue #4547: When debugging a very large function, it was not always + possible to update the lineno attribute of the current frame. + +- Issue #5330: C functions called with keyword arguments were not reported by + the various profiling modules (profile, cProfile). Patch by Hagen F?rstenau. + +Library +------- + +- Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular + expression string pattern was trying to match against a bytes returned by + Popen. Tested under win32 to build the py-postgresql project. + +- Issue #6258: Support AMD64 in bdist_msi. + +- Issue #6195: fixed doctest to no longer try to read 'source' data from + binary files. + +- Issue #5262: Fixed bug in next rollover time computation in + TimedRotatingFileHandler. + +- Issue #6217: The C implementation of io.TextIOWrapper didn't include the + errors property. Additionally, the errors and encoding properties of StringIO + are always None now. + +- Issue #6137: The pickle module now translates module names when loading + or dumping pickles with a 2.x-compatible protocol, in order to make data + sharing and migration easier. This behaviour can be disabled using the + new `fix_imports` optional argument. + +- Removed the ipaddr module. + +- Issue #3613: base64.{encode,decode}string are now called + base64.{encode,decode}bytes which reflects what type they accept and return. + The old names are still there as deprecated aliases. + +- Issue #5767: Remove sgmlop support from xmlrpc.client. + +- Issue #6150: Fix test_unicode on wide-unicode builds. + +- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty + parameters. + +Windows +------- + +- Issue #6221: Delete test registry key before running the test. + +- Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. + +C-API +----- + +- Issue #5735: Python compiled with --with-pydebug should throw an + ImportError when trying to import modules compiled without + --with-pydebug, and vice-versa. + + +Build +----- + +- Issue #6154: Make sure the intl library is added to LIBS if needed. Also + added LIBS to OS X framework builds. + +- Issue #5809: Specifying both --enable-framework and --enable-shared is + an error. Configure now explicity tells you about this. + + + +What's New in Python 3.1 release candidate 1? +============================================= + +*Release date: 2009-05-30* + +Core and Builtins +----------------- + +- Issue #6097: Escape UTF-8 surrogates resulting from mbstocs conversion + of the command line. + +- Issue #6012: Add cleanup support to O& argument parsing. + +- Issue #6089: Fixed str.format with certain invalid field specifiers + that would raise SystemError. + +- Issue #5982: staticmethod and classmethod now expose the wrapped + function with __func__. + +- Added support for multiple context managers in the same with-statement. + Deprecated contextlib.nested() which is no longer needed. + +- Issue #5829: complex("1e500") no longer raises OverflowError. This + makes it consistent with float("1e500") and interpretation of real + and imaginary literals. + +- Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. + +- Issue #5994: the marshal module now has docstrings. + +- Issue #5981: Fix three minor inf/nan issues in float.fromhex: + (1) inf and nan strings with trailing whitespace were incorrectly + rejected; (2) parsing of strings representing infinities and nans + was locale aware; and (3) the interpretation of fromhex('-nan') + didn't match that of float('-nan'). + +Library +------- + +- Issue #4859: Implement PEP 383 for pwd, spwd, and grp. + +- smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259). + +- Issue #6121: pydoc now ignores leading and trailing spaces in the + argument to the 'help' function. + +- Issue #6118: urllib.parse.quote_plus ignored the encoding and errors + arguments for strings with a space in them. + +- collections.namedtuple() was not working with the following field + names: cls, self, tuple, itemgetter, and property. + +- In unittest, using a skipping decorator on a class is now equivalent to + skipping every test on the class. The ClassTestSuite class has been removed. + +- Issue #6050: Don't fail extracting a directory from a zipfile if + the directory already exists. + +- Issue #1309352: fcntl now converts its third arguments to a C `long` rather + than an int, which makes some operations possible under 64-bit Linux (e.g. + DN_MULTISHOT with F_NOTIFY). + +- Issue #5761: Add the name of the underlying file to the repr() of various + IO objects. + +- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix + by Musashi Tamura, tests by Marcin Bachry. + +- Issue #1983: Fix functions taking or returning a process identifier to use + the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have + a process identifier type wider than the standard C integer type. + +- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. + Patch by Farhan Ahmad, test by Marcin Bachry. + +- Issue #2116: Weak references and weak dictionaries now support copy()ing and + deepcopy()ing. + +- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. + +- Issue #5918: Fix a crash in the parser module. + +- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. + +- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io + library. This means, for example, that opening an UTF-16 text file in + append mode doesn't add a BOM at the end of the file if the file isn't + empty. + +- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' + file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix + corrects a pydoc regression. + +- Issue #5955: aifc's close method did not close the file it wrapped, + now it does. This also means getfp method now returns the real fp. + +Installation +------------ + +- Issue #6047: fullinstall has been removed because Python 3's executable will + now be known as python3. + +- Lib/smtpd.py is no longer installed as a script. + +Extension Modules +----------------- + +- Issue #3061: Use wcsftime for time.strftime where available. + +- Issue #4873: Fix resource leaks in error cases of pwd and grp. + +- Issue #6093: Fix off-by-one error in locale.strxfrm. + +- The _functools and _locale modules are now built into the libpython shared + library instead of as extension modules. + +Build +----- + +- Issue #3585: Add pkg-config support. It creates a python-2.7.pc file + and a python3.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by + Clinton Roy. + +Tests +----- + +- Issue #5442: Tests for importlib were not properly skipping case-sensitivity + tests on darwin even when the OS was installed on a case-sensitive + filesystem. Also fixed tests that should not be run when + sys.dont_write_bytecode is true. + + +What's New in Python 3.1 beta 1? +================================ + +*Release date: 2009-05-06* + +Core and Builtins +----------------- + +- Issue #5914: Add new C API function PyOS_string_to_double, and + deprecate PyOS_ascii_strtod and PyOS_ascii_atof. + +- Issue #3382: float.__format__, complex.__format__, and %-formatting + no longer map 'F' to 'f'. Because of issue #5859 (below), this only + affects nan -> NAN and inf -> INF. + +- Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames + in all operations, including splitdrive, split, etc. splitunc() now issues + a PendingDeprecation warning. + +- Issue #5920: For float.__format__, change the behavior with the + empty presentation type (that is, not one of 'e', 'f', 'g', or 'n') + to be like 'g' but with at least one decimal point and with a + default precision of 12. Previously, the behavior the same but with + a default precision of 6. This more closely matches str(), and + reduces surprises when adding alignment flags to the empty + presentation type. This also affects the new complex.__format__ in + the same way. + +- Implement PEP 383, Non-decodable Bytes in System Character Interfaces. + +- Issue #5890: in subclasses of 'property' the __doc__ attribute was + shadowed by classtype's, even if it was None. property now + inserts the __doc__ into the subclass instance __dict__. + +- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal + sequences. Patch by Nick Barnes and Victor Stinner. + +- Issue #3672: Reject surrogates in utf-8 codec; add surrogatepass error handler. + +- Issue #5883: In the io module, the BufferedIOBase and TextIOBase ABCs have + received a new method, detach(). detach() disconnects the underlying stream + from the buffer or text IO and returns it. + +- Issue #5859: Remove switch from '%f' to '%g'-style formatting for + floats with absolute value over 1e50. Also remove length + restrictions for float formatting: '%.67f' % 12.34 and '%.120e' % + 12.34 no longer raise an exception. + +- Issue #1588: Add complex.__format__. For example, + format(complex(1, 2./3), '.5') now produces a sensible result. + +- Issue #5864: Fix empty format code formatting for floats so that it + never gives more than the requested number of significant digits. + +- Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes + new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. + +- Issue #5835: Deprecate PyOS_ascii_formatd. + +- Issue #4971: Fix titlecase for characters that are their own + titlecase, but not their own uppercase. + +- Issue #5283: Setting __class__ in __del__ caused a segfault. + +- Issue #5816: complex(repr(z)) now recovers z exactly, even when + z involves nans, infs or negative zeros. + +- Issue #3166: Make int -> float conversions correctly rounded. + +- Issue #1869 (and many duplicates): make round(x, n) correctly + rounded for a float x, by using the decimal <-> binary conversions + from Python/dtoa.c. As a consequence, (e.g.) round(x, 2) now + consistently agrees with format(x, '.2f'). + +- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on + some builtin types. + +- Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100'. + +- Issue #5515: str.format() type 'n' combined with commas and leading + zeros no longer gives odd results with ints and floats. + +- Implement PEP 378, Format Specifier for Thousands Separator, for + floats. + +- The str function switches to exponential notation at + 1e11, not 1e12. This avoids printing 13 significant digits in + situations where only 12 of them are correct. Example problem + value: str(1e11 + 0.5). (This minor issue has existed in 2.x for a + long time.) + +- Issue #1580: On most platforms, use a 'short' float repr: for a + finite float x, repr(x) now outputs a string based on the shortest + sequence of decimal digits that rounds to x. Previous behaviour was + to output 17 significant digits and then strip trailing zeros. + Another minor difference is that the new repr switches to + exponential notation at 1e16 instead of the previous 1e17; this + avoids misleading output in some cases. + + There's a new sys attribute sys.float_repr_style, which takes + the value 'short' to indicate that we're using short float repr, + and 'legacy' if the short float repr isn't available for one + reason or another. + + The float repr change involves incorporating David Gay's 'perfect + rounding' code into the Python core (it's in Python/dtoa.c). As a + secondary consequence, all string-to-float and float-to-string + conversions (including all float formatting operations) will be + correctly rounded on these platforms. + + See issue #1580 discussions for details of platforms for which + this change does not apply. + +- Issue #5759: float() didn't call __float__ on str subclasses. + +- The string.maketrans() function is deprecated; there is a new static method + maketrans() on the bytes and bytearray classes. This removes confusion about + the types string.maketrans() is supposed to work with, and mirrors the + methods available on the str class. + +- Issue #2170: refactored xml.dom.minidom.normalize, increasing both + its clarity and its speed. + +- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)`` + to avoid compiler warnings. + +- Issue #3739: The unicode-internal encoder now reports the number of characters + consumed like any other encoder (instead of the number of bytes). + +Installation +------------ + +- Issue #5756: Install idle and pydoc with a 3 suffix. + +Library +------- + +- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument. + +- Issue #5311: bdist_msi can now build packages that do not depend on a + specific Python version. + +- Issue #5150: IDLE's format menu now has an option to strip trailing + whitespace. + +- Issue #5940: distutils.command.build_clib.check_library_list was not doing + the right type checkings anymore. + +- Issue #4875: On win32, ctypes.util.find_library does no longer + return directories. + +- Issue #5142: Add the ability to skip modules while stepping to pdb. + +- Issue #1309567: Fix linecache behavior of stripping subdirectories when + looking for files given by a relative filename. + +- Issue #5923: Update the ``turtle`` module to version 1.1, add two new + turtle demos in Demo/turtle. + +- Issue #5692: In ``zipfile.Zipfile``, fix wrong path calculation when + extracting a file to the root directory. + +- Issue #5913: os.listdir() should fail for empty path on windows. + +- Issue #5084: unpickling now interns the attribute names of pickled objects, + saving memory and avoiding growth in size of subsequent pickles. Proposal + and original patch by Jake McGuire. + +- The json module now works exclusively with str and not bytes. + +- Issue #3959: The ipaddr module has been added to the standard library. + Contributed by Google. + +- Issue #3002: ``shutil.copyfile()`` and ``shutil.copytree()`` now raise an + error when a named pipe is encountered, rather than blocking infinitely. + +- Issue #5857: tokenize.tokenize() now returns named tuples. + +- Issue #4305: ctypes should now build again on mipsel-linux-gnu + +- Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the + string is already in normalized form, by performing a quick check beforehand. + Original patch by Rauli Ruohonen. + +- Issue #5853: calling a function of the mimetypes module from several threads + at once could hit the recursion limit if the mimetypes database hadn't been + initialized before. + +- Issue #5854: Updated __all__ to include some missing names and remove some + names which should not be exported. + +- Issue #3102: All global symbols that the _ctypes extension defines + are now prefixed with 'Py' or '_ctypes'. + +- Issue #5041: ctypes does now allow pickling wide character. + +- Issue #5812: For the two-argument form of the Fraction constructor, + Fraction(m, n), m and n are permitted to be arbitrary Rational + instances. + +- Issue #5812: Fraction('1e6') is valid: more generally, any string + that's valid for float() is now valid for Fraction(), with the + exception of strings representing NaNs and infinities. + +- Issue #5734: BufferedRWPair was poorly tested and had several glaring + bugs. Patch by Brian Quinlan. + +- Issue #1161031: fix readwrite select flag handling: POLLPRI now + results in a handle_expt_event call, not handle_read_event, and POLLERR + and POLLNVAL now call handle_close, not handle_expt_event. Also, + dispatcher now has an 'ignore_log_types' attribute for suppressing + log messages, which is set to 'warning' by default. + +- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for + new arguments introduced in 2.5. + +- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in + makeunicodedata.py and regenerated the Unicode database (This fixes + u'\u1d79'.lower() == '\x00'). + +Extension Modules +----------------- + +- Issue #5881: Remove old undocumented compatibility interfaces in hashlib and + pwd. + +- Issue #5463: In struct module, remove deprecated float coercion + for integer type codes: struct.pack('L', 0.3) should now raise + an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. + The version number has been bumped to 0.3. + +- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built + using Berkeley DB. + +Tests +----- + +- Issue #5354: New test support function import_fresh_module() makes + it easy to import both normal and optimised versions of modules. + test_heapq and test_warnings have been adjusted to use it, tests for + other modules with both C and Python implementations in the stdlib + can be adjusted to use it over time. + +- Issue #5837: Certain sequences of calls to set() and unset() for + support.EnvironmentVarGuard objects restored the environment variables + incorrectly on __exit__. + +C-API +----- + +- Issue #5630: A replacement PyCObject API, PyCapsule, has been added. + + +What's New in Python 3.1 alpha 2? +================================= + +*Release date: 2009-4-4* + +Core and Builtins +----------------- + +- Implement PEP 378, Format Specifier for Thousands Separator, for + integers. + +- Issue #5666: Py_BuildValue's 'c' code should create byte strings. + +- Issue #5499: The 'c' code for argument parsing functions now only accepts a + byte, and the 'C' code only accepts a unicode character. + +- Fix a problem in PyErr_NormalizeException that leads to "undetected errors" + when hitting the recursion limit under certain circumstances. + +- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. + +- Fix a segfault when running test_exceptions with coverage, caused by + insufficient checks in accessors of Exception.__context__. + +- Issue #5604: non-ASCII characters in module name passed to + imp.find_module() were converted to UTF-8 while the path is + converted to the default filesystem encoding, causing nonsense. + +- Issue #5126: str.isprintable() returned False for space characters. + +- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to + the end sys.path, for compatibility with the system install of Python. + +- Issue #4688: Add a heuristic so that tuples and dicts containing only + untrackable objects are not tracked by the garbage collector. This can + reduce the size of collections and therefore the garbage collection overhead + on long-running programs, depending on their particular use of datatypes. + +- Issue #5512: Rewrite PyLong long division algorithm (x_divrem) to + improve its performance. Long divisions and remainder operations + are now between 50% and 150% faster. + +- Issue #4258: Make it possible to use base 2**30 instead of base + 2**15 for the internal representation of integers, for performance + reasons. Base 2**30 is enabled by default on 64-bit machines. Add + --enable-big-digits option to configure, which overrides the + default. Add sys.int_info structseq to provide information about + the internal format. + +- Issue #4474: PyUnicode_FromWideChar now converts characters outside + the BMP to surrogate pairs, on systems with sizeof(wchar_t) == 4 + and sizeof(Py_UNICODE) == 2. + +- Issue #5237: Allow auto-numbered fields in str.format(). For + example: '{} {}'.format(1, 2) == '1 2'. + +- Issue #5392: when a very low recursion limit was set, the interpreter would + abort with a fatal error after the recursion limit was hit twice. + +- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with + short file names. + +Library +------- + +- Issue #2625: added missing items() call to the for loop in + mailbox.MH.get_message(). + +- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat + error substitutions from non-strict codec error callbacks in + incrementalencoder and StreamWriter. + +- Issue #5656: Fix the coverage reporting when running the test suite with + the -T argument. + +- Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. + +- Issue #5624: Fix the _winreg module name still used in several modules. + +- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer. + +- Issue #5619: Multiprocessing children disobey the debug flag and causes + popups on windows buildbots. Patch applied to work around this issue. + +- Issue #5400: Added patch for multiprocessing on netbsd compilation/support + +- Issue #5387: Fixed mmap.move crash by integer overflow. + +- Issue #5261: Patch multiprocessing's semaphore.c to support context + manager use: "with multiprocessing.Lock()" works now. + +- Issue #5236: Change time.strptime() to only take strings. Didn't work with + bytes already but the failure was non-obvious. + +- Issue #5177: Multiprocessing's SocketListener class now uses + socket.SO_REUSEADDR on all connections so that the user no longer needs + to wait 120 seconds for the socket to expire. + +- Issue #5595: Fix UnboundedLocalError in ntpath.ismount(). + +- Issue #1174606: Calling read() without arguments of an unbounded file + (typically /dev/zero under Unix) could crash the interpreter. + +- The max_buffer_size arguments of io.BufferedWriter, io.BufferedRWPair, and + io.BufferedRandom have been deprecated for removal in Python 3.2. + +- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop + forever on incomplete input. That caused tarfile.open() to hang when used + with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or + partial bzip2 compressed data. + +- Issue #2110: Add support for thousands separator and 'n' type + specifier to Decimal.__format__ + +- Fix Decimal.__format__ bug that swapped the meanings of the '<' and + '>' alignment characters. + +- The error detection code in FileIO.close() could fail to reflect the `errno` + value, and report it as -1 instead. + +- Issue #5016: FileIO.seekable() could return False if the file position + was negative when truncated to a C int. Patch by Victor Stinner. + +Extension Modules +----------------- + +- Issue #5391: mmap now deals exclusively with bytes. + +- Issue #5463: In struct module, remove deprecated overflow wrapping + when packing an integer: struct.pack('=L', -1) now raises + struct.error instead of returning b'\xff\xff\xff\xff'. The + _PY_STRUCT_RANGE_CHECKING and _PY_STRUCT_OVERFLOW_MASKING constants + have been removed from the struct module. + + +What's New in Python 3.1 alpha 1 +================================ + +*Release date: 2009-03-07* + +Core and Builtins +----------------- + +- The io module has been reimplemented in C for speed. + +- Give dict views an informative __repr__. + +- Issue #5247: Improve error message when unknown format codes are + used when using str.format() with str, int, and float arguments. + +- Issue #5249: time.strftime returned malformed string when format string + contained non ascii character on windows. + +- Issue #4626: compile(), exec(), and eval() ignore the coding cookie if the + source has already been decoded into str. + +- Issue #5186: Reduce hash collisions for objects with no __hash__ method by + rotating the object pointer by 4 bits to the right. + +- Issue #4575: Fix Py_IS_INFINITY macro to work correctly on x87 FPUs: + it now forces its argument to double before testing for infinity. + +- Issue #5137: Make len() correctly raise a TypeError when a __len__ method + returns a non-number type. + +- Issue #5182: Removed memoryview.__str__. + +- Issue #1717: Removed builtin cmp() function, dropped tp_compare + slot, the C API functions PyObject_Compare and PyUnicode_Compare and + the type definition cmpfunc. The tp_compare slot has been renamed + to tp_reserved, and is reserved for future usage. + +- Issue #1242657: the __len__() and __length_hint__() calls in several tools + were suppressing all exceptions. These include list() and bytearray(). + +- Issue #4707: round(x, n) now returns an integer if x is an integer. + Previously it returned a float. + +- Issue #4753: By enabling a configure option named '--with-computed-gotos' + on compilers that support it (notably: gcc, SunPro, icc), the bytecode + evaluation loop is compiled with a new dispatch mechanism which gives + speedups of up to 20%, depending on the system, on various benchmarks. + +- Issue #4874: Most builtin decoders now reject unicode input. + +- Issue #4842: Don't allow trailing 'L' when constructing an integer + from a string. + +- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors. + +- Issue #4838: When a module is deallocated, free the memory backing the + optional module state data. + +- Issue #4910: Rename nb_long slot to nb_reserved, and change its + type to ``(void *)``. + +- Issue #4935: The overflow checking code in the expandtabs() method common + to str, bytes and bytearray could be optimized away by the compiler, letting + the interpreter segfault instead of raising an error. + +- Issue #3720: Fix a crash when an iterator modifies its class and removes its + __next__ method. + +- Issue #4910: Builtin int() function and PyNumber_Long/PyNumber_Int API + function no longer attempt to call the __long__ slot to convert an object + to an integer. Only the __int__ and __trunc__ slots are examined. + +- Issue #4893: Use NT threading on CE. + +- Issue #4915: Port sysmodule to Windows CE. + +- Issue #4868: utf-8, utf-16 and latin1 decoding are now 2x to 4x faster. The + common cases are optimized thanks to a dedicated fast path and a moderate + amount of loop unrolling. + +- Issue #4074: Change the criteria for doing a full garbage collection (i.e. + collecting the oldest generation) so that allocating lots of objects without + destroying them does not show quadratic performance. Based on a proposal by + Martin von L?wis at + http://mail.python.org/pipermail/python-dev/2008-June/080579.html. + +- Issue #4604: Some objects of the I/O library could still be used after + having been closed (for instance, a read() call could return some + previously buffered data). Patch by Dmitry Vasiliev. + +- Issue #4705: Fix the -u ("unbuffered binary stdout and stderr") command-line + flag to work properly. Furthermore, when specifying -u, the text stdout + and stderr streams have line-by-line buffering enabled (the default being + to buffer arbitrary chunks of data). + +- The internal table, _PyLong_DigitValue, is now an array of unsigned chars + instead of ints (reducing its size from 4 to 8 times thereby reducing + Python's overall memory). + +- Issue #1180193: When importing a module from a .pyc (or .pyo) file with + an existing .py counterpart, override the co_filename attributes of all + code objects if the original filename is obsolete (which can happen if the + file has been renamed, moved, or if it is accessed through different paths). + Patch by Ziga Seilnacht and Jean-Paul Calderone. + +- Issue #4580: Fix slicing of memoryviews when the item size is greater than + one byte. Also fixes the meaning of len() so that it returns the number of + items, rather than the size in bytes. + +- Issue #4075: Use OutputDebugStringW in Py_FatalError. + +- Issue #4747: When the terminal does not use utf-8, executing a script with + non-ascii characters in its name could fail with a "SyntaxError: None" error. + +- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed + to open file with a bytes filename on Windows. + +- Issue #3680: Reference cycles created through a dict, set or deque iterator + did not get collected. + +- Issue #4701: PyObject_Hash now implicitly calls PyType_Ready on types + where the tp_hash and tp_dict slots are both NULL. + +- Issue #4759: None is now allowed as the first argument of + bytearray.translate(). It was always allowed for bytes.translate(). + +- Added test case to ensure attempts to read from a file opened for writing + fail. + +- Issue #3106: Speedup some comparisons (str/str and int/int). + +- Issue #2183: Simplify and optimize bytecode for list, dict and set + comprehensions. Original patch for list comprehensions by Neal Norwitz. + +- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always + print elapsed times, not only when some objects are uncollectable / + unreachable. Original patch by Neil Schemenauer. + +- Issue #3439: Add a bit_length method to int. + +- Issue #2173: When getting device encoding, check that return value of + nl_langinfo is not the empty string. This was causing silent build + failures on OS X. + +- Issue #4597: Fixed several opcodes that weren't always propagating + exceptions. + +- Issue #4589: Fixed exception handling when the __exit__ function of a + context manager returns a value that cannot be converted to a bool. + +- Issue #4445: Replace "sizeof(PyBytesObject)" with + "offsetof(PyBytesObject, ob_sval) + 1" when allocating memory for + bytes instances. On a typical machine this saves 3 bytes of memory + (on average) per allocation of a bytes instance. + +- Issue #4533: File read operation was dreadfully slow due to a slowly + growing read buffer. Fixed by using the same growth rate algorithm as + Python 2.x. + +- Issue #4509: Various issues surrounding resize of bytearray objects to + which there are buffer exports (e.g. memoryview instances). + +- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` + method on file objects with closefd=False. The file descriptor is still + kept open but the file object behaves like a closed file. The ``FileIO`` + object also got a new readonly attribute ``closefd``. + +- Issue #4569: Interpreter crash when mutating a memoryview with an item size + larger than 1. + +- Issue #4748: Lambda generators no longer return a value. + +- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. + +- Issue #5108: Handle %s like %S, %R and %A in PyUnicode_FromFormatV(): Call + PyUnicode_DecodeUTF8() once, remember the result and output it in a second + step. This avoids problems with counting UTF-8 bytes that ignores the effect + of using the replace error handler in PyUnicode_DecodeUTF8(). + +Library +------- + +- Issue #7071: byte-compilation in Distutils is now done with respect to + sys.dont_write_bytecode. + +- Issue #7066: archive_util.make_archive now restores the cwd if an error is + raised. Initial patch by Ezio Melotti. + +- Issue #6516: Added owner/group support when creating tar archives in + Distutils. + +- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. + +- Issue #6163: Fixed HP-UX runtime library dir options in + distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and + Michael Haubenwallner. + +- Issue #6693: New functions in site.py to get user/global site packages paths. + +- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when + opening an empty or very small file. + +- Issue #6545: Removed assert statements in distutils.Extension, so the + behavior is similar when used with -O. + +- unittest has been split up into a package. All old names should still work. + +- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler + uses the same refactored function to get gcc/ld/dllwrap versions numbers. + It's `distutils.util.get_compiler_versions`. Added deprecation warnings + for the obsolete get_versions() functions. + +- Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list + +- Issue #6314: logging: Extra checks on the "level" argument in more places. + +- Issue #2622: Fixed an ImportError when importing email.message from a + standalone application built with py2exe or py2app. + +- Issue #6455: Fixed test_build_ext under win32. + +- Issue #6377: Enabled the compiler option, and deprecate its usage as an + attribute. + +- Issue #6413: Fixed the log level in distutils.dist for announce. + +- Issue #6403: Fixed package path usage in build_ext. + +- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was + unconditionally calling "os.close(sys.stdin.fileno())" resulting in file + descriptor errors + +- Issue #6365: Distutils build_ext inplace mode was copying the compiled + extension in a subdirectory if the extension name had dots. + +- Issue #6164: Added an AIX specific linker argument in Distutils + unixcompiler. Original patch by Sridhar Ratnakumar. + +- Issue #6286: Now Distutils upload command is based on urllib2 instead of + httplib, allowing the usage of http_proxy. + +- Issue #6287: Added the license field in Distutils documentation. + +- Issue #6263: Fixed syntax error in distutils.cygwincompiler. + +- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` + in Makefiles. This prevents compile errors when using syntax like: + `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. + +- Issue #6131: test_modulefinder leaked when run after test_distutils. + Patch by Hirokazu Yamamoto. + +- Issue #6048: Now Distutils uses the tarfile module in archive_util. + +- Issue #6062: In distutils, fixed the package option of build_ext. Feedback + and tests on pywin32 by Tim Golden. + +- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto. + +- Issue #6046: Fixed the library extension when distutils build_ext is used + inplace. Initial patch by Roumen Petrov. + +- Issue #6041: Now distutils `sdist` and `register` commands use `check` as a + subcommand. + +- Issue #6022: a test file was created in the current working directory by + test_get_outputs in Distutils. + +- Issue #5977: distutils build_ext.get_outputs was not taking into account the + inplace option. Initial patch by kxroberto. + +- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken + for old-style extensions. + +- Issue #5976: Fixed Distutils test_check_environ. + +- Issue #5941: Distutils build_clib command was not working anymore because + of an incomplete costumization of the archiver command. Added ARFLAGS in the + Makefile besides AR and make Distutils use it. Original patch by David + Cournapeau. + +- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. + +- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive + anymore. + +- Issue #5810: Fixed Distutils test_build_scripts so it uses + sysconfig.get_config_vars. + +- Issue #4951: Fixed failure in test_httpservers. + +- Issue #5795: Fixed test_distutils failure on Debian ppc. + +- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. + +- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting + a value in SafeConfigParser. + +- Issue #5732: added a new command in Distutils: check. + +- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows + platforms. Initial patch by Paul Moore. + +- Issue #5095: Added bdist_msi to the list of bdist supported formats. + Initial fix by Steven Bethard. + +- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. + Initial fix by Wayne Davison. + +- Issue #5694: removed spurious test output in Distutils (test_clean). + +- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module. + +- Issue #1665206 (partially): Move imports in cgitb to the top of the module + instead of performing them in functions. Helps prevent import deadlocking in + threads. + +- Issue #2522: locale.format now checks its first argument to ensure it has + been passed only one pattern, avoiding mysterious errors where it appeared + that it was failing to do localization. + +- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg + Brandl. + +- Issue #1222: locale.format() bug when the thousands separator is a space + character. + +- Issue #5472: Fixed distutils.test_util tear down. Original patch by + Tim Golden. + +- collections.deque() objects now have a read-only attribute called maxlen. + +- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after + it is has been populated and properly configured in order to prevent + window flashing. + +- Issue #4792: Prevent a segfault in _tkinter by using the + guaranteed to be safe interp argument given to the PythonCmd in place of + the Tcl interpreter taken from a PythonCmd_ClientData. + +- Issue #5193: Guarantee that tkinter.Text.search returns a string. + +- Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler. + Original patch by Akira Kitada. + +- Issue #5334: array.fromfile() failed to insert values when EOFError was raised. + +- Issue #5385: Fixed mmap crash after resize failure on windows. + +- Issue #5179: Fixed subprocess handle leak on failure on windows. + +- PEP 372: Added collections.OrderedDict(). + +- The _asdict() for method for namedtuples now returns an OrderedDict(). + +- configparser now defaults to using an ordered dictionary. + +- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes + import guess_extension`` was used. + +- Issue #1733986: Fixed mmap crash in accessing elements of second map object + with same tagname but larger size than first map. (Windows) + +- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer + overrun. + +- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils + bdist_rpm command. + +- Issue #5378: added --quiet option to Distutils bdist_rpm command. + +- Issue #5052: make Distutils compatible with 2.3 again. + +- Issue #5316: Fixed buildbot failures introduced by multiple inheritance + in Distutils tests. + +- Issue #5287: Add exception handling around findCaller() call to help out + IronPython. + +- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, + The file was resized to wrong size. + +- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. + +- Issue #2279: distutils.sdist.add_defaults now add files + from the package_data and the data_files metadata. + +- Issue #5257: refactored all tests in distutils, so they use + support.TempdirManager, to avoid writing in the tests directory. + +- Issue #4524: distutils build_script command failed with --with-suffix=3. + Initial patch by Amaury Forgeot d'Arc. + +- Issue #2461: added tests for distutils.util + +- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions + which inherited from numbers.py which did not have __slots__ defined. The + numbers hierarchy now has its own __slots__ declarations. + +- Issue #4631: Fix urlopen() result when an HTTP response uses chunked + encoding. + +- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a + function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). + +- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored + under NT and OS2. Patch by Philip Jenvey. + +- Issue #5128: Make compileall properly inspect bytecode to determine if needs + to be recreated. This avoids a timing hole thanks to the old reliance on the + ctime of the files involved. + +- Issue #5122: Synchronize tk load failure check to prevent a potential + deadlock. + +- Issue #1818: collections.namedtuple() now supports a keyword argument + 'rename' which lets invalid fieldnames be automatically converted to + positional names in the form, _1, _2, ... + +- Issue #4890: Handle empty text search pattern in Tkinter.Text.search. + +- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a + public documented method ``ZipImporter.get_filename()``. + +- Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support + the execution of packages by looking for and executing a ``__main__`` + submodule when a package name is supplied. Initial patch by Andi + Vajda. + +- Issue #1731706: Call Tcl_ConditionFinalize for Tcl_Conditions that will + not be used again (this requires Tcl/Tk 8.3.1), also fix a memory leak in + Tkapp_Call when calling from a thread different than the one that created + the Tcl interpreter. Patch by Robert Hancock. + +- Issue #4285: Change sys.version_info to be a named tuple. Patch by + Ross Light. + +- Issue #1520877: Now distutils.sysconfig reads $AR from the + environment/Makefile. Patch by Douglas Greiman. + +- Issue #1276768: The verbose option was not used in the code of + distutils.file_util and distutils.dir_util. + +- Issue #5132: Fixed trouble building extensions under Solaris with + --enabled-shared activated. Initial patch by Dave Peterson. + +- Issue #1581476: Always use the Tcl global namespace when calling into Tcl. + +- The shelve module now defaults to pickle protocol 3. + +- Fix a bug in the trace module where a bytes object from co_lnotab had its + items being passed through ord(). + +- Issue #2047: shutil.move() could believe that its destination path was + inside its source path if it began with the same letters (e.g. "src" vs. + "src.new"). + +- Added the ttk module. See issue #2983: Ttk support for Tkinter. + +- Removed isSequenceType(), isMappingType, and isNumberType() from the + operator module; use the abstract base classes instead. Also removed + the repeat() function; use mul() instead. + +- Issue #5021: doctest.testfile() did not create __name__ and + collections.namedtuple() relied on __name__ being defined. + +- Backport importlib from Python 3.1. Only the import_module() function has + been backported to help facilitate transitions from 2.7 to 3.1. + +- Issue #1885: distutils. When running sdist with --formats=tar,gztar + the tar file was overriden by the gztar one. + +- Issue #4863: distutils.mwerkscompiler has been removed. + +- Added a new itertools functions: combinations_with_replacement() + and compress(). + +- Issue #5032: added a step argument to itertools.count() and + allowed non-integer arguments. + +- Fix and properly document the multiprocessing module's logging + support, expose the internal levels and provide proper usage + examples. + +- Issue #1672332: fix unpickling of subnormal floats, which was + producing a ValueError on some platforms. + +- Issue #3881: Help Tcl to load even when started through the + unreadable local symlink to "Program Files" on Vista. + +- Issue #4710: Extract directories properly in the zipfile module; + allow adding directories to a zipfile. + +- Issue #3807: _multiprocessing build fails when configure is passed + --without-threads argument. When this occurs, _multiprocessing will + be disabled, and not compiled. + +- Issue #5008: When a file is opened in append mode with the new IO library, + do an explicit seek to the end of file (so that e.g. tell() returns the + file size rather than 0). This is consistent with the behaviour of the + traditional 2.x file object. + +- Issue #5013: Fixed a bug in FileHandler which occurred when the delay + parameter was set. + +- Issue #4842: Always append a trailing 'L' when pickling longs using + pickle protocol 0. When reading, the 'L' is optional. + +- Add the importlib package. + +- Issue #4301: Patch the logging module to add processName support, remove + _check_logger_class from multiprocessing. + +- Issue #3325: Remove python2.x try: except: imports for old cPickle from + multiprocessing. + +- Issue #4959: inspect.formatargspec now works for keyword only arguments + without defaults. + +- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks + for Unix machines for negative handles and large int handles. Without this check + it is possible to segfault the interpreter. + +- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue + in sharedctypes.py. + +- Issue #1225107: inspect.isclass() returned True for instances with a custom + __getattr__. + +- Issue #3826 and #4791: The socket module now closes the underlying socket + appropriately when it is being used via socket.makefile() objects + rather than delaying the close by waiting for garbage collection to do it. + +- Issue #1696199: Add collections.Counter() for rapid and convenient + counting. + +- Issue #3860: GzipFile and BZ2File now support the context manager protocol. + +- Issue #4867: Fixed a crash in ctypes when passing a string to a + function without defining argtypes. + +- Issue #4272: Add an optional argument to the GzipFile constructor to override + the timestamp in the gzip stream. The default value remains the current time. + The information can be used by e.g. gunzip when decompressing. Patch by + Jacques Frechet. + +- Restore Python 2.3 compatibility for decimal.py. + +- Issue #3638: Remove functions from _tkinter module level that depend on + TkappObject to work with multiple threads. + +- Issue #4718: Adapt the wsgiref package so that it actually works with + Python 3.x, in accordance with the `official amendments of the spec + `_. + +- Issue #4796: Added Decimal.from_float() and Context.create_decimal_from_float() + to the decimal module. + +- Fractions.from_float() no longer loses precision for integers too big to + cast as floats. + +- Issue #4812: add missing underscore prefix to some internal-use-only + constants in the decimal module. (Dec_0 becomes _Dec_0, etc.) + +- Issue #4790: The nsmallest() and nlargest() functions in the heapq module + did unnecessary work in the common case where no key function was specified. + +- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when + the function is not a generator. + +- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case + no MSVC compiler is found under Windows. Original patch by Philip Jenvey. + +- Issue #4646: distutils was choking on empty options arg in the setup + function. Original patch by Thomas Heller. + +- Issue #3767: Convert Tk object to string in tkColorChooser. + +- Issue #3248: Allow placing ScrolledText in a PanedWindow. + +- Issue #4444: Allow assertRaises() to be used as a context handler, so that + the code under test can be written inline if more practical. + +- Issue #4739: Add pydoc help topics for symbols, so that e.g. help('@') + works as expected in the interactive environment. + +- Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by + Gabriel Genellina. + +- Issue #4574: reading an UTF16-encoded text file crashes if \r on 64-char + boundary. + +- Issue #4223: inspect.getsource() will now correctly display source code + for packages loaded via zipimport (or any other conformant PEP 302 + loader). Original patch by Alexander Belopolsky. + +- Issue #4201: pdb can now access and display source code loaded via + zipimport (or any other conformant PEP 302 loader). Original patch by + Alexander Belopolsky. + +- Issue #4197: doctests in modules loaded via zipimport (or any other PEP + 302 conformant loader) will now work correctly in most cases (they + are still subject to the constraints that exist for all code running + from inside a module loaded via a PEP 302 loader and attempting to + perform IO operations based on __file__). Original patch by + Alexander Belopolsky. + +- Issues #4082 and #4512: Add runpy support to zipimport in a manner that + allows backporting to maintenance branches. Original patch by + Alexander Belopolsky. + +- Issue #4163: textwrap module: allow word splitting on a hyphen preceded by + a non-ASCII letter. + +- Issue #4616: TarFile.utime(): Restore directory times on Windows. + +- Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the + codec cannot be found. This is for compatibility with the builtin behavior. + +- Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to + give correct results in the case where one argument is a quiet NaN + and the other is a finite number that requires rounding. + +- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat + libs. + +- Added the subprocess.check_call_output() convenience function to get output + from a subprocess on success or raise an exception on error. + +- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to + support unusual filenames (such as those containing semi-colons) in + Content-Disposition headers. + +- Issue #4384: Added logging integration with warnings module using + captureWarnings(). This change includes a NullHandler which does nothing; + it will be of use to library developers who want to avoid the "No handlers + could be found for logger XXX" message which can appear if the library user + doesn't configure logging. + +- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an + exception. + +- Issue #4529: fix the parser module's validation of try-except-finally + statements. + +- Issue #4458: getopt.gnu_getopt() now recognizes a single "-" as an argument, + not a malformed option. + +- Added the subprocess.check_output() convenience function to get output + from a subprocess on success or raise an exception on error. + +- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input; + the corresponding tests now pass. + +- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because + it was calling the wrong open() function. + +- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to + support unusual filenames (such as those containing semi-colons) in + Content-Disposition headers. + +- Issue #4861: ctypes.util.find_library(): Robustify. Fix library detection on + biarch systems. Try to rely on ldconfig only, without using objdump and gcc. + +- Issue #5104: The socket module now raises OverflowError when 16-bit port and + protocol numbers are supplied outside the allowed 0-65536 range on bind() + and getservbyport(). + +- Windows locale mapping updated to Vista. + +Tools/Demos +----------- + +- Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1, + and make it 2.6-compatible. + +- Ttk demos added in Demo/tkinter/ttk/ + +- Issue #4677: add two list comprehension tests to pybench. + + +Build +----- + +- Issue #6094: Build correctly with Subversion 1.7. + +- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. + +- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the + linker, rather than always exit successfully. Patch by Floris Bruynooghe. + +- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify + the order that backends for the dbm extension are checked. + +- Link the shared python library with $(MODLIBS). + +- Issue #5134: Silence compiler warnings when compiling sqlite with VC++. + +- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. + +- Issue #4895: Use _strdup on Windows CE. + +- Issue #4472: "configure --enable-shared" now works on OSX + +- Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. + +- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". + +- Issue #4289: Remove Cancel button from AdvancedDlg. + +- Issue #1656675: Register a drop handler for .py* files on Windows. + +- Issue #4120: Exclude manifest from extension modules in VS2008. + +- Issue #4091: Install pythonxy.dll in system32 again. + +- Issue #4018: Disable "for me" installations on Vista. + +- Issue #3758: Add ``patchcheck`` build target to .PHONY. + +- Issue #4204: Fixed module build errors on FreeBSD 4. + + +C-API +----- + +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + +- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError + for negative arguments. Previously, it raised TypeError. + +- Issue #4720: The format for PyArg_ParseTupleAndKeywords can begin with '|'. + +- Issue #3632: from the gdb debugger, the 'pyo' macro can now be called when + the GIL is released, or owned by another thread. + +- Issue #4122: On Windows, fix a compilation error when using the + Py_UNICODE_ISSPACE macro in an extension module. + + +Extension Modules +----------------- + +- Issue #3745: Fix hashlib to always reject unicode and non buffer-api + supporting objects as input no matter how it was compiled (built in + implementations or external openssl library). + +- Issue #4397: Fix occasional test_socket failure on OS X. + +- Issue #4279: Fix build of parsermodule under Cygwin. + +- Issue #4751: hashlib now releases the GIL when hashing large buffers + (with a hardwired threshold of 2048 bytes), allowing better parallelization + on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner. + +- Issue #4051: Prevent conflict of UNICODE macros in cPickle. + +- Issue #4738: Each zlib object now has a separate lock, allowing to compress + or decompress several streams at once on multi-CPU systems. Also, the GIL + is now released when computing the CRC of a large buffer. Patch by ebfe. + +- Issue #4228: Pack negative values the same way as 2.4 in struct's L format. + +- Issue #1040026: Fix os.times result on systems where HZ is incorrect. + +- Issues #3167, #3682: Fix test_math failures for log, log10 on Solaris, + OpenBSD. + +- Issue #4583: array.array would not always prohibit resizing when a buffer + has been exported, resulting in an interpreter crash when accessing the + buffer. + + +- Issue #5228: Make functools.partial objects can now be pickled. + +Tests +----- + +- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running + regression tests in parallel, shortening the total runtime. + +- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to + Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate + the same behaviour as test_ttkguionly (and now also test_tk) which is to + skip the tests if DISPLAY is defined but can't be used. + +- regrtest no longer treats ImportError as equivalent to SkipTest. Imports + that should cause a test to be skipped are now done using import_module + from test support, which does the conversion. + +- Issue #5083: New 'gui' resource for regrtest. + + +Docs +---- + + What's New in Python 3.0 final ============================== diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4221,5401 +4221,4 @@ - Issue #11818: Fix tempfile examples for Python 3. -What's New in Python 3.2? -========================= - -*Release date: 20-Feb-2011* - -Core and Builtins ------------------ - -- Issue #11249: Fix potential crashes when using the limited API. - -Build ------ - -- Issue #11222: Fix non-framework shared library build on Mac OS X. - -- Issue #11184: Fix large-file support on AIX. - -- Issue #941346: Fix broken shared library build on AIX. - -Documentation -------------- - -- Issue #10709: Add updated AIX notes in Misc/README.AIX. - - -What's New in Python 3.2 Release Candidate 3? -============================================= - -*Release date: 13-Feb-2011* - -Core and Builtins ------------------ - -- Issue #11134: Add missing fields to typeslots.h. - -- Issue #11135: Remove redundant doc field from PyType_Spec. - -- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited - ABI. - -- Issue #11118: Fix bogus export of None in python3.dll. - -Library -------- - -- Issue #11116: any error during addition of a message to a mailbox now causes a - rollback, instead of leaving the mailbox partially modified. - -- Issue #11132: Fix passing of "optimize" parameter when recursing in - compileall.compile_dir(). - -- Issue #11110: Fix a potential decref of a NULL in sqlite3. - -- Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch - by Stan Mihai. - -Build ------ - -- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X - installers now includes a link to the installed documentation and no longer - includes an Extras directory. The Tools directory is now installed in the - framework under share/doc. - -- Issue #11121: Fix building with --enable-shared. - -Tests ------ - -- Issue #10971: test_zipimport_support is once again compatible with the refleak - hunter feature of test.regrtest. - - -What's New in Python 3.2 Release Candidate 2? -============================================= - -*Release date: 30-Jan-2011* - -Core and Builtins ------------------ - -- Issue #10451: memoryview objects could allow to mutate a readable buffer. - Initial patch by Ross Lagerwall. - -Library -------- - -- Issue #9124: mailbox now accepts binary input and reads and writes mailbox - files in binary mode, using the email package's binary support to parse - arbitrary email messages. StringIO and text file input is deprecated, - and string input fails early if non-ASCII characters are used, where - previously it would fail when the email was processed in a later step. - -- Issue #10845: Mitigate the incompatibility between the multiprocessing - module on Windows and the use of package, zipfile or directory execution - by special casing main modules that actually *are* called __main__.py. - -- Issue #11045: Protect logging call against None argument. - -- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save - commands. - -- Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, - preventing a confusing hung appearance on OS X with the windows - obscured. - -- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the - menu accelerators for Open Module, Go to Line, and New Indent Width. - The accelerators still work but no longer appear in the menu items. - -- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True). - -- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 - conversion. - -- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message - with a None body. - -- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a - keyword-only argument. The preceding positional argument was deprecated, - so it made no sense to add filter as a positional argument. - -- Issue #11004: Repaired edge case in deque.count(). - -- Issue #10974: IDLE no longer crashes if its recent files list includes files - with non-ASCII characters in their path names. - -- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both - return sets instead of one returning a tuple and the other a frozenset. - -- Issue #10987: Fix the recursion limit handling in the _pickle module. - -- Issue #10983: Fix several bugs making tunnel requests in http.client. - -- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode - filenames, at bootstrap, if the codec registry is not ready yet. It is still - possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding) - for all file entries in the ZIP file. - -- Issue #10949: Improved robustness of rotating file handlers. - -- Issue #10955: Fix a potential crash when trying to mmap() a file past its - length. Initial patch by Ross Lagerwall. - -- Issue #10898: Allow compiling the posix module when the C library defines - a symbol named FSTAT. - -- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1) - encoding. This is the preferred encoding of PEP 3333 and the base encoding - of HTTP 1.1. - -- To match the behaviour of HTTP server, the HTTP client library now also - encodes headers with iso-8859-1 (latin1) encoding. It was already doing - that for incoming headers which makes this behaviour now consistent in - both incoming and outgoing direction. - -- Issue #9509: argparse now properly handles IOErrors raised by - argparse.FileType. - -- Issue #10961: The new pydoc server now better handles exceptions raised - during request handling. - -- Issue #10680: Fix mutually exclusive arguments for argument groups in - argparse. - -Build ------ - -- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with - the system-provided Python. - - -What's New in Python 3.2 Release Candidate 1 -============================================ - -*Release date: 16-Jan-2011* - -Core and Builtins ------------------ - -- Issue #10889: range indexing and slicing now works correctly on ranges with - a length that exceeds sys.maxsize. - -- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a - class. - -- Issue #8020: Avoid a crash where the small objects allocator would read - non-Python managed memory while it is being modified by another thread. Patch - by Matt Bandy. - -- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all - io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser - translates newlines (\r\n => \n). - -- Remove buffer API from stable ABI for now, see #10181. - -- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file - doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int - (length bigger than 2^31-1 bytes). - -- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and - stdprinter.write() clamp the length to INT_MAX on Windows. - -- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() - can now handle dates after 2038. - -- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and - PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the - filesystem encoding instead of UTF-8. - -- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem - encoding instead of UTF-8. - -- Add sys.flags attribute for the new -q command-line option. - -- Issue #11506: Trying to assign to a bytes literal should result in a - SyntaxError. - -Library -------- - -- Issue #10916: mmap should not segfault when a file is mapped using 0 as length - and a non-zero offset, and an attempt to read past the end of file is made - (IndexError is raised instead). Patch by Ross Lagerwall. - -- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead - of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. - -- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather - than the currently problematic Apple-supplied one, when running with the - 64-/32-bit installer variant. - -- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not - as unicode, and accept binary files. Add encoding and errors attributes to - cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn - Linderman). - -- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl(). - -- Issue #10899: No function type annotations in the standard library. Removed - function type annotations from _pyio.py. - -- Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'. - -- Issue #10872: The repr() of TextIOWrapper objects now includes the mode - if available. - -- Issue #10869: Fixed bug where ast.increment_lineno modified the root node - twice. - -- Issue #5871: email.header.Header.encode now raises an error if any - continuation line in the formatted value has no leading white space and looks - like a header. Since Generator uses Header to format all headers, this check - is made for all headers in any serialized message at serialization time. This - provides protection against header injection attacks. - -- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially - private by renaming it to ``_GeneratorContextManager``. - -- Issue #10042: Fixed the total_ordering decorator to handle cross-type - comparisons that could lead to infinite recursion. - -- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with - non-ASCII bytes (parsed by a BytesParser) when doing conversion to 7bit-clean - presentation, instead of replacing them with ?s. - -- email.header.Header was incorrectly encoding folding whitespace when - rfc2047-encoding header values with embedded newlines, leaving them without - folding whitespace. It now uses the continuation_ws, as it does for - continuation lines that it creates itself. - -- Issue #1777412, #10827: Changed the rules for 2-digit years. The - time.asctime(), time.ctime() and time.strftime() functions will now format - any year when ``time.accept2dyear`` is False and will accept years >= 1000 - otherwise. ``time.mktime`` and ``time.strftime`` now accept full range - supported by the OS. With Visual Studio or on Solaris, the year is limited to - the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated. - -- Issue #7858: Raise an error properly when os.utime() fails under Windows - on an existing file. - -- Issue #3839: wsgiref should not override a Content-Length header set by - the application. Initial patch by Clovis Fabricio. - -- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the - compilation (if the input is a string). - -- Issue #7995: When calling accept() on a socket with a timeout, the returned - socket is now always blocking, regardless of the operating system. - -- Issue #10756: atexit normalizes the exception before displaying it. Patch by - Andreas St?hrk. - -- Issue #10790: email.header.Header.append's charset logic now works correctly - for charsets whose output codec is different from its input codec. - -- Issue #10819: SocketIO.name property returns -1 when its closed, instead of - raising a ValueError, to fix repr(). - -- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if - the input buffer length doesn't fit into an unsigned int (length bigger than - 2^32-1 bytes). - -- Issue #6643: Reinitialize locks held within the threading module after fork to - avoid a potential rare deadlock or crash on some platforms. - -- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file - descriptors (0, 1, 2) are closed in the parent process. Initial patch by Ross - Lagerwall. - -- `unittest.TestCase` can be instantiated without a method name; for simpler - exploration from the interactive interpreter. - -- Issue #10798: Reject supporting concurrent.futures if the system has too - few POSIX semaphores. - -- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from - the codec aliases. They are still accessible via codecs.lookup(). - -- Issue #10801: In zipfile, support different encodings for the header and the - filenames. - -- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott - David Daniels. - -- Fix collections.OrderedDict.setdefault() so that it works in subclasses that - define __missing__(). - -- Issue #10786: unittest.TextTestRunner default stream no longer bound at import - time. `sys.stderr` now looked up at instantiation time. Fix contributed by - Mark Roddy. - -- Issue #10753: Characters ';', '=' and ',' in the PATH_INFO environment variable - won't be quoted when the URI is constructed by the wsgiref.util's request_uri - method. According to RFC 3986, these characters can be a part of params in - PATH component of URI and need not be quoted. - -- Issue #10738: Fix webbrowser.Opera.raise_opts. - -- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how - browsers actually parse cookies. - -- Issue #9333: os.symlink now available regardless of user privileges. The - function now raises OSError on Windows >=6.0 when the user is unable to create - symbolic links. XP and 2003 still raise NotImplementedError. - -- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8. - -- Issue #10730: Add SVG mime types to mimetypes module. - -- Issue #10768: Make the Tkinter ScrolledText widget work again. - -- Issue #10777: Fix "dictionary changed size during iteration" bug in - ElementTree register_namespace(). - -- Issue #10626: test_logging now preserves logger disabled states. - -- Issue #10774: test_logging now removes temp files created during tests. - -- Issue #5258/#10642: if site.py encounters a .pth file that generates an error, - it now prints the filename, line number, and traceback to stderr and skips - the rest of that individual file, instead of stopping processing entirely. - -- Issue #10763: subprocess.communicate() closes stdout and stderr if both are - pipes (bug specific to Windows). - -- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better - compliance (no "s around encoded values). - -- Improved the diff message in the unittest module's assertCountEqual(). - -- Issue #1155362: email.utils.parsedate_tz now handles a missing space before - the '-' of a timezone field as well as before a '+'. - -- Issue #4871: The zipfile module now gives a more useful error message if - an attempt is made to use a string to specify the archive password. - -- Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only. - -- Deprecated assertDictContainsSubset() in the unittest module. - -C-API ------ - -- PyObject_CallMethod now passes along any underlying AttributeError from - PyObject_GetAttr, instead of replacing it with something less informative - -- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and - PyEval_ReleaseLock(). The thread-state aware APIs should be used instead. - -- Issue #10333: Remove ancient GC API, which has been deprecated since Python - 2.2. - -Build ------ - -- Issue #10843: Update third-party library versions used in OS X 32-bit - installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4 - and RTREE enabled), and ncursesw 5.5 (wide-char support enabled). - -- Issue #10820: Fix OS X framework installs to support version-specific - scripts (#10679). - -- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in - the configure script but use $GREP instead. Patch by Fabian Groffen. - -- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD - and DragonFly BSD. Patch by Nicolas Joly. - -- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with - a version-specific suffix on "make altinstall". - -- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with - timestamp profiling (--with-tsc): the preprocessor test for the PowerPC - support now looks for "__powerpc__" as well as "__ppc__": the latter seems to - only be present on OS X; the former is the correct one for Linux with GCC. - -- Issue #1099: Fix the build on MacOSX when building a framework with pydebug - using GCC 4.0. - -Tools/Demos ------------ - -- Issue #10843: Install the Tools directory on OS X in the applications Extras - (/Applications/Python 3.n/Extras/) where the Demo directory had previous been - installed. - -- Issue #7962: The Demo directory is gone. Most of the old and unmaintained - demos have been removed, others integrated in documentation or a new - Tools/demo subdirectory. - -- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell. - Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian - Curtin. - -Tests ------ - -- Issue #11910: Fix test_heapq to skip the C tests when _heapq is missing. - -- Fix test_startfile to wait for child process to terminate before finishing. - -- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch - by Ross Lagerwall. - -- Make the --coverage flag work for test.regrtest. - -- Issue #1677694: Refactor and improve test_timeout. Original patch by - Bj?rn Lindqvist. - -- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects. - Patch by Jean-Paul Calderone and Sandro Tosi. - -- Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in - whole runs and enabled selectively using ``--header`` when running an explicit - list of tests. Original patch by Collin Winter. - - -What's New in Python 3.2 Beta 2? -================================ - -*Release date: 19-Dec-2010* - -Core and Builtins ------------------ - -- Issue #8844: Regular and recursive lock acquisitions can now be interrupted - by signals on platforms using pthreads. Patch by Reid Kleckner. - -- Issue #4236: PyModule_Create2 now checks the import machinery directly - rather than the Py_IsInitialized flag, avoiding a Fatal Python - error in certain circumstances when an import is done in __del__. - -- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and - Daniel Urban. - -Library -------- - -- Issue #3243: Support iterable bodies in httplib. Patch Contributions by - Xuanji Li and Chris AtLee. - -- Issue #10611: SystemExit exception will no longer kill a unittest run. - -- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean - up function. - -- Issue #10573: use actual/expected consistently in unittest methods. - The order of the args of assertCountEqual is also changed. - -- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated - words in the local part of email addresses, thereby preserving the input. - -- Issue #6791: Limit header line length (to 65535 bytes) in http.client - and http.server, to avoid denial of services from the other party. - -- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. - -- Issue #9907: Fix tab handling on OSX when using editline by calling - rl_initialize first, then setting our custom defaults, then reading .editrc. - -- Issue #4188: Avoid creating dummy thread objects when logging operations - from the threading module (with the internal verbose flag activated). - -- Issue #10711: Remove HTTP 0.9 support from http.client. The ``strict`` - parameter to HTTPConnection and friends is deprecated. - -- Issue #9721: Fix the behavior of urljoin when the relative url starts with a - ';' character. Patch by Wes Chow. - -- Issue #10714: Limit length of incoming request in http.server to 65536 bytes - for security reasons. Initial patch by Ross Lagerwall. - -- Issue #9558: Fix distutils.command.build_ext with VS 8.0. - -- Issue #10667: Fast path for collections.Counter(). - -- Issue #10695: passing the port as a string value to telnetlib no longer - causes debug mode to fail. - -- Issue #1078919: add_header now automatically RFC2231 encodes parameters - that contain non-ascii values. - -- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits - a warning on sys.stderr rather than throwing a misleading exception - if cleanup fails due to nulling out of modules during shutdown. - Also avoids an AttributeError when mkdtemp call fails and issues - a ResourceWarning on implicit cleanup via __del__. - -- Issue #10107: Warn about unsaved files in IDLE on OSX. - -- Issue #7213: subprocess.Popen's default for close_fds has been changed. - It is now True in most cases other than on Windows when input, output or - error handles are provided. - -- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually - added in 3.2beta1) to allow specifying a specific list of file descriptors - to keep open in the child process. - -- Issue #1731717: Fixed the problem where subprocess.wait() could cause an - OSError exception when The OS had been told to ignore SIGCLD in our process - or otherwise not wait for exiting child processes. - -Tests ------ - -- Issue #775964: test_grp now skips YP/NIS entries instead of failing when - encountering them. - -Tools/Demos ------------ - -- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and - Cocoa AquaTk. - -- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree. - -- Issue #10706: Remove outdated script runtests.sh. Either ``make test`` - or ``python -m test`` should be used instead. - -Build ------ - -- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4. - -- Issue #9234: argparse supports alias names for subparsers. - - -What's New in Python 3.2 Beta 1? -================================ - -*Release date: 05-Dec-2010* - -Core and Builtins ------------------ - -- Issue #10630: Return dict views from the dict proxy keys()/values()/items() - methods. - -- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__ - with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. - -- Issue #1772833: Add the -q command-line option to suppress copyright and - version output in interactive mode. - -- Provide an *optimize* parameter in the built-in compile() function. - -- Fixed several corner case issues on Windows in os.stat/os.lstat related to - reparse points. - -- PEP 384 (Defining a Stable ABI) is implemented. - -- Issue #2690: Range objects support negative indices and slicing. - -- Issue #9915: Speed up sorting with a key. - -- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much - larger than operand ``b``. Patch by Andrew Bennetts. - -- Issue #10518: Bring back the callable() builtin. - -- Issue #7094: Added alternate formatting (specified by '#') to ``__format__`` - method of float, complex, and Decimal. This allows more precise control over - when decimal points are displayed. - -- Issue #10474: range.count() should return integers. - -- Issue #1574217: isinstance now catches only AttributeError, rather than - masking all errors. - -Library -------- - -- logging: added "handler of last resort". See http://bit.ly/last-resort-handler - -- test.support: Added TestHandler and Matcher classes for better support of - assertions about logging. - -- Issue #4391: Use proper plural forms in argparse. - -- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on - UnicodeEncodeError. - -- Add the "display" and "undisplay" pdb commands. - -- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again - after a "continue" command. - -- Add the "interact" pdb command. - -- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf. - -- Issue #1569291: Speed up array.repeat(). - -- Provide an interface to set the optimization level of compilation in - py_compile, compileall and zipfile.PyZipFile. - -- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by - RFC3986. Anything before :// is considered a scheme and is followed by an - authority (or netloc) and by '/' led path, which is optional. - -- Issue #6045: dbm.gnu databases now support get() and setdefault() methods. - -- Issue #10620: `python -m unittest` can accept file paths instead of module - names for running specific tests. - -- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`, - `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_` - and replace them with the correct methods in the Python test suite. - -- Issue #10272: The ssl module now raises socket.timeout instead of a generic - SSLError on socket timeouts. - -- Issue #10528: Allow translators to reorder placeholders in localizable - messages from argparse. - -- Issue #10497: Fix incorrect use of gettext in argparse. - -- Issue #10478: Reentrant calls inside buffered IO objects (for example by - way of a signal handler) now raise a RuntimeError instead of freezing the - current process. - -- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests. - -- Issue #10549: Fix pydoc traceback when text-documenting certain classes. - -- Issue #2001: New HTML server with enhanced Web page features. Patch by Ron - Adam. - -- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership - of non-weakrefable objects. - -- Issue #940286: pydoc.Helper.help() ignores input/output init parameters. - -- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent - DoS attacks. Patch by Savio Sena. - -- Issue #4925: Add filename to error message when executable can't be found in - subprocess. - -- Issue #10391: Don't dereference invalid memory in error messages in the ast - module. - -- Issue #10027: st_nlink was not being set on Windows calls to os.stat or - os.lstat. Patch by Hirokazu Yamamoto. - -- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is - held by the user's account, i.e., when the function can actually be used. - -- Issue #8879: Add os.link support for Windows. - -- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved - failure messages by default. Patch by Mark Roddy. - -- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to - guess at the correct parsing of invalid html. - -- Issue #10554: Add context manager support to subprocess.Popen objects. - -- Issue #8989: email.utils.make_msgid now has a domain parameter that can - override the domain name used in the generated msgid. - -- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File - exists' exception when a target directory already exists with the specified - mode. Patch by Ray Allen. - -- Issue #9573: os.fork() now works correctly when triggered as a side effect of - a module import. - -- Issue #10464: netrc now correctly handles lines with embedded '#' characters. - -- Added itertools.accumulate(). - -- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``. - Original patch by Daniel Urban. - -- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to - `assertRegex` and `assertRaisesRegex`. - -- Issue #10535: Enable silenced warnings in unittest by default. - -- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte - sequences as input in addition to character strings. - -- Issue #10586: The statistics API for the new functools.lru_cache has been - changed to a single cache_info() method returning a named tuple. - -- Issue #10323: itertools.islice() now consumes the minimum number of inputs - before stopping. Formerly, the final state of the underlying iterator was - undefined. - -- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and - __next__. - -- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new - more informative name, unittest.CountEqual. - -- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. - -- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can - be set to False to turn off the previously undocumented 'popularity' - heuristic. Patch by Terry Reedy and Eli Bendersky. - -- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate - undocumented and now redundant isbjunk and isbpopular methods. - -- Issue #9846: zipfile is now correctly closing underlying file objects. - -- Issue #10459: Update CJK character names to Unicode 6.0. - -- Issue #4493: urllib.request adds '/' in front of path components which does not - start with '/. Common behavior exhibited by browsers and other clients. - -- Issue #6378: idle.bat now runs with the appropriate Python version rather than - the system default. Patch by Sridhar Ratnakumar. - -- Issue #10470: 'python -m unittest' will now run test discovery by default, - when no extra arguments have been provided. - -- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to - output stream only when end_headers is invoked. This is a speedup and an - internal optimization. Patch by Andrew Shaaf. - -- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho - Eckhardt. - -- Issue #10453: compileall now uses argparse instead of getopt, and thus - provides clean output when called with '-h'. - -- Issue #8078: Add constants for higher baud rates in the termios module. Patch - by Rodolpho Eckhardt. - -- Issue #10407: Fix two NameErrors in distutils. - -- Issue #10371: Deprecated undocumented functions in the trace module. - -- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the - end of the file. - -- configparser: 100% test coverage. - -- Issue #10499: configparser supports pluggable interpolation handlers. The - default classic interpolation handler is called BasicInterpolation. Another - interpolation handler added (ExtendedInterpolation) which supports the syntax - used by zc.buildout (e.g. interpolation between sections). - -- configparser: the SafeConfigParser class has been renamed to ConfigParser. - The legacy ConfigParser class has been removed but its interpolation mechanism - is still available as LegacyInterpolation. - -- configparser: Usage of RawConfigParser is now discouraged for new projects - in favor of ConfigParser(interpolation=None). - -- Issue #1682942: configparser supports alternative option/value delimiters. - -- Issue #5412: configparser supports mapping protocol access. - -- Issue #9411: configparser supports specifying encoding for read operations. - -- Issue #9421: configparser's getint(), getfloat() and getboolean() methods - accept vars and default arguments just like get() does. - -- Issue #9452: configparser supports reading from strings and dictionaries - (thanks to the mapping protocol API, the latter can be used to copy data - between parsers). - -- configparser: accepted INI file structure is now customizable, including - comment prefixes, name of the DEFAULT section, empty lines in multiline - values, and indentation. - -- Issue #10326: unittest.TestCase instances can be pickled. - -- Issue #9926: Wrapped TestSuite subclass does not get __call__ executed. - -- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex - zeros on systems where the log1p function fails to respect the sign of zero. - This fixes a test failure on AIX. - -- Issue #9732: Addition of getattr_static to the inspect module. - -- Issue #10446: Module documentation generated by pydoc now links to a - version-specific online reference manual. - -- Make the 'No module named' exception message from importlib consistent. - -- Issue #10443: Add the SSLContext.set_default_verify_paths() method. - -- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module. - Patch by Robert Collins. - -- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather - than strings. - -C-API ------ - -- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(), - which transforms non-ASCII decimal digits in a Unicode string to their ASCII - equivalents. - -- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly - zero-initialize all fields, fixing compiler warnings seen when building - extension modules with gcc with "-Wmissing-field-initializers" (implied by - "-W"). - -- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil - Schemenauer. - -- structseq.h is now included in Python.h. - -- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. - -Tests ------ - -- regrtest.py once again ensures the test directory is removed from sys.path - when it is invoked directly as the __main__ module. - -- `python -m test` can be used to run the test suite as well as `python -m - test.regrtest`. - -- Do not fail test_socket when the IP address of the local hostname cannot be - looked up. - -- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric - Carstensen. - -Build ------ - -- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and - PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals. - -Documentation -------------- - -- Issue #10299: List the built-in functions in a table in functions.rst. - - -What's New in Python 3.2 Alpha 4? -================================= - -*Release date: 13-Nov-2010* - -Core and Builtins ------------------ - -- Issue #10372: Import the warnings module only after the IO library is - initialized, so as to avoid bootstrap issues with the '-W' option. - -- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused - undocumented value PyBUF_SHADOW, and strangely-looking code in - PyMemoryView_GetContiguous. - -- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``. - -- If FileIO.__init__ fails, close the file descriptor. - -- Issue #10221: dict.pop(k) now has a key error message that includes the - missing key (same message d[k] returns for missing keys). - -- Issue #5437: A preallocated MemoryError instance should not keep traceback - data (including local variables caught in the stack trace) alive infinitely. - -- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length - of the offending line. - -- Issue #10089: Add support for arbitrary -X options on the command line. They - can be retrieved through a new attribute ``sys._xoptions``. - -- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of - the locale encoding. If the LANG (and LC_ALL and LC_CTYPE) environment - variable is not set, the locale encoding is ISO-8859-1, whereas most programs - (including Python) expect UTF-8. Python already uses UTF-8 for the filesystem - encoding and to encode command line arguments on this OS. - -- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect - filenames encoded to the filesystem encoding with the surrogateescape error - handler (to support undecodable bytes), instead of UTF-8 in strict mode. - -- Issue #9997: Don't let the name "top" have special significance in scope - resolution. - -- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as - the default 512 when compiling on AIX. - -- Use locale encoding instead of UTF-8 to encode and decode filenames if - Py_FileSystemDefaultEncoding is not set. - -- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file - descriptor. - -- Issue #9418: Moved private string methods ``_formatter_parser`` and - ``_formatter_field_name_split`` into a new ``_string`` module. - -- Issue #9992: Remove PYTHONFSENCODING environment variable. - -Library -------- - -- Issue #12943: python -m tokenize support has been added to tokenize. - -- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. - -- Issue #10356: Decimal.__hash__(-1) should return -2. - -- Issue #1553375: logging: Added stack_info kwarg to display stack information. - -- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru. - -- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See also issue - #10356.) - -- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard - IMAP4 connections. Original patch by Lorenzo M. Catucci. - -- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if - there are non-base64 alphabet characters in the input. - -- Issue #10386: Add __all__ to token module; this simplifies importing in - tokenize module and prevents leaking of private names through ``import *``. - -- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by Lorenzo - M. Catucci. - -- Fix IMAP.login() to work properly. - -- Issue #9244: multiprocessing pool worker processes could terminate - unexpectedly if the return value of a task could not be pickled. Only the - ``repr`` of such errors are now sent back, wrapped in an - ``MaybeEncodingError`` exception. - -- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of - ``multiprocessing.Pool`` now accepts a ``error_callback`` argument. This can - be a callback with the signature ``callback(exc)``, which will be called if - the target raises an exception. - -- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL - sockets now has additional items such as ``issuer`` and ``notBefore``. - -- ``usenetrc`` is now false by default for NNTP objects. - -- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS. - Patch by Andrew Vant. - -- Issue #10335: Add tokenize.open(), detect the file encoding using - tokenize.detect_encoding() and open it in read only mode. - -- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new - method send_message to send an email.message.Message object. - -- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error - handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source - code directory name contains a non-ASCII character and the locale encoding is - ASCII. - -- Issue #10329: The trace module writes reports using the input Python script - encoding, instead of the locale encoding. Patch written by Alexander - Belopolsky. - -- Issue #10126: Fix distutils' test_build when Python was built with - --enable-shared. - -- Issue #9281: Prevent race condition with mkdir in distutils. Patch by - Arfrever. - -- Issue #10229: Fix caching error in gettext. - -- Issue #10252: Close file objects in a timely manner in distutils code and - tests. Patch by Brian Brazil, completed by ?ric Araujo. - -- Issue #10180: Pickling file objects is now explicitly forbidden, since - unpickling them produced nonsensical results. - -- Issue #10311: The signal module now restores errno before returning from its - low-level signal handler. Patch by Hallvard B Furuseth. - -- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects. - -- Issue #10283: Add a ``group_pattern`` argument to NNTP.list(). - -- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI - environment better, and to correct unicode environment values for WSGI 1.0.1. - -- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER - response, instead of raising an exception. - -- wsgiref now implements and validates PEP 3333, rather than an experimental - extension of PEP 333. (Note: earlier versions of Python 3.x may have - incorrectly validated some non-compliant applications as WSGI compliant; if - your app validates with Python <3.2b1+, but not on this version, it is likely - the case that your app was not compliant.) - -- Issue #10280: NNTP.nntp_version should reflect the highest version advertised - by the server. - -- Issue #10184: Touch directories only once when extracting a tarfile. - -- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts - that were formerly found under Demo/turtle. - -- Issue #10265: Close file objects explicitly in sunau. Patch by Brian Brazil. - -- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a - filename. Patch by Brian Brazil. - -- Issue #10110: Queue objects didn't recognize full queues when the maxsize - parameter had been reduced. - -- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. - -- logging: Added style option to basicConfig() to allow %, {} or $-formatting. - -- Issue #5729: json.dumps() now supports using a string such as '\t' for - pretty-printing multilevel objects. - -- Issue #10253: FileIO leaks a file descriptor when trying to open a file for - append that isn't seekable. Patch by Brian Brazil. - -- Support context manager protocol for file-like objects returned by mailbox - ``get_file()`` methods. - -- Issue #10246: uu.encode didn't close file objects explicitly when filenames - were given to it. Patch by Brian Brazil. - -- Issue #10198: fix duplicate header written to wave files when writeframes() is - called without data. - -- Close file objects in modulefinder in a timely manner. - -- Close a io.TextIOWrapper object in email.parser in a timely manner. - -- Close a file object in distutils.sysconfig in a timely manner. - -- Close a file object in pkgutil in a timely manner. - -- Issue #10233: Close file objects in a timely manner in the tarfile module and - its test suite. - -- Issue #10093: ResourceWarnings are now issued when files and sockets are - deallocated without explicit closing. These warnings are silenced by default, - except in pydebug mode. - -- tarfile.py: Add support for all missing variants of the GNU sparse extensions - and create files with holes when extracting sparse members. - -- Issue #10218: Return timeout status from ``Condition.wait`` in threading. - -- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and - deprecate the old name ``zipfile.BadZipfile``. - -- Issue #5027: The standard ``xml`` namespace is now understood by - xml.sax.saxutils.XMLGenerator as being bound to - http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell. - -- Issue #5975: Add csv.unix_dialect class. - -- Issue #7761: telnetlib.interact failures on Windows fixed. - -- logging: Added style option to Formatter to allow %, {} or $-formatting. - -- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a - context manager. - -- Issue #1349106: Generator (and BytesGenerator) flatten method and Header - encode method now support a 'linesep' argument. - -- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in - order to support the TLS SNI extension. ``HTTPSConnection`` and ``urlopen()`` - also use this argument, so that HTTPS virtual hosts are now supported. - -- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items. - -- Issue #10163: Skip unreadable registry keys during mimetypes initialization. - -- logging: Made StreamHandler terminator configurable. - -- logging: Allowed filters to be just callables. - -- logging: Added tests for _logRecordClass changes. - -- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. - -- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to - increase flexibility of LogRecord creation. - -- Issue #5117: Case normalization was needed on ntpath.relpath(). Also fixed - root directory issue on posixpath.relpath(). (Ported working fixes from - ntpath.) - -- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option - short_empty_elements to direct it to use self-closing tags when appropriate. - -- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags. Add --abiflags - switch to python-config for command line access. - -- Issue #6098: Don't claim DOM level 3 conformance in minidom. - -- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty - XML namespace attribute is encountered. - -- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic - characters by default. Deprecate ``cgi.escape()``. - -- Issue #9409: Fix the regex to match all kind of filenames, for interactive - debugging in doctests. - -- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the - same instance as ``datetime.timezone.utc``. - -- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where - supported by the system. Patch by Nikita Vetoshkin. - -- Issue #10063: file:// scheme will stop accessing remote hosts via ftp - protocol. file:// urls had fallback to access remote hosts via ftp. This was - not correct, change is made to raise a URLError when a remote host is tried to - access via file:// scheme. - -- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is - created in modes 'a' or 'w' and then closed without adding any files. Raise - BadZipfile (rather than IOError) when opening small non-ZIP files. - -- Issue #10041: The signature of optional arguments in socket.makefile() didn't - match that of io.open(), and they also didn't get forwarded properly to - TextIOWrapper in text mode. Patch by Kai Zhu. - -- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and - urllib.request.urlopen now take optional arguments to allow for server - certificate checking, as recommended in public uses of HTTPS. - -- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the - current directory was deleted. Patch written by W. Trevor King. - -- Issue #3873: Speed up unpickling from file objects that have a peek() method. - -- Issue #10075: Add a session_stats() method to SSLContext objects. - -- Issue #9948: Fixed problem of losing filename case information. - -Extension Modules ------------------ - -- Issue #5109: array.array constructor will now use fast code when - initial data is provided in an array object with correct type. - -- Issue #6317: Now winsound.PlaySound only accepts unicode. - -- Issue #6317: Now winsound.PlaySound can accept non ascii filename. - -- Issue #9377: Use Unicode API for gethostname on Windows. - -- Issue #10143: Update "os.pathconf" values. - -- Issue #6518: Support context manager protcol for ossaudiodev types. - -- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. - -- Issue #9054: Fix a crash occurring when using the pyexpat module with expat - version 2.0.1. - -- Issue #5355: Provide mappings from Expat error numbers to string descriptions - and backwards, in order to actually make it possible to analyze error codes - provided by ExpatError. - -- The Unicode database was updated to 6.0.0. - -C-API ------ - -- Issue #10288: The deprecated family of "char"-handling macros - (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead. - -- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t - type has been introduced. - -Tools/Demos ------------ - -- Issue #10117: Tools/scripts/reindent.py now accepts source files that use - encoding other than ASCII or UTF-8. Source encoding is preserved when - reindented code is written to a file. - -- Issue #7287: Demo/imputil/knee.py was removed. - -Tests ------ - -- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well - as unicode strings. Initial patch by Sandro Tosi. - -- Issue #10294: Remove dead code form test_unicode_file. - -- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new - test specific to unicode (non-ascii name and filename). - -Build ------ - -- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure. - -- Issue #8852: Allow the socket module to build on OpenSolaris. - -- Drop -OPT:Olimit compiler option. - -- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. - -- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. - -- Issue #7473: avoid link errors when building a framework with a different set - of architectures than the one that is currently installed. - - -What's New in Python 3.2 Alpha 3? -================================= - -*Release date: 09-Oct-2010* - -Core and Builtins ------------------ - -- Issue #10068: Global objects which have reference cycles with their module's - dict are now cleared again. This causes issue #7140 to appear again. - -- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename() - encodings. - -- ast.literal_eval() can now handle negative numbers. It is also a little more - liberal in what it accepts without compromising the safety of the evaluation. - For example, 3j+4 and 3+4+5 are both accepted. - -- Issue #10006: type.__abstractmethods__ now raises an AttributeError. As a - result metaclasses can now be ABCs (see #9533). - -- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t. - -- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace - UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and - 32 bits wchar_t (eg. Linux in narrow build). - -- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression - introduced by issue #9324. - -- Issue #9979: Create function PyUnicode_AsWideCharString(). - -- Issue #7397: Mention that importlib.import_module() is probably what someone - really wants to be using in __import__'s docstring. - -- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg - to use named arguments. - -- Issue #9930: Remove bogus subtype check that was causing (e.g.) - float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. - -- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin. - -- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other - threads are still running. Instead, reinitialize the GIL on a second call to - Py_Initialize(). - -- All SyntaxErrors now have a column offset and therefore a caret when the error - is printed. - -- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the - module that was imported, but instead gets the module from sys.modules. - -- Issue #9213: The range type_items now provides index() and count() methods, to - conform to the Sequence ABC. Patch by Daniel Urban and Daniel Stutzbach. - -- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called - with a non-empty format string. This is an effort to future-proof user - code. If a derived class does not currently implement __format__ but later - adds its own __format__, it would most likely break user code that had - supplied a format string. This will be changed to a DeprecationWaring in - Python 3.3 and it will be an error in Python 3.4. - -- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly - re-created on a subsequent call to Py_Initialize(). The problem (a crash) - wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial. - -- Issue #9210: Configure option --with-wctype-functions was removed. Using the - functions from the libc caused the methods .upper() and lower() to become - locale aware and created subtly wrong results. - -- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a - non-ASCII byte in the format string. - -- Issue #4617: Previously it was illegal to delete a name from the local - namespace if it occurs as a free variable in a nested block. This limitation - of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). - -- Issue #9804: ascii() now always represents unicode surrogate pairs as a single - ``\UXXXXXXXX``, regardless of whether the character is printable or not. - Also, the "backslashreplace" error handler now joins surrogate pairs into a - single character on UCS-2 builds. - -- Issue #9757: memoryview objects get a release() method to release the - underlying buffer (previously this was only done when deallocating the - memoryview), and gain support for the context management protocol. - -- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid - thread-local storage key. - -Library -------- - -- Issue #2236: distutils' mkpath ignored the mode parameter. - -- Fix typo in one sdist option (medata-check). - -- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce. - -- Issue #1718574: Fix options that were supposed to accept arguments but did - not in build_clib. - -- Issue #9437: Fix building C extensions with non-default LDFLAGS. - -- Issue #4661: email can now parse bytes input and generate either converted - 7bit output or bytes output. Email version bumped to 5.1.0. - -- Issue #1589: Add ssl.match_hostname(), to help implement server identity - verification for higher-level protocols. - -- Issue #9759: GzipFile now raises ValueError when an operation is attempted - after the file is closed. Patch by Jeffrey Finkelstein. - -- Issue #9042: Fix interaction of custom translation classes and caching in - gettext. - -- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method - returning a (sock, addr) pair which is called when a connection has been - established with a new remote endpoint. This is supposed to be used as a - replacement for old handle_accept() and avoids the user to call accept() - directly. - -- Issue #9065: tarfile no longer uses "root" as the default for the uname and - gname field. - -- Issue #8980: Fixed a failure in distutils.command check that was shadowed by - an environment that does not have docutils. Patch by Arfrever. - -- Issue #1050268: parseaddr now correctly quotes double quote and backslash - characters that appear inside quoted strings in email addresses. - -- Issue #10004: quoprimime no longer generates a traceback when confronted with - invalid characters after '=' in a Q-encoded word. - -- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before - sending a 200 OK for the Expect: 100-continue request header. - -- Issue #9360: Cleanup and improvements to the nntplib module. The API now - conforms to the philosophy of bytes and unicode separation in Python 3. A - test suite has also been added. - -- Issue #9962: GzipFile now has the peek() method. - -- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, - retry the select() loop instead of bailing out. This is because select() can - incorrectly report a socket as ready for reading (for example, if it received - some data with an invalid checksum). - -- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) - -- Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is - received. Now sendall() properly calls signal handlers if necessary, and - retries sending if these returned successfully, including on sockets with a - timeout. - -- Issue #9947: logging: Fixed locking bug in stopListening. - -- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler. - -- Issue #9936: Fixed executable lines' search in the trace module. - -- Issue #9790: Rework imports necessary for samefile and sameopenfile - in ntpath. - -- Issue #9928: Properly initialize the types exported by the bz2 module. - -- Issue #1675951: Allow GzipFile to work with unseekable file objects. Patch by - Florian Festi. - -- Logging: Added QueueListener class to facilitate logging usage for - performance-critical threads. - -- Issue #9916: Add some missing errno symbols. - -- Issue #9877: Expose sysconfig.get_makefile_filename() - -- logging: Added hasHandlers() method to Logger and LoggerAdapter. - -- Issue #9908: Fix os.stat() on bytes paths under Windows 7. - -- Issue #2643: msync() is not called anymore when deallocating an open mmap - object, only munmap(). - -- logging: Changed LoggerAdapter implementation internally, to make it easier to - subclass in a useful way. - -- logging: hasHandlers method was added to Logger, and isEnabledFor, - getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter. - LoggerAdapter was introduced into the unit tests for logging. - -- Issue #1686: Fix string.Template when overriding the pattern attribute. - -- Issue #9854: SocketIO objects now observe the RawIOBase interface in - non-blocking mode: they return None when an operation would block (instead of - raising an exception). - -- Issue #1730136: Fix the comparison between a tk.font.Font and an object of - another kind. - -- Issue #9441: logging has better coverage for rotating file handlers. - -- Issue #9865: collections.OrderedDict now has a __sizeof__ method. - -- Issue #9854: The default read() implementation in io.RawIOBase now handles - non-blocking readinto() returning None correctly. - -- Issue #1552: socket.socketpair() now returns regular socket.socket objects - supporting the whole socket API (rather than the "raw" _socket.socket - objects). - -- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto() - to match the corresponding socket methods. - -- Issue #9840: Added a decorator to reprlib for wrapping __repr__ methods to make - them handle recursive calls within the same thread. - -- logging: Enhanced HTTPHandler with secure and credentials initializers. - -- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X. - -- Issue #9837: The read() method of ZipExtFile objects (as returned by - ZipFile.open()) could return more bytes than requested. - -- Issue #9826: OrderedDict.__repr__ can now handle self-referential values: - d['x'] = d. - -- Issue #9825: Using __del__ in the definition of collections.OrderedDict made - it possible for the user to create self-referencing ordered dictionaries which - become permanently uncollectable GC garbage. Reinstated the Python 3.1 - approach of using weakref proxies so that reference cycles never get created - in the first place. - -- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and - encode the value with filesystem encoding and surrogateescape (instead of - utf-8 in strict mode) . Patch written by David Watson. - -- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING - environment variable to set the filesystem encoding at Python startup. - sys.setfilesystemencoding() creates inconsistencies because it is unable to - reencode all filenames in all objects. - -- Issue #9410: Various optimizations to the pickle module, leading to speedups - up to 4x (depending on the benchmark). Mostly ported from Unladen Swallow; - initial patch by Alexandre Vassalotti. - -- The pprint module now supports printing OrderedDicts in their given order - (formerly, it would sort the keys). - -- Logging: Added QueueHandler class to facilitate logging usage with - multiprocessing. - -- Issue #9707: Rewritten reference implementation of threading.local which is - friendlier towards reference cycles. This change is not normally visible - since an optimized C implementation (_thread._local) is used instead. - -- Issue #6394: os.getppid() is now supported on Windows. Note that it will - still return the id of the parent process after it has exited. This process - id may even have been reused by another unrelated process. - -- Issue #9792: In case of connection failure, socket.create_connection() would - swallow the exception and raise a new one, making it impossible to fetch the - original errno, or to filter timeout errors. Now the original error is - re-raised. - -- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and - the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated - back after the system call. Original patch by Brian Brazil. - -- Updates to the random module: - - * Document which parts of the module are guaranteed to stay the same across - versions and which parts are subject to change. - - * Update the seed() method to use all of the bits in a string instead of just - the hash value. This makes better use of the seed value and assures the - seeding is platform independent. Issue #7889. - - * Improved the random()-->integer algorithm used in choice(), shuffle(), - sample(), randrange(), and randint(). Formerly, it used int(n*random()) - which has a slight bias whenever n is not a power of two. Issue #9025. - - * Improved documentation of arguments to randrange(). Issue #9379. - -- collections.OrderedDict now supports a new method for repositioning keys to - either end. - -- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test - cases now also have assertWarns and assertWarnsRegexp methods to check that a - given warning type was triggered by the code under test. - -- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of - their contents without duplicating them. The view is both readable and - writable. - -- Issue #7566: Implement os.path.sameopenfile for Windows. - -- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an - unsupported operation is attempted (for example, writing to a file open only - for reading). - -- hashlib has two new constant attributes: algorithms_guaranteed and - algorithms_avaiable that respectively list the names of hash algorithms - guaranteed to exist in all Python implementations and the names of hash - algorithms available in the current process. - -- A new package ``concurrent.futures`` as defined by PEP 3148. - -C-API ------ - -- Add PyErr_SyntaxLocationEx, which supports passing a column offset. - -- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or - PySequence_DelSlice when the object doesn't have any mapping operations - defined. - -Tools/Demos ------------ - -- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as - wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb) - and the interpreter under test. - -Tests ------ - -- Issue #9308: Added tests for importing encoded modules that do not - depend on specific stdlib modules being encoded in a certain way. - -- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom - certificate and private key files used by SSL-related certs. - -- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests - in test_os) - -- Issue #7110: regrtest now sends test failure reports and single-failure - tracebacks to stderr rather than stdout. - -- Issue #9628: fix runtests.sh -x option so more than one test can be excluded. - -- Issue #9899: Fix test_tkinter.test_font on various platforms. Patch by Ned - Deily. - -- Issue #9894: Do not hardcode ENOENT in test_subprocess. - -- Issue #9315: Added tests for the trace module. Patch by Eli Bendersky. - -- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the - case when running profile or trace, for example. - -- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. - -Build ------ - -- Issue #10062: Allow building on platforms which do not have sem_timedwait. - -- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by Akira - Kitada. - -- Issue #10055: Make json C89-compliant in UCS4 mode. - -- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows) - -- Issue #1633863: Don't ignore $CC under AIX. - -- Issue #9810: Compile bzip2 source files in Python's project file directly. It - used to be built with bzip2's makefile. - -- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in - module. - -- Issue #9806: python-config now has an ``--extension-suffix`` option that - outputs the suffix for dynamic libraries including the ABI version name - defined by PEP 3149. - -- Issue #941346: Improve the build process under AIX and allow Python to be - built as a shared library. Patch by S?bastien Sabl?. - -- Issue #4026: Make the fcntl extension build under AIX. Patch by S?bastien - Sabl?. - -- Issue #9701: The MacOSX installer can patch the shell profile to ensure that - the "bin" directory inside the framework is on the shell's search path. This - feature now also supports the ZSH shell. - - -What's New in Python 3.2 Alpha 2? -================================= - -*Release date: 05-Sep-2010* - -Core and Builtins ------------------ - -- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by - the new (and simpler) DUP_TOP_TWO. Performance isn't changed, but our - bytecode is a bit simplified. Patch by Demur Rumed. - -- Issue #9766: Rename poorly named variables exposed by _warnings to prevent - confusion with the proper variables names from 'warnings' itself. - -- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to - conform to the Set ABC. Patch by Daniel Urban. - -- Issue #9737: Fix a crash when trying to delete a slice or an item from a - memoryview object. - -- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are - now removed, since their effect was inexistent in 3.x (the default encoding is - hardcoded to utf-8 and cannot be changed). - -- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API - properly. Patch by Stefan Behnel. - -- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most - platforms. Previously, it inlined only when using Microsoft Visual C. - -- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. - -- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. - -- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match - the pyconfig.h generated by configure on other systems. - -- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that - occur during attribute lookup are now propagated to the caller. - -- Issue #8622: Add PYTHONFSENCODING environment variable to override the - filesystem encoding. - -- Issue #5127: The C functions that access the Unicode Database now accept and - return characters from the full Unicode range, even on narrow unicode builds - (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others). A visible difference - in Python is that unicodedata.numeric() now returns the correct value for - large code points, and repr() may consider more characters as printable. - -- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename - as a unicode object, instead of a byte string. Function needed to support - unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new - function. - -- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx(). - -- Issue #9612: The set object is now 64-bit clean under Windows. - -- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for - the module file to be executed with the -m command line option. - -- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to - write a message formatted by PyUnicode_FromFormatV() to sys.stdout and - sys.stderr. - -- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter: - decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str - objects are output as-is. - -- Issue #9203: Computed gotos are now enabled by default on supported compilers - (which are detected by the configure script). They can still be disable - selectively by specifying --without-computed-gotos. - -- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but - use PyUnicode_FromFormatV() to format the warning message. - -- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an - array. - -- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. - -- Issue #9337: The str() of a float or complex number is now identical to its - repr(). - -- Issue #9416: Fix some issues with complex formatting where the output with no - type specifier failed to match the str output: - - - format(complex(-0.0, 2.0), '-') omitted the real part from the output, - - format(complex(0.0, 2.0), '-') included a sign and parentheses. - -Extension Modules ------------------ - -- Issue #8013: time.asctime and time.ctime no longer call system - asctime and ctime functions. The year range for time.asctime is now - 1900 through maxint. The range for time.ctime is the same as for - time.localtime. The string produced by these functions is longer - than 24 characters when year is greater than 9999. - -- Issue #6608: time.asctime is now checking struct tm fields its input - before passing it to the system asctime. Patch by MunSic Jeong. - -- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file - descriptor is provided. Patch by Pascal Chambon. - -- Issue #7736: Release the GIL around calls to opendir() and closedir() in the - posix module. Patch by Marcin Bachry. - -- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the - socket module, and fix the width of socket descriptors to be correctly - detected under 64-bit Windows. - -- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo - and gethostbyaddr. getnameinfo is now restricted to numeric addresses as - input. - -- Issue #9214: Set operations on a KeysView or ItemsView in collections now - correctly return a set. Patch by Eli Bendersky. - -- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by - Matthew Ahrens. - -- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using - the surrogate error handler. - -- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other - than ``TypeError`` raised by the iterator argument. - -- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo. - -- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter - Lock around all system calls. Original patch by Ryan Kelly. - -- Issue #8524: Add a detach() method to socket objects, so as to put the socket - into the closed state without closing the underlying file descriptor. - -- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty. - -- Issue #6869: Fix a refcount problem in the _ctypes extension. - -- Issue #5504: ctypes should now work with systems where mmap can't be - PROT_WRITE and PROT_EXEC. - -- Issue #9507: Named tuple repr will now automatically display the right name in - a tuple subclass. - -- Issue #9324: Add parameter validation to signal.signal on Windows in order to - prevent crashes. - -- Issue #9526: Remove some outdated (int) casts that were preventing the array - module from working correctly with arrays of more than 2**31 elements. - -- Fix memory leak in ssl._ssl._test_decode_cert. - -- Issue #8065: Fix memory leak in readline module (from failure to free the - result of history_get_history_state()). - -- Issue #9450: Fix memory leak in readline.replace_history_item and - readline.remove_history_item for readline version >= 5.0. - -- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. - -- Issue #8046: Add context manager protocol support and .closed property to mmap - objects. - -Library -------- - -- Issue #7451: Improve decoding performance of JSON objects, and reduce the - memory consumption of said decoded objects when they use the same strings as - keys. - -- Issue #1100562: Fix deep-copying of objects derived from the list and dict - types. Patch by Michele Orr? and Bj?rn Lindqvist. - -- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows. - -- Issue #9421: Made the get methods consistently accept the vars and - default arguments on all parser classes. - -- Issue #7005: Fixed output of None values for RawConfigParser.write and - ConfigParser.write. - -- Issue #8990: array.fromstring() and array.tostring() get renamed to - frombytes() and tobytes(), respectively, to avoid confusion. Furthermore, - array.frombytes(), array.extend() as well as the array.array() constructor now - accept bytearray objects. Patch by Thomas Jollans. - -- Issue #808164: Fixed socket.close to avoid references to globals, to avoid - issues when socket.close is called from a __del__ method. - -- Issue #9706: ssl module provides a better error handling in various - circumstances. - -- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting - rid of the cached copy of thread-local attribute dictionary. - -- Issue #1512791: In setframerate() in the wave module, non-integral frame rates - are rounded to the nearest integer. - -- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of - falling into recursion. - -- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four - character years even if the message contains RFC822 two character years. - -- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive - operations on its self, namely x -= x and x ^= x. - -- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error - handling when accepting a new connection. - -- Issue #9601: ftplib now provides a workaround for non-compliant - implementations such as IIS shipped with Windows server 2003 returning invalid - response codes for MKD and PWD commands. - -- Issue #658749: asyncore's connect() method now correctly interprets winsock - errors. - -- Issue #9501: Fixed logging regressions in cleanup code. - -- Fix functools.total_ordering() to skip methods inherited from object. - -- Issue #9572: Importlib should not raise an exception if a directory it thought - it needed to create was done concurrently by another process. - -- Issue #9617: Signals received during a low-level write operation aren't - ignored by the buffered IO layer anymore. - -- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding. - -- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape - error handler, or strict error handler on Windows. - -- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and - ``gzip.decompress``. Original patch by Anand B. Pillai. - -- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a - ssl.SSLContext object allowing bundling SSL configuration options, - certificates and private keys into a single (potentially long-lived) - structure. - -- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as - single keyword arguments. - -- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py - compiler flag values over defining its own. - -- Issue #9147: Added dis.code_info() which is similar to show_code() but returns - formatted code information in a string rather than displaying on screen. - -- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute - pointing to the original callable. - -- Issue #3445: functools.update_wrapper now tolerates missing attributes on - wrapped callables. - -- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod. - -- Issue #9605: posix.getlogin() decodes the username with file filesystem - encoding and surrogateescape error handler. Patch written by David Watson. - -- Issue #9604: posix.initgroups() encodes the username using the fileystem - encoding and surrogateescape error handler. Patch written by David Watson. - -- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name - using the filesystem encoding and surrogateescape error handler. Patch written - by David Watson. - -- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants, - for use with the statvfs() function. Patch by Adam Jackson. - -- Issue #8688: MANIFEST files created by distutils now include a magic comment - indicating they are generated. Manually maintained MANIFESTs without this - marker will not be overwritten or removed. - -- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a - BadZipfile error is raised if it doesn't match (as used to be the case in - Python 2.5 and earlier). - -- Issue #9550: a BufferedReader could issue an additional read when the original - read request had been satisfied, which could block indefinitely when the - underlying raw IO channel was e.g. a socket. Report and original patch by - Jason V. Miller. - -- Issue #3757: thread-local objects now support cyclic garbage collection. - Thread-local objects involved in reference cycles will be deallocated timely - by the cyclic GC, even if the underlying thread is still running. - -- Issue #9452: Add read_file, read_string, and read_dict to the configparser - API; new source attribute to exceptions. - -- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current - node. - -- Issue #8047: Fix the xml.etree serializer to return bytes by default. Use - ``encoding="unicode"`` to generate a Unicode string. - -- Issue #8280: urllib2's Request method will remove fragments in the url. This - is how it is supposed to work, wget and curl do the same. Previous behavior - was wrong. - -- Issue #6683: For SMTP logins we now try all authentication methods advertised - by the server. Many servers are buggy and advertise authentication methods - they do not support in reality. - -- Issue #8814: function annotations (the ``__annotations__`` attribute) are now - included in the set of attributes copied by default by functools.wraps and - functools.update_wrapper. Patch by Terrence Cole. - -- Issue #2944: asyncore doesn't handle connection refused correctly. - -- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate - the private attributes. Add tests for smtpd module. - -- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word - encoded in base64 is lacking padding. - -- Issue #9444: Argparse now uses the first element of prefix_chars as the option - character for the added 'h/help' option if prefix_chars does not contain a - '-', instead of raising an error. - -- Issue #7372: Fix pstats regression when stripping paths from profile data - generated with the profile module. - -- Issue #9428: Fix running scripts with the profile/cProfile modules from the - command line. - -- Issue #7781: Fix restricting stats by entry counts in the pstats interactive - browser. - -- Issue #9209: Do not crash in the pstats interactive browser on invalid regular - expressions. - -- Update collections.OrderedDict to match the implementation in Py2.7 (based on - lists instead of weakly referenced Link objects). - -- Issue #8397: Raise an error when attempting to mix iteration and regular reads - on a BZ2File object, rather than returning incorrect results. - -- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when - re-initializing a buffered IO object by calling its ``__init__`` method. - -- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links - across devices. - -- Issue #8826: Properly load old-style "expires" attribute in http.cookies. - -- Issue #1690103: Fix initial namespace for code run with trace.main(). - -- Issue #7395: Fix tracebacks in pstats interactive browser. - -- Issue #8230: Fix Lib/test/sortperf.py. - -- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final - newline, it no longer truncates the last character of the last command line. - -- Issue #5146: Handle UID THREAD command correctly in imaplib. - -- Issue #5147: Fix the header generated for cookie files written by - http.cookiejar.MozillaCookieJar. - -- Issue #8198: In pydoc, output all help text to the correct stream when - sys.stdout is reassigned. - -- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` - in ntpath.normpath(). - -- Issue #1286: Allow using fileinput.FileInput as a context manager. - -- Add lru_cache() decorator to the functools module. - -Tools/Demos ------------ - -- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147. - -- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing - non-ASCII content. - -Tests ------ - -- Issue #9601: Provide a test case for ftplib.parse257. - -- Issue #8857: Provide a test case for socket.getaddrinfo. - -- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. - -- Issue #8433: Fix test_curses failure with newer versions of ncurses. - -- Issue #9496: Provide a test suite for the rlcompleter module. Patch by - Michele Orr?. - -- Issue #8687: provide a test suite for sched.py module. - -Build ------ - -- Issue #1303434: Generate ZIP file containing all PDBs. - -- Issue #9193: PEP 3149 is accepted. - -- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F() - become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively. - -- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by - S?bastien Sabl?. - -- Don't run pgen twice when using make -j. - - -What's New in Python 3.2 Alpha 1? -================================= - -*Release date: 01-Aug-2010* - -Core and Builtins ------------------ - -- Issue #8991: convertbuffer() rejects discontigious buffers. - -- Issue #7616: Fix copying of overlapping memoryview slices with the Intel - compiler. - -- Issue #8413: structsequence now subclasses tuple. - -- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the - start byte and the continuation byte(s) are now considered invalid, instead of - the number of bytes specified by the start byte. E.g.: - '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces - with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80') - even if '\xf1' is the start byte of a 4-bytes sequence. Previous versions - returned a single u'\ufffd'. - -- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0 - rather than 0.0. So "-7j" is now exactly equivalent to "-(7j)". - -- Be more specific in error messages about positional arguments. - -- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes - objects, as described in the documentation. - -- Issue #6543: Write the traceback in the terminal encoding instead of utf-8. - Fix the encoding of the modules filename. Patch written by Amaury Forgeot - d'Arc. - -- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code - dealing with unary minus applied to a constant. The removed code was mutating - the ST, causing a second compilation to fail. - -- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict - mode raises unicode errors. The encoder only supports "strict" and "replace" - error handlers, the decoder only supports "strict" and "ignore" error - handlers. Patch written by Mark Hammond. - -- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use - "w*" format instead. Add tests for "w*" format. - -- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z" - formats if the string contains a null byte/character. Write unit tests for - string formats. - -- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test - suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module - location of the raised exception. - -- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode - filenames and enable os.fsencode(). - -- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. - -- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the - interpreter with characters outside the Basic Multilingual Plane (higher than - 0x10000). - -- Issue #8950: (See also issue #5080). Py_ArgParse*() functions now raise - TypeError instead of giving a DeprecationWarning when a float is parsed using - the 'L' code (for long long). (All other integer codes already raise - TypeError in this case.) - -- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to - enable shortcuts for upper case encoding name. Add also a shortcut for - "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode(). - -- Issue #8838: Remove codecs.charbuffer_encode() function. The buffer protocol - doesn't support "char buffer" anymore in Python 3. - -- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*" - instead. codecs.charbuffer_encode() now accepts modifiable buffer objects - like bytearray. - -- Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no - used anymore and it was never documented. - -- In str.format(), raise a ValueError when indexes to arguments are too large. - -- Issue #2844: Make int('42', n) consistently raise ValueError for invalid - integers n (including n = -909). - -- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances - of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it - easy to maintain the invariant that hash(x) == hash(y) whenever x and y have - equal value. - -- Issue #8748: Fix two issues with comparisons between complex and integer - objects. (1) The comparison could incorrectly return True in some cases - (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality. - (2) The comparison raised an OverflowError for large integers, leading to - unpredictable exceptions when combining integers and complex objects in sets - or dicts. - -- Issue #8766: Initialize _warnings module before importing the first module. - Fix a crash if an empty directory called "encodings" exists in sys.path. - -- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system - encoding and surrogateescape error handler instead of the locale encoding to - be consistent with os.environ. Add PySys_AddWarnOptionUnicode() function. - -- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead - of strict) error handler to escape surrogates. - -- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode - object to Py_FileSystemDefaultEncoding with the "surrogateescape" error - handler, and return bytes. If Py_FileSystemDefaultEncoding is not set, fall - back to UTF-8. - -- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any - error handler, not only the default error handler (strict). - -- Issue #8610: Load file system codec at startup, and display a fatal error on - failure. Set the file system encoding to utf-8 (instead of None) if getting - the locale encoding failed, or if nl_langinfo(CODESET) function is missing. - -- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of - PyUnicode_FromString() to support surrogates in the filename and use the right - encoding. - -- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells. - -- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler. - -- Issue #8419: Prevent the dict constructor from accepting non-string keyword - arguments. - -- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute - indirectly Python signal handlers anymore because mywrite() ignores exceptions - (KeyboardInterrupt). - -- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing - unicode string (eg. backslashreplace). - -- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects - anymore, you have to convert your bytearray filenames to bytes. - -- Issue #7332: Remove the 16KB stack-based buffer in - PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit - compared to the dynamic memory allocation fallback. Patch by Charles-Fran?ois - Natali. - -- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is - passed to bytes or bytearray. - -- Issue #7301: Add environment variable $PYTHONWARNINGS. - -- Issue #8329: Don't return the same lists from select.select when no fds are - changed. - -- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on - 64-bit machines. The shift count for either left or right shift is permitted - to be up to sys.maxsize. - -- Ensure that tokenization of identifiers is not affected by locale. - -- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever. - -- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. - -- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it - is set. - -- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding - is unknown. - -- Issue #1583863: A str subclass can now override the __str__ method. - -- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with - PyMemberDefs could produce an internal error; raise TypeError instead. - -- Issue #7845: Rich comparison methods on the complex type now return - NotImplemented rather than raising a TypeError when comparing with an - incompatible type; this allows user-defined classes to implement their own - comparisons with complex. - -- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt - (SIGINT). If an error occurs while importing the site module, the error is - printed and Python exits. Initialize the GIL before importing the site module. - -- Issue #7173: Generator finalization could invalidate sys.exc_info(). - -- Issue #7544: Preallocate thread memory before creating the thread to avoid a - fatal error in low memory condition. - -- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM - check fails. - -- Handle errors from looking up __prepare__ correctly. - -- Issue #5939: Add additional runtime checking to ensure a valid capsule in - Modules/_ctypes/callproc.c. - -- Issue #7309: Fix unchecked attribute access when converting - UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings. - -- Issue #6902: Fix problem with built-in types format incorrectly with 0 - padding. - -- Issue #7988: Fix default alignment to be right aligned for complex.__format__. - Now it matches other numeric types. - -- Issue #5988: Remove deprecated functions PyOS_ascii_formatd, - PyOS_ascii_strtod, and PyOS_ascii_atof. Use PyOS_double_to_string and - PyOS_string_to_double instead. See issue #5835 for the original deprecations. - -- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` - fails. Patch by Florent Xicluna. - -- Issue #7788: Fix an interpreter crash produced by deleting a list slice with - very large step value. - -- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and - add the additional members returned in an OSVERSIONINFOEX structure. The new - members are service_pack_major, service_pack_minor, suite_mask, and - product_type. - -- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could - crash in many places because of the PyByteArray_AS_STRING() macro returning - NULL. The macro now returns a statically allocated empty string instead. - -- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`, - where the right hand operand is a set of constants, by turning the set into a - frozenset and pre-building it as a constant. The comparison operation is made - against the constant instead of building a new set each time it is executed (a - similar optimization already existed which turned a list of constants into a - pre-built tuple). Patch and additional tests by Dave Malcolm. - -- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods - of bytes, bytearray and unicode objects by using a common implementation based - on stringlib's fast search. Patch by Florent Xicluna. - -- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2, - including: (1) a serious 'wrong output' bug that could occur for long (> 40 - digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when - parsing certain long numeric strings corresponding to subnormal values, (3) a - memory leak for some values large enough to cause overflow, and (4) a number - of flaws that could lead to incorrectly rounded results. - -- The __complex__ method is now looked up on the class of instances to make it - consistent with other special methods. - -- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, - `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. - -- Issue #7604: Deleting an unset slotted attribute did not raise an - AttributeError. - -- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero) - in ** operator. The behaviour now conforms to that described in C99 Annex F. - -- Issue #1811: improve accuracy and cross-platform consistency for true division - of integers: the result of a/b is now correctly rounded for ints a and b (at - least on IEEE 754 platforms), and in particular does not depend on the - internal representation of an int. - -- Issue #6834: replace the implementation for the 'python' and 'pythonw' - executables on OSX. - - These executables now work properly with the arch(1) command: ``arch -ppc - python`` will start a universal binary version of python in PPC mode (unlike - previous releases). - -- Issue #7466: Segmentation fault when the garbage collector is called in the - middle of populating a tuple. Patch by Florent Xicluna. - -- Issue #7419: setlocale() could crash the interpreter on Windows when called - with invalid values. - -- Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+" - mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z). - -- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX - 10.6. - -- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding. - -- Issue #6970: Remove redundant calls when comparing objects that don't - implement the relevant rich comparison methods. - -- Issue #7298: Fixes for range and reversed(range(...)). Iteration over - range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C - long but the length of the range did not. Also fix several cases where - reversed(range(a, b, c)) gave wrong results, and fix a refleak for - reversed(range(a, b, c)) with large arguments. - -- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised - during the formation of an output tuple. - -- Issue #3297: On wide unicode builds, do not split unicode characters into - surrogates. - -- Remove length limitation when constructing a complex number from a string. - -- Issue #1087418: Boost performance of bitwise operations for longs. - -- Support for AtheOS has been completely removed from the code base. It was - disabled since Python 3.0. - -- Support for several legacy threading libraries has been disabled. These - libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code - will be entirely removed in 3.3. - -- Support for OSF* has been disabled. If nobody stands up, support will be - removed in 3.3. See . - -- Peephole constant folding had missed UNARY_POSITIVE. - -- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which - fixes the problem of some exceptions being thrown at shutdown when the - interpreter is killed. Patch by Adam Olsen. - -- Issue #7147: Remove support for compiling Python without complex number - support. - -- Issue #7120: logging: Removed import of multiprocessing which is causing crash - in GAE. - -- Issue #1754094: Improve the stack depth calculation in the compiler. There - should be no other effect than a small decrease in memory use. Patch by - Christopher Tur Lesniewski-Laas. - -- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using - byte values greater than 127. Patch by Derk Drukker. - -- Issue #1571184: The Unicode database contains properties for more characters. - The tables for code points representing numeric values, white spaces or line - breaks are now generated from the official Unicode Character Database files, - and include information from the Unihan.txt file. - -- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of - producing internally inconsistent Python longs. - -- Issue #6990: Fix threading.local subclasses leaving old state around after a - reference cycle GC which could be recycled by new locals. - -- Issue #5460: Fix an ambiguity in the grammar. - -- Issue #1766304: Improve performance of membership tests on range objects. - -- Issue #6713: Improve performance of integer -> string conversions. - -- Issue #6846: Fix bug where bytearray.pop() returns negative integers. - -- Issue #6750: A text file opened with io.open() could duplicate its output when - writing from multiple threads at the same time. - -- Issue #6707: dir() on an uninitialized module caused a crash. - -- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. - -- Issue #6573: set.union() stopped processing inputs if an instance of self - occurred in the argument chain. - -- Issue #6070: On posix platforms import no longer copies the execute bit from - the .py file to the .pyc file if it is set. - -- Issue #1616979: Added the cp720 (Arabic DOS) encoding. - -- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object, - and not an int. Fix the corresponding error message, and the documentation. - -- The deprecated PyCObject has been removed. - -- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h. This fixes a - build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead - of stdint.h on that platform. - -- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the - 'surrogateescape' error handler, a string which contains unpaired surrogates. - -- Issue #4856: Remove checks for win NT. - -- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument - to construct a null-initialized bytes object. - -- Issue #1023290: Add from_bytes() and to_bytes() methods to integers. These - methods allow the conversion of integers to bytes, and vice-versa. - -- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances - from being copied with copy.copy(), and bytes subclasses from being pickled - properly. - -- Code objects now support weak references. - -- Issue #7072: isspace(0xa0) is true on Mac OS X. - -- Issue #8084: PEP 370 now conforms to system conventions for framework builds - on MacOS X. That is, "python setup.py install --user" will install into - "~/Library/Python/2.7" instead of "~/.local". - -C-API ------ - -- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the - variable argument list. `Py_VA_COPY` is equivalent to C99 - `va_copy`, but available on all python platforms. - -- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX] - instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX]. This makes it safe to do - "step = -step" when reversing a slice. - -- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the - interpreter to set sys.argv without also modifying sys.path. This helps fix - `CVE-2008-5983 - `_. - -- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are - strings in an efficient manner. - -- Issue #8276: PyEval_CallObject() is now only available in macro form. The - function declaration, which was kept for backwards compatibility reasons, is - now removed (the macro was introduced in 1997!). - -- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to - PyLong_AsLongAndOverflow. - -- Make PyUnicode_CompareWithASCIIString return not equal if the Python string - has '\0' at the end. - -- Issue #5080: The argument parsing functions PyArg_ParseTuple, - PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and - PyArg_Parse now raise a DeprecationWarning for float arguments passed with the - 'L' format code. This will become a TypeError in a future version of Python, - to match the behaviour of the other integer format codes. - -- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added. - -- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in - PyArg_ParseTupleAndKeywords. - -- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and - PyErr_Format, on machines with HAVE_LONG_LONG defined. - -- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in - PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for - accessing the d_type and d_name members of structures using PyDescr_COMMON. - -- Issue #6405: Remove duplicate type declarations in descrobject.h. - -- The code flags for old __future__ features are now available again. - -- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of - PyCode_Addr2Line(). - -- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code - object at a specified file, function, and line number. - -- Issue #1419652: Change the first argument to PyImport_AppendInittab() to - ``const char *`` as the string is stored beyond the call. - -- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc - allocator will be automatically disabled when running under Valgrind. This - gives improved memory leak detection when running under Valgrind, while taking - advantage of pymalloc at other times. - -Library -------- - -- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the - old commands are restored. - -- For traceback debugging, the pdb listing now also shows the locations where - the exception was originally (re)raised, if it differs from the last line - executed (e.g. in case of finally clauses). - -- The pdb command "source" has been added. It displays the source code for a - given object, if possible. - -- The pdb command "longlist" has been added. It displays the whole source code - for the current function. - -- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error - output into methods. - -- Issue #809887: Make the output of pdb's breakpoint deletions more consistent; - emit a message when a breakpoint is enabled or disabled. - -- Issue #5294: Fix the behavior of pdb's "continue" command when called in the - top-level debugged frame. - -- Issue #5727: Restore the ability to use readline when calling into pdb in - doctests. - -- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the - source file to be debugged is in a non-builtin encoding. - -- Issue #8048: Prevent doctests from failing when sys.displayhook has been - reassigned. - -- Issue #8015: In pdb, do not crash when an empty line is entered as a - breakpoint command. - -- In pdb, allow giving a line number to the "until" command. - -- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc - files. Also, add a command-line option "-c" that runs a command as if given - in .pdbrc. - -- Issue #4179: In pdb, allow "list ." as a command to return to the currently - debugged line. - -- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *`` - entries, consider the first one. - -- Issue #6630: Allow customizing regex flags when subclassing the - string.Template class. - -- Issue #9411: Allow specifying an encoding for config files in the configparser - module. - -- Issue #1682942: Improvements to configparser: support alternate delimiters, - alternate comment prefixes and empty lines in values. - -- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. - -- Issue #8966: ctypes: Remove implicit bytes-unicode conversion. - -- Issue #9378: python -m pickle will now load and display the - first object in the pickle file. - -- Issue #4770: Restrict binascii module to accept only bytes (as specified). - And fix the email package to encode to ASCII instead of ``raw-unicode-escape`` - before ASCII-to-binary decoding. - -- Issue #9384: ``python -m tkinter`` will now display a simple demo applet. - -- The default size of the re module's compiled regular expression cache has been - increased from 100 to 500 and the cache replacement policy has changed from - simply clearing the entire cache on overflow to forgetting the least recently - used cached compiled regular expressions. This is a performance win for - applications that use a lot of regular expressions and limits the impact of - the performance hit anytime the cache is exceeded. - -- Issue #7113: Speed up loading in configparser. Patch by ?ukasz Langa. - -- Issue #9032: XML-RPC client retries the request on EPIPE error. The EPIPE - error occurs when the server closes the socket and the client sends a big - XML-RPC request. - -- Issue #4629: getopt raises an error if an argument ends with "=", whereas - getopt doesn't accept a value (eg. --help= is rejected if getopt uses - ['help='] long options). - -- Issue #7989: Added pure python implementation of the `datetime` module. The C - module is renamed to `_datetime` and if available, overrides all classes - defined in datetime with fast C impementation. Python implementation is based - on the original python prototype for the datetime module by Tim Peters with - minor modifications by the PyPy project. The test suite now tests `datetime` - module with and without `_datetime` acceleration using the same test cases. - -- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). - -- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the - script being traced. Patch by Eli Bendersky. - -- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for - the patch. - -- Issue #3704: http.cookiejar was not properly handling URLs with a / in the - parameters. - -- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument - which controls printing of opcode descriptions in ``dis()`` output. - -- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo - crosses an 8192 byte boundary. - -- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee. - -- ``ast.literal_eval()`` now allows byte literals. - -- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated - keyword arguments called 'self' or 'other' specially. - -- ``ast.literal_eval()`` now allows set literals. - -- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS. - -- Issue #7646: The fnmatch pattern cache no longer grows without bound. - -- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError - produced when profiling the decimal module. This was due to a dangerous - iteration over 'locals()' in Context.__init__. - -- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10 - and the exponent is tiny (for example, ``Decimal(10) ** - Decimal('1e-999999999')``). - -- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError. - -- Issue #9130: Fix validation of relative imports in parser module. - -- Issue #9128: Fix validation of class decorators in parser module. - -- Issue #9094: python -m pickletools will now disassemble pickle files listed in - the command line arguments. See output of python -m pickletools -h for more - details. - -- Issue #5468: urlencode to handle bytes type and other encodings in its query - parameter. Patch by Dan Mahn. - -- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, - ensure that the input string length is a multiple of the frame size. - -- Issue #6507: Accept source strings in dis.dis(). Original patch by Daniel - Urban. - -- Issue #7829: Clearly document that the dis module is exposing an - implementation detail that is not stable between Python VMs or releases. - -- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor - raises an exception. - -- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs - that act as both context managers and decorators. contextmanager changes to - use ContextDecorator. - -- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader - for removal in Python 3.4. - -- Issue #9064: pdb's "up" and "down" commands now accept an optional argument - giving the number of frames to go. - -- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not - ``str`` or ``bytes``. - -- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an - OpenSSL structure. - -- Issue #8682: The ssl module now temporary increments the reference count of a - socket object got through ``PyWeakref_GetObject``, so as to avoid possible - deallocation while the object is still being used. - -- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong - password instead of presenting an interactive prompt. Older behavior can be - obtained by passing retry=True to http_error_xxx methods of FancyURLOpener. - -- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile - smart enough to find source files in the linecache. - -- Issue #5610: feedparser no longer eats extra characters at the end of a body - part if the body part ends with a ``\r\n``. - -- Issue #8986: math.erfc was incorrectly raising OverflowError for values - between -27.3 and -30.0 on some platforms. - -- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows. - -- Issue #8966: If a ctypes structure field is an array of c_char, convert its - value to bytes instead of str (as done for c_char and c_char_p). - -- Issue #8188: Comparisons between Decimal and Fraction objects are now - permitted, returning a result based on the exact numerical values of the - operands. This builds on issue #2531, which allowed Decimal-to-float - comparisons; all comparisons involving numeric types (bool, int, float, - complex, Decimal, Fraction) should now act as expected. - -- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by - Thomas Jollans. - -- Issue #8899: time.struct_time now has class and attribute docstrings. - -- Issue #6470: Drop UNC prefix in FixTk. - -- Issue #4768: base64 encoded email body parts were incorrectly stored as binary - strings. They are now correctly converted to strings. - -- Issue #8833: tarfile created hard link entries with a size field != 0 by - mistake. - -- Charset.body_encode now correctly handles base64 encoding by encoding with the - output_charset before calling base64mime.encode. Passes the tests from 2.x - issue #1368247. - -- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction - attribute that is True iff there are uncommitted changes. - -- Issue #1289118: datetime.timedelta objects can now be multiplied by float and - divided by float and int objects. Results are rounded to the nearest multiple - of timedelta.resolution with ties resolved using round-half-to-even method. - -- Issue #7150: Raise OverflowError if the result of adding or subtracting - timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. - -- Issue #8806: add SSL contexts support to ftplib. - -- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer - and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes - API. - -- Issue #8770: Now sysconfig displays information when it's called as a script. - Initial idea by Sridhar Ratnakumar. - -- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by - Fredrik H??rd. - -- Issue #8540: Decimal module: rename the Context._clamp attribute to - Context.clamp and make it public. This is useful in creating contexts that - correspond to the decimal interchange formats specified in IEEE 754. - -- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM - twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and - StreamWriter classes. - -- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead - of the C file stderr, to use stderr encoding and error handler. - -- Issue #8782: Add a trailing newline in linecache.updatecache to the last line - of files without one. - -- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when - comparing to a non-mapping. - -- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the - correct encoding. - -- Issue #4870: Add an `options` attribute to SSL contexts, as well as several - ``OP_*`` constants to the `ssl` module. This allows to selectively disable - protocol versions, when used in combination with `PROTOCOL_SSLv23`. - -- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. - -- Issue #8663: distutils.log emulates backslashreplace error handler. Fix - compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if - stdout is not a TTY). - -- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value. - subprocess.Popen() and os._execvpe() support bytes program name. Add - os.supports_bytes_environ flag: True if the native OS type of the environment - is bytes (eg. False on Windows). - -- Issue #8633: tarfile is now able to read and write archives with "raw" binary - pax headers as described in POSIX.1-2008. - -- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes, - unquote, unquote_to_bytes. - -- Issue #8688: Distutils now recalculates MANIFEST everytime. - -- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with - surrogates and bytes for the filename. - -- Issue #8550: Add first class ``SSLContext`` objects to the ssl module. - -- Issue #8681: Make the zlib module's error messages more informative when the - zlib itself doesn't give any detailed explanation. - -- The audioop module now supports sound fragments of length greater than 2**31 - bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN. - -- Issue #4972: Add support for the context manager protocol to the ftplib.FTP - class. - -- Issue #8664: In py_compile, create __pycache__ when the compiled path is - given. - -- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes - for use in the file system, environment variables or the command line. - -- Issue #8571: Fix an internal error when compressing or decompressing a chunk - larger than 1GB with the zlib module's compressor and decompressor objects. - -- Issue #8603: Support bytes environmental variables on Unix: Add os.environb - mapping and os.getenvb() function. os.unsetenv() encodes str argument to the - file system encoding with the surrogateescape error handler (instead of - utf8/strict) and accepts bytes. posix.environ keys and values are now bytes. - -- Issue #8573: asyncore _strerror() function might throw ValueError. - -- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error - messages when accessing undefined class attributes because of the cheap - inheritance with the underlying socket object. The cheap inheritance has been - deprecated. - -- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. - Patch by Tres Seaver. - -- Issue #8390: tarfile uses surrogateescape as the default error handler - (instead of replace in read mode or strict in write mode). - -- Issue #7755: Use an unencumbered audio file for tests. - -- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent - and any children created using ``os.fork`` on MacOS X 10.6. - -- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal - operation raises multiple signals and more than one of those signals is - trapped, the specification determines the order in which the signals should be - handled. In many cases this order wasn't being followed, leading to the wrong - Python exception being raised. - -- Issue #7865: The close() method of ``io`` objects should not swallow - exceptions raised by the implicit flush(). Also qensure that calling close() - several times is supported. Patch by Pascal Chambon. - -- Issue #4687: Fix accuracy of garbage collection runtimes displayed with - gc.DEBUG_STATS. - -- Issue #8354: The siginterrupt setting is now preserved for all signals, not - just SIGCHLD. - -- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does - webbrowser.get("safari"). - -- Issue #8464: tarfile no longer creates files with execute permissions set when - mode="w|" is used. - -- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of - the Linux kernel. Patch by Yaniv Aknin. - -- Issue #8295: Added shutil.unpack_archive. - -- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. - It should correctly return an empty response now. - -- Issue #8546: Reject None given as the buffering argument to _pyio.open. - -- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by - Sridhar Ratnakumar. - -- Issue #6656: fix locale.format_string to handle escaped percents - and mappings. - -- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where - the method could block indefinitely if called just before the event loop - started running. This also fixes the occasional freezes witnessed in - test_httpservers. - -- Issue #8524: When creating an SSL socket, the timeout value of the original - socket wasn't retained (instead, a socket with a positive timeout would be - turned into a non-blocking SSL socket). - -- Issue #5103: SSL handshake would ignore the socket timeout and block - indefinitely if the other end didn't respond. - -- The do_handshake() method of SSL objects now adjusts the blocking mode of the - SSL structure if necessary (as other methods already do). - -- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and - bytes strings for environment keys and values. - -- Issue #8467: Pure Python implementation of subprocess encodes the error - message using surrogatepass error handler to support surrogates in the - message. - -- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames. - -- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the - string "python" as the *ident*. openlog() arguments are all optional and - keywords. - -- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a - non-infinite timeout. Also make that method friendlier with applications - wanting to continue using the socket in clear-text mode, by disabling - OpenSSL's internal readahead. Thanks to Darryl Miles for guidance. - -- Issue #8496: make mailcap.lookup() always return a list, rather than an - iterator. Patch by Gregory Nofi. - -- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the - collation name contains a surrogate character. - -- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl - extension, such that verification of some SSL certificates doesn't fail - because of an "unknown algorithm". - -- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree. - -- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree. - -- Issue #4814: timeout parameter is now applied also for connections resulting - from PORT/EPRT commands. - -- Issue #8463: added missing reference to bztar in shutil's documentation. - -- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as - long as the user didn't specify 'automatic proxy configuration'). - -- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code - as stated in RFC-959 at chapter 5.4. - -- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with - surrogates. - -- Issue #850728: Add a *timeout* parameter to the `acquire()` method of - `threading.Semaphore` objects. Original patch by Torsten Landschoff. - -- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the - available cipher list. Helps fix test_ssl with OpenSSL 1.0.0. - -- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for - the current working directory. - -- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII - using backslashreplace error handler. - -- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. - -- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony - Locke and Hans Ulrich Niedermann. - -- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. - -- Issue #7316: The acquire() method of lock objects in the ``threading`` - module now takes an optional timeout argument in seconds. Timeout support - relies on the system threading library, so as to avoid a semi-busy wait loop. - -- Issue #8383: pickle and pickletools use surrogatepass error handler when - encoding unicode as utf8 to support lone surrogates and stay compatible with - Python 2.x and 3.x. - -- Issue #7585: difflib context and unified diffs now place a tab between - filename and date, conforming to the 'standards' they were originally designed - to follow. This improves compatibility with patch tools. - -- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 - character sets will now consistently use a Content-Transfer-Encoding of 7bit - rather than sometimes being marked as 8bit. - -- Issue #8375: test_distutils now checks if the temporary directory are still - present before it cleans them. - -- Issue #8374: Update the internal alias table in the ``locale`` module to - cover recent locale changes and additions. - -- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module, - using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and - `ssl.OPENSSL_VERSION_NUMBER`. - -- Add functools.total_ordering() and functools.cmp_to_key(). - -- Issue #8257: The Decimal construct now accepts a float instance directly, - converting that float to a Decimal of equal value: - - >>> Decimal(1.1) - Decimal('1.100000000000000088817841970012523233890533447265625') - -- Issue #8294: The Fraction constructor now accepts Decimal and float instances - directly. - -- Issue #7279: Comparisons involving a Decimal signaling NaN now signal - InvalidOperation instead of returning False. (Comparisons involving a quiet - NaN are unchanged.) Also, Decimal quiet NaNs are now hashable; Decimal - signaling NaNs remain unhashable. - -- Issue #2531: Comparison operations between floats and Decimal instances now - return a result based on the numeric values of the operands; previously they - returned an arbitrary result based on the relative ordering of id(float) and - id(Decimal). See also issue #8188, which adds Decimal-to-Fraction - comparisons. - -- Added a subtract() method to collections.Counter(). - -- Issue #8233: When run as a script, py_compile.py optionally takes a single - argument `-` which tells it to read files to compile from stdin. Each line is - read on demand and the named file is compiled immediately. (Original patch by - Piotr O?arowski). - -- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and - form feed (0x0C) are now considered linebreaks, as specified in Unicode - Standard Annex #14. See issue #7643. http://www.unicode.org/reports/tr14/ - -- Comparisons using one of <, <=, >, >= between a complex instance and a - Fractions instance now raise TypeError instead of returning True/False. This - makes Fraction <=> complex comparisons consistent with int <=> complex, float - <=> complex, and complex <=> complex comparisons. - -- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some - methods (such as oss_mixer_device.fileno()) were not available. Initial patch - by Bertrand Janin. - -- Issue #8205: Remove the "Modules" directory from sys.path when Python is - running from the build directory (POSIX only). - -- Issue #7512: shutil.copystat() could raise an OSError when the filesystem - didn't support chflags() (for example ZFS under FreeBSD). The error is now - silenced. - -- Issue #7860: platform.uname now reports the correct 'machine' type when Python - is running in WOW64 mode on 64 bit Windows. - -- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets. - Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking - reads and writes are always retried by OpenSSL itself. - -- Issue #4282: Fix the main function of the profile module for a non-ASCII - script, open the file in binary mode and not in text mode with the default - (utf8) encoding. - -- Issue #8179: Fix macpath.realpath() on a non-existing path. - -- Issue #8024: Update the Unicode database to 5.2. - -- Issue #8168: py_compile now handles files with utf-8 BOMS. - -- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is - detected. - -- Issue #6716/2: Backslash-replace error output in compilall. - -- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox - with Tcl/Tk-8.5. - -- Issue #8140: extend compileall to compile single files. Add -i option. - -- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the - locale. - -- The internals of the subprocess module on POSIX systems have been replaced by - an extension module (_posixsubprocess) so that the fork()+exec() can be done - safely without the possibility of deadlock in multithreaded applications. - -- subprocess.Popen now has restore_signals and start_new_session features. The - default of restore_signals=True is a new behavior compared to earlier Python - versions. This means that signals such as SIGPIPE are not ignored by default - in subprocesses launched by Python (Issue #1652). - -- Issue #6472: The xml.etree package is updated to ElementTree 1.3. The - cElementTree module is updated too. - -- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to - an non existent program name and Python is unable to retrieve the real program - name. - -- Issue #7880: Fix sysconfig when the python executable is a symbolic link. - -- Issue #6509: fix re.sub to work properly when the pattern, the string, and the - replacement were all bytes. Patch by Antoine Pitrou. - -- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure - bugs and allows loading SQLite extensions from shared libraries. - -- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public - Review Issue #29 (http://unicode.org/review/pr-29.html). - -- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, - reset also the pointer to the current pointer context. - -- Issue #7232: Add support for the context manager protocol to the TarFile - class. - -- Issue #7250: Fix info leak of os.environ across multi-run uses of - wsgiref.handlers.CGIHandler. - -- Issue #1729305: Fix doctest to handle encode error with "backslashreplace". - -- Issue #691291: codecs.open() should not convert end of lines on reading and - writing. - -- Issue #7869: logging: improved diagnostic for format-time errors. - -- Issue #7868: logging: added loggerClass attribute to Manager. - -- logging: Implemented PEP 391. - -- Issue #1537721: Add a writeheader() method to csv.DictWriter. - -- Issue #7959: ctypes callback functions are now registered correctly with the - cycle garbage collector. - -- Issue #5801: removed spurious empty lines in wsgiref. - -- Issue #6666: fix bug in trace.py that applied the list of directories to be - ignored only to the first file. Noted by Bogdan Opanchuk. - -- Issue #7597: curses.use_env() can now be called before initscr(). Noted by - Kan-Ru Chen. - -- Issue #7310: fix the __repr__ of os.environ to show the environment variables. - -- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822 - messages parsed by email.Parser.HeaderParser. - -- Issue #7361: Importlib was not properly checking the number of bytes in - bytecode file when it was less then 8 bytes. - -- Issue #7633: In the decimal module, Context class methods (with the exception - of canonical and is_canonical) now accept instances of int and long wherever a - Decimal instance is accepted, and implicitly convert that argument to Decimal. - Previously only some arguments were converted. - -- Issue #7835: shelve should no longer produce mysterious warnings during - interpreter shutdown. - -- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML - processing instructions and comments. These raw characters are allowed by the - XML specification, and are necessary when outputting e.g. PHP code in a - processing instruction. Patch by Neil Muller. - -- Issue #6233: ElementTree failed converting unicode characters to XML entities - when they could't be represented in the requested output encoding. Patch by - Jerry Chen. - -- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the - compression type. - -- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is - specified, rather than fall through to AF_PACKET (in the `socket` module). - Also, raise ValueError rather than TypeError when an unknown TIPC address type - is specified. Patch by Brian Curtin. - -- Issue #6939: Fix file I/O objects in the `io` module to keep the original file - position when calling `truncate()`. It would previously change the file - position to the given argument, which goes against the tradition of - ftruncate() and other truncation APIs. Patch by Pascal Chambon. - -- Issue #7610: Reworked implementation of the internal - ``zipfile.ZipExtFile`` class used to represent files stored inside an - archive. The new implementation is significantly faster and can be wrapped in - a ``io.BufferedReader`` object for more speedups. It also solves an - issue where interleaved calls to `read()` and `readline()` give wrong results. - Patch by Nir Aides. - -- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, - allowing for a maximum number of tasks within the pool to be completed by the - worker before that worker is terminated, and a new one created to replace it. - -- Issue #7792: Registering non-classes to ABCs raised an obscure error. - -- Issue #7785: Don't accept bytes in FileIO.write(). - -- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. - -- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when - the release file is empty. - -- Issue #7561: Fix crashes when using bytearray objects with the posix - module. - -- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in - multipart/signed MIME parts, which fixes one of the sources of invalid - modifications to such parts by Generator. - -- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`. Patch - by Florent Xicluna, along with some additional tests. - -- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte - argument. Patch by Victor Stinner. - -- Issue #3299: Fix possible crash in the _sre module when given bad argument - values in debug mode. Patch by Victor Stinner. - -- Issue #2846: Add support for gzip.GzipFile reading zero-padded files. Patch - by Brian Curtin. - -- Issue #7681: Use floor division in appropiate places in the wave module. - -- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since - Extension extra options may change the output without changing the .c - file). Initial patch by Collin Winter. - -- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc - when it has a fully qualified configuration prefix. Initial patch by Arfrever. - -- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the - destruction of weakref'ed objects while iterating. - -- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor - Stinner. - -- Issue #1628205: Socket file objects returned by socket.socket.makefile() now - properly handles EINTR within the read, readline, write & flush methods. The - socket.sendall() method now properly handles interrupted system calls. - -- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and - make it implement the `io.BufferedIOBase` ABC to allow for further speedups by - wrapping it in an `io.BufferedReader`. Patch by Nir Aides. - -- Issue #3972: http.client.HTTPConnection now accepts an optional source_address - parameter to allow specifying where your connections come from. - -- socket.create_connection now accepts an optional source_address parameter. - -- Issue #5511: now zipfile.ZipFile can be used as a context manager. Initial - patch by Brian Curtin. - -- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML - Manifest file in text mode so string patterns can be used in regular - expressions. - -- Issue #7552: Removed line feed in the base64 Authorization header in the - Distutils upload command to avoid an error when PyPI reads it. This occurs on - long passwords. Initial patch by JP St. Pierre. - -- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by - Tatsuhiro Tsujikawa. - -- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a - TypeError when given an `str` object (rather than a `bytes`-like object). - Patch by Victor Stinner and Florent Xicluna. - -- Issue #7349: Make methods of file objects in the io module accept None as an - argument where file-like objects (ie StringIO and BytesIO) accept them to mean - the same as passing no argument. - -- Issue #7357: tarfile no longer suppresses fatal extraction errors by default. - -- Issue #5949: added check for correct lineends in input from IMAP server in - imaplib. - -- Add count() and reverse() methods to collections.deque(). - -- Fix variations of extending deques: d.extend(d) d.extendleft(d) d+=d - -- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong - parameter types. Patch by Victor Stinner. - -- Issue #7457: added a read_pkg_file method to - distutils.dist.DistributionMetadata. - -- logging: Added optional `secure` parameter to SMTPHandler, to enable use of - TLS with authentication credentials. - -- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated - in Distutils. Patch by Stephen Emslie. - -- Issue #4120: Drop reference to CRT from manifest when building extensions with - msvc9compiler. - -- Issue #7333: The `posix` module gains an `initgroups()` function providing - access to the initgroups(3) C library call on Unix systems which implement it. - Patch by Jean-Paul Calderone. - -- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group - ownership when the group is not forced, because the group may be different - from the user's group and inherit from its container when the test is run. - -- Issue #4486: When an exception has an explicit cause, do not print its - implicit context too. This affects the `traceback` module as well as built-in - exception printing. - -- Issue #1515: Enable use of deepcopy() with instance methods. Patch by Robert - Collins. - -- Issue #7403: logging: Fixed possible race condition in lock creation. - -- Issue #6845: Add restart support for binary upload in ftplib. The - `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` - argument. Patch by Pablo Mouzo. - -- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method - returning the total number of seconds in the duration. Patch by Brian - Quinlan. - -- Issue #7133: SSL objects now support the new buffer API. - -- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters. - -- Issue #6123: tarfile now opens empty archives correctly and consistently - raises ReadError on empty files. - -- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2. - -- Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead - of __str__. - -- Issue #7341: Close the internal file object in the TarFile constructor in case - of an error. - -- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh - Windows box. Help provided by David Bolen. - -- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS - or SSL. Patch by Giampaolo Rodola'. - -- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch. - -- Issue #4969: The mimetypes module now reads the MIME database from the - registry under Windows. Patch by Gabriel Genellina. - -- Issue #6816: runpy now provides a run_path function that allows Python code to - execute file paths that refer to source or compiled Python files as well as - zipfiles, directories and other valid sys.path entries that contain a - __main__.py file. This allows applications that run other Python scripts to - support the same flexibility as the CPython command line itself. - -- Issue #7318: multiprocessing now uses a timeout when it fails to establish a - connection with another process, rather than looping endlessly. The default - timeout is 20 seconds, which should be amply sufficient for local connections. - -- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and - unpickled. This fixes crashes under Windows when trying to run - test_multiprocessing in verbose mode. - -- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass`` - argument added to the TextTestRunner constructor allowing a different result - class to be used without having to subclass. - -- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test - name in failure reports even if the test has a docstring. - -- Issue #3001: Add a C implementation of recursive locks which is used by - default when instantiating a `threading.RLock` object. This makes recursive - locks as fast as regular non-recursive locks (previously, they were slower by - 10x to 15x). - -- Issue #7282: Fix a memory leak when an RLock was used in a thread other than - those started through `threading.Thread` (for example, using - `_thread.start_new_thread()`). - -- Issue #7187: Importlib would not silence the IOError raised when trying to - write new bytecode when it was made read-only. - -- Issue #7264: Fix a possible deadlock when deallocating thread-local objects - which are part of a reference cycle. - -- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent - objects on 64-bit systems. Patch by Michael Broghton. - -- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a - modification is done through it. This fixes inconsistencies and test failures - on systems with slightly bogus mtime behaviour. - -- Issue #7246 & Issue #7208: getpass now properly flushes input before reading - from stdin so that existing input does not confuse it and lead to incorrect - entry or an IOError. It also properly flushes it afterwards to avoid the - terminal echoing the input afterwards on OSes such as Solaris. - -- Issue #7233: Fix a number of two-argument Decimal methods to make sure that - they accept an int or long as the second argument. Also fix buggy handling of - large arguments (those with coefficient longer than the current precision) in - shift and rotate. - -- Issue #4750: Store the basename of the original filename in the gzip FNAME - header as required by RFC 1952. - -- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in - Distutils. - -- Issue #7218: Fix test_site for win32, the directory comparison was done with - an uppercase. - -- Issue #7205: Fix a possible deadlock when using a BZ2File object from - several threads at once. - -- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424. - -- Issue #7099: Decimal.is_normal now returns True for numbers with exponent - larger than emax. - -- Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows - platforms, and assorted locale fixes by Derk Drukker. - -- Issue #5833: Fix extra space character in readline completion with the GNU - readline library version 6.0. - -- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment. - -- Issue #7086: Added TCP support to SysLogHandler, and tidied up some - anachronisms in the code which were a relic of 1.5.2 compatibility. - -- Issue #7082: When falling back to the MIME 'name' parameter, the correct place - to look for it is the Content-Type header. - -- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the - builtin tokenizer. - -- Issue #7048: Force Decimal.logb to round its result when that result is too - large to fit in the current precision. - -- Issue #6236, #6348: Fix various failures in the I/O library under AIX and - other platforms, when using a non-gcc compiler. Patch by Derk Drukker. - -- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now - always result in NULL. - -- Issue #5042: Structure sub-subclass does now initialize correctly with base - class positional arguments. - -- Issue #6882: Import uuid creates zombies processes. - -- Issue #6635: Fix profiler printing usage message. - -- Issue #6856: Add a filter keyword argument to TarFile.add(). - -- Issue #6888: pdb's alias command was broken when no arguments were given. - -- Issue #6857: Default format() alignment should be '>' for Decimal instances. - -- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning - NaN or raising InvalidContext. Also, fix infinite recursion in - long(Decimal('nan')). - -- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no - type specifier. - -- Issue #6239: ctypes.c_char_p return value must return bytes. - -- Issue #6838: Use a list to accumulate the value instead of repeatedly - concatenating strings in http.client's HTTPResponse._read_chunked providing a - significant speed increase when downloading large files servend with a - Transfer-Encoding of 'chunked'. - -- Trying to import a submodule from a module that is not a package, ImportError - should be raised, not AttributeError. - -- When the globals past to importlib.__import__() has __package__ set to None, - fall back to computing what __package__ should be instead of giving up. - -- Raise a TypeError when the name of a module to be imported for - importlib.__import__ is not a string (was raising an AttributeError before). - -- Allow the fromlist passed into importlib.__import__ to be any iterable. - -- Have importlib raise ImportError if None is found in sys.modules. - -- Issue #6054: Do not normalize stored pathnames in tarfile. - -- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN - payloads are now ordered by integer value rather than lexicographically. - -- Issue #1356969: Add missing info methods in tix.HList. - -- Issue #1522587: New constants and methods for the tix.Grid widget. - -- Issue #1250469: Fix the return value of tix.PanedWindow.panes. - -- Issue #1119673: Do not override tkinter.Text methods when creating a - ScrolledText. - -- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. - -- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview* - and yview* methods. - -- Issue #6629: Fix a data corruption issue in the new I/O library, which could - occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or - "wb+" mode) after having buffered a certain amount of data for reading. This - bug was not present in the pure Python implementation. - -- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in - POP3.apop. - -- Issue #2715: Remove remnants of Carbon.File from binhex module. - -- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal - digits in input, as recommended by the standard. Previously it was restricted - to accepting [0-9]. - -- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT - DO/DONT correctly. - -- Issue #1424152: Fix for http.client, urllib.request to support SSL while - working through proxy. Original patch by Christopher Li, changes made by - Senthil Kumaran. - -- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for - loaders that allow for modules to be executed. Both importlib.abc.PyLoader and - PyPycLoader inherit from this class and provide implementations in relation to - other methods required by the ABCs. - -- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like - the documentation said it did even though the code in PyLoader relied on the - abstract method required by ResourceLoader. - -- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how - to handle a comparison without loss of precision. Also add correct handling - of infinities and nans for comparisons with float. - -- Issue #6415: Fixed warnings.warn segfault on bad formatted string. - -- Issue #6358: The exit status of a command started with os.popen() was reported - differently than it did with python 2.x. - -- Issue #6323: The pdb debugger did not exit when running a script with a syntax - error. - -- Issue #3392: The subprocess communicate() method no longer fails in select() - when file descriptors are large; communicate() now uses poll() when possible. - -- Issue #6369: Fix an RLE decompression bug in the binhex module. - -- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. - -- The deprecated function string.maketrans has been removed. - -- Issue #4005: Fixed a crash of pydoc when there was a zip file present in - sys.path. - -- Issue #6218: io.StringIO and io.BytesIO instances are now picklable. - -- The os.get_exec_path() function to return the list of directories that will be - searched for an executable when launching a subprocess was added. - -- Issue #7481: When a threading.Thread failed to start it would leave the - instance stuck in initial state and present in threading.enumerate(). - -- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid - and os.read system calls where appropriate. - -- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t. - -- Issue #6247: The argparse module has been added to the standard library. - -- Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is a socket - option available on FreeBSD 7.1 and newer. - -- Issue #9315: Fix for the trace module to record correct class name - for tracing methods. - -Extension Modules ------------------ - -- Issue #9959: Tweak formula used for computing math.log of an integer, - making it marginally more accurate for exact powers of 2. - -- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. - -- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly - compared to other unix systems. In particular, os.getgroups() does not reflect - any changes made using os.setgroups() but basicly always returns the same - information as the id command. os.getgroups() can now return more than 16 - groups on MacOSX. - -- Issue #6095: Make directory argument to os.listdir optional. - -- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g., - struct.pack('>?')): if conversion to bool raised an exception then that - exception wasn't properly propagated on machines where char is unsigned. - -- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when - they contain instances of old-style classes. - -- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany - existing isinf and isnan functions. - -- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason - R. Coombs. - -- In struct.pack, correctly propogate exceptions from computing the truth of an - object in the '?' format. - -- Issue #9000: datetime.timezone objects now have eval-friendly repr. - -- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as - special methods. - -- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000. - Prior to this change, timezone adjustment in utctimetuple() could produce - tm_year value of 0 or 10,000. Now an OverflowError is raised in these edge - cases. - -- Issue #6641: The ``datetime.strptime`` method now supports the ``%z`` - directive. When the ``%z`` directive is present in the format string, an - aware ``datetime`` object is returned with ``tzinfo`` bound to a - ``datetime.timezone`` instance constructed from the parsed offset. If both - ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone - name, but ``%Z`` data without ``%z`` is discarded. - -- Issue #5094: The ``datetime`` module now has a simple concrete class - implementing ``datetime.tzinfo`` interface. Instances of the new class, - ``datetime.timezone``, return fixed name and UTC offset from their - ``tzname(dt)`` and ``utcoffset(dt)`` methods. The ``dst(dt)`` method always - returns ``None``. A class attribute, ``utc`` contains an instance - representing the UTC timezone. Original patch by Rafe Kaplan. - -- Issue #8973: Add __all__ to struct module; this ensures that help(struct) - includes documentation for the struct.Struct class. - -- Issue #3129: Trailing digits in struct format string are no longer ignored. - For example, "1" or "ilib123" are now invalid formats and cause - ``struct.error`` to be raised. Patch by Caleb Deveraux. - -- Issue #7384: If the system readline library is linked against ncurses, the - curses module must be linked against ncurses as well. Otherwise it is not safe - to load both the readline and curses modules in an application. - -- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA, - requiring a re-try in order to get the complete result. - -- Issue #8692: Optimize math.factorial: replace the previous naive algorithm - with an improved 'binary-split' algorithm that uses fewer multiplications and - allows many of the multiplications to be performed using plain C integer - arithmetic instead of PyLong arithmetic. Also uses a lookup table for small - arguments. - -- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing - overflow checks in the audioop module. - -- Issue #8644: The accuracy of td.total_seconds() has been improved (by - calculating with integer arithmetic instead of float arithmetic internally): - the result is now always correctly rounded, and is equivalent to ``td / - timedelta(seconds=1)``. - -- Issue #2706: Allow division of a timedelta by another timedelta: timedelta / - timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta, - timedelta) are all supported. - -- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. - -- Issue #8300: When passing a non-integer argument to struct.pack with any - integer format code, struct.pack first attempts to convert the non-integer - using its __index__ method. If that method is non-existent or raises - TypeError it goes on to try the __int__ method, as described below. - -- Issue #8142: Update libffi to the 3.0.9 release. - -- Issue #6949: Allow the _dbm extension to be built with db 4.8.x. - -- Issue #6544: Fix a reference leak in the kqueue implementation's error - handling. - -- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as - msvcr100.dll is not a platform assembly anymore. - -- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. - -- Issue #7078: Set struct.__doc__ from _struct.__doc__. - -- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module. - -- Issue #6877: It is now possible to link the readline extension to the libedit - readline emulation on OSX 10.5 or later. - -- Issue #6848: Fix curses module build failure on OS X 10.6. - -- Fix a segfault that could be triggered by expat with specially formed input. - -- Issue #6561: '\d' in a regex now matches only characters with Unicode category - 'Nd' (Number, Decimal Digit). Previously it also matched characters with - category 'No'. - -- Issue #4509: Array objects are no longer modified after an operation failing - due to the resize restriction in-place when the object has exported buffers. - -- Issue #2389: Array objects are now pickled in a portable manner. - -- Expat: Fix DoS via XML document with malformed UTF-8 sequences - (CVE_2009_3560). - -- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread - could raise an incorrect RuntimeError about not holding the import lock. The - import lock is now reinitialized after fork. - -- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 - parameter on some platforms such as OS X. - -- Build the ossaudio extension on GNU/kFreeBSD. - -- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in - the return value of QueryReflectionKey. - -- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice. - -Build ------ - -- Use OpenSSL 1.0.0a on Windows. - -- Issue #9280: Make sharedinstall depend on sharedmods. - -- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting - override the configure and makefile defaults, without deleting options the - user didn't intend to override. Developers should no longer need to specify - OPT or EXTRA_CFLAGS, although those variables are still present for - backward-compatibility. - -- Issue #8854: Fix finding Visual Studio 2008 on Windows x64. - -- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for - multiprocessing only. - -- Issue #8625: Turn off optimization in --with-pydebug builds with gcc. - (Optimization was unintentionally turned on in gcc --with-pydebug builds as a - result of the issue #1628484 fix, combined with autoconf's strange choice of - default CFLAGS produced by AC_PROG_CC for gcc.) - -- Issue #3646: It is now easily possible to install a Python framework into your - home directory on MacOSX, see Mac/README for more information. - -- Issue #3928: os.mknod() now available in Solaris, also. - -- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not - give false warnings. - -- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable - anymore. It also forwards the LDFLAGS settings to the linker when building a - shared library. - -- Issue #6716: Quote -x arguments of compileall in MSI installer. Exclude 2to3 - tests from compileall. - -- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. - -- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private - memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free - instead. Also disable caching of powers of 5. - -- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built. - -- Issue #6943: Use pkg-config to find the libffi headers when the - --with-system-ffi flag is used. - -- Issue #7609: Add a --with-system-expat option that causes the system's expat - library to be used for the pyexpat module instead of the one included with - Python. - -- Issue #7589: Only build the nis module when the correct header files are - found. - -- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. - -- Issue #5792: Extend the short float repr support to x86 systems using - icc or suncc. - -- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles - correctly under gcc on x86-64. This fixes a reported problem with the - --with-tsc build on x86-64. - -- Issue #6802: Fix build issues on MacOSX 10.6. - -- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6. - -- Issue #4601: 'make install' did not set the appropriate permissions on - directories. - -- Issue #5390: Add uninstall icon independent of whether file extensions are - installed. - -- Issue #7541: When using ``python-config`` with a framework install the - compiler might use the wrong library. - -- python-config now supports multiple options on the same command line. - -- Issue #8509: Fix quoting in help strings and code snippets in configure.in. - -- Issue #8510: Update to autoconf2.65. - -Documentation -------------- - -- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses - to Doc/license.rst. - -- Issue #9524: Document that two CTRL* signals are meant for use only - with os.kill. - -- Issue #9255: Document that the 'test' package is meant for internal Python use - only. - -- A small WSGI server was added as Tools/scripts/serve.py, and is used to - implement a local documentation server via 'make serve' in the doc directory. - -- Updating `Using Python` documentation to include description of CPython's -J - and -X options. - -- Document that importing a module that has None in sys.modules triggers an - ImportError. - -- Issue #6556: Fixed the Distutils configuration files location explanation for - Windows. - -- Update python manual page (options -B, -O0, -s, environment variables - PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). - -- Issue #8909: Added the size of the bitmap used in the installer created by - distutils' bdist_wininst. Patch by Anatoly Techtonik. - -Tests ------ - -- Issue #9251: test_threaded_import didn't fail when run through regrtest if the - import lock was disabled. - -- Issue #8605: Skip test_gdb if Python is compiled with optimizations. - -- Issue #7449: Skip test_socketserver if threading support is disabled. - -- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled - by a decompressor object without errors (it returns incomplete uncompressed - data). - -- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid - UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding). - -- Issue #8576: Remove use of find_unused_port() in test_smtplib and - test_multiprocessing. Patch by Paul Moore. - -- Issue #7449: Fix many tests to support Python compiled without thread - support. Patches written by Jerry Seutter. - -- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of - SSL shutdowns. - -- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written - by Dave Malcolm. - -- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any - thread was previously started, most likely due to a platform bug. - -- Issue #8193: Fix test_zlib failure with zlib 1.2.4. - -- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi. - -- Issue #8263: Now regrtest.py will report a failure if it receives a - KeyboardInterrupt (SIGINT). - -- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special - Unicode normalization cases. - -- Issue #7783: test.support.open_urlresource invalidates the outdated files from - the local cache. - -- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are - effectively raised. - -- The four path modules (genericpath, macpath, ntpath, posixpath) share a common - TestCase for some tests: test_genericpath.CommonTest. - -- Print platform information when running the whole test suite, or using the - --verbose flag. - -- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly - filesystem encoding. - -- Issue #6292: for the moment at least, the test suite runs cleanly if python is - run with the -OO flag. Tests requiring docstrings are skipped. - -- Issue #7712: test.support gained a new `temp_cwd` context manager which is now - also used by regrtest to run all the tests in a temporary directory. The - original CWD is saved in `support.SAVEDCWD`. Thanks to Florent Xicluna who - helped with the patch. - -- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi - (only seen so far on platforms where the curses module wasn't built), due to - an uncleared exception. - -- Issue #7728: test_timeout was changed to use support.bind_port instead of a - hard coded port. - -- Issue #7376: Instead of running a self-test (which was failing) when called - with no arguments, doctest.py now gives a usage message. - -- Issue #7396: fix regrtest -s, which was broken by the -j enhancement. - -- Issue #7498: test_multiprocessing now uses test.support.find_unused_port - instead of a hardcoded port number in test_rapid_restart. - -- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file - in the Lib/test directory, which might be read-only for the user running the - tests. - -- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case - of an option with no handler. - -- Issue #7312: Add a -F flag to run the selected tests in a loop until a test - fails. Can be combined with -j. - -- Issue #6551: test_zipimport could import and then destroy some modules of the - encodings package, which would make other tests fail further down the road - because the internally cached encoders and decoders would point to empty - global variables. - -- Issue #7295: Do not use a hardcoded file name in test_tarfile. - -- Issue #7270: Add some dedicated unit tests for multi-thread synchronization - primitives such as Lock, RLock, Condition, Event and Semaphore. - -- Issue #7248 (part 2): Use a unique temporary directory for importlib source - tests instead of tempfile.tempdir. This prevents the tests from sharing state - between concurrent executions on the same system. - -- Issue #7248: In importlib.test.source.util a try/finally block did not make - sure that some referenced objects actually were created in the block before - calling methods on the object. - -- Issue #7222: Make thread "reaping" more reliable so that reference - leak-chasing test runs give sensible results. The previous method of reaping - threads could return successfully while some Thread objects were still - referenced. This also introduces a new private function: - ``_thread._count()``. - -- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer - runs the risk of causing the worker thread to fail. - -- Issue #7055: test___all__ now greedily detects all modules which have an - __all__ attribute, rather than using a hardcoded and incomplete list. - -- Issue #7058: Added save/restore for things like sys.argv and cwd to - runtest_inner in regrtest, with warnings if the called test modifies them, and - a new section in the summary report at the end. - -- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. - -- Fixed tests in importlib.test.source.test_abc_loader that were masking the - proper exceptions that should be raised for missing or improper code object - bytecode. - -- Removed importlib's custom test discovery code and switched to - unittest.TestLoader.discover(). - -Tools/Demos ------------ - -- Issue #5464, #8974: Implement plural forms in msgfmt.py. - -- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were - added to the `Tools/` directory. They were previously living in the sandbox. - - -What's New in Python 3.1? -========================= - -*Release date: 27-June-2009* - -Core and Builtins ------------------ - -- Issue #6334: Fix bug in range length calculation for ranges with - large arguments. - -- Issue #6329: Fixed iteration for memoryview objects (it was being blocked - because it wasn't recognized as a sequence). - -Library -------- - -- Issue #6126: Fixed pdb command-line usage. - -- Issue #6314: logging: performs extra checks on the "level" argument. - -- Issue #6274: Fixed possible file descriptors leak in subprocess.py - -- Accessing io.StringIO.buffer now raises an AttributeError instead of - io.UnsupportedOperation. - -- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. - (On Unix) - -- Issue #1202: zipfile module would cause a struct.error when attempting to - store files with a CRC32 > 2**31-1. - -Extension Modules ------------------ - -- Issue #5590: Remove unused global variable in pyexpat extension. - - -What's New in Python 3.1 Release Candidate 2? -============================================= - -*Release date: 13-June-2009* - -Core and Builtins ------------------ - -- Fixed SystemError triggered by "range([], 1, -1)". - -- Issue #5924: On Windows, a large PYTHONPATH environment variable - (more than 255 characters) would be completely ignored. - -- Issue #4547: When debugging a very large function, it was not always - possible to update the lineno attribute of the current frame. - -- Issue #5330: C functions called with keyword arguments were not reported by - the various profiling modules (profile, cProfile). Patch by Hagen F?rstenau. - -Library -------- - -- Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular - expression string pattern was trying to match against a bytes returned by - Popen. Tested under win32 to build the py-postgresql project. - -- Issue #6258: Support AMD64 in bdist_msi. - -- Issue #6195: fixed doctest to no longer try to read 'source' data from - binary files. - -- Issue #5262: Fixed bug in next rollover time computation in - TimedRotatingFileHandler. - -- Issue #6217: The C implementation of io.TextIOWrapper didn't include the - errors property. Additionally, the errors and encoding properties of StringIO - are always None now. - -- Issue #6137: The pickle module now translates module names when loading - or dumping pickles with a 2.x-compatible protocol, in order to make data - sharing and migration easier. This behaviour can be disabled using the - new `fix_imports` optional argument. - -- Removed the ipaddr module. - -- Issue #3613: base64.{encode,decode}string are now called - base64.{encode,decode}bytes which reflects what type they accept and return. - The old names are still there as deprecated aliases. - -- Issue #5767: Remove sgmlop support from xmlrpc.client. - -- Issue #6150: Fix test_unicode on wide-unicode builds. - -- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty - parameters. - -Windows -------- - -- Issue #6221: Delete test registry key before running the test. - -- Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. - -C-API ------ - -- Issue #5735: Python compiled with --with-pydebug should throw an - ImportError when trying to import modules compiled without - --with-pydebug, and vice-versa. - - -Build ------ - -- Issue #6154: Make sure the intl library is added to LIBS if needed. Also - added LIBS to OS X framework builds. - -- Issue #5809: Specifying both --enable-framework and --enable-shared is - an error. Configure now explicity tells you about this. - - - -What's New in Python 3.1 release candidate 1? -============================================= - -*Release date: 2009-05-30* - -Core and Builtins ------------------ - -- Issue #6097: Escape UTF-8 surrogates resulting from mbstocs conversion - of the command line. - -- Issue #6012: Add cleanup support to O& argument parsing. - -- Issue #6089: Fixed str.format with certain invalid field specifiers - that would raise SystemError. - -- Issue #5982: staticmethod and classmethod now expose the wrapped - function with __func__. - -- Added support for multiple context managers in the same with-statement. - Deprecated contextlib.nested() which is no longer needed. - -- Issue #5829: complex("1e500") no longer raises OverflowError. This - makes it consistent with float("1e500") and interpretation of real - and imaginary literals. - -- Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. - -- Issue #5994: the marshal module now has docstrings. - -- Issue #5981: Fix three minor inf/nan issues in float.fromhex: - (1) inf and nan strings with trailing whitespace were incorrectly - rejected; (2) parsing of strings representing infinities and nans - was locale aware; and (3) the interpretation of fromhex('-nan') - didn't match that of float('-nan'). - -Library -------- - -- Issue #4859: Implement PEP 383 for pwd, spwd, and grp. - -- smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259). - -- Issue #6121: pydoc now ignores leading and trailing spaces in the - argument to the 'help' function. - -- Issue #6118: urllib.parse.quote_plus ignored the encoding and errors - arguments for strings with a space in them. - -- collections.namedtuple() was not working with the following field - names: cls, self, tuple, itemgetter, and property. - -- In unittest, using a skipping decorator on a class is now equivalent to - skipping every test on the class. The ClassTestSuite class has been removed. - -- Issue #6050: Don't fail extracting a directory from a zipfile if - the directory already exists. - -- Issue #1309352: fcntl now converts its third arguments to a C `long` rather - than an int, which makes some operations possible under 64-bit Linux (e.g. - DN_MULTISHOT with F_NOTIFY). - -- Issue #5761: Add the name of the underlying file to the repr() of various - IO objects. - -- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix - by Musashi Tamura, tests by Marcin Bachry. - -- Issue #1983: Fix functions taking or returning a process identifier to use - the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have - a process identifier type wider than the standard C integer type. - -- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. - Patch by Farhan Ahmad, test by Marcin Bachry. - -- Issue #2116: Weak references and weak dictionaries now support copy()ing and - deepcopy()ing. - -- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. - -- Issue #5918: Fix a crash in the parser module. - -- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. - -- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io - library. This means, for example, that opening an UTF-16 text file in - append mode doesn't add a BOM at the end of the file if the file isn't - empty. - -- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' - file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix - corrects a pydoc regression. - -- Issue #5955: aifc's close method did not close the file it wrapped, - now it does. This also means getfp method now returns the real fp. - -Installation ------------- - -- Issue #6047: fullinstall has been removed because Python 3's executable will - now be known as python3. - -- Lib/smtpd.py is no longer installed as a script. - -Extension Modules ------------------ - -- Issue #3061: Use wcsftime for time.strftime where available. - -- Issue #4873: Fix resource leaks in error cases of pwd and grp. - -- Issue #6093: Fix off-by-one error in locale.strxfrm. - -- The _functools and _locale modules are now built into the libpython shared - library instead of as extension modules. - -Build ------ - -- Issue #3585: Add pkg-config support. It creates a python-2.7.pc file - and a python3.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by - Clinton Roy. - -Tests ------ - -- Issue #5442: Tests for importlib were not properly skipping case-sensitivity - tests on darwin even when the OS was installed on a case-sensitive - filesystem. Also fixed tests that should not be run when - sys.dont_write_bytecode is true. - - -What's New in Python 3.1 beta 1? -================================ - -*Release date: 2009-05-06* - -Core and Builtins ------------------ - -- Issue #5914: Add new C API function PyOS_string_to_double, and - deprecate PyOS_ascii_strtod and PyOS_ascii_atof. - -- Issue #3382: float.__format__, complex.__format__, and %-formatting - no longer map 'F' to 'f'. Because of issue #5859 (below), this only - affects nan -> NAN and inf -> INF. - -- Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames - in all operations, including splitdrive, split, etc. splitunc() now issues - a PendingDeprecation warning. - -- Issue #5920: For float.__format__, change the behavior with the - empty presentation type (that is, not one of 'e', 'f', 'g', or 'n') - to be like 'g' but with at least one decimal point and with a - default precision of 12. Previously, the behavior the same but with - a default precision of 6. This more closely matches str(), and - reduces surprises when adding alignment flags to the empty - presentation type. This also affects the new complex.__format__ in - the same way. - -- Implement PEP 383, Non-decodable Bytes in System Character Interfaces. - -- Issue #5890: in subclasses of 'property' the __doc__ attribute was - shadowed by classtype's, even if it was None. property now - inserts the __doc__ into the subclass instance __dict__. - -- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal - sequences. Patch by Nick Barnes and Victor Stinner. - -- Issue #3672: Reject surrogates in utf-8 codec; add surrogatepass error handler. - -- Issue #5883: In the io module, the BufferedIOBase and TextIOBase ABCs have - received a new method, detach(). detach() disconnects the underlying stream - from the buffer or text IO and returns it. - -- Issue #5859: Remove switch from '%f' to '%g'-style formatting for - floats with absolute value over 1e50. Also remove length - restrictions for float formatting: '%.67f' % 12.34 and '%.120e' % - 12.34 no longer raise an exception. - -- Issue #1588: Add complex.__format__. For example, - format(complex(1, 2./3), '.5') now produces a sensible result. - -- Issue #5864: Fix empty format code formatting for floats so that it - never gives more than the requested number of significant digits. - -- Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes - new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. - -- Issue #5835: Deprecate PyOS_ascii_formatd. - -- Issue #4971: Fix titlecase for characters that are their own - titlecase, but not their own uppercase. - -- Issue #5283: Setting __class__ in __del__ caused a segfault. - -- Issue #5816: complex(repr(z)) now recovers z exactly, even when - z involves nans, infs or negative zeros. - -- Issue #3166: Make int -> float conversions correctly rounded. - -- Issue #1869 (and many duplicates): make round(x, n) correctly - rounded for a float x, by using the decimal <-> binary conversions - from Python/dtoa.c. As a consequence, (e.g.) round(x, 2) now - consistently agrees with format(x, '.2f'). - -- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on - some builtin types. - -- Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100'. - -- Issue #5515: str.format() type 'n' combined with commas and leading - zeros no longer gives odd results with ints and floats. - -- Implement PEP 378, Format Specifier for Thousands Separator, for - floats. - -- The str function switches to exponential notation at - 1e11, not 1e12. This avoids printing 13 significant digits in - situations where only 12 of them are correct. Example problem - value: str(1e11 + 0.5). (This minor issue has existed in 2.x for a - long time.) - -- Issue #1580: On most platforms, use a 'short' float repr: for a - finite float x, repr(x) now outputs a string based on the shortest - sequence of decimal digits that rounds to x. Previous behaviour was - to output 17 significant digits and then strip trailing zeros. - Another minor difference is that the new repr switches to - exponential notation at 1e16 instead of the previous 1e17; this - avoids misleading output in some cases. - - There's a new sys attribute sys.float_repr_style, which takes - the value 'short' to indicate that we're using short float repr, - and 'legacy' if the short float repr isn't available for one - reason or another. - - The float repr change involves incorporating David Gay's 'perfect - rounding' code into the Python core (it's in Python/dtoa.c). As a - secondary consequence, all string-to-float and float-to-string - conversions (including all float formatting operations) will be - correctly rounded on these platforms. - - See issue #1580 discussions for details of platforms for which - this change does not apply. - -- Issue #5759: float() didn't call __float__ on str subclasses. - -- The string.maketrans() function is deprecated; there is a new static method - maketrans() on the bytes and bytearray classes. This removes confusion about - the types string.maketrans() is supposed to work with, and mirrors the - methods available on the str class. - -- Issue #2170: refactored xml.dom.minidom.normalize, increasing both - its clarity and its speed. - -- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)`` - to avoid compiler warnings. - -- Issue #3739: The unicode-internal encoder now reports the number of characters - consumed like any other encoder (instead of the number of bytes). - -Installation ------------- - -- Issue #5756: Install idle and pydoc with a 3 suffix. - -Library -------- - -- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument. - -- Issue #5311: bdist_msi can now build packages that do not depend on a - specific Python version. - -- Issue #5150: IDLE's format menu now has an option to strip trailing - whitespace. - -- Issue #5940: distutils.command.build_clib.check_library_list was not doing - the right type checkings anymore. - -- Issue #4875: On win32, ctypes.util.find_library does no longer - return directories. - -- Issue #5142: Add the ability to skip modules while stepping to pdb. - -- Issue #1309567: Fix linecache behavior of stripping subdirectories when - looking for files given by a relative filename. - -- Issue #5923: Update the ``turtle`` module to version 1.1, add two new - turtle demos in Demo/turtle. - -- Issue #5692: In ``zipfile.Zipfile``, fix wrong path calculation when - extracting a file to the root directory. - -- Issue #5913: os.listdir() should fail for empty path on windows. - -- Issue #5084: unpickling now interns the attribute names of pickled objects, - saving memory and avoiding growth in size of subsequent pickles. Proposal - and original patch by Jake McGuire. - -- The json module now works exclusively with str and not bytes. - -- Issue #3959: The ipaddr module has been added to the standard library. - Contributed by Google. - -- Issue #3002: ``shutil.copyfile()`` and ``shutil.copytree()`` now raise an - error when a named pipe is encountered, rather than blocking infinitely. - -- Issue #5857: tokenize.tokenize() now returns named tuples. - -- Issue #4305: ctypes should now build again on mipsel-linux-gnu - -- Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the - string is already in normalized form, by performing a quick check beforehand. - Original patch by Rauli Ruohonen. - -- Issue #5853: calling a function of the mimetypes module from several threads - at once could hit the recursion limit if the mimetypes database hadn't been - initialized before. - -- Issue #5854: Updated __all__ to include some missing names and remove some - names which should not be exported. - -- Issue #3102: All global symbols that the _ctypes extension defines - are now prefixed with 'Py' or '_ctypes'. - -- Issue #5041: ctypes does now allow pickling wide character. - -- Issue #5812: For the two-argument form of the Fraction constructor, - Fraction(m, n), m and n are permitted to be arbitrary Rational - instances. - -- Issue #5812: Fraction('1e6') is valid: more generally, any string - that's valid for float() is now valid for Fraction(), with the - exception of strings representing NaNs and infinities. - -- Issue #5734: BufferedRWPair was poorly tested and had several glaring - bugs. Patch by Brian Quinlan. - -- Issue #1161031: fix readwrite select flag handling: POLLPRI now - results in a handle_expt_event call, not handle_read_event, and POLLERR - and POLLNVAL now call handle_close, not handle_expt_event. Also, - dispatcher now has an 'ignore_log_types' attribute for suppressing - log messages, which is set to 'warning' by default. - -- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for - new arguments introduced in 2.5. - -- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in - makeunicodedata.py and regenerated the Unicode database (This fixes - u'\u1d79'.lower() == '\x00'). - -Extension Modules ------------------ - -- Issue #5881: Remove old undocumented compatibility interfaces in hashlib and - pwd. - -- Issue #5463: In struct module, remove deprecated float coercion - for integer type codes: struct.pack('L', 0.3) should now raise - an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. - The version number has been bumped to 0.3. - -- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built - using Berkeley DB. - -Tests ------ - -- Issue #5354: New test support function import_fresh_module() makes - it easy to import both normal and optimised versions of modules. - test_heapq and test_warnings have been adjusted to use it, tests for - other modules with both C and Python implementations in the stdlib - can be adjusted to use it over time. - -- Issue #5837: Certain sequences of calls to set() and unset() for - support.EnvironmentVarGuard objects restored the environment variables - incorrectly on __exit__. - -C-API ------ - -- Issue #5630: A replacement PyCObject API, PyCapsule, has been added. - - -What's New in Python 3.1 alpha 2? -================================= - -*Release date: 2009-4-4* - -Core and Builtins ------------------ - -- Implement PEP 378, Format Specifier for Thousands Separator, for - integers. - -- Issue #5666: Py_BuildValue's 'c' code should create byte strings. - -- Issue #5499: The 'c' code for argument parsing functions now only accepts a - byte, and the 'C' code only accepts a unicode character. - -- Fix a problem in PyErr_NormalizeException that leads to "undetected errors" - when hitting the recursion limit under certain circumstances. - -- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. - -- Fix a segfault when running test_exceptions with coverage, caused by - insufficient checks in accessors of Exception.__context__. - -- Issue #5604: non-ASCII characters in module name passed to - imp.find_module() were converted to UTF-8 while the path is - converted to the default filesystem encoding, causing nonsense. - -- Issue #5126: str.isprintable() returned False for space characters. - -- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to - the end sys.path, for compatibility with the system install of Python. - -- Issue #4688: Add a heuristic so that tuples and dicts containing only - untrackable objects are not tracked by the garbage collector. This can - reduce the size of collections and therefore the garbage collection overhead - on long-running programs, depending on their particular use of datatypes. - -- Issue #5512: Rewrite PyLong long division algorithm (x_divrem) to - improve its performance. Long divisions and remainder operations - are now between 50% and 150% faster. - -- Issue #4258: Make it possible to use base 2**30 instead of base - 2**15 for the internal representation of integers, for performance - reasons. Base 2**30 is enabled by default on 64-bit machines. Add - --enable-big-digits option to configure, which overrides the - default. Add sys.int_info structseq to provide information about - the internal format. - -- Issue #4474: PyUnicode_FromWideChar now converts characters outside - the BMP to surrogate pairs, on systems with sizeof(wchar_t) == 4 - and sizeof(Py_UNICODE) == 2. - -- Issue #5237: Allow auto-numbered fields in str.format(). For - example: '{} {}'.format(1, 2) == '1 2'. - -- Issue #5392: when a very low recursion limit was set, the interpreter would - abort with a fatal error after the recursion limit was hit twice. - -- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with - short file names. - -Library -------- - -- Issue #2625: added missing items() call to the for loop in - mailbox.MH.get_message(). - -- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat - error substitutions from non-strict codec error callbacks in - incrementalencoder and StreamWriter. - -- Issue #5656: Fix the coverage reporting when running the test suite with - the -T argument. - -- Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. - -- Issue #5624: Fix the _winreg module name still used in several modules. - -- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer. - -- Issue #5619: Multiprocessing children disobey the debug flag and causes - popups on windows buildbots. Patch applied to work around this issue. - -- Issue #5400: Added patch for multiprocessing on netbsd compilation/support - -- Issue #5387: Fixed mmap.move crash by integer overflow. - -- Issue #5261: Patch multiprocessing's semaphore.c to support context - manager use: "with multiprocessing.Lock()" works now. - -- Issue #5236: Change time.strptime() to only take strings. Didn't work with - bytes already but the failure was non-obvious. - -- Issue #5177: Multiprocessing's SocketListener class now uses - socket.SO_REUSEADDR on all connections so that the user no longer needs - to wait 120 seconds for the socket to expire. - -- Issue #5595: Fix UnboundedLocalError in ntpath.ismount(). - -- Issue #1174606: Calling read() without arguments of an unbounded file - (typically /dev/zero under Unix) could crash the interpreter. - -- The max_buffer_size arguments of io.BufferedWriter, io.BufferedRWPair, and - io.BufferedRandom have been deprecated for removal in Python 3.2. - -- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop - forever on incomplete input. That caused tarfile.open() to hang when used - with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or - partial bzip2 compressed data. - -- Issue #2110: Add support for thousands separator and 'n' type - specifier to Decimal.__format__ - -- Fix Decimal.__format__ bug that swapped the meanings of the '<' and - '>' alignment characters. - -- The error detection code in FileIO.close() could fail to reflect the `errno` - value, and report it as -1 instead. - -- Issue #5016: FileIO.seekable() could return False if the file position - was negative when truncated to a C int. Patch by Victor Stinner. - -Extension Modules ------------------ - -- Issue #5391: mmap now deals exclusively with bytes. - -- Issue #5463: In struct module, remove deprecated overflow wrapping - when packing an integer: struct.pack('=L', -1) now raises - struct.error instead of returning b'\xff\xff\xff\xff'. The - _PY_STRUCT_RANGE_CHECKING and _PY_STRUCT_OVERFLOW_MASKING constants - have been removed from the struct module. - - -What's New in Python 3.1 alpha 1 -================================ - -*Release date: 2009-03-07* - -Core and Builtins ------------------ - -- The io module has been reimplemented in C for speed. - -- Give dict views an informative __repr__. - -- Issue #5247: Improve error message when unknown format codes are - used when using str.format() with str, int, and float arguments. - -- Issue #5249: time.strftime returned malformed string when format string - contained non ascii character on windows. - -- Issue #4626: compile(), exec(), and eval() ignore the coding cookie if the - source has already been decoded into str. - -- Issue #5186: Reduce hash collisions for objects with no __hash__ method by - rotating the object pointer by 4 bits to the right. - -- Issue #4575: Fix Py_IS_INFINITY macro to work correctly on x87 FPUs: - it now forces its argument to double before testing for infinity. - -- Issue #5137: Make len() correctly raise a TypeError when a __len__ method - returns a non-number type. - -- Issue #5182: Removed memoryview.__str__. - -- Issue #1717: Removed builtin cmp() function, dropped tp_compare - slot, the C API functions PyObject_Compare and PyUnicode_Compare and - the type definition cmpfunc. The tp_compare slot has been renamed - to tp_reserved, and is reserved for future usage. - -- Issue #1242657: the __len__() and __length_hint__() calls in several tools - were suppressing all exceptions. These include list() and bytearray(). - -- Issue #4707: round(x, n) now returns an integer if x is an integer. - Previously it returned a float. - -- Issue #4753: By enabling a configure option named '--with-computed-gotos' - on compilers that support it (notably: gcc, SunPro, icc), the bytecode - evaluation loop is compiled with a new dispatch mechanism which gives - speedups of up to 20%, depending on the system, on various benchmarks. - -- Issue #4874: Most builtin decoders now reject unicode input. - -- Issue #4842: Don't allow trailing 'L' when constructing an integer - from a string. - -- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors. - -- Issue #4838: When a module is deallocated, free the memory backing the - optional module state data. - -- Issue #4910: Rename nb_long slot to nb_reserved, and change its - type to ``(void *)``. - -- Issue #4935: The overflow checking code in the expandtabs() method common - to str, bytes and bytearray could be optimized away by the compiler, letting - the interpreter segfault instead of raising an error. - -- Issue #3720: Fix a crash when an iterator modifies its class and removes its - __next__ method. - -- Issue #4910: Builtin int() function and PyNumber_Long/PyNumber_Int API - function no longer attempt to call the __long__ slot to convert an object - to an integer. Only the __int__ and __trunc__ slots are examined. - -- Issue #4893: Use NT threading on CE. - -- Issue #4915: Port sysmodule to Windows CE. - -- Issue #4868: utf-8, utf-16 and latin1 decoding are now 2x to 4x faster. The - common cases are optimized thanks to a dedicated fast path and a moderate - amount of loop unrolling. - -- Issue #4074: Change the criteria for doing a full garbage collection (i.e. - collecting the oldest generation) so that allocating lots of objects without - destroying them does not show quadratic performance. Based on a proposal by - Martin von L?wis at - http://mail.python.org/pipermail/python-dev/2008-June/080579.html. - -- Issue #4604: Some objects of the I/O library could still be used after - having been closed (for instance, a read() call could return some - previously buffered data). Patch by Dmitry Vasiliev. - -- Issue #4705: Fix the -u ("unbuffered binary stdout and stderr") command-line - flag to work properly. Furthermore, when specifying -u, the text stdout - and stderr streams have line-by-line buffering enabled (the default being - to buffer arbitrary chunks of data). - -- The internal table, _PyLong_DigitValue, is now an array of unsigned chars - instead of ints (reducing its size from 4 to 8 times thereby reducing - Python's overall memory). - -- Issue #1180193: When importing a module from a .pyc (or .pyo) file with - an existing .py counterpart, override the co_filename attributes of all - code objects if the original filename is obsolete (which can happen if the - file has been renamed, moved, or if it is accessed through different paths). - Patch by Ziga Seilnacht and Jean-Paul Calderone. - -- Issue #4580: Fix slicing of memoryviews when the item size is greater than - one byte. Also fixes the meaning of len() so that it returns the number of - items, rather than the size in bytes. - -- Issue #4075: Use OutputDebugStringW in Py_FatalError. - -- Issue #4747: When the terminal does not use utf-8, executing a script with - non-ascii characters in its name could fail with a "SyntaxError: None" error. - -- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed - to open file with a bytes filename on Windows. - -- Issue #3680: Reference cycles created through a dict, set or deque iterator - did not get collected. - -- Issue #4701: PyObject_Hash now implicitly calls PyType_Ready on types - where the tp_hash and tp_dict slots are both NULL. - -- Issue #4759: None is now allowed as the first argument of - bytearray.translate(). It was always allowed for bytes.translate(). - -- Added test case to ensure attempts to read from a file opened for writing - fail. - -- Issue #3106: Speedup some comparisons (str/str and int/int). - -- Issue #2183: Simplify and optimize bytecode for list, dict and set - comprehensions. Original patch for list comprehensions by Neal Norwitz. - -- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always - print elapsed times, not only when some objects are uncollectable / - unreachable. Original patch by Neil Schemenauer. - -- Issue #3439: Add a bit_length method to int. - -- Issue #2173: When getting device encoding, check that return value of - nl_langinfo is not the empty string. This was causing silent build - failures on OS X. - -- Issue #4597: Fixed several opcodes that weren't always propagating - exceptions. - -- Issue #4589: Fixed exception handling when the __exit__ function of a - context manager returns a value that cannot be converted to a bool. - -- Issue #4445: Replace "sizeof(PyBytesObject)" with - "offsetof(PyBytesObject, ob_sval) + 1" when allocating memory for - bytes instances. On a typical machine this saves 3 bytes of memory - (on average) per allocation of a bytes instance. - -- Issue #4533: File read operation was dreadfully slow due to a slowly - growing read buffer. Fixed by using the same growth rate algorithm as - Python 2.x. - -- Issue #4509: Various issues surrounding resize of bytearray objects to - which there are buffer exports (e.g. memoryview instances). - -- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` - method on file objects with closefd=False. The file descriptor is still - kept open but the file object behaves like a closed file. The ``FileIO`` - object also got a new readonly attribute ``closefd``. - -- Issue #4569: Interpreter crash when mutating a memoryview with an item size - larger than 1. - -- Issue #4748: Lambda generators no longer return a value. - -- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. - -- Issue #5108: Handle %s like %S, %R and %A in PyUnicode_FromFormatV(): Call - PyUnicode_DecodeUTF8() once, remember the result and output it in a second - step. This avoids problems with counting UTF-8 bytes that ignores the effect - of using the replace error handler in PyUnicode_DecodeUTF8(). - -Library -------- - -- Issue #7071: byte-compilation in Distutils is now done with respect to - sys.dont_write_bytecode. - -- Issue #7066: archive_util.make_archive now restores the cwd if an error is - raised. Initial patch by Ezio Melotti. - -- Issue #6516: Added owner/group support when creating tar archives in - Distutils. - -- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. - -- Issue #6163: Fixed HP-UX runtime library dir options in - distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and - Michael Haubenwallner. - -- Issue #6693: New functions in site.py to get user/global site packages paths. - -- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when - opening an empty or very small file. - -- Issue #6545: Removed assert statements in distutils.Extension, so the - behavior is similar when used with -O. - -- unittest has been split up into a package. All old names should still work. - -- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler - uses the same refactored function to get gcc/ld/dllwrap versions numbers. - It's `distutils.util.get_compiler_versions`. Added deprecation warnings - for the obsolete get_versions() functions. - -- Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list - -- Issue #6314: logging: Extra checks on the "level" argument in more places. - -- Issue #2622: Fixed an ImportError when importing email.message from a - standalone application built with py2exe or py2app. - -- Issue #6455: Fixed test_build_ext under win32. - -- Issue #6377: Enabled the compiler option, and deprecate its usage as an - attribute. - -- Issue #6413: Fixed the log level in distutils.dist for announce. - -- Issue #6403: Fixed package path usage in build_ext. - -- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was - unconditionally calling "os.close(sys.stdin.fileno())" resulting in file - descriptor errors - -- Issue #6365: Distutils build_ext inplace mode was copying the compiled - extension in a subdirectory if the extension name had dots. - -- Issue #6164: Added an AIX specific linker argument in Distutils - unixcompiler. Original patch by Sridhar Ratnakumar. - -- Issue #6286: Now Distutils upload command is based on urllib2 instead of - httplib, allowing the usage of http_proxy. - -- Issue #6287: Added the license field in Distutils documentation. - -- Issue #6263: Fixed syntax error in distutils.cygwincompiler. - -- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` - in Makefiles. This prevents compile errors when using syntax like: - `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. - -- Issue #6131: test_modulefinder leaked when run after test_distutils. - Patch by Hirokazu Yamamoto. - -- Issue #6048: Now Distutils uses the tarfile module in archive_util. - -- Issue #6062: In distutils, fixed the package option of build_ext. Feedback - and tests on pywin32 by Tim Golden. - -- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto. - -- Issue #6046: Fixed the library extension when distutils build_ext is used - inplace. Initial patch by Roumen Petrov. - -- Issue #6041: Now distutils `sdist` and `register` commands use `check` as a - subcommand. - -- Issue #6022: a test file was created in the current working directory by - test_get_outputs in Distutils. - -- Issue #5977: distutils build_ext.get_outputs was not taking into account the - inplace option. Initial patch by kxroberto. - -- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken - for old-style extensions. - -- Issue #5976: Fixed Distutils test_check_environ. - -- Issue #5941: Distutils build_clib command was not working anymore because - of an incomplete costumization of the archiver command. Added ARFLAGS in the - Makefile besides AR and make Distutils use it. Original patch by David - Cournapeau. - -- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. - -- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive - anymore. - -- Issue #5810: Fixed Distutils test_build_scripts so it uses - sysconfig.get_config_vars. - -- Issue #4951: Fixed failure in test_httpservers. - -- Issue #5795: Fixed test_distutils failure on Debian ppc. - -- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. - -- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting - a value in SafeConfigParser. - -- Issue #5732: added a new command in Distutils: check. - -- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows - platforms. Initial patch by Paul Moore. - -- Issue #5095: Added bdist_msi to the list of bdist supported formats. - Initial fix by Steven Bethard. - -- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. - Initial fix by Wayne Davison. - -- Issue #5694: removed spurious test output in Distutils (test_clean). - -- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module. - -- Issue #1665206 (partially): Move imports in cgitb to the top of the module - instead of performing them in functions. Helps prevent import deadlocking in - threads. - -- Issue #2522: locale.format now checks its first argument to ensure it has - been passed only one pattern, avoiding mysterious errors where it appeared - that it was failing to do localization. - -- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg - Brandl. - -- Issue #1222: locale.format() bug when the thousands separator is a space - character. - -- Issue #5472: Fixed distutils.test_util tear down. Original patch by - Tim Golden. - -- collections.deque() objects now have a read-only attribute called maxlen. - -- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after - it is has been populated and properly configured in order to prevent - window flashing. - -- Issue #4792: Prevent a segfault in _tkinter by using the - guaranteed to be safe interp argument given to the PythonCmd in place of - the Tcl interpreter taken from a PythonCmd_ClientData. - -- Issue #5193: Guarantee that tkinter.Text.search returns a string. - -- Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler. - Original patch by Akira Kitada. - -- Issue #5334: array.fromfile() failed to insert values when EOFError was raised. - -- Issue #5385: Fixed mmap crash after resize failure on windows. - -- Issue #5179: Fixed subprocess handle leak on failure on windows. - -- PEP 372: Added collections.OrderedDict(). - -- The _asdict() for method for namedtuples now returns an OrderedDict(). - -- configparser now defaults to using an ordered dictionary. - -- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes - import guess_extension`` was used. - -- Issue #1733986: Fixed mmap crash in accessing elements of second map object - with same tagname but larger size than first map. (Windows) - -- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer - overrun. - -- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils - bdist_rpm command. - -- Issue #5378: added --quiet option to Distutils bdist_rpm command. - -- Issue #5052: make Distutils compatible with 2.3 again. - -- Issue #5316: Fixed buildbot failures introduced by multiple inheritance - in Distutils tests. - -- Issue #5287: Add exception handling around findCaller() call to help out - IronPython. - -- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, - The file was resized to wrong size. - -- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. - -- Issue #2279: distutils.sdist.add_defaults now add files - from the package_data and the data_files metadata. - -- Issue #5257: refactored all tests in distutils, so they use - support.TempdirManager, to avoid writing in the tests directory. - -- Issue #4524: distutils build_script command failed with --with-suffix=3. - Initial patch by Amaury Forgeot d'Arc. - -- Issue #2461: added tests for distutils.util - -- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions - which inherited from numbers.py which did not have __slots__ defined. The - numbers hierarchy now has its own __slots__ declarations. - -- Issue #4631: Fix urlopen() result when an HTTP response uses chunked - encoding. - -- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a - function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). - -- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored - under NT and OS2. Patch by Philip Jenvey. - -- Issue #5128: Make compileall properly inspect bytecode to determine if needs - to be recreated. This avoids a timing hole thanks to the old reliance on the - ctime of the files involved. - -- Issue #5122: Synchronize tk load failure check to prevent a potential - deadlock. - -- Issue #1818: collections.namedtuple() now supports a keyword argument - 'rename' which lets invalid fieldnames be automatically converted to - positional names in the form, _1, _2, ... - -- Issue #4890: Handle empty text search pattern in Tkinter.Text.search. - -- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a - public documented method ``ZipImporter.get_filename()``. - -- Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support - the execution of packages by looking for and executing a ``__main__`` - submodule when a package name is supplied. Initial patch by Andi - Vajda. - -- Issue #1731706: Call Tcl_ConditionFinalize for Tcl_Conditions that will - not be used again (this requires Tcl/Tk 8.3.1), also fix a memory leak in - Tkapp_Call when calling from a thread different than the one that created - the Tcl interpreter. Patch by Robert Hancock. - -- Issue #4285: Change sys.version_info to be a named tuple. Patch by - Ross Light. - -- Issue #1520877: Now distutils.sysconfig reads $AR from the - environment/Makefile. Patch by Douglas Greiman. - -- Issue #1276768: The verbose option was not used in the code of - distutils.file_util and distutils.dir_util. - -- Issue #5132: Fixed trouble building extensions under Solaris with - --enabled-shared activated. Initial patch by Dave Peterson. - -- Issue #1581476: Always use the Tcl global namespace when calling into Tcl. - -- The shelve module now defaults to pickle protocol 3. - -- Fix a bug in the trace module where a bytes object from co_lnotab had its - items being passed through ord(). - -- Issue #2047: shutil.move() could believe that its destination path was - inside its source path if it began with the same letters (e.g. "src" vs. - "src.new"). - -- Added the ttk module. See issue #2983: Ttk support for Tkinter. - -- Removed isSequenceType(), isMappingType, and isNumberType() from the - operator module; use the abstract base classes instead. Also removed - the repeat() function; use mul() instead. - -- Issue #5021: doctest.testfile() did not create __name__ and - collections.namedtuple() relied on __name__ being defined. - -- Backport importlib from Python 3.1. Only the import_module() function has - been backported to help facilitate transitions from 2.7 to 3.1. - -- Issue #1885: distutils. When running sdist with --formats=tar,gztar - the tar file was overriden by the gztar one. - -- Issue #4863: distutils.mwerkscompiler has been removed. - -- Added a new itertools functions: combinations_with_replacement() - and compress(). - -- Issue #5032: added a step argument to itertools.count() and - allowed non-integer arguments. - -- Fix and properly document the multiprocessing module's logging - support, expose the internal levels and provide proper usage - examples. - -- Issue #1672332: fix unpickling of subnormal floats, which was - producing a ValueError on some platforms. - -- Issue #3881: Help Tcl to load even when started through the - unreadable local symlink to "Program Files" on Vista. - -- Issue #4710: Extract directories properly in the zipfile module; - allow adding directories to a zipfile. - -- Issue #3807: _multiprocessing build fails when configure is passed - --without-threads argument. When this occurs, _multiprocessing will - be disabled, and not compiled. - -- Issue #5008: When a file is opened in append mode with the new IO library, - do an explicit seek to the end of file (so that e.g. tell() returns the - file size rather than 0). This is consistent with the behaviour of the - traditional 2.x file object. - -- Issue #5013: Fixed a bug in FileHandler which occurred when the delay - parameter was set. - -- Issue #4842: Always append a trailing 'L' when pickling longs using - pickle protocol 0. When reading, the 'L' is optional. - -- Add the importlib package. - -- Issue #4301: Patch the logging module to add processName support, remove - _check_logger_class from multiprocessing. - -- Issue #3325: Remove python2.x try: except: imports for old cPickle from - multiprocessing. - -- Issue #4959: inspect.formatargspec now works for keyword only arguments - without defaults. - -- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks - for Unix machines for negative handles and large int handles. Without this check - it is possible to segfault the interpreter. - -- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue - in sharedctypes.py. - -- Issue #1225107: inspect.isclass() returned True for instances with a custom - __getattr__. - -- Issue #3826 and #4791: The socket module now closes the underlying socket - appropriately when it is being used via socket.makefile() objects - rather than delaying the close by waiting for garbage collection to do it. - -- Issue #1696199: Add collections.Counter() for rapid and convenient - counting. - -- Issue #3860: GzipFile and BZ2File now support the context manager protocol. - -- Issue #4867: Fixed a crash in ctypes when passing a string to a - function without defining argtypes. - -- Issue #4272: Add an optional argument to the GzipFile constructor to override - the timestamp in the gzip stream. The default value remains the current time. - The information can be used by e.g. gunzip when decompressing. Patch by - Jacques Frechet. - -- Restore Python 2.3 compatibility for decimal.py. - -- Issue #3638: Remove functions from _tkinter module level that depend on - TkappObject to work with multiple threads. - -- Issue #4718: Adapt the wsgiref package so that it actually works with - Python 3.x, in accordance with the `official amendments of the spec - `_. - -- Issue #4796: Added Decimal.from_float() and Context.create_decimal_from_float() - to the decimal module. - -- Fractions.from_float() no longer loses precision for integers too big to - cast as floats. - -- Issue #4812: add missing underscore prefix to some internal-use-only - constants in the decimal module. (Dec_0 becomes _Dec_0, etc.) - -- Issue #4790: The nsmallest() and nlargest() functions in the heapq module - did unnecessary work in the common case where no key function was specified. - -- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when - the function is not a generator. - -- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case - no MSVC compiler is found under Windows. Original patch by Philip Jenvey. - -- Issue #4646: distutils was choking on empty options arg in the setup - function. Original patch by Thomas Heller. - -- Issue #3767: Convert Tk object to string in tkColorChooser. - -- Issue #3248: Allow placing ScrolledText in a PanedWindow. - -- Issue #4444: Allow assertRaises() to be used as a context handler, so that - the code under test can be written inline if more practical. - -- Issue #4739: Add pydoc help topics for symbols, so that e.g. help('@') - works as expected in the interactive environment. - -- Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by - Gabriel Genellina. - -- Issue #4574: reading an UTF16-encoded text file crashes if \r on 64-char - boundary. - -- Issue #4223: inspect.getsource() will now correctly display source code - for packages loaded via zipimport (or any other conformant PEP 302 - loader). Original patch by Alexander Belopolsky. - -- Issue #4201: pdb can now access and display source code loaded via - zipimport (or any other conformant PEP 302 loader). Original patch by - Alexander Belopolsky. - -- Issue #4197: doctests in modules loaded via zipimport (or any other PEP - 302 conformant loader) will now work correctly in most cases (they - are still subject to the constraints that exist for all code running - from inside a module loaded via a PEP 302 loader and attempting to - perform IO operations based on __file__). Original patch by - Alexander Belopolsky. - -- Issues #4082 and #4512: Add runpy support to zipimport in a manner that - allows backporting to maintenance branches. Original patch by - Alexander Belopolsky. - -- Issue #4163: textwrap module: allow word splitting on a hyphen preceded by - a non-ASCII letter. - -- Issue #4616: TarFile.utime(): Restore directory times on Windows. - -- Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the - codec cannot be found. This is for compatibility with the builtin behavior. - -- Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to - give correct results in the case where one argument is a quiet NaN - and the other is a finite number that requires rounding. - -- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat - libs. - -- Added the subprocess.check_call_output() convenience function to get output - from a subprocess on success or raise an exception on error. - -- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to - support unusual filenames (such as those containing semi-colons) in - Content-Disposition headers. - -- Issue #4384: Added logging integration with warnings module using - captureWarnings(). This change includes a NullHandler which does nothing; - it will be of use to library developers who want to avoid the "No handlers - could be found for logger XXX" message which can appear if the library user - doesn't configure logging. - -- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an - exception. - -- Issue #4529: fix the parser module's validation of try-except-finally - statements. - -- Issue #4458: getopt.gnu_getopt() now recognizes a single "-" as an argument, - not a malformed option. - -- Added the subprocess.check_output() convenience function to get output - from a subprocess on success or raise an exception on error. - -- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input; - the corresponding tests now pass. - -- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because - it was calling the wrong open() function. - -- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to - support unusual filenames (such as those containing semi-colons) in - Content-Disposition headers. - -- Issue #4861: ctypes.util.find_library(): Robustify. Fix library detection on - biarch systems. Try to rely on ldconfig only, without using objdump and gcc. - -- Issue #5104: The socket module now raises OverflowError when 16-bit port and - protocol numbers are supplied outside the allowed 0-65536 range on bind() - and getservbyport(). - -- Windows locale mapping updated to Vista. - -Tools/Demos ------------ - -- Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1, - and make it 2.6-compatible. - -- Ttk demos added in Demo/tkinter/ttk/ - -- Issue #4677: add two list comprehension tests to pybench. - - -Build ------ - -- Issue #6094: Build correctly with Subversion 1.7. - -- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. - -- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the - linker, rather than always exit successfully. Patch by Floris Bruynooghe. - -- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify - the order that backends for the dbm extension are checked. - -- Link the shared python library with $(MODLIBS). - -- Issue #5134: Silence compiler warnings when compiling sqlite with VC++. - -- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. - -- Issue #4895: Use _strdup on Windows CE. - -- Issue #4472: "configure --enable-shared" now works on OSX - -- Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. - -- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". - -- Issue #4289: Remove Cancel button from AdvancedDlg. - -- Issue #1656675: Register a drop handler for .py* files on Windows. - -- Issue #4120: Exclude manifest from extension modules in VS2008. - -- Issue #4091: Install pythonxy.dll in system32 again. - -- Issue #4018: Disable "for me" installations on Vista. - -- Issue #3758: Add ``patchcheck`` build target to .PHONY. - -- Issue #4204: Fixed module build errors on FreeBSD 4. - - -C-API ------ - -- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with - NUL: Bogus TypeError detail string. - -- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError - for negative arguments. Previously, it raised TypeError. - -- Issue #4720: The format for PyArg_ParseTupleAndKeywords can begin with '|'. - -- Issue #3632: from the gdb debugger, the 'pyo' macro can now be called when - the GIL is released, or owned by another thread. - -- Issue #4122: On Windows, fix a compilation error when using the - Py_UNICODE_ISSPACE macro in an extension module. - - -Extension Modules ------------------ - -- Issue #3745: Fix hashlib to always reject unicode and non buffer-api - supporting objects as input no matter how it was compiled (built in - implementations or external openssl library). - -- Issue #4397: Fix occasional test_socket failure on OS X. - -- Issue #4279: Fix build of parsermodule under Cygwin. - -- Issue #4751: hashlib now releases the GIL when hashing large buffers - (with a hardwired threshold of 2048 bytes), allowing better parallelization - on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner. - -- Issue #4051: Prevent conflict of UNICODE macros in cPickle. - -- Issue #4738: Each zlib object now has a separate lock, allowing to compress - or decompress several streams at once on multi-CPU systems. Also, the GIL - is now released when computing the CRC of a large buffer. Patch by ebfe. - -- Issue #4228: Pack negative values the same way as 2.4 in struct's L format. - -- Issue #1040026: Fix os.times result on systems where HZ is incorrect. - -- Issues #3167, #3682: Fix test_math failures for log, log10 on Solaris, - OpenBSD. - -- Issue #4583: array.array would not always prohibit resizing when a buffer - has been exported, resulting in an interpreter crash when accessing the - buffer. - - -- Issue #5228: Make functools.partial objects can now be pickled. - -Tests ------ - -- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running - regression tests in parallel, shortening the total runtime. - -- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to - Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate - the same behaviour as test_ttkguionly (and now also test_tk) which is to - skip the tests if DISPLAY is defined but can't be used. - -- regrtest no longer treats ImportError as equivalent to SkipTest. Imports - that should cause a test to be skipped are now done using import_module - from test support, which does the conversion. - -- Issue #5083: New 'gui' resource for regrtest. - - -Docs ----- - - **(For information about older versions, consult the HISTORY file.)** -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 18:59:24 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 18:59:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_null-merge_with_3=2E3?= Message-ID: <3XVqTm5d79zNPm@mail.python.org> http://hg.python.org/cpython/rev/1ae48928c26f changeset: 79367:1ae48928c26f parent: 79365:b76d29a381a9 parent: 79366:7a7913a11350 user: Georg Brandl date: Mon Oct 01 18:57:34 2012 +0200 summary: null-merge with 3.3 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 18:59:29 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 18:59:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Move_3=2E1=2C_3=2E2_and_3?= =?utf-8?q?=2E3_NEWS_items_to_HISTORY=2E?= Message-ID: <3XVqTs5SlMzQt1@mail.python.org> http://hg.python.org/cpython/rev/ac15e2de062b changeset: 79368:ac15e2de062b user: Georg Brandl date: Mon Oct 01 18:58:45 2012 +0200 summary: Move 3.1, 3.2 and 3.3 NEWS items to HISTORY. files: Misc/HISTORY | 9499 +++++++++++++++++++++++++++++++++++++- Misc/NEWS | 9497 ------------------------------------- 2 files changed, 9497 insertions(+), 9499 deletions(-) diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -3,13 +3,9508 @@ This file contains the release messages for previous Python releases. As you read on you go back to the dark ages of Python's history. -(Note: news about 2.5c2 and later 2.5 releases is in the Misc/NEWS -file of the release25-maint branch.) ====================================================================== +What's New in Python 3.3.0? +=========================== + +*Release date: 29-Sep-2012* + +Core and Builtins +----------------- + +- Issue #16046: Fix loading sourceless legacy .pyo files. + +- Issue #16060: Fix refcounting bug when __trunc__ returns an object + whose __int__ gives a non-integer. Patch by Serhiy Storchaka. + +Extension Modules +----------------- + +- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD() + method doesn't require an argument again. + + +What's New in Python 3.3.0 Release Candidate 3? +=============================================== + +*Release date: 23-Sep-2012* + +Core and Builtins +----------------- + +- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap(). + +- Issue #15926: Fix crash after multiple reinitializations of the interpreter. + +- Issue #15895: Fix FILE pointer leak in one error branch of + PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit + is false an and set_main_loader() fails. + +- Fixes for a few crash and memory leak regressions found by Coverity. + +Library +------- + +- Issue #15882: Change _decimal to accept any coefficient tuple when + constructing infinities. This is done for backwards compatibility + with decimal.py: Infinity coefficients are undefined in _decimal + (in accordance with the specification). + +- Issue #15925: Fix a regression in email.util where the parsedate() and + parsedate_tz() functions did not return None anymore when the argument could + not be parsed. + +Extension Modules +----------------- + +- Issue #15973: Fix a segmentation fault when comparing datetime timezone + objects. + +- Issue #15977: Fix memory leak in Modules/_ssl.c when the function + _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann. + +- Issue #15969: faulthandler module: rename dump_tracebacks_later() to + dump_traceback_later() and cancel_dump_tracebacks_later() to + cancel_dump_traceback_later(). + +- _decimal module: use only C 89 style comments. + + +What's New in Python 3.3.0 Release Candidate 2? +=============================================== + +*Release date: 09-Sep-2012* + +Core and Builtins +----------------- + +- Issue #13992: The trashcan mechanism is now thread-safe. This eliminates + sporadic crashes in multi-thread programs when several long deallocator + chains ran concurrently and involved subclasses of built-in container + types. + +- Issue #15784: Modify OSError.__str__() to better distinguish between + errno error numbers and Windows error numbers. + +- Issue #15781: Fix two small race conditions in import's module locking. + +Library +------- + +- Issue #15847: Fix a regression in argparse, which did not accept tuples + as argument lists anymore. + +- Issue #15828: Restore support for C extensions in imp.load_module(). + +- Issue #15340: Fix importing the random module when /dev/urandom cannot + be opened. This was a regression caused by the hash randomization patch. + +- Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize() + method. + +- Issue #15785: Modify window.get_wch() API of the curses module: return + a character for most keys, and an integer for special keys, instead of + always returning an integer. So it is now possible to distinguish special + keys like keypad keys. + +- Issue #14223: Fix window.addch() of the curses module for special characters + like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now + calling the C function waddch()/mvwaddch() (as it was done in Python 3.2), + instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still + calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked + to libncursesw. + +Build +----- + +- Issue #15822: Really ensure 2to3 grammar pickles are properly installed + (replaces fixes for Issue #15645). + +Documentation +------------- + +- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted + the hashing of multi-dimensional memorviews and memoryviews with multi-byte + item formats. The intended restrictions have now been documented - they + will be correctly enforced in 3.3.1 + + +What's New in Python 3.3.0 Release Candidate 1? +=============================================== + +*Release date: 25-Aug-2012* + +Core and Builtins +----------------- + +- Issue #15573: memoryview comparisons are now performed by value with full + support for any valid struct module format definition. + +- Issue #15316: When an item in the fromlist for __import__ doesn't exist, + don't raise an error, but if an exception is raised as part of an import do + let that propagate. + +- Issue #15778: ensure that str(ImportError(msg)) returns a str + even when msg isn't a str. + +- Issue #2051: Source file permission bits are once again correctly + copied to the cached bytecode file. (The migration to importlib + reintroduced this problem because these was no regression test. A test + has been added as part of this patch) + +- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. + +- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. + Patch by Robin Schreiber. + +- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle + errors correctly. Patch by Serhiy Storchaka. + +- Issue #14846: importlib.FileFinder now handles the case where the + directory being searched is removed after a previous import attempt + +Library +------- + +- Issue #13370: Ensure that ctypes works on Mac OS X when Python is + compiled using the clang compiler + +- Issue #13072: The array module's 'u' format code is now deprecated and + will be removed in Python 4.0. + +- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. + +- Issue #15249: BytesGenerator now correctly mangles From lines (when + requested) even if the body contains undecodable bytes. + +- Issue #15777: Fix a refleak in _posixsubprocess. + +- Issue ##665194: Update email.utils.localtime to use datetime.astimezone and + correctly handle historic changes in UTC offsets. + +- Issue #15199: Fix JavaScript's default MIME type to application/javascript. + Patch by Bohuslav Kabrda. + +- Issue #12643: code.InteractiveConsole now respects sys.excepthook when + displaying exceptions (Patch by Aaron Iles) + +- Issue #13579: string.Formatter now understands the 'a' conversion specifier. + +- Issue #15793: Stack corruption in ssl.RAND_egd(). + Patch by Serhiy Storchaka. + +- Issue #15595: Fix subprocess.Popen(universal_newlines=True) + for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. + +- Issue #15477: In cmath and math modules, add workaround for platforms whose + system-supplied log1p function doesn't respect signs of zeros. + +- Issue #15715: importlib.__import__() will silence an ImportError when the use + of fromlist leads to a failed import. + +- Issue #14669: Fix pickling of connections and sockets on MacOSX + by sending/receiving an acknowledgment after file descriptor transfer. + TestPicklingConnection has been reenabled for MacOSX. + +- Issue #11062: Fix adding a message from file to Babyl mailbox. + +- Issue #15646: Prevent equivalent of a fork bomb when using + multiprocessing on Windows without the "if __name__ == '__main__'" + idiom. + +- Issue #15678: Fix IDLE menus when started from OS X command line + (3.3.0b2 regression). + +C API +----- + +Extension Modules +----------------- + +Tools/Demos +----------- + +Documentation +------------- + +- Issue #14674: Add a discussion of the json module's standard compliance. + Patch by Chris Rebert. + +- Create a 'Concurrent Execution' section in the docs, and split up the + 'Optional Operating System Services' section to use a more user-centric + classification scheme (splitting them across the new CE section, IPC and + text processing). Operating system limitatons can be reflected with + the Sphinx ``:platform:`` tag, it doesn't make sense as part of the Table of + Contents. + +- Issue #4966: Bring the sequence docs up to date for the Py3k transition + and the many language enhancements since they were original written + +- The "path importer" misnomer has been replaced with Eric Snow's + more-awkward-but-at-least-not-wrong suggestion of "path based finder" in + the import system reference docs + +- Issue #15640: Document importlib.abc.Finder as deprecated. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +Tests +----- + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected + tests in test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using + two external hosts that have been configured specifically for this type + of test. + +- Issue #15743: Remove the deprecated method usage in urllib tests. Patch by + Jeff Knupp. + +- Issue #15615: Add some tests for the json module's handling of invalid + input data. Patch by Kushal Das. + +Build +----- + +- Output lib files for PGO build into PGO directory. + +- Pick up 32-bit launcher from PGO directory on 64-bit PGO build. + +- Drop PC\python_nt.h as it's not used. Add input dependency on custom + build step. + +- Issue #15511: Drop explicit dependency on pythonxy.lib from _decimal + amd64 configuration. + +- Add missing PGI/PGO configurations for pywlauncher. + +- Issue #15645: Ensure 2to3 grammar pickles are properly installed. + + +What's New in Python 3.3.0 Beta 2? +================================== + +*Release date: 12-Aug-2012* + +Core and Builtins +----------------- + +- Issue #15568: Fix the return value of "yield from" when StopIteration is + raised by a custom iterator. + +- Issue #13119: sys.stdout and sys.stderr are now using "\r\n" newline on + Windows, as Python 2. + +- Issue #15534: Fix the fast-search function for non-ASCII Unicode strings. + +- Issue #15508: Fix the docstring for __import__ to have the proper default + value of 0 for 'level' and to not mention negative levels since they are not + supported. + +- Issue #15425: Eliminated traceback noise from more situations involving + importlib. + +- Issue #14578: Support modules registered in the Windows registry again. + +- Issue #15466: Stop using TYPE_INT64 in marshal, to make importlib.h (and other + byte code files) equal between 32-bit and 64-bit systems. + +- Issue #1692335: Move initial exception args assignment to + "BaseException.__new__" to help pickling of naive subclasses. + +- Issue #12834: Fix PyBuffer_ToContiguous() for non-contiguous arrays. + +- Issue #15456: Fix code __sizeof__ after #12399 change. Patch by Serhiy + Storchaka. + +- Issue #15404: Refleak in PyMethodObject repr. + +- Issue #15394: An issue in PyModule_Create that caused references to be leaked + on some error paths has been fixed. Patch by Julia Lawall. + +- Issue #15368: An issue that caused bytecode generation to be non-deterministic + has been fixed. + +- Issue #15202: Consistently use the name "follow_symlinks" for new parameters + in os and shutil functions. + +- Issue #15314: __main__.__loader__ is now set correctly during interpreter + startup. + +- Issue #15111: When a module imported using 'from import' has an ImportError + inside itself, don't mask that fact behind a generic ImportError for the + module itself. + +- Issue #15293: Add GC support to the AST base node type. + +- Issue #15291: Fix a memory leak where AST nodes where not properly + deallocated. + +- Issue #15110: Fix the tracebacks generated by "import xxx" to not show the + importlib stack frames. + +- Issue #15020: The program name used to search for Python's path is now + "python3" under Unix, not "python". + +- Issue #15033: Fix the exit status bug when modules invoked using -m swith, + return the proper failure return value (1). Patch contributed by Jeff Knupp. + +- Issue #15229: An OSError subclass whose __init__ doesn't call back + OSError.__init__ could produce incomplete instances, leading to crashes when + calling str() on them. + +- Issue 15307: Virtual environments now use symlinks with framework builds on + Mac OS X, like other POSIX builds. + +Library +------- + +- Issue #15424: Add a __sizeof__ implementation for array objects. Patch by + Ludwig H?hne. + +- Issue #15576: Allow extension modules to act as a package's __init__ module. + +- Issue #15502: Have importlib.invalidate_caches() work on sys.meta_path instead + of sys.path_importer_cache. + +- Issue #15163: Pydoc shouldn't list __loader__ as module data. + +- Issue #15471: Do not use mutable objects as defaults for + importlib.__import__(). + +- Issue #15559: To avoid a problematic failure mode when passed to the bytes + constructor, objects in the ipaddress module no longer implement __index__ + (they still implement __int__ as appropriate) + +- Issue #15546: Fix handling of pathological input data in the peek() and + read1() methods of the BZ2File, GzipFile and LZMAFile classes. + +- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog + ended with '\'. Patch by Roger Serwy. + +- Issue #12655: Instead of requiring a custom type, os.sched_getaffinity and + os.sched_setaffinity now use regular sets of integers to represent the CPUs a + process is restricted to. + +- Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() emulation + code. Patch by Philipp Hagemeister. + +- Issue #15519: Properly expose WindowsRegistryFinder in importlib (and use the + correct term for it). Original patch by Eric Snow. + +- Issue #15502: Bring the importlib ABCs into line with the current state of the + import protocols given PEP 420. Original patch by Eric Snow. + +- Issue #15499: Launching a webbrowser in Unix used to sleep for a few seconds. + Original patch by Anton Barkovsky. + +- Issue #15463: The faulthandler module truncates strings to 500 characters, + instead of 100, to be able to display long file paths. + +- Issue #6056: Make multiprocessing use setblocking(True) on the sockets it + uses. Original patch by J Derek Wilson. + +- Issue #15364: Fix sysconfig.get_config_var('srcdir') to be an absolute path. + +- Issue #15041: Update "see also" list in tkinter documentation. + +- Issue #15413: os.times() had disappeared under Windows. + +- Issue #15402: An issue in the struct module that caused sys.getsizeof to + return incorrect results for struct.Struct instances has been fixed. Initial + patch by Serhiy Storchaka. + +- Issue #15232: When mangle_from is True, email.Generator now correctly mangles + lines that start with 'From ' that occur in a MIME preamble or epilogue. + +- Issue #15094: Incorrectly placed #endif in _tkinter.c. Patch by Serhiy + Storchaka. + +- Issue #13922: argparse no longer incorrectly strips '--'s that appear after + the first one. + +- Issue #12353: argparse now correctly handles null argument values. + +- Issue #10017, issue #14998: Fix TypeError using pprint on dictionaries with + user-defined types as keys or other unorderable keys. + +- Issue #15397: inspect.getmodulename() is now based directly on importlib via a + new importlib.machinery.all_suffixes() API. + +- Issue #14635: telnetlib will use poll() rather than select() when possible to + avoid failing due to the select() file descriptor limit. + +- Issue #15180: Clarify posixpath.join() error message when mixing str & bytes. + +- Issue #15343: pkgutil now includes an iter_importer_modules implementation for + importlib.machinery.FileFinder (similar to the way it already handled + zipimport.zipimporter). + +- Issue #15314: runpy now sets __main__.__loader__ correctly. + +- Issue #15357: The import emulation in pkgutil is now deprecated. pkgutil uses + importlib internally rather than the emulation. + +- Issue #15233: Python now guarantees that callables registered with the atexit + module will be called in a deterministic order. + +- Issue #15238: shutil.copystat now copies Linux "extended attributes". + +- Issue #15230: runpy.run_path now correctly sets __package__ as described in + the documentation. + +- Issue #15315: Support VS 2010 in distutils cygwincompiler. + +- Issue #15294: Fix a regression in pkgutil.extend_path()'s handling of nested + namespace packages. + +- Issue #15056: imp.cache_from_source() and source_from_cache() raise + NotImplementedError when sys.implementation.cache_tag is set to None. + +- Issue #15256: Grammatical mistake in exception raised by imp.find_module(). + +- Issue #5931: wsgiref environ variable SERVER_SOFTWARE will specify an + implementation specific term like CPython, Jython instead of generic "Python". + +- Issue #13248: Remove obsolete argument "max_buffer_size" of BufferedWriter and + BufferedRWPair, from the io module. + +- Issue #13248: Remove obsolete argument "version" of argparse.ArgumentParser. + +- Issue #14814: Implement more consistent ordering and sorting behaviour for + ipaddress objects. + +- Issue #14814: ipaddress network objects correctly return NotImplemented when + compared to arbitrary objects instead of raising TypeError. + +- Issue #14990: Correctly fail with SyntaxError on invalid encoding declaration. + +- Issue #14814: ipaddress now provides more informative error messages when + constructing instances directly (changes permitted during beta due to + provisional API status). + +- Issue #15247: FileIO now raises an error when given a file descriptor pointing + to a directory. + +- Issue #15261: Stop os.stat(fd) crashing on Windows when fd not open. + +- Issue #15166: Implement imp.get_tag() using sys.implementation.cache_tag. + +- Issue #15210: Catch KeyError when importlib.__init__ can't find + _frozen_importlib in sys.modules, not ImportError. + +- Issue #15030: importlib.abc.PyPycLoader now supports the new source size + header field in .pyc files. + +- Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on + flush(). + +- Issue #10571: Fix the "--sign" option of distutils' upload command. Patch by + Jakub Wilk. + +- Issue #9559: If messages were only added, a new file is no longer created and + renamed over the old file when flush() is called on an mbox, MMDF or Babyl + mailbox. + +- Issue 10924: Fixed crypt.mksalt() to use a RNG that is suitable for + cryptographic purpose. + +- Issue #15184: Ensure consistent results of OS X configuration tailoring for + universal builds by factoring out common OS X-specific customizations from + sysconfig, distutils.sysconfig, distutils.util, and distutils.unixccompiler + into a new module _osx_support. + +C API +----- + +- Issue #15610: PyImport_ImportModuleEx() now uses a 'level' of 0 instead of -1. + +- Issues #15169, #14599: Strip out the C implementation of + imp.source_from_cache() used by PyImport_ExecCodeModuleWithPathnames() and + used the Python code instead. Leads to PyImport_ExecCodeModuleObject() to not + try to infer the source path from the bytecode path as + PyImport_ExecCodeModuleWithPathnames() does. + +Extension Modules +----------------- + +- Issue #15676: Now "mmap" check for empty files before doing the + offset check. Patch by Steven Willis. + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields + of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. + +- Issue #15194: Update libffi to the 3.0.11 release. + +Tools/Demos +----------- + +- Issue #15458: python-config gets a new option --configdir to print the $LIBPL + value. + +- Move importlib.test.benchmark to Tools/importbench. + +- Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been + enhanced to show information on more C frames relevant to CPython within the + "py-bt" and "py-bt-full" commands: + + * C frames that are waiting on the GIL + * C frames that are garbage-collecting + * C frames that are due to the invocation of a PyCFunction + +Documentation +------------- + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch + by Serhiy Storchaka. + +- Issue #15295: Reorganize and rewrite the documentation on the import system. + +- Issue #15230: Clearly document some of the limitations of the runpy module and + nudge readers towards importlib when appropriate. + +- Issue #15053: Copy Python 3.3 import lock change notice to all relevant + functions in imp instead of just at the top of the relevant section. + +- Issue #15288: Link to the term "loader" in notes in pkgutil about how things + won't work as expected in Python 3.3 and mark the requisite functions as + "changed" since they will no longer work with modules directly imported by + import itself. + +- Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + +- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tests +----- + +- Issue #15467: Move helpers for __sizeof__ tests into test_support. Patch by + Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running tests + in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15168: Move importlib.test to test.test_importlib. + +- Issue #15091: Reactivate a test on UNIX which was failing thanks to a + forgotten importlib.invalidate_caches() call. + +- Issue #15230: Adopted a more systematic approach in the runpy tests. + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- Issue #15284: Skip {send,recv}msg tests in test_socket when IPv6 is not + enabled. Patch by Brian Brazil. + +- Issue #15277: Fix a resource leak in support.py when IPv6 is disabled. Patch + by Brian Brazil. + +Build +----- + +- Issue #11715: Fix multiarch detection without having Debian development tools + (dpkg-dev) installed. + +- Issue #15037: Build OS X installers with local copy of ncurses 5.9 libraries + to avoid curses.unget_wch bug present in older versions of ncurses such as + those shipped with OS X. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. Also, for + OS X installers, ensure consistent sqlite3 behavior and feature availability + by building a local copy of libsqlite3 rather than depending on the wide range + of versions supplied with various OS X releases. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +- Issue #15431: Add _freeze_importlib project to regenerate importlib.h on + Windows. Patch by Kristj?n Valur J?nsson. + +- Issue #14197: For OS X framework builds, ensure links to the shared library + are created with the proper ABI suffix. + +- Issue #14330: For cross builds, don't use host python, use host search paths + for host compiler. + +- Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. + +- Issue #15268: Search curses.h in /usr/include/ncursesw. + + +What's New in Python 3.3.0 Beta 1? +================================== + +*Release date: 27-Jun-2012* + +Core and Builtins +----------------- + +- Fix a (most likely) very rare memory leak when calling main() and not being + able to decode a command-line argument. + +- Issue #14815: Use Py_ssize_t instead of long for the object hash, to + preserve all 64 bits of hash on Win64. + +- Issue #12268: File readline, readlines and read() or readall() methods + no longer lose data when an underlying read system call is interrupted. + IOError is no longer raised due to a read system call returning EINTR + from within these methods. + +- Issue #11626: Add _SizeT functions to stable ABI. + +- Issue #15146: Add PyType_FromSpecWithBases. Patch by Robin Schreiber. + +- Issue #15142: Fix reference leak when deallocating instances of types + created using PyType_FromSpec(). + +- Issue #15042: Add PyState_AddModule and PyState_RemoveModule. Add version + guard for Py_LIMITED_API additions. Patch by Robin Schreiber. + +- Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on + the work by Hirokazu Yamamoto. + +- Issue #15096: Removed support for ur'' as the raw notation isn't + compatible with Python 2.x's raw unicode strings. + +- Issue #13783: Generator objects now use the identifier APIs internally + +- Issue #14874: Restore charmap decoding speed to pre-PEP 393 levels. + Patch by Serhiy Storchaka. + +- Issue #15026: utf-16 encoding is now significantly faster (up to 10x). + Patch by Serhiy Storchaka. + +- Issue #11022: open() and io.TextIOWrapper are now calling + locale.getpreferredencoding(False) instead of locale.getpreferredencoding() + in text mode if the encoding is not specified. Don't change temporary the + locale encoding using locale.setlocale(), use the current locale encoding + instead of the user preferred encoding. + +- Issue #14673: Add Eric Snow's sys.implementation implementation. + +- Issue #15038: Optimize python Locks on Windows. + +Library +------- + +- Issue #9803: Don't close IDLE on saving if breakpoint is open. + Patch by Roger Serwy. + +- Issue #12288: Consider '0' and '0.0' as valid initialvalue + for tkinter SimpleDialog. + +- Issue #15512: Add a __sizeof__ implementation for parser. + Patch by Serhiy Storchaka. + +- Issue #15469: Add a __sizeof__ implementation for deque objects. + Patch by Serhiy Storchaka. + +- Issue #15489: Add a __sizeof__ implementation for BytesIO objects. + Patch by Serhiy Storchaka. + +- Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. + Patch by Serhiy Storchaka. + +- Issue #15514: Correct __sizeof__ support for cpu_set. + Patch by Serhiy Storchaka. + +- Issue #15187: Bugfix: remove temporary directories test_shutil was leaving + behind. + +- Issue #15177: Added dir_fd parameter to os.fwalk(). + +- Issue #15176: Clarified behavior, documentation, and implementation + of os.listdir(). + +- Issue #15061: Re-implemented hmac.compare_digest() in C to prevent further + timing analysis and to support all buffer protocol aware objects as well as + ASCII only str instances safely. + +- Issue #15164: Change return value of platform.uname() from a + plain tuple to a collections.namedtuple. + +- Support Mageia Linux in the platform module. + +- Issue #11678: Support Arch linux in the platform module. + +- Issue #15118: Change return value of os.uname() and os.times() from + plain tuples to immutable iterable objects with named attributes + (structseq objects). + +- Speed up _decimal by another 10-15% by caching the thread local context + that was last accessed. In the pi benchmark (64-bit platform, prec=9), + _decimal is now only 1.5x slower than float. + +- Remove the packaging module, which is not ready for prime time. + +- Issue #15154: Add "dir_fd" parameter to os.rmdir, remove "rmdir" + parameter from os.remove / os.unlink. + +- Issue #4489: Add a shutil.rmtree that isn't susceptible to symlink attacks. + It is used automatically on platforms supporting the necessary os.openat() + and os.unlinkat() functions. Main code by Martin von L?wis. + +- Issue #15156: HTMLParser now uses the new "html.entities.html5" dictionary. + +- Issue #11113: add a new "html5" dictionary containing the named character + references defined by the HTML5 standard and the equivalent Unicode + character(s) to the html.entities module. + +- Issue #15114: the strict mode of HTMLParser and the HTMLParseError exception + are deprecated now that the parser is able to parse invalid markup. + +- Issue #3665: \u and \U escapes are now supported in unicode regular + expressions. Patch by Serhiy Storchaka. + +- Issue #15153: Added inspect.getgeneratorlocals to simplify white box + testing of generator state updates + +- Issue #13062: Added inspect.getclosurevars to simplify testing stateful + closures + +- Issue #11024: Fixes and additional tests for Time2Internaldate. + +- Issue #14626: Large refactoring of functions / parameters in the os module. + Many functions now support "dir_fd" and "follow_symlinks" parameters; + some also support accepting an open file descriptor in place of of a path + string. Added os.support_* collections as LBYL helpers. Removed many + functions only previously seen in 3.3 alpha releases (often starting with + "f" or "l", or ending with "at"). Originally suggested by Serhiy Storchaka; + implemented by Larry Hastings. + +- Issue #15008: Implement PEP 362 "Signature Objects". + Patch by Yury Selivanov. + +- Issue: #15138: base64.urlsafe_{en,de}code() are now 3-4x faster. + +- Issue #444582: Add shutil.which, for finding programs on the system path. + Original patch by Erik Demaine, with later iterations by Jan Killian + and Brian Curtin. + +- Issue #14837: SSL errors now have ``library`` and ``reason`` attributes + describing precisely what happened and in which OpenSSL submodule. The + str() of a SSLError is also enhanced accordingly. + +- Issue #9527: datetime.astimezone() method will now supply a class + timezone instance corresponding to the system local timezone when + called with no arguments. + +- Issue #14653: email.utils.mktime_tz() no longer relies on system + mktime() when timezone offest is supplied. + +- Issue #14684: zlib.compressobj() and zlib.decompressobj() now support the use + of predefined compression dictionaries. Original patch by Sam Rushing. + +- Fix GzipFile's handling of filenames given as bytes objects. + +- Issue #14772: Return destination values from some shutil functions. + +- Issue #15064: Implement context manager protocol for multiprocessing types + +- Issue #15101: Make pool finalizer avoid joining current thread. + +- Issue #14657: The frozen instance of importlib used for bootstrap is now + also the module imported as importlib._bootstrap. + +- Issue #14055: Add __sizeof__ support to _elementtree. + +- Issue #15054: A bug in tokenize.tokenize that caused string literals + with 'b' prefixes to be incorrectly tokenized has been fixed. + Patch by Serhiy Storchaka. + +- Issue #15006: Allow equality comparison between naive and aware + time or datetime objects. + +- Issue #14982: Document that pkgutil's iteration functions require the + non-standard iter_modules() method to be defined by an importer (something + the importlib importers do not define). + +- Issue #15036: Mailbox no longer throws an error if a flush is done + between operations when removing or changing multiple items in mbox, + MMDF, or Babyl mailboxes. + +- Issue #14059: Implement multiprocessing.Barrier. + +- Issue #15061: The inappropriately named hmac.secure_compare has been + renamed to hmac.compare_digest, restricted to operating on bytes inputs + only and had its documentation updated to more accurately reflect both its + intent and its limitations + +- Issue #13841: Make child processes exit using sys.exit() on Windows. + +- Issue #14936: curses_panel was converted to PEP 3121 and PEP 384 API. + Patch by Robin Schreiber. + +- Issue #1667546: On platforms supporting tm_zone and tm_gmtoff fields + in struct tm, time.struct_time objects returned by time.gmtime(), + time.localtime() and time.strptime() functions now have tm_zone and + tm_gmtoff attributes. Original patch by Paul Boddie. + +- Rename adjusted attribute to adjustable in time.get_clock_info() result. + +- Issue #3518: Remove references to non-existent BaseManager.from_address() + method. + +- Issue #13857: Added textwrap.indent() function (initial patch by Ezra + Berch) + +- Issue #2736: Added datetime.timestamp() method. + +- Issue #13854: Make multiprocessing properly handle non-integer + non-string argument to SystemExit. + +- Issue #12157: Make pool.map() empty iterables correctly. Initial + patch by mouad. + +- Issue #11823: disassembly now shows argument counts on calls with keyword args. + +- Issue #14711: os.stat_float_times() has been deprecated. + +- LZMAFile now accepts the modes "rb"/"wb"/"ab" as synonyms of "r"/"w"/"a". + +- The bz2 and lzma modules now each contain an open() function, allowing + compressed files to readily be opened in text mode as well as binary mode. + +- BZ2File.__init__() and LZMAFile.__init__() now accept a file object as their + first argument, rather than requiring a separate "fileobj" argument. + +- gzip.open() now accepts file objects as well as filenames. + +- Issue #14992: os.makedirs(path, exist_ok=True) would raise an OSError + when the path existed and had the S_ISGID mode bit set when it was + not explicitly asked for. This is no longer an exception as mkdir + cannot control if the OS sets that bit for it or not. + +- Issue #14989: Make the CGI enable option to http.server available via command + line. + +- Issue #14987: Add a missing import statement to inspect. + +- Issue #1079: email.header.decode_header now correctly parses all the examples + in RFC2047. There is a necessary visible behavior change: the leading and/or + trailing whitespace on ASCII parts is now preserved. + +- Issue #14969: Better handling of exception chaining in contextlib.ExitStack + +- Issue #14962: Update text coloring in IDLE shell window after changing + options. Patch by Roger Serwy. + +- Issue #14963: Convert contextlib.ExitStack.__exit__ to use an iterative + algorithm (Patch by Alon Horev) + +- Issue #14785: Add sys._debugmallocstats() to help debug low-level memory + allocation issues + +- Issue #14443: Ensure that .py files are byte-compiled with the correct Python + executable within bdist_rpm even on older versions of RPM + +C-API +----- + +- Issue #13783: Inadvertent additions to the public C API in the PEP 380 + implementation have either been removed or marked as private interfaces. + +Extension Modules +----------------- + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +Documentation +------------- + +- Issue #15081: Document PyState_FindModule. + Patch by Robin Schreiber. + +- Issue #14814: Added first draft of ipaddress module API reference + +Tests +----- + +- Issue #14769: test_capi now has SkipitemTest, which cleverly checks + for "parity" between PyArg_ParseTuple() and the Python/getargs.c static + function skipitem() for all possible "format units". + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14963: Add test cases for exception handling behaviour + in contextlib.ExitStack (Initial patch by Alon Horev) + +Build +----- + +- Issue #13590: Improve support for OS X Xcode 4: + * Try to avoid building Python or extension modules with problematic + llvm-gcc compiler. + * Since Xcode 4 removes ppc support, extension module builds now + check for ppc compiler support and automatically remove ppc and + ppc64 archs when not available. + * Since Xcode 4 no longer install SDKs in default locations, + extension module builds now revert to using installed headers + and libs if the SDK used to build the interpreter is not + available. + * Update ./configure to use better defaults for universal builds; + in particular, --enable-universalsdk=yes uses the Xcode default + SDK and --with-universal-archs now defaults to "intel" if ppc + not available. + +- Issue #14225: Fix Unicode support for curses (#12567) on OS X + +- Issue #14928: Fix importlib bootstrap issues by using a custom executable + (Modules/_freeze_importlib) to build Python/importlib.h. + + +What's New in Python 3.3.0 Alpha 4? +=================================== + +*Release date: 31-May-2012* + +Core and Builtins +----------------- + +- Issue #14835: Make plistlib output empty arrays & dicts like OS X. + Patch by Sidney San Mart?n. + +- Issue #14744: Use the new _PyUnicodeWriter internal API to speed up + str%args and str.format(args). + +- Issue #14930: Make memoryview objects weakrefable. + +- Issue #14775: Fix a potential quadratic dict build-up due to the garbage + collector repeatedly trying to untrack dicts. + +- Issue #14857: fix regression in references to PEP 3135 implicit __class__ + closure variable (Reopens issue #12370) + +- Issue #14712 (PEP 405): Virtual environments. Implemented by Vinay Sajip. + +- Issue #14660 (PEP 420): Namespace packages. Implemented by Eric Smith. + +- Issue #14494: Fix __future__.py and its documentation to note that + absolute imports are the default behavior in 3.0 instead of 2.7. + Patch by Sven Marnach. + +- Issue #9260: A finer-grained import lock. Most of the import sequence + now uses per-module locks rather than the global import lock, eliminating + well-known issues with threads and imports. + +- Issue #14624: UTF-16 decoding is now 3x to 4x faster on various inputs. + Patch by Serhiy Storchaka. + +- asdl_seq and asdl_int_seq are now Py_ssize_t sized. + +- Issue #14133 (PEP 415): Implement suppression of __context__ display with an + attribute on BaseException. This replaces the original mechanism of PEP 409. + +- Issue #14417: Mutating a dict during lookup now restarts the lookup instead + of raising a RuntimeError (undoes issue #14205). + +- Issue #14738: Speed-up UTF-8 decoding on non-ASCII data. Patch by Serhiy + Storchaka. + +- Issue #14700: Fix two broken and undefined-behaviour-inducing overflow checks + in old-style string formatting. + +- Issue #14705: The PyArg_Parse() family of functions now support the 'p' format + unit, which accepts a "boolean predicate" argument. It converts any Python + value into an integer--0 if it is "false", and 1 otherwise. + +Library +------- + +- Issue #14690: Use monotonic clock instead of system clock in the sched, + subprocess and trace modules. + +- Issue #14958: Change IDLE systax highlighting to recognize all string and + byte literals supported in Python 3.3. + +- Issue #10997: Prevent a duplicate entry in IDLE's "Recent Files" menu. + +- Issue #14443: Tell rpmbuild to use the correct version of Python in + bdist_rpm. Initial patch by Ross Lagerwall. + +- Issue #14929: Stop Idle 3.x from closing on Unicode decode errors when + grepping. Patch by Roger Serwy. + +- Issue #12515: email now registers a defect if it gets to EOF while parsing + a MIME part without seeing the closing MIME boundary. + +- Issue #12510: Attempting to get invalid tooltip no longer closes Idle. + Other tooltipss have been corrected or improved and the number of tests + has been tripled. Original patch by Roger Serwy. + +- Issue #1672568: email now always decodes base64 payloads, adding padding and + ignoring non-base64-alphabet characters if needed, and registering defects + for any such problems. + +- Issue #14925: email now registers a defect when the parser decides that there + is a missing header/body separator line. MalformedHeaderDefect, which the + existing code would never actually generate, is deprecated. + +- Issue #10365: File open dialog now works instead of crashing even when + the parent window is closed before the dialog. Patch by Roger Serwy. + +- Issue #8739: Updated smtpd to support RFC 5321, and added support for the + RFC 1870 SIZE extension. + +- Issue #665194: Added a localtime function to email.utils to provide an + aware local datetime for use in setting Date headers. + +- Issue #12586: Added new provisional policies that implement convenient + unicode support for email headers. See What's New for details. + +- Issue #14731: Refactored email Policy framework to support full backward + compatibility with Python 3.2 by default yet allow for the introduction of + new features through new policies. Note that Policy.must_be_7bit is renamed + to cte_type. + +- Issue #14876: Use user-selected font for highlight configuration. + +- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals. + Have ascii characters in help. + +- Issue #14548: Make multiprocessing finalizers check pid before + running to cope with possibility of gc running just after fork. + +- Issue #14863: Update the documentation of os.fdopen() to reflect the + fact that it's only a thin wrapper around open() anymore. + +- Issue #14036: Add an additional check to validate that port in urlparse does + not go in illegal range and returns None. + +- Issue #14862: Add missing names to os.__all__ + +- Issue #14875: Use float('inf') instead of float('1e66666') in the json module. + +- Issue #13585: Added contextlib.ExitStack + +- PEP 3144, Issue #14814: Added the ipaddress module + +- Issue #14426: Correct the Date format in Expires attribute of Set-Cookie + Header in Cookie.py. + +- Issue #14588: The types module now provide new_class() and prepare_class() + functions to support PEP 3115 compliant dynamic class creation. Patch by + Daniel Urban and Nick Coghlan. + +- Issue #13152: Allow to specify a custom tabsize for expanding tabs in + textwrap. Patch by John Feuerstein. + +- Issue #14721: Send the correct 'Content-length: 0' header when the body is an + empty string ''. Initial Patch contributed by Arve Knudsen. + +- Issue #14072: Fix parsing of 'tel' URIs in urlparse by making the check for + ports stricter. + +- Issue #9374: Generic parsing of query and fragment portions of url for any + scheme. Supported both by RFC3986 and RFC2396. + +- Issue #14798: Fix the functions in pyclbr to raise an ImportError + when the first part of a dotted name is not a package. Patch by + Xavier de Gaye. + +- Issue #12098: multiprocessing on Windows now starts child processes + using the same sys.flags as the current process. Initial patch by + Sergey Mezentsev. + +- Issue #13031: Small speed-up for tarfile when unzipping tarfiles. + Patch by Justin Peel. + +- Issue #14780: urllib.request.urlopen() now has a ``cadefault`` argument + to use the default certificate store. Initial patch by James Oakley. + +- Issue #14829: Fix bisect and range() indexing with large indices + (>= 2 ** 32) under 64-bit Windows. + +- Issue #14732: The _csv module now uses PEP 3121 module initialization. + Patch by Robin Schreiber. + +- Issue #14809: Add HTTP status codes introduced by RFC 6585 to http.server + and http.client. Patch by EungJun Yi. + +- Issue #14777: tkinter may return undecoded UTF-8 bytes as a string when + accessing the Tk clipboard. Modify clipboad_get() to first request type + UTF8_STRING when no specific type is requested in an X11 windowing + environment, falling back to the current default type STRING if that fails. + Original patch by Thomas Kluyver. + +- Issue #14773: Fix os.fwalk() failing on dangling symlinks. + +- Issue #12541: Be lenient with quotes around Realm field of HTTP Basic + Authentation in urllib2. + +- Issue #14807: move undocumented tarfile.filemode() to stat.filemode() and add + doc entry. Add tarfile.filemode alias with deprecation warning. + +- Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects. + +- Issue #14532: Add a secure_compare() helper to the hmac module, to mitigate + timing attacks. Patch by Jon Oberheide. + +- Add importlib.util.resolve_name(). + +- Issue #14366: Support lzma compression in zip files. + Patch by Serhiy Storchaka. + +- Issue #13959: Introduce importlib.find_loader() and document + imp.find_module/load_module as deprecated. + +- Issue #14082: shutil.copy2() now copies extended attributes, if possible. + Patch by Hynek Schlawack. + +- Issue #13959: Make importlib.abc.FileLoader.load_module()/get_filename() and + importlib.machinery.ExtensionFileLoader.load_module() have their single + argument be optional. Allows for the replacement (and thus deprecation) of + imp.load_source()/load_package()/load_compiled(). + +- Issue #13959: imp.get_suffixes() has been deprecated in favour of the new + attributes on importlib.machinery: SOURCE_SUFFIXES, DEBUG_BYTECODE_SUFFIXES, + OPTIMIZED_BYTECODE_SUFFIXES, BYTECODE_SUFFIXES, and EXTENSION_SUFFIXES. This + led to an indirect deprecation of inspect.getmoduleinfo(). + +- Issue #14662: Prevent shutil failures on OS X when destination does not + support chflag operations. Patch by Hynek Schlawack. + +- Issue #14157: Fix time.strptime failing without a year on February 29th. + Patch by Hynek Schlawack. + +- Issue #14753: Make multiprocessing's handling of negative timeouts + the same as it was in Python 3.2. + +- Issue #14583: Fix importlib bug when a package's __init__.py would first + import one of its modules then raise an error. + +- Issue #14741: Fix missing support for Ellipsis ('...') in parser module. + +- Issue #14697: Fix missing support for set displays and set comprehensions in + parser module. + +- Issue #14701: Fix missing support for 'raise ... from' in parser module. + +- Add support for timeouts to the acquire() methods of + multiprocessing's lock/semaphore/condition proxies. + +- Issue #13989: Add support for text mode to gzip.open(). + +- Issue #14127: The os.stat() result object now provides three additional + fields: st_ctime_ns, st_mtime_ns, and st_atime_ns, providing those times as an + integer with nanosecond resolution. The functions os.utime(), os.lutimes(), + and os.futimes() now accept a new parameter, ns, which accepts mtime and atime + as integers with nanosecond resolution. + +- Issue #14127 and #10148: shutil.copystat now preserves exact mtime and atime + on filesystems providing nanosecond resolution. + +Tools/Demos +----------- + +- Issue #14695: Bring Tools/parser/unparse.py support up to date with + the Python 3.3 Grammar. + +Build +----- + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c. + +- Issue #14693: Under non-Windows platforms, hashlib's fallback modules are + always compiled, even if OpenSSL is present at build time. + +- Issue #13210: Windows build now uses VS2010, ported from VS2008. + +Documentation +------------- + +- Issue #14588: The language reference now accurately documents the Python 3 + class definition process. Patch by Nick Coghlan. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + + +What's New in Python 3.3.0 Alpha 3? +=================================== + +*Release date: 01-May-2012* + +Core and Builtins +----------------- + +- Issue #14699: Fix calling the classmethod descriptor directly. + +- Issue #14433: Prevent msvcrt crash in interactive prompt when stdin is closed. + +- Issue #14521: Make result of float('nan') and float('-nan') more consistent + across platforms. + +- Issue #14646: __import__() sets __loader__ if the loader did not. + +- Issue #14605: No longer have implicit entries in sys.meta_path. If + sys.meta_path is found to be empty, raise ImportWarning. + +- Issue #14605: No longer have implicit entries in sys.path_hooks. If + sys.path_hooks is found to be empty, a warning will be raised. None is now + inserted into sys.path_importer_cache if no finder was discovered. This also + means imp.NullImporter is no longer implicitly used. + +- Issue #13903: Implement PEP 412. Individual dictionary instances can now share + their keys with other dictionaries. Classes take advantage of this to share + their instance dictionary keys for improved memory and performance. + +- Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError + when repr() or str() is called on such an object. + +- Issue #14658: Fix binding a special method to a builtin implementation of a + special method with a different name. + +- Issue #14630: Fix a memory access bug for instances of a subclass of int + with value 0. + +- Issue #14339: Speed improvements to bin, oct and hex functions. Patch by + Serhiy Storchaka. + +- Issue #14098: New functions PyErr_GetExcInfo and PyErr_SetExcInfo. + Patch by Stefan Behnel. + +- Issue #14385: It is now possible to use a custom type for the __builtins__ + namespace, instead of a dict. It can be used for sandboxing for example. + Raise also a NameError instead of ImportError if __build_class__ name if not + found in __builtins__. + +- Issue #12599: Be more strict in accepting None compared to a false-like + object for importlib.util.module_for_loader and + importlib.machinery.PathFinder. + +- Issue #14612: Fix jumping around with blocks by setting f_lineno. + +- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in + globals raises a KeyError. + +- Issue #14607: Fix keyword-only arguments which started with ``__``. + +- Issue #10854: The ImportError raised when an extension module on Windows + fails to import now uses the new path and name attributes from + Issue #1559549. + +- Issue #13889: Check and (if necessary) set FPU control word before calling + any of the dtoa.c string <-> float conversion functions, on MSVC builds of + Python. This fixes issues when embedding Python in a Delphi app. + +- __import__() now matches PEP 328 and documentation by defaulting 'index' to 0 + instead of -1 and removing support for negative values. + +- Issue #2377: Make importlib the implementation of __import__(). + +- Issue #1559549: ImportError now has 'name' and 'path' attributes that are set + using keyword arguments to its constructor. They are currently not set by + import as they are meant for use by importlib. + +- Issue #14474: Save and restore exception state in thread.start_new_thread() + while writing error message if the thread leaves a unhandled exception. + +- Issue #13019: Fix potential reference leaks in bytearray.extend(). Patch + by Suman Saha. + +Library +------- + +- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'. + +- Issue #14371: Support bzip2 in zipfile module. Patch by Serhiy Storchaka. + +- Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running + step. Patch by Xavier de Gaye. + +- Issue #14696: Fix parser module to understand 'nonlocal' declarations. + +- Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near + the DST transition. Patch by Joe Peterson. + +- Issue #9154: Fix parser module to understand function annotations. + +- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the + client ip address instead client hostname. Patch by Charles-Fran?ois Natali. + +- Issue #14309: Deprecate time.clock(), use time.perf_counter() or + time.process_time() instead. + +- Issue #14428: Implement the PEP 418. Add time.get_clock_info(), + time.perf_counter() and time.process_time() functions, and rename + time.steady() to time.monotonic(). + +- Issue #14646: importlib.util.module_for_loader() now sets __loader__ and + __package__ (when possible). + +- Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a + test class that doesn't inherit from TestCase (i.e. a mixin). + +- Issue #4892: multiprocessing Connections can now be transferred over + multiprocessing Connections. Patch by Richard Oudkerk (sbt). + +- Issue #14160: TarFile.extractfile() failed to resolve symbolic links when + the links were not located in an archive subdirectory. + +- Issue #14638: pydoc now treats non-string __name__ values as if they + were missing, instead of raising an error. + +- Issue #13684: Fix httplib tunnel issue of infinite loops for certain sites + which send EOF without trailing \r\n. + +- Issue #14605: Add importlib.abc.FileLoader, importlib.machinery.(FileFinder, + SourceFileLoader, SourcelessFileLoader, ExtensionFileLoader). + +- Issue #13959: imp.cache_from_source()/source_from_cache() now follow + os.path.join()/split() semantics for path manipulation instead of its prior, + custom semantics of caring the right-most path separator forward in path + joining. + +- Issue #2193: Allow ":" character in Cookie NAME values. + +- Issue #14629: tokenizer.detect_encoding will specify the filename in the + SyntaxError exception if found at readline.__self__.name. + +- Issue #14629: Raise SyntaxError in tokenizer.detect_encoding if the + first two lines have non-UTF-8 characters without an encoding declaration. + +- Issue #14308: Fix an exception when a "dummy" thread is in the threading + module's active list after a fork(). + +- Issue #11750: The Windows API functions scattered in the _subprocess and + _multiprocessing.win32 modules now live in a single module "_winapi". + Patch by sbt. + +- Issue #14087: multiprocessing: add Condition.wait_for(). Patch by sbt. + +- Issue #14538: HTMLParser can now parse correctly start tags that contain + a bare '/'. + +- Issue #14452: SysLogHandler no longer inserts a UTF-8 BOM into the message. + +- Issue #14386: Expose the dict_proxy internal type as types.MappingProxyType. + +- Issue #13959: Make imp.reload() always use a module's __loader__ to perform + the reload. + +- Issue #13959: Add imp.py and rename the built-in module to _imp, allowing for + re-implementing parts of the module in pure Python. + +- Issue #13496: Fix potential overflow in bisect.bisect algorithm when applied + to a collection of size > sys.maxsize / 2. + +- Have importlib take advantage of ImportError's new 'name' and 'path' + attributes. + +- Issue #14399: zipfile now recognizes that the archive has been modified even + if only the comment is changed. In addition, the TypeError that results from + trying to set a non-binary value as a comment is now now raised at the time + the comment is set rather than at the time the zipfile is written. + +- trace.CoverageResults.is_ignored_filename() now ignores any name that starts + with "<" and ends with ">" instead of special-casing "" and + ". + +- IDLE can be launched as python -m idlelib + +- Issue #14295: Add unittest.mock + +- Issue #7652: Add --with-system-libmpdec option to configure for linking + the _decimal module against an installed libmpdec. + +- Issue #14380: MIMEText now defaults to utf-8 when passed non-ASCII unicode + with no charset specified. + +- Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on + OSX; avoid to call handle_connect in case of a disconnected socket which + was not meant to connect. + +- Issue #14204: The ssl module now has support for the Next Protocol + Negotiation extension, if available in the underlying OpenSSL library. + Patch by Colin Marc. + +- Issue #3035: Unused functions from tkinter are marked as pending deprecated. + +- Issue #12757: Fix the skipping of doctests when python is run with -OO so + that it works in unittest's verbose mode as well as non-verbose mode. + +- Issue #7652: Integrate the decimal floating point libmpdec library to speed + up the decimal module. Performance gains of the new C implementation are + between 10x and 100x, depending on the application. + +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)) (Patch by Guilherme Polo) + +- Issue #14269: SMTPD now conforms to the RFC and requires a HELO command + before MAIL, RCPT, or DATA. + +- Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr + attribute. + +- Issue #14344: fixed the repr of email.policy objects. + +- Issue #11686: Added missing entries to email package __all__ lists + (mostly the new Bytes classes). + +- Issue #14335: multiprocessing's custom Pickler subclass now inherits from + the C-accelerated implementation. Patch by sbt. + +- Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem. + +- Issue #11199: Fix the with urllib which hangs on particular ftp urls. + +- Improve the memory utilization and speed of functools.lru_cache. + +- Issue #14222: Use the new time.steady() function instead of time.time() for + timeout in queue and threading modules to not be affected of system time + update. + +- Issue #13248: Remove lib2to3.pytree.Base.get_prefix/set_prefix. + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + +- Issue #14200: Idle shell crash on printing non-BMP unicode character. + +- Issue #12818: format address no longer needlessly \ escapes ()s in names when + the name ends up being quoted. + +- Issue #14062: BytesGenerator now correctly folds Header objects, + including using linesep when folding. + +- Issue #13839: When invoked on the command-line, the pstats module now + accepts several filenames of profile stat files and merges them all. + Patch by Matt Joiner. + +- Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers + instead of raising an error. This fixes a regression relative to 2.7. + +- Issue #989712: Support using Tk without a mainloop. + +- Issue #5219: Prevent event handler cascade in IDLE. + +- Issue #3835: Refuse to use unthreaded Tcl in threaded Python. + +- Issue #2843: Add new Tk API to Tkinter. + +- Issue #14184: Increase the default stack size for secondary threads on + Mac OS X to avoid interpreter crashes when using threads on 10.7. + +- Issue #14180: datetime.date.fromtimestamp(), + datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() + now raise an OSError instead of ValueError if localtime() or gmtime() failed. + +- Issue #14180: time.ctime(), gmtime(), time.localtime(), + datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and + datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of + a ValueError, if the timestamp does not fit in time_t. + +- Issue #14180: datetime.datetime.fromtimestamp() and + datetime.datetime.utcfromtimestamp() now round microseconds towards zero + instead of rounding to nearest with ties going away from zero. + +- Issue #10543: Fix unittest test discovery with Jython bytecode files. + +- Issue #1178863: Separate initialisation from setting when initializing + Tkinter.Variables; harmonize exceptions to ValueError; only delete variables + that have not been deleted; assert that variable names are strings. + +- Issue #14104: Implement time.monotonic() on Mac OS X, patch written by + Nicholas Riley. + +- Issue #13394: the aifc module now uses warnings.warn() to signal warnings. + +- Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under + Windows when the child process has already exited. + +- Issue #14223: curses.addch() is no more limited to the range 0-255 when the + Python curses is not linked to libncursesw. It was a regression introduced + in Python 3.3a1. + +- Issue #14168: Check for presence of Element._attrs in minidom before + accessing it. + +- Issue #12328: Fix multiprocessing's use of overlapped I/O on Windows. + Also, add a multiprocessing.connection.wait(rlist, timeout=None) function + for polling multiple objects at once. Patch by sbt. + +- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end, + data or close method) for the Python implementation as well. + Drop the no-op TreeBuilder().xml() method from the C implementation. + +- Issue #14210: pdb now has tab-completion not only for command names, but + also for their arguments, wherever possible. + +- Issue #14310: Sockets can now be with other processes on Windows using + the api socket.socket.share() and socket.fromshare(). + +- Issue #10576: The gc module now has a 'callbacks' member that will get + called when garbage collection takes place. + +Build +----- + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14321: Do not run pgen during the build if files are up to date. + +Documentation +------------- + +- Issue #14034: added the argparse tutorial. + +- Issue #14324: Fix configure tests for cross builds. + +- Issue #14327: Call AC_CANONICAL_HOST in configure.ac and check in + config.{guess,sub}. Don't use uname calls for cross builds. + +Extension Modules +----------------- + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +- Issue #14259: The finditer() method of re objects did not take any + keyword arguments, contrary to the documentation. + +- Issue #10142: Support for SEEK_HOLE/SEEK_DATA (for example, under ZFS). + +Tests +----- + +- Issue #14442: Add missing errno import in test_smtplib. + +- Issue #8315: (partial fix) python -m unittest test.test_email now works. + + +What's New in Python 3.3.0 Alpha 1? +=================================== + +*Release date: 05-Mar-2012* + +Core and Builtins +----------------- + +- Issue #14172: Fix reference leak when marshalling a buffer-like object + (other than a bytes object). + +- Issue #13521: dict.setdefault() now does only one lookup for the given key, + making it "atomic" for many purposes. Patch by Filip Gruszczy?ski. + +- PEP 409, Issue #6210: "raise X from None" is now supported as a means of + suppressing the display of the chained exception context. The chained + context still remains available as the __context__ attribute. + +- Issue #10181: New memoryview implementation fixes multiple ownership + and lifetime issues of dynamically allocated Py_buffer members (#9990) + as well as crashes (#8305, #7433). Many new features have been added + (See whatsnew/3.3), and the documentation has been updated extensively. + The ndarray test object from _testbuffer.c implements all aspects of + PEP-3118, so further development towards the complete implementation + of the PEP can proceed in a test-driven manner. + + Thanks to Nick Coghlan, Antoine Pitrou and Pauli Virtanen for review + and many ideas. + +- Issue #12834: Fix incorrect results of memoryview.tobytes() for + non-contiguous arrays. + +- Issue #5231: Introduce memoryview.cast() method that allows changing + format and shape without making a copy of the underlying memory. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Upgrade Unicode data to Unicode 6.1. + +- Issue #14040: Remove rarely used file name suffixes for C extensions + (under POSIX mainly). + +- Issue #14051: Allow arbitrary attributes to be set of classmethod and + staticmethod. + +- Issue #13703: oCERT-2011-003: Randomize hashes of str and bytes to protect + against denial of service attacks due to hash collisions within the dict and + set types. Patch by David Malcolm, based on work by Victor Stinner. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Issue #12705: A SyntaxError exception is now raised when attempting to + compile multiple statements as a single interactive statement. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Issue #13752: Add a casefold() method to str. + +- Issue #13761: Add a "flush" keyword argument to the print() function, + used to ensure flushing the output stream. + +- Issue #13645: pyc files now contain the size of the corresponding source + code, to avoid timestamp collisions (especially on filesystems with a low + timestamp resolution) when checking for freshness of the bytecode. + +- PEP 380, Issue #11682: Add "yield from " to support easy delegation to + subgenerators (initial patch by Greg Ewing, integration into 3.3 by + Renaud Blanch, Ryan Kelly, Zbigniew J?drzejewski-Szmek and Nick Coghlan) + +- Issue #13748: Raw bytes literals can now be written with the ``rb`` prefix + as well as ``br``. + +- Issue #12736: Use full unicode case mappings for upper, lower, and title case. + +- Issue #12760: Add a create mode to open(). Patch by David Townshend. + +- Issue #13738: Simplify implementation of bytes.lower() and bytes.upper(). + +- Issue #13577: Built-in methods and functions now have a __qualname__. + Patch by sbt. + +- Issue #6695: Full garbage collection runs now clear the freelist of set + objects. Initial patch by Matthias Troffaes. + +- Fix OSError.__init__ and OSError.__new__ so that each of them can be + overriden and take additional arguments (followup to issue #12555). + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #13503: Use a more efficient reduction format for bytearrays with + pickle protocol >= 3. The old reduction format is kept with older protocols + in order to allow unpickling under Python 2. Patch by Irmen de Jong. + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #11849: Ensure that free()d memory arenas are really released + on POSIX systems supporting anonymous memory mappings. Patch by + Charles-Fran?ois Natali. + +- Issue #13452: PyUnicode_EncodeDecimal() doesn't support error handlers + different than "strict" anymore. The caller was unable to compute the + size of the output buffer: it depends on the error handler. + +- PEP 3155 / issue #13448: Qualified name for classes and functions. + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13411: memoryview objects are now hashable when the underlying + object is hashable. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #10227: Add an allocation cache for a single slice object. Patch by + Stefan Behnel. + +- Issue #13393: BufferedReader.read1() now asks the full requested size to + the raw stream instead of limiting itself to the buffer size. + +- Issue #13392: Writing a pyc file should now be atomic under Windows as well. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13389: Full garbage collection passes now clear the freelists for + list and dict objects. They already cleared other freelists in the + interpreter. + +- Issue #13327: Remove the need for an explicit None as the second argument + to os.utime, os.lutimes, os.futimes, os.futimens, os.futimesat, in + order to update to the current time. Also added keyword argument + handling to os.utimensat in order to remove the need for explicit None. + +- Issue #13350: Simplify some C code by replacing most usages of + PyUnicode_Format by PyUnicode_FromFormat. + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #9896: Add start, stop, and step attributes to range objects. + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: ``lambda *, + arg=GLOBAL_NAME: None`` + +- Issue #12797: Added custom opener parameter to builtin open() and + FileIO.open(). + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #13201: Define '==' and '!=' to compare range objects based on + the sequence of values they define (instead of comparing based on + object identity). + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12753: Add support for Unicode name aliases and named sequences. + Both ``unicodedata.lookup()`` and '\N{...}' now resolve aliases, + and ``unicodedata.lookup()`` resolves named sequences too. + +- Issue #12170: The count(), find(), rfind(), index() and rindex() methods + of bytes and bytearray objects now accept an integer between 0 and 255 + as their first argument. Patch by Petri Lehtinen. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #12281: Rewrite the MBCS codec to handle correctly replace and ignore + error handlers on all Windows versions. The MBCS codec is now supporting all + error handlers, instead of only replace to encode and ignore to decode. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #13146: Writing a pyc file is now atomic under POSIX. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. + +- Add internal API for static strings (_Py_identifier et al.). + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- PEP 393: flexible string representation. Thanks to Torsten Becker for the + initial implementation, and Victor Stinner for various bug fixes. + +- Issue #14081: The 'sep' and 'maxsplit' parameter to str.split, bytes.split, + and bytearray.split may now be passed as keyword arguments. + +- Issue #13012: The 'keepends' parameter to str.splitlines may now be passed + as a keyword argument: "my_string.splitlines(keepends=True)". The same + change also applies to bytes.splitlines and bytearray.splitlines. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12904: os.utime, os.futimes, os.lutimes, and os.futimesat now write + atime and mtime with nanosecond precision on modern POSIX platforms. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12773: Make __doc__ mutable on user-defined classes. + +- Issue #12766: Raise a ValueError when creating a class with a class variable + that conflicts with a name in __slots__. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +- Issue #12732: In narrow unicode builds, allow Unicode identifiers which fall + outside the BMP. + +- Issue #12575: Validate user-generated AST before it is compiled. + +- Make type(None), type(Ellipsis), and type(NotImplemented) callable. They + return the respective singleton instances. + +- Forbid summing bytes with sum(). + +- Verify the types of AST strings and identifiers provided by the user before + compiling them. + +- Issue #12647: The None object now has a __bool__() method that returns False. + Formerly, bool(None) returned False only because of special case logic + in PyObject_IsTrue(). + +- Issue #12579: str.format_map() now raises a ValueError if used on a + format string that contains positional fields. Initial patch by + Julian Berman. + +- Issue #10271: Allow warnings.showwarning() be any callable. + +- Issue #11627: Fix segfault when __new__ on a exception returns a + non-exception class. + +- Issue #12149: Update the method cache after a type's dictionary gets + cleared by the garbage collector. This fixes a segfault when an instance + and its type get caught in a reference cycle, and the instance's + deallocator calls one of the methods on the type (e.g. when subclassing + IOBase). Diagnosis and patch by Davide Rizzo. + +- Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows. + +- Issue #9642: Uniformize the tests on the availability of the mbcs codec, add + a new HAVE_MBCS define. + +- Issue #9642: Fix filesystem encoding initialization: use the ANSI code page + on Windows if the mbcs codec is not available, and fail with a fatal error if + we cannot get the locale encoding (if nl_langinfo(CODESET) is not available) + instead of using UTF-8. + +- When a generator yields, do not retain the caller's exception state on the + generator. + +- Issue #12475: Prevent generators from leaking their exception state into the + caller's frame as they return for the last time. + +- Issue #12291: You can now load multiple marshalled objects from a stream, + with other data interleaved between marshalled objects. + +- Issue #12356: When required positional or keyword-only arguments are not + given, produce a informative error message which includes the name(s) of the + missing arguments. + +- Issue #12370: Fix super with no arguments when __class__ is overriden in the + class body. + +- Issue #12084: os.stat on Windows now works properly with relative symbolic + links when called from any directory. + +- Loosen type restrictions on the __dir__ method. __dir__ can now return any + sequence, which will be converted to a list and sorted by dir(). + +- Issue #12265: Make error messages produced by passing an invalid set of + arguments to a function more informative. + +- Issue #12225: Still allow Python to build if Python is not in its hg repo or + mercurial is not installed. + +- Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix + the following case: sys.stdin.read() stopped with CTRL+d (end of file), + raw_input() interrupted by CTRL+c. + +- Issue #12216: Allow unexpected EOF errors to happen on any line of the file. + +- Issue #12199: The TryExcept and TryFinally and AST nodes have been unified + into a Try node. + +- Issue #9670: Increase the default stack size for secondary threads on + Mac OS X and FreeBSD to reduce the chances of a crash instead of a + "maximum recursion depth" RuntimeError exception. + (patch by Ronald Oussoren) + +- Issue #12106: The use of the multiple-with shorthand syntax is now reflected + in the AST. + +- Issue #12190: Try to use the same filename object when compiling unmarshalling + a code objects in the same file. + +- Issue #12166: Move implementations of dir() specialized for various types into + the __dir__() methods of those types. + +- Issue #5715: In socketserver, close the server socket in the child process. + +- Correct lookup of __dir__ on objects. Among other things, this causes errors + besides AttributeError found on lookup to be propagated. + +- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal + module. Patch written by Charles-Fran?ois Natali. + +- Issue #1746656: Added the if_nameindex, if_indextoname, if_nametoindex + methods to the socket module. + +- Issue #12044: Fixed subprocess.Popen when used as a context manager to + wait for the process to end when exiting the context to avoid unintentionally + leaving zombie processes around. + +- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, + clear the end-of-file indicator after CTRL+d. + +- Issue #1856: Avoid crashes and lockups when daemon threads run while the + interpreter is shutting down; instead, these threads are now killed when + they try to take the GIL. + +- Issue #9756: When calling a method descriptor or a slot wrapper descriptor, + the check of the object type doesn't read the __class__ attribute anymore. + Fix a crash if a class override its __class__ attribute (e.g. a proxy of the + str type). Patch written by Andreas St?hrk. + +- Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* + APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch + by Charles-Fran?ois Natali. + +- Issue #10914: Initialize correctly the filesystem codec when creating a new + subinterpreter to fix a bootstrap issue with codecs implemented in Python, as + the ISO-8859-15 codec. + +- Issue #11918: OS/2 and VMS are no more supported because of the lack of + maintainer. + +- Issue #6780: fix starts/endswith error message to mention that tuples are + accepted too. + +- Issue #5057: fix a bug in the peepholer that led to non-portable pyc files + between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP + chars (e.g. "\U00012345"[0]). + +- Issue #11845: Fix typo in rangeobject.c that caused a crash in + compute_slice_indices. Patch by Daniel Urban. + +- Issue #5673: Added a `timeout` keyword argument to subprocess.Popen.wait, + subprocess.Popen.communicated, subprocess.call, subprocess.check_call, and + subprocess.check_output. If the blocking operation takes more than `timeout` + seconds, the `subprocess.TimeoutExpired` exception is raised. + +- Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted + (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch + written by Charles-Francois Natali. + +- Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. + +- Issue #10785: Store the filename as Unicode in the Python parser. + +- Issue #11619: _PyImport_LoadDynamicModule() doesn't encode the path to bytes + on Windows. + +- Issue #10998: Remove mentions of -Q, sys.flags.division_warning and + Py_DivisionWarningFlag left over from Python 2. + +- Issue #11244: Remove an unnecessary peepholer check that was preventing + negative zeros from being constant-folded properly. + +- Issue #11395: io.FileIO().write() clamps the data length to 32,767 bytes on + Windows if the file is a TTY to workaround a Windows bug. The Windows console + returns an error (12: not enough space error) on writing into stdout if + stdout mode is binary and the length is greater than 66,000 bytes (or less, + depending on heap usage). + +- Issue #11320: fix bogus memory management in Modules/getpath.c, leading to + a possible crash when calling Py_SetPath(). + +- Issue #11432: A bug was introduced in subprocess.Popen on posix systems with + 3.2.0 where the stdout or stderr file descriptor being the same as the stdin + file descriptor would raise an exception. webbrowser.open would fail. fixed. + +- Issue #9856: Change object.__format__ with a non-empty format string + to be a DeprecationWarning. In 3.2 it was a PendingDeprecationWarning. + In 3.4 it will be a TypeError. + +- Issue #11244: The peephole optimizer is now able to constant-fold + arbitrarily complex expressions. This also fixes a 3.2 regression where + operations involving negative numbers were not constant-folded. + +- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when + there are many tags (e.g. when using mq). Patch by Nadeem Vawda. + +- Issue #11335: Fixed a memory leak in list.sort when the key function + throws an exception. + +- Issue #8923: When a string is encoded to UTF-8 in strict mode, the result is + cached into the object. Examples: str.encode(), str.encode('utf-8'), + PyUnicode_AsUTF8String() and PyUnicode_AsEncodedString(unicode, "utf-8", + NULL). + +- Issue #10831: PyUnicode_FromFormat() supports %li, %lli and %zi formats. + +- Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse + the format string in the 3 steps, fix crashs on invalid format strings. + +- Issue #13007: whichdb should recognize gdbm 1.9 magic numbers. + +- Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from + UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode). + Patch written by Ray Allen. + +- Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with + a buffer struct having a NULL data pointer. + +- Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and + sys.stdin uses universal newline (replace '\r\n' by '\n'). + +- issue #11828: startswith and endswith don't accept None as slice index. + Patch by Torsten Becker. + +- Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on + narrow build. + +- Issue #11168: Remove filename debug variable from PyEval_EvalFrameEx(). + It encoded the Unicode filename to UTF-8, but the encoding fails on + undecodable filename (on surrogate characters) which raises an unexpected + UnicodeEncodeError on recursion limit. + +- Issue #11187: Remove bootstrap code (use ASCII) of + PyUnicode_AsEncodedString(), it was replaced by a better fallback (use the + locale encoding) in PyUnicode_EncodeFSDefault(). + +- Check for NULL result in PyType_FromSpec. + +- Issue #10516: New copy() and clear() methods for lists and bytearrays. + +- Issue #11386: bytearray.pop() now throws IndexError when the bytearray is + empty, instead of OverflowError. + +- Issue #12380: The rjust, ljust and center methods of bytes and bytearray + now accept a bytearray argument. + +Library +------- + +- Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly + return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been + fixed. + +- Issue #14166: Pickler objects now have an optional ``dispatch_table`` + attribute which allows to set custom per-pickler reduction functions. + Patch by sbt. + +- Issue #14177: marshal.loads() now raises TypeError when given an unicode + string. Patch by Guilherme Gon?alves. + +- Issue #13550: Remove the debug machinery from the threading module: remove + verbose arguments from all threading classes and functions. + +- Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary, + WeakValueDictionary) to return a better approximation when some objects + are dead or dying. Moreover, the implementation is now O(1) rather than + O(n). + +- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode. + Patch by Mikhail Novikov. + +- Issue #11841: Fix comparison bug with 'rc' versions in packaging.version. + Patch by Filip Gruszczy?ski. + +- Issue #13447: Add a test file to host regression tests for bugs in the + scripts found in the Tools directory. + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. Also fixed in packaging. + +- Issue #8033: sqlite3: Fix 64-bit integer handling in user functions + on 32-bit architectures. Initial patch by Philippe Devalkeneer. + +- HTMLParser is now able to handle slashes in the start tag. + +- Issue #13641: Decoding functions in the base64 module now accept ASCII-only + unicode strings. Patch by Catalin Iacob. + +- Issue #14043: Speed up importlib's _FileFinder by at least 8x, and add a + new importlib.invalidate_caches() function. + +- Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in + SimpleXMLRPCServer upon malformed POST request. + +- Issue #13961: Move importlib over to using os.replace() for atomic renaming. + +- Do away with ambiguous level values (as suggested by PEP 328) in + importlib.__import__() by raising ValueError when level < 0. + +- Issue #2489: pty.spawn could consume 100% cpu when it encountered an EOF. + +- Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). + +- Issue #13777: Add PF_SYSTEM sockets on OS X. + Patch by Michael Goderbauer. + +- Issue #13015: Fix a possible reference leak in defaultdict.__repr__. + Patch by Suman Saha. + +- Issue #1326113: distutils' and packaging's build_ext commands option now + correctly parses multiple values (separated by whitespace or commas) given + to their --libraries option. + +- Issue #10287: nntplib now queries the server's CAPABILITIES first before + sending MODE READER, and only sends it if not already in READER mode. + Patch by Hynek Schlawack. + +- Issue #13993: HTMLParser is now able to handle broken end tags when + strict=False. + +- Issue #13930: lib2to3 now supports writing converted output files to another + directory tree as well as copying unchanged files and altering the file + suffix. + +- Issue #9750: Fix sqlite3.Connection.iterdump on tables and fields + with a name that is a keyword or contains quotes. Patch by Marko + Kohtala. + +- Issue #10287: nntplib now queries the server's CAPABILITIES again after + authenticating (since the result may change, according to RFC 4643). + Patch by Hynek Schlawack. + +- Issue #13989: Document that GzipFile does not support text mode, and give a + more helpful error message when opened with an invalid mode string. + +- Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building + Distutils-based packages with C extension modules may fail because + Apple has removed gcc-4.2, the version used to build python.org + 64-bit/32-bit Pythons. If the user does not explicitly override + the default C compiler by setting the CC environment variable, + Distutils will now attempt to compile extension modules with clang + if gcc-4.2 is required but not found. Also as a convenience, if + the user does explicitly set CC, substitute its value as the default + compiler in the Distutils LDSHARED configuration variable for OS X. + (Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u + SDK, neither of which are available in Xcode 4. This change does not + attempt to override settings to support their use with Xcode 4.) + +- Issue #13960: HTMLParser is now able to handle broken comments when + strict=False. + +- Issue #13921: Undocument and clean up sqlite3.OptimizedUnicode, + which is obsolete in Python 3.x. It's now aliased to str for + backwards compatibility. + +- When '' is a path (e.g. in sys.path), make sure __file__ uses the current + working directory instead of '' in importlib. + +- Issue #13609: Add two functions to query the terminal size: + os.get_terminal_size (low level) and shutil.get_terminal_size (high level). + Patch by Zbigniew J?drzejewski-Szmek. + +- Issue #13845: On Windows, time.time() now uses GetSystemTimeAsFileTime() + instead of ftime() to have a resolution of 100 ns instead of 1 ms (the clock + accuracy is between 0.5 ms and 15 ms). + +- Issue #13846: Add time.monotonic(), monotonic clock. + +- Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on + Connection sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to + make sure two listeners can't bind to the same socket/pipe (or any existing + socket/pipe). + +- Issue #9021: Add an introduction to the copy module documentation. + +- Issue #6005: Examples in the socket library documentation use sendall, where + relevant, instead send method. + +- Issue #10811: Fix recursive usage of cursors. Instead of crashing, + raise a ProgrammingError now. + +- Issue #10881: Fix test_site failure with OS X framework builds. + +- Issue #964437: Make IDLE help window non-modal. + Patch by Guilherme Polo and Roger Serwy. + +- Issue #13734: Add os.fwalk(), a directory walking function yielding file + descriptors. + +- Issue #2945: Make the distutils upload command aware of bdist_rpm products. + +- Issue #13712: pysetup create should not convert package_data to extra_files. + +- Issue #11805: package_data in setup.cfg should allow more than one value. + +- Issue #13933: IDLE auto-complete did not work with some imported + module, like hashlib. (Patch by Roger Serwy) + +- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared. + +- Issue #13676: Handle strings with embedded zeros correctly in sqlite3. + +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + +- Issue #8828: Add new function os.replace(), for cross-platform renaming + with overwriting. + +- Issue #13848: open() and the FileIO constructor now check for NUL + characters in the file name. Patch by Hynek Schlawack. + +- Issue #13806: The size check in audioop decompression functions was too + strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. + +- Issue #13812: When a multiprocessing Process child raises an exception, + flush stderr after printing the exception traceback. + +- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC + IV attack countermeasure. + +- Issue #13847: time.localtime() and time.gmtime() now raise an OSError instead + of ValueError on failure. time.ctime() and time.asctime() now raises an + OSError if localtime() failed. time.clock() now raises a RuntimeError if the + processor time used is not available or its value cannot be represented + +- Issue #13862: Fix spurious failure in test_zlib due to runtime/compile time + minor versions not matching. + +- Issue #12804: Fix test_socket and test_urllib2net failures when running tests + on a system without internet access. + +- Issue #13772: In os.symlink() under Windows, do not try to guess the link + target's type (file or directory). The detection was buggy and made the + call non-atomic (therefore prone to race conditions). + +- Issue #6631: Disallow relative file paths in urllib urlopen methods. + +- Issue #13722: Avoid silencing ImportErrors when initializing the codecs + registry. + +- Issue #13781: Fix GzipFile bug that caused an exception to be raised when + opening for writing using a fileobj returned by os.fdopen(). + +- Issue #13803: Under Solaris, distutils doesn't include bitness + in the directory name. + +- Issue #10278: Add time.wallclock() function, monotonic clock. + +- Issue #13809: Fix regression where bz2 module wouldn't work when threads are + disabled. Original patch by Amaury Forgeot d'Arc. + +- Issue #13589: Fix some serialization primitives in the aifc module. + Patch by Oleg Plakhotnyuk. + +- Issue #13642: Unquote before b64encoding user:password during Basic + Authentication. Patch contributed by Joonas Kuorilehto. + +- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow + tests. + +- Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. + The hang would occur when retrieving the result of a scheduled future after + the executor had been shut down. + +- Issue #13502: threading: Fix a race condition in Event.wait() that made it + return False when the event was set and cleared right after. + +- Issue #9993: When the source and destination are on different filesystems, + and the source is a symlink, shutil.move() now recreates a symlink on the + destination instead of copying the file contents. Patch by Jonathan Niehof + and Hynek Schlawack. + +- Issue #12926: Fix a bug in tarfile's link extraction. + +- Issue #13696: Fix the 302 Relative URL Redirection problem. + +- Issue #13636: Weak ciphers are now disabled by default in the ssl module + (except when SSLv2 is explicitly asked for). + +- Issue #12715: Add an optional symlinks argument to shutil functions + (copyfile, copymode, copystat, copy, copy2). When that parameter is + true, symlinks aren't dereferenced and the operation instead acts on the + symlink itself (or creates one, if relevant). Patch by Hynek Schlawack. + +- Add a flags parameter to select.epoll. + +- Issue #12798: Updated the mimetypes documentation. + +- Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the + SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. + +- Issue #11006: Don't issue low level warning in subprocess when pipe2() fails. + +- Issue #13620: Support for Chrome browser in webbrowser. Patch contributed + by Arnaud Calmettes. + +- Issue #11829: Fix code execution holes in inspect.getattr_static for + metaclasses with metaclasses. Patch by Andreas St?hrk. + +- Issue #12708: Add starmap() and starmap_async() methods (similar to + itertools.starmap()) to multiprocessing.Pool. Patch by Hynek Schlawack. + +- Issue #1785: Fix inspect and pydoc with misbehaving descriptors. + +- Issue #13637: "a2b" functions in the binascii module now accept ASCII-only + unicode strings. + +- Issue #13634: Add support for querying and disabling SSL compression. + +- Issue #13627: Add support for SSL Elliptic Curve-based Diffie-Hellman + key exchange, through the SSLContext.set_ecdh_curve() method and the + ssl.OP_SINGLE_ECDH_USE option. + +- Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers + choose the cipher based on their own preferences, rather than on the + client's. + +- Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas + St?hrk. + +- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by + C?dric Krier. + +- Issue #11870: threading: Properly reinitialize threads internal locks and + condition variables to avoid deadlocks in child processes. + +- Issue #8035: urllib: Fix a bug where the client could remain stuck after a + redirection or an error. + +- Issue #13560: os.strerror() now uses the current locale encoding instead of + UTF-8. + +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() + and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to + the current locale encoding. + +- Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem + encoding and the surrogateescape error handler, rather than UTF-8. Patch + by David Watson. + +- Issue #10350: Read and save errno before calling a function which might + overwrite it. Original patch by Hallvard B Furuseth. + +- Issue #11610: Introduce a more general way to declare abstract properties. + +- Issue #13591: A bug in importlib has been fixed that caused import_module + to load a module twice. + +- Issue #4625: If IDLE cannot write to its recent file or breakpoint files, + display a message popup and continue rather than crash. Original patch by + Roger Serwy. + +- Issue #13449 sched.scheduler.run() method has a new "blocking" parameter which + when set to False makes run() execute the scheduled events due to expire + soonest (if any) and then return. Patch by Giampaolo Rodol?. + +- Issue #8684 sched.scheduler class can be safely used in multi-threaded + environments. Patch by Josiah Carlson and Giampaolo Rodol?. + +- Alias resource.error to OSError ala PEP 3151. + +- Issue #5689: Add support for lzma compression to the tarfile module. + +- Issue #13248: Turn 3.2's PendingDeprecationWarning into 3.3's + DeprecationWarning. It covers 'cgi.escape', 'importlib.abc.PyLoader', + 'importlib.abc.PyPycLoader', 'nntplib.NNTP.xgtitle', 'nntplib.NNTP.xpath', + and private attributes of 'smtpd.SMTPChannel'. + +- Issue #5905, #13560: time.strftime() is now using the current locale + encoding, instead of UTF-8, if the wcsftime() function is not available. + +- Issue #8641: Update IDLE 3 syntax coloring to recognize b".." and not u"..". + Patch by Tal Einat. + +- Issue #13464: Add a readinto() method to http.client.HTTPResponse. Patch + by Jon Kuhn. + +- tarfile.py: Correctly detect bzip2 compressed streams with blocksizes + other than 900k. + +- Issue #13439: Fix many errors in turtle docstrings. + +- Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm. + Thanks to Per ?yvind Karlsen for the initial implementation. + +- Issue #13487: Make inspect.getmodule robust against changes done to + sys.modules while it is iterating over it. + +- Issue #12618: Fix a bug that prevented py_compile from creating byte + compiled files in the current directory. Initial patch by Sjoerd de Vries. + +- Issue #13444: When stdout has been closed explicitly, we should not attempt + to flush it at shutdown and print an error. + +- Issue #12567: The curses module uses Unicode functions for Unicode arguments + when it is linked to the ncurses library. It encodes also Unicode strings to + the locale encoding instead of UTF-8. + +- Issue #12856: Ensure child processes do not inherit the parent's random + seed for filename generation in the tempfile module. Patch by Brian + Harring. + +- Issue #9957: SpooledTemporaryFile.truncate() now accepts an optional size + parameter, as other file-like objects. Patch by Ryan Kelly. + +- Issue #13458: Fix a memory leak in the ssl module when decoding a + certificate with a subjectAltName. Patch by Robert Xiao. + +- Issue #13415: os.unsetenv() doesn't ignore errors anymore. + +- Issue #13245: sched.scheduler class constructor's timefunc and + delayfunct parameters are now optional. + scheduler.enter and scheduler.enterabs methods gained a new kwargs parameter. + Patch contributed by Chris Clark. + +- Issue #12328: Under Windows, refactor handling of Ctrl-C events and + make _multiprocessing.win32.WaitForMultipleObjects interruptible when + the wait_flag parameter is false. Patch by sbt. + +- Issue #13322: Fix BufferedWriter.write() to ensure that BlockingIOError is + raised when the wrapped raw file is non-blocking and the write would block. + Previous code assumed that the raw write() would raise BlockingIOError, but + RawIOBase.write() is defined to returned None when the call would block. + Patch by sbt. + +- Issue #13358: HTMLParser now calls handle_data only once for each CDATA. + +- Issue #4147: minidom's toprettyxml no longer adds whitespace around a text + node when it is the only child of an element. Initial patch by Dan + Kenigsberg. + +- Issue #13374: The Windows bytes API has been deprecated in the os module. Use + Unicode filenames instead of bytes filenames to not depend on the ANSI code + page anymore and to support any filename. + +- Issue #13297: Use bytes type to send and receive binary data through XMLRPC. + +- Issue #6397: Support "/dev/poll" polling objects in select module, + under Solaris & derivatives. + +- Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly + handles non-valid attributes, including adjacent and unquoted attributes. + +- Issue #13193: Fix distutils.filelist.FileList and packaging.manifest.Manifest + under Windows. + +- Issue #13384: Remove unnecessary __future__ import in Lib/random.py + +- Issue #13149: Speed up append-only StringIO objects. + +- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely + when called with a timeout. Patch by Arnaud Ysmal. + +- Issue #13254: Fix Maildir initialization so that maildir contents + are read correctly. + +- Issue #3067: locale.setlocale() now raises TypeError if the second + argument is an invalid iterable. Its documentation and docstring + were also updated. Initial patch by Jyrki Pulliainen. + +- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. + +- Issue #13339: Fix compile error in posixmodule.c due to missing semicolon. + Thanks to Robert Xiao. + +- Byte compilation in packaging is now isolated from the calling Python -B or + -O options, instead of being disallowed under -B or buggy under -O. + +- Issue #10570: curses.putp() and curses.tparm() are now expecting a byte + string, instead of a Unicode string. + +- Issue #13295: http.server now produces valid HTML 4.01 strict. + +- Issue #2892: preserve iterparse events in case of SyntaxError. + +- Issue #13287: urllib.request and urllib.error now contains an __all__ + attribute to expose only relevant classes and functions. Patch by Florent + Xicluna. + +- Issue #670664: Fix HTMLParser to correctly handle the content of + ```` and ````. + +- Issue #10817: Fix urlretrieve function to raise ContentTooShortError even + when reporthook is None. Patch by Jyrki Pulliainen. + +- Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + +- Fix the xmlrpc.client user agent to return something similar to + urllib.request user agent: "Python-xmlrpc/3.3". + +- Issue #13293: Better error message when trying to marshal bytes using + xmlrpc.client. + +- Issue #13291: NameError in xmlrpc package. + +- Issue #13258: Use callable() built-in in the standard library. + +- Issue #13273: fix a bug that prevented HTMLParser to properly detect some + tags when strict=False. + +- Issue #11183: Add finer-grained exceptions to the ssl module, so that + you don't have to inspect the exception's attributes in the common case. + +- Issue #13216: Add cp65001 codec, the Windows UTF-8 (CP_UTF8). + +- Issue #13226: Add RTLD_xxx constants to the os module. These constants can be + used with sys.setdlopenflags(). + +- Issue #10278: Add clock_getres(), clock_gettime() and CLOCK_xxx constants to + the time module. time.clock_gettime(time.CLOCK_MONOTONIC) provides a + monotonic clock + +- Issue #10332: multiprocessing: fix a race condition when a Pool is closed + before all tasks have completed. + +- Issue #13255: wrong docstrings in array module. + +- Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. + +- Issue #13235: Added PendingDeprecationWarning to warn() method and function. + +- Issue #9168: now smtpd is able to bind privileged port. + +- Issue #12529: fix cgi.parse_header issue on strings with double-quotes and + semicolons together. Patch by Ben Darnell and Petri Lehtinen. + +- Issue #13227: functools.lru_cache() now has a option to distinguish + calls with different argument types. + +- Issue #6090: zipfile raises a ValueError when a document with a timestamp + earlier than 1980 is provided. Patch contributed by Petri Lehtinen. + +- Issue #13150: sysconfig no longer parses the Makefile and config.h files + when imported, instead doing it at build time. This makes importing + sysconfig faster and reduces Python startup time by 20%. + +- Issue #12448: smtplib now flushes stdout while running ``python -m smtplib`` + in order to display the prompt correctly. + +- Issue #12454: The mailbox module is now using ASCII, instead of the locale + encoding, to read and write MH mailboxes (.mh_sequences files). + +- Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are + now available on Windows. + +- issue #1673007: urllib2 to support HEAD request via new method argument. + Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. + +- Issue #12386: packaging does not fail anymore when writing the RESOURCES + file. + +- Issue #13158: Fix decoding and encoding of GNU tar specific base-256 number + fields in tarfile. + +- Issue #13025: mimetypes is now reading MIME types using the UTF-8 encoding, + instead of the locale encoding. + +- Issue #10653: On Windows, use strftime() instead of wcsftime() because + wcsftime() doesn't format time zone correctly. + +- Issue #13150: The tokenize module doesn't compile large regular expressions + at startup anymore. + +- Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was + configured with different prefix and exec-prefix. + +- Issue #11254: Teach distutils and packaging to compile .pyc and .pyo files in + PEP 3147-compliant __pycache__ directories. + +- Issue #7367: Fix pkgutil.walk_paths to skip directories whose + contents cannot be read. + +- Issue #3163: The struct module gets new format characters 'n' and 'N' + supporting C integer types ``ssize_t`` and ``size_t``, respectively. + +- Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. + Reported and diagnosed by Thomas Kluyver. + +- Issue #13087: BufferedReader.seek() now always raises UnsupportedOperation + if the underlying raw stream is unseekable, even if the seek could be + satisfied using the internal buffer. Patch by John O'Connor. + +- Issue #7689: Allow pickling of dynamically created classes when their + metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig + Citro. + +- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes. + +- Issue #13034: When decoding some SSL certificates, the subjectAltName + extension could be unreported. + +- Issue #9871: Prevent IDLE 3 crash when given byte stings + with invalid hex escape sequences, like b'\x0'. + (Original patch by Claudiu Popa.) + +- Issue #12306: Expose the runtime version of the zlib C library as a constant, + ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff. + +- Issue #12959: Add collections.ChainMap to collections.__all__. + +- Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will + now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or + Download-URL field is present. + +- Issue #12567: Add curses.unget_wch() function. Push a character so the next + get_wch() will return it. + +- Issue #9561: distutils and packaging now writes egg-info files using UTF-8, + instead of the locale encoding. + +- Issue #8286: The distutils command sdist will print a warning message instead + of crashing when an invalid path is given in the manifest template. + +- Issue #12841: tarfile unnecessarily checked the existence of numerical user + and group ids on extraction. If one of them did not exist the respective id + of the current user (i.e. root) was used for the file and ownership + information was lost. + +- Issue #12888: Fix a bug in HTMLParser.unescape that prevented it to escape + more than 128 entities. Patch by Peter Otten. + +- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses. + +- Issue #12636: IDLE reads the coding cookie when executing a Python script. + +- Issue #12494: On error, call(), check_call(), check_output() and + getstatusoutput() functions of the subprocess module now kill the process, + read its status (to avoid zombis) and close pipes. + +- Issue #12720: Expose low-level Linux extended file attribute functions in os. + +- Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi + now respect a --skip-build option given to bdist. The packaging commands + were fixed too. + +- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in + the C pickle implementation. + +- Issue #11564: Avoid crashes when trying to pickle huge objects or containers + (more than 2**31 items). Instead, in most cases, an OverflowError is raised. + +- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is + greater than FD_SETSIZE. + +- Issue #12839: Fix crash in zlib module due to version mismatch. + Fix by Richard M. Tew. + +- Issue #9923: The mailcap module now correctly uses the platform path + separator for the MAILCAP environment variable on non-POSIX platforms. + +- Issue #12835: Follow up to #6560 that unconditionally prevents use of the + unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David + Watson. + +- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument + to be used if the private key is encrypted. Patch by Adam Simpkins. + +- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing + Pipe. + +- Issue #12811: tabnanny.check() now promptly closes checked files. Patch by + Anthony Briggs. + +- Issue #6560: The sendmsg/recvmsg API is now exposed by the socket module + when provided by the underlying platform, supporting processing of + ancillary data in pure Python code. Patch by David Watson and Heiko Wundram. + +- Issue #12326: On Linux, sys.platform doesn't contain the major version + anymore. It is now always 'linux', instead of 'linux2' or 'linux3' depending + on the Linux version used to build Python. + +- Issue #12213: Fix a buffering bug with interleaved reads and writes that + could appear on BufferedRandom streams. + +- Issue #12778: Reduce memory consumption when JSON-encoding a large + container of many small objects. + +- Issue #12650: Fix a race condition where a subprocess.Popen could leak + resources (FD/zombie) when killed at the wrong time. + +- Issue #12744: Fix inefficient representation of integers between 2**31 and + 2**63 on systems with a 64-bit C "long". + +- Issue #12646: Add an 'eof' attribute to zlib.Decompress, to make it easier to + detect truncated input streams. + +- Issue #11513: Fix exception handling ``tarfile.TarFile.gzopen()`` when + the file cannot be opened. + +- Issue #12687: Fix a possible buffering bug when unpickling text mode + (protocol 0, mostly) pickles. + +- Issue #10087: Fix the html output format of the calendar module. + +- Issue #12540: Prevent zombie IDLE processes on Windows due to changes + in os.kill(). + +- Add support for unary plus and unary minus to collections.Counter(). + Issue #13121: Also add support for inplace math operators. + +- Issue #12683: urlparse updated to include svn as schemes that uses relative + paths. (svn from 1.5 onwards support relative path). + +- Issue #12655: Expose functions from sched.h in the os module: sched_yield(), + sched_setscheduler(), sched_getscheduler(), sched_setparam(), + sched_get_min_priority(), sched_get_max_priority(), sched_rr_get_interval(), + sched_getaffinity(), sched_setaffinity(). + +- Add ThreadError to threading.__all__. + +- Issues #11104, #8688: Fix the behavior of distutils' sdist command with + manually-maintained MANIFEST files. + +- Issue #11281: smtplib.STMP gets source_address parameter, which adds the + ability to bind to specific source address on a machine with multiple + interfaces. Patch by Paulo Scardine. + +- Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow + symlinks: fix it. Patch by Petri Lehtinen. + +- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') + in Python code) now finds the doc of the method. + +- Issue #10968: Remove indirection in threading. The public names (Thread, + Condition, etc.) used to be factory functions returning instances of hidden + classes (_Thread, _Condition, etc.), because (if Guido recalls correctly) this + code pre-dates the ability to subclass extension types. It is now possible to + inherit from Thread and other classes, without having to import the private + underscored names like multiprocessing did. + +- Issue #9723: Add shlex.quote functions, to escape filenames and command + lines. + +- Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. + +- Issue #12514: Use try/finally to assure the timeit module restores garbage + collections when it is done. + +- Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is + given as a low fd, it gets overwritten. + +- Issue #12590: IDLE editor window now always displays the first line + when opening a long file. With Tk 8.5, the first line was hidden. + +- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates) + Connection:close header. + +- Issue #12102: Document that buffered files must be flushed before being used + with mmap. Patch by Steffen Daode Nurpmeso. + +- Issue #12560: Build libpython.so on OpenBSD. Patch by Stefan Sperling. + +- Issue #1813: Fix codec lookup under Turkish locales. + +- Issue #12591: Improve support of "universal newlines" in the subprocess + module: the piped streams can now be properly read from or written to. + +- Issue #12591: Allow io.TextIOWrapper to work with raw IO objects (without + a read1() method), and add a *write_through* parameter to mandate + unbuffered writes. + +- Issue #10883: Fix socket leaks in urllib.request when using FTP. + +- Issue #12592: Make Python build on OpenBSD 5 (and future major releases). + +- Issue #12372: POSIX semaphores are broken on AIX: don't use them. + +- Issue #12551: Provide a get_channel_binding() method on SSL sockets so as + to get channel binding data for the current SSL session (only the + "tls-unique" channel binding is implemented). This allows the implementation + of certain authentication mechanisms such as SCRAM-SHA-1-PLUS. Patch by + Jacek Konieczny. + +- Issue #665194: email.utils now has format_datetime and parsedate_to_datetime + functions, allowing for round tripping of RFC2822 format dates. + +- Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2 + directory, so that "import DLFCN" and other similar imports work on + Linux 3.0. + +- Issue #7484: smtplib no longer puts <> around addresses in VRFY and EXPN + commands; they aren't required and in fact postfix doesn't support that form. + +- Issue #12273: Remove ast.__version__. AST changes can be accounted for by + checking sys.version_info or sys._mercurial. + +- Silence spurious "broken pipe" tracebacks when shutting down a + ProcessPoolExecutor. + +- Fix potential resource leaks in concurrent.futures.ProcessPoolExecutor + by joining all queues and processes when shutdown() is called. + +- Issue #11603: Fix a crash when __str__ is rebound as __repr__. Patch by + Andreas St?hrk. + +- Issue #11321: Fix a crash with multiple imports of the _pickle module when + embedding Python. Patch by Andreas St?hrk. + +- Issue #6755: Add get_wch() method to curses.window class. Patch by I?igo + Serna. + +- Add cgi.closelog() function to close the log file. + +- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets. + +- Issue #4376: ctypes now supports nested structures in a endian different than + the parent structure. Patch by Vlad Riscutia. + +- Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a + TextIOWrapper to a huge value, not TypeError. + +- Issue #12504: Close file handles in a timely manner in packaging.database. + This fixes a bug with the remove (uninstall) feature on Windows. + +- Issues #12169 and #10510: Factor out code used by various packaging commands + to make HTTP POST requests, and make sure it uses CRLF. + +- Issue #12016: Multibyte CJK decoders now resynchronize faster. They only + ignore the first byte of an invalid byte sequence. For example, + b'\xff\n'.decode('gb2312', 'replace') gives '\ufffd\n' instead of '\ufffd'. + +- Issue #12459: time.sleep() now raises a ValueError if the sleep length is + negative, instead of an infinite sleep on Windows or raising an IOError on + Linux for example, to have the same behaviour on all platforms. + +- Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support + Python scripts using a encoding different than UTF-8 (read the coding cookie + of the script). + +- Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors + if the process has only one pipe. + +- Issue #12467: warnings: fix a race condition if a warning is emitted at + shutdown, if globals()['__file__'] is None. + +- Issue #12451: pydoc: importfile() now opens the Python script in binary mode, + instead of text mode using the locale encoding, to avoid encoding issues. + +- Issue #12451: runpy: run_path() now opens the Python script in binary mode, + instead of text mode using the locale encoding, to support other encodings + than UTF-8 (scripts using the coding cookie). + +- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead + of the text mode (using the locale encoding) to avoid encoding issues. + +- Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better + conformance to the RFCs: correctly handle Sender and Resent- headers. + +- Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by + the garbage collector while the Heap lock is held. + +- Issue #12462: time.sleep() now calls immediatly the (Python) signal handler + if it is interrupted by a signal, instead of having to wait until the next + instruction. + +- Issue #12442: new shutil.disk_usage function, providing total, used and free + disk space statistics. + +- Issue #12451: The XInclude default loader of xml.etree now decodes files from + UTF-8 instead of the locale encoding if the encoding is not specified. It now + also opens XML files for the parser in binary mode instead of the text mode + to avoid encoding issues. + +- Issue #12451: doctest.debug_script() doesn't create a temporary file + anymore to avoid encoding issues. + +- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, + to read the Python script from the right encoding. + +- Issue #12451: distutils now opens the setup script in binary mode to read the + encoding cookie, instead of opening it in UTF-8. + +- Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to + check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the + interpreter process. This could cause failures in non-Distutils subprocesses + and was unreliable since tests or user programs could modify the interpreter + environment after Distutils set it. Instead, have Distutils set the the + deployment target only in the environment of each build subprocess. It is + still possible to globally override the default by setting + MACOSX_DEPLOYMENT_TARGET before launching the interpreter; its value must be + greater or equal to the default value, the value with which the interpreter + was built. Also, implement the same handling in packaging. + +- Issue #12422: In the copy module, don't store objects that are their own copy + in the memo dict. + +- Issue #12303: Add sigwaitinfo() and sigtimedwait() to the signal module. + +- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira + Kitada. + +- Issue #1874: email now detects and reports as a defect the presence of + any CTE other than 7bit, 8bit, or binary on a multipart. + +- Issue #12383: Fix subprocess module with env={}: don't copy the environment + variables, start with an empty environment. + +- Issue #11637: Fix support for importing packaging setup hooks from the + project directory. + +- Issue #6771: Moved the curses.wrapper function from the single-function + wrapper module into __init__, eliminating the module. Since __init__ was + already importing the function to curses.wrapper, there is no API change. + +- Issue #11584: email.header.decode_header no longer fails if the header + passed to it is a Header object, and Header/make_header no longer fail + if given binary unknown-8bit input. + +- Issue #11700: mailbox proxy object close methods can now be called multiple + times without error. + +- Issue #11767: Correct file descriptor leak in mailbox's __getitem__ method. + +- Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP + connection if its getresponse() method fails with a socket error. Patch + written by Ezio Melotti. + +- Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files. + Original patch by Erik Bray. + +- Issue #9284: Allow inspect.findsource() to find the source of doctest + functions. + +- Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a + compatibility helper for the distutils-packaging transition. Original patch + by Erik Bray. + +- Issue #12287: In ossaudiodev, check that the device isn't closed in several + methods. + +- Issue #12009: Fixed regression in netrc file comment handling. + +- Issue #12246: Warn and fail when trying to install a third-party project from + an uninstalled Python (built in a source checkout). Original patch by + Tshepang Lekhonkhobe. + +- Issue #10694: zipfile now ignores garbage at the end of a zipfile. + +- Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA. + +- Issue #10424: Argparse now includes the names of the missing required + arguments in the missing arguments error message. + +- Issue #12168: SysLogHandler now allows NUL termination to be controlled using + a new 'append_nul' attribute on the handler. + +- Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes + instead of os.stat. + +- Issue #12021: Make mmap's read() method argument optional. Patch by Petri + Lehtinen. + +- Issue #9205: concurrent.futures.ProcessPoolExecutor now detects killed + children and raises BrokenProcessPool in such a situation. Previously it + would reliably freeze/deadlock. + +- Issue #12040: Expose a new attribute ``sentinel`` on instances of + ``multiprocessing.Process``. Also, fix Process.join() to not use polling + anymore, when given a timeout. + +- Issue #11893: Remove obsolete internal wrapper class ``SSLFakeFile`` in the + smtplib module. Patch by Catalin Iacob. + +- Issue #12080: Fix a Decimal.power() case that took an unreasonably long time + to compute. + +- Issue #12221: Remove __version__ attributes from pyexpat, pickle, tarfile, + pydoc, tkinter, and xml.parsers.expat. This were useless version constants + left over from the Mercurial transition + +- Named tuples now work correctly with vars(). + +- Issue #12085: Fix an attribute error in subprocess.Popen destructor if the + constructor has failed, e.g. because of an undeclared keyword argument. Patch + written by Oleg Oshmyan. + +- Issue #12028: Make threading._get_ident() public, rename it to + threading.get_ident() and document it. This function was already used using + _thread.get_ident(). + +- Issue #12171: IncrementalEncoder.reset() of CJK codecs (multibytecodec) calls + encreset() instead of decreset(). + +- Issue #12218: Removed wsgiref.egg-info. + +- Issue #12196: Add pipe2() to the os module. + +- Issue #985064: Make plistlib more resilient to faulty input plists. + Patch by Mher Movsisyan. + +- Issue #1625: BZ2File and bz2.decompress() now support multi-stream files. + Initial patch by Nir Aides. + +- Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available. + +- Issue #12175: FileIO.readall() now only reads the file position and size + once. + +- Issue #12175: RawIOBase.readall() now returns None if read() returns None. + +- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError + if the file is closed. + +- Issue #11109: New service_action method for BaseServer, used by ForkingMixin + class for cleanup. Initial Patch by Justin Wark. + +- Issue #12045: Avoid duplicate execution of command in + ctypes.util._get_soname(). Patch by Sijin Joseph. + +- Issue #10818: Remove the Tk GUI and the serve() function of the pydoc module, + pydoc -g has been deprecated in Python 3.2 and it has a new enhanced web + server. + +- Issue #1441530: In imaplib, read the data in one chunk to speed up large + reads and simplify code. + +- Issue #12070: Fix the Makefile parser of the sysconfig module to handle + correctly references to "bogus variable" (e.g. "prefix=$/opt/python"). + +- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to + their encode() method anymore, but continue to call the reset() method if the + final argument is True. + +- Issue #12049: Add RAND_bytes() and RAND_pseudo_bytes() functions to the ssl + module. + +- Issue #6501: os.device_encoding() returns None on Windows if the application + has no console. + +- Issue #12105: Add O_CLOEXEC to the os module. + +- Issue #12079: Decimal('Infinity').fma(Decimal('0'), (3.91224318126786e+19+0j)) + now raises TypeError (reflecting the invalid type of the 3rd argument) rather + than Decimal.InvalidOperation. + +- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore + to be able to unload the module. + +- Add the packaging module, an improved fork of distutils (also known as + distutils2). + +- Issue #12065: connect_ex() on an SSL socket now returns the original errno + when the socket's timeout expires (it used to return None). + +- Issue #8809: The SMTP_SSL constructor and SMTP.starttls() now support + passing a ``context`` argument pointing to an ssl.SSLContext instance. + Patch by Kasun Herath. + +- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX + with Tk 8.5. + +- Issue #9516: Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET + is set in shell. + +- Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and + their incremental counterparts now raise OverflowError if given an input + larger than 4GB, instead of silently truncating the input and returning + an incorrect result. + +- Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail + attribute when called without a max_length argument. + +- Issue #12062: Fix a flushing bug when doing a certain type of I/O sequence + on a file opened in read+write mode (namely: reading, seeking a bit forward, + writing, then seeking before the previous write but still within buffered + data, and writing again). + +- Issue #9971: Write an optimized implementation of BufferedReader.readinto(). + Patch by John O'Connor. + +- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError. + With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused + IDLE to exit. Converted to valid Unicode null in PythonCmd(). + +- Issue #11799: urllib.request Authentication Handlers will raise a ValueError + when presented with an unsupported Authentication Scheme. Patch contributed + by Yuval Greenfield. + +- Issue #10419, #6011: build_scripts command of distutils handles correctly + non-ASCII path (path to the Python executable). Open and write the script in + binary mode, but ensure that the shebang is decodable from UTF-8 and from the + encoding of the script. + +- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in + order to accept exactly one connection. Patch by Daniel Evers. + +- Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, + instead of a RuntimeError: OSError has an errno attribute. + +- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which + manages the sending of headers to output stream and flushing the internal + headers buffer. Patch contribution by Andrew Schaaf + +- Issue #11743: Rewrite multiprocessing connection classes in pure Python. + +- Issue #11164: Stop trying to use _xmlplus in the xml module. + +- Issue #11888: Add log2 function to math module. Patch written by Mark + Dickinson. + +- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional. + +- Issue #8407: The signal handler writes the signal number as a single byte + instead of a nul byte into the wakeup file descriptor. So it is possible to + wait more than one signal and know which signals were raised. + +- Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to the + signal module. + +- Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch + by Kasun Herath. + +- Issue #12002: ftplib's abort() method raises TypeError. + +- Issue #11916: Add a number of MacOSX specific definitions to the errno module. + Patch by Pierre Carrier. + +- Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to + detect mtime changes by comparing to the system clock instead of to the + previous value of the mtime. + +- Issue #11072: added MLSD command (RFC-3659) support to ftplib. + +- Issue #8808: The IMAP4_SSL constructor now allows passing an SSLContext + parameter to control parameters of the secure channel. Patch by Sijin + Joseph. + +- ntpath.samefile failed to notice that "a.txt" and "A.TXT" refer to the same + file on Windows XP. As noticed in issue #10684. + +- Issue #12000: When a SSL certificate has a subjectAltName without any + dNSName entry, ssl.match_hostname() should use the subject's commonName. + Patch by Nicolas Bareil. + +- Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and + assertWarnsRegex now accept a keyword argument 'msg' when used as context + managers. Initial patch by Winston Ewert. + +- Issue #10684: shutil.move used to delete a folder on case insensitive + filesystems when the source and destination name where the same except + for the case. + +- Issue #11647: objects created using contextlib.contextmanager now support + more than one call to the function when used as a decorator. Initial patch + by Ysj Ray. + +- Issue #11930: Removed deprecated time.accept2dyear variable. + Removed year >= 1000 restriction from datetime.strftime. + +- logging: don't define QueueListener if Python has no thread support. + +- functools.cmp_to_key() now works with collections.Hashable(). + +- Issue #11277: mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X to get + around a mmap bug with sparse files. Patch written by Steffen Daode Nurpmeso. + +- Issue #8407: Add signal.pthread_sigmask() function to fetch and/or change the + signal mask of the calling thread. + +- Issue #11858: configparser.ExtendedInterpolation expected lower-case section + names. + +- Issue #11324: ConfigParser(interpolation=None) now works correctly. + +- Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch + by Charles-Fran?ois Natali. + +- Issue #11763: don't use difflib in TestCase.assertMultiLineEqual if the + strings are too long. + +- Issue #11236: getpass.getpass responds to ctrl-c or ctrl-z on terminal. + +- Issue #11856: Speed up parsing of JSON numbers. + +- Issue #11005: threading.RLock()._release_save() raises a RuntimeError if the + lock was not acquired. + +- Issue #11258: Speed up ctypes.util.find_library() under Linux by a factor + of 5 to 10. Initial patch by Jonas H. + +- Issue #11382: Trivial system calls, such as dup() or pipe(), needn't + release the GIL. Patch by Charles-Fran?ois Natali. + +- Issue #11223: Add threading._info() function providing informations about + the thread implementation. + +- Issue #11731: simplify/enhance email parser/generator API by introducing + policy objects. + +- Issue #11768: The signal handler of the signal module only calls + Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or + parallel calls. PyErr_SetInterrupt() writes also into the wake up file. + +- Issue #11492: fix several issues with header folding in the email package. + +- Issue #11852: Add missing imports and update tests. + +- Issue #11875: collections.OrderedDict's __reduce__ was temporarily + mutating the object instead of just working on a copy. + +- Issue #11467: Fix urlparse behavior when handling urls which contains scheme + specific part only digits. Patch by Santoso Wijaya. + +- collections.Counter().copy() now works correctly for subclasses. + +- Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. + Patch by Santoso Wijaya. + +- Issue #11684: complete email.parser bytes API by adding BytesHeaderParser. + +- The bz2 module now handles 4GiB+ input buffers correctly. + +- Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when + _json is not available. + +- Issue #11830: Remove unnecessary introspection code in the decimal module. + +- Issue #11703: urllib2.geturl() does not return correct url when the original + url contains #fragment. + +- Issue #10019: Fixed regression in json module where an indent of 0 stopped + adding newlines and acted instead like 'None'. + +- Issue #11186: pydoc ignores a module if its name contains a surrogate + character in the index of modules. + +- Issue #11815: Use a light-weight SimpleQueue for the result queue in + concurrent.futures.ProcessPoolExecutor. + +- Issue #5162: Treat services like frozen executables to allow child spawning + from multiprocessing.forking on Windows. + +- logging.basicConfig now supports an optional 'handlers' argument taking an + iterable of handlers to be added to the root logger. Additional parameter + checks were also added to basicConfig. + +- Issue #11814: Fix likely typo in multiprocessing.Pool._terminate(). + +- Issue #11747: Fix range formatting in difflib.context_diff() and + difflib.unified_diff(). + +- Issue #8428: Fix a race condition in multiprocessing.Pool when terminating + worker processes: new processes would be spawned while the pool is being + shut down. Patch by Charles-Fran?ois Natali. + +- Issue #2650: re.escape() no longer escapes the '_'. + +- Issue #11757: select.select() now raises ValueError when a negative timeout + is passed (previously, a select.error with EINVAL would be raised). Patch + by Charles-Fran?ois Natali. + +- Issue #7311: fix html.parser to accept non-ASCII attribute values. + +- Issue #11605: email.parser.BytesFeedParser was incorrectly converting + multipart subparts with an 8-bit CTE into unicode instead of preserving the + bytes. + +- Issue #1690608: email.util.formataddr is now RFC 2047 aware: it now has a + charset parameter that defaults to utf-8 and is used as the charset for RFC + 2047 encoding when the realname contains non-ASCII characters. + +- Issue #10963: Ensure that subprocess.communicate() never raises EPIPE. + +- Issue #10791: Implement missing method GzipFile.read1(), allowing GzipFile + to be wrapped in a TextIOWrapper. Patch by Nadeem Vawda. + +- Issue #11707: Added a fast C version of functools.cmp_to_key(). + Patch by Filip Gruszczy?ski. + +- Issue #11688: Add sqlite3.Connection.set_trace_callback(). Patch by + Torsten Landschoff. + +- Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve + private keys. + +- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept + file-like objects using a new ``fileobj`` constructor argument. Patch by + Nadeem Vawda. + +- unittest.TestCase.assertSameElements has been removed. + +- sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not + called yet: detect bootstrap (startup) issues earlier. + +- Issue #11393: Add the new faulthandler module. + +- Issue #11618: Fix the timeout logic in threading.Lock.acquire() under Windows. + +- Removed the 'strict' argument to email.parser.Parser, which has been + deprecated since Python 2.4. + +- Issue #11256: Fix inspect.getcallargs on functions that take only keyword + arguments. + +- Issue #11696: Fix ID generation in msilib. + +- itertools.accumulate now supports an optional *func* argument for + a user-supplied binary function. + +- Issue #11692: Remove unnecessary demo functions in subprocess module. + +- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when + trying to pack a negative (in-range) integer. + +- Issue #11675: multiprocessing.[Raw]Array objects created from an integer size + are now zeroed on creation. This matches the behaviour specified by the + documentation. + +- Issue #7639: Fix short file name generation in bdist_msi + +- Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459. + Patch by Ben Hayden. + +- Issue #11635: Don't use polling in worker threads and processes launched by + concurrent.futures. + +- Issue #6811: Allow importlib to change a code object's co_filename attribute + to match the path to where the source code currently is, not where the code + object originally came from. + +- Issue #8754: Have importlib use the repr of a module name in error messages. + +- Issue #11591: Prevent "import site" from modifying sys.path when python + was started with -S. + +- collections.namedtuple() now adds a _source attribute to the generated + class. This make the source more accessible than the outdated + "verbose" option which prints to stdout but doesn't make the source + string available. + +- Issue #11371: Mark getopt error messages as localizable. Patch by Filip + Gruszczy?ski. + +- Issue #11333: Add __slots__ to collections ABCs. + +- Issue #11628: cmp_to_key generated class should use __slots__. + +- Issue #11666: let help() display named tuple attributes and methods + that start with a leading underscore. + +- Issue #11662: Make urllib and urllib2 ignore redirections if the + scheme is not HTTP, HTTPS or FTP (CVE-2011-1521). + +- Issue #5537: Fix time2isoz() and time2netscape() functions of + httplib.cookiejar for expiration year greater than 2038 on 32-bit systems. + +- Issue #4391: Use proper gettext plural forms in optparse. + +- Issue #11127: Raise a TypeError when trying to pickle a socket object. + +- Issue #11563: Connection:close header is sent by requests using URLOpener + class which helps in closing of sockets after connection is over. Patch + contributions by Jeff McNeil and Nadeem Vawda. + +- Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates + unbuffered pipes, such that select() works properly on them. + +- Issue #5421: Fix misleading error message when one of socket.sendto()'s + arguments has the wrong type. Patch by Nikita Vetoshkin. + +- Issue #10812: Add some extra posix functions to the os module. + +- Issue #10979: unittest stdout buffering now works with class and module + setup and teardown. + +- Issue #11577: fix ResourceWarning triggered by improved binhex test coverage + +- Issue #11243: fix the parameter querying methods of Message to work if + the headers contain un-encoded non-ASCII data. + +- Issue #11401: fix handling of headers with no value; this fixes a regression + relative to Python2 and the result is now the same as it was in Python2. + +- Issue #9298: base64 bodies weren't being folded to line lengths less than 78, + which was a regression relative to Python2. Unlike Python2, the last line + of the folded body now ends with a carriage return. + +- Issue #11560: shutil.unpack_archive now correctly handles the format + parameter. Patch by Evan Dandrea. + +- Issue #5870: Add `subprocess.DEVNULL` constant. + +- Issue #11133: fix two cases where inspect.getattr_static can trigger code + execution. Patch by Andreas St?hrk. + +- Issue #11569: use absolute path to the sysctl command in multiprocessing to + ensure that it will be found regardless of the shell PATH. This ensures + that multiprocessing.cpu_count works on default installs of MacOSX. + +- Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is + not installed. Instead, the zipfile.ZIP_STORED compression is used to create + the ZipFile. Patch by Natalia B. Bidart. + +- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used + in a `with` statement. Contributed by Giampaolo Rodola. + +- Issue #11554: Fixed support for Japanese codecs; previously the body output + encoding was not done if euc-jp or shift-jis was specified as the charset. + +- Issue #11509: Significantly increase test coverage of fileinput. + Patch by Denver Coneybeare at PyCon 2011 Sprints. + +- Issue #11407: `TestCase.run` returns the result object used or created. + Contributed by Janathan Hartley. + +- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified + IP addresses in the proxy exception list. + +- Issue #11491: dbm.error is no longer raised when dbm.open is called with + the "n" as the flag argument and the file exists. The behavior matches + the documentation and general logic. + +- Issue #1162477: Postel Principle adjustment to email date parsing: handle the + fact that some non-compliant MUAs use '.' instead of ':' in time specs. + +- Issue #11131: Fix sign of zero in decimal.Decimal plus and minus + operations when the rounding mode is ROUND_FLOOR. + +- Issue #9935: Speed up pickling of instances of user-defined classes. + +- Issue #5622: Fix curses.wrapper to raise correct exception if curses + initialization fails. + +- Issue #11408: In threading.Lock.acquire(), only call gettimeofday() when + really necessary. Patch by Charles-Fran?ois Natali. + +- Issue #11391: Writing to a mmap object created with + ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a + TypeError. Patch by Charles-Fran?ois Natali. + +- Issue #9795: add context manager protocol support for nntplib.NNTP class. + +- Issue #11306: mailbox in certain cases adapts to an inability to open + certain files in read-write mode. Previously it detected this by + checking for EACCES, now it also checks for EROFS. + +- Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors + on accept(), send() and recv(). + +- Issue #11377: Deprecate platform.popen() and reimplement it with os.popen(). + +- Issue #8513: On UNIX, subprocess supports bytes command string. + +- Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. + +- Issue #11140: Lock.release() now raises a RuntimeError when attempting + to release an unacquired lock, as claimed in the threading documentation. + The _thread.error exception is now an alias of RuntimeError. Patch by + Filip Gruszczy?ski. Patch for _dummy_thread by Aymeric Augustin. + +- Issue #8594: ftplib now provides a source_address parameter to specify which + (address, port) to bind to before connecting. + +- Issue #11326: Add the missing connect_ex() implementation for SSL sockets, + and make it work for non-blocking connects. + +- Issue #11297: Add collections.ChainMap(). + +- Issue #10755: Add the posix.flistdir() function. Patch by Ross Lagerwall. + +- Issue #4761: Add the ``*at()`` family of functions (openat(), etc.) to the + posix module. Patch by Ross Lagerwall. + +- Issue #7322: Trying to read from a socket's file-like object after a timeout + occurred now raises an error instead of silently losing data. + +- Issue #11291: poplib.POP no longer suppresses errors on quit(). + +- Issue #11177: asyncore's create_socket() arguments can now be omitted. + +- Issue #6064: Add a ``daemon`` keyword argument to the threading.Thread + and multiprocessing.Process constructors in order to override the + default behaviour of inheriting the daemonic property from the current + thread/process. + +- Issue #10956: Buffered I/O classes retry reading or writing after a signal + has arrived and the handler returned successfully. + +- Issue #10784: New os.getpriority() and os.setpriority() functions. + +- Issue #11114: Fix catastrophic performance of tell() on text files (up + to 1000x faster in some cases). It is still one to two order of magnitudes + slower than binary tell(). + +- Issue #10882: Add os.sendfile function. + +- Issue #10868: Allow usage of the register method of an ABC as a class + decorator. + +- Issue #11224: Fixed a regression in tarfile that affected the file-like + objects returned by TarFile.extractfile() regarding performance, memory + consumption and failures with the stream interface. + +- Issue #10924: Adding salt and Modular Crypt Format to crypt library. + Moved old C wrapper to _crypt, and added a Python wrapper with + enhanced salt generation and simpler API for password generation. + +- Issue #11074: Make 'tokenize' so it can be reloaded. + +- Issue #11085: Moved collections abstract base classes into a separate + module called collections.abc, following the pattern used by importlib.abc. + For backwards compatibility, the names are imported into the collections + module. + +- Issue #4681: Allow mmap() to work on file sizes and offsets larger than + 4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for + 32-bit Windows. + +- Issue #11169: compileall module uses repr() to format filenames and paths to + escape surrogate characters and show spaces. + +- Issue #11089: Fix performance issue limiting the use of ConfigParser() + with large config files. + +- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers + larger than 4GB. Patch by Nadeem Vawda. + +- Issue #11388: Added a clear() method to MutableSequence + +- Issue #11174: Add argparse.MetavarTypeHelpFormatter, which uses type names + for the names of optional and positional arguments in help messages. + +- Issue #9348: Raise an early error if argparse nargs and metavar don't match. + +- Issue #8982: Improve the documentation for the argparse Namespace object. + +- Issue #9343: Document that argparse parent parsers must be configured before + their children. + +- Issue #9026: Fix order of argparse sub-commands in help messages. + +- Issue #9347: Fix formatting for tuples in argparse type= error messages. + +- Issue #12191: Added shutil.chown() to change user and/or group owner of a + given path also specifying their names. + +- Issue #13988: The _elementtree accelerator is used whenever available. + Now xml.etree.cElementTree becomes a deprecated alias to ElementTree. + +Build +----- + +- Issue #6807: Run msisupport.mak earlier. + +- Issue #10580: Minor grammar change in Windows installer. + +- Issue #13326: Clean __pycache__ directories correctly on OpenBSD. + +- PEP 393: the configure option --with-wide-unicode is removed. + +- Issue #12852: Set _XOPEN_SOURCE to 700, instead of 600, to get POSIX 2008 + functions on OpenBSD (e.g. fdopendir). + +- Issue #11863: Remove support for legacy systems deprecated in Python 3.2 + (following PEP 11). These systems are systems using Mach C Threads, + SunOS lightweight processes, GNU pth threads and IRIX threads. + +- Issue #8746: Correct faulty configure checks so that os.chflags() and + os.lchflags() are once again built on systems that support these + functions (BSD and OS X). Also add new stat file flags for OS X + (UF_HIDDEN and UF_COMPRESSED). + +- Issue #10645: Installing Python no longer creates a + Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory. + +- Do not accidentally include the directory containing sqlite.h twice when + building sqlite3. + +- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, + ensure "make install" creates symlinks in --prefix bin for the "-32" + files in the framework bin directory like the installer does. + +- Issue #11347: Use --no-as-needed when linking libpython3.so. + +- Issue #11411: Fix 'make DESTDIR=' with a relative destination. + +- Issue #11268: Prevent Mac OS X Installer failure if Documentation + package had previously been installed. + +- Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2. + + +IDLE +---- + +- Issue #11718: IDLE's open module dialog couldn't find the __init__.py + file in a package. + +Tools/Demos +----------- + +- Issue #14053: patchcheck.py ("make patchcheck") now works with MQ patches. + Patch by Francisco Mart?n Brugu?. + +- Issue #13930: 2to3 is now able to write its converted output files to another + directory tree as well as copying unchanged files and altering the file + suffix. See its new -o, -W and --add-suffix options. This makes it more + useful in many automated code translation workflows. + +- Issue #13628: python-gdb.py is now able to retrieve more frames in the Python + traceback if Python is optimized. + +- Issue #11996: libpython (gdb), replace "py-bt" command by "py-bt-full" and + add a smarter "py-bt" command printing a classic Python traceback. + +- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. + +- Issue #10639: reindent.py no longer converts newlines and will raise + an error if attempting to convert a file with mixed newlines. + "--newline" option added to specify new line character. + +Extension Modules +----------------- + +- Issue #13840: The error message produced by ctypes.create_string_buffer + when given a Unicode string has been fixed. + +- Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by + Vilmos Nebehaj. + +- Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. + +- Issue #13159: FileIO and BZ2Compressor/BZ2Decompressor now use a linear-time + buffer growth strategy instead of a quadratic-time one. + +- Issue #10141: socket: Add SocketCAN (PF_CAN) support. Initial patch by + Matthias Fuchs, updated by Tiago Gon?alves. + +- Issue #13070: Fix a crash when a TextIOWrapper caught in a reference cycle + would be finalized after the reference to its underlying BufferedRWPair's + writer got cleared by the GC. + +- Issue #12881: ctypes: Fix segfault with large structure field names. + +- Issue #13058: ossaudiodev: fix a file descriptor leak on error. Patch by + Thomas Jarosch. + +- Issue #13013: ctypes: Fix a reference leak in PyCArrayType_from_ctype. + Thanks to Suman Saha for finding the bug and providing a patch. + +- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that + file descriptor was actually received. + +- Issue #1172711: Add 'long long' support to the array module. + Initial patch by Oren Tirosh and Hirokazu Yamamoto. + +- Issue #12483: ctypes: Fix a crash when the destruction of a callback + object triggers the garbage collector. + +- Issue #12950: Fix passing file descriptors in multiprocessing, under + OpenIndiana/Illumos. + +- Issue #12764: Fix a crash in ctypes when the name of a Structure field is not + a string. + +- Issue #11241: subclasses of ctypes.Array can now be subclassed. + +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + +- Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper + signature. Without this, architectures where sizeof void* != sizeof int are + broken. Patch given by Hallvard B Furuseth. + +- Issue #12051: Fix segfault in json.dumps() while encoding highly-nested + objects using the C accelerations. + +- Issue #12017: Fix segfault in json.loads() while decoding highly-nested + objects using the C accelerations. + +- Issue #1838: Prevent segfault in ctypes, when _as_parameter_ on a class is set + to an instance of the class. + +Tests +----- + +- Issue #11689: Fix a variable scoping error in an sqlite3 test + +- Issue #13786: Remove unimplemented 'trace' long option from regrtest.py. + +- Issue #13725: Fix regrtest to recognize the documented -d flag. + Patch by Erno Tukia. + +- Issue #13304: Skip test case if user site-packages disabled (-s or + PYTHONNOUSERSITE). (Patch by Carl Meyer) + +- Issue #5661: Add a test for ECONNRESET/EPIPE handling to test_asyncore. Patch + by Xavier de Gaye. + +- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. + +- Re-enable lib2to3's test_parser.py tests, though with an expected failure + (see issue 13125). + +- Issue #12656: Add tests for IPv6 and Unix sockets to test_asyncore. + +- Issue #6484: Add unit tests for mailcap module (patch by Gregory Nofi) + +- Issue #11651: Improve the Makefile test targets to run more of the test suite + more quickly. The --multiprocess option is now enabled by default, reducing + the amount of time needed to run the tests. "make test" and "make quicktest" + now include some resource-intensive tests, but no longer run the test suite + twice to check for bugs in .pyc generation. Tools/scripts/run_test.py provides + an easy platform-independent way to run test suite with sensible defaults. + +- Issue #12331: The test suite for the packaging module can now run from an + installed Python. + +- Issue #12331: The test suite for lib2to3 can now run from an installed + Python. + +- Issue #12626: In regrtest, allow to filter tests using a glob filter + with the ``-m`` (or ``--match``) option. This works with all test cases + using the unittest module. This is useful with long test suites + such as test_io or test_subprocess. + +- Issue #12624: It is now possible to fail after the first failure when + running in verbose mode (``-v`` or ``-W``), by using the ``--failfast`` + (or ``-G``) option to regrtest. This is useful with long test suites + such as test_io or test_subprocess. + +- Issue #12587: Correct faulty test file and reference in test_tokenize. + (Patch by Robert Xiao) + +- Issue #12573: Add resource checks for dangling Thread and Process objects. + +- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64' + as the processor type on some Mac systems. + +- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary + failure in name resolution. + +- Issue #11812: Solve transient socket failure to connect to 'localhost' + in test_telnetlib.py. + +- Solved a potential deadlock in test_telnetlib.py. Related to issue #11812. + +- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and + an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder + Web site. + +- Avoid failing in test_urllibnet.test_bad_address when some overzealous + DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test + is now skipped instead. + +- Issue #12440: When testing whether some bits in SSLContext.options can be + reset, check the version of the OpenSSL headers Python was compiled against, + rather than the runtime version of the OpenSSL library. + +- Issue #11512: Add a test suite for the cgitb module. Patch by Robbie Clemons. + +- Issue #12497: Install test/data to prevent failures of the various codecmaps + tests. + +- Issue #12496: Install test/capath directory to prevent test_connect_capath + testcase failure in test_ssl. + +- Issue #12469: Run wakeup and pending signal tests in a subprocess to run the + test in a fresh process with only one thread and to not change signal + handling of the parent process. + +- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run + test_tk or test_ttk_guionly under a username that is not currently logged + in to the console windowserver (as may be the case under buildbot or ssh). + +- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. + +- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures + the output and displays it on failure instead. regrtest -v doesn't print the + error twice anymore if there is only one error. + +- Issue #12141: Install copies of template C module file so that + test_build_ext of test_distutils and test_command_build_ext of + test_packaging are no longer silently skipped when + run outside of a build directory. + +- Issue #8746: Add additional tests for os.chflags() and os.lchflags(). + Patch by Garrett Cooper. + +- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9 + 2.8 + on Mac OS X. (Patch by Ronald Oussoren) + +- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2, + iso2022_kr). + +- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch + written by Charles-Fran?ois Natali. + +- Issue #11614: import __hello__ prints "Hello World!". Patch written by + Andreas St?hrk. + +- Issue #5723: Improve json tests to be executed with and without accelerations. + +- Issue #12041: Make test_wait3 more robust. + +- Issue #11873: Change regex in test_compileall to fix occasional failures when + when the randomly generated temporary path happened to match the regex. + +- Issue #11958: Fix FTP tests for IPv6, bind to "::1" instead of "localhost". + Patch written by Charles-Francois Natali. + +- Issue #8407, #11859: Fix tests of test_io using threads and an alarm: use + pthread_sigmask() to ensure that the SIGALRM signal is received by the main + thread. + +- Issue #11811: Factor out detection of IPv6 support on the current host + and make it available as ``test.support.IPV6_ENABLED``. Patch by + Charles-Fran?ois Natali. + +- Issue #10914: Add a minimal embedding test to test_capi. + +- Issue #11223: Skip test_lock_acquire_interruption() and + test_rlock_acquire_interruption() of test_threadsignals if a thread lock is + implemented using a POSIX mutex and a POSIX condition variable. A POSIX + condition variable cannot be interrupted by a signal (e.g. on Linux, the + futex system call is restarted). + +- Issue #11790: Fix sporadic failures in test_multiprocessing.WithProcessesTestCondition. + +- Fix possible "file already exists" error when running the tests in parallel. + +- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows + platforms. Patch by Nadeem Vawda. + +- Issue #11727: Add a --timeout option to regrtest: if a test takes more than + TIMEOUT seconds, dumps the traceback of all threads and exits. + +- Issue #11653: fix -W with -j in regrtest. + +- The email test suite now lives in the Lib/test/test_email package. The test + harness code has also been modernized to allow use of new unittest features. + +- regrtest now discovers test packages as well as test modules. + +- Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov. + +- New test_crashers added to exercise the scripts in the Lib/test/crashers + directory and confirm they fail as expected + +- Issue #11578: added test for the timeit module. Patch by Michael Henry. + +- Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. + +- Issue #11505: improves test coverage of string.py, increases granularity of + string.Formatter tests. Initial patch by Alicia Arlen. + +- Issue #11548: Improve test coverage of the shutil module. Patch by + Evan Dandrea. + +- Issue #11554: Reactivated test_email_codecs. + +- Issue #11505: improves test coverage of string.py. Patch by Alicia + Arlen + +- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a + false positive if the last directory in the path is inaccessible. + +- Issue #11223: Fix test_threadsignals to fail, not hang, when the + non-semaphore implementation of locks is used under POSIX. + +- Issue #10911: Add tests on CGI with non-ASCII characters. Patch written by + Pierre Quentel. + +- Issue #9931: Fix hangs in GUI tests under Windows in certain conditions. + Patch by Hirokazu Yamamoto. + +- Issue #10512: Properly close sockets under test.test_cgi. + +- Issue #10992: Make tests pass under coverage. + +- Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due + to open door files. + +- Issue #10990: Prevent tests from clobbering a set trace function. + +C-API +----- + +- Add PyObject_GenericGetDict and PyObject_GeneriSetDict. They are generic + implementations for the getter and setter of a ``__dict__`` descriptor of C + types. + +- Issue #13727: Add 3 macros to access PyDateTime_Delta members: + PyDateTime_DELTA_GET_DAYS, PyDateTime_DELTA_GET_SECONDS, + PyDateTime_DELTA_GET_MICROSECONDS. + +- Issue #10542: Add 4 macros to work with surrogates: Py_UNICODE_IS_SURROGATE, + Py_UNICODE_IS_HIGH_SURROGATE, Py_UNICODE_IS_LOW_SURROGATE, + Py_UNICODE_JOIN_SURROGATES. + +- Issue #12724: Add Py_RETURN_NOTIMPLEMENTED macro for returning NotImplemented. + +- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with + Mercurial. + +- Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const + char *` instead of `char *`. + +- Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. + +Documentation +------------- + +- Issues #13491 and #13995: Fix many errors in sqlite3 documentation. + Initial patch for #13491 by Johannes Vogel. + +- Issue #13402: Document absoluteness of sys.executable. + +- Issue #13883: PYTHONCASEOK also works on OS X. + +- Issue #12949: Document the kwonlyargcount argument for the PyCode_New + C API function. + +- Issue #13513: Fix io.IOBase documentation to correctly link to the + io.IOBase.readline method instead of the readline module. + +- Issue #13237: Reorganise subprocess documentation to emphasise convenience + functions and the most commonly needed arguments to Popen. + +- Issue #13141: Demonstrate recommended style for socketserver examples. + +- Issue #11818: Fix tempfile examples for Python 3. + + +What's New in Python 3.2? +========================= + +*Release date: 20-Feb-2011* + +Core and Builtins +----------------- + +- Issue #11249: Fix potential crashes when using the limited API. + +Build +----- + +- Issue #11222: Fix non-framework shared library build on Mac OS X. + +- Issue #11184: Fix large-file support on AIX. + +- Issue #941346: Fix broken shared library build on AIX. + +Documentation +------------- + +- Issue #10709: Add updated AIX notes in Misc/README.AIX. + + +What's New in Python 3.2 Release Candidate 3? +============================================= + +*Release date: 13-Feb-2011* + +Core and Builtins +----------------- + +- Issue #11134: Add missing fields to typeslots.h. + +- Issue #11135: Remove redundant doc field from PyType_Spec. + +- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited + ABI. + +- Issue #11118: Fix bogus export of None in python3.dll. + +Library +------- + +- Issue #11116: any error during addition of a message to a mailbox now causes a + rollback, instead of leaving the mailbox partially modified. + +- Issue #11132: Fix passing of "optimize" parameter when recursing in + compileall.compile_dir(). + +- Issue #11110: Fix a potential decref of a NULL in sqlite3. + +- Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch + by Stan Mihai. + +Build +----- + +- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X + installers now includes a link to the installed documentation and no longer + includes an Extras directory. The Tools directory is now installed in the + framework under share/doc. + +- Issue #11121: Fix building with --enable-shared. + +Tests +----- + +- Issue #10971: test_zipimport_support is once again compatible with the refleak + hunter feature of test.regrtest. + + +What's New in Python 3.2 Release Candidate 2? +============================================= + +*Release date: 30-Jan-2011* + +Core and Builtins +----------------- + +- Issue #10451: memoryview objects could allow to mutate a readable buffer. + Initial patch by Ross Lagerwall. + +Library +------- + +- Issue #9124: mailbox now accepts binary input and reads and writes mailbox + files in binary mode, using the email package's binary support to parse + arbitrary email messages. StringIO and text file input is deprecated, + and string input fails early if non-ASCII characters are used, where + previously it would fail when the email was processed in a later step. + +- Issue #10845: Mitigate the incompatibility between the multiprocessing + module on Windows and the use of package, zipfile or directory execution + by special casing main modules that actually *are* called __main__.py. + +- Issue #11045: Protect logging call against None argument. + +- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save + commands. + +- Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, + preventing a confusing hung appearance on OS X with the windows + obscured. + +- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the + menu accelerators for Open Module, Go to Line, and New Indent Width. + The accelerators still work but no longer appear in the menu items. + +- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True). + +- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 + conversion. + +- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message + with a None body. + +- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a + keyword-only argument. The preceding positional argument was deprecated, + so it made no sense to add filter as a positional argument. + +- Issue #11004: Repaired edge case in deque.count(). + +- Issue #10974: IDLE no longer crashes if its recent files list includes files + with non-ASCII characters in their path names. + +- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both + return sets instead of one returning a tuple and the other a frozenset. + +- Issue #10987: Fix the recursion limit handling in the _pickle module. + +- Issue #10983: Fix several bugs making tunnel requests in http.client. + +- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode + filenames, at bootstrap, if the codec registry is not ready yet. It is still + possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding) + for all file entries in the ZIP file. + +- Issue #10949: Improved robustness of rotating file handlers. + +- Issue #10955: Fix a potential crash when trying to mmap() a file past its + length. Initial patch by Ross Lagerwall. + +- Issue #10898: Allow compiling the posix module when the C library defines + a symbol named FSTAT. + +- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1) + encoding. This is the preferred encoding of PEP 3333 and the base encoding + of HTTP 1.1. + +- To match the behaviour of HTTP server, the HTTP client library now also + encodes headers with iso-8859-1 (latin1) encoding. It was already doing + that for incoming headers which makes this behaviour now consistent in + both incoming and outgoing direction. + +- Issue #9509: argparse now properly handles IOErrors raised by + argparse.FileType. + +- Issue #10961: The new pydoc server now better handles exceptions raised + during request handling. + +- Issue #10680: Fix mutually exclusive arguments for argument groups in + argparse. + +Build +----- + +- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with + the system-provided Python. + + +What's New in Python 3.2 Release Candidate 1 +============================================ + +*Release date: 16-Jan-2011* + +Core and Builtins +----------------- + +- Issue #10889: range indexing and slicing now works correctly on ranges with + a length that exceeds sys.maxsize. + +- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a + class. + +- Issue #8020: Avoid a crash where the small objects allocator would read + non-Python managed memory while it is being modified by another thread. Patch + by Matt Bandy. + +- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all + io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser + translates newlines (\r\n => \n). + +- Remove buffer API from stable ABI for now, see #10181. + +- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file + doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int + (length bigger than 2^31-1 bytes). + +- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and + stdprinter.write() clamp the length to INT_MAX on Windows. + +- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() + can now handle dates after 2038. + +- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and + PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the + filesystem encoding instead of UTF-8. + +- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem + encoding instead of UTF-8. + +- Add sys.flags attribute for the new -q command-line option. + +- Issue #11506: Trying to assign to a bytes literal should result in a + SyntaxError. + +Library +------- + +- Issue #10916: mmap should not segfault when a file is mapped using 0 as length + and a non-zero offset, and an attempt to read past the end of file is made + (IndexError is raised instead). Patch by Ross Lagerwall. + +- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead + of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. + +- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather + than the currently problematic Apple-supplied one, when running with the + 64-/32-bit installer variant. + +- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not + as unicode, and accept binary files. Add encoding and errors attributes to + cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn + Linderman). + +- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl(). + +- Issue #10899: No function type annotations in the standard library. Removed + function type annotations from _pyio.py. + +- Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'. + +- Issue #10872: The repr() of TextIOWrapper objects now includes the mode + if available. + +- Issue #10869: Fixed bug where ast.increment_lineno modified the root node + twice. + +- Issue #5871: email.header.Header.encode now raises an error if any + continuation line in the formatted value has no leading white space and looks + like a header. Since Generator uses Header to format all headers, this check + is made for all headers in any serialized message at serialization time. This + provides protection against header injection attacks. + +- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially + private by renaming it to ``_GeneratorContextManager``. + +- Issue #10042: Fixed the total_ordering decorator to handle cross-type + comparisons that could lead to infinite recursion. + +- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with + non-ASCII bytes (parsed by a BytesParser) when doing conversion to 7bit-clean + presentation, instead of replacing them with ?s. + +- email.header.Header was incorrectly encoding folding whitespace when + rfc2047-encoding header values with embedded newlines, leaving them without + folding whitespace. It now uses the continuation_ws, as it does for + continuation lines that it creates itself. + +- Issue #1777412, #10827: Changed the rules for 2-digit years. The + time.asctime(), time.ctime() and time.strftime() functions will now format + any year when ``time.accept2dyear`` is False and will accept years >= 1000 + otherwise. ``time.mktime`` and ``time.strftime`` now accept full range + supported by the OS. With Visual Studio or on Solaris, the year is limited to + the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated. + +- Issue #7858: Raise an error properly when os.utime() fails under Windows + on an existing file. + +- Issue #3839: wsgiref should not override a Content-Length header set by + the application. Initial patch by Clovis Fabricio. + +- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the + compilation (if the input is a string). + +- Issue #7995: When calling accept() on a socket with a timeout, the returned + socket is now always blocking, regardless of the operating system. + +- Issue #10756: atexit normalizes the exception before displaying it. Patch by + Andreas St?hrk. + +- Issue #10790: email.header.Header.append's charset logic now works correctly + for charsets whose output codec is different from its input codec. + +- Issue #10819: SocketIO.name property returns -1 when its closed, instead of + raising a ValueError, to fix repr(). + +- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if + the input buffer length doesn't fit into an unsigned int (length bigger than + 2^32-1 bytes). + +- Issue #6643: Reinitialize locks held within the threading module after fork to + avoid a potential rare deadlock or crash on some platforms. + +- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file + descriptors (0, 1, 2) are closed in the parent process. Initial patch by Ross + Lagerwall. + +- `unittest.TestCase` can be instantiated without a method name; for simpler + exploration from the interactive interpreter. + +- Issue #10798: Reject supporting concurrent.futures if the system has too + few POSIX semaphores. + +- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from + the codec aliases. They are still accessible via codecs.lookup(). + +- Issue #10801: In zipfile, support different encodings for the header and the + filenames. + +- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott + David Daniels. + +- Fix collections.OrderedDict.setdefault() so that it works in subclasses that + define __missing__(). + +- Issue #10786: unittest.TextTestRunner default stream no longer bound at import + time. `sys.stderr` now looked up at instantiation time. Fix contributed by + Mark Roddy. + +- Issue #10753: Characters ';', '=' and ',' in the PATH_INFO environment variable + won't be quoted when the URI is constructed by the wsgiref.util's request_uri + method. According to RFC 3986, these characters can be a part of params in + PATH component of URI and need not be quoted. + +- Issue #10738: Fix webbrowser.Opera.raise_opts. + +- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how + browsers actually parse cookies. + +- Issue #9333: os.symlink now available regardless of user privileges. The + function now raises OSError on Windows >=6.0 when the user is unable to create + symbolic links. XP and 2003 still raise NotImplementedError. + +- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8. + +- Issue #10730: Add SVG mime types to mimetypes module. + +- Issue #10768: Make the Tkinter ScrolledText widget work again. + +- Issue #10777: Fix "dictionary changed size during iteration" bug in + ElementTree register_namespace(). + +- Issue #10626: test_logging now preserves logger disabled states. + +- Issue #10774: test_logging now removes temp files created during tests. + +- Issue #5258/#10642: if site.py encounters a .pth file that generates an error, + it now prints the filename, line number, and traceback to stderr and skips + the rest of that individual file, instead of stopping processing entirely. + +- Issue #10763: subprocess.communicate() closes stdout and stderr if both are + pipes (bug specific to Windows). + +- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better + compliance (no "s around encoded values). + +- Improved the diff message in the unittest module's assertCountEqual(). + +- Issue #1155362: email.utils.parsedate_tz now handles a missing space before + the '-' of a timezone field as well as before a '+'. + +- Issue #4871: The zipfile module now gives a more useful error message if + an attempt is made to use a string to specify the archive password. + +- Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only. + +- Deprecated assertDictContainsSubset() in the unittest module. + +C-API +----- + +- PyObject_CallMethod now passes along any underlying AttributeError from + PyObject_GetAttr, instead of replacing it with something less informative + +- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and + PyEval_ReleaseLock(). The thread-state aware APIs should be used instead. + +- Issue #10333: Remove ancient GC API, which has been deprecated since Python + 2.2. + +Build +----- + +- Issue #10843: Update third-party library versions used in OS X 32-bit + installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4 + and RTREE enabled), and ncursesw 5.5 (wide-char support enabled). + +- Issue #10820: Fix OS X framework installs to support version-specific + scripts (#10679). + +- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in + the configure script but use $GREP instead. Patch by Fabian Groffen. + +- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD + and DragonFly BSD. Patch by Nicolas Joly. + +- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with + a version-specific suffix on "make altinstall". + +- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with + timestamp profiling (--with-tsc): the preprocessor test for the PowerPC + support now looks for "__powerpc__" as well as "__ppc__": the latter seems to + only be present on OS X; the former is the correct one for Linux with GCC. + +- Issue #1099: Fix the build on MacOSX when building a framework with pydebug + using GCC 4.0. + +Tools/Demos +----------- + +- Issue #10843: Install the Tools directory on OS X in the applications Extras + (/Applications/Python 3.n/Extras/) where the Demo directory had previous been + installed. + +- Issue #7962: The Demo directory is gone. Most of the old and unmaintained + demos have been removed, others integrated in documentation or a new + Tools/demo subdirectory. + +- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell. + Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian + Curtin. + +Tests +----- + +- Issue #11910: Fix test_heapq to skip the C tests when _heapq is missing. + +- Fix test_startfile to wait for child process to terminate before finishing. + +- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch + by Ross Lagerwall. + +- Make the --coverage flag work for test.regrtest. + +- Issue #1677694: Refactor and improve test_timeout. Original patch by + Bj?rn Lindqvist. + +- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects. + Patch by Jean-Paul Calderone and Sandro Tosi. + +- Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in + whole runs and enabled selectively using ``--header`` when running an explicit + list of tests. Original patch by Collin Winter. + + +What's New in Python 3.2 Beta 2? +================================ + +*Release date: 19-Dec-2010* + +Core and Builtins +----------------- + +- Issue #8844: Regular and recursive lock acquisitions can now be interrupted + by signals on platforms using pthreads. Patch by Reid Kleckner. + +- Issue #4236: PyModule_Create2 now checks the import machinery directly + rather than the Py_IsInitialized flag, avoiding a Fatal Python + error in certain circumstances when an import is done in __del__. + +- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and + Daniel Urban. + +Library +------- + +- Issue #3243: Support iterable bodies in httplib. Patch Contributions by + Xuanji Li and Chris AtLee. + +- Issue #10611: SystemExit exception will no longer kill a unittest run. + +- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean + up function. + +- Issue #10573: use actual/expected consistently in unittest methods. + The order of the args of assertCountEqual is also changed. + +- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated + words in the local part of email addresses, thereby preserving the input. + +- Issue #6791: Limit header line length (to 65535 bytes) in http.client + and http.server, to avoid denial of services from the other party. + +- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. + +- Issue #9907: Fix tab handling on OSX when using editline by calling + rl_initialize first, then setting our custom defaults, then reading .editrc. + +- Issue #4188: Avoid creating dummy thread objects when logging operations + from the threading module (with the internal verbose flag activated). + +- Issue #10711: Remove HTTP 0.9 support from http.client. The ``strict`` + parameter to HTTPConnection and friends is deprecated. + +- Issue #9721: Fix the behavior of urljoin when the relative url starts with a + ';' character. Patch by Wes Chow. + +- Issue #10714: Limit length of incoming request in http.server to 65536 bytes + for security reasons. Initial patch by Ross Lagerwall. + +- Issue #9558: Fix distutils.command.build_ext with VS 8.0. + +- Issue #10667: Fast path for collections.Counter(). + +- Issue #10695: passing the port as a string value to telnetlib no longer + causes debug mode to fail. + +- Issue #1078919: add_header now automatically RFC2231 encodes parameters + that contain non-ascii values. + +- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits + a warning on sys.stderr rather than throwing a misleading exception + if cleanup fails due to nulling out of modules during shutdown. + Also avoids an AttributeError when mkdtemp call fails and issues + a ResourceWarning on implicit cleanup via __del__. + +- Issue #10107: Warn about unsaved files in IDLE on OSX. + +- Issue #7213: subprocess.Popen's default for close_fds has been changed. + It is now True in most cases other than on Windows when input, output or + error handles are provided. + +- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually + added in 3.2beta1) to allow specifying a specific list of file descriptors + to keep open in the child process. + +- Issue #1731717: Fixed the problem where subprocess.wait() could cause an + OSError exception when The OS had been told to ignore SIGCLD in our process + or otherwise not wait for exiting child processes. + +Tests +----- + +- Issue #775964: test_grp now skips YP/NIS entries instead of failing when + encountering them. + +Tools/Demos +----------- + +- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and + Cocoa AquaTk. + +- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree. + +- Issue #10706: Remove outdated script runtests.sh. Either ``make test`` + or ``python -m test`` should be used instead. + +Build +----- + +- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4. + +- Issue #9234: argparse supports alias names for subparsers. + + +What's New in Python 3.2 Beta 1? +================================ + +*Release date: 05-Dec-2010* + +Core and Builtins +----------------- + +- Issue #10630: Return dict views from the dict proxy keys()/values()/items() + methods. + +- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__ + with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. + +- Issue #1772833: Add the -q command-line option to suppress copyright and + version output in interactive mode. + +- Provide an *optimize* parameter in the built-in compile() function. + +- Fixed several corner case issues on Windows in os.stat/os.lstat related to + reparse points. + +- PEP 384 (Defining a Stable ABI) is implemented. + +- Issue #2690: Range objects support negative indices and slicing. + +- Issue #9915: Speed up sorting with a key. + +- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much + larger than operand ``b``. Patch by Andrew Bennetts. + +- Issue #10518: Bring back the callable() builtin. + +- Issue #7094: Added alternate formatting (specified by '#') to ``__format__`` + method of float, complex, and Decimal. This allows more precise control over + when decimal points are displayed. + +- Issue #10474: range.count() should return integers. + +- Issue #1574217: isinstance now catches only AttributeError, rather than + masking all errors. + +Library +------- + +- logging: added "handler of last resort". See http://bit.ly/last-resort-handler + +- test.support: Added TestHandler and Matcher classes for better support of + assertions about logging. + +- Issue #4391: Use proper plural forms in argparse. + +- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on + UnicodeEncodeError. + +- Add the "display" and "undisplay" pdb commands. + +- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again + after a "continue" command. + +- Add the "interact" pdb command. + +- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf. + +- Issue #1569291: Speed up array.repeat(). + +- Provide an interface to set the optimization level of compilation in + py_compile, compileall and zipfile.PyZipFile. + +- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by + RFC3986. Anything before :// is considered a scheme and is followed by an + authority (or netloc) and by '/' led path, which is optional. + +- Issue #6045: dbm.gnu databases now support get() and setdefault() methods. + +- Issue #10620: `python -m unittest` can accept file paths instead of module + names for running specific tests. + +- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`, + `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_` + and replace them with the correct methods in the Python test suite. + +- Issue #10272: The ssl module now raises socket.timeout instead of a generic + SSLError on socket timeouts. + +- Issue #10528: Allow translators to reorder placeholders in localizable + messages from argparse. + +- Issue #10497: Fix incorrect use of gettext in argparse. + +- Issue #10478: Reentrant calls inside buffered IO objects (for example by + way of a signal handler) now raise a RuntimeError instead of freezing the + current process. + +- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests. + +- Issue #10549: Fix pydoc traceback when text-documenting certain classes. + +- Issue #2001: New HTML server with enhanced Web page features. Patch by Ron + Adam. + +- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership + of non-weakrefable objects. + +- Issue #940286: pydoc.Helper.help() ignores input/output init parameters. + +- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent + DoS attacks. Patch by Savio Sena. + +- Issue #4925: Add filename to error message when executable can't be found in + subprocess. + +- Issue #10391: Don't dereference invalid memory in error messages in the ast + module. + +- Issue #10027: st_nlink was not being set on Windows calls to os.stat or + os.lstat. Patch by Hirokazu Yamamoto. + +- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is + held by the user's account, i.e., when the function can actually be used. + +- Issue #8879: Add os.link support for Windows. + +- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved + failure messages by default. Patch by Mark Roddy. + +- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to + guess at the correct parsing of invalid html. + +- Issue #10554: Add context manager support to subprocess.Popen objects. + +- Issue #8989: email.utils.make_msgid now has a domain parameter that can + override the domain name used in the generated msgid. + +- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File + exists' exception when a target directory already exists with the specified + mode. Patch by Ray Allen. + +- Issue #9573: os.fork() now works correctly when triggered as a side effect of + a module import. + +- Issue #10464: netrc now correctly handles lines with embedded '#' characters. + +- Added itertools.accumulate(). + +- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``. + Original patch by Daniel Urban. + +- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to + `assertRegex` and `assertRaisesRegex`. + +- Issue #10535: Enable silenced warnings in unittest by default. + +- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte + sequences as input in addition to character strings. + +- Issue #10586: The statistics API for the new functools.lru_cache has been + changed to a single cache_info() method returning a named tuple. + +- Issue #10323: itertools.islice() now consumes the minimum number of inputs + before stopping. Formerly, the final state of the underlying iterator was + undefined. + +- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and + __next__. + +- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new + more informative name, unittest.CountEqual. + +- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. + +- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can + be set to False to turn off the previously undocumented 'popularity' + heuristic. Patch by Terry Reedy and Eli Bendersky. + +- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate + undocumented and now redundant isbjunk and isbpopular methods. + +- Issue #9846: zipfile is now correctly closing underlying file objects. + +- Issue #10459: Update CJK character names to Unicode 6.0. + +- Issue #4493: urllib.request adds '/' in front of path components which does not + start with '/. Common behavior exhibited by browsers and other clients. + +- Issue #6378: idle.bat now runs with the appropriate Python version rather than + the system default. Patch by Sridhar Ratnakumar. + +- Issue #10470: 'python -m unittest' will now run test discovery by default, + when no extra arguments have been provided. + +- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to + output stream only when end_headers is invoked. This is a speedup and an + internal optimization. Patch by Andrew Shaaf. + +- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho + Eckhardt. + +- Issue #10453: compileall now uses argparse instead of getopt, and thus + provides clean output when called with '-h'. + +- Issue #8078: Add constants for higher baud rates in the termios module. Patch + by Rodolpho Eckhardt. + +- Issue #10407: Fix two NameErrors in distutils. + +- Issue #10371: Deprecated undocumented functions in the trace module. + +- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the + end of the file. + +- configparser: 100% test coverage. + +- Issue #10499: configparser supports pluggable interpolation handlers. The + default classic interpolation handler is called BasicInterpolation. Another + interpolation handler added (ExtendedInterpolation) which supports the syntax + used by zc.buildout (e.g. interpolation between sections). + +- configparser: the SafeConfigParser class has been renamed to ConfigParser. + The legacy ConfigParser class has been removed but its interpolation mechanism + is still available as LegacyInterpolation. + +- configparser: Usage of RawConfigParser is now discouraged for new projects + in favor of ConfigParser(interpolation=None). + +- Issue #1682942: configparser supports alternative option/value delimiters. + +- Issue #5412: configparser supports mapping protocol access. + +- Issue #9411: configparser supports specifying encoding for read operations. + +- Issue #9421: configparser's getint(), getfloat() and getboolean() methods + accept vars and default arguments just like get() does. + +- Issue #9452: configparser supports reading from strings and dictionaries + (thanks to the mapping protocol API, the latter can be used to copy data + between parsers). + +- configparser: accepted INI file structure is now customizable, including + comment prefixes, name of the DEFAULT section, empty lines in multiline + values, and indentation. + +- Issue #10326: unittest.TestCase instances can be pickled. + +- Issue #9926: Wrapped TestSuite subclass does not get __call__ executed. + +- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex + zeros on systems where the log1p function fails to respect the sign of zero. + This fixes a test failure on AIX. + +- Issue #9732: Addition of getattr_static to the inspect module. + +- Issue #10446: Module documentation generated by pydoc now links to a + version-specific online reference manual. + +- Make the 'No module named' exception message from importlib consistent. + +- Issue #10443: Add the SSLContext.set_default_verify_paths() method. + +- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module. + Patch by Robert Collins. + +- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather + than strings. + +C-API +----- + +- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(), + which transforms non-ASCII decimal digits in a Unicode string to their ASCII + equivalents. + +- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly + zero-initialize all fields, fixing compiler warnings seen when building + extension modules with gcc with "-Wmissing-field-initializers" (implied by + "-W"). + +- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil + Schemenauer. + +- structseq.h is now included in Python.h. + +- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. + +Tests +----- + +- regrtest.py once again ensures the test directory is removed from sys.path + when it is invoked directly as the __main__ module. + +- `python -m test` can be used to run the test suite as well as `python -m + test.regrtest`. + +- Do not fail test_socket when the IP address of the local hostname cannot be + looked up. + +- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric + Carstensen. + +Build +----- + +- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and + PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals. + +Documentation +------------- + +- Issue #10299: List the built-in functions in a table in functions.rst. + + +What's New in Python 3.2 Alpha 4? +================================= + +*Release date: 13-Nov-2010* + +Core and Builtins +----------------- + +- Issue #10372: Import the warnings module only after the IO library is + initialized, so as to avoid bootstrap issues with the '-W' option. + +- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused + undocumented value PyBUF_SHADOW, and strangely-looking code in + PyMemoryView_GetContiguous. + +- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``. + +- If FileIO.__init__ fails, close the file descriptor. + +- Issue #10221: dict.pop(k) now has a key error message that includes the + missing key (same message d[k] returns for missing keys). + +- Issue #5437: A preallocated MemoryError instance should not keep traceback + data (including local variables caught in the stack trace) alive infinitely. + +- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length + of the offending line. + +- Issue #10089: Add support for arbitrary -X options on the command line. They + can be retrieved through a new attribute ``sys._xoptions``. + +- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of + the locale encoding. If the LANG (and LC_ALL and LC_CTYPE) environment + variable is not set, the locale encoding is ISO-8859-1, whereas most programs + (including Python) expect UTF-8. Python already uses UTF-8 for the filesystem + encoding and to encode command line arguments on this OS. + +- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect + filenames encoded to the filesystem encoding with the surrogateescape error + handler (to support undecodable bytes), instead of UTF-8 in strict mode. + +- Issue #9997: Don't let the name "top" have special significance in scope + resolution. + +- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as + the default 512 when compiling on AIX. + +- Use locale encoding instead of UTF-8 to encode and decode filenames if + Py_FileSystemDefaultEncoding is not set. + +- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file + descriptor. + +- Issue #9418: Moved private string methods ``_formatter_parser`` and + ``_formatter_field_name_split`` into a new ``_string`` module. + +- Issue #9992: Remove PYTHONFSENCODING environment variable. + +Library +------- + +- Issue #12943: python -m tokenize support has been added to tokenize. + +- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. + +- Issue #10356: Decimal.__hash__(-1) should return -2. + +- Issue #1553375: logging: Added stack_info kwarg to display stack information. + +- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru. + +- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See also issue + #10356.) + +- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard + IMAP4 connections. Original patch by Lorenzo M. Catucci. + +- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if + there are non-base64 alphabet characters in the input. + +- Issue #10386: Add __all__ to token module; this simplifies importing in + tokenize module and prevents leaking of private names through ``import *``. + +- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by Lorenzo + M. Catucci. + +- Fix IMAP.login() to work properly. + +- Issue #9244: multiprocessing pool worker processes could terminate + unexpectedly if the return value of a task could not be pickled. Only the + ``repr`` of such errors are now sent back, wrapped in an + ``MaybeEncodingError`` exception. + +- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of + ``multiprocessing.Pool`` now accepts a ``error_callback`` argument. This can + be a callback with the signature ``callback(exc)``, which will be called if + the target raises an exception. + +- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL + sockets now has additional items such as ``issuer`` and ``notBefore``. + +- ``usenetrc`` is now false by default for NNTP objects. + +- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS. + Patch by Andrew Vant. + +- Issue #10335: Add tokenize.open(), detect the file encoding using + tokenize.detect_encoding() and open it in read only mode. + +- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new + method send_message to send an email.message.Message object. + +- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error + handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source + code directory name contains a non-ASCII character and the locale encoding is + ASCII. + +- Issue #10329: The trace module writes reports using the input Python script + encoding, instead of the locale encoding. Patch written by Alexander + Belopolsky. + +- Issue #10126: Fix distutils' test_build when Python was built with + --enable-shared. + +- Issue #9281: Prevent race condition with mkdir in distutils. Patch by + Arfrever. + +- Issue #10229: Fix caching error in gettext. + +- Issue #10252: Close file objects in a timely manner in distutils code and + tests. Patch by Brian Brazil, completed by ?ric Araujo. + +- Issue #10180: Pickling file objects is now explicitly forbidden, since + unpickling them produced nonsensical results. + +- Issue #10311: The signal module now restores errno before returning from its + low-level signal handler. Patch by Hallvard B Furuseth. + +- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects. + +- Issue #10283: Add a ``group_pattern`` argument to NNTP.list(). + +- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI + environment better, and to correct unicode environment values for WSGI 1.0.1. + +- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER + response, instead of raising an exception. + +- wsgiref now implements and validates PEP 3333, rather than an experimental + extension of PEP 333. (Note: earlier versions of Python 3.x may have + incorrectly validated some non-compliant applications as WSGI compliant; if + your app validates with Python <3.2b1+, but not on this version, it is likely + the case that your app was not compliant.) + +- Issue #10280: NNTP.nntp_version should reflect the highest version advertised + by the server. + +- Issue #10184: Touch directories only once when extracting a tarfile. + +- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts + that were formerly found under Demo/turtle. + +- Issue #10265: Close file objects explicitly in sunau. Patch by Brian Brazil. + +- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a + filename. Patch by Brian Brazil. + +- Issue #10110: Queue objects didn't recognize full queues when the maxsize + parameter had been reduced. + +- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. + +- logging: Added style option to basicConfig() to allow %, {} or $-formatting. + +- Issue #5729: json.dumps() now supports using a string such as '\t' for + pretty-printing multilevel objects. + +- Issue #10253: FileIO leaks a file descriptor when trying to open a file for + append that isn't seekable. Patch by Brian Brazil. + +- Support context manager protocol for file-like objects returned by mailbox + ``get_file()`` methods. + +- Issue #10246: uu.encode didn't close file objects explicitly when filenames + were given to it. Patch by Brian Brazil. + +- Issue #10198: fix duplicate header written to wave files when writeframes() is + called without data. + +- Close file objects in modulefinder in a timely manner. + +- Close a io.TextIOWrapper object in email.parser in a timely manner. + +- Close a file object in distutils.sysconfig in a timely manner. + +- Close a file object in pkgutil in a timely manner. + +- Issue #10233: Close file objects in a timely manner in the tarfile module and + its test suite. + +- Issue #10093: ResourceWarnings are now issued when files and sockets are + deallocated without explicit closing. These warnings are silenced by default, + except in pydebug mode. + +- tarfile.py: Add support for all missing variants of the GNU sparse extensions + and create files with holes when extracting sparse members. + +- Issue #10218: Return timeout status from ``Condition.wait`` in threading. + +- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and + deprecate the old name ``zipfile.BadZipfile``. + +- Issue #5027: The standard ``xml`` namespace is now understood by + xml.sax.saxutils.XMLGenerator as being bound to + http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell. + +- Issue #5975: Add csv.unix_dialect class. + +- Issue #7761: telnetlib.interact failures on Windows fixed. + +- logging: Added style option to Formatter to allow %, {} or $-formatting. + +- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a + context manager. + +- Issue #1349106: Generator (and BytesGenerator) flatten method and Header + encode method now support a 'linesep' argument. + +- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in + order to support the TLS SNI extension. ``HTTPSConnection`` and ``urlopen()`` + also use this argument, so that HTTPS virtual hosts are now supported. + +- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items. + +- Issue #10163: Skip unreadable registry keys during mimetypes initialization. + +- logging: Made StreamHandler terminator configurable. + +- logging: Allowed filters to be just callables. + +- logging: Added tests for _logRecordClass changes. + +- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. + +- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to + increase flexibility of LogRecord creation. + +- Issue #5117: Case normalization was needed on ntpath.relpath(). Also fixed + root directory issue on posixpath.relpath(). (Ported working fixes from + ntpath.) + +- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option + short_empty_elements to direct it to use self-closing tags when appropriate. + +- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags. Add --abiflags + switch to python-config for command line access. + +- Issue #6098: Don't claim DOM level 3 conformance in minidom. + +- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty + XML namespace attribute is encountered. + +- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic + characters by default. Deprecate ``cgi.escape()``. + +- Issue #9409: Fix the regex to match all kind of filenames, for interactive + debugging in doctests. + +- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the + same instance as ``datetime.timezone.utc``. + +- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where + supported by the system. Patch by Nikita Vetoshkin. + +- Issue #10063: file:// scheme will stop accessing remote hosts via ftp + protocol. file:// urls had fallback to access remote hosts via ftp. This was + not correct, change is made to raise a URLError when a remote host is tried to + access via file:// scheme. + +- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is + created in modes 'a' or 'w' and then closed without adding any files. Raise + BadZipfile (rather than IOError) when opening small non-ZIP files. + +- Issue #10041: The signature of optional arguments in socket.makefile() didn't + match that of io.open(), and they also didn't get forwarded properly to + TextIOWrapper in text mode. Patch by Kai Zhu. + +- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and + urllib.request.urlopen now take optional arguments to allow for server + certificate checking, as recommended in public uses of HTTPS. + +- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the + current directory was deleted. Patch written by W. Trevor King. + +- Issue #3873: Speed up unpickling from file objects that have a peek() method. + +- Issue #10075: Add a session_stats() method to SSLContext objects. + +- Issue #9948: Fixed problem of losing filename case information. + +Extension Modules +----------------- + +- Issue #5109: array.array constructor will now use fast code when + initial data is provided in an array object with correct type. + +- Issue #6317: Now winsound.PlaySound only accepts unicode. + +- Issue #6317: Now winsound.PlaySound can accept non ascii filename. + +- Issue #9377: Use Unicode API for gethostname on Windows. + +- Issue #10143: Update "os.pathconf" values. + +- Issue #6518: Support context manager protcol for ossaudiodev types. + +- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. + +- Issue #9054: Fix a crash occurring when using the pyexpat module with expat + version 2.0.1. + +- Issue #5355: Provide mappings from Expat error numbers to string descriptions + and backwards, in order to actually make it possible to analyze error codes + provided by ExpatError. + +- The Unicode database was updated to 6.0.0. + +C-API +----- + +- Issue #10288: The deprecated family of "char"-handling macros + (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead. + +- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t + type has been introduced. + +Tools/Demos +----------- + +- Issue #10117: Tools/scripts/reindent.py now accepts source files that use + encoding other than ASCII or UTF-8. Source encoding is preserved when + reindented code is written to a file. + +- Issue #7287: Demo/imputil/knee.py was removed. + +Tests +----- + +- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well + as unicode strings. Initial patch by Sandro Tosi. + +- Issue #10294: Remove dead code form test_unicode_file. + +- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new + test specific to unicode (non-ascii name and filename). + +Build +----- + +- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure. + +- Issue #8852: Allow the socket module to build on OpenSolaris. + +- Drop -OPT:Olimit compiler option. + +- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. + +- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. + +- Issue #7473: avoid link errors when building a framework with a different set + of architectures than the one that is currently installed. + + +What's New in Python 3.2 Alpha 3? +================================= + +*Release date: 09-Oct-2010* + +Core and Builtins +----------------- + +- Issue #10068: Global objects which have reference cycles with their module's + dict are now cleared again. This causes issue #7140 to appear again. + +- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename() + encodings. + +- ast.literal_eval() can now handle negative numbers. It is also a little more + liberal in what it accepts without compromising the safety of the evaluation. + For example, 3j+4 and 3+4+5 are both accepted. + +- Issue #10006: type.__abstractmethods__ now raises an AttributeError. As a + result metaclasses can now be ABCs (see #9533). + +- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t. + +- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace + UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and + 32 bits wchar_t (eg. Linux in narrow build). + +- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression + introduced by issue #9324. + +- Issue #9979: Create function PyUnicode_AsWideCharString(). + +- Issue #7397: Mention that importlib.import_module() is probably what someone + really wants to be using in __import__'s docstring. + +- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg + to use named arguments. + +- Issue #9930: Remove bogus subtype check that was causing (e.g.) + float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. + +- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin. + +- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other + threads are still running. Instead, reinitialize the GIL on a second call to + Py_Initialize(). + +- All SyntaxErrors now have a column offset and therefore a caret when the error + is printed. + +- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the + module that was imported, but instead gets the module from sys.modules. + +- Issue #9213: The range type_items now provides index() and count() methods, to + conform to the Sequence ABC. Patch by Daniel Urban and Daniel Stutzbach. + +- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called + with a non-empty format string. This is an effort to future-proof user + code. If a derived class does not currently implement __format__ but later + adds its own __format__, it would most likely break user code that had + supplied a format string. This will be changed to a DeprecationWaring in + Python 3.3 and it will be an error in Python 3.4. + +- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly + re-created on a subsequent call to Py_Initialize(). The problem (a crash) + wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial. + +- Issue #9210: Configure option --with-wctype-functions was removed. Using the + functions from the libc caused the methods .upper() and lower() to become + locale aware and created subtly wrong results. + +- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a + non-ASCII byte in the format string. + +- Issue #4617: Previously it was illegal to delete a name from the local + namespace if it occurs as a free variable in a nested block. This limitation + of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). + +- Issue #9804: ascii() now always represents unicode surrogate pairs as a single + ``\UXXXXXXXX``, regardless of whether the character is printable or not. + Also, the "backslashreplace" error handler now joins surrogate pairs into a + single character on UCS-2 builds. + +- Issue #9757: memoryview objects get a release() method to release the + underlying buffer (previously this was only done when deallocating the + memoryview), and gain support for the context management protocol. + +- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid + thread-local storage key. + +Library +------- + +- Issue #2236: distutils' mkpath ignored the mode parameter. + +- Fix typo in one sdist option (medata-check). + +- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce. + +- Issue #1718574: Fix options that were supposed to accept arguments but did + not in build_clib. + +- Issue #9437: Fix building C extensions with non-default LDFLAGS. + +- Issue #4661: email can now parse bytes input and generate either converted + 7bit output or bytes output. Email version bumped to 5.1.0. + +- Issue #1589: Add ssl.match_hostname(), to help implement server identity + verification for higher-level protocols. + +- Issue #9759: GzipFile now raises ValueError when an operation is attempted + after the file is closed. Patch by Jeffrey Finkelstein. + +- Issue #9042: Fix interaction of custom translation classes and caching in + gettext. + +- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method + returning a (sock, addr) pair which is called when a connection has been + established with a new remote endpoint. This is supposed to be used as a + replacement for old handle_accept() and avoids the user to call accept() + directly. + +- Issue #9065: tarfile no longer uses "root" as the default for the uname and + gname field. + +- Issue #8980: Fixed a failure in distutils.command check that was shadowed by + an environment that does not have docutils. Patch by Arfrever. + +- Issue #1050268: parseaddr now correctly quotes double quote and backslash + characters that appear inside quoted strings in email addresses. + +- Issue #10004: quoprimime no longer generates a traceback when confronted with + invalid characters after '=' in a Q-encoded word. + +- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before + sending a 200 OK for the Expect: 100-continue request header. + +- Issue #9360: Cleanup and improvements to the nntplib module. The API now + conforms to the philosophy of bytes and unicode separation in Python 3. A + test suite has also been added. + +- Issue #9962: GzipFile now has the peek() method. + +- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, + retry the select() loop instead of bailing out. This is because select() can + incorrectly report a socket as ready for reading (for example, if it received + some data with an invalid checksum). + +- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) + +- Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is + received. Now sendall() properly calls signal handlers if necessary, and + retries sending if these returned successfully, including on sockets with a + timeout. + +- Issue #9947: logging: Fixed locking bug in stopListening. + +- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler. + +- Issue #9936: Fixed executable lines' search in the trace module. + +- Issue #9790: Rework imports necessary for samefile and sameopenfile + in ntpath. + +- Issue #9928: Properly initialize the types exported by the bz2 module. + +- Issue #1675951: Allow GzipFile to work with unseekable file objects. Patch by + Florian Festi. + +- Logging: Added QueueListener class to facilitate logging usage for + performance-critical threads. + +- Issue #9916: Add some missing errno symbols. + +- Issue #9877: Expose sysconfig.get_makefile_filename() + +- logging: Added hasHandlers() method to Logger and LoggerAdapter. + +- Issue #9908: Fix os.stat() on bytes paths under Windows 7. + +- Issue #2643: msync() is not called anymore when deallocating an open mmap + object, only munmap(). + +- logging: Changed LoggerAdapter implementation internally, to make it easier to + subclass in a useful way. + +- logging: hasHandlers method was added to Logger, and isEnabledFor, + getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter. + LoggerAdapter was introduced into the unit tests for logging. + +- Issue #1686: Fix string.Template when overriding the pattern attribute. + +- Issue #9854: SocketIO objects now observe the RawIOBase interface in + non-blocking mode: they return None when an operation would block (instead of + raising an exception). + +- Issue #1730136: Fix the comparison between a tk.font.Font and an object of + another kind. + +- Issue #9441: logging has better coverage for rotating file handlers. + +- Issue #9865: collections.OrderedDict now has a __sizeof__ method. + +- Issue #9854: The default read() implementation in io.RawIOBase now handles + non-blocking readinto() returning None correctly. + +- Issue #1552: socket.socketpair() now returns regular socket.socket objects + supporting the whole socket API (rather than the "raw" _socket.socket + objects). + +- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto() + to match the corresponding socket methods. + +- Issue #9840: Added a decorator to reprlib for wrapping __repr__ methods to make + them handle recursive calls within the same thread. + +- logging: Enhanced HTTPHandler with secure and credentials initializers. + +- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X. + +- Issue #9837: The read() method of ZipExtFile objects (as returned by + ZipFile.open()) could return more bytes than requested. + +- Issue #9826: OrderedDict.__repr__ can now handle self-referential values: + d['x'] = d. + +- Issue #9825: Using __del__ in the definition of collections.OrderedDict made + it possible for the user to create self-referencing ordered dictionaries which + become permanently uncollectable GC garbage. Reinstated the Python 3.1 + approach of using weakref proxies so that reference cycles never get created + in the first place. + +- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and + encode the value with filesystem encoding and surrogateescape (instead of + utf-8 in strict mode) . Patch written by David Watson. + +- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING + environment variable to set the filesystem encoding at Python startup. + sys.setfilesystemencoding() creates inconsistencies because it is unable to + reencode all filenames in all objects. + +- Issue #9410: Various optimizations to the pickle module, leading to speedups + up to 4x (depending on the benchmark). Mostly ported from Unladen Swallow; + initial patch by Alexandre Vassalotti. + +- The pprint module now supports printing OrderedDicts in their given order + (formerly, it would sort the keys). + +- Logging: Added QueueHandler class to facilitate logging usage with + multiprocessing. + +- Issue #9707: Rewritten reference implementation of threading.local which is + friendlier towards reference cycles. This change is not normally visible + since an optimized C implementation (_thread._local) is used instead. + +- Issue #6394: os.getppid() is now supported on Windows. Note that it will + still return the id of the parent process after it has exited. This process + id may even have been reused by another unrelated process. + +- Issue #9792: In case of connection failure, socket.create_connection() would + swallow the exception and raise a new one, making it impossible to fetch the + original errno, or to filter timeout errors. Now the original error is + re-raised. + +- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and + the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated + back after the system call. Original patch by Brian Brazil. + +- Updates to the random module: + + * Document which parts of the module are guaranteed to stay the same across + versions and which parts are subject to change. + + * Update the seed() method to use all of the bits in a string instead of just + the hash value. This makes better use of the seed value and assures the + seeding is platform independent. Issue #7889. + + * Improved the random()-->integer algorithm used in choice(), shuffle(), + sample(), randrange(), and randint(). Formerly, it used int(n*random()) + which has a slight bias whenever n is not a power of two. Issue #9025. + + * Improved documentation of arguments to randrange(). Issue #9379. + +- collections.OrderedDict now supports a new method for repositioning keys to + either end. + +- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test + cases now also have assertWarns and assertWarnsRegexp methods to check that a + given warning type was triggered by the code under test. + +- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of + their contents without duplicating them. The view is both readable and + writable. + +- Issue #7566: Implement os.path.sameopenfile for Windows. + +- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an + unsupported operation is attempted (for example, writing to a file open only + for reading). + +- hashlib has two new constant attributes: algorithms_guaranteed and + algorithms_avaiable that respectively list the names of hash algorithms + guaranteed to exist in all Python implementations and the names of hash + algorithms available in the current process. + +- A new package ``concurrent.futures`` as defined by PEP 3148. + +C-API +----- + +- Add PyErr_SyntaxLocationEx, which supports passing a column offset. + +- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or + PySequence_DelSlice when the object doesn't have any mapping operations + defined. + +Tools/Demos +----------- + +- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as + wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb) + and the interpreter under test. + +Tests +----- + +- Issue #9308: Added tests for importing encoded modules that do not + depend on specific stdlib modules being encoded in a certain way. + +- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom + certificate and private key files used by SSL-related certs. + +- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests + in test_os) + +- Issue #7110: regrtest now sends test failure reports and single-failure + tracebacks to stderr rather than stdout. + +- Issue #9628: fix runtests.sh -x option so more than one test can be excluded. + +- Issue #9899: Fix test_tkinter.test_font on various platforms. Patch by Ned + Deily. + +- Issue #9894: Do not hardcode ENOENT in test_subprocess. + +- Issue #9315: Added tests for the trace module. Patch by Eli Bendersky. + +- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the + case when running profile or trace, for example. + +- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. + +Build +----- + +- Issue #10062: Allow building on platforms which do not have sem_timedwait. + +- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by Akira + Kitada. + +- Issue #10055: Make json C89-compliant in UCS4 mode. + +- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows) + +- Issue #1633863: Don't ignore $CC under AIX. + +- Issue #9810: Compile bzip2 source files in Python's project file directly. It + used to be built with bzip2's makefile. + +- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in + module. + +- Issue #9806: python-config now has an ``--extension-suffix`` option that + outputs the suffix for dynamic libraries including the ABI version name + defined by PEP 3149. + +- Issue #941346: Improve the build process under AIX and allow Python to be + built as a shared library. Patch by S?bastien Sabl?. + +- Issue #4026: Make the fcntl extension build under AIX. Patch by S?bastien + Sabl?. + +- Issue #9701: The MacOSX installer can patch the shell profile to ensure that + the "bin" directory inside the framework is on the shell's search path. This + feature now also supports the ZSH shell. + + +What's New in Python 3.2 Alpha 2? +================================= + +*Release date: 05-Sep-2010* + +Core and Builtins +----------------- + +- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by + the new (and simpler) DUP_TOP_TWO. Performance isn't changed, but our + bytecode is a bit simplified. Patch by Demur Rumed. + +- Issue #9766: Rename poorly named variables exposed by _warnings to prevent + confusion with the proper variables names from 'warnings' itself. + +- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to + conform to the Set ABC. Patch by Daniel Urban. + +- Issue #9737: Fix a crash when trying to delete a slice or an item from a + memoryview object. + +- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are + now removed, since their effect was inexistent in 3.x (the default encoding is + hardcoded to utf-8 and cannot be changed). + +- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API + properly. Patch by Stefan Behnel. + +- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most + platforms. Previously, it inlined only when using Microsoft Visual C. + +- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. + +- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. + +- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match + the pyconfig.h generated by configure on other systems. + +- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that + occur during attribute lookup are now propagated to the caller. + +- Issue #8622: Add PYTHONFSENCODING environment variable to override the + filesystem encoding. + +- Issue #5127: The C functions that access the Unicode Database now accept and + return characters from the full Unicode range, even on narrow unicode builds + (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others). A visible difference + in Python is that unicodedata.numeric() now returns the correct value for + large code points, and repr() may consider more characters as printable. + +- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename + as a unicode object, instead of a byte string. Function needed to support + unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new + function. + +- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx(). + +- Issue #9612: The set object is now 64-bit clean under Windows. + +- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for + the module file to be executed with the -m command line option. + +- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to + write a message formatted by PyUnicode_FromFormatV() to sys.stdout and + sys.stderr. + +- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter: + decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str + objects are output as-is. + +- Issue #9203: Computed gotos are now enabled by default on supported compilers + (which are detected by the configure script). They can still be disable + selectively by specifying --without-computed-gotos. + +- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but + use PyUnicode_FromFormatV() to format the warning message. + +- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an + array. + +- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. + +- Issue #9337: The str() of a float or complex number is now identical to its + repr(). + +- Issue #9416: Fix some issues with complex formatting where the output with no + type specifier failed to match the str output: + + - format(complex(-0.0, 2.0), '-') omitted the real part from the output, + - format(complex(0.0, 2.0), '-') included a sign and parentheses. + +Extension Modules +----------------- + +- Issue #8013: time.asctime and time.ctime no longer call system + asctime and ctime functions. The year range for time.asctime is now + 1900 through maxint. The range for time.ctime is the same as for + time.localtime. The string produced by these functions is longer + than 24 characters when year is greater than 9999. + +- Issue #6608: time.asctime is now checking struct tm fields its input + before passing it to the system asctime. Patch by MunSic Jeong. + +- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file + descriptor is provided. Patch by Pascal Chambon. + +- Issue #7736: Release the GIL around calls to opendir() and closedir() in the + posix module. Patch by Marcin Bachry. + +- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the + socket module, and fix the width of socket descriptors to be correctly + detected under 64-bit Windows. + +- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo + and gethostbyaddr. getnameinfo is now restricted to numeric addresses as + input. + +- Issue #9214: Set operations on a KeysView or ItemsView in collections now + correctly return a set. Patch by Eli Bendersky. + +- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by + Matthew Ahrens. + +- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using + the surrogate error handler. + +- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other + than ``TypeError`` raised by the iterator argument. + +- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo. + +- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter + Lock around all system calls. Original patch by Ryan Kelly. + +- Issue #8524: Add a detach() method to socket objects, so as to put the socket + into the closed state without closing the underlying file descriptor. + +- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty. + +- Issue #6869: Fix a refcount problem in the _ctypes extension. + +- Issue #5504: ctypes should now work with systems where mmap can't be + PROT_WRITE and PROT_EXEC. + +- Issue #9507: Named tuple repr will now automatically display the right name in + a tuple subclass. + +- Issue #9324: Add parameter validation to signal.signal on Windows in order to + prevent crashes. + +- Issue #9526: Remove some outdated (int) casts that were preventing the array + module from working correctly with arrays of more than 2**31 elements. + +- Fix memory leak in ssl._ssl._test_decode_cert. + +- Issue #8065: Fix memory leak in readline module (from failure to free the + result of history_get_history_state()). + +- Issue #9450: Fix memory leak in readline.replace_history_item and + readline.remove_history_item for readline version >= 5.0. + +- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. + +- Issue #8046: Add context manager protocol support and .closed property to mmap + objects. + +Library +------- + +- Issue #7451: Improve decoding performance of JSON objects, and reduce the + memory consumption of said decoded objects when they use the same strings as + keys. + +- Issue #1100562: Fix deep-copying of objects derived from the list and dict + types. Patch by Michele Orr? and Bj?rn Lindqvist. + +- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows. + +- Issue #9421: Made the get methods consistently accept the vars and + default arguments on all parser classes. + +- Issue #7005: Fixed output of None values for RawConfigParser.write and + ConfigParser.write. + +- Issue #8990: array.fromstring() and array.tostring() get renamed to + frombytes() and tobytes(), respectively, to avoid confusion. Furthermore, + array.frombytes(), array.extend() as well as the array.array() constructor now + accept bytearray objects. Patch by Thomas Jollans. + +- Issue #808164: Fixed socket.close to avoid references to globals, to avoid + issues when socket.close is called from a __del__ method. + +- Issue #9706: ssl module provides a better error handling in various + circumstances. + +- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting + rid of the cached copy of thread-local attribute dictionary. + +- Issue #1512791: In setframerate() in the wave module, non-integral frame rates + are rounded to the nearest integer. + +- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of + falling into recursion. + +- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four + character years even if the message contains RFC822 two character years. + +- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive + operations on its self, namely x -= x and x ^= x. + +- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error + handling when accepting a new connection. + +- Issue #9601: ftplib now provides a workaround for non-compliant + implementations such as IIS shipped with Windows server 2003 returning invalid + response codes for MKD and PWD commands. + +- Issue #658749: asyncore's connect() method now correctly interprets winsock + errors. + +- Issue #9501: Fixed logging regressions in cleanup code. + +- Fix functools.total_ordering() to skip methods inherited from object. + +- Issue #9572: Importlib should not raise an exception if a directory it thought + it needed to create was done concurrently by another process. + +- Issue #9617: Signals received during a low-level write operation aren't + ignored by the buffered IO layer anymore. + +- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding. + +- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape + error handler, or strict error handler on Windows. + +- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and + ``gzip.decompress``. Original patch by Anand B. Pillai. + +- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a + ssl.SSLContext object allowing bundling SSL configuration options, + certificates and private keys into a single (potentially long-lived) + structure. + +- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as + single keyword arguments. + +- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py + compiler flag values over defining its own. + +- Issue #9147: Added dis.code_info() which is similar to show_code() but returns + formatted code information in a string rather than displaying on screen. + +- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute + pointing to the original callable. + +- Issue #3445: functools.update_wrapper now tolerates missing attributes on + wrapped callables. + +- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod. + +- Issue #9605: posix.getlogin() decodes the username with file filesystem + encoding and surrogateescape error handler. Patch written by David Watson. + +- Issue #9604: posix.initgroups() encodes the username using the fileystem + encoding and surrogateescape error handler. Patch written by David Watson. + +- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name + using the filesystem encoding and surrogateescape error handler. Patch written + by David Watson. + +- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants, + for use with the statvfs() function. Patch by Adam Jackson. + +- Issue #8688: MANIFEST files created by distutils now include a magic comment + indicating they are generated. Manually maintained MANIFESTs without this + marker will not be overwritten or removed. + +- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a + BadZipfile error is raised if it doesn't match (as used to be the case in + Python 2.5 and earlier). + +- Issue #9550: a BufferedReader could issue an additional read when the original + read request had been satisfied, which could block indefinitely when the + underlying raw IO channel was e.g. a socket. Report and original patch by + Jason V. Miller. + +- Issue #3757: thread-local objects now support cyclic garbage collection. + Thread-local objects involved in reference cycles will be deallocated timely + by the cyclic GC, even if the underlying thread is still running. + +- Issue #9452: Add read_file, read_string, and read_dict to the configparser + API; new source attribute to exceptions. + +- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current + node. + +- Issue #8047: Fix the xml.etree serializer to return bytes by default. Use + ``encoding="unicode"`` to generate a Unicode string. + +- Issue #8280: urllib2's Request method will remove fragments in the url. This + is how it is supposed to work, wget and curl do the same. Previous behavior + was wrong. + +- Issue #6683: For SMTP logins we now try all authentication methods advertised + by the server. Many servers are buggy and advertise authentication methods + they do not support in reality. + +- Issue #8814: function annotations (the ``__annotations__`` attribute) are now + included in the set of attributes copied by default by functools.wraps and + functools.update_wrapper. Patch by Terrence Cole. + +- Issue #2944: asyncore doesn't handle connection refused correctly. + +- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate + the private attributes. Add tests for smtpd module. + +- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word + encoded in base64 is lacking padding. + +- Issue #9444: Argparse now uses the first element of prefix_chars as the option + character for the added 'h/help' option if prefix_chars does not contain a + '-', instead of raising an error. + +- Issue #7372: Fix pstats regression when stripping paths from profile data + generated with the profile module. + +- Issue #9428: Fix running scripts with the profile/cProfile modules from the + command line. + +- Issue #7781: Fix restricting stats by entry counts in the pstats interactive + browser. + +- Issue #9209: Do not crash in the pstats interactive browser on invalid regular + expressions. + +- Update collections.OrderedDict to match the implementation in Py2.7 (based on + lists instead of weakly referenced Link objects). + +- Issue #8397: Raise an error when attempting to mix iteration and regular reads + on a BZ2File object, rather than returning incorrect results. + +- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when + re-initializing a buffered IO object by calling its ``__init__`` method. + +- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links + across devices. + +- Issue #8826: Properly load old-style "expires" attribute in http.cookies. + +- Issue #1690103: Fix initial namespace for code run with trace.main(). + +- Issue #7395: Fix tracebacks in pstats interactive browser. + +- Issue #8230: Fix Lib/test/sortperf.py. + +- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final + newline, it no longer truncates the last character of the last command line. + +- Issue #5146: Handle UID THREAD command correctly in imaplib. + +- Issue #5147: Fix the header generated for cookie files written by + http.cookiejar.MozillaCookieJar. + +- Issue #8198: In pydoc, output all help text to the correct stream when + sys.stdout is reassigned. + +- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` + in ntpath.normpath(). + +- Issue #1286: Allow using fileinput.FileInput as a context manager. + +- Add lru_cache() decorator to the functools module. + +Tools/Demos +----------- + +- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147. + +- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing + non-ASCII content. + +Tests +----- + +- Issue #9601: Provide a test case for ftplib.parse257. + +- Issue #8857: Provide a test case for socket.getaddrinfo. + +- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. + +- Issue #8433: Fix test_curses failure with newer versions of ncurses. + +- Issue #9496: Provide a test suite for the rlcompleter module. Patch by + Michele Orr?. + +- Issue #8687: provide a test suite for sched.py module. + +Build +----- + +- Issue #1303434: Generate ZIP file containing all PDBs. + +- Issue #9193: PEP 3149 is accepted. + +- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F() + become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively. + +- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by + S?bastien Sabl?. + +- Don't run pgen twice when using make -j. + + +What's New in Python 3.2 Alpha 1? +================================= + +*Release date: 01-Aug-2010* + +Core and Builtins +----------------- + +- Issue #8991: convertbuffer() rejects discontigious buffers. + +- Issue #7616: Fix copying of overlapping memoryview slices with the Intel + compiler. + +- Issue #8413: structsequence now subclasses tuple. + +- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the + start byte and the continuation byte(s) are now considered invalid, instead of + the number of bytes specified by the start byte. E.g.: + '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces + with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80') + even if '\xf1' is the start byte of a 4-bytes sequence. Previous versions + returned a single u'\ufffd'. + +- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0 + rather than 0.0. So "-7j" is now exactly equivalent to "-(7j)". + +- Be more specific in error messages about positional arguments. + +- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes + objects, as described in the documentation. + +- Issue #6543: Write the traceback in the terminal encoding instead of utf-8. + Fix the encoding of the modules filename. Patch written by Amaury Forgeot + d'Arc. + +- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code + dealing with unary minus applied to a constant. The removed code was mutating + the ST, causing a second compilation to fail. + +- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict + mode raises unicode errors. The encoder only supports "strict" and "replace" + error handlers, the decoder only supports "strict" and "ignore" error + handlers. Patch written by Mark Hammond. + +- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use + "w*" format instead. Add tests for "w*" format. + +- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z" + formats if the string contains a null byte/character. Write unit tests for + string formats. + +- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test + suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module + location of the raised exception. + +- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode + filenames and enable os.fsencode(). + +- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. + +- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the + interpreter with characters outside the Basic Multilingual Plane (higher than + 0x10000). + +- Issue #8950: (See also issue #5080). Py_ArgParse*() functions now raise + TypeError instead of giving a DeprecationWarning when a float is parsed using + the 'L' code (for long long). (All other integer codes already raise + TypeError in this case.) + +- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to + enable shortcuts for upper case encoding name. Add also a shortcut for + "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode(). + +- Issue #8838: Remove codecs.charbuffer_encode() function. The buffer protocol + doesn't support "char buffer" anymore in Python 3. + +- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*" + instead. codecs.charbuffer_encode() now accepts modifiable buffer objects + like bytearray. + +- Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no + used anymore and it was never documented. + +- In str.format(), raise a ValueError when indexes to arguments are too large. + +- Issue #2844: Make int('42', n) consistently raise ValueError for invalid + integers n (including n = -909). + +- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances + of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it + easy to maintain the invariant that hash(x) == hash(y) whenever x and y have + equal value. + +- Issue #8748: Fix two issues with comparisons between complex and integer + objects. (1) The comparison could incorrectly return True in some cases + (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality. + (2) The comparison raised an OverflowError for large integers, leading to + unpredictable exceptions when combining integers and complex objects in sets + or dicts. + +- Issue #8766: Initialize _warnings module before importing the first module. + Fix a crash if an empty directory called "encodings" exists in sys.path. + +- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system + encoding and surrogateescape error handler instead of the locale encoding to + be consistent with os.environ. Add PySys_AddWarnOptionUnicode() function. + +- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead + of strict) error handler to escape surrogates. + +- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode + object to Py_FileSystemDefaultEncoding with the "surrogateescape" error + handler, and return bytes. If Py_FileSystemDefaultEncoding is not set, fall + back to UTF-8. + +- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any + error handler, not only the default error handler (strict). + +- Issue #8610: Load file system codec at startup, and display a fatal error on + failure. Set the file system encoding to utf-8 (instead of None) if getting + the locale encoding failed, or if nl_langinfo(CODESET) function is missing. + +- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of + PyUnicode_FromString() to support surrogates in the filename and use the right + encoding. + +- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells. + +- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler. + +- Issue #8419: Prevent the dict constructor from accepting non-string keyword + arguments. + +- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute + indirectly Python signal handlers anymore because mywrite() ignores exceptions + (KeyboardInterrupt). + +- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing + unicode string (eg. backslashreplace). + +- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects + anymore, you have to convert your bytearray filenames to bytes. + +- Issue #7332: Remove the 16KB stack-based buffer in + PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit + compared to the dynamic memory allocation fallback. Patch by Charles-Fran?ois + Natali. + +- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is + passed to bytes or bytearray. + +- Issue #7301: Add environment variable $PYTHONWARNINGS. + +- Issue #8329: Don't return the same lists from select.select when no fds are + changed. + +- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on + 64-bit machines. The shift count for either left or right shift is permitted + to be up to sys.maxsize. + +- Ensure that tokenization of identifiers is not affected by locale. + +- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever. + +- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. + +- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it + is set. + +- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding + is unknown. + +- Issue #1583863: A str subclass can now override the __str__ method. + +- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with + PyMemberDefs could produce an internal error; raise TypeError instead. + +- Issue #7845: Rich comparison methods on the complex type now return + NotImplemented rather than raising a TypeError when comparing with an + incompatible type; this allows user-defined classes to implement their own + comparisons with complex. + +- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt + (SIGINT). If an error occurs while importing the site module, the error is + printed and Python exits. Initialize the GIL before importing the site module. + +- Issue #7173: Generator finalization could invalidate sys.exc_info(). + +- Issue #7544: Preallocate thread memory before creating the thread to avoid a + fatal error in low memory condition. + +- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM + check fails. + +- Handle errors from looking up __prepare__ correctly. + +- Issue #5939: Add additional runtime checking to ensure a valid capsule in + Modules/_ctypes/callproc.c. + +- Issue #7309: Fix unchecked attribute access when converting + UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings. + +- Issue #6902: Fix problem with built-in types format incorrectly with 0 + padding. + +- Issue #7988: Fix default alignment to be right aligned for complex.__format__. + Now it matches other numeric types. + +- Issue #5988: Remove deprecated functions PyOS_ascii_formatd, + PyOS_ascii_strtod, and PyOS_ascii_atof. Use PyOS_double_to_string and + PyOS_string_to_double instead. See issue #5835 for the original deprecations. + +- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` + fails. Patch by Florent Xicluna. + +- Issue #7788: Fix an interpreter crash produced by deleting a list slice with + very large step value. + +- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and + add the additional members returned in an OSVERSIONINFOEX structure. The new + members are service_pack_major, service_pack_minor, suite_mask, and + product_type. + +- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could + crash in many places because of the PyByteArray_AS_STRING() macro returning + NULL. The macro now returns a statically allocated empty string instead. + +- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`, + where the right hand operand is a set of constants, by turning the set into a + frozenset and pre-building it as a constant. The comparison operation is made + against the constant instead of building a new set each time it is executed (a + similar optimization already existed which turned a list of constants into a + pre-built tuple). Patch and additional tests by Dave Malcolm. + +- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods + of bytes, bytearray and unicode objects by using a common implementation based + on stringlib's fast search. Patch by Florent Xicluna. + +- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2, + including: (1) a serious 'wrong output' bug that could occur for long (> 40 + digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when + parsing certain long numeric strings corresponding to subnormal values, (3) a + memory leak for some values large enough to cause overflow, and (4) a number + of flaws that could lead to incorrectly rounded results. + +- The __complex__ method is now looked up on the class of instances to make it + consistent with other special methods. + +- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, + `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. + +- Issue #7604: Deleting an unset slotted attribute did not raise an + AttributeError. + +- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero) + in ** operator. The behaviour now conforms to that described in C99 Annex F. + +- Issue #1811: improve accuracy and cross-platform consistency for true division + of integers: the result of a/b is now correctly rounded for ints a and b (at + least on IEEE 754 platforms), and in particular does not depend on the + internal representation of an int. + +- Issue #6834: replace the implementation for the 'python' and 'pythonw' + executables on OSX. + + These executables now work properly with the arch(1) command: ``arch -ppc + python`` will start a universal binary version of python in PPC mode (unlike + previous releases). + +- Issue #7466: Segmentation fault when the garbage collector is called in the + middle of populating a tuple. Patch by Florent Xicluna. + +- Issue #7419: setlocale() could crash the interpreter on Windows when called + with invalid values. + +- Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+" + mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z). + +- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX + 10.6. + +- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding. + +- Issue #6970: Remove redundant calls when comparing objects that don't + implement the relevant rich comparison methods. + +- Issue #7298: Fixes for range and reversed(range(...)). Iteration over + range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C + long but the length of the range did not. Also fix several cases where + reversed(range(a, b, c)) gave wrong results, and fix a refleak for + reversed(range(a, b, c)) with large arguments. + +- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised + during the formation of an output tuple. + +- Issue #3297: On wide unicode builds, do not split unicode characters into + surrogates. + +- Remove length limitation when constructing a complex number from a string. + +- Issue #1087418: Boost performance of bitwise operations for longs. + +- Support for AtheOS has been completely removed from the code base. It was + disabled since Python 3.0. + +- Support for several legacy threading libraries has been disabled. These + libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code + will be entirely removed in 3.3. + +- Support for OSF* has been disabled. If nobody stands up, support will be + removed in 3.3. See . + +- Peephole constant folding had missed UNARY_POSITIVE. + +- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which + fixes the problem of some exceptions being thrown at shutdown when the + interpreter is killed. Patch by Adam Olsen. + +- Issue #7147: Remove support for compiling Python without complex number + support. + +- Issue #7120: logging: Removed import of multiprocessing which is causing crash + in GAE. + +- Issue #1754094: Improve the stack depth calculation in the compiler. There + should be no other effect than a small decrease in memory use. Patch by + Christopher Tur Lesniewski-Laas. + +- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using + byte values greater than 127. Patch by Derk Drukker. + +- Issue #1571184: The Unicode database contains properties for more characters. + The tables for code points representing numeric values, white spaces or line + breaks are now generated from the official Unicode Character Database files, + and include information from the Unihan.txt file. + +- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of + producing internally inconsistent Python longs. + +- Issue #6990: Fix threading.local subclasses leaving old state around after a + reference cycle GC which could be recycled by new locals. + +- Issue #5460: Fix an ambiguity in the grammar. + +- Issue #1766304: Improve performance of membership tests on range objects. + +- Issue #6713: Improve performance of integer -> string conversions. + +- Issue #6846: Fix bug where bytearray.pop() returns negative integers. + +- Issue #6750: A text file opened with io.open() could duplicate its output when + writing from multiple threads at the same time. + +- Issue #6707: dir() on an uninitialized module caused a crash. + +- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. + +- Issue #6573: set.union() stopped processing inputs if an instance of self + occurred in the argument chain. + +- Issue #6070: On posix platforms import no longer copies the execute bit from + the .py file to the .pyc file if it is set. + +- Issue #1616979: Added the cp720 (Arabic DOS) encoding. + +- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object, + and not an int. Fix the corresponding error message, and the documentation. + +- The deprecated PyCObject has been removed. + +- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h. This fixes a + build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead + of stdint.h on that platform. + +- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the + 'surrogateescape' error handler, a string which contains unpaired surrogates. + +- Issue #4856: Remove checks for win NT. + +- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument + to construct a null-initialized bytes object. + +- Issue #1023290: Add from_bytes() and to_bytes() methods to integers. These + methods allow the conversion of integers to bytes, and vice-versa. + +- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances + from being copied with copy.copy(), and bytes subclasses from being pickled + properly. + +- Code objects now support weak references. + +- Issue #7072: isspace(0xa0) is true on Mac OS X. + +- Issue #8084: PEP 370 now conforms to system conventions for framework builds + on MacOS X. That is, "python setup.py install --user" will install into + "~/Library/Python/2.7" instead of "~/.local". + +C-API +----- + +- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the + variable argument list. `Py_VA_COPY` is equivalent to C99 + `va_copy`, but available on all python platforms. + +- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX] + instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX]. This makes it safe to do + "step = -step" when reversing a slice. + +- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the + interpreter to set sys.argv without also modifying sys.path. This helps fix + `CVE-2008-5983 + `_. + +- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are + strings in an efficient manner. + +- Issue #8276: PyEval_CallObject() is now only available in macro form. The + function declaration, which was kept for backwards compatibility reasons, is + now removed (the macro was introduced in 1997!). + +- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to + PyLong_AsLongAndOverflow. + +- Make PyUnicode_CompareWithASCIIString return not equal if the Python string + has '\0' at the end. + +- Issue #5080: The argument parsing functions PyArg_ParseTuple, + PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and + PyArg_Parse now raise a DeprecationWarning for float arguments passed with the + 'L' format code. This will become a TypeError in a future version of Python, + to match the behaviour of the other integer format codes. + +- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added. + +- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in + PyArg_ParseTupleAndKeywords. + +- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and + PyErr_Format, on machines with HAVE_LONG_LONG defined. + +- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in + PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for + accessing the d_type and d_name members of structures using PyDescr_COMMON. + +- Issue #6405: Remove duplicate type declarations in descrobject.h. + +- The code flags for old __future__ features are now available again. + +- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of + PyCode_Addr2Line(). + +- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code + object at a specified file, function, and line number. + +- Issue #1419652: Change the first argument to PyImport_AppendInittab() to + ``const char *`` as the string is stored beyond the call. + +- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc + allocator will be automatically disabled when running under Valgrind. This + gives improved memory leak detection when running under Valgrind, while taking + advantage of pymalloc at other times. + +Library +------- + +- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the + old commands are restored. + +- For traceback debugging, the pdb listing now also shows the locations where + the exception was originally (re)raised, if it differs from the last line + executed (e.g. in case of finally clauses). + +- The pdb command "source" has been added. It displays the source code for a + given object, if possible. + +- The pdb command "longlist" has been added. It displays the whole source code + for the current function. + +- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error + output into methods. + +- Issue #809887: Make the output of pdb's breakpoint deletions more consistent; + emit a message when a breakpoint is enabled or disabled. + +- Issue #5294: Fix the behavior of pdb's "continue" command when called in the + top-level debugged frame. + +- Issue #5727: Restore the ability to use readline when calling into pdb in + doctests. + +- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the + source file to be debugged is in a non-builtin encoding. + +- Issue #8048: Prevent doctests from failing when sys.displayhook has been + reassigned. + +- Issue #8015: In pdb, do not crash when an empty line is entered as a + breakpoint command. + +- In pdb, allow giving a line number to the "until" command. + +- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc + files. Also, add a command-line option "-c" that runs a command as if given + in .pdbrc. + +- Issue #4179: In pdb, allow "list ." as a command to return to the currently + debugged line. + +- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *`` + entries, consider the first one. + +- Issue #6630: Allow customizing regex flags when subclassing the + string.Template class. + +- Issue #9411: Allow specifying an encoding for config files in the configparser + module. + +- Issue #1682942: Improvements to configparser: support alternate delimiters, + alternate comment prefixes and empty lines in values. + +- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. + +- Issue #8966: ctypes: Remove implicit bytes-unicode conversion. + +- Issue #9378: python -m pickle will now load and display the + first object in the pickle file. + +- Issue #4770: Restrict binascii module to accept only bytes (as specified). + And fix the email package to encode to ASCII instead of ``raw-unicode-escape`` + before ASCII-to-binary decoding. + +- Issue #9384: ``python -m tkinter`` will now display a simple demo applet. + +- The default size of the re module's compiled regular expression cache has been + increased from 100 to 500 and the cache replacement policy has changed from + simply clearing the entire cache on overflow to forgetting the least recently + used cached compiled regular expressions. This is a performance win for + applications that use a lot of regular expressions and limits the impact of + the performance hit anytime the cache is exceeded. + +- Issue #7113: Speed up loading in configparser. Patch by ?ukasz Langa. + +- Issue #9032: XML-RPC client retries the request on EPIPE error. The EPIPE + error occurs when the server closes the socket and the client sends a big + XML-RPC request. + +- Issue #4629: getopt raises an error if an argument ends with "=", whereas + getopt doesn't accept a value (eg. --help= is rejected if getopt uses + ['help='] long options). + +- Issue #7989: Added pure python implementation of the `datetime` module. The C + module is renamed to `_datetime` and if available, overrides all classes + defined in datetime with fast C impementation. Python implementation is based + on the original python prototype for the datetime module by Tim Peters with + minor modifications by the PyPy project. The test suite now tests `datetime` + module with and without `_datetime` acceleration using the same test cases. + +- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). + +- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the + script being traced. Patch by Eli Bendersky. + +- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for + the patch. + +- Issue #3704: http.cookiejar was not properly handling URLs with a / in the + parameters. + +- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument + which controls printing of opcode descriptions in ``dis()`` output. + +- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo + crosses an 8192 byte boundary. + +- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee. + +- ``ast.literal_eval()`` now allows byte literals. + +- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated + keyword arguments called 'self' or 'other' specially. + +- ``ast.literal_eval()`` now allows set literals. + +- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS. + +- Issue #7646: The fnmatch pattern cache no longer grows without bound. + +- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError + produced when profiling the decimal module. This was due to a dangerous + iteration over 'locals()' in Context.__init__. + +- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10 + and the exponent is tiny (for example, ``Decimal(10) ** + Decimal('1e-999999999')``). + +- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError. + +- Issue #9130: Fix validation of relative imports in parser module. + +- Issue #9128: Fix validation of class decorators in parser module. + +- Issue #9094: python -m pickletools will now disassemble pickle files listed in + the command line arguments. See output of python -m pickletools -h for more + details. + +- Issue #5468: urlencode to handle bytes type and other encodings in its query + parameter. Patch by Dan Mahn. + +- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, + ensure that the input string length is a multiple of the frame size. + +- Issue #6507: Accept source strings in dis.dis(). Original patch by Daniel + Urban. + +- Issue #7829: Clearly document that the dis module is exposing an + implementation detail that is not stable between Python VMs or releases. + +- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor + raises an exception. + +- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs + that act as both context managers and decorators. contextmanager changes to + use ContextDecorator. + +- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader + for removal in Python 3.4. + +- Issue #9064: pdb's "up" and "down" commands now accept an optional argument + giving the number of frames to go. + +- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not + ``str`` or ``bytes``. + +- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an + OpenSSL structure. + +- Issue #8682: The ssl module now temporary increments the reference count of a + socket object got through ``PyWeakref_GetObject``, so as to avoid possible + deallocation while the object is still being used. + +- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong + password instead of presenting an interactive prompt. Older behavior can be + obtained by passing retry=True to http_error_xxx methods of FancyURLOpener. + +- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile + smart enough to find source files in the linecache. + +- Issue #5610: feedparser no longer eats extra characters at the end of a body + part if the body part ends with a ``\r\n``. + +- Issue #8986: math.erfc was incorrectly raising OverflowError for values + between -27.3 and -30.0 on some platforms. + +- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows. + +- Issue #8966: If a ctypes structure field is an array of c_char, convert its + value to bytes instead of str (as done for c_char and c_char_p). + +- Issue #8188: Comparisons between Decimal and Fraction objects are now + permitted, returning a result based on the exact numerical values of the + operands. This builds on issue #2531, which allowed Decimal-to-float + comparisons; all comparisons involving numeric types (bool, int, float, + complex, Decimal, Fraction) should now act as expected. + +- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by + Thomas Jollans. + +- Issue #8899: time.struct_time now has class and attribute docstrings. + +- Issue #6470: Drop UNC prefix in FixTk. + +- Issue #4768: base64 encoded email body parts were incorrectly stored as binary + strings. They are now correctly converted to strings. + +- Issue #8833: tarfile created hard link entries with a size field != 0 by + mistake. + +- Charset.body_encode now correctly handles base64 encoding by encoding with the + output_charset before calling base64mime.encode. Passes the tests from 2.x + issue #1368247. + +- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction + attribute that is True iff there are uncommitted changes. + +- Issue #1289118: datetime.timedelta objects can now be multiplied by float and + divided by float and int objects. Results are rounded to the nearest multiple + of timedelta.resolution with ties resolved using round-half-to-even method. + +- Issue #7150: Raise OverflowError if the result of adding or subtracting + timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. + +- Issue #8806: add SSL contexts support to ftplib. + +- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer + and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes + API. + +- Issue #8770: Now sysconfig displays information when it's called as a script. + Initial idea by Sridhar Ratnakumar. + +- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by + Fredrik H??rd. + +- Issue #8540: Decimal module: rename the Context._clamp attribute to + Context.clamp and make it public. This is useful in creating contexts that + correspond to the decimal interchange formats specified in IEEE 754. + +- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM + twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and + StreamWriter classes. + +- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead + of the C file stderr, to use stderr encoding and error handler. + +- Issue #8782: Add a trailing newline in linecache.updatecache to the last line + of files without one. + +- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when + comparing to a non-mapping. + +- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the + correct encoding. + +- Issue #4870: Add an `options` attribute to SSL contexts, as well as several + ``OP_*`` constants to the `ssl` module. This allows to selectively disable + protocol versions, when used in combination with `PROTOCOL_SSLv23`. + +- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. + +- Issue #8663: distutils.log emulates backslashreplace error handler. Fix + compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if + stdout is not a TTY). + +- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value. + subprocess.Popen() and os._execvpe() support bytes program name. Add + os.supports_bytes_environ flag: True if the native OS type of the environment + is bytes (eg. False on Windows). + +- Issue #8633: tarfile is now able to read and write archives with "raw" binary + pax headers as described in POSIX.1-2008. + +- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes, + unquote, unquote_to_bytes. + +- Issue #8688: Distutils now recalculates MANIFEST everytime. + +- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with + surrogates and bytes for the filename. + +- Issue #8550: Add first class ``SSLContext`` objects to the ssl module. + +- Issue #8681: Make the zlib module's error messages more informative when the + zlib itself doesn't give any detailed explanation. + +- The audioop module now supports sound fragments of length greater than 2**31 + bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN. + +- Issue #4972: Add support for the context manager protocol to the ftplib.FTP + class. + +- Issue #8664: In py_compile, create __pycache__ when the compiled path is + given. + +- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes + for use in the file system, environment variables or the command line. + +- Issue #8571: Fix an internal error when compressing or decompressing a chunk + larger than 1GB with the zlib module's compressor and decompressor objects. + +- Issue #8603: Support bytes environmental variables on Unix: Add os.environb + mapping and os.getenvb() function. os.unsetenv() encodes str argument to the + file system encoding with the surrogateescape error handler (instead of + utf8/strict) and accepts bytes. posix.environ keys and values are now bytes. + +- Issue #8573: asyncore _strerror() function might throw ValueError. + +- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error + messages when accessing undefined class attributes because of the cheap + inheritance with the underlying socket object. The cheap inheritance has been + deprecated. + +- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. + Patch by Tres Seaver. + +- Issue #8390: tarfile uses surrogateescape as the default error handler + (instead of replace in read mode or strict in write mode). + +- Issue #7755: Use an unencumbered audio file for tests. + +- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent + and any children created using ``os.fork`` on MacOS X 10.6. + +- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal + operation raises multiple signals and more than one of those signals is + trapped, the specification determines the order in which the signals should be + handled. In many cases this order wasn't being followed, leading to the wrong + Python exception being raised. + +- Issue #7865: The close() method of ``io`` objects should not swallow + exceptions raised by the implicit flush(). Also qensure that calling close() + several times is supported. Patch by Pascal Chambon. + +- Issue #4687: Fix accuracy of garbage collection runtimes displayed with + gc.DEBUG_STATS. + +- Issue #8354: The siginterrupt setting is now preserved for all signals, not + just SIGCHLD. + +- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does + webbrowser.get("safari"). + +- Issue #8464: tarfile no longer creates files with execute permissions set when + mode="w|" is used. + +- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of + the Linux kernel. Patch by Yaniv Aknin. + +- Issue #8295: Added shutil.unpack_archive. + +- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. + It should correctly return an empty response now. + +- Issue #8546: Reject None given as the buffering argument to _pyio.open. + +- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by + Sridhar Ratnakumar. + +- Issue #6656: fix locale.format_string to handle escaped percents + and mappings. + +- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where + the method could block indefinitely if called just before the event loop + started running. This also fixes the occasional freezes witnessed in + test_httpservers. + +- Issue #8524: When creating an SSL socket, the timeout value of the original + socket wasn't retained (instead, a socket with a positive timeout would be + turned into a non-blocking SSL socket). + +- Issue #5103: SSL handshake would ignore the socket timeout and block + indefinitely if the other end didn't respond. + +- The do_handshake() method of SSL objects now adjusts the blocking mode of the + SSL structure if necessary (as other methods already do). + +- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and + bytes strings for environment keys and values. + +- Issue #8467: Pure Python implementation of subprocess encodes the error + message using surrogatepass error handler to support surrogates in the + message. + +- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames. + +- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the + string "python" as the *ident*. openlog() arguments are all optional and + keywords. + +- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a + non-infinite timeout. Also make that method friendlier with applications + wanting to continue using the socket in clear-text mode, by disabling + OpenSSL's internal readahead. Thanks to Darryl Miles for guidance. + +- Issue #8496: make mailcap.lookup() always return a list, rather than an + iterator. Patch by Gregory Nofi. + +- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the + collation name contains a surrogate character. + +- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl + extension, such that verification of some SSL certificates doesn't fail + because of an "unknown algorithm". + +- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree. + +- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree. + +- Issue #4814: timeout parameter is now applied also for connections resulting + from PORT/EPRT commands. + +- Issue #8463: added missing reference to bztar in shutil's documentation. + +- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as + long as the user didn't specify 'automatic proxy configuration'). + +- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code + as stated in RFC-959 at chapter 5.4. + +- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with + surrogates. + +- Issue #850728: Add a *timeout* parameter to the `acquire()` method of + `threading.Semaphore` objects. Original patch by Torsten Landschoff. + +- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the + available cipher list. Helps fix test_ssl with OpenSSL 1.0.0. + +- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for + the current working directory. + +- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII + using backslashreplace error handler. + +- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. + +- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony + Locke and Hans Ulrich Niedermann. + +- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. + +- Issue #7316: The acquire() method of lock objects in the ``threading`` + module now takes an optional timeout argument in seconds. Timeout support + relies on the system threading library, so as to avoid a semi-busy wait loop. + +- Issue #8383: pickle and pickletools use surrogatepass error handler when + encoding unicode as utf8 to support lone surrogates and stay compatible with + Python 2.x and 3.x. + +- Issue #7585: difflib context and unified diffs now place a tab between + filename and date, conforming to the 'standards' they were originally designed + to follow. This improves compatibility with patch tools. + +- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 + character sets will now consistently use a Content-Transfer-Encoding of 7bit + rather than sometimes being marked as 8bit. + +- Issue #8375: test_distutils now checks if the temporary directory are still + present before it cleans them. + +- Issue #8374: Update the internal alias table in the ``locale`` module to + cover recent locale changes and additions. + +- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module, + using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and + `ssl.OPENSSL_VERSION_NUMBER`. + +- Add functools.total_ordering() and functools.cmp_to_key(). + +- Issue #8257: The Decimal construct now accepts a float instance directly, + converting that float to a Decimal of equal value: + + >>> Decimal(1.1) + Decimal('1.100000000000000088817841970012523233890533447265625') + +- Issue #8294: The Fraction constructor now accepts Decimal and float instances + directly. + +- Issue #7279: Comparisons involving a Decimal signaling NaN now signal + InvalidOperation instead of returning False. (Comparisons involving a quiet + NaN are unchanged.) Also, Decimal quiet NaNs are now hashable; Decimal + signaling NaNs remain unhashable. + +- Issue #2531: Comparison operations between floats and Decimal instances now + return a result based on the numeric values of the operands; previously they + returned an arbitrary result based on the relative ordering of id(float) and + id(Decimal). See also issue #8188, which adds Decimal-to-Fraction + comparisons. + +- Added a subtract() method to collections.Counter(). + +- Issue #8233: When run as a script, py_compile.py optionally takes a single + argument `-` which tells it to read files to compile from stdin. Each line is + read on demand and the named file is compiled immediately. (Original patch by + Piotr O?arowski). + +- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and + form feed (0x0C) are now considered linebreaks, as specified in Unicode + Standard Annex #14. See issue #7643. http://www.unicode.org/reports/tr14/ + +- Comparisons using one of <, <=, >, >= between a complex instance and a + Fractions instance now raise TypeError instead of returning True/False. This + makes Fraction <=> complex comparisons consistent with int <=> complex, float + <=> complex, and complex <=> complex comparisons. + +- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some + methods (such as oss_mixer_device.fileno()) were not available. Initial patch + by Bertrand Janin. + +- Issue #8205: Remove the "Modules" directory from sys.path when Python is + running from the build directory (POSIX only). + +- Issue #7512: shutil.copystat() could raise an OSError when the filesystem + didn't support chflags() (for example ZFS under FreeBSD). The error is now + silenced. + +- Issue #7860: platform.uname now reports the correct 'machine' type when Python + is running in WOW64 mode on 64 bit Windows. + +- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets. + Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking + reads and writes are always retried by OpenSSL itself. + +- Issue #4282: Fix the main function of the profile module for a non-ASCII + script, open the file in binary mode and not in text mode with the default + (utf8) encoding. + +- Issue #8179: Fix macpath.realpath() on a non-existing path. + +- Issue #8024: Update the Unicode database to 5.2. + +- Issue #8168: py_compile now handles files with utf-8 BOMS. + +- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is + detected. + +- Issue #6716/2: Backslash-replace error output in compilall. + +- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox + with Tcl/Tk-8.5. + +- Issue #8140: extend compileall to compile single files. Add -i option. + +- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the + locale. + +- The internals of the subprocess module on POSIX systems have been replaced by + an extension module (_posixsubprocess) so that the fork()+exec() can be done + safely without the possibility of deadlock in multithreaded applications. + +- subprocess.Popen now has restore_signals and start_new_session features. The + default of restore_signals=True is a new behavior compared to earlier Python + versions. This means that signals such as SIGPIPE are not ignored by default + in subprocesses launched by Python (Issue #1652). + +- Issue #6472: The xml.etree package is updated to ElementTree 1.3. The + cElementTree module is updated too. + +- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to + an non existent program name and Python is unable to retrieve the real program + name. + +- Issue #7880: Fix sysconfig when the python executable is a symbolic link. + +- Issue #6509: fix re.sub to work properly when the pattern, the string, and the + replacement were all bytes. Patch by Antoine Pitrou. + +- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure + bugs and allows loading SQLite extensions from shared libraries. + +- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public + Review Issue #29 (http://unicode.org/review/pr-29.html). + +- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, + reset also the pointer to the current pointer context. + +- Issue #7232: Add support for the context manager protocol to the TarFile + class. + +- Issue #7250: Fix info leak of os.environ across multi-run uses of + wsgiref.handlers.CGIHandler. + +- Issue #1729305: Fix doctest to handle encode error with "backslashreplace". + +- Issue #691291: codecs.open() should not convert end of lines on reading and + writing. + +- Issue #7869: logging: improved diagnostic for format-time errors. + +- Issue #7868: logging: added loggerClass attribute to Manager. + +- logging: Implemented PEP 391. + +- Issue #1537721: Add a writeheader() method to csv.DictWriter. + +- Issue #7959: ctypes callback functions are now registered correctly with the + cycle garbage collector. + +- Issue #5801: removed spurious empty lines in wsgiref. + +- Issue #6666: fix bug in trace.py that applied the list of directories to be + ignored only to the first file. Noted by Bogdan Opanchuk. + +- Issue #7597: curses.use_env() can now be called before initscr(). Noted by + Kan-Ru Chen. + +- Issue #7310: fix the __repr__ of os.environ to show the environment variables. + +- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822 + messages parsed by email.Parser.HeaderParser. + +- Issue #7361: Importlib was not properly checking the number of bytes in + bytecode file when it was less then 8 bytes. + +- Issue #7633: In the decimal module, Context class methods (with the exception + of canonical and is_canonical) now accept instances of int and long wherever a + Decimal instance is accepted, and implicitly convert that argument to Decimal. + Previously only some arguments were converted. + +- Issue #7835: shelve should no longer produce mysterious warnings during + interpreter shutdown. + +- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML + processing instructions and comments. These raw characters are allowed by the + XML specification, and are necessary when outputting e.g. PHP code in a + processing instruction. Patch by Neil Muller. + +- Issue #6233: ElementTree failed converting unicode characters to XML entities + when they could't be represented in the requested output encoding. Patch by + Jerry Chen. + +- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the + compression type. + +- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is + specified, rather than fall through to AF_PACKET (in the `socket` module). + Also, raise ValueError rather than TypeError when an unknown TIPC address type + is specified. Patch by Brian Curtin. + +- Issue #6939: Fix file I/O objects in the `io` module to keep the original file + position when calling `truncate()`. It would previously change the file + position to the given argument, which goes against the tradition of + ftruncate() and other truncation APIs. Patch by Pascal Chambon. + +- Issue #7610: Reworked implementation of the internal + ``zipfile.ZipExtFile`` class used to represent files stored inside an + archive. The new implementation is significantly faster and can be wrapped in + a ``io.BufferedReader`` object for more speedups. It also solves an + issue where interleaved calls to `read()` and `readline()` give wrong results. + Patch by Nir Aides. + +- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, + allowing for a maximum number of tasks within the pool to be completed by the + worker before that worker is terminated, and a new one created to replace it. + +- Issue #7792: Registering non-classes to ABCs raised an obscure error. + +- Issue #7785: Don't accept bytes in FileIO.write(). + +- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. + +- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when + the release file is empty. + +- Issue #7561: Fix crashes when using bytearray objects with the posix + module. + +- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in + multipart/signed MIME parts, which fixes one of the sources of invalid + modifications to such parts by Generator. + +- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`. Patch + by Florent Xicluna, along with some additional tests. + +- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte + argument. Patch by Victor Stinner. + +- Issue #3299: Fix possible crash in the _sre module when given bad argument + values in debug mode. Patch by Victor Stinner. + +- Issue #2846: Add support for gzip.GzipFile reading zero-padded files. Patch + by Brian Curtin. + +- Issue #7681: Use floor division in appropiate places in the wave module. + +- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since + Extension extra options may change the output without changing the .c + file). Initial patch by Collin Winter. + +- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc + when it has a fully qualified configuration prefix. Initial patch by Arfrever. + +- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the + destruction of weakref'ed objects while iterating. + +- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor + Stinner. + +- Issue #1628205: Socket file objects returned by socket.socket.makefile() now + properly handles EINTR within the read, readline, write & flush methods. The + socket.sendall() method now properly handles interrupted system calls. + +- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and + make it implement the `io.BufferedIOBase` ABC to allow for further speedups by + wrapping it in an `io.BufferedReader`. Patch by Nir Aides. + +- Issue #3972: http.client.HTTPConnection now accepts an optional source_address + parameter to allow specifying where your connections come from. + +- socket.create_connection now accepts an optional source_address parameter. + +- Issue #5511: now zipfile.ZipFile can be used as a context manager. Initial + patch by Brian Curtin. + +- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML + Manifest file in text mode so string patterns can be used in regular + expressions. + +- Issue #7552: Removed line feed in the base64 Authorization header in the + Distutils upload command to avoid an error when PyPI reads it. This occurs on + long passwords. Initial patch by JP St. Pierre. + +- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by + Tatsuhiro Tsujikawa. + +- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a + TypeError when given an `str` object (rather than a `bytes`-like object). + Patch by Victor Stinner and Florent Xicluna. + +- Issue #7349: Make methods of file objects in the io module accept None as an + argument where file-like objects (ie StringIO and BytesIO) accept them to mean + the same as passing no argument. + +- Issue #7357: tarfile no longer suppresses fatal extraction errors by default. + +- Issue #5949: added check for correct lineends in input from IMAP server in + imaplib. + +- Add count() and reverse() methods to collections.deque(). + +- Fix variations of extending deques: d.extend(d) d.extendleft(d) d+=d + +- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong + parameter types. Patch by Victor Stinner. + +- Issue #7457: added a read_pkg_file method to + distutils.dist.DistributionMetadata. + +- logging: Added optional `secure` parameter to SMTPHandler, to enable use of + TLS with authentication credentials. + +- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated + in Distutils. Patch by Stephen Emslie. + +- Issue #4120: Drop reference to CRT from manifest when building extensions with + msvc9compiler. + +- Issue #7333: The `posix` module gains an `initgroups()` function providing + access to the initgroups(3) C library call on Unix systems which implement it. + Patch by Jean-Paul Calderone. + +- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group + ownership when the group is not forced, because the group may be different + from the user's group and inherit from its container when the test is run. + +- Issue #4486: When an exception has an explicit cause, do not print its + implicit context too. This affects the `traceback` module as well as built-in + exception printing. + +- Issue #1515: Enable use of deepcopy() with instance methods. Patch by Robert + Collins. + +- Issue #7403: logging: Fixed possible race condition in lock creation. + +- Issue #6845: Add restart support for binary upload in ftplib. The + `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` + argument. Patch by Pablo Mouzo. + +- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method + returning the total number of seconds in the duration. Patch by Brian + Quinlan. + +- Issue #7133: SSL objects now support the new buffer API. + +- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters. + +- Issue #6123: tarfile now opens empty archives correctly and consistently + raises ReadError on empty files. + +- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2. + +- Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead + of __str__. + +- Issue #7341: Close the internal file object in the TarFile constructor in case + of an error. + +- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh + Windows box. Help provided by David Bolen. + +- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS + or SSL. Patch by Giampaolo Rodola'. + +- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch. + +- Issue #4969: The mimetypes module now reads the MIME database from the + registry under Windows. Patch by Gabriel Genellina. + +- Issue #6816: runpy now provides a run_path function that allows Python code to + execute file paths that refer to source or compiled Python files as well as + zipfiles, directories and other valid sys.path entries that contain a + __main__.py file. This allows applications that run other Python scripts to + support the same flexibility as the CPython command line itself. + +- Issue #7318: multiprocessing now uses a timeout when it fails to establish a + connection with another process, rather than looping endlessly. The default + timeout is 20 seconds, which should be amply sufficient for local connections. + +- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and + unpickled. This fixes crashes under Windows when trying to run + test_multiprocessing in verbose mode. + +- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass`` + argument added to the TextTestRunner constructor allowing a different result + class to be used without having to subclass. + +- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test + name in failure reports even if the test has a docstring. + +- Issue #3001: Add a C implementation of recursive locks which is used by + default when instantiating a `threading.RLock` object. This makes recursive + locks as fast as regular non-recursive locks (previously, they were slower by + 10x to 15x). + +- Issue #7282: Fix a memory leak when an RLock was used in a thread other than + those started through `threading.Thread` (for example, using + `_thread.start_new_thread()`). + +- Issue #7187: Importlib would not silence the IOError raised when trying to + write new bytecode when it was made read-only. + +- Issue #7264: Fix a possible deadlock when deallocating thread-local objects + which are part of a reference cycle. + +- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent + objects on 64-bit systems. Patch by Michael Broghton. + +- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a + modification is done through it. This fixes inconsistencies and test failures + on systems with slightly bogus mtime behaviour. + +- Issue #7246 & Issue #7208: getpass now properly flushes input before reading + from stdin so that existing input does not confuse it and lead to incorrect + entry or an IOError. It also properly flushes it afterwards to avoid the + terminal echoing the input afterwards on OSes such as Solaris. + +- Issue #7233: Fix a number of two-argument Decimal methods to make sure that + they accept an int or long as the second argument. Also fix buggy handling of + large arguments (those with coefficient longer than the current precision) in + shift and rotate. + +- Issue #4750: Store the basename of the original filename in the gzip FNAME + header as required by RFC 1952. + +- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in + Distutils. + +- Issue #7218: Fix test_site for win32, the directory comparison was done with + an uppercase. + +- Issue #7205: Fix a possible deadlock when using a BZ2File object from + several threads at once. + +- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424. + +- Issue #7099: Decimal.is_normal now returns True for numbers with exponent + larger than emax. + +- Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows + platforms, and assorted locale fixes by Derk Drukker. + +- Issue #5833: Fix extra space character in readline completion with the GNU + readline library version 6.0. + +- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment. + +- Issue #7086: Added TCP support to SysLogHandler, and tidied up some + anachronisms in the code which were a relic of 1.5.2 compatibility. + +- Issue #7082: When falling back to the MIME 'name' parameter, the correct place + to look for it is the Content-Type header. + +- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the + builtin tokenizer. + +- Issue #7048: Force Decimal.logb to round its result when that result is too + large to fit in the current precision. + +- Issue #6236, #6348: Fix various failures in the I/O library under AIX and + other platforms, when using a non-gcc compiler. Patch by Derk Drukker. + +- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now + always result in NULL. + +- Issue #5042: Structure sub-subclass does now initialize correctly with base + class positional arguments. + +- Issue #6882: Import uuid creates zombies processes. + +- Issue #6635: Fix profiler printing usage message. + +- Issue #6856: Add a filter keyword argument to TarFile.add(). + +- Issue #6888: pdb's alias command was broken when no arguments were given. + +- Issue #6857: Default format() alignment should be '>' for Decimal instances. + +- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning + NaN or raising InvalidContext. Also, fix infinite recursion in + long(Decimal('nan')). + +- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no + type specifier. + +- Issue #6239: ctypes.c_char_p return value must return bytes. + +- Issue #6838: Use a list to accumulate the value instead of repeatedly + concatenating strings in http.client's HTTPResponse._read_chunked providing a + significant speed increase when downloading large files servend with a + Transfer-Encoding of 'chunked'. + +- Trying to import a submodule from a module that is not a package, ImportError + should be raised, not AttributeError. + +- When the globals past to importlib.__import__() has __package__ set to None, + fall back to computing what __package__ should be instead of giving up. + +- Raise a TypeError when the name of a module to be imported for + importlib.__import__ is not a string (was raising an AttributeError before). + +- Allow the fromlist passed into importlib.__import__ to be any iterable. + +- Have importlib raise ImportError if None is found in sys.modules. + +- Issue #6054: Do not normalize stored pathnames in tarfile. + +- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN + payloads are now ordered by integer value rather than lexicographically. + +- Issue #1356969: Add missing info methods in tix.HList. + +- Issue #1522587: New constants and methods for the tix.Grid widget. + +- Issue #1250469: Fix the return value of tix.PanedWindow.panes. + +- Issue #1119673: Do not override tkinter.Text methods when creating a + ScrolledText. + +- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. + +- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview* + and yview* methods. + +- Issue #6629: Fix a data corruption issue in the new I/O library, which could + occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or + "wb+" mode) after having buffered a certain amount of data for reading. This + bug was not present in the pure Python implementation. + +- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in + POP3.apop. + +- Issue #2715: Remove remnants of Carbon.File from binhex module. + +- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal + digits in input, as recommended by the standard. Previously it was restricted + to accepting [0-9]. + +- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT + DO/DONT correctly. + +- Issue #1424152: Fix for http.client, urllib.request to support SSL while + working through proxy. Original patch by Christopher Li, changes made by + Senthil Kumaran. + +- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for + loaders that allow for modules to be executed. Both importlib.abc.PyLoader and + PyPycLoader inherit from this class and provide implementations in relation to + other methods required by the ABCs. + +- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like + the documentation said it did even though the code in PyLoader relied on the + abstract method required by ResourceLoader. + +- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how + to handle a comparison without loss of precision. Also add correct handling + of infinities and nans for comparisons with float. + +- Issue #6415: Fixed warnings.warn segfault on bad formatted string. + +- Issue #6358: The exit status of a command started with os.popen() was reported + differently than it did with python 2.x. + +- Issue #6323: The pdb debugger did not exit when running a script with a syntax + error. + +- Issue #3392: The subprocess communicate() method no longer fails in select() + when file descriptors are large; communicate() now uses poll() when possible. + +- Issue #6369: Fix an RLE decompression bug in the binhex module. + +- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. + +- The deprecated function string.maketrans has been removed. + +- Issue #4005: Fixed a crash of pydoc when there was a zip file present in + sys.path. + +- Issue #6218: io.StringIO and io.BytesIO instances are now picklable. + +- The os.get_exec_path() function to return the list of directories that will be + searched for an executable when launching a subprocess was added. + +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + +- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid + and os.read system calls where appropriate. + +- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t. + +- Issue #6247: The argparse module has been added to the standard library. + +- Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is a socket + option available on FreeBSD 7.1 and newer. + +- Issue #9315: Fix for the trace module to record correct class name + for tracing methods. + +Extension Modules +----------------- + +- Issue #9959: Tweak formula used for computing math.log of an integer, + making it marginally more accurate for exact powers of 2. + +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + +- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly + compared to other unix systems. In particular, os.getgroups() does not reflect + any changes made using os.setgroups() but basicly always returns the same + information as the id command. os.getgroups() can now return more than 16 + groups on MacOSX. + +- Issue #6095: Make directory argument to os.listdir optional. + +- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g., + struct.pack('>?')): if conversion to bool raised an exception then that + exception wasn't properly propagated on machines where char is unsigned. + +- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when + they contain instances of old-style classes. + +- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany + existing isinf and isnan functions. + +- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason + R. Coombs. + +- In struct.pack, correctly propogate exceptions from computing the truth of an + object in the '?' format. + +- Issue #9000: datetime.timezone objects now have eval-friendly repr. + +- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as + special methods. + +- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000. + Prior to this change, timezone adjustment in utctimetuple() could produce + tm_year value of 0 or 10,000. Now an OverflowError is raised in these edge + cases. + +- Issue #6641: The ``datetime.strptime`` method now supports the ``%z`` + directive. When the ``%z`` directive is present in the format string, an + aware ``datetime`` object is returned with ``tzinfo`` bound to a + ``datetime.timezone`` instance constructed from the parsed offset. If both + ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone + name, but ``%Z`` data without ``%z`` is discarded. + +- Issue #5094: The ``datetime`` module now has a simple concrete class + implementing ``datetime.tzinfo`` interface. Instances of the new class, + ``datetime.timezone``, return fixed name and UTC offset from their + ``tzname(dt)`` and ``utcoffset(dt)`` methods. The ``dst(dt)`` method always + returns ``None``. A class attribute, ``utc`` contains an instance + representing the UTC timezone. Original patch by Rafe Kaplan. + +- Issue #8973: Add __all__ to struct module; this ensures that help(struct) + includes documentation for the struct.Struct class. + +- Issue #3129: Trailing digits in struct format string are no longer ignored. + For example, "1" or "ilib123" are now invalid formats and cause + ``struct.error`` to be raised. Patch by Caleb Deveraux. + +- Issue #7384: If the system readline library is linked against ncurses, the + curses module must be linked against ncurses as well. Otherwise it is not safe + to load both the readline and curses modules in an application. + +- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA, + requiring a re-try in order to get the complete result. + +- Issue #8692: Optimize math.factorial: replace the previous naive algorithm + with an improved 'binary-split' algorithm that uses fewer multiplications and + allows many of the multiplications to be performed using plain C integer + arithmetic instead of PyLong arithmetic. Also uses a lookup table for small + arguments. + +- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing + overflow checks in the audioop module. + +- Issue #8644: The accuracy of td.total_seconds() has been improved (by + calculating with integer arithmetic instead of float arithmetic internally): + the result is now always correctly rounded, and is equivalent to ``td / + timedelta(seconds=1)``. + +- Issue #2706: Allow division of a timedelta by another timedelta: timedelta / + timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta, + timedelta) are all supported. + +- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. + +- Issue #8300: When passing a non-integer argument to struct.pack with any + integer format code, struct.pack first attempts to convert the non-integer + using its __index__ method. If that method is non-existent or raises + TypeError it goes on to try the __int__ method, as described below. + +- Issue #8142: Update libffi to the 3.0.9 release. + +- Issue #6949: Allow the _dbm extension to be built with db 4.8.x. + +- Issue #6544: Fix a reference leak in the kqueue implementation's error + handling. + +- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as + msvcr100.dll is not a platform assembly anymore. + +- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. + +- Issue #7078: Set struct.__doc__ from _struct.__doc__. + +- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module. + +- Issue #6877: It is now possible to link the readline extension to the libedit + readline emulation on OSX 10.5 or later. + +- Issue #6848: Fix curses module build failure on OS X 10.6. + +- Fix a segfault that could be triggered by expat with specially formed input. + +- Issue #6561: '\d' in a regex now matches only characters with Unicode category + 'Nd' (Number, Decimal Digit). Previously it also matched characters with + category 'No'. + +- Issue #4509: Array objects are no longer modified after an operation failing + due to the resize restriction in-place when the object has exported buffers. + +- Issue #2389: Array objects are now pickled in a portable manner. + +- Expat: Fix DoS via XML document with malformed UTF-8 sequences + (CVE_2009_3560). + +- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread + could raise an incorrect RuntimeError about not holding the import lock. The + import lock is now reinitialized after fork. + +- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 + parameter on some platforms such as OS X. + +- Build the ossaudio extension on GNU/kFreeBSD. + +- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in + the return value of QueryReflectionKey. + +- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice. + +Build +----- + +- Use OpenSSL 1.0.0a on Windows. + +- Issue #9280: Make sharedinstall depend on sharedmods. + +- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting + override the configure and makefile defaults, without deleting options the + user didn't intend to override. Developers should no longer need to specify + OPT or EXTRA_CFLAGS, although those variables are still present for + backward-compatibility. + +- Issue #8854: Fix finding Visual Studio 2008 on Windows x64. + +- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for + multiprocessing only. + +- Issue #8625: Turn off optimization in --with-pydebug builds with gcc. + (Optimization was unintentionally turned on in gcc --with-pydebug builds as a + result of the issue #1628484 fix, combined with autoconf's strange choice of + default CFLAGS produced by AC_PROG_CC for gcc.) + +- Issue #3646: It is now easily possible to install a Python framework into your + home directory on MacOSX, see Mac/README for more information. + +- Issue #3928: os.mknod() now available in Solaris, also. + +- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not + give false warnings. + +- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable + anymore. It also forwards the LDFLAGS settings to the linker when building a + shared library. + +- Issue #6716: Quote -x arguments of compileall in MSI installer. Exclude 2to3 + tests from compileall. + +- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. + +- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private + memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free + instead. Also disable caching of powers of 5. + +- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built. + +- Issue #6943: Use pkg-config to find the libffi headers when the + --with-system-ffi flag is used. + +- Issue #7609: Add a --with-system-expat option that causes the system's expat + library to be used for the pyexpat module instead of the one included with + Python. + +- Issue #7589: Only build the nis module when the correct header files are + found. + +- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. + +- Issue #5792: Extend the short float repr support to x86 systems using + icc or suncc. + +- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles + correctly under gcc on x86-64. This fixes a reported problem with the + --with-tsc build on x86-64. + +- Issue #6802: Fix build issues on MacOSX 10.6. + +- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6. + +- Issue #4601: 'make install' did not set the appropriate permissions on + directories. + +- Issue #5390: Add uninstall icon independent of whether file extensions are + installed. + +- Issue #7541: When using ``python-config`` with a framework install the + compiler might use the wrong library. + +- python-config now supports multiple options on the same command line. + +- Issue #8509: Fix quoting in help strings and code snippets in configure.in. + +- Issue #8510: Update to autoconf2.65. + +Documentation +------------- + +- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses + to Doc/license.rst. + +- Issue #9524: Document that two CTRL* signals are meant for use only + with os.kill. + +- Issue #9255: Document that the 'test' package is meant for internal Python use + only. + +- A small WSGI server was added as Tools/scripts/serve.py, and is used to + implement a local documentation server via 'make serve' in the doc directory. + +- Updating `Using Python` documentation to include description of CPython's -J + and -X options. + +- Document that importing a module that has None in sys.modules triggers an + ImportError. + +- Issue #6556: Fixed the Distutils configuration files location explanation for + Windows. + +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). + +- Issue #8909: Added the size of the bitmap used in the installer created by + distutils' bdist_wininst. Patch by Anatoly Techtonik. + +Tests +----- + +- Issue #9251: test_threaded_import didn't fail when run through regrtest if the + import lock was disabled. + +- Issue #8605: Skip test_gdb if Python is compiled with optimizations. + +- Issue #7449: Skip test_socketserver if threading support is disabled. + +- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled + by a decompressor object without errors (it returns incomplete uncompressed + data). + +- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid + UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding). + +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + +- Issue #7449: Fix many tests to support Python compiled without thread + support. Patches written by Jerry Seutter. + +- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of + SSL shutdowns. + +- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written + by Dave Malcolm. + +- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any + thread was previously started, most likely due to a platform bug. + +- Issue #8193: Fix test_zlib failure with zlib 1.2.4. + +- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi. + +- Issue #8263: Now regrtest.py will report a failure if it receives a + KeyboardInterrupt (SIGINT). + +- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special + Unicode normalization cases. + +- Issue #7783: test.support.open_urlresource invalidates the outdated files from + the local cache. + +- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are + effectively raised. + +- The four path modules (genericpath, macpath, ntpath, posixpath) share a common + TestCase for some tests: test_genericpath.CommonTest. + +- Print platform information when running the whole test suite, or using the + --verbose flag. + +- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly + filesystem encoding. + +- Issue #6292: for the moment at least, the test suite runs cleanly if python is + run with the -OO flag. Tests requiring docstrings are skipped. + +- Issue #7712: test.support gained a new `temp_cwd` context manager which is now + also used by regrtest to run all the tests in a temporary directory. The + original CWD is saved in `support.SAVEDCWD`. Thanks to Florent Xicluna who + helped with the patch. + +- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi + (only seen so far on platforms where the curses module wasn't built), due to + an uncleared exception. + +- Issue #7728: test_timeout was changed to use support.bind_port instead of a + hard coded port. + +- Issue #7376: Instead of running a self-test (which was failing) when called + with no arguments, doctest.py now gives a usage message. + +- Issue #7396: fix regrtest -s, which was broken by the -j enhancement. + +- Issue #7498: test_multiprocessing now uses test.support.find_unused_port + instead of a hardcoded port number in test_rapid_restart. + +- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file + in the Lib/test directory, which might be read-only for the user running the + tests. + +- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case + of an option with no handler. + +- Issue #7312: Add a -F flag to run the selected tests in a loop until a test + fails. Can be combined with -j. + +- Issue #6551: test_zipimport could import and then destroy some modules of the + encodings package, which would make other tests fail further down the road + because the internally cached encoders and decoders would point to empty + global variables. + +- Issue #7295: Do not use a hardcoded file name in test_tarfile. + +- Issue #7270: Add some dedicated unit tests for multi-thread synchronization + primitives such as Lock, RLock, Condition, Event and Semaphore. + +- Issue #7248 (part 2): Use a unique temporary directory for importlib source + tests instead of tempfile.tempdir. This prevents the tests from sharing state + between concurrent executions on the same system. + +- Issue #7248: In importlib.test.source.util a try/finally block did not make + sure that some referenced objects actually were created in the block before + calling methods on the object. + +- Issue #7222: Make thread "reaping" more reliable so that reference + leak-chasing test runs give sensible results. The previous method of reaping + threads could return successfully while some Thread objects were still + referenced. This also introduces a new private function: + ``_thread._count()``. + +- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer + runs the risk of causing the worker thread to fail. + +- Issue #7055: test___all__ now greedily detects all modules which have an + __all__ attribute, rather than using a hardcoded and incomplete list. + +- Issue #7058: Added save/restore for things like sys.argv and cwd to + runtest_inner in regrtest, with warnings if the called test modifies them, and + a new section in the summary report at the end. + +- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. + +- Fixed tests in importlib.test.source.test_abc_loader that were masking the + proper exceptions that should be raised for missing or improper code object + bytecode. + +- Removed importlib's custom test discovery code and switched to + unittest.TestLoader.discover(). + +Tools/Demos +----------- + +- Issue #5464, #8974: Implement plural forms in msgfmt.py. + +- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were + added to the `Tools/` directory. They were previously living in the sandbox. + + +What's New in Python 3.1? +========================= + +*Release date: 27-June-2009* + +Core and Builtins +----------------- + +- Issue #6334: Fix bug in range length calculation for ranges with + large arguments. + +- Issue #6329: Fixed iteration for memoryview objects (it was being blocked + because it wasn't recognized as a sequence). + +Library +------- + +- Issue #6126: Fixed pdb command-line usage. + +- Issue #6314: logging: performs extra checks on the "level" argument. + +- Issue #6274: Fixed possible file descriptors leak in subprocess.py + +- Accessing io.StringIO.buffer now raises an AttributeError instead of + io.UnsupportedOperation. + +- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. + (On Unix) + +- Issue #1202: zipfile module would cause a struct.error when attempting to + store files with a CRC32 > 2**31-1. + +Extension Modules +----------------- + +- Issue #5590: Remove unused global variable in pyexpat extension. + + +What's New in Python 3.1 Release Candidate 2? +============================================= + +*Release date: 13-June-2009* + +Core and Builtins +----------------- + +- Fixed SystemError triggered by "range([], 1, -1)". + +- Issue #5924: On Windows, a large PYTHONPATH environment variable + (more than 255 characters) would be completely ignored. + +- Issue #4547: When debugging a very large function, it was not always + possible to update the lineno attribute of the current frame. + +- Issue #5330: C functions called with keyword arguments were not reported by + the various profiling modules (profile, cProfile). Patch by Hagen F?rstenau. + +Library +------- + +- Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular + expression string pattern was trying to match against a bytes returned by + Popen. Tested under win32 to build the py-postgresql project. + +- Issue #6258: Support AMD64 in bdist_msi. + +- Issue #6195: fixed doctest to no longer try to read 'source' data from + binary files. + +- Issue #5262: Fixed bug in next rollover time computation in + TimedRotatingFileHandler. + +- Issue #6217: The C implementation of io.TextIOWrapper didn't include the + errors property. Additionally, the errors and encoding properties of StringIO + are always None now. + +- Issue #6137: The pickle module now translates module names when loading + or dumping pickles with a 2.x-compatible protocol, in order to make data + sharing and migration easier. This behaviour can be disabled using the + new `fix_imports` optional argument. + +- Removed the ipaddr module. + +- Issue #3613: base64.{encode,decode}string are now called + base64.{encode,decode}bytes which reflects what type they accept and return. + The old names are still there as deprecated aliases. + +- Issue #5767: Remove sgmlop support from xmlrpc.client. + +- Issue #6150: Fix test_unicode on wide-unicode builds. + +- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty + parameters. + +Windows +------- + +- Issue #6221: Delete test registry key before running the test. + +- Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. + +C-API +----- + +- Issue #5735: Python compiled with --with-pydebug should throw an + ImportError when trying to import modules compiled without + --with-pydebug, and vice-versa. + + +Build +----- + +- Issue #6154: Make sure the intl library is added to LIBS if needed. Also + added LIBS to OS X framework builds. + +- Issue #5809: Specifying both --enable-framework and --enable-shared is + an error. Configure now explicity tells you about this. + + + +What's New in Python 3.1 release candidate 1? +============================================= + +*Release date: 2009-05-30* + +Core and Builtins +----------------- + +- Issue #6097: Escape UTF-8 surrogates resulting from mbstocs conversion + of the command line. + +- Issue #6012: Add cleanup support to O& argument parsing. + +- Issue #6089: Fixed str.format with certain invalid field specifiers + that would raise SystemError. + +- Issue #5982: staticmethod and classmethod now expose the wrapped + function with __func__. + +- Added support for multiple context managers in the same with-statement. + Deprecated contextlib.nested() which is no longer needed. + +- Issue #5829: complex("1e500") no longer raises OverflowError. This + makes it consistent with float("1e500") and interpretation of real + and imaginary literals. + +- Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. + +- Issue #5994: the marshal module now has docstrings. + +- Issue #5981: Fix three minor inf/nan issues in float.fromhex: + (1) inf and nan strings with trailing whitespace were incorrectly + rejected; (2) parsing of strings representing infinities and nans + was locale aware; and (3) the interpretation of fromhex('-nan') + didn't match that of float('-nan'). + +Library +------- + +- Issue #4859: Implement PEP 383 for pwd, spwd, and grp. + +- smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259). + +- Issue #6121: pydoc now ignores leading and trailing spaces in the + argument to the 'help' function. + +- Issue #6118: urllib.parse.quote_plus ignored the encoding and errors + arguments for strings with a space in them. + +- collections.namedtuple() was not working with the following field + names: cls, self, tuple, itemgetter, and property. + +- In unittest, using a skipping decorator on a class is now equivalent to + skipping every test on the class. The ClassTestSuite class has been removed. + +- Issue #6050: Don't fail extracting a directory from a zipfile if + the directory already exists. + +- Issue #1309352: fcntl now converts its third arguments to a C `long` rather + than an int, which makes some operations possible under 64-bit Linux (e.g. + DN_MULTISHOT with F_NOTIFY). + +- Issue #5761: Add the name of the underlying file to the repr() of various + IO objects. + +- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix + by Musashi Tamura, tests by Marcin Bachry. + +- Issue #1983: Fix functions taking or returning a process identifier to use + the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have + a process identifier type wider than the standard C integer type. + +- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. + Patch by Farhan Ahmad, test by Marcin Bachry. + +- Issue #2116: Weak references and weak dictionaries now support copy()ing and + deepcopy()ing. + +- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. + +- Issue #5918: Fix a crash in the parser module. + +- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. + +- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io + library. This means, for example, that opening an UTF-16 text file in + append mode doesn't add a BOM at the end of the file if the file isn't + empty. + +- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' + file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix + corrects a pydoc regression. + +- Issue #5955: aifc's close method did not close the file it wrapped, + now it does. This also means getfp method now returns the real fp. + +Installation +------------ + +- Issue #6047: fullinstall has been removed because Python 3's executable will + now be known as python3. + +- Lib/smtpd.py is no longer installed as a script. + +Extension Modules +----------------- + +- Issue #3061: Use wcsftime for time.strftime where available. + +- Issue #4873: Fix resource leaks in error cases of pwd and grp. + +- Issue #6093: Fix off-by-one error in locale.strxfrm. + +- The _functools and _locale modules are now built into the libpython shared + library instead of as extension modules. + +Build +----- + +- Issue #3585: Add pkg-config support. It creates a python-2.7.pc file + and a python3.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by + Clinton Roy. + +Tests +----- + +- Issue #5442: Tests for importlib were not properly skipping case-sensitivity + tests on darwin even when the OS was installed on a case-sensitive + filesystem. Also fixed tests that should not be run when + sys.dont_write_bytecode is true. + + +What's New in Python 3.1 beta 1? +================================ + +*Release date: 2009-05-06* + +Core and Builtins +----------------- + +- Issue #5914: Add new C API function PyOS_string_to_double, and + deprecate PyOS_ascii_strtod and PyOS_ascii_atof. + +- Issue #3382: float.__format__, complex.__format__, and %-formatting + no longer map 'F' to 'f'. Because of issue #5859 (below), this only + affects nan -> NAN and inf -> INF. + +- Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames + in all operations, including splitdrive, split, etc. splitunc() now issues + a PendingDeprecation warning. + +- Issue #5920: For float.__format__, change the behavior with the + empty presentation type (that is, not one of 'e', 'f', 'g', or 'n') + to be like 'g' but with at least one decimal point and with a + default precision of 12. Previously, the behavior the same but with + a default precision of 6. This more closely matches str(), and + reduces surprises when adding alignment flags to the empty + presentation type. This also affects the new complex.__format__ in + the same way. + +- Implement PEP 383, Non-decodable Bytes in System Character Interfaces. + +- Issue #5890: in subclasses of 'property' the __doc__ attribute was + shadowed by classtype's, even if it was None. property now + inserts the __doc__ into the subclass instance __dict__. + +- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal + sequences. Patch by Nick Barnes and Victor Stinner. + +- Issue #3672: Reject surrogates in utf-8 codec; add surrogatepass error handler. + +- Issue #5883: In the io module, the BufferedIOBase and TextIOBase ABCs have + received a new method, detach(). detach() disconnects the underlying stream + from the buffer or text IO and returns it. + +- Issue #5859: Remove switch from '%f' to '%g'-style formatting for + floats with absolute value over 1e50. Also remove length + restrictions for float formatting: '%.67f' % 12.34 and '%.120e' % + 12.34 no longer raise an exception. + +- Issue #1588: Add complex.__format__. For example, + format(complex(1, 2./3), '.5') now produces a sensible result. + +- Issue #5864: Fix empty format code formatting for floats so that it + never gives more than the requested number of significant digits. + +- Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes + new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. + +- Issue #5835: Deprecate PyOS_ascii_formatd. + +- Issue #4971: Fix titlecase for characters that are their own + titlecase, but not their own uppercase. + +- Issue #5283: Setting __class__ in __del__ caused a segfault. + +- Issue #5816: complex(repr(z)) now recovers z exactly, even when + z involves nans, infs or negative zeros. + +- Issue #3166: Make int -> float conversions correctly rounded. + +- Issue #1869 (and many duplicates): make round(x, n) correctly + rounded for a float x, by using the decimal <-> binary conversions + from Python/dtoa.c. As a consequence, (e.g.) round(x, 2) now + consistently agrees with format(x, '.2f'). + +- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on + some builtin types. + +- Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100'. + +- Issue #5515: str.format() type 'n' combined with commas and leading + zeros no longer gives odd results with ints and floats. + +- Implement PEP 378, Format Specifier for Thousands Separator, for + floats. + +- The str function switches to exponential notation at + 1e11, not 1e12. This avoids printing 13 significant digits in + situations where only 12 of them are correct. Example problem + value: str(1e11 + 0.5). (This minor issue has existed in 2.x for a + long time.) + +- Issue #1580: On most platforms, use a 'short' float repr: for a + finite float x, repr(x) now outputs a string based on the shortest + sequence of decimal digits that rounds to x. Previous behaviour was + to output 17 significant digits and then strip trailing zeros. + Another minor difference is that the new repr switches to + exponential notation at 1e16 instead of the previous 1e17; this + avoids misleading output in some cases. + + There's a new sys attribute sys.float_repr_style, which takes + the value 'short' to indicate that we're using short float repr, + and 'legacy' if the short float repr isn't available for one + reason or another. + + The float repr change involves incorporating David Gay's 'perfect + rounding' code into the Python core (it's in Python/dtoa.c). As a + secondary consequence, all string-to-float and float-to-string + conversions (including all float formatting operations) will be + correctly rounded on these platforms. + + See issue #1580 discussions for details of platforms for which + this change does not apply. + +- Issue #5759: float() didn't call __float__ on str subclasses. + +- The string.maketrans() function is deprecated; there is a new static method + maketrans() on the bytes and bytearray classes. This removes confusion about + the types string.maketrans() is supposed to work with, and mirrors the + methods available on the str class. + +- Issue #2170: refactored xml.dom.minidom.normalize, increasing both + its clarity and its speed. + +- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)`` + to avoid compiler warnings. + +- Issue #3739: The unicode-internal encoder now reports the number of characters + consumed like any other encoder (instead of the number of bytes). + +Installation +------------ + +- Issue #5756: Install idle and pydoc with a 3 suffix. + +Library +------- + +- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument. + +- Issue #5311: bdist_msi can now build packages that do not depend on a + specific Python version. + +- Issue #5150: IDLE's format menu now has an option to strip trailing + whitespace. + +- Issue #5940: distutils.command.build_clib.check_library_list was not doing + the right type checkings anymore. + +- Issue #4875: On win32, ctypes.util.find_library does no longer + return directories. + +- Issue #5142: Add the ability to skip modules while stepping to pdb. + +- Issue #1309567: Fix linecache behavior of stripping subdirectories when + looking for files given by a relative filename. + +- Issue #5923: Update the ``turtle`` module to version 1.1, add two new + turtle demos in Demo/turtle. + +- Issue #5692: In ``zipfile.Zipfile``, fix wrong path calculation when + extracting a file to the root directory. + +- Issue #5913: os.listdir() should fail for empty path on windows. + +- Issue #5084: unpickling now interns the attribute names of pickled objects, + saving memory and avoiding growth in size of subsequent pickles. Proposal + and original patch by Jake McGuire. + +- The json module now works exclusively with str and not bytes. + +- Issue #3959: The ipaddr module has been added to the standard library. + Contributed by Google. + +- Issue #3002: ``shutil.copyfile()`` and ``shutil.copytree()`` now raise an + error when a named pipe is encountered, rather than blocking infinitely. + +- Issue #5857: tokenize.tokenize() now returns named tuples. + +- Issue #4305: ctypes should now build again on mipsel-linux-gnu + +- Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the + string is already in normalized form, by performing a quick check beforehand. + Original patch by Rauli Ruohonen. + +- Issue #5853: calling a function of the mimetypes module from several threads + at once could hit the recursion limit if the mimetypes database hadn't been + initialized before. + +- Issue #5854: Updated __all__ to include some missing names and remove some + names which should not be exported. + +- Issue #3102: All global symbols that the _ctypes extension defines + are now prefixed with 'Py' or '_ctypes'. + +- Issue #5041: ctypes does now allow pickling wide character. + +- Issue #5812: For the two-argument form of the Fraction constructor, + Fraction(m, n), m and n are permitted to be arbitrary Rational + instances. + +- Issue #5812: Fraction('1e6') is valid: more generally, any string + that's valid for float() is now valid for Fraction(), with the + exception of strings representing NaNs and infinities. + +- Issue #5734: BufferedRWPair was poorly tested and had several glaring + bugs. Patch by Brian Quinlan. + +- Issue #1161031: fix readwrite select flag handling: POLLPRI now + results in a handle_expt_event call, not handle_read_event, and POLLERR + and POLLNVAL now call handle_close, not handle_expt_event. Also, + dispatcher now has an 'ignore_log_types' attribute for suppressing + log messages, which is set to 'warning' by default. + +- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for + new arguments introduced in 2.5. + +- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in + makeunicodedata.py and regenerated the Unicode database (This fixes + u'\u1d79'.lower() == '\x00'). + +Extension Modules +----------------- + +- Issue #5881: Remove old undocumented compatibility interfaces in hashlib and + pwd. + +- Issue #5463: In struct module, remove deprecated float coercion + for integer type codes: struct.pack('L', 0.3) should now raise + an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. + The version number has been bumped to 0.3. + +- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built + using Berkeley DB. + +Tests +----- + +- Issue #5354: New test support function import_fresh_module() makes + it easy to import both normal and optimised versions of modules. + test_heapq and test_warnings have been adjusted to use it, tests for + other modules with both C and Python implementations in the stdlib + can be adjusted to use it over time. + +- Issue #5837: Certain sequences of calls to set() and unset() for + support.EnvironmentVarGuard objects restored the environment variables + incorrectly on __exit__. + +C-API +----- + +- Issue #5630: A replacement PyCObject API, PyCapsule, has been added. + + +What's New in Python 3.1 alpha 2? +================================= + +*Release date: 2009-4-4* + +Core and Builtins +----------------- + +- Implement PEP 378, Format Specifier for Thousands Separator, for + integers. + +- Issue #5666: Py_BuildValue's 'c' code should create byte strings. + +- Issue #5499: The 'c' code for argument parsing functions now only accepts a + byte, and the 'C' code only accepts a unicode character. + +- Fix a problem in PyErr_NormalizeException that leads to "undetected errors" + when hitting the recursion limit under certain circumstances. + +- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. + +- Fix a segfault when running test_exceptions with coverage, caused by + insufficient checks in accessors of Exception.__context__. + +- Issue #5604: non-ASCII characters in module name passed to + imp.find_module() were converted to UTF-8 while the path is + converted to the default filesystem encoding, causing nonsense. + +- Issue #5126: str.isprintable() returned False for space characters. + +- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to + the end sys.path, for compatibility with the system install of Python. + +- Issue #4688: Add a heuristic so that tuples and dicts containing only + untrackable objects are not tracked by the garbage collector. This can + reduce the size of collections and therefore the garbage collection overhead + on long-running programs, depending on their particular use of datatypes. + +- Issue #5512: Rewrite PyLong long division algorithm (x_divrem) to + improve its performance. Long divisions and remainder operations + are now between 50% and 150% faster. + +- Issue #4258: Make it possible to use base 2**30 instead of base + 2**15 for the internal representation of integers, for performance + reasons. Base 2**30 is enabled by default on 64-bit machines. Add + --enable-big-digits option to configure, which overrides the + default. Add sys.int_info structseq to provide information about + the internal format. + +- Issue #4474: PyUnicode_FromWideChar now converts characters outside + the BMP to surrogate pairs, on systems with sizeof(wchar_t) == 4 + and sizeof(Py_UNICODE) == 2. + +- Issue #5237: Allow auto-numbered fields in str.format(). For + example: '{} {}'.format(1, 2) == '1 2'. + +- Issue #5392: when a very low recursion limit was set, the interpreter would + abort with a fatal error after the recursion limit was hit twice. + +- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with + short file names. + +Library +------- + +- Issue #2625: added missing items() call to the for loop in + mailbox.MH.get_message(). + +- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat + error substitutions from non-strict codec error callbacks in + incrementalencoder and StreamWriter. + +- Issue #5656: Fix the coverage reporting when running the test suite with + the -T argument. + +- Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. + +- Issue #5624: Fix the _winreg module name still used in several modules. + +- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer. + +- Issue #5619: Multiprocessing children disobey the debug flag and causes + popups on windows buildbots. Patch applied to work around this issue. + +- Issue #5400: Added patch for multiprocessing on netbsd compilation/support + +- Issue #5387: Fixed mmap.move crash by integer overflow. + +- Issue #5261: Patch multiprocessing's semaphore.c to support context + manager use: "with multiprocessing.Lock()" works now. + +- Issue #5236: Change time.strptime() to only take strings. Didn't work with + bytes already but the failure was non-obvious. + +- Issue #5177: Multiprocessing's SocketListener class now uses + socket.SO_REUSEADDR on all connections so that the user no longer needs + to wait 120 seconds for the socket to expire. + +- Issue #5595: Fix UnboundedLocalError in ntpath.ismount(). + +- Issue #1174606: Calling read() without arguments of an unbounded file + (typically /dev/zero under Unix) could crash the interpreter. + +- The max_buffer_size arguments of io.BufferedWriter, io.BufferedRWPair, and + io.BufferedRandom have been deprecated for removal in Python 3.2. + +- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop + forever on incomplete input. That caused tarfile.open() to hang when used + with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or + partial bzip2 compressed data. + +- Issue #2110: Add support for thousands separator and 'n' type + specifier to Decimal.__format__ + +- Fix Decimal.__format__ bug that swapped the meanings of the '<' and + '>' alignment characters. + +- The error detection code in FileIO.close() could fail to reflect the `errno` + value, and report it as -1 instead. + +- Issue #5016: FileIO.seekable() could return False if the file position + was negative when truncated to a C int. Patch by Victor Stinner. + +Extension Modules +----------------- + +- Issue #5391: mmap now deals exclusively with bytes. + +- Issue #5463: In struct module, remove deprecated overflow wrapping + when packing an integer: struct.pack('=L', -1) now raises + struct.error instead of returning b'\xff\xff\xff\xff'. The + _PY_STRUCT_RANGE_CHECKING and _PY_STRUCT_OVERFLOW_MASKING constants + have been removed from the struct module. + + +What's New in Python 3.1 alpha 1 +================================ + +*Release date: 2009-03-07* + +Core and Builtins +----------------- + +- The io module has been reimplemented in C for speed. + +- Give dict views an informative __repr__. + +- Issue #5247: Improve error message when unknown format codes are + used when using str.format() with str, int, and float arguments. + +- Issue #5249: time.strftime returned malformed string when format string + contained non ascii character on windows. + +- Issue #4626: compile(), exec(), and eval() ignore the coding cookie if the + source has already been decoded into str. + +- Issue #5186: Reduce hash collisions for objects with no __hash__ method by + rotating the object pointer by 4 bits to the right. + +- Issue #4575: Fix Py_IS_INFINITY macro to work correctly on x87 FPUs: + it now forces its argument to double before testing for infinity. + +- Issue #5137: Make len() correctly raise a TypeError when a __len__ method + returns a non-number type. + +- Issue #5182: Removed memoryview.__str__. + +- Issue #1717: Removed builtin cmp() function, dropped tp_compare + slot, the C API functions PyObject_Compare and PyUnicode_Compare and + the type definition cmpfunc. The tp_compare slot has been renamed + to tp_reserved, and is reserved for future usage. + +- Issue #1242657: the __len__() and __length_hint__() calls in several tools + were suppressing all exceptions. These include list() and bytearray(). + +- Issue #4707: round(x, n) now returns an integer if x is an integer. + Previously it returned a float. + +- Issue #4753: By enabling a configure option named '--with-computed-gotos' + on compilers that support it (notably: gcc, SunPro, icc), the bytecode + evaluation loop is compiled with a new dispatch mechanism which gives + speedups of up to 20%, depending on the system, on various benchmarks. + +- Issue #4874: Most builtin decoders now reject unicode input. + +- Issue #4842: Don't allow trailing 'L' when constructing an integer + from a string. + +- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors. + +- Issue #4838: When a module is deallocated, free the memory backing the + optional module state data. + +- Issue #4910: Rename nb_long slot to nb_reserved, and change its + type to ``(void *)``. + +- Issue #4935: The overflow checking code in the expandtabs() method common + to str, bytes and bytearray could be optimized away by the compiler, letting + the interpreter segfault instead of raising an error. + +- Issue #3720: Fix a crash when an iterator modifies its class and removes its + __next__ method. + +- Issue #4910: Builtin int() function and PyNumber_Long/PyNumber_Int API + function no longer attempt to call the __long__ slot to convert an object + to an integer. Only the __int__ and __trunc__ slots are examined. + +- Issue #4893: Use NT threading on CE. + +- Issue #4915: Port sysmodule to Windows CE. + +- Issue #4868: utf-8, utf-16 and latin1 decoding are now 2x to 4x faster. The + common cases are optimized thanks to a dedicated fast path and a moderate + amount of loop unrolling. + +- Issue #4074: Change the criteria for doing a full garbage collection (i.e. + collecting the oldest generation) so that allocating lots of objects without + destroying them does not show quadratic performance. Based on a proposal by + Martin von L?wis at + http://mail.python.org/pipermail/python-dev/2008-June/080579.html. + +- Issue #4604: Some objects of the I/O library could still be used after + having been closed (for instance, a read() call could return some + previously buffered data). Patch by Dmitry Vasiliev. + +- Issue #4705: Fix the -u ("unbuffered binary stdout and stderr") command-line + flag to work properly. Furthermore, when specifying -u, the text stdout + and stderr streams have line-by-line buffering enabled (the default being + to buffer arbitrary chunks of data). + +- The internal table, _PyLong_DigitValue, is now an array of unsigned chars + instead of ints (reducing its size from 4 to 8 times thereby reducing + Python's overall memory). + +- Issue #1180193: When importing a module from a .pyc (or .pyo) file with + an existing .py counterpart, override the co_filename attributes of all + code objects if the original filename is obsolete (which can happen if the + file has been renamed, moved, or if it is accessed through different paths). + Patch by Ziga Seilnacht and Jean-Paul Calderone. + +- Issue #4580: Fix slicing of memoryviews when the item size is greater than + one byte. Also fixes the meaning of len() so that it returns the number of + items, rather than the size in bytes. + +- Issue #4075: Use OutputDebugStringW in Py_FatalError. + +- Issue #4747: When the terminal does not use utf-8, executing a script with + non-ascii characters in its name could fail with a "SyntaxError: None" error. + +- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed + to open file with a bytes filename on Windows. + +- Issue #3680: Reference cycles created through a dict, set or deque iterator + did not get collected. + +- Issue #4701: PyObject_Hash now implicitly calls PyType_Ready on types + where the tp_hash and tp_dict slots are both NULL. + +- Issue #4759: None is now allowed as the first argument of + bytearray.translate(). It was always allowed for bytes.translate(). + +- Added test case to ensure attempts to read from a file opened for writing + fail. + +- Issue #3106: Speedup some comparisons (str/str and int/int). + +- Issue #2183: Simplify and optimize bytecode for list, dict and set + comprehensions. Original patch for list comprehensions by Neal Norwitz. + +- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always + print elapsed times, not only when some objects are uncollectable / + unreachable. Original patch by Neil Schemenauer. + +- Issue #3439: Add a bit_length method to int. + +- Issue #2173: When getting device encoding, check that return value of + nl_langinfo is not the empty string. This was causing silent build + failures on OS X. + +- Issue #4597: Fixed several opcodes that weren't always propagating + exceptions. + +- Issue #4589: Fixed exception handling when the __exit__ function of a + context manager returns a value that cannot be converted to a bool. + +- Issue #4445: Replace "sizeof(PyBytesObject)" with + "offsetof(PyBytesObject, ob_sval) + 1" when allocating memory for + bytes instances. On a typical machine this saves 3 bytes of memory + (on average) per allocation of a bytes instance. + +- Issue #4533: File read operation was dreadfully slow due to a slowly + growing read buffer. Fixed by using the same growth rate algorithm as + Python 2.x. + +- Issue #4509: Various issues surrounding resize of bytearray objects to + which there are buffer exports (e.g. memoryview instances). + +- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` + method on file objects with closefd=False. The file descriptor is still + kept open but the file object behaves like a closed file. The ``FileIO`` + object also got a new readonly attribute ``closefd``. + +- Issue #4569: Interpreter crash when mutating a memoryview with an item size + larger than 1. + +- Issue #4748: Lambda generators no longer return a value. + +- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. + +- Issue #5108: Handle %s like %S, %R and %A in PyUnicode_FromFormatV(): Call + PyUnicode_DecodeUTF8() once, remember the result and output it in a second + step. This avoids problems with counting UTF-8 bytes that ignores the effect + of using the replace error handler in PyUnicode_DecodeUTF8(). + +Library +------- + +- Issue #7071: byte-compilation in Distutils is now done with respect to + sys.dont_write_bytecode. + +- Issue #7066: archive_util.make_archive now restores the cwd if an error is + raised. Initial patch by Ezio Melotti. + +- Issue #6516: Added owner/group support when creating tar archives in + Distutils. + +- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. + +- Issue #6163: Fixed HP-UX runtime library dir options in + distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and + Michael Haubenwallner. + +- Issue #6693: New functions in site.py to get user/global site packages paths. + +- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when + opening an empty or very small file. + +- Issue #6545: Removed assert statements in distutils.Extension, so the + behavior is similar when used with -O. + +- unittest has been split up into a package. All old names should still work. + +- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler + uses the same refactored function to get gcc/ld/dllwrap versions numbers. + It's `distutils.util.get_compiler_versions`. Added deprecation warnings + for the obsolete get_versions() functions. + +- Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list + +- Issue #6314: logging: Extra checks on the "level" argument in more places. + +- Issue #2622: Fixed an ImportError when importing email.message from a + standalone application built with py2exe or py2app. + +- Issue #6455: Fixed test_build_ext under win32. + +- Issue #6377: Enabled the compiler option, and deprecate its usage as an + attribute. + +- Issue #6413: Fixed the log level in distutils.dist for announce. + +- Issue #6403: Fixed package path usage in build_ext. + +- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was + unconditionally calling "os.close(sys.stdin.fileno())" resulting in file + descriptor errors + +- Issue #6365: Distutils build_ext inplace mode was copying the compiled + extension in a subdirectory if the extension name had dots. + +- Issue #6164: Added an AIX specific linker argument in Distutils + unixcompiler. Original patch by Sridhar Ratnakumar. + +- Issue #6286: Now Distutils upload command is based on urllib2 instead of + httplib, allowing the usage of http_proxy. + +- Issue #6287: Added the license field in Distutils documentation. + +- Issue #6263: Fixed syntax error in distutils.cygwincompiler. + +- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` + in Makefiles. This prevents compile errors when using syntax like: + `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. + +- Issue #6131: test_modulefinder leaked when run after test_distutils. + Patch by Hirokazu Yamamoto. + +- Issue #6048: Now Distutils uses the tarfile module in archive_util. + +- Issue #6062: In distutils, fixed the package option of build_ext. Feedback + and tests on pywin32 by Tim Golden. + +- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto. + +- Issue #6046: Fixed the library extension when distutils build_ext is used + inplace. Initial patch by Roumen Petrov. + +- Issue #6041: Now distutils `sdist` and `register` commands use `check` as a + subcommand. + +- Issue #6022: a test file was created in the current working directory by + test_get_outputs in Distutils. + +- Issue #5977: distutils build_ext.get_outputs was not taking into account the + inplace option. Initial patch by kxroberto. + +- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken + for old-style extensions. + +- Issue #5976: Fixed Distutils test_check_environ. + +- Issue #5941: Distutils build_clib command was not working anymore because + of an incomplete costumization of the archiver command. Added ARFLAGS in the + Makefile besides AR and make Distutils use it. Original patch by David + Cournapeau. + +- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. + +- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive + anymore. + +- Issue #5810: Fixed Distutils test_build_scripts so it uses + sysconfig.get_config_vars. + +- Issue #4951: Fixed failure in test_httpservers. + +- Issue #5795: Fixed test_distutils failure on Debian ppc. + +- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. + +- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting + a value in SafeConfigParser. + +- Issue #5732: added a new command in Distutils: check. + +- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows + platforms. Initial patch by Paul Moore. + +- Issue #5095: Added bdist_msi to the list of bdist supported formats. + Initial fix by Steven Bethard. + +- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. + Initial fix by Wayne Davison. + +- Issue #5694: removed spurious test output in Distutils (test_clean). + +- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module. + +- Issue #1665206 (partially): Move imports in cgitb to the top of the module + instead of performing them in functions. Helps prevent import deadlocking in + threads. + +- Issue #2522: locale.format now checks its first argument to ensure it has + been passed only one pattern, avoiding mysterious errors where it appeared + that it was failing to do localization. + +- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg + Brandl. + +- Issue #1222: locale.format() bug when the thousands separator is a space + character. + +- Issue #5472: Fixed distutils.test_util tear down. Original patch by + Tim Golden. + +- collections.deque() objects now have a read-only attribute called maxlen. + +- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after + it is has been populated and properly configured in order to prevent + window flashing. + +- Issue #4792: Prevent a segfault in _tkinter by using the + guaranteed to be safe interp argument given to the PythonCmd in place of + the Tcl interpreter taken from a PythonCmd_ClientData. + +- Issue #5193: Guarantee that tkinter.Text.search returns a string. + +- Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler. + Original patch by Akira Kitada. + +- Issue #5334: array.fromfile() failed to insert values when EOFError was raised. + +- Issue #5385: Fixed mmap crash after resize failure on windows. + +- Issue #5179: Fixed subprocess handle leak on failure on windows. + +- PEP 372: Added collections.OrderedDict(). + +- The _asdict() for method for namedtuples now returns an OrderedDict(). + +- configparser now defaults to using an ordered dictionary. + +- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes + import guess_extension`` was used. + +- Issue #1733986: Fixed mmap crash in accessing elements of second map object + with same tagname but larger size than first map. (Windows) + +- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer + overrun. + +- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils + bdist_rpm command. + +- Issue #5378: added --quiet option to Distutils bdist_rpm command. + +- Issue #5052: make Distutils compatible with 2.3 again. + +- Issue #5316: Fixed buildbot failures introduced by multiple inheritance + in Distutils tests. + +- Issue #5287: Add exception handling around findCaller() call to help out + IronPython. + +- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, + The file was resized to wrong size. + +- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. + +- Issue #2279: distutils.sdist.add_defaults now add files + from the package_data and the data_files metadata. + +- Issue #5257: refactored all tests in distutils, so they use + support.TempdirManager, to avoid writing in the tests directory. + +- Issue #4524: distutils build_script command failed with --with-suffix=3. + Initial patch by Amaury Forgeot d'Arc. + +- Issue #2461: added tests for distutils.util + +- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions + which inherited from numbers.py which did not have __slots__ defined. The + numbers hierarchy now has its own __slots__ declarations. + +- Issue #4631: Fix urlopen() result when an HTTP response uses chunked + encoding. + +- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a + function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). + +- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored + under NT and OS2. Patch by Philip Jenvey. + +- Issue #5128: Make compileall properly inspect bytecode to determine if needs + to be recreated. This avoids a timing hole thanks to the old reliance on the + ctime of the files involved. + +- Issue #5122: Synchronize tk load failure check to prevent a potential + deadlock. + +- Issue #1818: collections.namedtuple() now supports a keyword argument + 'rename' which lets invalid fieldnames be automatically converted to + positional names in the form, _1, _2, ... + +- Issue #4890: Handle empty text search pattern in Tkinter.Text.search. + +- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a + public documented method ``ZipImporter.get_filename()``. + +- Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support + the execution of packages by looking for and executing a ``__main__`` + submodule when a package name is supplied. Initial patch by Andi + Vajda. + +- Issue #1731706: Call Tcl_ConditionFinalize for Tcl_Conditions that will + not be used again (this requires Tcl/Tk 8.3.1), also fix a memory leak in + Tkapp_Call when calling from a thread different than the one that created + the Tcl interpreter. Patch by Robert Hancock. + +- Issue #4285: Change sys.version_info to be a named tuple. Patch by + Ross Light. + +- Issue #1520877: Now distutils.sysconfig reads $AR from the + environment/Makefile. Patch by Douglas Greiman. + +- Issue #1276768: The verbose option was not used in the code of + distutils.file_util and distutils.dir_util. + +- Issue #5132: Fixed trouble building extensions under Solaris with + --enabled-shared activated. Initial patch by Dave Peterson. + +- Issue #1581476: Always use the Tcl global namespace when calling into Tcl. + +- The shelve module now defaults to pickle protocol 3. + +- Fix a bug in the trace module where a bytes object from co_lnotab had its + items being passed through ord(). + +- Issue #2047: shutil.move() could believe that its destination path was + inside its source path if it began with the same letters (e.g. "src" vs. + "src.new"). + +- Added the ttk module. See issue #2983: Ttk support for Tkinter. + +- Removed isSequenceType(), isMappingType, and isNumberType() from the + operator module; use the abstract base classes instead. Also removed + the repeat() function; use mul() instead. + +- Issue #5021: doctest.testfile() did not create __name__ and + collections.namedtuple() relied on __name__ being defined. + +- Backport importlib from Python 3.1. Only the import_module() function has + been backported to help facilitate transitions from 2.7 to 3.1. + +- Issue #1885: distutils. When running sdist with --formats=tar,gztar + the tar file was overriden by the gztar one. + +- Issue #4863: distutils.mwerkscompiler has been removed. + +- Added a new itertools functions: combinations_with_replacement() + and compress(). + +- Issue #5032: added a step argument to itertools.count() and + allowed non-integer arguments. + +- Fix and properly document the multiprocessing module's logging + support, expose the internal levels and provide proper usage + examples. + +- Issue #1672332: fix unpickling of subnormal floats, which was + producing a ValueError on some platforms. + +- Issue #3881: Help Tcl to load even when started through the + unreadable local symlink to "Program Files" on Vista. + +- Issue #4710: Extract directories properly in the zipfile module; + allow adding directories to a zipfile. + +- Issue #3807: _multiprocessing build fails when configure is passed + --without-threads argument. When this occurs, _multiprocessing will + be disabled, and not compiled. + +- Issue #5008: When a file is opened in append mode with the new IO library, + do an explicit seek to the end of file (so that e.g. tell() returns the + file size rather than 0). This is consistent with the behaviour of the + traditional 2.x file object. + +- Issue #5013: Fixed a bug in FileHandler which occurred when the delay + parameter was set. + +- Issue #4842: Always append a trailing 'L' when pickling longs using + pickle protocol 0. When reading, the 'L' is optional. + +- Add the importlib package. + +- Issue #4301: Patch the logging module to add processName support, remove + _check_logger_class from multiprocessing. + +- Issue #3325: Remove python2.x try: except: imports for old cPickle from + multiprocessing. + +- Issue #4959: inspect.formatargspec now works for keyword only arguments + without defaults. + +- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks + for Unix machines for negative handles and large int handles. Without this check + it is possible to segfault the interpreter. + +- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue + in sharedctypes.py. + +- Issue #1225107: inspect.isclass() returned True for instances with a custom + __getattr__. + +- Issue #3826 and #4791: The socket module now closes the underlying socket + appropriately when it is being used via socket.makefile() objects + rather than delaying the close by waiting for garbage collection to do it. + +- Issue #1696199: Add collections.Counter() for rapid and convenient + counting. + +- Issue #3860: GzipFile and BZ2File now support the context manager protocol. + +- Issue #4867: Fixed a crash in ctypes when passing a string to a + function without defining argtypes. + +- Issue #4272: Add an optional argument to the GzipFile constructor to override + the timestamp in the gzip stream. The default value remains the current time. + The information can be used by e.g. gunzip when decompressing. Patch by + Jacques Frechet. + +- Restore Python 2.3 compatibility for decimal.py. + +- Issue #3638: Remove functions from _tkinter module level that depend on + TkappObject to work with multiple threads. + +- Issue #4718: Adapt the wsgiref package so that it actually works with + Python 3.x, in accordance with the `official amendments of the spec + `_. + +- Issue #4796: Added Decimal.from_float() and Context.create_decimal_from_float() + to the decimal module. + +- Fractions.from_float() no longer loses precision for integers too big to + cast as floats. + +- Issue #4812: add missing underscore prefix to some internal-use-only + constants in the decimal module. (Dec_0 becomes _Dec_0, etc.) + +- Issue #4790: The nsmallest() and nlargest() functions in the heapq module + did unnecessary work in the common case where no key function was specified. + +- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when + the function is not a generator. + +- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case + no MSVC compiler is found under Windows. Original patch by Philip Jenvey. + +- Issue #4646: distutils was choking on empty options arg in the setup + function. Original patch by Thomas Heller. + +- Issue #3767: Convert Tk object to string in tkColorChooser. + +- Issue #3248: Allow placing ScrolledText in a PanedWindow. + +- Issue #4444: Allow assertRaises() to be used as a context handler, so that + the code under test can be written inline if more practical. + +- Issue #4739: Add pydoc help topics for symbols, so that e.g. help('@') + works as expected in the interactive environment. + +- Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by + Gabriel Genellina. + +- Issue #4574: reading an UTF16-encoded text file crashes if \r on 64-char + boundary. + +- Issue #4223: inspect.getsource() will now correctly display source code + for packages loaded via zipimport (or any other conformant PEP 302 + loader). Original patch by Alexander Belopolsky. + +- Issue #4201: pdb can now access and display source code loaded via + zipimport (or any other conformant PEP 302 loader). Original patch by + Alexander Belopolsky. + +- Issue #4197: doctests in modules loaded via zipimport (or any other PEP + 302 conformant loader) will now work correctly in most cases (they + are still subject to the constraints that exist for all code running + from inside a module loaded via a PEP 302 loader and attempting to + perform IO operations based on __file__). Original patch by + Alexander Belopolsky. + +- Issues #4082 and #4512: Add runpy support to zipimport in a manner that + allows backporting to maintenance branches. Original patch by + Alexander Belopolsky. + +- Issue #4163: textwrap module: allow word splitting on a hyphen preceded by + a non-ASCII letter. + +- Issue #4616: TarFile.utime(): Restore directory times on Windows. + +- Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the + codec cannot be found. This is for compatibility with the builtin behavior. + +- Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to + give correct results in the case where one argument is a quiet NaN + and the other is a finite number that requires rounding. + +- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat + libs. + +- Added the subprocess.check_call_output() convenience function to get output + from a subprocess on success or raise an exception on error. + +- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to + support unusual filenames (such as those containing semi-colons) in + Content-Disposition headers. + +- Issue #4384: Added logging integration with warnings module using + captureWarnings(). This change includes a NullHandler which does nothing; + it will be of use to library developers who want to avoid the "No handlers + could be found for logger XXX" message which can appear if the library user + doesn't configure logging. + +- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an + exception. + +- Issue #4529: fix the parser module's validation of try-except-finally + statements. + +- Issue #4458: getopt.gnu_getopt() now recognizes a single "-" as an argument, + not a malformed option. + +- Added the subprocess.check_output() convenience function to get output + from a subprocess on success or raise an exception on error. + +- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input; + the corresponding tests now pass. + +- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because + it was calling the wrong open() function. + +- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to + support unusual filenames (such as those containing semi-colons) in + Content-Disposition headers. + +- Issue #4861: ctypes.util.find_library(): Robustify. Fix library detection on + biarch systems. Try to rely on ldconfig only, without using objdump and gcc. + +- Issue #5104: The socket module now raises OverflowError when 16-bit port and + protocol numbers are supplied outside the allowed 0-65536 range on bind() + and getservbyport(). + +- Windows locale mapping updated to Vista. + +Tools/Demos +----------- + +- Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1, + and make it 2.6-compatible. + +- Ttk demos added in Demo/tkinter/ttk/ + +- Issue #4677: add two list comprehension tests to pybench. + + +Build +----- + +- Issue #6094: Build correctly with Subversion 1.7. + +- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. + +- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the + linker, rather than always exit successfully. Patch by Floris Bruynooghe. + +- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify + the order that backends for the dbm extension are checked. + +- Link the shared python library with $(MODLIBS). + +- Issue #5134: Silence compiler warnings when compiling sqlite with VC++. + +- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. + +- Issue #4895: Use _strdup on Windows CE. + +- Issue #4472: "configure --enable-shared" now works on OSX + +- Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. + +- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". + +- Issue #4289: Remove Cancel button from AdvancedDlg. + +- Issue #1656675: Register a drop handler for .py* files on Windows. + +- Issue #4120: Exclude manifest from extension modules in VS2008. + +- Issue #4091: Install pythonxy.dll in system32 again. + +- Issue #4018: Disable "for me" installations on Vista. + +- Issue #3758: Add ``patchcheck`` build target to .PHONY. + +- Issue #4204: Fixed module build errors on FreeBSD 4. + + +C-API +----- + +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + +- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError + for negative arguments. Previously, it raised TypeError. + +- Issue #4720: The format for PyArg_ParseTupleAndKeywords can begin with '|'. + +- Issue #3632: from the gdb debugger, the 'pyo' macro can now be called when + the GIL is released, or owned by another thread. + +- Issue #4122: On Windows, fix a compilation error when using the + Py_UNICODE_ISSPACE macro in an extension module. + + +Extension Modules +----------------- + +- Issue #3745: Fix hashlib to always reject unicode and non buffer-api + supporting objects as input no matter how it was compiled (built in + implementations or external openssl library). + +- Issue #4397: Fix occasional test_socket failure on OS X. + +- Issue #4279: Fix build of parsermodule under Cygwin. + +- Issue #4751: hashlib now releases the GIL when hashing large buffers + (with a hardwired threshold of 2048 bytes), allowing better parallelization + on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner. + +- Issue #4051: Prevent conflict of UNICODE macros in cPickle. + +- Issue #4738: Each zlib object now has a separate lock, allowing to compress + or decompress several streams at once on multi-CPU systems. Also, the GIL + is now released when computing the CRC of a large buffer. Patch by ebfe. + +- Issue #4228: Pack negative values the same way as 2.4 in struct's L format. + +- Issue #1040026: Fix os.times result on systems where HZ is incorrect. + +- Issues #3167, #3682: Fix test_math failures for log, log10 on Solaris, + OpenBSD. + +- Issue #4583: array.array would not always prohibit resizing when a buffer + has been exported, resulting in an interpreter crash when accessing the + buffer. + + +- Issue #5228: Make functools.partial objects can now be pickled. + +Tests +----- + +- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running + regression tests in parallel, shortening the total runtime. + +- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to + Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate + the same behaviour as test_ttkguionly (and now also test_tk) which is to + skip the tests if DISPLAY is defined but can't be used. + +- regrtest no longer treats ImportError as equivalent to SkipTest. Imports + that should cause a test to be skipped are now done using import_module + from test support, which does the conversion. + +- Issue #5083: New 'gui' resource for regrtest. + + +Docs +---- + + What's New in Python 3.0 final ============================== diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -131,9501 +131,4 @@ ----------- -What's New in Python 3.3.0? -=========================== - -*Release date: 29-Sep-2012* - -Core and Builtins ------------------ - -- Issue #16046: Fix loading sourceless legacy .pyo files. - -- Issue #16060: Fix refcounting bug when __trunc__ returns an object - whose __int__ gives a non-integer. Patch by Serhiy Storchaka. - -Extension Modules ------------------ - -- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD() - method doesn't require an argument again. - - -What's New in Python 3.3.0 Release Candidate 3? -=============================================== - -*Release date: 23-Sep-2012* - -Core and Builtins ------------------ - -- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap(). - -- Issue #15926: Fix crash after multiple reinitializations of the interpreter. - -- Issue #15895: Fix FILE pointer leak in one error branch of - PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit - is false an and set_main_loader() fails. - -- Fixes for a few crash and memory leak regressions found by Coverity. - -Library -------- - -- Issue #15882: Change _decimal to accept any coefficient tuple when - constructing infinities. This is done for backwards compatibility - with decimal.py: Infinity coefficients are undefined in _decimal - (in accordance with the specification). - -- Issue #15925: Fix a regression in email.util where the parsedate() and - parsedate_tz() functions did not return None anymore when the argument could - not be parsed. - -Extension Modules ------------------ - -- Issue #15973: Fix a segmentation fault when comparing datetime timezone - objects. - -- Issue #15977: Fix memory leak in Modules/_ssl.c when the function - _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann. - -- Issue #15969: faulthandler module: rename dump_tracebacks_later() to - dump_traceback_later() and cancel_dump_tracebacks_later() to - cancel_dump_traceback_later(). - -- _decimal module: use only C 89 style comments. - - -What's New in Python 3.3.0 Release Candidate 2? -=============================================== - -*Release date: 09-Sep-2012* - -Core and Builtins ------------------ - -- Issue #13992: The trashcan mechanism is now thread-safe. This eliminates - sporadic crashes in multi-thread programs when several long deallocator - chains ran concurrently and involved subclasses of built-in container - types. - -- Issue #15784: Modify OSError.__str__() to better distinguish between - errno error numbers and Windows error numbers. - -- Issue #15781: Fix two small race conditions in import's module locking. - -Library -------- - -- Issue #15847: Fix a regression in argparse, which did not accept tuples - as argument lists anymore. - -- Issue #15828: Restore support for C extensions in imp.load_module(). - -- Issue #15340: Fix importing the random module when /dev/urandom cannot - be opened. This was a regression caused by the hash randomization patch. - -- Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize() - method. - -- Issue #15785: Modify window.get_wch() API of the curses module: return - a character for most keys, and an integer for special keys, instead of - always returning an integer. So it is now possible to distinguish special - keys like keypad keys. - -- Issue #14223: Fix window.addch() of the curses module for special characters - like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now - calling the C function waddch()/mvwaddch() (as it was done in Python 3.2), - instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still - calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked - to libncursesw. - -Build ------ - -- Issue #15822: Really ensure 2to3 grammar pickles are properly installed - (replaces fixes for Issue #15645). - -Documentation -------------- - -- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted - the hashing of multi-dimensional memorviews and memoryviews with multi-byte - item formats. The intended restrictions have now been documented - they - will be correctly enforced in 3.3.1 - - -What's New in Python 3.3.0 Release Candidate 1? -=============================================== - -*Release date: 25-Aug-2012* - -Core and Builtins ------------------ - -- Issue #15573: memoryview comparisons are now performed by value with full - support for any valid struct module format definition. - -- Issue #15316: When an item in the fromlist for __import__ doesn't exist, - don't raise an error, but if an exception is raised as part of an import do - let that propagate. - -- Issue #15778: ensure that str(ImportError(msg)) returns a str - even when msg isn't a str. - -- Issue #2051: Source file permission bits are once again correctly - copied to the cached bytecode file. (The migration to importlib - reintroduced this problem because these was no regression test. A test - has been added as part of this patch) - -- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. - -- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. - Patch by Robin Schreiber. - -- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle - errors correctly. Patch by Serhiy Storchaka. - -- Issue #14846: importlib.FileFinder now handles the case where the - directory being searched is removed after a previous import attempt - -Library -------- - -- Issue #13370: Ensure that ctypes works on Mac OS X when Python is - compiled using the clang compiler - -- Issue #13072: The array module's 'u' format code is now deprecated and - will be removed in Python 4.0. - -- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. - -- Issue #15249: BytesGenerator now correctly mangles From lines (when - requested) even if the body contains undecodable bytes. - -- Issue #15777: Fix a refleak in _posixsubprocess. - -- Issue ##665194: Update email.utils.localtime to use datetime.astimezone and - correctly handle historic changes in UTC offsets. - -- Issue #15199: Fix JavaScript's default MIME type to application/javascript. - Patch by Bohuslav Kabrda. - -- Issue #12643: code.InteractiveConsole now respects sys.excepthook when - displaying exceptions (Patch by Aaron Iles) - -- Issue #13579: string.Formatter now understands the 'a' conversion specifier. - -- Issue #15793: Stack corruption in ssl.RAND_egd(). - Patch by Serhiy Storchaka. - -- Issue #15595: Fix subprocess.Popen(universal_newlines=True) - for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. - -- Issue #15477: In cmath and math modules, add workaround for platforms whose - system-supplied log1p function doesn't respect signs of zeros. - -- Issue #15715: importlib.__import__() will silence an ImportError when the use - of fromlist leads to a failed import. - -- Issue #14669: Fix pickling of connections and sockets on MacOSX - by sending/receiving an acknowledgment after file descriptor transfer. - TestPicklingConnection has been reenabled for MacOSX. - -- Issue #11062: Fix adding a message from file to Babyl mailbox. - -- Issue #15646: Prevent equivalent of a fork bomb when using - multiprocessing on Windows without the "if __name__ == '__main__'" - idiom. - -- Issue #15678: Fix IDLE menus when started from OS X command line - (3.3.0b2 regression). - -C API ------ - -Extension Modules ------------------ - -Tools/Demos ------------ - -Documentation -------------- - -- Issue #14674: Add a discussion of the json module's standard compliance. - Patch by Chris Rebert. - -- Create a 'Concurrent Execution' section in the docs, and split up the - 'Optional Operating System Services' section to use a more user-centric - classification scheme (splitting them across the new CE section, IPC and - text processing). Operating system limitatons can be reflected with - the Sphinx ``:platform:`` tag, it doesn't make sense as part of the Table of - Contents. - -- Issue #4966: Bring the sequence docs up to date for the Py3k transition - and the many language enhancements since they were original written - -- The "path importer" misnomer has been replaced with Eric Snow's - more-awkward-but-at-least-not-wrong suggestion of "path based finder" in - the import system reference docs - -- Issue #15640: Document importlib.abc.Finder as deprecated. - -- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by - Daniel Ellis. - -Tests ------ - -- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the - UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected - tests in test_posix.py to account for this. - -- Issue #15285: Refactor the approach for testing connect timeouts using - two external hosts that have been configured specifically for this type - of test. - -- Issue #15743: Remove the deprecated method usage in urllib tests. Patch by - Jeff Knupp. - -- Issue #15615: Add some tests for the json module's handling of invalid - input data. Patch by Kushal Das. - -Build ------ - -- Output lib files for PGO build into PGO directory. - -- Pick up 32-bit launcher from PGO directory on 64-bit PGO build. - -- Drop PC\python_nt.h as it's not used. Add input dependency on custom - build step. - -- Issue #15511: Drop explicit dependency on pythonxy.lib from _decimal - amd64 configuration. - -- Add missing PGI/PGO configurations for pywlauncher. - -- Issue #15645: Ensure 2to3 grammar pickles are properly installed. - - -What's New in Python 3.3.0 Beta 2? -================================== - -*Release date: 12-Aug-2012* - -Core and Builtins ------------------ - -- Issue #15568: Fix the return value of "yield from" when StopIteration is - raised by a custom iterator. - -- Issue #13119: sys.stdout and sys.stderr are now using "\r\n" newline on - Windows, as Python 2. - -- Issue #15534: Fix the fast-search function for non-ASCII Unicode strings. - -- Issue #15508: Fix the docstring for __import__ to have the proper default - value of 0 for 'level' and to not mention negative levels since they are not - supported. - -- Issue #15425: Eliminated traceback noise from more situations involving - importlib. - -- Issue #14578: Support modules registered in the Windows registry again. - -- Issue #15466: Stop using TYPE_INT64 in marshal, to make importlib.h (and other - byte code files) equal between 32-bit and 64-bit systems. - -- Issue #1692335: Move initial exception args assignment to - "BaseException.__new__" to help pickling of naive subclasses. - -- Issue #12834: Fix PyBuffer_ToContiguous() for non-contiguous arrays. - -- Issue #15456: Fix code __sizeof__ after #12399 change. Patch by Serhiy - Storchaka. - -- Issue #15404: Refleak in PyMethodObject repr. - -- Issue #15394: An issue in PyModule_Create that caused references to be leaked - on some error paths has been fixed. Patch by Julia Lawall. - -- Issue #15368: An issue that caused bytecode generation to be non-deterministic - has been fixed. - -- Issue #15202: Consistently use the name "follow_symlinks" for new parameters - in os and shutil functions. - -- Issue #15314: __main__.__loader__ is now set correctly during interpreter - startup. - -- Issue #15111: When a module imported using 'from import' has an ImportError - inside itself, don't mask that fact behind a generic ImportError for the - module itself. - -- Issue #15293: Add GC support to the AST base node type. - -- Issue #15291: Fix a memory leak where AST nodes where not properly - deallocated. - -- Issue #15110: Fix the tracebacks generated by "import xxx" to not show the - importlib stack frames. - -- Issue #15020: The program name used to search for Python's path is now - "python3" under Unix, not "python". - -- Issue #15033: Fix the exit status bug when modules invoked using -m swith, - return the proper failure return value (1). Patch contributed by Jeff Knupp. - -- Issue #15229: An OSError subclass whose __init__ doesn't call back - OSError.__init__ could produce incomplete instances, leading to crashes when - calling str() on them. - -- Issue 15307: Virtual environments now use symlinks with framework builds on - Mac OS X, like other POSIX builds. - -Library -------- - -- Issue #15424: Add a __sizeof__ implementation for array objects. Patch by - Ludwig H?hne. - -- Issue #15576: Allow extension modules to act as a package's __init__ module. - -- Issue #15502: Have importlib.invalidate_caches() work on sys.meta_path instead - of sys.path_importer_cache. - -- Issue #15163: Pydoc shouldn't list __loader__ as module data. - -- Issue #15471: Do not use mutable objects as defaults for - importlib.__import__(). - -- Issue #15559: To avoid a problematic failure mode when passed to the bytes - constructor, objects in the ipaddress module no longer implement __index__ - (they still implement __int__ as appropriate) - -- Issue #15546: Fix handling of pathological input data in the peek() and - read1() methods of the BZ2File, GzipFile and LZMAFile classes. - -- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog - ended with '\'. Patch by Roger Serwy. - -- Issue #12655: Instead of requiring a custom type, os.sched_getaffinity and - os.sched_setaffinity now use regular sets of integers to represent the CPUs a - process is restricted to. - -- Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() emulation - code. Patch by Philipp Hagemeister. - -- Issue #15519: Properly expose WindowsRegistryFinder in importlib (and use the - correct term for it). Original patch by Eric Snow. - -- Issue #15502: Bring the importlib ABCs into line with the current state of the - import protocols given PEP 420. Original patch by Eric Snow. - -- Issue #15499: Launching a webbrowser in Unix used to sleep for a few seconds. - Original patch by Anton Barkovsky. - -- Issue #15463: The faulthandler module truncates strings to 500 characters, - instead of 100, to be able to display long file paths. - -- Issue #6056: Make multiprocessing use setblocking(True) on the sockets it - uses. Original patch by J Derek Wilson. - -- Issue #15364: Fix sysconfig.get_config_var('srcdir') to be an absolute path. - -- Issue #15041: Update "see also" list in tkinter documentation. - -- Issue #15413: os.times() had disappeared under Windows. - -- Issue #15402: An issue in the struct module that caused sys.getsizeof to - return incorrect results for struct.Struct instances has been fixed. Initial - patch by Serhiy Storchaka. - -- Issue #15232: When mangle_from is True, email.Generator now correctly mangles - lines that start with 'From ' that occur in a MIME preamble or epilogue. - -- Issue #15094: Incorrectly placed #endif in _tkinter.c. Patch by Serhiy - Storchaka. - -- Issue #13922: argparse no longer incorrectly strips '--'s that appear after - the first one. - -- Issue #12353: argparse now correctly handles null argument values. - -- Issue #10017, issue #14998: Fix TypeError using pprint on dictionaries with - user-defined types as keys or other unorderable keys. - -- Issue #15397: inspect.getmodulename() is now based directly on importlib via a - new importlib.machinery.all_suffixes() API. - -- Issue #14635: telnetlib will use poll() rather than select() when possible to - avoid failing due to the select() file descriptor limit. - -- Issue #15180: Clarify posixpath.join() error message when mixing str & bytes. - -- Issue #15343: pkgutil now includes an iter_importer_modules implementation for - importlib.machinery.FileFinder (similar to the way it already handled - zipimport.zipimporter). - -- Issue #15314: runpy now sets __main__.__loader__ correctly. - -- Issue #15357: The import emulation in pkgutil is now deprecated. pkgutil uses - importlib internally rather than the emulation. - -- Issue #15233: Python now guarantees that callables registered with the atexit - module will be called in a deterministic order. - -- Issue #15238: shutil.copystat now copies Linux "extended attributes". - -- Issue #15230: runpy.run_path now correctly sets __package__ as described in - the documentation. - -- Issue #15315: Support VS 2010 in distutils cygwincompiler. - -- Issue #15294: Fix a regression in pkgutil.extend_path()'s handling of nested - namespace packages. - -- Issue #15056: imp.cache_from_source() and source_from_cache() raise - NotImplementedError when sys.implementation.cache_tag is set to None. - -- Issue #15256: Grammatical mistake in exception raised by imp.find_module(). - -- Issue #5931: wsgiref environ variable SERVER_SOFTWARE will specify an - implementation specific term like CPython, Jython instead of generic "Python". - -- Issue #13248: Remove obsolete argument "max_buffer_size" of BufferedWriter and - BufferedRWPair, from the io module. - -- Issue #13248: Remove obsolete argument "version" of argparse.ArgumentParser. - -- Issue #14814: Implement more consistent ordering and sorting behaviour for - ipaddress objects. - -- Issue #14814: ipaddress network objects correctly return NotImplemented when - compared to arbitrary objects instead of raising TypeError. - -- Issue #14990: Correctly fail with SyntaxError on invalid encoding declaration. - -- Issue #14814: ipaddress now provides more informative error messages when - constructing instances directly (changes permitted during beta due to - provisional API status). - -- Issue #15247: FileIO now raises an error when given a file descriptor pointing - to a directory. - -- Issue #15261: Stop os.stat(fd) crashing on Windows when fd not open. - -- Issue #15166: Implement imp.get_tag() using sys.implementation.cache_tag. - -- Issue #15210: Catch KeyError when importlib.__init__ can't find - _frozen_importlib in sys.modules, not ImportError. - -- Issue #15030: importlib.abc.PyPycLoader now supports the new source size - header field in .pyc files. - -- Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on - flush(). - -- Issue #10571: Fix the "--sign" option of distutils' upload command. Patch by - Jakub Wilk. - -- Issue #9559: If messages were only added, a new file is no longer created and - renamed over the old file when flush() is called on an mbox, MMDF or Babyl - mailbox. - -- Issue 10924: Fixed crypt.mksalt() to use a RNG that is suitable for - cryptographic purpose. - -- Issue #15184: Ensure consistent results of OS X configuration tailoring for - universal builds by factoring out common OS X-specific customizations from - sysconfig, distutils.sysconfig, distutils.util, and distutils.unixccompiler - into a new module _osx_support. - -C API ------ - -- Issue #15610: PyImport_ImportModuleEx() now uses a 'level' of 0 instead of -1. - -- Issues #15169, #14599: Strip out the C implementation of - imp.source_from_cache() used by PyImport_ExecCodeModuleWithPathnames() and - used the Python code instead. Leads to PyImport_ExecCodeModuleObject() to not - try to infer the source path from the bytecode path as - PyImport_ExecCodeModuleWithPathnames() does. - -Extension Modules ------------------ - -- Issue #15676: Now "mmap" check for empty files before doing the - offset check. Patch by Steven Willis. - -- Issue #6493: An issue in ctypes on Windows that caused structure bitfields - of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. - -- Issue #15194: Update libffi to the 3.0.11 release. - -Tools/Demos ------------ - -- Issue #15458: python-config gets a new option --configdir to print the $LIBPL - value. - -- Move importlib.test.benchmark to Tools/importbench. - -- Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been - enhanced to show information on more C frames relevant to CPython within the - "py-bt" and "py-bt-full" commands: - - * C frames that are waiting on the GIL - * C frames that are garbage-collecting - * C frames that are due to the invocation of a PyCFunction - -Documentation -------------- - -- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch - by Serhiy Storchaka. - -- Issue #15295: Reorganize and rewrite the documentation on the import system. - -- Issue #15230: Clearly document some of the limitations of the runpy module and - nudge readers towards importlib when appropriate. - -- Issue #15053: Copy Python 3.3 import lock change notice to all relevant - functions in imp instead of just at the top of the relevant section. - -- Issue #15288: Link to the term "loader" in notes in pkgutil about how things - won't work as expected in Python 3.3 and mark the requisite functions as - "changed" since they will no longer work with modules directly imported by - import itself. - -- Issue #13557: Clarify effect of giving two different namespaces to exec or - execfile(). - -- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch - contributed by Chris Jerdonek. - -Tests ------ - -- Issue #15467: Move helpers for __sizeof__ tests into test_support. Patch by - Serhiy Storchaka. - -- Issue #15320: Make iterating the list of tests thread-safe when running tests - in multiprocess mode. Patch by Chris Jerdonek. - -- Issue #15168: Move importlib.test to test.test_importlib. - -- Issue #15091: Reactivate a test on UNIX which was failing thanks to a - forgotten importlib.invalidate_caches() call. - -- Issue #15230: Adopted a more systematic approach in the runpy tests. - -- Issue #15300: Ensure the temporary test working directories are in the same - parent folder when running tests in multiprocess mode from a Python build. - Patch by Chris Jerdonek. - -- Issue #15284: Skip {send,recv}msg tests in test_socket when IPv6 is not - enabled. Patch by Brian Brazil. - -- Issue #15277: Fix a resource leak in support.py when IPv6 is disabled. Patch - by Brian Brazil. - -Build ------ - -- Issue #11715: Fix multiarch detection without having Debian development tools - (dpkg-dev) installed. - -- Issue #15037: Build OS X installers with local copy of ncurses 5.9 libraries - to avoid curses.unget_wch bug present in older versions of ncurses such as - those shipped with OS X. - -- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. Also, for - OS X installers, ensure consistent sqlite3 behavior and feature availability - by building a local copy of libsqlite3 rather than depending on the wide range - of versions supplied with various OS X releases. - -- Issue #8847: Disable COMDAT folding in Windows PGO builds. - -- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. - -- Issue #15431: Add _freeze_importlib project to regenerate importlib.h on - Windows. Patch by Kristj?n Valur J?nsson. - -- Issue #14197: For OS X framework builds, ensure links to the shared library - are created with the proper ABI suffix. - -- Issue #14330: For cross builds, don't use host python, use host search paths - for host compiler. - -- Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. - -- Issue #15268: Search curses.h in /usr/include/ncursesw. - - -What's New in Python 3.3.0 Beta 1? -================================== - -*Release date: 27-Jun-2012* - -Core and Builtins ------------------ - -- Fix a (most likely) very rare memory leak when calling main() and not being - able to decode a command-line argument. - -- Issue #14815: Use Py_ssize_t instead of long for the object hash, to - preserve all 64 bits of hash on Win64. - -- Issue #12268: File readline, readlines and read() or readall() methods - no longer lose data when an underlying read system call is interrupted. - IOError is no longer raised due to a read system call returning EINTR - from within these methods. - -- Issue #11626: Add _SizeT functions to stable ABI. - -- Issue #15146: Add PyType_FromSpecWithBases. Patch by Robin Schreiber. - -- Issue #15142: Fix reference leak when deallocating instances of types - created using PyType_FromSpec(). - -- Issue #15042: Add PyState_AddModule and PyState_RemoveModule. Add version - guard for Py_LIMITED_API additions. Patch by Robin Schreiber. - -- Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on - the work by Hirokazu Yamamoto. - -- Issue #15096: Removed support for ur'' as the raw notation isn't - compatible with Python 2.x's raw unicode strings. - -- Issue #13783: Generator objects now use the identifier APIs internally - -- Issue #14874: Restore charmap decoding speed to pre-PEP 393 levels. - Patch by Serhiy Storchaka. - -- Issue #15026: utf-16 encoding is now significantly faster (up to 10x). - Patch by Serhiy Storchaka. - -- Issue #11022: open() and io.TextIOWrapper are now calling - locale.getpreferredencoding(False) instead of locale.getpreferredencoding() - in text mode if the encoding is not specified. Don't change temporary the - locale encoding using locale.setlocale(), use the current locale encoding - instead of the user preferred encoding. - -- Issue #14673: Add Eric Snow's sys.implementation implementation. - -- Issue #15038: Optimize python Locks on Windows. - -Library -------- - -- Issue #9803: Don't close IDLE on saving if breakpoint is open. - Patch by Roger Serwy. - -- Issue #12288: Consider '0' and '0.0' as valid initialvalue - for tkinter SimpleDialog. - -- Issue #15512: Add a __sizeof__ implementation for parser. - Patch by Serhiy Storchaka. - -- Issue #15469: Add a __sizeof__ implementation for deque objects. - Patch by Serhiy Storchaka. - -- Issue #15489: Add a __sizeof__ implementation for BytesIO objects. - Patch by Serhiy Storchaka. - -- Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. - Patch by Serhiy Storchaka. - -- Issue #15514: Correct __sizeof__ support for cpu_set. - Patch by Serhiy Storchaka. - -- Issue #15187: Bugfix: remove temporary directories test_shutil was leaving - behind. - -- Issue #15177: Added dir_fd parameter to os.fwalk(). - -- Issue #15176: Clarified behavior, documentation, and implementation - of os.listdir(). - -- Issue #15061: Re-implemented hmac.compare_digest() in C to prevent further - timing analysis and to support all buffer protocol aware objects as well as - ASCII only str instances safely. - -- Issue #15164: Change return value of platform.uname() from a - plain tuple to a collections.namedtuple. - -- Support Mageia Linux in the platform module. - -- Issue #11678: Support Arch linux in the platform module. - -- Issue #15118: Change return value of os.uname() and os.times() from - plain tuples to immutable iterable objects with named attributes - (structseq objects). - -- Speed up _decimal by another 10-15% by caching the thread local context - that was last accessed. In the pi benchmark (64-bit platform, prec=9), - _decimal is now only 1.5x slower than float. - -- Remove the packaging module, which is not ready for prime time. - -- Issue #15154: Add "dir_fd" parameter to os.rmdir, remove "rmdir" - parameter from os.remove / os.unlink. - -- Issue #4489: Add a shutil.rmtree that isn't susceptible to symlink attacks. - It is used automatically on platforms supporting the necessary os.openat() - and os.unlinkat() functions. Main code by Martin von L?wis. - -- Issue #15156: HTMLParser now uses the new "html.entities.html5" dictionary. - -- Issue #11113: add a new "html5" dictionary containing the named character - references defined by the HTML5 standard and the equivalent Unicode - character(s) to the html.entities module. - -- Issue #15114: the strict mode of HTMLParser and the HTMLParseError exception - are deprecated now that the parser is able to parse invalid markup. - -- Issue #3665: \u and \U escapes are now supported in unicode regular - expressions. Patch by Serhiy Storchaka. - -- Issue #15153: Added inspect.getgeneratorlocals to simplify white box - testing of generator state updates - -- Issue #13062: Added inspect.getclosurevars to simplify testing stateful - closures - -- Issue #11024: Fixes and additional tests for Time2Internaldate. - -- Issue #14626: Large refactoring of functions / parameters in the os module. - Many functions now support "dir_fd" and "follow_symlinks" parameters; - some also support accepting an open file descriptor in place of of a path - string. Added os.support_* collections as LBYL helpers. Removed many - functions only previously seen in 3.3 alpha releases (often starting with - "f" or "l", or ending with "at"). Originally suggested by Serhiy Storchaka; - implemented by Larry Hastings. - -- Issue #15008: Implement PEP 362 "Signature Objects". - Patch by Yury Selivanov. - -- Issue: #15138: base64.urlsafe_{en,de}code() are now 3-4x faster. - -- Issue #444582: Add shutil.which, for finding programs on the system path. - Original patch by Erik Demaine, with later iterations by Jan Killian - and Brian Curtin. - -- Issue #14837: SSL errors now have ``library`` and ``reason`` attributes - describing precisely what happened and in which OpenSSL submodule. The - str() of a SSLError is also enhanced accordingly. - -- Issue #9527: datetime.astimezone() method will now supply a class - timezone instance corresponding to the system local timezone when - called with no arguments. - -- Issue #14653: email.utils.mktime_tz() no longer relies on system - mktime() when timezone offest is supplied. - -- Issue #14684: zlib.compressobj() and zlib.decompressobj() now support the use - of predefined compression dictionaries. Original patch by Sam Rushing. - -- Fix GzipFile's handling of filenames given as bytes objects. - -- Issue #14772: Return destination values from some shutil functions. - -- Issue #15064: Implement context manager protocol for multiprocessing types - -- Issue #15101: Make pool finalizer avoid joining current thread. - -- Issue #14657: The frozen instance of importlib used for bootstrap is now - also the module imported as importlib._bootstrap. - -- Issue #14055: Add __sizeof__ support to _elementtree. - -- Issue #15054: A bug in tokenize.tokenize that caused string literals - with 'b' prefixes to be incorrectly tokenized has been fixed. - Patch by Serhiy Storchaka. - -- Issue #15006: Allow equality comparison between naive and aware - time or datetime objects. - -- Issue #14982: Document that pkgutil's iteration functions require the - non-standard iter_modules() method to be defined by an importer (something - the importlib importers do not define). - -- Issue #15036: Mailbox no longer throws an error if a flush is done - between operations when removing or changing multiple items in mbox, - MMDF, or Babyl mailboxes. - -- Issue #14059: Implement multiprocessing.Barrier. - -- Issue #15061: The inappropriately named hmac.secure_compare has been - renamed to hmac.compare_digest, restricted to operating on bytes inputs - only and had its documentation updated to more accurately reflect both its - intent and its limitations - -- Issue #13841: Make child processes exit using sys.exit() on Windows. - -- Issue #14936: curses_panel was converted to PEP 3121 and PEP 384 API. - Patch by Robin Schreiber. - -- Issue #1667546: On platforms supporting tm_zone and tm_gmtoff fields - in struct tm, time.struct_time objects returned by time.gmtime(), - time.localtime() and time.strptime() functions now have tm_zone and - tm_gmtoff attributes. Original patch by Paul Boddie. - -- Rename adjusted attribute to adjustable in time.get_clock_info() result. - -- Issue #3518: Remove references to non-existent BaseManager.from_address() - method. - -- Issue #13857: Added textwrap.indent() function (initial patch by Ezra - Berch) - -- Issue #2736: Added datetime.timestamp() method. - -- Issue #13854: Make multiprocessing properly handle non-integer - non-string argument to SystemExit. - -- Issue #12157: Make pool.map() empty iterables correctly. Initial - patch by mouad. - -- Issue #11823: disassembly now shows argument counts on calls with keyword args. - -- Issue #14711: os.stat_float_times() has been deprecated. - -- LZMAFile now accepts the modes "rb"/"wb"/"ab" as synonyms of "r"/"w"/"a". - -- The bz2 and lzma modules now each contain an open() function, allowing - compressed files to readily be opened in text mode as well as binary mode. - -- BZ2File.__init__() and LZMAFile.__init__() now accept a file object as their - first argument, rather than requiring a separate "fileobj" argument. - -- gzip.open() now accepts file objects as well as filenames. - -- Issue #14992: os.makedirs(path, exist_ok=True) would raise an OSError - when the path existed and had the S_ISGID mode bit set when it was - not explicitly asked for. This is no longer an exception as mkdir - cannot control if the OS sets that bit for it or not. - -- Issue #14989: Make the CGI enable option to http.server available via command - line. - -- Issue #14987: Add a missing import statement to inspect. - -- Issue #1079: email.header.decode_header now correctly parses all the examples - in RFC2047. There is a necessary visible behavior change: the leading and/or - trailing whitespace on ASCII parts is now preserved. - -- Issue #14969: Better handling of exception chaining in contextlib.ExitStack - -- Issue #14962: Update text coloring in IDLE shell window after changing - options. Patch by Roger Serwy. - -- Issue #14963: Convert contextlib.ExitStack.__exit__ to use an iterative - algorithm (Patch by Alon Horev) - -- Issue #14785: Add sys._debugmallocstats() to help debug low-level memory - allocation issues - -- Issue #14443: Ensure that .py files are byte-compiled with the correct Python - executable within bdist_rpm even on older versions of RPM - -C-API ------ - -- Issue #13783: Inadvertent additions to the public C API in the PEP 380 - implementation have either been removed or marked as private interfaces. - -Extension Modules ------------------ - -- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. - -Documentation -------------- - -- Issue #15081: Document PyState_FindModule. - Patch by Robin Schreiber. - -- Issue #14814: Added first draft of ipaddress module API reference - -Tests ------ - -- Issue #14769: test_capi now has SkipitemTest, which cleverly checks - for "parity" between PyArg_ParseTuple() and the Python/getargs.c static - function skipitem() for all possible "format units". - -- test_nntplib now tolerates being run from behind NNTP gateways that add - "X-Antivirus" headers to articles - -- Issue #15043: test_gdb is now skipped entirely if gdb security settings - block loading of the gdb hooks - -- Issue #14963: Add test cases for exception handling behaviour - in contextlib.ExitStack (Initial patch by Alon Horev) - -Build ------ - -- Issue #13590: Improve support for OS X Xcode 4: - * Try to avoid building Python or extension modules with problematic - llvm-gcc compiler. - * Since Xcode 4 removes ppc support, extension module builds now - check for ppc compiler support and automatically remove ppc and - ppc64 archs when not available. - * Since Xcode 4 no longer install SDKs in default locations, - extension module builds now revert to using installed headers - and libs if the SDK used to build the interpreter is not - available. - * Update ./configure to use better defaults for universal builds; - in particular, --enable-universalsdk=yes uses the Xcode default - SDK and --with-universal-archs now defaults to "intel" if ppc - not available. - -- Issue #14225: Fix Unicode support for curses (#12567) on OS X - -- Issue #14928: Fix importlib bootstrap issues by using a custom executable - (Modules/_freeze_importlib) to build Python/importlib.h. - - -What's New in Python 3.3.0 Alpha 4? -=================================== - -*Release date: 31-May-2012* - -Core and Builtins ------------------ - -- Issue #14835: Make plistlib output empty arrays & dicts like OS X. - Patch by Sidney San Mart?n. - -- Issue #14744: Use the new _PyUnicodeWriter internal API to speed up - str%args and str.format(args). - -- Issue #14930: Make memoryview objects weakrefable. - -- Issue #14775: Fix a potential quadratic dict build-up due to the garbage - collector repeatedly trying to untrack dicts. - -- Issue #14857: fix regression in references to PEP 3135 implicit __class__ - closure variable (Reopens issue #12370) - -- Issue #14712 (PEP 405): Virtual environments. Implemented by Vinay Sajip. - -- Issue #14660 (PEP 420): Namespace packages. Implemented by Eric Smith. - -- Issue #14494: Fix __future__.py and its documentation to note that - absolute imports are the default behavior in 3.0 instead of 2.7. - Patch by Sven Marnach. - -- Issue #9260: A finer-grained import lock. Most of the import sequence - now uses per-module locks rather than the global import lock, eliminating - well-known issues with threads and imports. - -- Issue #14624: UTF-16 decoding is now 3x to 4x faster on various inputs. - Patch by Serhiy Storchaka. - -- asdl_seq and asdl_int_seq are now Py_ssize_t sized. - -- Issue #14133 (PEP 415): Implement suppression of __context__ display with an - attribute on BaseException. This replaces the original mechanism of PEP 409. - -- Issue #14417: Mutating a dict during lookup now restarts the lookup instead - of raising a RuntimeError (undoes issue #14205). - -- Issue #14738: Speed-up UTF-8 decoding on non-ASCII data. Patch by Serhiy - Storchaka. - -- Issue #14700: Fix two broken and undefined-behaviour-inducing overflow checks - in old-style string formatting. - -- Issue #14705: The PyArg_Parse() family of functions now support the 'p' format - unit, which accepts a "boolean predicate" argument. It converts any Python - value into an integer--0 if it is "false", and 1 otherwise. - -Library -------- - -- Issue #14690: Use monotonic clock instead of system clock in the sched, - subprocess and trace modules. - -- Issue #14958: Change IDLE systax highlighting to recognize all string and - byte literals supported in Python 3.3. - -- Issue #10997: Prevent a duplicate entry in IDLE's "Recent Files" menu. - -- Issue #14443: Tell rpmbuild to use the correct version of Python in - bdist_rpm. Initial patch by Ross Lagerwall. - -- Issue #14929: Stop Idle 3.x from closing on Unicode decode errors when - grepping. Patch by Roger Serwy. - -- Issue #12515: email now registers a defect if it gets to EOF while parsing - a MIME part without seeing the closing MIME boundary. - -- Issue #12510: Attempting to get invalid tooltip no longer closes Idle. - Other tooltipss have been corrected or improved and the number of tests - has been tripled. Original patch by Roger Serwy. - -- Issue #1672568: email now always decodes base64 payloads, adding padding and - ignoring non-base64-alphabet characters if needed, and registering defects - for any such problems. - -- Issue #14925: email now registers a defect when the parser decides that there - is a missing header/body separator line. MalformedHeaderDefect, which the - existing code would never actually generate, is deprecated. - -- Issue #10365: File open dialog now works instead of crashing even when - the parent window is closed before the dialog. Patch by Roger Serwy. - -- Issue #8739: Updated smtpd to support RFC 5321, and added support for the - RFC 1870 SIZE extension. - -- Issue #665194: Added a localtime function to email.utils to provide an - aware local datetime for use in setting Date headers. - -- Issue #12586: Added new provisional policies that implement convenient - unicode support for email headers. See What's New for details. - -- Issue #14731: Refactored email Policy framework to support full backward - compatibility with Python 3.2 by default yet allow for the introduction of - new features through new policies. Note that Policy.must_be_7bit is renamed - to cte_type. - -- Issue #14876: Use user-selected font for highlight configuration. - -- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals. - Have ascii characters in help. - -- Issue #14548: Make multiprocessing finalizers check pid before - running to cope with possibility of gc running just after fork. - -- Issue #14863: Update the documentation of os.fdopen() to reflect the - fact that it's only a thin wrapper around open() anymore. - -- Issue #14036: Add an additional check to validate that port in urlparse does - not go in illegal range and returns None. - -- Issue #14862: Add missing names to os.__all__ - -- Issue #14875: Use float('inf') instead of float('1e66666') in the json module. - -- Issue #13585: Added contextlib.ExitStack - -- PEP 3144, Issue #14814: Added the ipaddress module - -- Issue #14426: Correct the Date format in Expires attribute of Set-Cookie - Header in Cookie.py. - -- Issue #14588: The types module now provide new_class() and prepare_class() - functions to support PEP 3115 compliant dynamic class creation. Patch by - Daniel Urban and Nick Coghlan. - -- Issue #13152: Allow to specify a custom tabsize for expanding tabs in - textwrap. Patch by John Feuerstein. - -- Issue #14721: Send the correct 'Content-length: 0' header when the body is an - empty string ''. Initial Patch contributed by Arve Knudsen. - -- Issue #14072: Fix parsing of 'tel' URIs in urlparse by making the check for - ports stricter. - -- Issue #9374: Generic parsing of query and fragment portions of url for any - scheme. Supported both by RFC3986 and RFC2396. - -- Issue #14798: Fix the functions in pyclbr to raise an ImportError - when the first part of a dotted name is not a package. Patch by - Xavier de Gaye. - -- Issue #12098: multiprocessing on Windows now starts child processes - using the same sys.flags as the current process. Initial patch by - Sergey Mezentsev. - -- Issue #13031: Small speed-up for tarfile when unzipping tarfiles. - Patch by Justin Peel. - -- Issue #14780: urllib.request.urlopen() now has a ``cadefault`` argument - to use the default certificate store. Initial patch by James Oakley. - -- Issue #14829: Fix bisect and range() indexing with large indices - (>= 2 ** 32) under 64-bit Windows. - -- Issue #14732: The _csv module now uses PEP 3121 module initialization. - Patch by Robin Schreiber. - -- Issue #14809: Add HTTP status codes introduced by RFC 6585 to http.server - and http.client. Patch by EungJun Yi. - -- Issue #14777: tkinter may return undecoded UTF-8 bytes as a string when - accessing the Tk clipboard. Modify clipboad_get() to first request type - UTF8_STRING when no specific type is requested in an X11 windowing - environment, falling back to the current default type STRING if that fails. - Original patch by Thomas Kluyver. - -- Issue #14773: Fix os.fwalk() failing on dangling symlinks. - -- Issue #12541: Be lenient with quotes around Realm field of HTTP Basic - Authentation in urllib2. - -- Issue #14807: move undocumented tarfile.filemode() to stat.filemode() and add - doc entry. Add tarfile.filemode alias with deprecation warning. - -- Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects. - -- Issue #14532: Add a secure_compare() helper to the hmac module, to mitigate - timing attacks. Patch by Jon Oberheide. - -- Add importlib.util.resolve_name(). - -- Issue #14366: Support lzma compression in zip files. - Patch by Serhiy Storchaka. - -- Issue #13959: Introduce importlib.find_loader() and document - imp.find_module/load_module as deprecated. - -- Issue #14082: shutil.copy2() now copies extended attributes, if possible. - Patch by Hynek Schlawack. - -- Issue #13959: Make importlib.abc.FileLoader.load_module()/get_filename() and - importlib.machinery.ExtensionFileLoader.load_module() have their single - argument be optional. Allows for the replacement (and thus deprecation) of - imp.load_source()/load_package()/load_compiled(). - -- Issue #13959: imp.get_suffixes() has been deprecated in favour of the new - attributes on importlib.machinery: SOURCE_SUFFIXES, DEBUG_BYTECODE_SUFFIXES, - OPTIMIZED_BYTECODE_SUFFIXES, BYTECODE_SUFFIXES, and EXTENSION_SUFFIXES. This - led to an indirect deprecation of inspect.getmoduleinfo(). - -- Issue #14662: Prevent shutil failures on OS X when destination does not - support chflag operations. Patch by Hynek Schlawack. - -- Issue #14157: Fix time.strptime failing without a year on February 29th. - Patch by Hynek Schlawack. - -- Issue #14753: Make multiprocessing's handling of negative timeouts - the same as it was in Python 3.2. - -- Issue #14583: Fix importlib bug when a package's __init__.py would first - import one of its modules then raise an error. - -- Issue #14741: Fix missing support for Ellipsis ('...') in parser module. - -- Issue #14697: Fix missing support for set displays and set comprehensions in - parser module. - -- Issue #14701: Fix missing support for 'raise ... from' in parser module. - -- Add support for timeouts to the acquire() methods of - multiprocessing's lock/semaphore/condition proxies. - -- Issue #13989: Add support for text mode to gzip.open(). - -- Issue #14127: The os.stat() result object now provides three additional - fields: st_ctime_ns, st_mtime_ns, and st_atime_ns, providing those times as an - integer with nanosecond resolution. The functions os.utime(), os.lutimes(), - and os.futimes() now accept a new parameter, ns, which accepts mtime and atime - as integers with nanosecond resolution. - -- Issue #14127 and #10148: shutil.copystat now preserves exact mtime and atime - on filesystems providing nanosecond resolution. - -Tools/Demos ------------ - -- Issue #14695: Bring Tools/parser/unparse.py support up to date with - the Python 3.3 Grammar. - -Build ------ - -- Issue #14472: Update .gitignore. Patch by Matej Cepl. - -- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c. - -- Issue #14693: Under non-Windows platforms, hashlib's fallback modules are - always compiled, even if OpenSSL is present at build time. - -- Issue #13210: Windows build now uses VS2010, ported from VS2008. - -Documentation -------------- - -- Issue #14588: The language reference now accurately documents the Python 3 - class definition process. Patch by Nick Coghlan. - -- Issue #14943: Correct a default argument value for winreg.OpenKey - and correctly list the argument names in the function's explanation. - - -What's New in Python 3.3.0 Alpha 3? -=================================== - -*Release date: 01-May-2012* - -Core and Builtins ------------------ - -- Issue #14699: Fix calling the classmethod descriptor directly. - -- Issue #14433: Prevent msvcrt crash in interactive prompt when stdin is closed. - -- Issue #14521: Make result of float('nan') and float('-nan') more consistent - across platforms. - -- Issue #14646: __import__() sets __loader__ if the loader did not. - -- Issue #14605: No longer have implicit entries in sys.meta_path. If - sys.meta_path is found to be empty, raise ImportWarning. - -- Issue #14605: No longer have implicit entries in sys.path_hooks. If - sys.path_hooks is found to be empty, a warning will be raised. None is now - inserted into sys.path_importer_cache if no finder was discovered. This also - means imp.NullImporter is no longer implicitly used. - -- Issue #13903: Implement PEP 412. Individual dictionary instances can now share - their keys with other dictionaries. Classes take advantage of this to share - their instance dictionary keys for improved memory and performance. - -- Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError - when repr() or str() is called on such an object. - -- Issue #14658: Fix binding a special method to a builtin implementation of a - special method with a different name. - -- Issue #14630: Fix a memory access bug for instances of a subclass of int - with value 0. - -- Issue #14339: Speed improvements to bin, oct and hex functions. Patch by - Serhiy Storchaka. - -- Issue #14098: New functions PyErr_GetExcInfo and PyErr_SetExcInfo. - Patch by Stefan Behnel. - -- Issue #14385: It is now possible to use a custom type for the __builtins__ - namespace, instead of a dict. It can be used for sandboxing for example. - Raise also a NameError instead of ImportError if __build_class__ name if not - found in __builtins__. - -- Issue #12599: Be more strict in accepting None compared to a false-like - object for importlib.util.module_for_loader and - importlib.machinery.PathFinder. - -- Issue #14612: Fix jumping around with blocks by setting f_lineno. - -- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in - globals raises a KeyError. - -- Issue #14607: Fix keyword-only arguments which started with ``__``. - -- Issue #10854: The ImportError raised when an extension module on Windows - fails to import now uses the new path and name attributes from - Issue #1559549. - -- Issue #13889: Check and (if necessary) set FPU control word before calling - any of the dtoa.c string <-> float conversion functions, on MSVC builds of - Python. This fixes issues when embedding Python in a Delphi app. - -- __import__() now matches PEP 328 and documentation by defaulting 'index' to 0 - instead of -1 and removing support for negative values. - -- Issue #2377: Make importlib the implementation of __import__(). - -- Issue #1559549: ImportError now has 'name' and 'path' attributes that are set - using keyword arguments to its constructor. They are currently not set by - import as they are meant for use by importlib. - -- Issue #14474: Save and restore exception state in thread.start_new_thread() - while writing error message if the thread leaves a unhandled exception. - -- Issue #13019: Fix potential reference leaks in bytearray.extend(). Patch - by Suman Saha. - -Library -------- - -- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'. - -- Issue #14371: Support bzip2 in zipfile module. Patch by Serhiy Storchaka. - -- Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running - step. Patch by Xavier de Gaye. - -- Issue #14696: Fix parser module to understand 'nonlocal' declarations. - -- Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near - the DST transition. Patch by Joe Peterson. - -- Issue #9154: Fix parser module to understand function annotations. - -- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the - client ip address instead client hostname. Patch by Charles-Fran?ois Natali. - -- Issue #14309: Deprecate time.clock(), use time.perf_counter() or - time.process_time() instead. - -- Issue #14428: Implement the PEP 418. Add time.get_clock_info(), - time.perf_counter() and time.process_time() functions, and rename - time.steady() to time.monotonic(). - -- Issue #14646: importlib.util.module_for_loader() now sets __loader__ and - __package__ (when possible). - -- Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a - test class that doesn't inherit from TestCase (i.e. a mixin). - -- Issue #4892: multiprocessing Connections can now be transferred over - multiprocessing Connections. Patch by Richard Oudkerk (sbt). - -- Issue #14160: TarFile.extractfile() failed to resolve symbolic links when - the links were not located in an archive subdirectory. - -- Issue #14638: pydoc now treats non-string __name__ values as if they - were missing, instead of raising an error. - -- Issue #13684: Fix httplib tunnel issue of infinite loops for certain sites - which send EOF without trailing \r\n. - -- Issue #14605: Add importlib.abc.FileLoader, importlib.machinery.(FileFinder, - SourceFileLoader, SourcelessFileLoader, ExtensionFileLoader). - -- Issue #13959: imp.cache_from_source()/source_from_cache() now follow - os.path.join()/split() semantics for path manipulation instead of its prior, - custom semantics of caring the right-most path separator forward in path - joining. - -- Issue #2193: Allow ":" character in Cookie NAME values. - -- Issue #14629: tokenizer.detect_encoding will specify the filename in the - SyntaxError exception if found at readline.__self__.name. - -- Issue #14629: Raise SyntaxError in tokenizer.detect_encoding if the - first two lines have non-UTF-8 characters without an encoding declaration. - -- Issue #14308: Fix an exception when a "dummy" thread is in the threading - module's active list after a fork(). - -- Issue #11750: The Windows API functions scattered in the _subprocess and - _multiprocessing.win32 modules now live in a single module "_winapi". - Patch by sbt. - -- Issue #14087: multiprocessing: add Condition.wait_for(). Patch by sbt. - -- Issue #14538: HTMLParser can now parse correctly start tags that contain - a bare '/'. - -- Issue #14452: SysLogHandler no longer inserts a UTF-8 BOM into the message. - -- Issue #14386: Expose the dict_proxy internal type as types.MappingProxyType. - -- Issue #13959: Make imp.reload() always use a module's __loader__ to perform - the reload. - -- Issue #13959: Add imp.py and rename the built-in module to _imp, allowing for - re-implementing parts of the module in pure Python. - -- Issue #13496: Fix potential overflow in bisect.bisect algorithm when applied - to a collection of size > sys.maxsize / 2. - -- Have importlib take advantage of ImportError's new 'name' and 'path' - attributes. - -- Issue #14399: zipfile now recognizes that the archive has been modified even - if only the comment is changed. In addition, the TypeError that results from - trying to set a non-binary value as a comment is now now raised at the time - the comment is set rather than at the time the zipfile is written. - -- trace.CoverageResults.is_ignored_filename() now ignores any name that starts - with "<" and ends with ">" instead of special-casing "" and - ". - -- IDLE can be launched as python -m idlelib - -- Issue #14295: Add unittest.mock - -- Issue #7652: Add --with-system-libmpdec option to configure for linking - the _decimal module against an installed libmpdec. - -- Issue #14380: MIMEText now defaults to utf-8 when passed non-ASCII unicode - with no charset specified. - -- Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on - OSX; avoid to call handle_connect in case of a disconnected socket which - was not meant to connect. - -- Issue #14204: The ssl module now has support for the Next Protocol - Negotiation extension, if available in the underlying OpenSSL library. - Patch by Colin Marc. - -- Issue #3035: Unused functions from tkinter are marked as pending deprecated. - -- Issue #12757: Fix the skipping of doctests when python is run with -OO so - that it works in unittest's verbose mode as well as non-verbose mode. - -- Issue #7652: Integrate the decimal floating point libmpdec library to speed - up the decimal module. Performance gains of the new C implementation are - between 10x and 100x, depending on the application. - -- Issue #3573: IDLE hangs when passing invalid command line args - (directory(ies) instead of file(s)) (Patch by Guilherme Polo) - -- Issue #14269: SMTPD now conforms to the RFC and requires a HELO command - before MAIL, RCPT, or DATA. - -- Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr - attribute. - -- Issue #14344: fixed the repr of email.policy objects. - -- Issue #11686: Added missing entries to email package __all__ lists - (mostly the new Bytes classes). - -- Issue #14335: multiprocessing's custom Pickler subclass now inherits from - the C-accelerated implementation. Patch by sbt. - -- Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem. - -- Issue #11199: Fix the with urllib which hangs on particular ftp urls. - -- Improve the memory utilization and speed of functools.lru_cache. - -- Issue #14222: Use the new time.steady() function instead of time.time() for - timeout in queue and threading modules to not be affected of system time - update. - -- Issue #13248: Remove lib2to3.pytree.Base.get_prefix/set_prefix. - -- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash - table internal to the pyexpat module's copy of the expat library to avoid a - denial of service due to hash collisions. Patch by David Malcolm with some - modifications by the expat project. - -- Issue #14200: Idle shell crash on printing non-BMP unicode character. - -- Issue #12818: format address no longer needlessly \ escapes ()s in names when - the name ends up being quoted. - -- Issue #14062: BytesGenerator now correctly folds Header objects, - including using linesep when folding. - -- Issue #13839: When invoked on the command-line, the pstats module now - accepts several filenames of profile stat files and merges them all. - Patch by Matt Joiner. - -- Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers - instead of raising an error. This fixes a regression relative to 2.7. - -- Issue #989712: Support using Tk without a mainloop. - -- Issue #5219: Prevent event handler cascade in IDLE. - -- Issue #3835: Refuse to use unthreaded Tcl in threaded Python. - -- Issue #2843: Add new Tk API to Tkinter. - -- Issue #14184: Increase the default stack size for secondary threads on - Mac OS X to avoid interpreter crashes when using threads on 10.7. - -- Issue #14180: datetime.date.fromtimestamp(), - datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() - now raise an OSError instead of ValueError if localtime() or gmtime() failed. - -- Issue #14180: time.ctime(), gmtime(), time.localtime(), - datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and - datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of - a ValueError, if the timestamp does not fit in time_t. - -- Issue #14180: datetime.datetime.fromtimestamp() and - datetime.datetime.utcfromtimestamp() now round microseconds towards zero - instead of rounding to nearest with ties going away from zero. - -- Issue #10543: Fix unittest test discovery with Jython bytecode files. - -- Issue #1178863: Separate initialisation from setting when initializing - Tkinter.Variables; harmonize exceptions to ValueError; only delete variables - that have not been deleted; assert that variable names are strings. - -- Issue #14104: Implement time.monotonic() on Mac OS X, patch written by - Nicholas Riley. - -- Issue #13394: the aifc module now uses warnings.warn() to signal warnings. - -- Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under - Windows when the child process has already exited. - -- Issue #14223: curses.addch() is no more limited to the range 0-255 when the - Python curses is not linked to libncursesw. It was a regression introduced - in Python 3.3a1. - -- Issue #14168: Check for presence of Element._attrs in minidom before - accessing it. - -- Issue #12328: Fix multiprocessing's use of overlapped I/O on Windows. - Also, add a multiprocessing.connection.wait(rlist, timeout=None) function - for polling multiple objects at once. Patch by sbt. - -- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end, - data or close method) for the Python implementation as well. - Drop the no-op TreeBuilder().xml() method from the C implementation. - -- Issue #14210: pdb now has tab-completion not only for command names, but - also for their arguments, wherever possible. - -- Issue #14310: Sockets can now be with other processes on Windows using - the api socket.socket.share() and socket.fromshare(). - -- Issue #10576: The gc module now has a 'callbacks' member that will get - called when garbage collection takes place. - -Build ------ - -- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. - -- Issue #14387: Do not include accu.h from Python.h. - -- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. - Based on patch from Herv? Coatanhay. - -- Issue #14321: Do not run pgen during the build if files are up to date. - -Documentation -------------- - -- Issue #14034: added the argparse tutorial. - -- Issue #14324: Fix configure tests for cross builds. - -- Issue #14327: Call AC_CANONICAL_HOST in configure.ac and check in - config.{guess,sub}. Don't use uname calls for cross builds. - -Extension Modules ------------------ - -- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and - ctypes.c_float that caused an incorrect exception to be returned in the - case of overflow has been fixed. - -- Issue #14212: The re module didn't retain a reference to buffers it was - scanning, resulting in segfaults. - -- Issue #14259: The finditer() method of re objects did not take any - keyword arguments, contrary to the documentation. - -- Issue #10142: Support for SEEK_HOLE/SEEK_DATA (for example, under ZFS). - -Tests ------ - -- Issue #14442: Add missing errno import in test_smtplib. - -- Issue #8315: (partial fix) python -m unittest test.test_email now works. - - -What's New in Python 3.3.0 Alpha 1? -=================================== - -*Release date: 05-Mar-2012* - -Core and Builtins ------------------ - -- Issue #14172: Fix reference leak when marshalling a buffer-like object - (other than a bytes object). - -- Issue #13521: dict.setdefault() now does only one lookup for the given key, - making it "atomic" for many purposes. Patch by Filip Gruszczy?ski. - -- PEP 409, Issue #6210: "raise X from None" is now supported as a means of - suppressing the display of the chained exception context. The chained - context still remains available as the __context__ attribute. - -- Issue #10181: New memoryview implementation fixes multiple ownership - and lifetime issues of dynamically allocated Py_buffer members (#9990) - as well as crashes (#8305, #7433). Many new features have been added - (See whatsnew/3.3), and the documentation has been updated extensively. - The ndarray test object from _testbuffer.c implements all aspects of - PEP-3118, so further development towards the complete implementation - of the PEP can proceed in a test-driven manner. - - Thanks to Nick Coghlan, Antoine Pitrou and Pauli Virtanen for review - and many ideas. - -- Issue #12834: Fix incorrect results of memoryview.tobytes() for - non-contiguous arrays. - -- Issue #5231: Introduce memoryview.cast() method that allows changing - format and shape without making a copy of the underlying memory. - -- Issue #14084: Fix a file descriptor leak when importing a module with a - bad encoding. - -- Upgrade Unicode data to Unicode 6.1. - -- Issue #14040: Remove rarely used file name suffixes for C extensions - (under POSIX mainly). - -- Issue #14051: Allow arbitrary attributes to be set of classmethod and - staticmethod. - -- Issue #13703: oCERT-2011-003: Randomize hashes of str and bytes to protect - against denial of service attacks due to hash collisions within the dict and - set types. Patch by David Malcolm, based on work by Victor Stinner. - -- Issue #13020: Fix a reference leak when allocating a structsequence object - fails. Patch by Suman Saha. - -- Issue #13908: Ready types returned from PyType_FromSpec. - -- Issue #11235: Fix OverflowError when trying to import a source file whose - modification time doesn't fit in a 32-bit timestamp. - -- Issue #12705: A SyntaxError exception is now raised when attempting to - compile multiple statements as a single interactive statement. - -- Fix the builtin module initialization code to store the init function for - future reinitialization. - -- Issue #8052: The posix subprocess module would take a long time closing - all possible file descriptors in the child process rather than just open - file descriptors. It now closes only the open fds if possible for the - default close_fds=True behavior. - -- Issue #13629: Renumber the tokens in token.h so that they match the indexes - into _PyParser_TokenNames. - -- Issue #13752: Add a casefold() method to str. - -- Issue #13761: Add a "flush" keyword argument to the print() function, - used to ensure flushing the output stream. - -- Issue #13645: pyc files now contain the size of the corresponding source - code, to avoid timestamp collisions (especially on filesystems with a low - timestamp resolution) when checking for freshness of the bytecode. - -- PEP 380, Issue #11682: Add "yield from " to support easy delegation to - subgenerators (initial patch by Greg Ewing, integration into 3.3 by - Renaud Blanch, Ryan Kelly, Zbigniew J?drzejewski-Szmek and Nick Coghlan) - -- Issue #13748: Raw bytes literals can now be written with the ``rb`` prefix - as well as ``br``. - -- Issue #12736: Use full unicode case mappings for upper, lower, and title case. - -- Issue #12760: Add a create mode to open(). Patch by David Townshend. - -- Issue #13738: Simplify implementation of bytes.lower() and bytes.upper(). - -- Issue #13577: Built-in methods and functions now have a __qualname__. - Patch by sbt. - -- Issue #6695: Full garbage collection runs now clear the freelist of set - objects. Initial patch by Matthias Troffaes. - -- Fix OSError.__init__ and OSError.__new__ so that each of them can be - overriden and take additional arguments (followup to issue #12555). - -- Fix the fix for issue #12149: it was incorrect, although it had the side - effect of appearing to resolve the issue. Thanks to Mark Shannon for - noticing. - -- Issue #13505: Pickle bytes objects in a way that is compatible with - Python 2 when using protocols <= 2. - -- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix - given by Campbell Barton). - -- Issue #13503: Use a more efficient reduction format for bytearrays with - pickle protocol >= 3. The old reduction format is kept with older protocols - in order to allow unpickling under Python 2. Patch by Irmen de Jong. - -- Issue #7111: Python can now be run without a stdin, stdout or stderr - stream. It was already the case with Python 2. However, the corresponding - sys module entries are now set to None (instead of an unusable file object). - -- Issue #11849: Ensure that free()d memory arenas are really released - on POSIX systems supporting anonymous memory mappings. Patch by - Charles-Fran?ois Natali. - -- Issue #13452: PyUnicode_EncodeDecimal() doesn't support error handlers - different than "strict" anymore. The caller was unable to compute the - size of the output buffer: it depends on the error handler. - -- PEP 3155 / issue #13448: Qualified name for classes and functions. - -- Issue #13436: Fix a bogus error message when an AST object was passed - an invalid integer value. - -- Issue #13411: memoryview objects are now hashable when the underlying - object is hashable. - -- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER - to allow compiling extension modules with -Wswitch-enum on gcc. - Initial patch by Floris Bruynooghe. - -- Issue #10227: Add an allocation cache for a single slice object. Patch by - Stefan Behnel. - -- Issue #13393: BufferedReader.read1() now asks the full requested size to - the raw stream instead of limiting itself to the buffer size. - -- Issue #13392: Writing a pyc file should now be atomic under Windows as well. - -- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder - already accepts them). - -- Issue #13389: Full garbage collection passes now clear the freelists for - list and dict objects. They already cleared other freelists in the - interpreter. - -- Issue #13327: Remove the need for an explicit None as the second argument - to os.utime, os.lutimes, os.futimes, os.futimens, os.futimesat, in - order to update to the current time. Also added keyword argument - handling to os.utimensat in order to remove the need for explicit None. - -- Issue #13350: Simplify some C code by replacing most usages of - PyUnicode_Format by PyUnicode_FromFormat. - -- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode - error handler in interactive mode (when calling into PyOS_Readline()). - -- Issue #9896: Add start, stop, and step attributes to range objects. - -- Issue #13343: Fix a SystemError when a lambda expression uses a global - variable in the default value of a keyword-only argument: ``lambda *, - arg=GLOBAL_NAME: None`` - -- Issue #12797: Added custom opener parameter to builtin open() and - FileIO.open(). - -- Issue #10519: Avoid unnecessary recursive function calls in - setobject.c. - -- Issue #10363: Deallocate global locks in Py_Finalize(). - -- Issue #13018: Fix reference leaks in error paths in dictobject.c. - Patch by Suman Saha. - -- Issue #13201: Define '==' and '!=' to compare range objects based on - the sequence of values they define (instead of comparing based on - object identity). - -- Issue #1294232: In a few cases involving metaclass inheritance, the - interpreter would sometimes invoke the wrong metaclass when building a new - class object. These cases now behave correctly. Patch by Daniel Urban. - -- Issue #12753: Add support for Unicode name aliases and named sequences. - Both ``unicodedata.lookup()`` and '\N{...}' now resolve aliases, - and ``unicodedata.lookup()`` resolves named sequences too. - -- Issue #12170: The count(), find(), rfind(), index() and rindex() methods - of bytes and bytearray objects now accept an integer between 0 and 255 - as their first argument. Patch by Petri Lehtinen. - -- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler - warnings. Patch by Josh Triplett and Petri Lehtinen. - -- Issue #12281: Rewrite the MBCS codec to handle correctly replace and ignore - error handlers on all Windows versions. The MBCS codec is now supporting all - error handlers, instead of only replace to encode and ignore to decode. - -- Issue #13188: When called without an explicit traceback argument, - generator.throw() now gets the traceback from the passed exception's - ``__traceback__`` attribute. Patch by Petri Lehtinen. - -- Issue #13146: Writing a pyc file is now atomic under POSIX. - -- Issue #7833: Extension modules built using distutils on Windows will no - longer include a "manifest" to prevent them failing at import time in some - embedded situations. - -- PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. - -- Add internal API for static strings (_Py_identifier et al.). - -- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described - as "The pipe is being closed") is now mapped to POSIX errno EPIPE - (previously EINVAL). - -- Issue #12911: Fix memory consumption when calculating the repr() of huge - tuples or lists. - -- PEP 393: flexible string representation. Thanks to Torsten Becker for the - initial implementation, and Victor Stinner for various bug fixes. - -- Issue #14081: The 'sep' and 'maxsplit' parameter to str.split, bytes.split, - and bytearray.split may now be passed as keyword arguments. - -- Issue #13012: The 'keepends' parameter to str.splitlines may now be passed - as a keyword argument: "my_string.splitlines(keepends=True)". The same - change also applies to bytes.splitlines and bytearray.splitlines. - -- Issue #7732: Don't open a directory as a file anymore while importing a - module. Ignore the direcotry if its name matchs the module name (e.g. - "__init__.py") and raise a ImportError instead. - -- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for - finding the bug and providing a patch. - -- Issue #12973: Fix overflow checks that relied on undefined behaviour in - list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs - caused test failures with recent versions of Clang. - -- Issue #12904: os.utime, os.futimes, os.lutimes, and os.futimesat now write - atime and mtime with nanosecond precision on modern POSIX platforms. - -- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now - mapped to POSIX errno ENOTDIR (previously EINVAL). - -- Issue #9200: The str.is* methods now work with strings that contain non-BMP - characters even in narrow Unicode builds. - -- Issue #12791: Break reference cycles early when a generator exits with - an exception. - -- Issue #12773: Make __doc__ mutable on user-defined classes. - -- Issue #12766: Raise a ValueError when creating a class with a class variable - that conflicts with a name in __slots__. - -- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase - titlecased and cased non-letter characters. - -- Issue #12732: In narrow unicode builds, allow Unicode identifiers which fall - outside the BMP. - -- Issue #12575: Validate user-generated AST before it is compiled. - -- Make type(None), type(Ellipsis), and type(NotImplemented) callable. They - return the respective singleton instances. - -- Forbid summing bytes with sum(). - -- Verify the types of AST strings and identifiers provided by the user before - compiling them. - -- Issue #12647: The None object now has a __bool__() method that returns False. - Formerly, bool(None) returned False only because of special case logic - in PyObject_IsTrue(). - -- Issue #12579: str.format_map() now raises a ValueError if used on a - format string that contains positional fields. Initial patch by - Julian Berman. - -- Issue #10271: Allow warnings.showwarning() be any callable. - -- Issue #11627: Fix segfault when __new__ on a exception returns a - non-exception class. - -- Issue #12149: Update the method cache after a type's dictionary gets - cleared by the garbage collector. This fixes a segfault when an instance - and its type get caught in a reference cycle, and the instance's - deallocator calls one of the methods on the type (e.g. when subclassing - IOBase). Diagnosis and patch by Davide Rizzo. - -- Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows. - -- Issue #9642: Uniformize the tests on the availability of the mbcs codec, add - a new HAVE_MBCS define. - -- Issue #9642: Fix filesystem encoding initialization: use the ANSI code page - on Windows if the mbcs codec is not available, and fail with a fatal error if - we cannot get the locale encoding (if nl_langinfo(CODESET) is not available) - instead of using UTF-8. - -- When a generator yields, do not retain the caller's exception state on the - generator. - -- Issue #12475: Prevent generators from leaking their exception state into the - caller's frame as they return for the last time. - -- Issue #12291: You can now load multiple marshalled objects from a stream, - with other data interleaved between marshalled objects. - -- Issue #12356: When required positional or keyword-only arguments are not - given, produce a informative error message which includes the name(s) of the - missing arguments. - -- Issue #12370: Fix super with no arguments when __class__ is overriden in the - class body. - -- Issue #12084: os.stat on Windows now works properly with relative symbolic - links when called from any directory. - -- Loosen type restrictions on the __dir__ method. __dir__ can now return any - sequence, which will be converted to a list and sorted by dir(). - -- Issue #12265: Make error messages produced by passing an invalid set of - arguments to a function more informative. - -- Issue #12225: Still allow Python to build if Python is not in its hg repo or - mercurial is not installed. - -- Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix - the following case: sys.stdin.read() stopped with CTRL+d (end of file), - raw_input() interrupted by CTRL+c. - -- Issue #12216: Allow unexpected EOF errors to happen on any line of the file. - -- Issue #12199: The TryExcept and TryFinally and AST nodes have been unified - into a Try node. - -- Issue #9670: Increase the default stack size for secondary threads on - Mac OS X and FreeBSD to reduce the chances of a crash instead of a - "maximum recursion depth" RuntimeError exception. - (patch by Ronald Oussoren) - -- Issue #12106: The use of the multiple-with shorthand syntax is now reflected - in the AST. - -- Issue #12190: Try to use the same filename object when compiling unmarshalling - a code objects in the same file. - -- Issue #12166: Move implementations of dir() specialized for various types into - the __dir__() methods of those types. - -- Issue #5715: In socketserver, close the server socket in the child process. - -- Correct lookup of __dir__ on objects. Among other things, this causes errors - besides AttributeError found on lookup to be propagated. - -- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal - module. Patch written by Charles-Fran?ois Natali. - -- Issue #1746656: Added the if_nameindex, if_indextoname, if_nametoindex - methods to the socket module. - -- Issue #12044: Fixed subprocess.Popen when used as a context manager to - wait for the process to end when exiting the context to avoid unintentionally - leaving zombie processes around. - -- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, - clear the end-of-file indicator after CTRL+d. - -- Issue #1856: Avoid crashes and lockups when daemon threads run while the - interpreter is shutting down; instead, these threads are now killed when - they try to take the GIL. - -- Issue #9756: When calling a method descriptor or a slot wrapper descriptor, - the check of the object type doesn't read the __class__ attribute anymore. - Fix a crash if a class override its __class__ attribute (e.g. a proxy of the - str type). Patch written by Andreas St?hrk. - -- Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* - APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch - by Charles-Fran?ois Natali. - -- Issue #10914: Initialize correctly the filesystem codec when creating a new - subinterpreter to fix a bootstrap issue with codecs implemented in Python, as - the ISO-8859-15 codec. - -- Issue #11918: OS/2 and VMS are no more supported because of the lack of - maintainer. - -- Issue #6780: fix starts/endswith error message to mention that tuples are - accepted too. - -- Issue #5057: fix a bug in the peepholer that led to non-portable pyc files - between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP - chars (e.g. "\U00012345"[0]). - -- Issue #11845: Fix typo in rangeobject.c that caused a crash in - compute_slice_indices. Patch by Daniel Urban. - -- Issue #5673: Added a `timeout` keyword argument to subprocess.Popen.wait, - subprocess.Popen.communicated, subprocess.call, subprocess.check_call, and - subprocess.check_output. If the blocking operation takes more than `timeout` - seconds, the `subprocess.TimeoutExpired` exception is raised. - -- Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted - (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch - written by Charles-Francois Natali. - -- Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. - -- Issue #10785: Store the filename as Unicode in the Python parser. - -- Issue #11619: _PyImport_LoadDynamicModule() doesn't encode the path to bytes - on Windows. - -- Issue #10998: Remove mentions of -Q, sys.flags.division_warning and - Py_DivisionWarningFlag left over from Python 2. - -- Issue #11244: Remove an unnecessary peepholer check that was preventing - negative zeros from being constant-folded properly. - -- Issue #11395: io.FileIO().write() clamps the data length to 32,767 bytes on - Windows if the file is a TTY to workaround a Windows bug. The Windows console - returns an error (12: not enough space error) on writing into stdout if - stdout mode is binary and the length is greater than 66,000 bytes (or less, - depending on heap usage). - -- Issue #11320: fix bogus memory management in Modules/getpath.c, leading to - a possible crash when calling Py_SetPath(). - -- Issue #11432: A bug was introduced in subprocess.Popen on posix systems with - 3.2.0 where the stdout or stderr file descriptor being the same as the stdin - file descriptor would raise an exception. webbrowser.open would fail. fixed. - -- Issue #9856: Change object.__format__ with a non-empty format string - to be a DeprecationWarning. In 3.2 it was a PendingDeprecationWarning. - In 3.4 it will be a TypeError. - -- Issue #11244: The peephole optimizer is now able to constant-fold - arbitrarily complex expressions. This also fixes a 3.2 regression where - operations involving negative numbers were not constant-folded. - -- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when - there are many tags (e.g. when using mq). Patch by Nadeem Vawda. - -- Issue #11335: Fixed a memory leak in list.sort when the key function - throws an exception. - -- Issue #8923: When a string is encoded to UTF-8 in strict mode, the result is - cached into the object. Examples: str.encode(), str.encode('utf-8'), - PyUnicode_AsUTF8String() and PyUnicode_AsEncodedString(unicode, "utf-8", - NULL). - -- Issue #10831: PyUnicode_FromFormat() supports %li, %lli and %zi formats. - -- Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse - the format string in the 3 steps, fix crashs on invalid format strings. - -- Issue #13007: whichdb should recognize gdbm 1.9 magic numbers. - -- Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from - UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode). - Patch written by Ray Allen. - -- Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with - a buffer struct having a NULL data pointer. - -- Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and - sys.stdin uses universal newline (replace '\r\n' by '\n'). - -- issue #11828: startswith and endswith don't accept None as slice index. - Patch by Torsten Becker. - -- Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on - narrow build. - -- Issue #11168: Remove filename debug variable from PyEval_EvalFrameEx(). - It encoded the Unicode filename to UTF-8, but the encoding fails on - undecodable filename (on surrogate characters) which raises an unexpected - UnicodeEncodeError on recursion limit. - -- Issue #11187: Remove bootstrap code (use ASCII) of - PyUnicode_AsEncodedString(), it was replaced by a better fallback (use the - locale encoding) in PyUnicode_EncodeFSDefault(). - -- Check for NULL result in PyType_FromSpec. - -- Issue #10516: New copy() and clear() methods for lists and bytearrays. - -- Issue #11386: bytearray.pop() now throws IndexError when the bytearray is - empty, instead of OverflowError. - -- Issue #12380: The rjust, ljust and center methods of bytes and bytearray - now accept a bytearray argument. - -Library -------- - -- Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly - return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been - fixed. - -- Issue #14166: Pickler objects now have an optional ``dispatch_table`` - attribute which allows to set custom per-pickler reduction functions. - Patch by sbt. - -- Issue #14177: marshal.loads() now raises TypeError when given an unicode - string. Patch by Guilherme Gon?alves. - -- Issue #13550: Remove the debug machinery from the threading module: remove - verbose arguments from all threading classes and functions. - -- Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary, - WeakValueDictionary) to return a better approximation when some objects - are dead or dying. Moreover, the implementation is now O(1) rather than - O(n). - -- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode. - Patch by Mikhail Novikov. - -- Issue #11841: Fix comparison bug with 'rc' versions in packaging.version. - Patch by Filip Gruszczy?ski. - -- Issue #13447: Add a test file to host regression tests for bugs in the - scripts found in the Tools directory. - -- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils - on Windows. Also fixed in packaging. - -- Issue #8033: sqlite3: Fix 64-bit integer handling in user functions - on 32-bit architectures. Initial patch by Philippe Devalkeneer. - -- HTMLParser is now able to handle slashes in the start tag. - -- Issue #13641: Decoding functions in the base64 module now accept ASCII-only - unicode strings. Patch by Catalin Iacob. - -- Issue #14043: Speed up importlib's _FileFinder by at least 8x, and add a - new importlib.invalidate_caches() function. - -- Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in - SimpleXMLRPCServer upon malformed POST request. - -- Issue #13961: Move importlib over to using os.replace() for atomic renaming. - -- Do away with ambiguous level values (as suggested by PEP 328) in - importlib.__import__() by raising ValueError when level < 0. - -- Issue #2489: pty.spawn could consume 100% cpu when it encountered an EOF. - -- Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). - -- Issue #13777: Add PF_SYSTEM sockets on OS X. - Patch by Michael Goderbauer. - -- Issue #13015: Fix a possible reference leak in defaultdict.__repr__. - Patch by Suman Saha. - -- Issue #1326113: distutils' and packaging's build_ext commands option now - correctly parses multiple values (separated by whitespace or commas) given - to their --libraries option. - -- Issue #10287: nntplib now queries the server's CAPABILITIES first before - sending MODE READER, and only sends it if not already in READER mode. - Patch by Hynek Schlawack. - -- Issue #13993: HTMLParser is now able to handle broken end tags when - strict=False. - -- Issue #13930: lib2to3 now supports writing converted output files to another - directory tree as well as copying unchanged files and altering the file - suffix. - -- Issue #9750: Fix sqlite3.Connection.iterdump on tables and fields - with a name that is a keyword or contains quotes. Patch by Marko - Kohtala. - -- Issue #10287: nntplib now queries the server's CAPABILITIES again after - authenticating (since the result may change, according to RFC 4643). - Patch by Hynek Schlawack. - -- Issue #13989: Document that GzipFile does not support text mode, and give a - more helpful error message when opened with an invalid mode string. - -- Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building - Distutils-based packages with C extension modules may fail because - Apple has removed gcc-4.2, the version used to build python.org - 64-bit/32-bit Pythons. If the user does not explicitly override - the default C compiler by setting the CC environment variable, - Distutils will now attempt to compile extension modules with clang - if gcc-4.2 is required but not found. Also as a convenience, if - the user does explicitly set CC, substitute its value as the default - compiler in the Distutils LDSHARED configuration variable for OS X. - (Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u - SDK, neither of which are available in Xcode 4. This change does not - attempt to override settings to support their use with Xcode 4.) - -- Issue #13960: HTMLParser is now able to handle broken comments when - strict=False. - -- Issue #13921: Undocument and clean up sqlite3.OptimizedUnicode, - which is obsolete in Python 3.x. It's now aliased to str for - backwards compatibility. - -- When '' is a path (e.g. in sys.path), make sure __file__ uses the current - working directory instead of '' in importlib. - -- Issue #13609: Add two functions to query the terminal size: - os.get_terminal_size (low level) and shutil.get_terminal_size (high level). - Patch by Zbigniew J?drzejewski-Szmek. - -- Issue #13845: On Windows, time.time() now uses GetSystemTimeAsFileTime() - instead of ftime() to have a resolution of 100 ns instead of 1 ms (the clock - accuracy is between 0.5 ms and 15 ms). - -- Issue #13846: Add time.monotonic(), monotonic clock. - -- Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on - Connection sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to - make sure two listeners can't bind to the same socket/pipe (or any existing - socket/pipe). - -- Issue #9021: Add an introduction to the copy module documentation. - -- Issue #6005: Examples in the socket library documentation use sendall, where - relevant, instead send method. - -- Issue #10811: Fix recursive usage of cursors. Instead of crashing, - raise a ProgrammingError now. - -- Issue #10881: Fix test_site failure with OS X framework builds. - -- Issue #964437: Make IDLE help window non-modal. - Patch by Guilherme Polo and Roger Serwy. - -- Issue #13734: Add os.fwalk(), a directory walking function yielding file - descriptors. - -- Issue #2945: Make the distutils upload command aware of bdist_rpm products. - -- Issue #13712: pysetup create should not convert package_data to extra_files. - -- Issue #11805: package_data in setup.cfg should allow more than one value. - -- Issue #13933: IDLE auto-complete did not work with some imported - module, like hashlib. (Patch by Roger Serwy) - -- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared. - -- Issue #13676: Handle strings with embedded zeros correctly in sqlite3. - -- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. - Original patches by Marco Scataglini and Roger Serwy. - -- Issue #8828: Add new function os.replace(), for cross-platform renaming - with overwriting. - -- Issue #13848: open() and the FileIO constructor now check for NUL - characters in the file name. Patch by Hynek Schlawack. - -- Issue #13806: The size check in audioop decompression functions was too - strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. - -- Issue #13812: When a multiprocessing Process child raises an exception, - flush stderr after printing the exception traceback. - -- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC - IV attack countermeasure. - -- Issue #13847: time.localtime() and time.gmtime() now raise an OSError instead - of ValueError on failure. time.ctime() and time.asctime() now raises an - OSError if localtime() failed. time.clock() now raises a RuntimeError if the - processor time used is not available or its value cannot be represented - -- Issue #13862: Fix spurious failure in test_zlib due to runtime/compile time - minor versions not matching. - -- Issue #12804: Fix test_socket and test_urllib2net failures when running tests - on a system without internet access. - -- Issue #13772: In os.symlink() under Windows, do not try to guess the link - target's type (file or directory). The detection was buggy and made the - call non-atomic (therefore prone to race conditions). - -- Issue #6631: Disallow relative file paths in urllib urlopen methods. - -- Issue #13722: Avoid silencing ImportErrors when initializing the codecs - registry. - -- Issue #13781: Fix GzipFile bug that caused an exception to be raised when - opening for writing using a fileobj returned by os.fdopen(). - -- Issue #13803: Under Solaris, distutils doesn't include bitness - in the directory name. - -- Issue #10278: Add time.wallclock() function, monotonic clock. - -- Issue #13809: Fix regression where bz2 module wouldn't work when threads are - disabled. Original patch by Amaury Forgeot d'Arc. - -- Issue #13589: Fix some serialization primitives in the aifc module. - Patch by Oleg Plakhotnyuk. - -- Issue #13642: Unquote before b64encoding user:password during Basic - Authentication. Patch contributed by Joonas Kuorilehto. - -- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow - tests. - -- Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. - The hang would occur when retrieving the result of a scheduled future after - the executor had been shut down. - -- Issue #13502: threading: Fix a race condition in Event.wait() that made it - return False when the event was set and cleared right after. - -- Issue #9993: When the source and destination are on different filesystems, - and the source is a symlink, shutil.move() now recreates a symlink on the - destination instead of copying the file contents. Patch by Jonathan Niehof - and Hynek Schlawack. - -- Issue #12926: Fix a bug in tarfile's link extraction. - -- Issue #13696: Fix the 302 Relative URL Redirection problem. - -- Issue #13636: Weak ciphers are now disabled by default in the ssl module - (except when SSLv2 is explicitly asked for). - -- Issue #12715: Add an optional symlinks argument to shutil functions - (copyfile, copymode, copystat, copy, copy2). When that parameter is - true, symlinks aren't dereferenced and the operation instead acts on the - symlink itself (or creates one, if relevant). Patch by Hynek Schlawack. - -- Add a flags parameter to select.epoll. - -- Issue #12798: Updated the mimetypes documentation. - -- Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the - SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. - -- Issue #11006: Don't issue low level warning in subprocess when pipe2() fails. - -- Issue #13620: Support for Chrome browser in webbrowser. Patch contributed - by Arnaud Calmettes. - -- Issue #11829: Fix code execution holes in inspect.getattr_static for - metaclasses with metaclasses. Patch by Andreas St?hrk. - -- Issue #12708: Add starmap() and starmap_async() methods (similar to - itertools.starmap()) to multiprocessing.Pool. Patch by Hynek Schlawack. - -- Issue #1785: Fix inspect and pydoc with misbehaving descriptors. - -- Issue #13637: "a2b" functions in the binascii module now accept ASCII-only - unicode strings. - -- Issue #13634: Add support for querying and disabling SSL compression. - -- Issue #13627: Add support for SSL Elliptic Curve-based Diffie-Hellman - key exchange, through the SSLContext.set_ecdh_curve() method and the - ssl.OP_SINGLE_ECDH_USE option. - -- Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers - choose the cipher based on their own preferences, rather than on the - client's. - -- Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas - St?hrk. - -- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by - C?dric Krier. - -- Issue #11870: threading: Properly reinitialize threads internal locks and - condition variables to avoid deadlocks in child processes. - -- Issue #8035: urllib: Fix a bug where the client could remain stuck after a - redirection or an error. - -- Issue #13560: os.strerror() now uses the current locale encoding instead of - UTF-8. - -- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() - and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to - the current locale encoding. - -- Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem - encoding and the surrogateescape error handler, rather than UTF-8. Patch - by David Watson. - -- Issue #10350: Read and save errno before calling a function which might - overwrite it. Original patch by Hallvard B Furuseth. - -- Issue #11610: Introduce a more general way to declare abstract properties. - -- Issue #13591: A bug in importlib has been fixed that caused import_module - to load a module twice. - -- Issue #4625: If IDLE cannot write to its recent file or breakpoint files, - display a message popup and continue rather than crash. Original patch by - Roger Serwy. - -- Issue #13449 sched.scheduler.run() method has a new "blocking" parameter which - when set to False makes run() execute the scheduled events due to expire - soonest (if any) and then return. Patch by Giampaolo Rodol?. - -- Issue #8684 sched.scheduler class can be safely used in multi-threaded - environments. Patch by Josiah Carlson and Giampaolo Rodol?. - -- Alias resource.error to OSError ala PEP 3151. - -- Issue #5689: Add support for lzma compression to the tarfile module. - -- Issue #13248: Turn 3.2's PendingDeprecationWarning into 3.3's - DeprecationWarning. It covers 'cgi.escape', 'importlib.abc.PyLoader', - 'importlib.abc.PyPycLoader', 'nntplib.NNTP.xgtitle', 'nntplib.NNTP.xpath', - and private attributes of 'smtpd.SMTPChannel'. - -- Issue #5905, #13560: time.strftime() is now using the current locale - encoding, instead of UTF-8, if the wcsftime() function is not available. - -- Issue #8641: Update IDLE 3 syntax coloring to recognize b".." and not u"..". - Patch by Tal Einat. - -- Issue #13464: Add a readinto() method to http.client.HTTPResponse. Patch - by Jon Kuhn. - -- tarfile.py: Correctly detect bzip2 compressed streams with blocksizes - other than 900k. - -- Issue #13439: Fix many errors in turtle docstrings. - -- Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm. - Thanks to Per ?yvind Karlsen for the initial implementation. - -- Issue #13487: Make inspect.getmodule robust against changes done to - sys.modules while it is iterating over it. - -- Issue #12618: Fix a bug that prevented py_compile from creating byte - compiled files in the current directory. Initial patch by Sjoerd de Vries. - -- Issue #13444: When stdout has been closed explicitly, we should not attempt - to flush it at shutdown and print an error. - -- Issue #12567: The curses module uses Unicode functions for Unicode arguments - when it is linked to the ncurses library. It encodes also Unicode strings to - the locale encoding instead of UTF-8. - -- Issue #12856: Ensure child processes do not inherit the parent's random - seed for filename generation in the tempfile module. Patch by Brian - Harring. - -- Issue #9957: SpooledTemporaryFile.truncate() now accepts an optional size - parameter, as other file-like objects. Patch by Ryan Kelly. - -- Issue #13458: Fix a memory leak in the ssl module when decoding a - certificate with a subjectAltName. Patch by Robert Xiao. - -- Issue #13415: os.unsetenv() doesn't ignore errors anymore. - -- Issue #13245: sched.scheduler class constructor's timefunc and - delayfunct parameters are now optional. - scheduler.enter and scheduler.enterabs methods gained a new kwargs parameter. - Patch contributed by Chris Clark. - -- Issue #12328: Under Windows, refactor handling of Ctrl-C events and - make _multiprocessing.win32.WaitForMultipleObjects interruptible when - the wait_flag parameter is false. Patch by sbt. - -- Issue #13322: Fix BufferedWriter.write() to ensure that BlockingIOError is - raised when the wrapped raw file is non-blocking and the write would block. - Previous code assumed that the raw write() would raise BlockingIOError, but - RawIOBase.write() is defined to returned None when the call would block. - Patch by sbt. - -- Issue #13358: HTMLParser now calls handle_data only once for each CDATA. - -- Issue #4147: minidom's toprettyxml no longer adds whitespace around a text - node when it is the only child of an element. Initial patch by Dan - Kenigsberg. - -- Issue #13374: The Windows bytes API has been deprecated in the os module. Use - Unicode filenames instead of bytes filenames to not depend on the ANSI code - page anymore and to support any filename. - -- Issue #13297: Use bytes type to send and receive binary data through XMLRPC. - -- Issue #6397: Support "/dev/poll" polling objects in select module, - under Solaris & derivatives. - -- Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly - handles non-valid attributes, including adjacent and unquoted attributes. - -- Issue #13193: Fix distutils.filelist.FileList and packaging.manifest.Manifest - under Windows. - -- Issue #13384: Remove unnecessary __future__ import in Lib/random.py - -- Issue #13149: Speed up append-only StringIO objects. - -- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely - when called with a timeout. Patch by Arnaud Ysmal. - -- Issue #13254: Fix Maildir initialization so that maildir contents - are read correctly. - -- Issue #3067: locale.setlocale() now raises TypeError if the second - argument is an invalid iterable. Its documentation and docstring - were also updated. Initial patch by Jyrki Pulliainen. - -- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. - -- Issue #13339: Fix compile error in posixmodule.c due to missing semicolon. - Thanks to Robert Xiao. - -- Byte compilation in packaging is now isolated from the calling Python -B or - -O options, instead of being disallowed under -B or buggy under -O. - -- Issue #10570: curses.putp() and curses.tparm() are now expecting a byte - string, instead of a Unicode string. - -- Issue #13295: http.server now produces valid HTML 4.01 strict. - -- Issue #2892: preserve iterparse events in case of SyntaxError. - -- Issue #13287: urllib.request and urllib.error now contains an __all__ - attribute to expose only relevant classes and functions. Patch by Florent - Xicluna. - -- Issue #670664: Fix HTMLParser to correctly handle the content of - ```` and ````. - -- Issue #10817: Fix urlretrieve function to raise ContentTooShortError even - when reporthook is None. Patch by Jyrki Pulliainen. - -- Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart. - (Patch by Roger Serwy) - -- Fix the xmlrpc.client user agent to return something similar to - urllib.request user agent: "Python-xmlrpc/3.3". - -- Issue #13293: Better error message when trying to marshal bytes using - xmlrpc.client. - -- Issue #13291: NameError in xmlrpc package. - -- Issue #13258: Use callable() built-in in the standard library. - -- Issue #13273: fix a bug that prevented HTMLParser to properly detect some - tags when strict=False. - -- Issue #11183: Add finer-grained exceptions to the ssl module, so that - you don't have to inspect the exception's attributes in the common case. - -- Issue #13216: Add cp65001 codec, the Windows UTF-8 (CP_UTF8). - -- Issue #13226: Add RTLD_xxx constants to the os module. These constants can be - used with sys.setdlopenflags(). - -- Issue #10278: Add clock_getres(), clock_gettime() and CLOCK_xxx constants to - the time module. time.clock_gettime(time.CLOCK_MONOTONIC) provides a - monotonic clock - -- Issue #10332: multiprocessing: fix a race condition when a Pool is closed - before all tasks have completed. - -- Issue #13255: wrong docstrings in array module. - -- Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. - -- Issue #13235: Added PendingDeprecationWarning to warn() method and function. - -- Issue #9168: now smtpd is able to bind privileged port. - -- Issue #12529: fix cgi.parse_header issue on strings with double-quotes and - semicolons together. Patch by Ben Darnell and Petri Lehtinen. - -- Issue #13227: functools.lru_cache() now has a option to distinguish - calls with different argument types. - -- Issue #6090: zipfile raises a ValueError when a document with a timestamp - earlier than 1980 is provided. Patch contributed by Petri Lehtinen. - -- Issue #13150: sysconfig no longer parses the Makefile and config.h files - when imported, instead doing it at build time. This makes importing - sysconfig faster and reduces Python startup time by 20%. - -- Issue #12448: smtplib now flushes stdout while running ``python -m smtplib`` - in order to display the prompt correctly. - -- Issue #12454: The mailbox module is now using ASCII, instead of the locale - encoding, to read and write MH mailboxes (.mh_sequences files). - -- Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are - now available on Windows. - -- issue #1673007: urllib2 to support HEAD request via new method argument. - Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. - -- Issue #12386: packaging does not fail anymore when writing the RESOURCES - file. - -- Issue #13158: Fix decoding and encoding of GNU tar specific base-256 number - fields in tarfile. - -- Issue #13025: mimetypes is now reading MIME types using the UTF-8 encoding, - instead of the locale encoding. - -- Issue #10653: On Windows, use strftime() instead of wcsftime() because - wcsftime() doesn't format time zone correctly. - -- Issue #13150: The tokenize module doesn't compile large regular expressions - at startup anymore. - -- Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was - configured with different prefix and exec-prefix. - -- Issue #11254: Teach distutils and packaging to compile .pyc and .pyo files in - PEP 3147-compliant __pycache__ directories. - -- Issue #7367: Fix pkgutil.walk_paths to skip directories whose - contents cannot be read. - -- Issue #3163: The struct module gets new format characters 'n' and 'N' - supporting C integer types ``ssize_t`` and ``size_t``, respectively. - -- Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. - Reported and diagnosed by Thomas Kluyver. - -- Issue #13087: BufferedReader.seek() now always raises UnsupportedOperation - if the underlying raw stream is unseekable, even if the seek could be - satisfied using the internal buffer. Patch by John O'Connor. - -- Issue #7689: Allow pickling of dynamically created classes when their - metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig - Citro. - -- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes. - -- Issue #13034: When decoding some SSL certificates, the subjectAltName - extension could be unreported. - -- Issue #9871: Prevent IDLE 3 crash when given byte stings - with invalid hex escape sequences, like b'\x0'. - (Original patch by Claudiu Popa.) - -- Issue #12306: Expose the runtime version of the zlib C library as a constant, - ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff. - -- Issue #12959: Add collections.ChainMap to collections.__all__. - -- Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will - now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or - Download-URL field is present. - -- Issue #12567: Add curses.unget_wch() function. Push a character so the next - get_wch() will return it. - -- Issue #9561: distutils and packaging now writes egg-info files using UTF-8, - instead of the locale encoding. - -- Issue #8286: The distutils command sdist will print a warning message instead - of crashing when an invalid path is given in the manifest template. - -- Issue #12841: tarfile unnecessarily checked the existence of numerical user - and group ids on extraction. If one of them did not exist the respective id - of the current user (i.e. root) was used for the file and ownership - information was lost. - -- Issue #12888: Fix a bug in HTMLParser.unescape that prevented it to escape - more than 128 entities. Patch by Peter Otten. - -- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses. - -- Issue #12636: IDLE reads the coding cookie when executing a Python script. - -- Issue #12494: On error, call(), check_call(), check_output() and - getstatusoutput() functions of the subprocess module now kill the process, - read its status (to avoid zombis) and close pipes. - -- Issue #12720: Expose low-level Linux extended file attribute functions in os. - -- Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi - now respect a --skip-build option given to bdist. The packaging commands - were fixed too. - -- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in - the C pickle implementation. - -- Issue #11564: Avoid crashes when trying to pickle huge objects or containers - (more than 2**31 items). Instead, in most cases, an OverflowError is raised. - -- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is - greater than FD_SETSIZE. - -- Issue #12839: Fix crash in zlib module due to version mismatch. - Fix by Richard M. Tew. - -- Issue #9923: The mailcap module now correctly uses the platform path - separator for the MAILCAP environment variable on non-POSIX platforms. - -- Issue #12835: Follow up to #6560 that unconditionally prevents use of the - unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David - Watson. - -- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument - to be used if the private key is encrypted. Patch by Adam Simpkins. - -- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing - Pipe. - -- Issue #12811: tabnanny.check() now promptly closes checked files. Patch by - Anthony Briggs. - -- Issue #6560: The sendmsg/recvmsg API is now exposed by the socket module - when provided by the underlying platform, supporting processing of - ancillary data in pure Python code. Patch by David Watson and Heiko Wundram. - -- Issue #12326: On Linux, sys.platform doesn't contain the major version - anymore. It is now always 'linux', instead of 'linux2' or 'linux3' depending - on the Linux version used to build Python. - -- Issue #12213: Fix a buffering bug with interleaved reads and writes that - could appear on BufferedRandom streams. - -- Issue #12778: Reduce memory consumption when JSON-encoding a large - container of many small objects. - -- Issue #12650: Fix a race condition where a subprocess.Popen could leak - resources (FD/zombie) when killed at the wrong time. - -- Issue #12744: Fix inefficient representation of integers between 2**31 and - 2**63 on systems with a 64-bit C "long". - -- Issue #12646: Add an 'eof' attribute to zlib.Decompress, to make it easier to - detect truncated input streams. - -- Issue #11513: Fix exception handling ``tarfile.TarFile.gzopen()`` when - the file cannot be opened. - -- Issue #12687: Fix a possible buffering bug when unpickling text mode - (protocol 0, mostly) pickles. - -- Issue #10087: Fix the html output format of the calendar module. - -- Issue #12540: Prevent zombie IDLE processes on Windows due to changes - in os.kill(). - -- Add support for unary plus and unary minus to collections.Counter(). - Issue #13121: Also add support for inplace math operators. - -- Issue #12683: urlparse updated to include svn as schemes that uses relative - paths. (svn from 1.5 onwards support relative path). - -- Issue #12655: Expose functions from sched.h in the os module: sched_yield(), - sched_setscheduler(), sched_getscheduler(), sched_setparam(), - sched_get_min_priority(), sched_get_max_priority(), sched_rr_get_interval(), - sched_getaffinity(), sched_setaffinity(). - -- Add ThreadError to threading.__all__. - -- Issues #11104, #8688: Fix the behavior of distutils' sdist command with - manually-maintained MANIFEST files. - -- Issue #11281: smtplib.STMP gets source_address parameter, which adds the - ability to bind to specific source address on a machine with multiple - interfaces. Patch by Paulo Scardine. - -- Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow - symlinks: fix it. Patch by Petri Lehtinen. - -- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') - in Python code) now finds the doc of the method. - -- Issue #10968: Remove indirection in threading. The public names (Thread, - Condition, etc.) used to be factory functions returning instances of hidden - classes (_Thread, _Condition, etc.), because (if Guido recalls correctly) this - code pre-dates the ability to subclass extension types. It is now possible to - inherit from Thread and other classes, without having to import the private - underscored names like multiprocessing did. - -- Issue #9723: Add shlex.quote functions, to escape filenames and command - lines. - -- Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. - -- Issue #12514: Use try/finally to assure the timeit module restores garbage - collections when it is done. - -- Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is - given as a low fd, it gets overwritten. - -- Issue #12590: IDLE editor window now always displays the first line - when opening a long file. With Tk 8.5, the first line was hidden. - -- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates) - Connection:close header. - -- Issue #12102: Document that buffered files must be flushed before being used - with mmap. Patch by Steffen Daode Nurpmeso. - -- Issue #12560: Build libpython.so on OpenBSD. Patch by Stefan Sperling. - -- Issue #1813: Fix codec lookup under Turkish locales. - -- Issue #12591: Improve support of "universal newlines" in the subprocess - module: the piped streams can now be properly read from or written to. - -- Issue #12591: Allow io.TextIOWrapper to work with raw IO objects (without - a read1() method), and add a *write_through* parameter to mandate - unbuffered writes. - -- Issue #10883: Fix socket leaks in urllib.request when using FTP. - -- Issue #12592: Make Python build on OpenBSD 5 (and future major releases). - -- Issue #12372: POSIX semaphores are broken on AIX: don't use them. - -- Issue #12551: Provide a get_channel_binding() method on SSL sockets so as - to get channel binding data for the current SSL session (only the - "tls-unique" channel binding is implemented). This allows the implementation - of certain authentication mechanisms such as SCRAM-SHA-1-PLUS. Patch by - Jacek Konieczny. - -- Issue #665194: email.utils now has format_datetime and parsedate_to_datetime - functions, allowing for round tripping of RFC2822 format dates. - -- Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2 - directory, so that "import DLFCN" and other similar imports work on - Linux 3.0. - -- Issue #7484: smtplib no longer puts <> around addresses in VRFY and EXPN - commands; they aren't required and in fact postfix doesn't support that form. - -- Issue #12273: Remove ast.__version__. AST changes can be accounted for by - checking sys.version_info or sys._mercurial. - -- Silence spurious "broken pipe" tracebacks when shutting down a - ProcessPoolExecutor. - -- Fix potential resource leaks in concurrent.futures.ProcessPoolExecutor - by joining all queues and processes when shutdown() is called. - -- Issue #11603: Fix a crash when __str__ is rebound as __repr__. Patch by - Andreas St?hrk. - -- Issue #11321: Fix a crash with multiple imports of the _pickle module when - embedding Python. Patch by Andreas St?hrk. - -- Issue #6755: Add get_wch() method to curses.window class. Patch by I?igo - Serna. - -- Add cgi.closelog() function to close the log file. - -- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets. - -- Issue #4376: ctypes now supports nested structures in a endian different than - the parent structure. Patch by Vlad Riscutia. - -- Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a - TextIOWrapper to a huge value, not TypeError. - -- Issue #12504: Close file handles in a timely manner in packaging.database. - This fixes a bug with the remove (uninstall) feature on Windows. - -- Issues #12169 and #10510: Factor out code used by various packaging commands - to make HTTP POST requests, and make sure it uses CRLF. - -- Issue #12016: Multibyte CJK decoders now resynchronize faster. They only - ignore the first byte of an invalid byte sequence. For example, - b'\xff\n'.decode('gb2312', 'replace') gives '\ufffd\n' instead of '\ufffd'. - -- Issue #12459: time.sleep() now raises a ValueError if the sleep length is - negative, instead of an infinite sleep on Windows or raising an IOError on - Linux for example, to have the same behaviour on all platforms. - -- Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support - Python scripts using a encoding different than UTF-8 (read the coding cookie - of the script). - -- Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors - if the process has only one pipe. - -- Issue #12467: warnings: fix a race condition if a warning is emitted at - shutdown, if globals()['__file__'] is None. - -- Issue #12451: pydoc: importfile() now opens the Python script in binary mode, - instead of text mode using the locale encoding, to avoid encoding issues. - -- Issue #12451: runpy: run_path() now opens the Python script in binary mode, - instead of text mode using the locale encoding, to support other encodings - than UTF-8 (scripts using the coding cookie). - -- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead - of the text mode (using the locale encoding) to avoid encoding issues. - -- Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better - conformance to the RFCs: correctly handle Sender and Resent- headers. - -- Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by - the garbage collector while the Heap lock is held. - -- Issue #12462: time.sleep() now calls immediatly the (Python) signal handler - if it is interrupted by a signal, instead of having to wait until the next - instruction. - -- Issue #12442: new shutil.disk_usage function, providing total, used and free - disk space statistics. - -- Issue #12451: The XInclude default loader of xml.etree now decodes files from - UTF-8 instead of the locale encoding if the encoding is not specified. It now - also opens XML files for the parser in binary mode instead of the text mode - to avoid encoding issues. - -- Issue #12451: doctest.debug_script() doesn't create a temporary file - anymore to avoid encoding issues. - -- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, - to read the Python script from the right encoding. - -- Issue #12451: distutils now opens the setup script in binary mode to read the - encoding cookie, instead of opening it in UTF-8. - -- Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to - check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the - interpreter process. This could cause failures in non-Distutils subprocesses - and was unreliable since tests or user programs could modify the interpreter - environment after Distutils set it. Instead, have Distutils set the the - deployment target only in the environment of each build subprocess. It is - still possible to globally override the default by setting - MACOSX_DEPLOYMENT_TARGET before launching the interpreter; its value must be - greater or equal to the default value, the value with which the interpreter - was built. Also, implement the same handling in packaging. - -- Issue #12422: In the copy module, don't store objects that are their own copy - in the memo dict. - -- Issue #12303: Add sigwaitinfo() and sigtimedwait() to the signal module. - -- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira - Kitada. - -- Issue #1874: email now detects and reports as a defect the presence of - any CTE other than 7bit, 8bit, or binary on a multipart. - -- Issue #12383: Fix subprocess module with env={}: don't copy the environment - variables, start with an empty environment. - -- Issue #11637: Fix support for importing packaging setup hooks from the - project directory. - -- Issue #6771: Moved the curses.wrapper function from the single-function - wrapper module into __init__, eliminating the module. Since __init__ was - already importing the function to curses.wrapper, there is no API change. - -- Issue #11584: email.header.decode_header no longer fails if the header - passed to it is a Header object, and Header/make_header no longer fail - if given binary unknown-8bit input. - -- Issue #11700: mailbox proxy object close methods can now be called multiple - times without error. - -- Issue #11767: Correct file descriptor leak in mailbox's __getitem__ method. - -- Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP - connection if its getresponse() method fails with a socket error. Patch - written by Ezio Melotti. - -- Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files. - Original patch by Erik Bray. - -- Issue #9284: Allow inspect.findsource() to find the source of doctest - functions. - -- Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a - compatibility helper for the distutils-packaging transition. Original patch - by Erik Bray. - -- Issue #12287: In ossaudiodev, check that the device isn't closed in several - methods. - -- Issue #12009: Fixed regression in netrc file comment handling. - -- Issue #12246: Warn and fail when trying to install a third-party project from - an uninstalled Python (built in a source checkout). Original patch by - Tshepang Lekhonkhobe. - -- Issue #10694: zipfile now ignores garbage at the end of a zipfile. - -- Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA. - -- Issue #10424: Argparse now includes the names of the missing required - arguments in the missing arguments error message. - -- Issue #12168: SysLogHandler now allows NUL termination to be controlled using - a new 'append_nul' attribute on the handler. - -- Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes - instead of os.stat. - -- Issue #12021: Make mmap's read() method argument optional. Patch by Petri - Lehtinen. - -- Issue #9205: concurrent.futures.ProcessPoolExecutor now detects killed - children and raises BrokenProcessPool in such a situation. Previously it - would reliably freeze/deadlock. - -- Issue #12040: Expose a new attribute ``sentinel`` on instances of - ``multiprocessing.Process``. Also, fix Process.join() to not use polling - anymore, when given a timeout. - -- Issue #11893: Remove obsolete internal wrapper class ``SSLFakeFile`` in the - smtplib module. Patch by Catalin Iacob. - -- Issue #12080: Fix a Decimal.power() case that took an unreasonably long time - to compute. - -- Issue #12221: Remove __version__ attributes from pyexpat, pickle, tarfile, - pydoc, tkinter, and xml.parsers.expat. This were useless version constants - left over from the Mercurial transition - -- Named tuples now work correctly with vars(). - -- Issue #12085: Fix an attribute error in subprocess.Popen destructor if the - constructor has failed, e.g. because of an undeclared keyword argument. Patch - written by Oleg Oshmyan. - -- Issue #12028: Make threading._get_ident() public, rename it to - threading.get_ident() and document it. This function was already used using - _thread.get_ident(). - -- Issue #12171: IncrementalEncoder.reset() of CJK codecs (multibytecodec) calls - encreset() instead of decreset(). - -- Issue #12218: Removed wsgiref.egg-info. - -- Issue #12196: Add pipe2() to the os module. - -- Issue #985064: Make plistlib more resilient to faulty input plists. - Patch by Mher Movsisyan. - -- Issue #1625: BZ2File and bz2.decompress() now support multi-stream files. - Initial patch by Nir Aides. - -- Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available. - -- Issue #12175: FileIO.readall() now only reads the file position and size - once. - -- Issue #12175: RawIOBase.readall() now returns None if read() returns None. - -- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError - if the file is closed. - -- Issue #11109: New service_action method for BaseServer, used by ForkingMixin - class for cleanup. Initial Patch by Justin Wark. - -- Issue #12045: Avoid duplicate execution of command in - ctypes.util._get_soname(). Patch by Sijin Joseph. - -- Issue #10818: Remove the Tk GUI and the serve() function of the pydoc module, - pydoc -g has been deprecated in Python 3.2 and it has a new enhanced web - server. - -- Issue #1441530: In imaplib, read the data in one chunk to speed up large - reads and simplify code. - -- Issue #12070: Fix the Makefile parser of the sysconfig module to handle - correctly references to "bogus variable" (e.g. "prefix=$/opt/python"). - -- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to - their encode() method anymore, but continue to call the reset() method if the - final argument is True. - -- Issue #12049: Add RAND_bytes() and RAND_pseudo_bytes() functions to the ssl - module. - -- Issue #6501: os.device_encoding() returns None on Windows if the application - has no console. - -- Issue #12105: Add O_CLOEXEC to the os module. - -- Issue #12079: Decimal('Infinity').fma(Decimal('0'), (3.91224318126786e+19+0j)) - now raises TypeError (reflecting the invalid type of the 3rd argument) rather - than Decimal.InvalidOperation. - -- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore - to be able to unload the module. - -- Add the packaging module, an improved fork of distutils (also known as - distutils2). - -- Issue #12065: connect_ex() on an SSL socket now returns the original errno - when the socket's timeout expires (it used to return None). - -- Issue #8809: The SMTP_SSL constructor and SMTP.starttls() now support - passing a ``context`` argument pointing to an ssl.SSLContext instance. - Patch by Kasun Herath. - -- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX - with Tk 8.5. - -- Issue #9516: Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET - is set in shell. - -- Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and - their incremental counterparts now raise OverflowError if given an input - larger than 4GB, instead of silently truncating the input and returning - an incorrect result. - -- Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail - attribute when called without a max_length argument. - -- Issue #12062: Fix a flushing bug when doing a certain type of I/O sequence - on a file opened in read+write mode (namely: reading, seeking a bit forward, - writing, then seeking before the previous write but still within buffered - data, and writing again). - -- Issue #9971: Write an optimized implementation of BufferedReader.readinto(). - Patch by John O'Connor. - -- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError. - With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused - IDLE to exit. Converted to valid Unicode null in PythonCmd(). - -- Issue #11799: urllib.request Authentication Handlers will raise a ValueError - when presented with an unsupported Authentication Scheme. Patch contributed - by Yuval Greenfield. - -- Issue #10419, #6011: build_scripts command of distutils handles correctly - non-ASCII path (path to the Python executable). Open and write the script in - binary mode, but ensure that the shebang is decodable from UTF-8 and from the - encoding of the script. - -- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in - order to accept exactly one connection. Patch by Daniel Evers. - -- Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, - instead of a RuntimeError: OSError has an errno attribute. - -- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which - manages the sending of headers to output stream and flushing the internal - headers buffer. Patch contribution by Andrew Schaaf - -- Issue #11743: Rewrite multiprocessing connection classes in pure Python. - -- Issue #11164: Stop trying to use _xmlplus in the xml module. - -- Issue #11888: Add log2 function to math module. Patch written by Mark - Dickinson. - -- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional. - -- Issue #8407: The signal handler writes the signal number as a single byte - instead of a nul byte into the wakeup file descriptor. So it is possible to - wait more than one signal and know which signals were raised. - -- Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to the - signal module. - -- Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch - by Kasun Herath. - -- Issue #12002: ftplib's abort() method raises TypeError. - -- Issue #11916: Add a number of MacOSX specific definitions to the errno module. - Patch by Pierre Carrier. - -- Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to - detect mtime changes by comparing to the system clock instead of to the - previous value of the mtime. - -- Issue #11072: added MLSD command (RFC-3659) support to ftplib. - -- Issue #8808: The IMAP4_SSL constructor now allows passing an SSLContext - parameter to control parameters of the secure channel. Patch by Sijin - Joseph. - -- ntpath.samefile failed to notice that "a.txt" and "A.TXT" refer to the same - file on Windows XP. As noticed in issue #10684. - -- Issue #12000: When a SSL certificate has a subjectAltName without any - dNSName entry, ssl.match_hostname() should use the subject's commonName. - Patch by Nicolas Bareil. - -- Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and - assertWarnsRegex now accept a keyword argument 'msg' when used as context - managers. Initial patch by Winston Ewert. - -- Issue #10684: shutil.move used to delete a folder on case insensitive - filesystems when the source and destination name where the same except - for the case. - -- Issue #11647: objects created using contextlib.contextmanager now support - more than one call to the function when used as a decorator. Initial patch - by Ysj Ray. - -- Issue #11930: Removed deprecated time.accept2dyear variable. - Removed year >= 1000 restriction from datetime.strftime. - -- logging: don't define QueueListener if Python has no thread support. - -- functools.cmp_to_key() now works with collections.Hashable(). - -- Issue #11277: mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X to get - around a mmap bug with sparse files. Patch written by Steffen Daode Nurpmeso. - -- Issue #8407: Add signal.pthread_sigmask() function to fetch and/or change the - signal mask of the calling thread. - -- Issue #11858: configparser.ExtendedInterpolation expected lower-case section - names. - -- Issue #11324: ConfigParser(interpolation=None) now works correctly. - -- Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch - by Charles-Fran?ois Natali. - -- Issue #11763: don't use difflib in TestCase.assertMultiLineEqual if the - strings are too long. - -- Issue #11236: getpass.getpass responds to ctrl-c or ctrl-z on terminal. - -- Issue #11856: Speed up parsing of JSON numbers. - -- Issue #11005: threading.RLock()._release_save() raises a RuntimeError if the - lock was not acquired. - -- Issue #11258: Speed up ctypes.util.find_library() under Linux by a factor - of 5 to 10. Initial patch by Jonas H. - -- Issue #11382: Trivial system calls, such as dup() or pipe(), needn't - release the GIL. Patch by Charles-Fran?ois Natali. - -- Issue #11223: Add threading._info() function providing informations about - the thread implementation. - -- Issue #11731: simplify/enhance email parser/generator API by introducing - policy objects. - -- Issue #11768: The signal handler of the signal module only calls - Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or - parallel calls. PyErr_SetInterrupt() writes also into the wake up file. - -- Issue #11492: fix several issues with header folding in the email package. - -- Issue #11852: Add missing imports and update tests. - -- Issue #11875: collections.OrderedDict's __reduce__ was temporarily - mutating the object instead of just working on a copy. - -- Issue #11467: Fix urlparse behavior when handling urls which contains scheme - specific part only digits. Patch by Santoso Wijaya. - -- collections.Counter().copy() now works correctly for subclasses. - -- Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. - Patch by Santoso Wijaya. - -- Issue #11684: complete email.parser bytes API by adding BytesHeaderParser. - -- The bz2 module now handles 4GiB+ input buffers correctly. - -- Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when - _json is not available. - -- Issue #11830: Remove unnecessary introspection code in the decimal module. - -- Issue #11703: urllib2.geturl() does not return correct url when the original - url contains #fragment. - -- Issue #10019: Fixed regression in json module where an indent of 0 stopped - adding newlines and acted instead like 'None'. - -- Issue #11186: pydoc ignores a module if its name contains a surrogate - character in the index of modules. - -- Issue #11815: Use a light-weight SimpleQueue for the result queue in - concurrent.futures.ProcessPoolExecutor. - -- Issue #5162: Treat services like frozen executables to allow child spawning - from multiprocessing.forking on Windows. - -- logging.basicConfig now supports an optional 'handlers' argument taking an - iterable of handlers to be added to the root logger. Additional parameter - checks were also added to basicConfig. - -- Issue #11814: Fix likely typo in multiprocessing.Pool._terminate(). - -- Issue #11747: Fix range formatting in difflib.context_diff() and - difflib.unified_diff(). - -- Issue #8428: Fix a race condition in multiprocessing.Pool when terminating - worker processes: new processes would be spawned while the pool is being - shut down. Patch by Charles-Fran?ois Natali. - -- Issue #2650: re.escape() no longer escapes the '_'. - -- Issue #11757: select.select() now raises ValueError when a negative timeout - is passed (previously, a select.error with EINVAL would be raised). Patch - by Charles-Fran?ois Natali. - -- Issue #7311: fix html.parser to accept non-ASCII attribute values. - -- Issue #11605: email.parser.BytesFeedParser was incorrectly converting - multipart subparts with an 8-bit CTE into unicode instead of preserving the - bytes. - -- Issue #1690608: email.util.formataddr is now RFC 2047 aware: it now has a - charset parameter that defaults to utf-8 and is used as the charset for RFC - 2047 encoding when the realname contains non-ASCII characters. - -- Issue #10963: Ensure that subprocess.communicate() never raises EPIPE. - -- Issue #10791: Implement missing method GzipFile.read1(), allowing GzipFile - to be wrapped in a TextIOWrapper. Patch by Nadeem Vawda. - -- Issue #11707: Added a fast C version of functools.cmp_to_key(). - Patch by Filip Gruszczy?ski. - -- Issue #11688: Add sqlite3.Connection.set_trace_callback(). Patch by - Torsten Landschoff. - -- Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve - private keys. - -- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept - file-like objects using a new ``fileobj`` constructor argument. Patch by - Nadeem Vawda. - -- unittest.TestCase.assertSameElements has been removed. - -- sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not - called yet: detect bootstrap (startup) issues earlier. - -- Issue #11393: Add the new faulthandler module. - -- Issue #11618: Fix the timeout logic in threading.Lock.acquire() under Windows. - -- Removed the 'strict' argument to email.parser.Parser, which has been - deprecated since Python 2.4. - -- Issue #11256: Fix inspect.getcallargs on functions that take only keyword - arguments. - -- Issue #11696: Fix ID generation in msilib. - -- itertools.accumulate now supports an optional *func* argument for - a user-supplied binary function. - -- Issue #11692: Remove unnecessary demo functions in subprocess module. - -- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when - trying to pack a negative (in-range) integer. - -- Issue #11675: multiprocessing.[Raw]Array objects created from an integer size - are now zeroed on creation. This matches the behaviour specified by the - documentation. - -- Issue #7639: Fix short file name generation in bdist_msi - -- Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459. - Patch by Ben Hayden. - -- Issue #11635: Don't use polling in worker threads and processes launched by - concurrent.futures. - -- Issue #6811: Allow importlib to change a code object's co_filename attribute - to match the path to where the source code currently is, not where the code - object originally came from. - -- Issue #8754: Have importlib use the repr of a module name in error messages. - -- Issue #11591: Prevent "import site" from modifying sys.path when python - was started with -S. - -- collections.namedtuple() now adds a _source attribute to the generated - class. This make the source more accessible than the outdated - "verbose" option which prints to stdout but doesn't make the source - string available. - -- Issue #11371: Mark getopt error messages as localizable. Patch by Filip - Gruszczy?ski. - -- Issue #11333: Add __slots__ to collections ABCs. - -- Issue #11628: cmp_to_key generated class should use __slots__. - -- Issue #11666: let help() display named tuple attributes and methods - that start with a leading underscore. - -- Issue #11662: Make urllib and urllib2 ignore redirections if the - scheme is not HTTP, HTTPS or FTP (CVE-2011-1521). - -- Issue #5537: Fix time2isoz() and time2netscape() functions of - httplib.cookiejar for expiration year greater than 2038 on 32-bit systems. - -- Issue #4391: Use proper gettext plural forms in optparse. - -- Issue #11127: Raise a TypeError when trying to pickle a socket object. - -- Issue #11563: Connection:close header is sent by requests using URLOpener - class which helps in closing of sockets after connection is over. Patch - contributions by Jeff McNeil and Nadeem Vawda. - -- Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates - unbuffered pipes, such that select() works properly on them. - -- Issue #5421: Fix misleading error message when one of socket.sendto()'s - arguments has the wrong type. Patch by Nikita Vetoshkin. - -- Issue #10812: Add some extra posix functions to the os module. - -- Issue #10979: unittest stdout buffering now works with class and module - setup and teardown. - -- Issue #11577: fix ResourceWarning triggered by improved binhex test coverage - -- Issue #11243: fix the parameter querying methods of Message to work if - the headers contain un-encoded non-ASCII data. - -- Issue #11401: fix handling of headers with no value; this fixes a regression - relative to Python2 and the result is now the same as it was in Python2. - -- Issue #9298: base64 bodies weren't being folded to line lengths less than 78, - which was a regression relative to Python2. Unlike Python2, the last line - of the folded body now ends with a carriage return. - -- Issue #11560: shutil.unpack_archive now correctly handles the format - parameter. Patch by Evan Dandrea. - -- Issue #5870: Add `subprocess.DEVNULL` constant. - -- Issue #11133: fix two cases where inspect.getattr_static can trigger code - execution. Patch by Andreas St?hrk. - -- Issue #11569: use absolute path to the sysctl command in multiprocessing to - ensure that it will be found regardless of the shell PATH. This ensures - that multiprocessing.cpu_count works on default installs of MacOSX. - -- Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is - not installed. Instead, the zipfile.ZIP_STORED compression is used to create - the ZipFile. Patch by Natalia B. Bidart. - -- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used - in a `with` statement. Contributed by Giampaolo Rodola. - -- Issue #11554: Fixed support for Japanese codecs; previously the body output - encoding was not done if euc-jp or shift-jis was specified as the charset. - -- Issue #11509: Significantly increase test coverage of fileinput. - Patch by Denver Coneybeare at PyCon 2011 Sprints. - -- Issue #11407: `TestCase.run` returns the result object used or created. - Contributed by Janathan Hartley. - -- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified - IP addresses in the proxy exception list. - -- Issue #11491: dbm.error is no longer raised when dbm.open is called with - the "n" as the flag argument and the file exists. The behavior matches - the documentation and general logic. - -- Issue #1162477: Postel Principle adjustment to email date parsing: handle the - fact that some non-compliant MUAs use '.' instead of ':' in time specs. - -- Issue #11131: Fix sign of zero in decimal.Decimal plus and minus - operations when the rounding mode is ROUND_FLOOR. - -- Issue #9935: Speed up pickling of instances of user-defined classes. - -- Issue #5622: Fix curses.wrapper to raise correct exception if curses - initialization fails. - -- Issue #11408: In threading.Lock.acquire(), only call gettimeofday() when - really necessary. Patch by Charles-Fran?ois Natali. - -- Issue #11391: Writing to a mmap object created with - ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a - TypeError. Patch by Charles-Fran?ois Natali. - -- Issue #9795: add context manager protocol support for nntplib.NNTP class. - -- Issue #11306: mailbox in certain cases adapts to an inability to open - certain files in read-write mode. Previously it detected this by - checking for EACCES, now it also checks for EROFS. - -- Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors - on accept(), send() and recv(). - -- Issue #11377: Deprecate platform.popen() and reimplement it with os.popen(). - -- Issue #8513: On UNIX, subprocess supports bytes command string. - -- Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. - -- Issue #11140: Lock.release() now raises a RuntimeError when attempting - to release an unacquired lock, as claimed in the threading documentation. - The _thread.error exception is now an alias of RuntimeError. Patch by - Filip Gruszczy?ski. Patch for _dummy_thread by Aymeric Augustin. - -- Issue #8594: ftplib now provides a source_address parameter to specify which - (address, port) to bind to before connecting. - -- Issue #11326: Add the missing connect_ex() implementation for SSL sockets, - and make it work for non-blocking connects. - -- Issue #11297: Add collections.ChainMap(). - -- Issue #10755: Add the posix.flistdir() function. Patch by Ross Lagerwall. - -- Issue #4761: Add the ``*at()`` family of functions (openat(), etc.) to the - posix module. Patch by Ross Lagerwall. - -- Issue #7322: Trying to read from a socket's file-like object after a timeout - occurred now raises an error instead of silently losing data. - -- Issue #11291: poplib.POP no longer suppresses errors on quit(). - -- Issue #11177: asyncore's create_socket() arguments can now be omitted. - -- Issue #6064: Add a ``daemon`` keyword argument to the threading.Thread - and multiprocessing.Process constructors in order to override the - default behaviour of inheriting the daemonic property from the current - thread/process. - -- Issue #10956: Buffered I/O classes retry reading or writing after a signal - has arrived and the handler returned successfully. - -- Issue #10784: New os.getpriority() and os.setpriority() functions. - -- Issue #11114: Fix catastrophic performance of tell() on text files (up - to 1000x faster in some cases). It is still one to two order of magnitudes - slower than binary tell(). - -- Issue #10882: Add os.sendfile function. - -- Issue #10868: Allow usage of the register method of an ABC as a class - decorator. - -- Issue #11224: Fixed a regression in tarfile that affected the file-like - objects returned by TarFile.extractfile() regarding performance, memory - consumption and failures with the stream interface. - -- Issue #10924: Adding salt and Modular Crypt Format to crypt library. - Moved old C wrapper to _crypt, and added a Python wrapper with - enhanced salt generation and simpler API for password generation. - -- Issue #11074: Make 'tokenize' so it can be reloaded. - -- Issue #11085: Moved collections abstract base classes into a separate - module called collections.abc, following the pattern used by importlib.abc. - For backwards compatibility, the names are imported into the collections - module. - -- Issue #4681: Allow mmap() to work on file sizes and offsets larger than - 4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for - 32-bit Windows. - -- Issue #11169: compileall module uses repr() to format filenames and paths to - escape surrogate characters and show spaces. - -- Issue #11089: Fix performance issue limiting the use of ConfigParser() - with large config files. - -- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers - larger than 4GB. Patch by Nadeem Vawda. - -- Issue #11388: Added a clear() method to MutableSequence - -- Issue #11174: Add argparse.MetavarTypeHelpFormatter, which uses type names - for the names of optional and positional arguments in help messages. - -- Issue #9348: Raise an early error if argparse nargs and metavar don't match. - -- Issue #8982: Improve the documentation for the argparse Namespace object. - -- Issue #9343: Document that argparse parent parsers must be configured before - their children. - -- Issue #9026: Fix order of argparse sub-commands in help messages. - -- Issue #9347: Fix formatting for tuples in argparse type= error messages. - -- Issue #12191: Added shutil.chown() to change user and/or group owner of a - given path also specifying their names. - -- Issue #13988: The _elementtree accelerator is used whenever available. - Now xml.etree.cElementTree becomes a deprecated alias to ElementTree. - -Build ------ - -- Issue #6807: Run msisupport.mak earlier. - -- Issue #10580: Minor grammar change in Windows installer. - -- Issue #13326: Clean __pycache__ directories correctly on OpenBSD. - -- PEP 393: the configure option --with-wide-unicode is removed. - -- Issue #12852: Set _XOPEN_SOURCE to 700, instead of 600, to get POSIX 2008 - functions on OpenBSD (e.g. fdopendir). - -- Issue #11863: Remove support for legacy systems deprecated in Python 3.2 - (following PEP 11). These systems are systems using Mach C Threads, - SunOS lightweight processes, GNU pth threads and IRIX threads. - -- Issue #8746: Correct faulty configure checks so that os.chflags() and - os.lchflags() are once again built on systems that support these - functions (BSD and OS X). Also add new stat file flags for OS X - (UF_HIDDEN and UF_COMPRESSED). - -- Issue #10645: Installing Python no longer creates a - Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory. - -- Do not accidentally include the directory containing sqlite.h twice when - building sqlite3. - -- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, - ensure "make install" creates symlinks in --prefix bin for the "-32" - files in the framework bin directory like the installer does. - -- Issue #11347: Use --no-as-needed when linking libpython3.so. - -- Issue #11411: Fix 'make DESTDIR=' with a relative destination. - -- Issue #11268: Prevent Mac OS X Installer failure if Documentation - package had previously been installed. - -- Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2. - - -IDLE ----- - -- Issue #11718: IDLE's open module dialog couldn't find the __init__.py - file in a package. - -Tools/Demos ------------ - -- Issue #14053: patchcheck.py ("make patchcheck") now works with MQ patches. - Patch by Francisco Mart?n Brugu?. - -- Issue #13930: 2to3 is now able to write its converted output files to another - directory tree as well as copying unchanged files and altering the file - suffix. See its new -o, -W and --add-suffix options. This makes it more - useful in many automated code translation workflows. - -- Issue #13628: python-gdb.py is now able to retrieve more frames in the Python - traceback if Python is optimized. - -- Issue #11996: libpython (gdb), replace "py-bt" command by "py-bt-full" and - add a smarter "py-bt" command printing a classic Python traceback. - -- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. - -- Issue #10639: reindent.py no longer converts newlines and will raise - an error if attempting to convert a file with mixed newlines. - "--newline" option added to specify new line character. - -Extension Modules ------------------ - -- Issue #13840: The error message produced by ctypes.create_string_buffer - when given a Unicode string has been fixed. - -- Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by - Vilmos Nebehaj. - -- Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. - -- Issue #13159: FileIO and BZ2Compressor/BZ2Decompressor now use a linear-time - buffer growth strategy instead of a quadratic-time one. - -- Issue #10141: socket: Add SocketCAN (PF_CAN) support. Initial patch by - Matthias Fuchs, updated by Tiago Gon?alves. - -- Issue #13070: Fix a crash when a TextIOWrapper caught in a reference cycle - would be finalized after the reference to its underlying BufferedRWPair's - writer got cleared by the GC. - -- Issue #12881: ctypes: Fix segfault with large structure field names. - -- Issue #13058: ossaudiodev: fix a file descriptor leak on error. Patch by - Thomas Jarosch. - -- Issue #13013: ctypes: Fix a reference leak in PyCArrayType_from_ctype. - Thanks to Suman Saha for finding the bug and providing a patch. - -- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that - file descriptor was actually received. - -- Issue #1172711: Add 'long long' support to the array module. - Initial patch by Oren Tirosh and Hirokazu Yamamoto. - -- Issue #12483: ctypes: Fix a crash when the destruction of a callback - object triggers the garbage collector. - -- Issue #12950: Fix passing file descriptors in multiprocessing, under - OpenIndiana/Illumos. - -- Issue #12764: Fix a crash in ctypes when the name of a Structure field is not - a string. - -- Issue #11241: subclasses of ctypes.Array can now be subclassed. - -- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to - some functions like file.write(). - -- Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper - signature. Without this, architectures where sizeof void* != sizeof int are - broken. Patch given by Hallvard B Furuseth. - -- Issue #12051: Fix segfault in json.dumps() while encoding highly-nested - objects using the C accelerations. - -- Issue #12017: Fix segfault in json.loads() while decoding highly-nested - objects using the C accelerations. - -- Issue #1838: Prevent segfault in ctypes, when _as_parameter_ on a class is set - to an instance of the class. - -Tests ------ - -- Issue #11689: Fix a variable scoping error in an sqlite3 test - -- Issue #13786: Remove unimplemented 'trace' long option from regrtest.py. - -- Issue #13725: Fix regrtest to recognize the documented -d flag. - Patch by Erno Tukia. - -- Issue #13304: Skip test case if user site-packages disabled (-s or - PYTHONNOUSERSITE). (Patch by Carl Meyer) - -- Issue #5661: Add a test for ECONNRESET/EPIPE handling to test_asyncore. Patch - by Xavier de Gaye. - -- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. - -- Re-enable lib2to3's test_parser.py tests, though with an expected failure - (see issue 13125). - -- Issue #12656: Add tests for IPv6 and Unix sockets to test_asyncore. - -- Issue #6484: Add unit tests for mailcap module (patch by Gregory Nofi) - -- Issue #11651: Improve the Makefile test targets to run more of the test suite - more quickly. The --multiprocess option is now enabled by default, reducing - the amount of time needed to run the tests. "make test" and "make quicktest" - now include some resource-intensive tests, but no longer run the test suite - twice to check for bugs in .pyc generation. Tools/scripts/run_test.py provides - an easy platform-independent way to run test suite with sensible defaults. - -- Issue #12331: The test suite for the packaging module can now run from an - installed Python. - -- Issue #12331: The test suite for lib2to3 can now run from an installed - Python. - -- Issue #12626: In regrtest, allow to filter tests using a glob filter - with the ``-m`` (or ``--match``) option. This works with all test cases - using the unittest module. This is useful with long test suites - such as test_io or test_subprocess. - -- Issue #12624: It is now possible to fail after the first failure when - running in verbose mode (``-v`` or ``-W``), by using the ``--failfast`` - (or ``-G``) option to regrtest. This is useful with long test suites - such as test_io or test_subprocess. - -- Issue #12587: Correct faulty test file and reference in test_tokenize. - (Patch by Robert Xiao) - -- Issue #12573: Add resource checks for dangling Thread and Process objects. - -- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64' - as the processor type on some Mac systems. - -- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary - failure in name resolution. - -- Issue #11812: Solve transient socket failure to connect to 'localhost' - in test_telnetlib.py. - -- Solved a potential deadlock in test_telnetlib.py. Related to issue #11812. - -- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and - an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder - Web site. - -- Avoid failing in test_urllibnet.test_bad_address when some overzealous - DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test - is now skipped instead. - -- Issue #12440: When testing whether some bits in SSLContext.options can be - reset, check the version of the OpenSSL headers Python was compiled against, - rather than the runtime version of the OpenSSL library. - -- Issue #11512: Add a test suite for the cgitb module. Patch by Robbie Clemons. - -- Issue #12497: Install test/data to prevent failures of the various codecmaps - tests. - -- Issue #12496: Install test/capath directory to prevent test_connect_capath - testcase failure in test_ssl. - -- Issue #12469: Run wakeup and pending signal tests in a subprocess to run the - test in a fresh process with only one thread and to not change signal - handling of the parent process. - -- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run - test_tk or test_ttk_guionly under a username that is not currently logged - in to the console windowserver (as may be the case under buildbot or ssh). - -- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. - -- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures - the output and displays it on failure instead. regrtest -v doesn't print the - error twice anymore if there is only one error. - -- Issue #12141: Install copies of template C module file so that - test_build_ext of test_distutils and test_command_build_ext of - test_packaging are no longer silently skipped when - run outside of a build directory. - -- Issue #8746: Add additional tests for os.chflags() and os.lchflags(). - Patch by Garrett Cooper. - -- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9 - 2.8 + on Mac OS X. (Patch by Ronald Oussoren) - -- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2, - iso2022_kr). - -- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch - written by Charles-Fran?ois Natali. - -- Issue #11614: import __hello__ prints "Hello World!". Patch written by - Andreas St?hrk. - -- Issue #5723: Improve json tests to be executed with and without accelerations. - -- Issue #12041: Make test_wait3 more robust. - -- Issue #11873: Change regex in test_compileall to fix occasional failures when - when the randomly generated temporary path happened to match the regex. - -- Issue #11958: Fix FTP tests for IPv6, bind to "::1" instead of "localhost". - Patch written by Charles-Francois Natali. - -- Issue #8407, #11859: Fix tests of test_io using threads and an alarm: use - pthread_sigmask() to ensure that the SIGALRM signal is received by the main - thread. - -- Issue #11811: Factor out detection of IPv6 support on the current host - and make it available as ``test.support.IPV6_ENABLED``. Patch by - Charles-Fran?ois Natali. - -- Issue #10914: Add a minimal embedding test to test_capi. - -- Issue #11223: Skip test_lock_acquire_interruption() and - test_rlock_acquire_interruption() of test_threadsignals if a thread lock is - implemented using a POSIX mutex and a POSIX condition variable. A POSIX - condition variable cannot be interrupted by a signal (e.g. on Linux, the - futex system call is restarted). - -- Issue #11790: Fix sporadic failures in test_multiprocessing.WithProcessesTestCondition. - -- Fix possible "file already exists" error when running the tests in parallel. - -- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows - platforms. Patch by Nadeem Vawda. - -- Issue #11727: Add a --timeout option to regrtest: if a test takes more than - TIMEOUT seconds, dumps the traceback of all threads and exits. - -- Issue #11653: fix -W with -j in regrtest. - -- The email test suite now lives in the Lib/test/test_email package. The test - harness code has also been modernized to allow use of new unittest features. - -- regrtest now discovers test packages as well as test modules. - -- Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov. - -- New test_crashers added to exercise the scripts in the Lib/test/crashers - directory and confirm they fail as expected - -- Issue #11578: added test for the timeit module. Patch by Michael Henry. - -- Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. - -- Issue #11505: improves test coverage of string.py, increases granularity of - string.Formatter tests. Initial patch by Alicia Arlen. - -- Issue #11548: Improve test coverage of the shutil module. Patch by - Evan Dandrea. - -- Issue #11554: Reactivated test_email_codecs. - -- Issue #11505: improves test coverage of string.py. Patch by Alicia - Arlen - -- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a - false positive if the last directory in the path is inaccessible. - -- Issue #11223: Fix test_threadsignals to fail, not hang, when the - non-semaphore implementation of locks is used under POSIX. - -- Issue #10911: Add tests on CGI with non-ASCII characters. Patch written by - Pierre Quentel. - -- Issue #9931: Fix hangs in GUI tests under Windows in certain conditions. - Patch by Hirokazu Yamamoto. - -- Issue #10512: Properly close sockets under test.test_cgi. - -- Issue #10992: Make tests pass under coverage. - -- Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due - to open door files. - -- Issue #10990: Prevent tests from clobbering a set trace function. - -C-API ------ - -- Add PyObject_GenericGetDict and PyObject_GeneriSetDict. They are generic - implementations for the getter and setter of a ``__dict__`` descriptor of C - types. - -- Issue #13727: Add 3 macros to access PyDateTime_Delta members: - PyDateTime_DELTA_GET_DAYS, PyDateTime_DELTA_GET_SECONDS, - PyDateTime_DELTA_GET_MICROSECONDS. - -- Issue #10542: Add 4 macros to work with surrogates: Py_UNICODE_IS_SURROGATE, - Py_UNICODE_IS_HIGH_SURROGATE, Py_UNICODE_IS_LOW_SURROGATE, - Py_UNICODE_JOIN_SURROGATES. - -- Issue #12724: Add Py_RETURN_NOTIMPLEMENTED macro for returning NotImplemented. - -- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with - Mercurial. - -- Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const - char *` instead of `char *`. - -- Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. - -Documentation -------------- - -- Issues #13491 and #13995: Fix many errors in sqlite3 documentation. - Initial patch for #13491 by Johannes Vogel. - -- Issue #13402: Document absoluteness of sys.executable. - -- Issue #13883: PYTHONCASEOK also works on OS X. - -- Issue #12949: Document the kwonlyargcount argument for the PyCode_New - C API function. - -- Issue #13513: Fix io.IOBase documentation to correctly link to the - io.IOBase.readline method instead of the readline module. - -- Issue #13237: Reorganise subprocess documentation to emphasise convenience - functions and the most commonly needed arguments to Popen. - -- Issue #13141: Demonstrate recommended style for socketserver examples. - -- Issue #11818: Fix tempfile examples for Python 3. - - -What's New in Python 3.2? -========================= - -*Release date: 20-Feb-2011* - -Core and Builtins ------------------ - -- Issue #11249: Fix potential crashes when using the limited API. - -Build ------ - -- Issue #11222: Fix non-framework shared library build on Mac OS X. - -- Issue #11184: Fix large-file support on AIX. - -- Issue #941346: Fix broken shared library build on AIX. - -Documentation -------------- - -- Issue #10709: Add updated AIX notes in Misc/README.AIX. - - -What's New in Python 3.2 Release Candidate 3? -============================================= - -*Release date: 13-Feb-2011* - -Core and Builtins ------------------ - -- Issue #11134: Add missing fields to typeslots.h. - -- Issue #11135: Remove redundant doc field from PyType_Spec. - -- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited - ABI. - -- Issue #11118: Fix bogus export of None in python3.dll. - -Library -------- - -- Issue #11116: any error during addition of a message to a mailbox now causes a - rollback, instead of leaving the mailbox partially modified. - -- Issue #11132: Fix passing of "optimize" parameter when recursing in - compileall.compile_dir(). - -- Issue #11110: Fix a potential decref of a NULL in sqlite3. - -- Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch - by Stan Mihai. - -Build ------ - -- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X - installers now includes a link to the installed documentation and no longer - includes an Extras directory. The Tools directory is now installed in the - framework under share/doc. - -- Issue #11121: Fix building with --enable-shared. - -Tests ------ - -- Issue #10971: test_zipimport_support is once again compatible with the refleak - hunter feature of test.regrtest. - - -What's New in Python 3.2 Release Candidate 2? -============================================= - -*Release date: 30-Jan-2011* - -Core and Builtins ------------------ - -- Issue #10451: memoryview objects could allow to mutate a readable buffer. - Initial patch by Ross Lagerwall. - -Library -------- - -- Issue #9124: mailbox now accepts binary input and reads and writes mailbox - files in binary mode, using the email package's binary support to parse - arbitrary email messages. StringIO and text file input is deprecated, - and string input fails early if non-ASCII characters are used, where - previously it would fail when the email was processed in a later step. - -- Issue #10845: Mitigate the incompatibility between the multiprocessing - module on Windows and the use of package, zipfile or directory execution - by special casing main modules that actually *are* called __main__.py. - -- Issue #11045: Protect logging call against None argument. - -- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save - commands. - -- Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, - preventing a confusing hung appearance on OS X with the windows - obscured. - -- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the - menu accelerators for Open Module, Go to Line, and New Indent Width. - The accelerators still work but no longer appear in the menu items. - -- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True). - -- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 - conversion. - -- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message - with a None body. - -- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a - keyword-only argument. The preceding positional argument was deprecated, - so it made no sense to add filter as a positional argument. - -- Issue #11004: Repaired edge case in deque.count(). - -- Issue #10974: IDLE no longer crashes if its recent files list includes files - with non-ASCII characters in their path names. - -- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both - return sets instead of one returning a tuple and the other a frozenset. - -- Issue #10987: Fix the recursion limit handling in the _pickle module. - -- Issue #10983: Fix several bugs making tunnel requests in http.client. - -- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode - filenames, at bootstrap, if the codec registry is not ready yet. It is still - possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding) - for all file entries in the ZIP file. - -- Issue #10949: Improved robustness of rotating file handlers. - -- Issue #10955: Fix a potential crash when trying to mmap() a file past its - length. Initial patch by Ross Lagerwall. - -- Issue #10898: Allow compiling the posix module when the C library defines - a symbol named FSTAT. - -- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1) - encoding. This is the preferred encoding of PEP 3333 and the base encoding - of HTTP 1.1. - -- To match the behaviour of HTTP server, the HTTP client library now also - encodes headers with iso-8859-1 (latin1) encoding. It was already doing - that for incoming headers which makes this behaviour now consistent in - both incoming and outgoing direction. - -- Issue #9509: argparse now properly handles IOErrors raised by - argparse.FileType. - -- Issue #10961: The new pydoc server now better handles exceptions raised - during request handling. - -- Issue #10680: Fix mutually exclusive arguments for argument groups in - argparse. - -Build ------ - -- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with - the system-provided Python. - - -What's New in Python 3.2 Release Candidate 1 -============================================ - -*Release date: 16-Jan-2011* - -Core and Builtins ------------------ - -- Issue #10889: range indexing and slicing now works correctly on ranges with - a length that exceeds sys.maxsize. - -- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a - class. - -- Issue #8020: Avoid a crash where the small objects allocator would read - non-Python managed memory while it is being modified by another thread. Patch - by Matt Bandy. - -- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all - io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser - translates newlines (\r\n => \n). - -- Remove buffer API from stable ABI for now, see #10181. - -- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file - doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int - (length bigger than 2^31-1 bytes). - -- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and - stdprinter.write() clamp the length to INT_MAX on Windows. - -- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() - can now handle dates after 2038. - -- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and - PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the - filesystem encoding instead of UTF-8. - -- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem - encoding instead of UTF-8. - -- Add sys.flags attribute for the new -q command-line option. - -- Issue #11506: Trying to assign to a bytes literal should result in a - SyntaxError. - -Library -------- - -- Issue #10916: mmap should not segfault when a file is mapped using 0 as length - and a non-zero offset, and an attempt to read past the end of file is made - (IndexError is raised instead). Patch by Ross Lagerwall. - -- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead - of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. - -- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather - than the currently problematic Apple-supplied one, when running with the - 64-/32-bit installer variant. - -- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not - as unicode, and accept binary files. Add encoding and errors attributes to - cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn - Linderman). - -- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl(). - -- Issue #10899: No function type annotations in the standard library. Removed - function type annotations from _pyio.py. - -- Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'. - -- Issue #10872: The repr() of TextIOWrapper objects now includes the mode - if available. - -- Issue #10869: Fixed bug where ast.increment_lineno modified the root node - twice. - -- Issue #5871: email.header.Header.encode now raises an error if any - continuation line in the formatted value has no leading white space and looks - like a header. Since Generator uses Header to format all headers, this check - is made for all headers in any serialized message at serialization time. This - provides protection against header injection attacks. - -- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially - private by renaming it to ``_GeneratorContextManager``. - -- Issue #10042: Fixed the total_ordering decorator to handle cross-type - comparisons that could lead to infinite recursion. - -- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with - non-ASCII bytes (parsed by a BytesParser) when doing conversion to 7bit-clean - presentation, instead of replacing them with ?s. - -- email.header.Header was incorrectly encoding folding whitespace when - rfc2047-encoding header values with embedded newlines, leaving them without - folding whitespace. It now uses the continuation_ws, as it does for - continuation lines that it creates itself. - -- Issue #1777412, #10827: Changed the rules for 2-digit years. The - time.asctime(), time.ctime() and time.strftime() functions will now format - any year when ``time.accept2dyear`` is False and will accept years >= 1000 - otherwise. ``time.mktime`` and ``time.strftime`` now accept full range - supported by the OS. With Visual Studio or on Solaris, the year is limited to - the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated. - -- Issue #7858: Raise an error properly when os.utime() fails under Windows - on an existing file. - -- Issue #3839: wsgiref should not override a Content-Length header set by - the application. Initial patch by Clovis Fabricio. - -- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the - compilation (if the input is a string). - -- Issue #7995: When calling accept() on a socket with a timeout, the returned - socket is now always blocking, regardless of the operating system. - -- Issue #10756: atexit normalizes the exception before displaying it. Patch by - Andreas St?hrk. - -- Issue #10790: email.header.Header.append's charset logic now works correctly - for charsets whose output codec is different from its input codec. - -- Issue #10819: SocketIO.name property returns -1 when its closed, instead of - raising a ValueError, to fix repr(). - -- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if - the input buffer length doesn't fit into an unsigned int (length bigger than - 2^32-1 bytes). - -- Issue #6643: Reinitialize locks held within the threading module after fork to - avoid a potential rare deadlock or crash on some platforms. - -- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file - descriptors (0, 1, 2) are closed in the parent process. Initial patch by Ross - Lagerwall. - -- `unittest.TestCase` can be instantiated without a method name; for simpler - exploration from the interactive interpreter. - -- Issue #10798: Reject supporting concurrent.futures if the system has too - few POSIX semaphores. - -- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from - the codec aliases. They are still accessible via codecs.lookup(). - -- Issue #10801: In zipfile, support different encodings for the header and the - filenames. - -- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott - David Daniels. - -- Fix collections.OrderedDict.setdefault() so that it works in subclasses that - define __missing__(). - -- Issue #10786: unittest.TextTestRunner default stream no longer bound at import - time. `sys.stderr` now looked up at instantiation time. Fix contributed by - Mark Roddy. - -- Issue #10753: Characters ';', '=' and ',' in the PATH_INFO environment variable - won't be quoted when the URI is constructed by the wsgiref.util's request_uri - method. According to RFC 3986, these characters can be a part of params in - PATH component of URI and need not be quoted. - -- Issue #10738: Fix webbrowser.Opera.raise_opts. - -- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how - browsers actually parse cookies. - -- Issue #9333: os.symlink now available regardless of user privileges. The - function now raises OSError on Windows >=6.0 when the user is unable to create - symbolic links. XP and 2003 still raise NotImplementedError. - -- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8. - -- Issue #10730: Add SVG mime types to mimetypes module. - -- Issue #10768: Make the Tkinter ScrolledText widget work again. - -- Issue #10777: Fix "dictionary changed size during iteration" bug in - ElementTree register_namespace(). - -- Issue #10626: test_logging now preserves logger disabled states. - -- Issue #10774: test_logging now removes temp files created during tests. - -- Issue #5258/#10642: if site.py encounters a .pth file that generates an error, - it now prints the filename, line number, and traceback to stderr and skips - the rest of that individual file, instead of stopping processing entirely. - -- Issue #10763: subprocess.communicate() closes stdout and stderr if both are - pipes (bug specific to Windows). - -- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better - compliance (no "s around encoded values). - -- Improved the diff message in the unittest module's assertCountEqual(). - -- Issue #1155362: email.utils.parsedate_tz now handles a missing space before - the '-' of a timezone field as well as before a '+'. - -- Issue #4871: The zipfile module now gives a more useful error message if - an attempt is made to use a string to specify the archive password. - -- Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only. - -- Deprecated assertDictContainsSubset() in the unittest module. - -C-API ------ - -- PyObject_CallMethod now passes along any underlying AttributeError from - PyObject_GetAttr, instead of replacing it with something less informative - -- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and - PyEval_ReleaseLock(). The thread-state aware APIs should be used instead. - -- Issue #10333: Remove ancient GC API, which has been deprecated since Python - 2.2. - -Build ------ - -- Issue #10843: Update third-party library versions used in OS X 32-bit - installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4 - and RTREE enabled), and ncursesw 5.5 (wide-char support enabled). - -- Issue #10820: Fix OS X framework installs to support version-specific - scripts (#10679). - -- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in - the configure script but use $GREP instead. Patch by Fabian Groffen. - -- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD - and DragonFly BSD. Patch by Nicolas Joly. - -- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with - a version-specific suffix on "make altinstall". - -- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with - timestamp profiling (--with-tsc): the preprocessor test for the PowerPC - support now looks for "__powerpc__" as well as "__ppc__": the latter seems to - only be present on OS X; the former is the correct one for Linux with GCC. - -- Issue #1099: Fix the build on MacOSX when building a framework with pydebug - using GCC 4.0. - -Tools/Demos ------------ - -- Issue #10843: Install the Tools directory on OS X in the applications Extras - (/Applications/Python 3.n/Extras/) where the Demo directory had previous been - installed. - -- Issue #7962: The Demo directory is gone. Most of the old and unmaintained - demos have been removed, others integrated in documentation or a new - Tools/demo subdirectory. - -- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell. - Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian - Curtin. - -Tests ------ - -- Issue #11910: Fix test_heapq to skip the C tests when _heapq is missing. - -- Fix test_startfile to wait for child process to terminate before finishing. - -- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch - by Ross Lagerwall. - -- Make the --coverage flag work for test.regrtest. - -- Issue #1677694: Refactor and improve test_timeout. Original patch by - Bj?rn Lindqvist. - -- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects. - Patch by Jean-Paul Calderone and Sandro Tosi. - -- Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in - whole runs and enabled selectively using ``--header`` when running an explicit - list of tests. Original patch by Collin Winter. - - -What's New in Python 3.2 Beta 2? -================================ - -*Release date: 19-Dec-2010* - -Core and Builtins ------------------ - -- Issue #8844: Regular and recursive lock acquisitions can now be interrupted - by signals on platforms using pthreads. Patch by Reid Kleckner. - -- Issue #4236: PyModule_Create2 now checks the import machinery directly - rather than the Py_IsInitialized flag, avoiding a Fatal Python - error in certain circumstances when an import is done in __del__. - -- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and - Daniel Urban. - -Library -------- - -- Issue #3243: Support iterable bodies in httplib. Patch Contributions by - Xuanji Li and Chris AtLee. - -- Issue #10611: SystemExit exception will no longer kill a unittest run. - -- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean - up function. - -- Issue #10573: use actual/expected consistently in unittest methods. - The order of the args of assertCountEqual is also changed. - -- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated - words in the local part of email addresses, thereby preserving the input. - -- Issue #6791: Limit header line length (to 65535 bytes) in http.client - and http.server, to avoid denial of services from the other party. - -- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. - -- Issue #9907: Fix tab handling on OSX when using editline by calling - rl_initialize first, then setting our custom defaults, then reading .editrc. - -- Issue #4188: Avoid creating dummy thread objects when logging operations - from the threading module (with the internal verbose flag activated). - -- Issue #10711: Remove HTTP 0.9 support from http.client. The ``strict`` - parameter to HTTPConnection and friends is deprecated. - -- Issue #9721: Fix the behavior of urljoin when the relative url starts with a - ';' character. Patch by Wes Chow. - -- Issue #10714: Limit length of incoming request in http.server to 65536 bytes - for security reasons. Initial patch by Ross Lagerwall. - -- Issue #9558: Fix distutils.command.build_ext with VS 8.0. - -- Issue #10667: Fast path for collections.Counter(). - -- Issue #10695: passing the port as a string value to telnetlib no longer - causes debug mode to fail. - -- Issue #1078919: add_header now automatically RFC2231 encodes parameters - that contain non-ascii values. - -- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits - a warning on sys.stderr rather than throwing a misleading exception - if cleanup fails due to nulling out of modules during shutdown. - Also avoids an AttributeError when mkdtemp call fails and issues - a ResourceWarning on implicit cleanup via __del__. - -- Issue #10107: Warn about unsaved files in IDLE on OSX. - -- Issue #7213: subprocess.Popen's default for close_fds has been changed. - It is now True in most cases other than on Windows when input, output or - error handles are provided. - -- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually - added in 3.2beta1) to allow specifying a specific list of file descriptors - to keep open in the child process. - -- Issue #1731717: Fixed the problem where subprocess.wait() could cause an - OSError exception when The OS had been told to ignore SIGCLD in our process - or otherwise not wait for exiting child processes. - -Tests ------ - -- Issue #775964: test_grp now skips YP/NIS entries instead of failing when - encountering them. - -Tools/Demos ------------ - -- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and - Cocoa AquaTk. - -- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree. - -- Issue #10706: Remove outdated script runtests.sh. Either ``make test`` - or ``python -m test`` should be used instead. - -Build ------ - -- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4. - -- Issue #9234: argparse supports alias names for subparsers. - - -What's New in Python 3.2 Beta 1? -================================ - -*Release date: 05-Dec-2010* - -Core and Builtins ------------------ - -- Issue #10630: Return dict views from the dict proxy keys()/values()/items() - methods. - -- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__ - with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. - -- Issue #1772833: Add the -q command-line option to suppress copyright and - version output in interactive mode. - -- Provide an *optimize* parameter in the built-in compile() function. - -- Fixed several corner case issues on Windows in os.stat/os.lstat related to - reparse points. - -- PEP 384 (Defining a Stable ABI) is implemented. - -- Issue #2690: Range objects support negative indices and slicing. - -- Issue #9915: Speed up sorting with a key. - -- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much - larger than operand ``b``. Patch by Andrew Bennetts. - -- Issue #10518: Bring back the callable() builtin. - -- Issue #7094: Added alternate formatting (specified by '#') to ``__format__`` - method of float, complex, and Decimal. This allows more precise control over - when decimal points are displayed. - -- Issue #10474: range.count() should return integers. - -- Issue #1574217: isinstance now catches only AttributeError, rather than - masking all errors. - -Library -------- - -- logging: added "handler of last resort". See http://bit.ly/last-resort-handler - -- test.support: Added TestHandler and Matcher classes for better support of - assertions about logging. - -- Issue #4391: Use proper plural forms in argparse. - -- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on - UnicodeEncodeError. - -- Add the "display" and "undisplay" pdb commands. - -- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again - after a "continue" command. - -- Add the "interact" pdb command. - -- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf. - -- Issue #1569291: Speed up array.repeat(). - -- Provide an interface to set the optimization level of compilation in - py_compile, compileall and zipfile.PyZipFile. - -- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by - RFC3986. Anything before :// is considered a scheme and is followed by an - authority (or netloc) and by '/' led path, which is optional. - -- Issue #6045: dbm.gnu databases now support get() and setdefault() methods. - -- Issue #10620: `python -m unittest` can accept file paths instead of module - names for running specific tests. - -- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`, - `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_` - and replace them with the correct methods in the Python test suite. - -- Issue #10272: The ssl module now raises socket.timeout instead of a generic - SSLError on socket timeouts. - -- Issue #10528: Allow translators to reorder placeholders in localizable - messages from argparse. - -- Issue #10497: Fix incorrect use of gettext in argparse. - -- Issue #10478: Reentrant calls inside buffered IO objects (for example by - way of a signal handler) now raise a RuntimeError instead of freezing the - current process. - -- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests. - -- Issue #10549: Fix pydoc traceback when text-documenting certain classes. - -- Issue #2001: New HTML server with enhanced Web page features. Patch by Ron - Adam. - -- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership - of non-weakrefable objects. - -- Issue #940286: pydoc.Helper.help() ignores input/output init parameters. - -- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent - DoS attacks. Patch by Savio Sena. - -- Issue #4925: Add filename to error message when executable can't be found in - subprocess. - -- Issue #10391: Don't dereference invalid memory in error messages in the ast - module. - -- Issue #10027: st_nlink was not being set on Windows calls to os.stat or - os.lstat. Patch by Hirokazu Yamamoto. - -- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is - held by the user's account, i.e., when the function can actually be used. - -- Issue #8879: Add os.link support for Windows. - -- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved - failure messages by default. Patch by Mark Roddy. - -- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to - guess at the correct parsing of invalid html. - -- Issue #10554: Add context manager support to subprocess.Popen objects. - -- Issue #8989: email.utils.make_msgid now has a domain parameter that can - override the domain name used in the generated msgid. - -- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File - exists' exception when a target directory already exists with the specified - mode. Patch by Ray Allen. - -- Issue #9573: os.fork() now works correctly when triggered as a side effect of - a module import. - -- Issue #10464: netrc now correctly handles lines with embedded '#' characters. - -- Added itertools.accumulate(). - -- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``. - Original patch by Daniel Urban. - -- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to - `assertRegex` and `assertRaisesRegex`. - -- Issue #10535: Enable silenced warnings in unittest by default. - -- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte - sequences as input in addition to character strings. - -- Issue #10586: The statistics API for the new functools.lru_cache has been - changed to a single cache_info() method returning a named tuple. - -- Issue #10323: itertools.islice() now consumes the minimum number of inputs - before stopping. Formerly, the final state of the underlying iterator was - undefined. - -- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and - __next__. - -- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new - more informative name, unittest.CountEqual. - -- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. - -- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can - be set to False to turn off the previously undocumented 'popularity' - heuristic. Patch by Terry Reedy and Eli Bendersky. - -- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate - undocumented and now redundant isbjunk and isbpopular methods. - -- Issue #9846: zipfile is now correctly closing underlying file objects. - -- Issue #10459: Update CJK character names to Unicode 6.0. - -- Issue #4493: urllib.request adds '/' in front of path components which does not - start with '/. Common behavior exhibited by browsers and other clients. - -- Issue #6378: idle.bat now runs with the appropriate Python version rather than - the system default. Patch by Sridhar Ratnakumar. - -- Issue #10470: 'python -m unittest' will now run test discovery by default, - when no extra arguments have been provided. - -- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to - output stream only when end_headers is invoked. This is a speedup and an - internal optimization. Patch by Andrew Shaaf. - -- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho - Eckhardt. - -- Issue #10453: compileall now uses argparse instead of getopt, and thus - provides clean output when called with '-h'. - -- Issue #8078: Add constants for higher baud rates in the termios module. Patch - by Rodolpho Eckhardt. - -- Issue #10407: Fix two NameErrors in distutils. - -- Issue #10371: Deprecated undocumented functions in the trace module. - -- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the - end of the file. - -- configparser: 100% test coverage. - -- Issue #10499: configparser supports pluggable interpolation handlers. The - default classic interpolation handler is called BasicInterpolation. Another - interpolation handler added (ExtendedInterpolation) which supports the syntax - used by zc.buildout (e.g. interpolation between sections). - -- configparser: the SafeConfigParser class has been renamed to ConfigParser. - The legacy ConfigParser class has been removed but its interpolation mechanism - is still available as LegacyInterpolation. - -- configparser: Usage of RawConfigParser is now discouraged for new projects - in favor of ConfigParser(interpolation=None). - -- Issue #1682942: configparser supports alternative option/value delimiters. - -- Issue #5412: configparser supports mapping protocol access. - -- Issue #9411: configparser supports specifying encoding for read operations. - -- Issue #9421: configparser's getint(), getfloat() and getboolean() methods - accept vars and default arguments just like get() does. - -- Issue #9452: configparser supports reading from strings and dictionaries - (thanks to the mapping protocol API, the latter can be used to copy data - between parsers). - -- configparser: accepted INI file structure is now customizable, including - comment prefixes, name of the DEFAULT section, empty lines in multiline - values, and indentation. - -- Issue #10326: unittest.TestCase instances can be pickled. - -- Issue #9926: Wrapped TestSuite subclass does not get __call__ executed. - -- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex - zeros on systems where the log1p function fails to respect the sign of zero. - This fixes a test failure on AIX. - -- Issue #9732: Addition of getattr_static to the inspect module. - -- Issue #10446: Module documentation generated by pydoc now links to a - version-specific online reference manual. - -- Make the 'No module named' exception message from importlib consistent. - -- Issue #10443: Add the SSLContext.set_default_verify_paths() method. - -- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module. - Patch by Robert Collins. - -- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather - than strings. - -C-API ------ - -- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(), - which transforms non-ASCII decimal digits in a Unicode string to their ASCII - equivalents. - -- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly - zero-initialize all fields, fixing compiler warnings seen when building - extension modules with gcc with "-Wmissing-field-initializers" (implied by - "-W"). - -- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil - Schemenauer. - -- structseq.h is now included in Python.h. - -- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. - -Tests ------ - -- regrtest.py once again ensures the test directory is removed from sys.path - when it is invoked directly as the __main__ module. - -- `python -m test` can be used to run the test suite as well as `python -m - test.regrtest`. - -- Do not fail test_socket when the IP address of the local hostname cannot be - looked up. - -- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric - Carstensen. - -Build ------ - -- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and - PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals. - -Documentation -------------- - -- Issue #10299: List the built-in functions in a table in functions.rst. - - -What's New in Python 3.2 Alpha 4? -================================= - -*Release date: 13-Nov-2010* - -Core and Builtins ------------------ - -- Issue #10372: Import the warnings module only after the IO library is - initialized, so as to avoid bootstrap issues with the '-W' option. - -- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused - undocumented value PyBUF_SHADOW, and strangely-looking code in - PyMemoryView_GetContiguous. - -- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``. - -- If FileIO.__init__ fails, close the file descriptor. - -- Issue #10221: dict.pop(k) now has a key error message that includes the - missing key (same message d[k] returns for missing keys). - -- Issue #5437: A preallocated MemoryError instance should not keep traceback - data (including local variables caught in the stack trace) alive infinitely. - -- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length - of the offending line. - -- Issue #10089: Add support for arbitrary -X options on the command line. They - can be retrieved through a new attribute ``sys._xoptions``. - -- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of - the locale encoding. If the LANG (and LC_ALL and LC_CTYPE) environment - variable is not set, the locale encoding is ISO-8859-1, whereas most programs - (including Python) expect UTF-8. Python already uses UTF-8 for the filesystem - encoding and to encode command line arguments on this OS. - -- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect - filenames encoded to the filesystem encoding with the surrogateescape error - handler (to support undecodable bytes), instead of UTF-8 in strict mode. - -- Issue #9997: Don't let the name "top" have special significance in scope - resolution. - -- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as - the default 512 when compiling on AIX. - -- Use locale encoding instead of UTF-8 to encode and decode filenames if - Py_FileSystemDefaultEncoding is not set. - -- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file - descriptor. - -- Issue #9418: Moved private string methods ``_formatter_parser`` and - ``_formatter_field_name_split`` into a new ``_string`` module. - -- Issue #9992: Remove PYTHONFSENCODING environment variable. - -Library -------- - -- Issue #12943: python -m tokenize support has been added to tokenize. - -- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. - -- Issue #10356: Decimal.__hash__(-1) should return -2. - -- Issue #1553375: logging: Added stack_info kwarg to display stack information. - -- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru. - -- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See also issue - #10356.) - -- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard - IMAP4 connections. Original patch by Lorenzo M. Catucci. - -- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if - there are non-base64 alphabet characters in the input. - -- Issue #10386: Add __all__ to token module; this simplifies importing in - tokenize module and prevents leaking of private names through ``import *``. - -- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by Lorenzo - M. Catucci. - -- Fix IMAP.login() to work properly. - -- Issue #9244: multiprocessing pool worker processes could terminate - unexpectedly if the return value of a task could not be pickled. Only the - ``repr`` of such errors are now sent back, wrapped in an - ``MaybeEncodingError`` exception. - -- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of - ``multiprocessing.Pool`` now accepts a ``error_callback`` argument. This can - be a callback with the signature ``callback(exc)``, which will be called if - the target raises an exception. - -- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL - sockets now has additional items such as ``issuer`` and ``notBefore``. - -- ``usenetrc`` is now false by default for NNTP objects. - -- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS. - Patch by Andrew Vant. - -- Issue #10335: Add tokenize.open(), detect the file encoding using - tokenize.detect_encoding() and open it in read only mode. - -- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new - method send_message to send an email.message.Message object. - -- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error - handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source - code directory name contains a non-ASCII character and the locale encoding is - ASCII. - -- Issue #10329: The trace module writes reports using the input Python script - encoding, instead of the locale encoding. Patch written by Alexander - Belopolsky. - -- Issue #10126: Fix distutils' test_build when Python was built with - --enable-shared. - -- Issue #9281: Prevent race condition with mkdir in distutils. Patch by - Arfrever. - -- Issue #10229: Fix caching error in gettext. - -- Issue #10252: Close file objects in a timely manner in distutils code and - tests. Patch by Brian Brazil, completed by ?ric Araujo. - -- Issue #10180: Pickling file objects is now explicitly forbidden, since - unpickling them produced nonsensical results. - -- Issue #10311: The signal module now restores errno before returning from its - low-level signal handler. Patch by Hallvard B Furuseth. - -- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects. - -- Issue #10283: Add a ``group_pattern`` argument to NNTP.list(). - -- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI - environment better, and to correct unicode environment values for WSGI 1.0.1. - -- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER - response, instead of raising an exception. - -- wsgiref now implements and validates PEP 3333, rather than an experimental - extension of PEP 333. (Note: earlier versions of Python 3.x may have - incorrectly validated some non-compliant applications as WSGI compliant; if - your app validates with Python <3.2b1+, but not on this version, it is likely - the case that your app was not compliant.) - -- Issue #10280: NNTP.nntp_version should reflect the highest version advertised - by the server. - -- Issue #10184: Touch directories only once when extracting a tarfile. - -- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts - that were formerly found under Demo/turtle. - -- Issue #10265: Close file objects explicitly in sunau. Patch by Brian Brazil. - -- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a - filename. Patch by Brian Brazil. - -- Issue #10110: Queue objects didn't recognize full queues when the maxsize - parameter had been reduced. - -- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. - -- logging: Added style option to basicConfig() to allow %, {} or $-formatting. - -- Issue #5729: json.dumps() now supports using a string such as '\t' for - pretty-printing multilevel objects. - -- Issue #10253: FileIO leaks a file descriptor when trying to open a file for - append that isn't seekable. Patch by Brian Brazil. - -- Support context manager protocol for file-like objects returned by mailbox - ``get_file()`` methods. - -- Issue #10246: uu.encode didn't close file objects explicitly when filenames - were given to it. Patch by Brian Brazil. - -- Issue #10198: fix duplicate header written to wave files when writeframes() is - called without data. - -- Close file objects in modulefinder in a timely manner. - -- Close a io.TextIOWrapper object in email.parser in a timely manner. - -- Close a file object in distutils.sysconfig in a timely manner. - -- Close a file object in pkgutil in a timely manner. - -- Issue #10233: Close file objects in a timely manner in the tarfile module and - its test suite. - -- Issue #10093: ResourceWarnings are now issued when files and sockets are - deallocated without explicit closing. These warnings are silenced by default, - except in pydebug mode. - -- tarfile.py: Add support for all missing variants of the GNU sparse extensions - and create files with holes when extracting sparse members. - -- Issue #10218: Return timeout status from ``Condition.wait`` in threading. - -- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and - deprecate the old name ``zipfile.BadZipfile``. - -- Issue #5027: The standard ``xml`` namespace is now understood by - xml.sax.saxutils.XMLGenerator as being bound to - http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell. - -- Issue #5975: Add csv.unix_dialect class. - -- Issue #7761: telnetlib.interact failures on Windows fixed. - -- logging: Added style option to Formatter to allow %, {} or $-formatting. - -- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a - context manager. - -- Issue #1349106: Generator (and BytesGenerator) flatten method and Header - encode method now support a 'linesep' argument. - -- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in - order to support the TLS SNI extension. ``HTTPSConnection`` and ``urlopen()`` - also use this argument, so that HTTPS virtual hosts are now supported. - -- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items. - -- Issue #10163: Skip unreadable registry keys during mimetypes initialization. - -- logging: Made StreamHandler terminator configurable. - -- logging: Allowed filters to be just callables. - -- logging: Added tests for _logRecordClass changes. - -- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. - -- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to - increase flexibility of LogRecord creation. - -- Issue #5117: Case normalization was needed on ntpath.relpath(). Also fixed - root directory issue on posixpath.relpath(). (Ported working fixes from - ntpath.) - -- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option - short_empty_elements to direct it to use self-closing tags when appropriate. - -- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags. Add --abiflags - switch to python-config for command line access. - -- Issue #6098: Don't claim DOM level 3 conformance in minidom. - -- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty - XML namespace attribute is encountered. - -- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic - characters by default. Deprecate ``cgi.escape()``. - -- Issue #9409: Fix the regex to match all kind of filenames, for interactive - debugging in doctests. - -- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the - same instance as ``datetime.timezone.utc``. - -- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where - supported by the system. Patch by Nikita Vetoshkin. - -- Issue #10063: file:// scheme will stop accessing remote hosts via ftp - protocol. file:// urls had fallback to access remote hosts via ftp. This was - not correct, change is made to raise a URLError when a remote host is tried to - access via file:// scheme. - -- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is - created in modes 'a' or 'w' and then closed without adding any files. Raise - BadZipfile (rather than IOError) when opening small non-ZIP files. - -- Issue #10041: The signature of optional arguments in socket.makefile() didn't - match that of io.open(), and they also didn't get forwarded properly to - TextIOWrapper in text mode. Patch by Kai Zhu. - -- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and - urllib.request.urlopen now take optional arguments to allow for server - certificate checking, as recommended in public uses of HTTPS. - -- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the - current directory was deleted. Patch written by W. Trevor King. - -- Issue #3873: Speed up unpickling from file objects that have a peek() method. - -- Issue #10075: Add a session_stats() method to SSLContext objects. - -- Issue #9948: Fixed problem of losing filename case information. - -Extension Modules ------------------ - -- Issue #5109: array.array constructor will now use fast code when - initial data is provided in an array object with correct type. - -- Issue #6317: Now winsound.PlaySound only accepts unicode. - -- Issue #6317: Now winsound.PlaySound can accept non ascii filename. - -- Issue #9377: Use Unicode API for gethostname on Windows. - -- Issue #10143: Update "os.pathconf" values. - -- Issue #6518: Support context manager protcol for ossaudiodev types. - -- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. - -- Issue #9054: Fix a crash occurring when using the pyexpat module with expat - version 2.0.1. - -- Issue #5355: Provide mappings from Expat error numbers to string descriptions - and backwards, in order to actually make it possible to analyze error codes - provided by ExpatError. - -- The Unicode database was updated to 6.0.0. - -C-API ------ - -- Issue #10288: The deprecated family of "char"-handling macros - (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead. - -- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t - type has been introduced. - -Tools/Demos ------------ - -- Issue #10117: Tools/scripts/reindent.py now accepts source files that use - encoding other than ASCII or UTF-8. Source encoding is preserved when - reindented code is written to a file. - -- Issue #7287: Demo/imputil/knee.py was removed. - -Tests ------ - -- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well - as unicode strings. Initial patch by Sandro Tosi. - -- Issue #10294: Remove dead code form test_unicode_file. - -- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new - test specific to unicode (non-ascii name and filename). - -Build ------ - -- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure. - -- Issue #8852: Allow the socket module to build on OpenSolaris. - -- Drop -OPT:Olimit compiler option. - -- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. - -- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. - -- Issue #7473: avoid link errors when building a framework with a different set - of architectures than the one that is currently installed. - - -What's New in Python 3.2 Alpha 3? -================================= - -*Release date: 09-Oct-2010* - -Core and Builtins ------------------ - -- Issue #10068: Global objects which have reference cycles with their module's - dict are now cleared again. This causes issue #7140 to appear again. - -- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename() - encodings. - -- ast.literal_eval() can now handle negative numbers. It is also a little more - liberal in what it accepts without compromising the safety of the evaluation. - For example, 3j+4 and 3+4+5 are both accepted. - -- Issue #10006: type.__abstractmethods__ now raises an AttributeError. As a - result metaclasses can now be ABCs (see #9533). - -- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t. - -- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace - UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and - 32 bits wchar_t (eg. Linux in narrow build). - -- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression - introduced by issue #9324. - -- Issue #9979: Create function PyUnicode_AsWideCharString(). - -- Issue #7397: Mention that importlib.import_module() is probably what someone - really wants to be using in __import__'s docstring. - -- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg - to use named arguments. - -- Issue #9930: Remove bogus subtype check that was causing (e.g.) - float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. - -- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin. - -- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other - threads are still running. Instead, reinitialize the GIL on a second call to - Py_Initialize(). - -- All SyntaxErrors now have a column offset and therefore a caret when the error - is printed. - -- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the - module that was imported, but instead gets the module from sys.modules. - -- Issue #9213: The range type_items now provides index() and count() methods, to - conform to the Sequence ABC. Patch by Daniel Urban and Daniel Stutzbach. - -- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called - with a non-empty format string. This is an effort to future-proof user - code. If a derived class does not currently implement __format__ but later - adds its own __format__, it would most likely break user code that had - supplied a format string. This will be changed to a DeprecationWaring in - Python 3.3 and it will be an error in Python 3.4. - -- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly - re-created on a subsequent call to Py_Initialize(). The problem (a crash) - wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial. - -- Issue #9210: Configure option --with-wctype-functions was removed. Using the - functions from the libc caused the methods .upper() and lower() to become - locale aware and created subtly wrong results. - -- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a - non-ASCII byte in the format string. - -- Issue #4617: Previously it was illegal to delete a name from the local - namespace if it occurs as a free variable in a nested block. This limitation - of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). - -- Issue #9804: ascii() now always represents unicode surrogate pairs as a single - ``\UXXXXXXXX``, regardless of whether the character is printable or not. - Also, the "backslashreplace" error handler now joins surrogate pairs into a - single character on UCS-2 builds. - -- Issue #9757: memoryview objects get a release() method to release the - underlying buffer (previously this was only done when deallocating the - memoryview), and gain support for the context management protocol. - -- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid - thread-local storage key. - -Library -------- - -- Issue #2236: distutils' mkpath ignored the mode parameter. - -- Fix typo in one sdist option (medata-check). - -- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce. - -- Issue #1718574: Fix options that were supposed to accept arguments but did - not in build_clib. - -- Issue #9437: Fix building C extensions with non-default LDFLAGS. - -- Issue #4661: email can now parse bytes input and generate either converted - 7bit output or bytes output. Email version bumped to 5.1.0. - -- Issue #1589: Add ssl.match_hostname(), to help implement server identity - verification for higher-level protocols. - -- Issue #9759: GzipFile now raises ValueError when an operation is attempted - after the file is closed. Patch by Jeffrey Finkelstein. - -- Issue #9042: Fix interaction of custom translation classes and caching in - gettext. - -- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method - returning a (sock, addr) pair which is called when a connection has been - established with a new remote endpoint. This is supposed to be used as a - replacement for old handle_accept() and avoids the user to call accept() - directly. - -- Issue #9065: tarfile no longer uses "root" as the default for the uname and - gname field. - -- Issue #8980: Fixed a failure in distutils.command check that was shadowed by - an environment that does not have docutils. Patch by Arfrever. - -- Issue #1050268: parseaddr now correctly quotes double quote and backslash - characters that appear inside quoted strings in email addresses. - -- Issue #10004: quoprimime no longer generates a traceback when confronted with - invalid characters after '=' in a Q-encoded word. - -- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before - sending a 200 OK for the Expect: 100-continue request header. - -- Issue #9360: Cleanup and improvements to the nntplib module. The API now - conforms to the philosophy of bytes and unicode separation in Python 3. A - test suite has also been added. - -- Issue #9962: GzipFile now has the peek() method. - -- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, - retry the select() loop instead of bailing out. This is because select() can - incorrectly report a socket as ready for reading (for example, if it received - some data with an invalid checksum). - -- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) - -- Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is - received. Now sendall() properly calls signal handlers if necessary, and - retries sending if these returned successfully, including on sockets with a - timeout. - -- Issue #9947: logging: Fixed locking bug in stopListening. - -- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler. - -- Issue #9936: Fixed executable lines' search in the trace module. - -- Issue #9790: Rework imports necessary for samefile and sameopenfile - in ntpath. - -- Issue #9928: Properly initialize the types exported by the bz2 module. - -- Issue #1675951: Allow GzipFile to work with unseekable file objects. Patch by - Florian Festi. - -- Logging: Added QueueListener class to facilitate logging usage for - performance-critical threads. - -- Issue #9916: Add some missing errno symbols. - -- Issue #9877: Expose sysconfig.get_makefile_filename() - -- logging: Added hasHandlers() method to Logger and LoggerAdapter. - -- Issue #9908: Fix os.stat() on bytes paths under Windows 7. - -- Issue #2643: msync() is not called anymore when deallocating an open mmap - object, only munmap(). - -- logging: Changed LoggerAdapter implementation internally, to make it easier to - subclass in a useful way. - -- logging: hasHandlers method was added to Logger, and isEnabledFor, - getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter. - LoggerAdapter was introduced into the unit tests for logging. - -- Issue #1686: Fix string.Template when overriding the pattern attribute. - -- Issue #9854: SocketIO objects now observe the RawIOBase interface in - non-blocking mode: they return None when an operation would block (instead of - raising an exception). - -- Issue #1730136: Fix the comparison between a tk.font.Font and an object of - another kind. - -- Issue #9441: logging has better coverage for rotating file handlers. - -- Issue #9865: collections.OrderedDict now has a __sizeof__ method. - -- Issue #9854: The default read() implementation in io.RawIOBase now handles - non-blocking readinto() returning None correctly. - -- Issue #1552: socket.socketpair() now returns regular socket.socket objects - supporting the whole socket API (rather than the "raw" _socket.socket - objects). - -- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto() - to match the corresponding socket methods. - -- Issue #9840: Added a decorator to reprlib for wrapping __repr__ methods to make - them handle recursive calls within the same thread. - -- logging: Enhanced HTTPHandler with secure and credentials initializers. - -- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X. - -- Issue #9837: The read() method of ZipExtFile objects (as returned by - ZipFile.open()) could return more bytes than requested. - -- Issue #9826: OrderedDict.__repr__ can now handle self-referential values: - d['x'] = d. - -- Issue #9825: Using __del__ in the definition of collections.OrderedDict made - it possible for the user to create self-referencing ordered dictionaries which - become permanently uncollectable GC garbage. Reinstated the Python 3.1 - approach of using weakref proxies so that reference cycles never get created - in the first place. - -- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and - encode the value with filesystem encoding and surrogateescape (instead of - utf-8 in strict mode) . Patch written by David Watson. - -- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING - environment variable to set the filesystem encoding at Python startup. - sys.setfilesystemencoding() creates inconsistencies because it is unable to - reencode all filenames in all objects. - -- Issue #9410: Various optimizations to the pickle module, leading to speedups - up to 4x (depending on the benchmark). Mostly ported from Unladen Swallow; - initial patch by Alexandre Vassalotti. - -- The pprint module now supports printing OrderedDicts in their given order - (formerly, it would sort the keys). - -- Logging: Added QueueHandler class to facilitate logging usage with - multiprocessing. - -- Issue #9707: Rewritten reference implementation of threading.local which is - friendlier towards reference cycles. This change is not normally visible - since an optimized C implementation (_thread._local) is used instead. - -- Issue #6394: os.getppid() is now supported on Windows. Note that it will - still return the id of the parent process after it has exited. This process - id may even have been reused by another unrelated process. - -- Issue #9792: In case of connection failure, socket.create_connection() would - swallow the exception and raise a new one, making it impossible to fetch the - original errno, or to filter timeout errors. Now the original error is - re-raised. - -- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and - the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated - back after the system call. Original patch by Brian Brazil. - -- Updates to the random module: - - * Document which parts of the module are guaranteed to stay the same across - versions and which parts are subject to change. - - * Update the seed() method to use all of the bits in a string instead of just - the hash value. This makes better use of the seed value and assures the - seeding is platform independent. Issue #7889. - - * Improved the random()-->integer algorithm used in choice(), shuffle(), - sample(), randrange(), and randint(). Formerly, it used int(n*random()) - which has a slight bias whenever n is not a power of two. Issue #9025. - - * Improved documentation of arguments to randrange(). Issue #9379. - -- collections.OrderedDict now supports a new method for repositioning keys to - either end. - -- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test - cases now also have assertWarns and assertWarnsRegexp methods to check that a - given warning type was triggered by the code under test. - -- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of - their contents without duplicating them. The view is both readable and - writable. - -- Issue #7566: Implement os.path.sameopenfile for Windows. - -- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an - unsupported operation is attempted (for example, writing to a file open only - for reading). - -- hashlib has two new constant attributes: algorithms_guaranteed and - algorithms_avaiable that respectively list the names of hash algorithms - guaranteed to exist in all Python implementations and the names of hash - algorithms available in the current process. - -- A new package ``concurrent.futures`` as defined by PEP 3148. - -C-API ------ - -- Add PyErr_SyntaxLocationEx, which supports passing a column offset. - -- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or - PySequence_DelSlice when the object doesn't have any mapping operations - defined. - -Tools/Demos ------------ - -- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as - wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb) - and the interpreter under test. - -Tests ------ - -- Issue #9308: Added tests for importing encoded modules that do not - depend on specific stdlib modules being encoded in a certain way. - -- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom - certificate and private key files used by SSL-related certs. - -- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests - in test_os) - -- Issue #7110: regrtest now sends test failure reports and single-failure - tracebacks to stderr rather than stdout. - -- Issue #9628: fix runtests.sh -x option so more than one test can be excluded. - -- Issue #9899: Fix test_tkinter.test_font on various platforms. Patch by Ned - Deily. - -- Issue #9894: Do not hardcode ENOENT in test_subprocess. - -- Issue #9315: Added tests for the trace module. Patch by Eli Bendersky. - -- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the - case when running profile or trace, for example. - -- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. - -Build ------ - -- Issue #10062: Allow building on platforms which do not have sem_timedwait. - -- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by Akira - Kitada. - -- Issue #10055: Make json C89-compliant in UCS4 mode. - -- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows) - -- Issue #1633863: Don't ignore $CC under AIX. - -- Issue #9810: Compile bzip2 source files in Python's project file directly. It - used to be built with bzip2's makefile. - -- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in - module. - -- Issue #9806: python-config now has an ``--extension-suffix`` option that - outputs the suffix for dynamic libraries including the ABI version name - defined by PEP 3149. - -- Issue #941346: Improve the build process under AIX and allow Python to be - built as a shared library. Patch by S?bastien Sabl?. - -- Issue #4026: Make the fcntl extension build under AIX. Patch by S?bastien - Sabl?. - -- Issue #9701: The MacOSX installer can patch the shell profile to ensure that - the "bin" directory inside the framework is on the shell's search path. This - feature now also supports the ZSH shell. - - -What's New in Python 3.2 Alpha 2? -================================= - -*Release date: 05-Sep-2010* - -Core and Builtins ------------------ - -- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by - the new (and simpler) DUP_TOP_TWO. Performance isn't changed, but our - bytecode is a bit simplified. Patch by Demur Rumed. - -- Issue #9766: Rename poorly named variables exposed by _warnings to prevent - confusion with the proper variables names from 'warnings' itself. - -- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to - conform to the Set ABC. Patch by Daniel Urban. - -- Issue #9737: Fix a crash when trying to delete a slice or an item from a - memoryview object. - -- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are - now removed, since their effect was inexistent in 3.x (the default encoding is - hardcoded to utf-8 and cannot be changed). - -- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API - properly. Patch by Stefan Behnel. - -- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most - platforms. Previously, it inlined only when using Microsoft Visual C. - -- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. - -- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. - -- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match - the pyconfig.h generated by configure on other systems. - -- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that - occur during attribute lookup are now propagated to the caller. - -- Issue #8622: Add PYTHONFSENCODING environment variable to override the - filesystem encoding. - -- Issue #5127: The C functions that access the Unicode Database now accept and - return characters from the full Unicode range, even on narrow unicode builds - (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others). A visible difference - in Python is that unicodedata.numeric() now returns the correct value for - large code points, and repr() may consider more characters as printable. - -- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename - as a unicode object, instead of a byte string. Function needed to support - unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new - function. - -- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx(). - -- Issue #9612: The set object is now 64-bit clean under Windows. - -- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for - the module file to be executed with the -m command line option. - -- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to - write a message formatted by PyUnicode_FromFormatV() to sys.stdout and - sys.stderr. - -- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter: - decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str - objects are output as-is. - -- Issue #9203: Computed gotos are now enabled by default on supported compilers - (which are detected by the configure script). They can still be disable - selectively by specifying --without-computed-gotos. - -- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but - use PyUnicode_FromFormatV() to format the warning message. - -- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an - array. - -- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. - -- Issue #9337: The str() of a float or complex number is now identical to its - repr(). - -- Issue #9416: Fix some issues with complex formatting where the output with no - type specifier failed to match the str output: - - - format(complex(-0.0, 2.0), '-') omitted the real part from the output, - - format(complex(0.0, 2.0), '-') included a sign and parentheses. - -Extension Modules ------------------ - -- Issue #8013: time.asctime and time.ctime no longer call system - asctime and ctime functions. The year range for time.asctime is now - 1900 through maxint. The range for time.ctime is the same as for - time.localtime. The string produced by these functions is longer - than 24 characters when year is greater than 9999. - -- Issue #6608: time.asctime is now checking struct tm fields its input - before passing it to the system asctime. Patch by MunSic Jeong. - -- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file - descriptor is provided. Patch by Pascal Chambon. - -- Issue #7736: Release the GIL around calls to opendir() and closedir() in the - posix module. Patch by Marcin Bachry. - -- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the - socket module, and fix the width of socket descriptors to be correctly - detected under 64-bit Windows. - -- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo - and gethostbyaddr. getnameinfo is now restricted to numeric addresses as - input. - -- Issue #9214: Set operations on a KeysView or ItemsView in collections now - correctly return a set. Patch by Eli Bendersky. - -- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by - Matthew Ahrens. - -- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using - the surrogate error handler. - -- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other - than ``TypeError`` raised by the iterator argument. - -- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo. - -- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter - Lock around all system calls. Original patch by Ryan Kelly. - -- Issue #8524: Add a detach() method to socket objects, so as to put the socket - into the closed state without closing the underlying file descriptor. - -- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty. - -- Issue #6869: Fix a refcount problem in the _ctypes extension. - -- Issue #5504: ctypes should now work with systems where mmap can't be - PROT_WRITE and PROT_EXEC. - -- Issue #9507: Named tuple repr will now automatically display the right name in - a tuple subclass. - -- Issue #9324: Add parameter validation to signal.signal on Windows in order to - prevent crashes. - -- Issue #9526: Remove some outdated (int) casts that were preventing the array - module from working correctly with arrays of more than 2**31 elements. - -- Fix memory leak in ssl._ssl._test_decode_cert. - -- Issue #8065: Fix memory leak in readline module (from failure to free the - result of history_get_history_state()). - -- Issue #9450: Fix memory leak in readline.replace_history_item and - readline.remove_history_item for readline version >= 5.0. - -- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. - -- Issue #8046: Add context manager protocol support and .closed property to mmap - objects. - -Library -------- - -- Issue #7451: Improve decoding performance of JSON objects, and reduce the - memory consumption of said decoded objects when they use the same strings as - keys. - -- Issue #1100562: Fix deep-copying of objects derived from the list and dict - types. Patch by Michele Orr? and Bj?rn Lindqvist. - -- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows. - -- Issue #9421: Made the get methods consistently accept the vars and - default arguments on all parser classes. - -- Issue #7005: Fixed output of None values for RawConfigParser.write and - ConfigParser.write. - -- Issue #8990: array.fromstring() and array.tostring() get renamed to - frombytes() and tobytes(), respectively, to avoid confusion. Furthermore, - array.frombytes(), array.extend() as well as the array.array() constructor now - accept bytearray objects. Patch by Thomas Jollans. - -- Issue #808164: Fixed socket.close to avoid references to globals, to avoid - issues when socket.close is called from a __del__ method. - -- Issue #9706: ssl module provides a better error handling in various - circumstances. - -- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting - rid of the cached copy of thread-local attribute dictionary. - -- Issue #1512791: In setframerate() in the wave module, non-integral frame rates - are rounded to the nearest integer. - -- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of - falling into recursion. - -- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four - character years even if the message contains RFC822 two character years. - -- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive - operations on its self, namely x -= x and x ^= x. - -- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error - handling when accepting a new connection. - -- Issue #9601: ftplib now provides a workaround for non-compliant - implementations such as IIS shipped with Windows server 2003 returning invalid - response codes for MKD and PWD commands. - -- Issue #658749: asyncore's connect() method now correctly interprets winsock - errors. - -- Issue #9501: Fixed logging regressions in cleanup code. - -- Fix functools.total_ordering() to skip methods inherited from object. - -- Issue #9572: Importlib should not raise an exception if a directory it thought - it needed to create was done concurrently by another process. - -- Issue #9617: Signals received during a low-level write operation aren't - ignored by the buffered IO layer anymore. - -- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding. - -- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape - error handler, or strict error handler on Windows. - -- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and - ``gzip.decompress``. Original patch by Anand B. Pillai. - -- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a - ssl.SSLContext object allowing bundling SSL configuration options, - certificates and private keys into a single (potentially long-lived) - structure. - -- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as - single keyword arguments. - -- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py - compiler flag values over defining its own. - -- Issue #9147: Added dis.code_info() which is similar to show_code() but returns - formatted code information in a string rather than displaying on screen. - -- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute - pointing to the original callable. - -- Issue #3445: functools.update_wrapper now tolerates missing attributes on - wrapped callables. - -- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod. - -- Issue #9605: posix.getlogin() decodes the username with file filesystem - encoding and surrogateescape error handler. Patch written by David Watson. - -- Issue #9604: posix.initgroups() encodes the username using the fileystem - encoding and surrogateescape error handler. Patch written by David Watson. - -- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name - using the filesystem encoding and surrogateescape error handler. Patch written - by David Watson. - -- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants, - for use with the statvfs() function. Patch by Adam Jackson. - -- Issue #8688: MANIFEST files created by distutils now include a magic comment - indicating they are generated. Manually maintained MANIFESTs without this - marker will not be overwritten or removed. - -- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a - BadZipfile error is raised if it doesn't match (as used to be the case in - Python 2.5 and earlier). - -- Issue #9550: a BufferedReader could issue an additional read when the original - read request had been satisfied, which could block indefinitely when the - underlying raw IO channel was e.g. a socket. Report and original patch by - Jason V. Miller. - -- Issue #3757: thread-local objects now support cyclic garbage collection. - Thread-local objects involved in reference cycles will be deallocated timely - by the cyclic GC, even if the underlying thread is still running. - -- Issue #9452: Add read_file, read_string, and read_dict to the configparser - API; new source attribute to exceptions. - -- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current - node. - -- Issue #8047: Fix the xml.etree serializer to return bytes by default. Use - ``encoding="unicode"`` to generate a Unicode string. - -- Issue #8280: urllib2's Request method will remove fragments in the url. This - is how it is supposed to work, wget and curl do the same. Previous behavior - was wrong. - -- Issue #6683: For SMTP logins we now try all authentication methods advertised - by the server. Many servers are buggy and advertise authentication methods - they do not support in reality. - -- Issue #8814: function annotations (the ``__annotations__`` attribute) are now - included in the set of attributes copied by default by functools.wraps and - functools.update_wrapper. Patch by Terrence Cole. - -- Issue #2944: asyncore doesn't handle connection refused correctly. - -- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate - the private attributes. Add tests for smtpd module. - -- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word - encoded in base64 is lacking padding. - -- Issue #9444: Argparse now uses the first element of prefix_chars as the option - character for the added 'h/help' option if prefix_chars does not contain a - '-', instead of raising an error. - -- Issue #7372: Fix pstats regression when stripping paths from profile data - generated with the profile module. - -- Issue #9428: Fix running scripts with the profile/cProfile modules from the - command line. - -- Issue #7781: Fix restricting stats by entry counts in the pstats interactive - browser. - -- Issue #9209: Do not crash in the pstats interactive browser on invalid regular - expressions. - -- Update collections.OrderedDict to match the implementation in Py2.7 (based on - lists instead of weakly referenced Link objects). - -- Issue #8397: Raise an error when attempting to mix iteration and regular reads - on a BZ2File object, rather than returning incorrect results. - -- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when - re-initializing a buffered IO object by calling its ``__init__`` method. - -- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links - across devices. - -- Issue #8826: Properly load old-style "expires" attribute in http.cookies. - -- Issue #1690103: Fix initial namespace for code run with trace.main(). - -- Issue #7395: Fix tracebacks in pstats interactive browser. - -- Issue #8230: Fix Lib/test/sortperf.py. - -- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final - newline, it no longer truncates the last character of the last command line. - -- Issue #5146: Handle UID THREAD command correctly in imaplib. - -- Issue #5147: Fix the header generated for cookie files written by - http.cookiejar.MozillaCookieJar. - -- Issue #8198: In pydoc, output all help text to the correct stream when - sys.stdout is reassigned. - -- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` - in ntpath.normpath(). - -- Issue #1286: Allow using fileinput.FileInput as a context manager. - -- Add lru_cache() decorator to the functools module. - -Tools/Demos ------------ - -- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147. - -- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing - non-ASCII content. - -Tests ------ - -- Issue #9601: Provide a test case for ftplib.parse257. - -- Issue #8857: Provide a test case for socket.getaddrinfo. - -- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. - -- Issue #8433: Fix test_curses failure with newer versions of ncurses. - -- Issue #9496: Provide a test suite for the rlcompleter module. Patch by - Michele Orr?. - -- Issue #8687: provide a test suite for sched.py module. - -Build ------ - -- Issue #1303434: Generate ZIP file containing all PDBs. - -- Issue #9193: PEP 3149 is accepted. - -- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F() - become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively. - -- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by - S?bastien Sabl?. - -- Don't run pgen twice when using make -j. - - -What's New in Python 3.2 Alpha 1? -================================= - -*Release date: 01-Aug-2010* - -Core and Builtins ------------------ - -- Issue #8991: convertbuffer() rejects discontigious buffers. - -- Issue #7616: Fix copying of overlapping memoryview slices with the Intel - compiler. - -- Issue #8413: structsequence now subclasses tuple. - -- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the - start byte and the continuation byte(s) are now considered invalid, instead of - the number of bytes specified by the start byte. E.g.: - '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces - with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80') - even if '\xf1' is the start byte of a 4-bytes sequence. Previous versions - returned a single u'\ufffd'. - -- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0 - rather than 0.0. So "-7j" is now exactly equivalent to "-(7j)". - -- Be more specific in error messages about positional arguments. - -- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes - objects, as described in the documentation. - -- Issue #6543: Write the traceback in the terminal encoding instead of utf-8. - Fix the encoding of the modules filename. Patch written by Amaury Forgeot - d'Arc. - -- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code - dealing with unary minus applied to a constant. The removed code was mutating - the ST, causing a second compilation to fail. - -- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict - mode raises unicode errors. The encoder only supports "strict" and "replace" - error handlers, the decoder only supports "strict" and "ignore" error - handlers. Patch written by Mark Hammond. - -- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use - "w*" format instead. Add tests for "w*" format. - -- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z" - formats if the string contains a null byte/character. Write unit tests for - string formats. - -- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test - suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module - location of the raised exception. - -- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode - filenames and enable os.fsencode(). - -- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. - -- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the - interpreter with characters outside the Basic Multilingual Plane (higher than - 0x10000). - -- Issue #8950: (See also issue #5080). Py_ArgParse*() functions now raise - TypeError instead of giving a DeprecationWarning when a float is parsed using - the 'L' code (for long long). (All other integer codes already raise - TypeError in this case.) - -- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to - enable shortcuts for upper case encoding name. Add also a shortcut for - "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode(). - -- Issue #8838: Remove codecs.charbuffer_encode() function. The buffer protocol - doesn't support "char buffer" anymore in Python 3. - -- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*" - instead. codecs.charbuffer_encode() now accepts modifiable buffer objects - like bytearray. - -- Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no - used anymore and it was never documented. - -- In str.format(), raise a ValueError when indexes to arguments are too large. - -- Issue #2844: Make int('42', n) consistently raise ValueError for invalid - integers n (including n = -909). - -- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances - of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it - easy to maintain the invariant that hash(x) == hash(y) whenever x and y have - equal value. - -- Issue #8748: Fix two issues with comparisons between complex and integer - objects. (1) The comparison could incorrectly return True in some cases - (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality. - (2) The comparison raised an OverflowError for large integers, leading to - unpredictable exceptions when combining integers and complex objects in sets - or dicts. - -- Issue #8766: Initialize _warnings module before importing the first module. - Fix a crash if an empty directory called "encodings" exists in sys.path. - -- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system - encoding and surrogateescape error handler instead of the locale encoding to - be consistent with os.environ. Add PySys_AddWarnOptionUnicode() function. - -- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead - of strict) error handler to escape surrogates. - -- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode - object to Py_FileSystemDefaultEncoding with the "surrogateescape" error - handler, and return bytes. If Py_FileSystemDefaultEncoding is not set, fall - back to UTF-8. - -- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any - error handler, not only the default error handler (strict). - -- Issue #8610: Load file system codec at startup, and display a fatal error on - failure. Set the file system encoding to utf-8 (instead of None) if getting - the locale encoding failed, or if nl_langinfo(CODESET) function is missing. - -- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of - PyUnicode_FromString() to support surrogates in the filename and use the right - encoding. - -- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells. - -- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler. - -- Issue #8419: Prevent the dict constructor from accepting non-string keyword - arguments. - -- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute - indirectly Python signal handlers anymore because mywrite() ignores exceptions - (KeyboardInterrupt). - -- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing - unicode string (eg. backslashreplace). - -- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects - anymore, you have to convert your bytearray filenames to bytes. - -- Issue #7332: Remove the 16KB stack-based buffer in - PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit - compared to the dynamic memory allocation fallback. Patch by Charles-Fran?ois - Natali. - -- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is - passed to bytes or bytearray. - -- Issue #7301: Add environment variable $PYTHONWARNINGS. - -- Issue #8329: Don't return the same lists from select.select when no fds are - changed. - -- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on - 64-bit machines. The shift count for either left or right shift is permitted - to be up to sys.maxsize. - -- Ensure that tokenization of identifiers is not affected by locale. - -- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever. - -- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. - -- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it - is set. - -- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding - is unknown. - -- Issue #1583863: A str subclass can now override the __str__ method. - -- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with - PyMemberDefs could produce an internal error; raise TypeError instead. - -- Issue #7845: Rich comparison methods on the complex type now return - NotImplemented rather than raising a TypeError when comparing with an - incompatible type; this allows user-defined classes to implement their own - comparisons with complex. - -- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt - (SIGINT). If an error occurs while importing the site module, the error is - printed and Python exits. Initialize the GIL before importing the site module. - -- Issue #7173: Generator finalization could invalidate sys.exc_info(). - -- Issue #7544: Preallocate thread memory before creating the thread to avoid a - fatal error in low memory condition. - -- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM - check fails. - -- Handle errors from looking up __prepare__ correctly. - -- Issue #5939: Add additional runtime checking to ensure a valid capsule in - Modules/_ctypes/callproc.c. - -- Issue #7309: Fix unchecked attribute access when converting - UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings. - -- Issue #6902: Fix problem with built-in types format incorrectly with 0 - padding. - -- Issue #7988: Fix default alignment to be right aligned for complex.__format__. - Now it matches other numeric types. - -- Issue #5988: Remove deprecated functions PyOS_ascii_formatd, - PyOS_ascii_strtod, and PyOS_ascii_atof. Use PyOS_double_to_string and - PyOS_string_to_double instead. See issue #5835 for the original deprecations. - -- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` - fails. Patch by Florent Xicluna. - -- Issue #7788: Fix an interpreter crash produced by deleting a list slice with - very large step value. - -- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and - add the additional members returned in an OSVERSIONINFOEX structure. The new - members are service_pack_major, service_pack_minor, suite_mask, and - product_type. - -- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could - crash in many places because of the PyByteArray_AS_STRING() macro returning - NULL. The macro now returns a statically allocated empty string instead. - -- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`, - where the right hand operand is a set of constants, by turning the set into a - frozenset and pre-building it as a constant. The comparison operation is made - against the constant instead of building a new set each time it is executed (a - similar optimization already existed which turned a list of constants into a - pre-built tuple). Patch and additional tests by Dave Malcolm. - -- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods - of bytes, bytearray and unicode objects by using a common implementation based - on stringlib's fast search. Patch by Florent Xicluna. - -- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2, - including: (1) a serious 'wrong output' bug that could occur for long (> 40 - digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when - parsing certain long numeric strings corresponding to subnormal values, (3) a - memory leak for some values large enough to cause overflow, and (4) a number - of flaws that could lead to incorrectly rounded results. - -- The __complex__ method is now looked up on the class of instances to make it - consistent with other special methods. - -- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, - `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. - -- Issue #7604: Deleting an unset slotted attribute did not raise an - AttributeError. - -- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero) - in ** operator. The behaviour now conforms to that described in C99 Annex F. - -- Issue #1811: improve accuracy and cross-platform consistency for true division - of integers: the result of a/b is now correctly rounded for ints a and b (at - least on IEEE 754 platforms), and in particular does not depend on the - internal representation of an int. - -- Issue #6834: replace the implementation for the 'python' and 'pythonw' - executables on OSX. - - These executables now work properly with the arch(1) command: ``arch -ppc - python`` will start a universal binary version of python in PPC mode (unlike - previous releases). - -- Issue #7466: Segmentation fault when the garbage collector is called in the - middle of populating a tuple. Patch by Florent Xicluna. - -- Issue #7419: setlocale() could crash the interpreter on Windows when called - with invalid values. - -- Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+" - mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z). - -- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX - 10.6. - -- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding. - -- Issue #6970: Remove redundant calls when comparing objects that don't - implement the relevant rich comparison methods. - -- Issue #7298: Fixes for range and reversed(range(...)). Iteration over - range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C - long but the length of the range did not. Also fix several cases where - reversed(range(a, b, c)) gave wrong results, and fix a refleak for - reversed(range(a, b, c)) with large arguments. - -- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised - during the formation of an output tuple. - -- Issue #3297: On wide unicode builds, do not split unicode characters into - surrogates. - -- Remove length limitation when constructing a complex number from a string. - -- Issue #1087418: Boost performance of bitwise operations for longs. - -- Support for AtheOS has been completely removed from the code base. It was - disabled since Python 3.0. - -- Support for several legacy threading libraries has been disabled. These - libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code - will be entirely removed in 3.3. - -- Support for OSF* has been disabled. If nobody stands up, support will be - removed in 3.3. See . - -- Peephole constant folding had missed UNARY_POSITIVE. - -- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which - fixes the problem of some exceptions being thrown at shutdown when the - interpreter is killed. Patch by Adam Olsen. - -- Issue #7147: Remove support for compiling Python without complex number - support. - -- Issue #7120: logging: Removed import of multiprocessing which is causing crash - in GAE. - -- Issue #1754094: Improve the stack depth calculation in the compiler. There - should be no other effect than a small decrease in memory use. Patch by - Christopher Tur Lesniewski-Laas. - -- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using - byte values greater than 127. Patch by Derk Drukker. - -- Issue #1571184: The Unicode database contains properties for more characters. - The tables for code points representing numeric values, white spaces or line - breaks are now generated from the official Unicode Character Database files, - and include information from the Unihan.txt file. - -- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of - producing internally inconsistent Python longs. - -- Issue #6990: Fix threading.local subclasses leaving old state around after a - reference cycle GC which could be recycled by new locals. - -- Issue #5460: Fix an ambiguity in the grammar. - -- Issue #1766304: Improve performance of membership tests on range objects. - -- Issue #6713: Improve performance of integer -> string conversions. - -- Issue #6846: Fix bug where bytearray.pop() returns negative integers. - -- Issue #6750: A text file opened with io.open() could duplicate its output when - writing from multiple threads at the same time. - -- Issue #6707: dir() on an uninitialized module caused a crash. - -- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. - -- Issue #6573: set.union() stopped processing inputs if an instance of self - occurred in the argument chain. - -- Issue #6070: On posix platforms import no longer copies the execute bit from - the .py file to the .pyc file if it is set. - -- Issue #1616979: Added the cp720 (Arabic DOS) encoding. - -- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object, - and not an int. Fix the corresponding error message, and the documentation. - -- The deprecated PyCObject has been removed. - -- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h. This fixes a - build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead - of stdint.h on that platform. - -- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the - 'surrogateescape' error handler, a string which contains unpaired surrogates. - -- Issue #4856: Remove checks for win NT. - -- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument - to construct a null-initialized bytes object. - -- Issue #1023290: Add from_bytes() and to_bytes() methods to integers. These - methods allow the conversion of integers to bytes, and vice-versa. - -- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances - from being copied with copy.copy(), and bytes subclasses from being pickled - properly. - -- Code objects now support weak references. - -- Issue #7072: isspace(0xa0) is true on Mac OS X. - -- Issue #8084: PEP 370 now conforms to system conventions for framework builds - on MacOS X. That is, "python setup.py install --user" will install into - "~/Library/Python/2.7" instead of "~/.local". - -C-API ------ - -- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the - variable argument list. `Py_VA_COPY` is equivalent to C99 - `va_copy`, but available on all python platforms. - -- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX] - instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX]. This makes it safe to do - "step = -step" when reversing a slice. - -- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the - interpreter to set sys.argv without also modifying sys.path. This helps fix - `CVE-2008-5983 - `_. - -- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are - strings in an efficient manner. - -- Issue #8276: PyEval_CallObject() is now only available in macro form. The - function declaration, which was kept for backwards compatibility reasons, is - now removed (the macro was introduced in 1997!). - -- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to - PyLong_AsLongAndOverflow. - -- Make PyUnicode_CompareWithASCIIString return not equal if the Python string - has '\0' at the end. - -- Issue #5080: The argument parsing functions PyArg_ParseTuple, - PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and - PyArg_Parse now raise a DeprecationWarning for float arguments passed with the - 'L' format code. This will become a TypeError in a future version of Python, - to match the behaviour of the other integer format codes. - -- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added. - -- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in - PyArg_ParseTupleAndKeywords. - -- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and - PyErr_Format, on machines with HAVE_LONG_LONG defined. - -- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in - PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for - accessing the d_type and d_name members of structures using PyDescr_COMMON. - -- Issue #6405: Remove duplicate type declarations in descrobject.h. - -- The code flags for old __future__ features are now available again. - -- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of - PyCode_Addr2Line(). - -- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code - object at a specified file, function, and line number. - -- Issue #1419652: Change the first argument to PyImport_AppendInittab() to - ``const char *`` as the string is stored beyond the call. - -- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc - allocator will be automatically disabled when running under Valgrind. This - gives improved memory leak detection when running under Valgrind, while taking - advantage of pymalloc at other times. - -Library -------- - -- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the - old commands are restored. - -- For traceback debugging, the pdb listing now also shows the locations where - the exception was originally (re)raised, if it differs from the last line - executed (e.g. in case of finally clauses). - -- The pdb command "source" has been added. It displays the source code for a - given object, if possible. - -- The pdb command "longlist" has been added. It displays the whole source code - for the current function. - -- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error - output into methods. - -- Issue #809887: Make the output of pdb's breakpoint deletions more consistent; - emit a message when a breakpoint is enabled or disabled. - -- Issue #5294: Fix the behavior of pdb's "continue" command when called in the - top-level debugged frame. - -- Issue #5727: Restore the ability to use readline when calling into pdb in - doctests. - -- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the - source file to be debugged is in a non-builtin encoding. - -- Issue #8048: Prevent doctests from failing when sys.displayhook has been - reassigned. - -- Issue #8015: In pdb, do not crash when an empty line is entered as a - breakpoint command. - -- In pdb, allow giving a line number to the "until" command. - -- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc - files. Also, add a command-line option "-c" that runs a command as if given - in .pdbrc. - -- Issue #4179: In pdb, allow "list ." as a command to return to the currently - debugged line. - -- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *`` - entries, consider the first one. - -- Issue #6630: Allow customizing regex flags when subclassing the - string.Template class. - -- Issue #9411: Allow specifying an encoding for config files in the configparser - module. - -- Issue #1682942: Improvements to configparser: support alternate delimiters, - alternate comment prefixes and empty lines in values. - -- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. - -- Issue #8966: ctypes: Remove implicit bytes-unicode conversion. - -- Issue #9378: python -m pickle will now load and display the - first object in the pickle file. - -- Issue #4770: Restrict binascii module to accept only bytes (as specified). - And fix the email package to encode to ASCII instead of ``raw-unicode-escape`` - before ASCII-to-binary decoding. - -- Issue #9384: ``python -m tkinter`` will now display a simple demo applet. - -- The default size of the re module's compiled regular expression cache has been - increased from 100 to 500 and the cache replacement policy has changed from - simply clearing the entire cache on overflow to forgetting the least recently - used cached compiled regular expressions. This is a performance win for - applications that use a lot of regular expressions and limits the impact of - the performance hit anytime the cache is exceeded. - -- Issue #7113: Speed up loading in configparser. Patch by ?ukasz Langa. - -- Issue #9032: XML-RPC client retries the request on EPIPE error. The EPIPE - error occurs when the server closes the socket and the client sends a big - XML-RPC request. - -- Issue #4629: getopt raises an error if an argument ends with "=", whereas - getopt doesn't accept a value (eg. --help= is rejected if getopt uses - ['help='] long options). - -- Issue #7989: Added pure python implementation of the `datetime` module. The C - module is renamed to `_datetime` and if available, overrides all classes - defined in datetime with fast C impementation. Python implementation is based - on the original python prototype for the datetime module by Tim Peters with - minor modifications by the PyPy project. The test suite now tests `datetime` - module with and without `_datetime` acceleration using the same test cases. - -- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). - -- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the - script being traced. Patch by Eli Bendersky. - -- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for - the patch. - -- Issue #3704: http.cookiejar was not properly handling URLs with a / in the - parameters. - -- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument - which controls printing of opcode descriptions in ``dis()`` output. - -- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo - crosses an 8192 byte boundary. - -- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee. - -- ``ast.literal_eval()`` now allows byte literals. - -- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated - keyword arguments called 'self' or 'other' specially. - -- ``ast.literal_eval()`` now allows set literals. - -- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS. - -- Issue #7646: The fnmatch pattern cache no longer grows without bound. - -- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError - produced when profiling the decimal module. This was due to a dangerous - iteration over 'locals()' in Context.__init__. - -- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10 - and the exponent is tiny (for example, ``Decimal(10) ** - Decimal('1e-999999999')``). - -- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError. - -- Issue #9130: Fix validation of relative imports in parser module. - -- Issue #9128: Fix validation of class decorators in parser module. - -- Issue #9094: python -m pickletools will now disassemble pickle files listed in - the command line arguments. See output of python -m pickletools -h for more - details. - -- Issue #5468: urlencode to handle bytes type and other encodings in its query - parameter. Patch by Dan Mahn. - -- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, - ensure that the input string length is a multiple of the frame size. - -- Issue #6507: Accept source strings in dis.dis(). Original patch by Daniel - Urban. - -- Issue #7829: Clearly document that the dis module is exposing an - implementation detail that is not stable between Python VMs or releases. - -- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor - raises an exception. - -- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs - that act as both context managers and decorators. contextmanager changes to - use ContextDecorator. - -- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader - for removal in Python 3.4. - -- Issue #9064: pdb's "up" and "down" commands now accept an optional argument - giving the number of frames to go. - -- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not - ``str`` or ``bytes``. - -- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an - OpenSSL structure. - -- Issue #8682: The ssl module now temporary increments the reference count of a - socket object got through ``PyWeakref_GetObject``, so as to avoid possible - deallocation while the object is still being used. - -- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong - password instead of presenting an interactive prompt. Older behavior can be - obtained by passing retry=True to http_error_xxx methods of FancyURLOpener. - -- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile - smart enough to find source files in the linecache. - -- Issue #5610: feedparser no longer eats extra characters at the end of a body - part if the body part ends with a ``\r\n``. - -- Issue #8986: math.erfc was incorrectly raising OverflowError for values - between -27.3 and -30.0 on some platforms. - -- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows. - -- Issue #8966: If a ctypes structure field is an array of c_char, convert its - value to bytes instead of str (as done for c_char and c_char_p). - -- Issue #8188: Comparisons between Decimal and Fraction objects are now - permitted, returning a result based on the exact numerical values of the - operands. This builds on issue #2531, which allowed Decimal-to-float - comparisons; all comparisons involving numeric types (bool, int, float, - complex, Decimal, Fraction) should now act as expected. - -- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by - Thomas Jollans. - -- Issue #8899: time.struct_time now has class and attribute docstrings. - -- Issue #6470: Drop UNC prefix in FixTk. - -- Issue #4768: base64 encoded email body parts were incorrectly stored as binary - strings. They are now correctly converted to strings. - -- Issue #8833: tarfile created hard link entries with a size field != 0 by - mistake. - -- Charset.body_encode now correctly handles base64 encoding by encoding with the - output_charset before calling base64mime.encode. Passes the tests from 2.x - issue #1368247. - -- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction - attribute that is True iff there are uncommitted changes. - -- Issue #1289118: datetime.timedelta objects can now be multiplied by float and - divided by float and int objects. Results are rounded to the nearest multiple - of timedelta.resolution with ties resolved using round-half-to-even method. - -- Issue #7150: Raise OverflowError if the result of adding or subtracting - timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. - -- Issue #8806: add SSL contexts support to ftplib. - -- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer - and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes - API. - -- Issue #8770: Now sysconfig displays information when it's called as a script. - Initial idea by Sridhar Ratnakumar. - -- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by - Fredrik H??rd. - -- Issue #8540: Decimal module: rename the Context._clamp attribute to - Context.clamp and make it public. This is useful in creating contexts that - correspond to the decimal interchange formats specified in IEEE 754. - -- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM - twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and - StreamWriter classes. - -- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead - of the C file stderr, to use stderr encoding and error handler. - -- Issue #8782: Add a trailing newline in linecache.updatecache to the last line - of files without one. - -- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when - comparing to a non-mapping. - -- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the - correct encoding. - -- Issue #4870: Add an `options` attribute to SSL contexts, as well as several - ``OP_*`` constants to the `ssl` module. This allows to selectively disable - protocol versions, when used in combination with `PROTOCOL_SSLv23`. - -- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. - -- Issue #8663: distutils.log emulates backslashreplace error handler. Fix - compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if - stdout is not a TTY). - -- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value. - subprocess.Popen() and os._execvpe() support bytes program name. Add - os.supports_bytes_environ flag: True if the native OS type of the environment - is bytes (eg. False on Windows). - -- Issue #8633: tarfile is now able to read and write archives with "raw" binary - pax headers as described in POSIX.1-2008. - -- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes, - unquote, unquote_to_bytes. - -- Issue #8688: Distutils now recalculates MANIFEST everytime. - -- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with - surrogates and bytes for the filename. - -- Issue #8550: Add first class ``SSLContext`` objects to the ssl module. - -- Issue #8681: Make the zlib module's error messages more informative when the - zlib itself doesn't give any detailed explanation. - -- The audioop module now supports sound fragments of length greater than 2**31 - bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN. - -- Issue #4972: Add support for the context manager protocol to the ftplib.FTP - class. - -- Issue #8664: In py_compile, create __pycache__ when the compiled path is - given. - -- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes - for use in the file system, environment variables or the command line. - -- Issue #8571: Fix an internal error when compressing or decompressing a chunk - larger than 1GB with the zlib module's compressor and decompressor objects. - -- Issue #8603: Support bytes environmental variables on Unix: Add os.environb - mapping and os.getenvb() function. os.unsetenv() encodes str argument to the - file system encoding with the surrogateescape error handler (instead of - utf8/strict) and accepts bytes. posix.environ keys and values are now bytes. - -- Issue #8573: asyncore _strerror() function might throw ValueError. - -- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error - messages when accessing undefined class attributes because of the cheap - inheritance with the underlying socket object. The cheap inheritance has been - deprecated. - -- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. - Patch by Tres Seaver. - -- Issue #8390: tarfile uses surrogateescape as the default error handler - (instead of replace in read mode or strict in write mode). - -- Issue #7755: Use an unencumbered audio file for tests. - -- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent - and any children created using ``os.fork`` on MacOS X 10.6. - -- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal - operation raises multiple signals and more than one of those signals is - trapped, the specification determines the order in which the signals should be - handled. In many cases this order wasn't being followed, leading to the wrong - Python exception being raised. - -- Issue #7865: The close() method of ``io`` objects should not swallow - exceptions raised by the implicit flush(). Also qensure that calling close() - several times is supported. Patch by Pascal Chambon. - -- Issue #4687: Fix accuracy of garbage collection runtimes displayed with - gc.DEBUG_STATS. - -- Issue #8354: The siginterrupt setting is now preserved for all signals, not - just SIGCHLD. - -- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does - webbrowser.get("safari"). - -- Issue #8464: tarfile no longer creates files with execute permissions set when - mode="w|" is used. - -- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of - the Linux kernel. Patch by Yaniv Aknin. - -- Issue #8295: Added shutil.unpack_archive. - -- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. - It should correctly return an empty response now. - -- Issue #8546: Reject None given as the buffering argument to _pyio.open. - -- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by - Sridhar Ratnakumar. - -- Issue #6656: fix locale.format_string to handle escaped percents - and mappings. - -- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where - the method could block indefinitely if called just before the event loop - started running. This also fixes the occasional freezes witnessed in - test_httpservers. - -- Issue #8524: When creating an SSL socket, the timeout value of the original - socket wasn't retained (instead, a socket with a positive timeout would be - turned into a non-blocking SSL socket). - -- Issue #5103: SSL handshake would ignore the socket timeout and block - indefinitely if the other end didn't respond. - -- The do_handshake() method of SSL objects now adjusts the blocking mode of the - SSL structure if necessary (as other methods already do). - -- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and - bytes strings for environment keys and values. - -- Issue #8467: Pure Python implementation of subprocess encodes the error - message using surrogatepass error handler to support surrogates in the - message. - -- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames. - -- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the - string "python" as the *ident*. openlog() arguments are all optional and - keywords. - -- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a - non-infinite timeout. Also make that method friendlier with applications - wanting to continue using the socket in clear-text mode, by disabling - OpenSSL's internal readahead. Thanks to Darryl Miles for guidance. - -- Issue #8496: make mailcap.lookup() always return a list, rather than an - iterator. Patch by Gregory Nofi. - -- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the - collation name contains a surrogate character. - -- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl - extension, such that verification of some SSL certificates doesn't fail - because of an "unknown algorithm". - -- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree. - -- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree. - -- Issue #4814: timeout parameter is now applied also for connections resulting - from PORT/EPRT commands. - -- Issue #8463: added missing reference to bztar in shutil's documentation. - -- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as - long as the user didn't specify 'automatic proxy configuration'). - -- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code - as stated in RFC-959 at chapter 5.4. - -- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with - surrogates. - -- Issue #850728: Add a *timeout* parameter to the `acquire()` method of - `threading.Semaphore` objects. Original patch by Torsten Landschoff. - -- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the - available cipher list. Helps fix test_ssl with OpenSSL 1.0.0. - -- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for - the current working directory. - -- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII - using backslashreplace error handler. - -- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. - -- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony - Locke and Hans Ulrich Niedermann. - -- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. - -- Issue #7316: The acquire() method of lock objects in the ``threading`` - module now takes an optional timeout argument in seconds. Timeout support - relies on the system threading library, so as to avoid a semi-busy wait loop. - -- Issue #8383: pickle and pickletools use surrogatepass error handler when - encoding unicode as utf8 to support lone surrogates and stay compatible with - Python 2.x and 3.x. - -- Issue #7585: difflib context and unified diffs now place a tab between - filename and date, conforming to the 'standards' they were originally designed - to follow. This improves compatibility with patch tools. - -- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 - character sets will now consistently use a Content-Transfer-Encoding of 7bit - rather than sometimes being marked as 8bit. - -- Issue #8375: test_distutils now checks if the temporary directory are still - present before it cleans them. - -- Issue #8374: Update the internal alias table in the ``locale`` module to - cover recent locale changes and additions. - -- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module, - using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and - `ssl.OPENSSL_VERSION_NUMBER`. - -- Add functools.total_ordering() and functools.cmp_to_key(). - -- Issue #8257: The Decimal construct now accepts a float instance directly, - converting that float to a Decimal of equal value: - - >>> Decimal(1.1) - Decimal('1.100000000000000088817841970012523233890533447265625') - -- Issue #8294: The Fraction constructor now accepts Decimal and float instances - directly. - -- Issue #7279: Comparisons involving a Decimal signaling NaN now signal - InvalidOperation instead of returning False. (Comparisons involving a quiet - NaN are unchanged.) Also, Decimal quiet NaNs are now hashable; Decimal - signaling NaNs remain unhashable. - -- Issue #2531: Comparison operations between floats and Decimal instances now - return a result based on the numeric values of the operands; previously they - returned an arbitrary result based on the relative ordering of id(float) and - id(Decimal). See also issue #8188, which adds Decimal-to-Fraction - comparisons. - -- Added a subtract() method to collections.Counter(). - -- Issue #8233: When run as a script, py_compile.py optionally takes a single - argument `-` which tells it to read files to compile from stdin. Each line is - read on demand and the named file is compiled immediately. (Original patch by - Piotr O?arowski). - -- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and - form feed (0x0C) are now considered linebreaks, as specified in Unicode - Standard Annex #14. See issue #7643. http://www.unicode.org/reports/tr14/ - -- Comparisons using one of <, <=, >, >= between a complex instance and a - Fractions instance now raise TypeError instead of returning True/False. This - makes Fraction <=> complex comparisons consistent with int <=> complex, float - <=> complex, and complex <=> complex comparisons. - -- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some - methods (such as oss_mixer_device.fileno()) were not available. Initial patch - by Bertrand Janin. - -- Issue #8205: Remove the "Modules" directory from sys.path when Python is - running from the build directory (POSIX only). - -- Issue #7512: shutil.copystat() could raise an OSError when the filesystem - didn't support chflags() (for example ZFS under FreeBSD). The error is now - silenced. - -- Issue #7860: platform.uname now reports the correct 'machine' type when Python - is running in WOW64 mode on 64 bit Windows. - -- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets. - Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking - reads and writes are always retried by OpenSSL itself. - -- Issue #4282: Fix the main function of the profile module for a non-ASCII - script, open the file in binary mode and not in text mode with the default - (utf8) encoding. - -- Issue #8179: Fix macpath.realpath() on a non-existing path. - -- Issue #8024: Update the Unicode database to 5.2. - -- Issue #8168: py_compile now handles files with utf-8 BOMS. - -- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is - detected. - -- Issue #6716/2: Backslash-replace error output in compilall. - -- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox - with Tcl/Tk-8.5. - -- Issue #8140: extend compileall to compile single files. Add -i option. - -- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the - locale. - -- The internals of the subprocess module on POSIX systems have been replaced by - an extension module (_posixsubprocess) so that the fork()+exec() can be done - safely without the possibility of deadlock in multithreaded applications. - -- subprocess.Popen now has restore_signals and start_new_session features. The - default of restore_signals=True is a new behavior compared to earlier Python - versions. This means that signals such as SIGPIPE are not ignored by default - in subprocesses launched by Python (Issue #1652). - -- Issue #6472: The xml.etree package is updated to ElementTree 1.3. The - cElementTree module is updated too. - -- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to - an non existent program name and Python is unable to retrieve the real program - name. - -- Issue #7880: Fix sysconfig when the python executable is a symbolic link. - -- Issue #6509: fix re.sub to work properly when the pattern, the string, and the - replacement were all bytes. Patch by Antoine Pitrou. - -- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure - bugs and allows loading SQLite extensions from shared libraries. - -- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public - Review Issue #29 (http://unicode.org/review/pr-29.html). - -- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, - reset also the pointer to the current pointer context. - -- Issue #7232: Add support for the context manager protocol to the TarFile - class. - -- Issue #7250: Fix info leak of os.environ across multi-run uses of - wsgiref.handlers.CGIHandler. - -- Issue #1729305: Fix doctest to handle encode error with "backslashreplace". - -- Issue #691291: codecs.open() should not convert end of lines on reading and - writing. - -- Issue #7869: logging: improved diagnostic for format-time errors. - -- Issue #7868: logging: added loggerClass attribute to Manager. - -- logging: Implemented PEP 391. - -- Issue #1537721: Add a writeheader() method to csv.DictWriter. - -- Issue #7959: ctypes callback functions are now registered correctly with the - cycle garbage collector. - -- Issue #5801: removed spurious empty lines in wsgiref. - -- Issue #6666: fix bug in trace.py that applied the list of directories to be - ignored only to the first file. Noted by Bogdan Opanchuk. - -- Issue #7597: curses.use_env() can now be called before initscr(). Noted by - Kan-Ru Chen. - -- Issue #7310: fix the __repr__ of os.environ to show the environment variables. - -- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822 - messages parsed by email.Parser.HeaderParser. - -- Issue #7361: Importlib was not properly checking the number of bytes in - bytecode file when it was less then 8 bytes. - -- Issue #7633: In the decimal module, Context class methods (with the exception - of canonical and is_canonical) now accept instances of int and long wherever a - Decimal instance is accepted, and implicitly convert that argument to Decimal. - Previously only some arguments were converted. - -- Issue #7835: shelve should no longer produce mysterious warnings during - interpreter shutdown. - -- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML - processing instructions and comments. These raw characters are allowed by the - XML specification, and are necessary when outputting e.g. PHP code in a - processing instruction. Patch by Neil Muller. - -- Issue #6233: ElementTree failed converting unicode characters to XML entities - when they could't be represented in the requested output encoding. Patch by - Jerry Chen. - -- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the - compression type. - -- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is - specified, rather than fall through to AF_PACKET (in the `socket` module). - Also, raise ValueError rather than TypeError when an unknown TIPC address type - is specified. Patch by Brian Curtin. - -- Issue #6939: Fix file I/O objects in the `io` module to keep the original file - position when calling `truncate()`. It would previously change the file - position to the given argument, which goes against the tradition of - ftruncate() and other truncation APIs. Patch by Pascal Chambon. - -- Issue #7610: Reworked implementation of the internal - ``zipfile.ZipExtFile`` class used to represent files stored inside an - archive. The new implementation is significantly faster and can be wrapped in - a ``io.BufferedReader`` object for more speedups. It also solves an - issue where interleaved calls to `read()` and `readline()` give wrong results. - Patch by Nir Aides. - -- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, - allowing for a maximum number of tasks within the pool to be completed by the - worker before that worker is terminated, and a new one created to replace it. - -- Issue #7792: Registering non-classes to ABCs raised an obscure error. - -- Issue #7785: Don't accept bytes in FileIO.write(). - -- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. - -- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when - the release file is empty. - -- Issue #7561: Fix crashes when using bytearray objects with the posix - module. - -- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in - multipart/signed MIME parts, which fixes one of the sources of invalid - modifications to such parts by Generator. - -- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`. Patch - by Florent Xicluna, along with some additional tests. - -- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte - argument. Patch by Victor Stinner. - -- Issue #3299: Fix possible crash in the _sre module when given bad argument - values in debug mode. Patch by Victor Stinner. - -- Issue #2846: Add support for gzip.GzipFile reading zero-padded files. Patch - by Brian Curtin. - -- Issue #7681: Use floor division in appropiate places in the wave module. - -- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since - Extension extra options may change the output without changing the .c - file). Initial patch by Collin Winter. - -- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc - when it has a fully qualified configuration prefix. Initial patch by Arfrever. - -- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the - destruction of weakref'ed objects while iterating. - -- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor - Stinner. - -- Issue #1628205: Socket file objects returned by socket.socket.makefile() now - properly handles EINTR within the read, readline, write & flush methods. The - socket.sendall() method now properly handles interrupted system calls. - -- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and - make it implement the `io.BufferedIOBase` ABC to allow for further speedups by - wrapping it in an `io.BufferedReader`. Patch by Nir Aides. - -- Issue #3972: http.client.HTTPConnection now accepts an optional source_address - parameter to allow specifying where your connections come from. - -- socket.create_connection now accepts an optional source_address parameter. - -- Issue #5511: now zipfile.ZipFile can be used as a context manager. Initial - patch by Brian Curtin. - -- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML - Manifest file in text mode so string patterns can be used in regular - expressions. - -- Issue #7552: Removed line feed in the base64 Authorization header in the - Distutils upload command to avoid an error when PyPI reads it. This occurs on - long passwords. Initial patch by JP St. Pierre. - -- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by - Tatsuhiro Tsujikawa. - -- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a - TypeError when given an `str` object (rather than a `bytes`-like object). - Patch by Victor Stinner and Florent Xicluna. - -- Issue #7349: Make methods of file objects in the io module accept None as an - argument where file-like objects (ie StringIO and BytesIO) accept them to mean - the same as passing no argument. - -- Issue #7357: tarfile no longer suppresses fatal extraction errors by default. - -- Issue #5949: added check for correct lineends in input from IMAP server in - imaplib. - -- Add count() and reverse() methods to collections.deque(). - -- Fix variations of extending deques: d.extend(d) d.extendleft(d) d+=d - -- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong - parameter types. Patch by Victor Stinner. - -- Issue #7457: added a read_pkg_file method to - distutils.dist.DistributionMetadata. - -- logging: Added optional `secure` parameter to SMTPHandler, to enable use of - TLS with authentication credentials. - -- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated - in Distutils. Patch by Stephen Emslie. - -- Issue #4120: Drop reference to CRT from manifest when building extensions with - msvc9compiler. - -- Issue #7333: The `posix` module gains an `initgroups()` function providing - access to the initgroups(3) C library call on Unix systems which implement it. - Patch by Jean-Paul Calderone. - -- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group - ownership when the group is not forced, because the group may be different - from the user's group and inherit from its container when the test is run. - -- Issue #4486: When an exception has an explicit cause, do not print its - implicit context too. This affects the `traceback` module as well as built-in - exception printing. - -- Issue #1515: Enable use of deepcopy() with instance methods. Patch by Robert - Collins. - -- Issue #7403: logging: Fixed possible race condition in lock creation. - -- Issue #6845: Add restart support for binary upload in ftplib. The - `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` - argument. Patch by Pablo Mouzo. - -- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method - returning the total number of seconds in the duration. Patch by Brian - Quinlan. - -- Issue #7133: SSL objects now support the new buffer API. - -- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters. - -- Issue #6123: tarfile now opens empty archives correctly and consistently - raises ReadError on empty files. - -- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2. - -- Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead - of __str__. - -- Issue #7341: Close the internal file object in the TarFile constructor in case - of an error. - -- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh - Windows box. Help provided by David Bolen. - -- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS - or SSL. Patch by Giampaolo Rodola'. - -- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch. - -- Issue #4969: The mimetypes module now reads the MIME database from the - registry under Windows. Patch by Gabriel Genellina. - -- Issue #6816: runpy now provides a run_path function that allows Python code to - execute file paths that refer to source or compiled Python files as well as - zipfiles, directories and other valid sys.path entries that contain a - __main__.py file. This allows applications that run other Python scripts to - support the same flexibility as the CPython command line itself. - -- Issue #7318: multiprocessing now uses a timeout when it fails to establish a - connection with another process, rather than looping endlessly. The default - timeout is 20 seconds, which should be amply sufficient for local connections. - -- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and - unpickled. This fixes crashes under Windows when trying to run - test_multiprocessing in verbose mode. - -- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass`` - argument added to the TextTestRunner constructor allowing a different result - class to be used without having to subclass. - -- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test - name in failure reports even if the test has a docstring. - -- Issue #3001: Add a C implementation of recursive locks which is used by - default when instantiating a `threading.RLock` object. This makes recursive - locks as fast as regular non-recursive locks (previously, they were slower by - 10x to 15x). - -- Issue #7282: Fix a memory leak when an RLock was used in a thread other than - those started through `threading.Thread` (for example, using - `_thread.start_new_thread()`). - -- Issue #7187: Importlib would not silence the IOError raised when trying to - write new bytecode when it was made read-only. - -- Issue #7264: Fix a possible deadlock when deallocating thread-local objects - which are part of a reference cycle. - -- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent - objects on 64-bit systems. Patch by Michael Broghton. - -- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a - modification is done through it. This fixes inconsistencies and test failures - on systems with slightly bogus mtime behaviour. - -- Issue #7246 & Issue #7208: getpass now properly flushes input before reading - from stdin so that existing input does not confuse it and lead to incorrect - entry or an IOError. It also properly flushes it afterwards to avoid the - terminal echoing the input afterwards on OSes such as Solaris. - -- Issue #7233: Fix a number of two-argument Decimal methods to make sure that - they accept an int or long as the second argument. Also fix buggy handling of - large arguments (those with coefficient longer than the current precision) in - shift and rotate. - -- Issue #4750: Store the basename of the original filename in the gzip FNAME - header as required by RFC 1952. - -- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in - Distutils. - -- Issue #7218: Fix test_site for win32, the directory comparison was done with - an uppercase. - -- Issue #7205: Fix a possible deadlock when using a BZ2File object from - several threads at once. - -- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424. - -- Issue #7099: Decimal.is_normal now returns True for numbers with exponent - larger than emax. - -- Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows - platforms, and assorted locale fixes by Derk Drukker. - -- Issue #5833: Fix extra space character in readline completion with the GNU - readline library version 6.0. - -- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment. - -- Issue #7086: Added TCP support to SysLogHandler, and tidied up some - anachronisms in the code which were a relic of 1.5.2 compatibility. - -- Issue #7082: When falling back to the MIME 'name' parameter, the correct place - to look for it is the Content-Type header. - -- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the - builtin tokenizer. - -- Issue #7048: Force Decimal.logb to round its result when that result is too - large to fit in the current precision. - -- Issue #6236, #6348: Fix various failures in the I/O library under AIX and - other platforms, when using a non-gcc compiler. Patch by Derk Drukker. - -- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now - always result in NULL. - -- Issue #5042: Structure sub-subclass does now initialize correctly with base - class positional arguments. - -- Issue #6882: Import uuid creates zombies processes. - -- Issue #6635: Fix profiler printing usage message. - -- Issue #6856: Add a filter keyword argument to TarFile.add(). - -- Issue #6888: pdb's alias command was broken when no arguments were given. - -- Issue #6857: Default format() alignment should be '>' for Decimal instances. - -- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning - NaN or raising InvalidContext. Also, fix infinite recursion in - long(Decimal('nan')). - -- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no - type specifier. - -- Issue #6239: ctypes.c_char_p return value must return bytes. - -- Issue #6838: Use a list to accumulate the value instead of repeatedly - concatenating strings in http.client's HTTPResponse._read_chunked providing a - significant speed increase when downloading large files servend with a - Transfer-Encoding of 'chunked'. - -- Trying to import a submodule from a module that is not a package, ImportError - should be raised, not AttributeError. - -- When the globals past to importlib.__import__() has __package__ set to None, - fall back to computing what __package__ should be instead of giving up. - -- Raise a TypeError when the name of a module to be imported for - importlib.__import__ is not a string (was raising an AttributeError before). - -- Allow the fromlist passed into importlib.__import__ to be any iterable. - -- Have importlib raise ImportError if None is found in sys.modules. - -- Issue #6054: Do not normalize stored pathnames in tarfile. - -- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN - payloads are now ordered by integer value rather than lexicographically. - -- Issue #1356969: Add missing info methods in tix.HList. - -- Issue #1522587: New constants and methods for the tix.Grid widget. - -- Issue #1250469: Fix the return value of tix.PanedWindow.panes. - -- Issue #1119673: Do not override tkinter.Text methods when creating a - ScrolledText. - -- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. - -- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview* - and yview* methods. - -- Issue #6629: Fix a data corruption issue in the new I/O library, which could - occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or - "wb+" mode) after having buffered a certain amount of data for reading. This - bug was not present in the pure Python implementation. - -- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in - POP3.apop. - -- Issue #2715: Remove remnants of Carbon.File from binhex module. - -- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal - digits in input, as recommended by the standard. Previously it was restricted - to accepting [0-9]. - -- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT - DO/DONT correctly. - -- Issue #1424152: Fix for http.client, urllib.request to support SSL while - working through proxy. Original patch by Christopher Li, changes made by - Senthil Kumaran. - -- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for - loaders that allow for modules to be executed. Both importlib.abc.PyLoader and - PyPycLoader inherit from this class and provide implementations in relation to - other methods required by the ABCs. - -- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like - the documentation said it did even though the code in PyLoader relied on the - abstract method required by ResourceLoader. - -- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how - to handle a comparison without loss of precision. Also add correct handling - of infinities and nans for comparisons with float. - -- Issue #6415: Fixed warnings.warn segfault on bad formatted string. - -- Issue #6358: The exit status of a command started with os.popen() was reported - differently than it did with python 2.x. - -- Issue #6323: The pdb debugger did not exit when running a script with a syntax - error. - -- Issue #3392: The subprocess communicate() method no longer fails in select() - when file descriptors are large; communicate() now uses poll() when possible. - -- Issue #6369: Fix an RLE decompression bug in the binhex module. - -- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. - -- The deprecated function string.maketrans has been removed. - -- Issue #4005: Fixed a crash of pydoc when there was a zip file present in - sys.path. - -- Issue #6218: io.StringIO and io.BytesIO instances are now picklable. - -- The os.get_exec_path() function to return the list of directories that will be - searched for an executable when launching a subprocess was added. - -- Issue #7481: When a threading.Thread failed to start it would leave the - instance stuck in initial state and present in threading.enumerate(). - -- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid - and os.read system calls where appropriate. - -- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t. - -- Issue #6247: The argparse module has been added to the standard library. - -- Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is a socket - option available on FreeBSD 7.1 and newer. - -- Issue #9315: Fix for the trace module to record correct class name - for tracing methods. - -Extension Modules ------------------ - -- Issue #9959: Tweak formula used for computing math.log of an integer, - making it marginally more accurate for exact powers of 2. - -- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. - -- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly - compared to other unix systems. In particular, os.getgroups() does not reflect - any changes made using os.setgroups() but basicly always returns the same - information as the id command. os.getgroups() can now return more than 16 - groups on MacOSX. - -- Issue #6095: Make directory argument to os.listdir optional. - -- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g., - struct.pack('>?')): if conversion to bool raised an exception then that - exception wasn't properly propagated on machines where char is unsigned. - -- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when - they contain instances of old-style classes. - -- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany - existing isinf and isnan functions. - -- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason - R. Coombs. - -- In struct.pack, correctly propogate exceptions from computing the truth of an - object in the '?' format. - -- Issue #9000: datetime.timezone objects now have eval-friendly repr. - -- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as - special methods. - -- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000. - Prior to this change, timezone adjustment in utctimetuple() could produce - tm_year value of 0 or 10,000. Now an OverflowError is raised in these edge - cases. - -- Issue #6641: The ``datetime.strptime`` method now supports the ``%z`` - directive. When the ``%z`` directive is present in the format string, an - aware ``datetime`` object is returned with ``tzinfo`` bound to a - ``datetime.timezone`` instance constructed from the parsed offset. If both - ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone - name, but ``%Z`` data without ``%z`` is discarded. - -- Issue #5094: The ``datetime`` module now has a simple concrete class - implementing ``datetime.tzinfo`` interface. Instances of the new class, - ``datetime.timezone``, return fixed name and UTC offset from their - ``tzname(dt)`` and ``utcoffset(dt)`` methods. The ``dst(dt)`` method always - returns ``None``. A class attribute, ``utc`` contains an instance - representing the UTC timezone. Original patch by Rafe Kaplan. - -- Issue #8973: Add __all__ to struct module; this ensures that help(struct) - includes documentation for the struct.Struct class. - -- Issue #3129: Trailing digits in struct format string are no longer ignored. - For example, "1" or "ilib123" are now invalid formats and cause - ``struct.error`` to be raised. Patch by Caleb Deveraux. - -- Issue #7384: If the system readline library is linked against ncurses, the - curses module must be linked against ncurses as well. Otherwise it is not safe - to load both the readline and curses modules in an application. - -- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA, - requiring a re-try in order to get the complete result. - -- Issue #8692: Optimize math.factorial: replace the previous naive algorithm - with an improved 'binary-split' algorithm that uses fewer multiplications and - allows many of the multiplications to be performed using plain C integer - arithmetic instead of PyLong arithmetic. Also uses a lookup table for small - arguments. - -- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing - overflow checks in the audioop module. - -- Issue #8644: The accuracy of td.total_seconds() has been improved (by - calculating with integer arithmetic instead of float arithmetic internally): - the result is now always correctly rounded, and is equivalent to ``td / - timedelta(seconds=1)``. - -- Issue #2706: Allow division of a timedelta by another timedelta: timedelta / - timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta, - timedelta) are all supported. - -- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. - -- Issue #8300: When passing a non-integer argument to struct.pack with any - integer format code, struct.pack first attempts to convert the non-integer - using its __index__ method. If that method is non-existent or raises - TypeError it goes on to try the __int__ method, as described below. - -- Issue #8142: Update libffi to the 3.0.9 release. - -- Issue #6949: Allow the _dbm extension to be built with db 4.8.x. - -- Issue #6544: Fix a reference leak in the kqueue implementation's error - handling. - -- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as - msvcr100.dll is not a platform assembly anymore. - -- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. - -- Issue #7078: Set struct.__doc__ from _struct.__doc__. - -- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module. - -- Issue #6877: It is now possible to link the readline extension to the libedit - readline emulation on OSX 10.5 or later. - -- Issue #6848: Fix curses module build failure on OS X 10.6. - -- Fix a segfault that could be triggered by expat with specially formed input. - -- Issue #6561: '\d' in a regex now matches only characters with Unicode category - 'Nd' (Number, Decimal Digit). Previously it also matched characters with - category 'No'. - -- Issue #4509: Array objects are no longer modified after an operation failing - due to the resize restriction in-place when the object has exported buffers. - -- Issue #2389: Array objects are now pickled in a portable manner. - -- Expat: Fix DoS via XML document with malformed UTF-8 sequences - (CVE_2009_3560). - -- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread - could raise an incorrect RuntimeError about not holding the import lock. The - import lock is now reinitialized after fork. - -- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 - parameter on some platforms such as OS X. - -- Build the ossaudio extension on GNU/kFreeBSD. - -- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in - the return value of QueryReflectionKey. - -- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice. - -Build ------ - -- Use OpenSSL 1.0.0a on Windows. - -- Issue #9280: Make sharedinstall depend on sharedmods. - -- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting - override the configure and makefile defaults, without deleting options the - user didn't intend to override. Developers should no longer need to specify - OPT or EXTRA_CFLAGS, although those variables are still present for - backward-compatibility. - -- Issue #8854: Fix finding Visual Studio 2008 on Windows x64. - -- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for - multiprocessing only. - -- Issue #8625: Turn off optimization in --with-pydebug builds with gcc. - (Optimization was unintentionally turned on in gcc --with-pydebug builds as a - result of the issue #1628484 fix, combined with autoconf's strange choice of - default CFLAGS produced by AC_PROG_CC for gcc.) - -- Issue #3646: It is now easily possible to install a Python framework into your - home directory on MacOSX, see Mac/README for more information. - -- Issue #3928: os.mknod() now available in Solaris, also. - -- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not - give false warnings. - -- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable - anymore. It also forwards the LDFLAGS settings to the linker when building a - shared library. - -- Issue #6716: Quote -x arguments of compileall in MSI installer. Exclude 2to3 - tests from compileall. - -- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. - -- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private - memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free - instead. Also disable caching of powers of 5. - -- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built. - -- Issue #6943: Use pkg-config to find the libffi headers when the - --with-system-ffi flag is used. - -- Issue #7609: Add a --with-system-expat option that causes the system's expat - library to be used for the pyexpat module instead of the one included with - Python. - -- Issue #7589: Only build the nis module when the correct header files are - found. - -- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. - -- Issue #5792: Extend the short float repr support to x86 systems using - icc or suncc. - -- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles - correctly under gcc on x86-64. This fixes a reported problem with the - --with-tsc build on x86-64. - -- Issue #6802: Fix build issues on MacOSX 10.6. - -- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6. - -- Issue #4601: 'make install' did not set the appropriate permissions on - directories. - -- Issue #5390: Add uninstall icon independent of whether file extensions are - installed. - -- Issue #7541: When using ``python-config`` with a framework install the - compiler might use the wrong library. - -- python-config now supports multiple options on the same command line. - -- Issue #8509: Fix quoting in help strings and code snippets in configure.in. - -- Issue #8510: Update to autoconf2.65. - -Documentation -------------- - -- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses - to Doc/license.rst. - -- Issue #9524: Document that two CTRL* signals are meant for use only - with os.kill. - -- Issue #9255: Document that the 'test' package is meant for internal Python use - only. - -- A small WSGI server was added as Tools/scripts/serve.py, and is used to - implement a local documentation server via 'make serve' in the doc directory. - -- Updating `Using Python` documentation to include description of CPython's -J - and -X options. - -- Document that importing a module that has None in sys.modules triggers an - ImportError. - -- Issue #6556: Fixed the Distutils configuration files location explanation for - Windows. - -- Update python manual page (options -B, -O0, -s, environment variables - PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). - -- Issue #8909: Added the size of the bitmap used in the installer created by - distutils' bdist_wininst. Patch by Anatoly Techtonik. - -Tests ------ - -- Issue #9251: test_threaded_import didn't fail when run through regrtest if the - import lock was disabled. - -- Issue #8605: Skip test_gdb if Python is compiled with optimizations. - -- Issue #7449: Skip test_socketserver if threading support is disabled. - -- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled - by a decompressor object without errors (it returns incomplete uncompressed - data). - -- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid - UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding). - -- Issue #8576: Remove use of find_unused_port() in test_smtplib and - test_multiprocessing. Patch by Paul Moore. - -- Issue #7449: Fix many tests to support Python compiled without thread - support. Patches written by Jerry Seutter. - -- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of - SSL shutdowns. - -- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written - by Dave Malcolm. - -- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any - thread was previously started, most likely due to a platform bug. - -- Issue #8193: Fix test_zlib failure with zlib 1.2.4. - -- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi. - -- Issue #8263: Now regrtest.py will report a failure if it receives a - KeyboardInterrupt (SIGINT). - -- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special - Unicode normalization cases. - -- Issue #7783: test.support.open_urlresource invalidates the outdated files from - the local cache. - -- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are - effectively raised. - -- The four path modules (genericpath, macpath, ntpath, posixpath) share a common - TestCase for some tests: test_genericpath.CommonTest. - -- Print platform information when running the whole test suite, or using the - --verbose flag. - -- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly - filesystem encoding. - -- Issue #6292: for the moment at least, the test suite runs cleanly if python is - run with the -OO flag. Tests requiring docstrings are skipped. - -- Issue #7712: test.support gained a new `temp_cwd` context manager which is now - also used by regrtest to run all the tests in a temporary directory. The - original CWD is saved in `support.SAVEDCWD`. Thanks to Florent Xicluna who - helped with the patch. - -- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi - (only seen so far on platforms where the curses module wasn't built), due to - an uncleared exception. - -- Issue #7728: test_timeout was changed to use support.bind_port instead of a - hard coded port. - -- Issue #7376: Instead of running a self-test (which was failing) when called - with no arguments, doctest.py now gives a usage message. - -- Issue #7396: fix regrtest -s, which was broken by the -j enhancement. - -- Issue #7498: test_multiprocessing now uses test.support.find_unused_port - instead of a hardcoded port number in test_rapid_restart. - -- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file - in the Lib/test directory, which might be read-only for the user running the - tests. - -- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case - of an option with no handler. - -- Issue #7312: Add a -F flag to run the selected tests in a loop until a test - fails. Can be combined with -j. - -- Issue #6551: test_zipimport could import and then destroy some modules of the - encodings package, which would make other tests fail further down the road - because the internally cached encoders and decoders would point to empty - global variables. - -- Issue #7295: Do not use a hardcoded file name in test_tarfile. - -- Issue #7270: Add some dedicated unit tests for multi-thread synchronization - primitives such as Lock, RLock, Condition, Event and Semaphore. - -- Issue #7248 (part 2): Use a unique temporary directory for importlib source - tests instead of tempfile.tempdir. This prevents the tests from sharing state - between concurrent executions on the same system. - -- Issue #7248: In importlib.test.source.util a try/finally block did not make - sure that some referenced objects actually were created in the block before - calling methods on the object. - -- Issue #7222: Make thread "reaping" more reliable so that reference - leak-chasing test runs give sensible results. The previous method of reaping - threads could return successfully while some Thread objects were still - referenced. This also introduces a new private function: - ``_thread._count()``. - -- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer - runs the risk of causing the worker thread to fail. - -- Issue #7055: test___all__ now greedily detects all modules which have an - __all__ attribute, rather than using a hardcoded and incomplete list. - -- Issue #7058: Added save/restore for things like sys.argv and cwd to - runtest_inner in regrtest, with warnings if the called test modifies them, and - a new section in the summary report at the end. - -- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. - -- Fixed tests in importlib.test.source.test_abc_loader that were masking the - proper exceptions that should be raised for missing or improper code object - bytecode. - -- Removed importlib's custom test discovery code and switched to - unittest.TestLoader.discover(). - -Tools/Demos ------------ - -- Issue #5464, #8974: Implement plural forms in msgfmt.py. - -- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were - added to the `Tools/` directory. They were previously living in the sandbox. - - -What's New in Python 3.1? -========================= - -*Release date: 27-June-2009* - -Core and Builtins ------------------ - -- Issue #6334: Fix bug in range length calculation for ranges with - large arguments. - -- Issue #6329: Fixed iteration for memoryview objects (it was being blocked - because it wasn't recognized as a sequence). - -Library -------- - -- Issue #6126: Fixed pdb command-line usage. - -- Issue #6314: logging: performs extra checks on the "level" argument. - -- Issue #6274: Fixed possible file descriptors leak in subprocess.py - -- Accessing io.StringIO.buffer now raises an AttributeError instead of - io.UnsupportedOperation. - -- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. - (On Unix) - -- Issue #1202: zipfile module would cause a struct.error when attempting to - store files with a CRC32 > 2**31-1. - -Extension Modules ------------------ - -- Issue #5590: Remove unused global variable in pyexpat extension. - - -What's New in Python 3.1 Release Candidate 2? -============================================= - -*Release date: 13-June-2009* - -Core and Builtins ------------------ - -- Fixed SystemError triggered by "range([], 1, -1)". - -- Issue #5924: On Windows, a large PYTHONPATH environment variable - (more than 255 characters) would be completely ignored. - -- Issue #4547: When debugging a very large function, it was not always - possible to update the lineno attribute of the current frame. - -- Issue #5330: C functions called with keyword arguments were not reported by - the various profiling modules (profile, cProfile). Patch by Hagen F?rstenau. - -Library -------- - -- Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular - expression string pattern was trying to match against a bytes returned by - Popen. Tested under win32 to build the py-postgresql project. - -- Issue #6258: Support AMD64 in bdist_msi. - -- Issue #6195: fixed doctest to no longer try to read 'source' data from - binary files. - -- Issue #5262: Fixed bug in next rollover time computation in - TimedRotatingFileHandler. - -- Issue #6217: The C implementation of io.TextIOWrapper didn't include the - errors property. Additionally, the errors and encoding properties of StringIO - are always None now. - -- Issue #6137: The pickle module now translates module names when loading - or dumping pickles with a 2.x-compatible protocol, in order to make data - sharing and migration easier. This behaviour can be disabled using the - new `fix_imports` optional argument. - -- Removed the ipaddr module. - -- Issue #3613: base64.{encode,decode}string are now called - base64.{encode,decode}bytes which reflects what type they accept and return. - The old names are still there as deprecated aliases. - -- Issue #5767: Remove sgmlop support from xmlrpc.client. - -- Issue #6150: Fix test_unicode on wide-unicode builds. - -- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty - parameters. - -Windows -------- - -- Issue #6221: Delete test registry key before running the test. - -- Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. - -C-API ------ - -- Issue #5735: Python compiled with --with-pydebug should throw an - ImportError when trying to import modules compiled without - --with-pydebug, and vice-versa. - - -Build ------ - -- Issue #6154: Make sure the intl library is added to LIBS if needed. Also - added LIBS to OS X framework builds. - -- Issue #5809: Specifying both --enable-framework and --enable-shared is - an error. Configure now explicity tells you about this. - - - -What's New in Python 3.1 release candidate 1? -============================================= - -*Release date: 2009-05-30* - -Core and Builtins ------------------ - -- Issue #6097: Escape UTF-8 surrogates resulting from mbstocs conversion - of the command line. - -- Issue #6012: Add cleanup support to O& argument parsing. - -- Issue #6089: Fixed str.format with certain invalid field specifiers - that would raise SystemError. - -- Issue #5982: staticmethod and classmethod now expose the wrapped - function with __func__. - -- Added support for multiple context managers in the same with-statement. - Deprecated contextlib.nested() which is no longer needed. - -- Issue #5829: complex("1e500") no longer raises OverflowError. This - makes it consistent with float("1e500") and interpretation of real - and imaginary literals. - -- Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. - -- Issue #5994: the marshal module now has docstrings. - -- Issue #5981: Fix three minor inf/nan issues in float.fromhex: - (1) inf and nan strings with trailing whitespace were incorrectly - rejected; (2) parsing of strings representing infinities and nans - was locale aware; and (3) the interpretation of fromhex('-nan') - didn't match that of float('-nan'). - -Library -------- - -- Issue #4859: Implement PEP 383 for pwd, spwd, and grp. - -- smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259). - -- Issue #6121: pydoc now ignores leading and trailing spaces in the - argument to the 'help' function. - -- Issue #6118: urllib.parse.quote_plus ignored the encoding and errors - arguments for strings with a space in them. - -- collections.namedtuple() was not working with the following field - names: cls, self, tuple, itemgetter, and property. - -- In unittest, using a skipping decorator on a class is now equivalent to - skipping every test on the class. The ClassTestSuite class has been removed. - -- Issue #6050: Don't fail extracting a directory from a zipfile if - the directory already exists. - -- Issue #1309352: fcntl now converts its third arguments to a C `long` rather - than an int, which makes some operations possible under 64-bit Linux (e.g. - DN_MULTISHOT with F_NOTIFY). - -- Issue #5761: Add the name of the underlying file to the repr() of various - IO objects. - -- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix - by Musashi Tamura, tests by Marcin Bachry. - -- Issue #1983: Fix functions taking or returning a process identifier to use - the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have - a process identifier type wider than the standard C integer type. - -- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. - Patch by Farhan Ahmad, test by Marcin Bachry. - -- Issue #2116: Weak references and weak dictionaries now support copy()ing and - deepcopy()ing. - -- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. - -- Issue #5918: Fix a crash in the parser module. - -- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. - -- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io - library. This means, for example, that opening an UTF-16 text file in - append mode doesn't add a BOM at the end of the file if the file isn't - empty. - -- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' - file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix - corrects a pydoc regression. - -- Issue #5955: aifc's close method did not close the file it wrapped, - now it does. This also means getfp method now returns the real fp. - -Installation ------------- - -- Issue #6047: fullinstall has been removed because Python 3's executable will - now be known as python3. - -- Lib/smtpd.py is no longer installed as a script. - -Extension Modules ------------------ - -- Issue #3061: Use wcsftime for time.strftime where available. - -- Issue #4873: Fix resource leaks in error cases of pwd and grp. - -- Issue #6093: Fix off-by-one error in locale.strxfrm. - -- The _functools and _locale modules are now built into the libpython shared - library instead of as extension modules. - -Build ------ - -- Issue #3585: Add pkg-config support. It creates a python-2.7.pc file - and a python3.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by - Clinton Roy. - -Tests ------ - -- Issue #5442: Tests for importlib were not properly skipping case-sensitivity - tests on darwin even when the OS was installed on a case-sensitive - filesystem. Also fixed tests that should not be run when - sys.dont_write_bytecode is true. - - -What's New in Python 3.1 beta 1? -================================ - -*Release date: 2009-05-06* - -Core and Builtins ------------------ - -- Issue #5914: Add new C API function PyOS_string_to_double, and - deprecate PyOS_ascii_strtod and PyOS_ascii_atof. - -- Issue #3382: float.__format__, complex.__format__, and %-formatting - no longer map 'F' to 'f'. Because of issue #5859 (below), this only - affects nan -> NAN and inf -> INF. - -- Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames - in all operations, including splitdrive, split, etc. splitunc() now issues - a PendingDeprecation warning. - -- Issue #5920: For float.__format__, change the behavior with the - empty presentation type (that is, not one of 'e', 'f', 'g', or 'n') - to be like 'g' but with at least one decimal point and with a - default precision of 12. Previously, the behavior the same but with - a default precision of 6. This more closely matches str(), and - reduces surprises when adding alignment flags to the empty - presentation type. This also affects the new complex.__format__ in - the same way. - -- Implement PEP 383, Non-decodable Bytes in System Character Interfaces. - -- Issue #5890: in subclasses of 'property' the __doc__ attribute was - shadowed by classtype's, even if it was None. property now - inserts the __doc__ into the subclass instance __dict__. - -- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal - sequences. Patch by Nick Barnes and Victor Stinner. - -- Issue #3672: Reject surrogates in utf-8 codec; add surrogatepass error handler. - -- Issue #5883: In the io module, the BufferedIOBase and TextIOBase ABCs have - received a new method, detach(). detach() disconnects the underlying stream - from the buffer or text IO and returns it. - -- Issue #5859: Remove switch from '%f' to '%g'-style formatting for - floats with absolute value over 1e50. Also remove length - restrictions for float formatting: '%.67f' % 12.34 and '%.120e' % - 12.34 no longer raise an exception. - -- Issue #1588: Add complex.__format__. For example, - format(complex(1, 2./3), '.5') now produces a sensible result. - -- Issue #5864: Fix empty format code formatting for floats so that it - never gives more than the requested number of significant digits. - -- Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes - new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. - -- Issue #5835: Deprecate PyOS_ascii_formatd. - -- Issue #4971: Fix titlecase for characters that are their own - titlecase, but not their own uppercase. - -- Issue #5283: Setting __class__ in __del__ caused a segfault. - -- Issue #5816: complex(repr(z)) now recovers z exactly, even when - z involves nans, infs or negative zeros. - -- Issue #3166: Make int -> float conversions correctly rounded. - -- Issue #1869 (and many duplicates): make round(x, n) correctly - rounded for a float x, by using the decimal <-> binary conversions - from Python/dtoa.c. As a consequence, (e.g.) round(x, 2) now - consistently agrees with format(x, '.2f'). - -- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on - some builtin types. - -- Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100'. - -- Issue #5515: str.format() type 'n' combined with commas and leading - zeros no longer gives odd results with ints and floats. - -- Implement PEP 378, Format Specifier for Thousands Separator, for - floats. - -- The str function switches to exponential notation at - 1e11, not 1e12. This avoids printing 13 significant digits in - situations where only 12 of them are correct. Example problem - value: str(1e11 + 0.5). (This minor issue has existed in 2.x for a - long time.) - -- Issue #1580: On most platforms, use a 'short' float repr: for a - finite float x, repr(x) now outputs a string based on the shortest - sequence of decimal digits that rounds to x. Previous behaviour was - to output 17 significant digits and then strip trailing zeros. - Another minor difference is that the new repr switches to - exponential notation at 1e16 instead of the previous 1e17; this - avoids misleading output in some cases. - - There's a new sys attribute sys.float_repr_style, which takes - the value 'short' to indicate that we're using short float repr, - and 'legacy' if the short float repr isn't available for one - reason or another. - - The float repr change involves incorporating David Gay's 'perfect - rounding' code into the Python core (it's in Python/dtoa.c). As a - secondary consequence, all string-to-float and float-to-string - conversions (including all float formatting operations) will be - correctly rounded on these platforms. - - See issue #1580 discussions for details of platforms for which - this change does not apply. - -- Issue #5759: float() didn't call __float__ on str subclasses. - -- The string.maketrans() function is deprecated; there is a new static method - maketrans() on the bytes and bytearray classes. This removes confusion about - the types string.maketrans() is supposed to work with, and mirrors the - methods available on the str class. - -- Issue #2170: refactored xml.dom.minidom.normalize, increasing both - its clarity and its speed. - -- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)`` - to avoid compiler warnings. - -- Issue #3739: The unicode-internal encoder now reports the number of characters - consumed like any other encoder (instead of the number of bytes). - -Installation ------------- - -- Issue #5756: Install idle and pydoc with a 3 suffix. - -Library -------- - -- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument. - -- Issue #5311: bdist_msi can now build packages that do not depend on a - specific Python version. - -- Issue #5150: IDLE's format menu now has an option to strip trailing - whitespace. - -- Issue #5940: distutils.command.build_clib.check_library_list was not doing - the right type checkings anymore. - -- Issue #4875: On win32, ctypes.util.find_library does no longer - return directories. - -- Issue #5142: Add the ability to skip modules while stepping to pdb. - -- Issue #1309567: Fix linecache behavior of stripping subdirectories when - looking for files given by a relative filename. - -- Issue #5923: Update the ``turtle`` module to version 1.1, add two new - turtle demos in Demo/turtle. - -- Issue #5692: In ``zipfile.Zipfile``, fix wrong path calculation when - extracting a file to the root directory. - -- Issue #5913: os.listdir() should fail for empty path on windows. - -- Issue #5084: unpickling now interns the attribute names of pickled objects, - saving memory and avoiding growth in size of subsequent pickles. Proposal - and original patch by Jake McGuire. - -- The json module now works exclusively with str and not bytes. - -- Issue #3959: The ipaddr module has been added to the standard library. - Contributed by Google. - -- Issue #3002: ``shutil.copyfile()`` and ``shutil.copytree()`` now raise an - error when a named pipe is encountered, rather than blocking infinitely. - -- Issue #5857: tokenize.tokenize() now returns named tuples. - -- Issue #4305: ctypes should now build again on mipsel-linux-gnu - -- Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the - string is already in normalized form, by performing a quick check beforehand. - Original patch by Rauli Ruohonen. - -- Issue #5853: calling a function of the mimetypes module from several threads - at once could hit the recursion limit if the mimetypes database hadn't been - initialized before. - -- Issue #5854: Updated __all__ to include some missing names and remove some - names which should not be exported. - -- Issue #3102: All global symbols that the _ctypes extension defines - are now prefixed with 'Py' or '_ctypes'. - -- Issue #5041: ctypes does now allow pickling wide character. - -- Issue #5812: For the two-argument form of the Fraction constructor, - Fraction(m, n), m and n are permitted to be arbitrary Rational - instances. - -- Issue #5812: Fraction('1e6') is valid: more generally, any string - that's valid for float() is now valid for Fraction(), with the - exception of strings representing NaNs and infinities. - -- Issue #5734: BufferedRWPair was poorly tested and had several glaring - bugs. Patch by Brian Quinlan. - -- Issue #1161031: fix readwrite select flag handling: POLLPRI now - results in a handle_expt_event call, not handle_read_event, and POLLERR - and POLLNVAL now call handle_close, not handle_expt_event. Also, - dispatcher now has an 'ignore_log_types' attribute for suppressing - log messages, which is set to 'warning' by default. - -- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for - new arguments introduced in 2.5. - -- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in - makeunicodedata.py and regenerated the Unicode database (This fixes - u'\u1d79'.lower() == '\x00'). - -Extension Modules ------------------ - -- Issue #5881: Remove old undocumented compatibility interfaces in hashlib and - pwd. - -- Issue #5463: In struct module, remove deprecated float coercion - for integer type codes: struct.pack('L', 0.3) should now raise - an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. - The version number has been bumped to 0.3. - -- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built - using Berkeley DB. - -Tests ------ - -- Issue #5354: New test support function import_fresh_module() makes - it easy to import both normal and optimised versions of modules. - test_heapq and test_warnings have been adjusted to use it, tests for - other modules with both C and Python implementations in the stdlib - can be adjusted to use it over time. - -- Issue #5837: Certain sequences of calls to set() and unset() for - support.EnvironmentVarGuard objects restored the environment variables - incorrectly on __exit__. - -C-API ------ - -- Issue #5630: A replacement PyCObject API, PyCapsule, has been added. - - -What's New in Python 3.1 alpha 2? -================================= - -*Release date: 2009-4-4* - -Core and Builtins ------------------ - -- Implement PEP 378, Format Specifier for Thousands Separator, for - integers. - -- Issue #5666: Py_BuildValue's 'c' code should create byte strings. - -- Issue #5499: The 'c' code for argument parsing functions now only accepts a - byte, and the 'C' code only accepts a unicode character. - -- Fix a problem in PyErr_NormalizeException that leads to "undetected errors" - when hitting the recursion limit under certain circumstances. - -- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. - -- Fix a segfault when running test_exceptions with coverage, caused by - insufficient checks in accessors of Exception.__context__. - -- Issue #5604: non-ASCII characters in module name passed to - imp.find_module() were converted to UTF-8 while the path is - converted to the default filesystem encoding, causing nonsense. - -- Issue #5126: str.isprintable() returned False for space characters. - -- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to - the end sys.path, for compatibility with the system install of Python. - -- Issue #4688: Add a heuristic so that tuples and dicts containing only - untrackable objects are not tracked by the garbage collector. This can - reduce the size of collections and therefore the garbage collection overhead - on long-running programs, depending on their particular use of datatypes. - -- Issue #5512: Rewrite PyLong long division algorithm (x_divrem) to - improve its performance. Long divisions and remainder operations - are now between 50% and 150% faster. - -- Issue #4258: Make it possible to use base 2**30 instead of base - 2**15 for the internal representation of integers, for performance - reasons. Base 2**30 is enabled by default on 64-bit machines. Add - --enable-big-digits option to configure, which overrides the - default. Add sys.int_info structseq to provide information about - the internal format. - -- Issue #4474: PyUnicode_FromWideChar now converts characters outside - the BMP to surrogate pairs, on systems with sizeof(wchar_t) == 4 - and sizeof(Py_UNICODE) == 2. - -- Issue #5237: Allow auto-numbered fields in str.format(). For - example: '{} {}'.format(1, 2) == '1 2'. - -- Issue #5392: when a very low recursion limit was set, the interpreter would - abort with a fatal error after the recursion limit was hit twice. - -- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with - short file names. - -Library -------- - -- Issue #2625: added missing items() call to the for loop in - mailbox.MH.get_message(). - -- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat - error substitutions from non-strict codec error callbacks in - incrementalencoder and StreamWriter. - -- Issue #5656: Fix the coverage reporting when running the test suite with - the -T argument. - -- Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. - -- Issue #5624: Fix the _winreg module name still used in several modules. - -- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer. - -- Issue #5619: Multiprocessing children disobey the debug flag and causes - popups on windows buildbots. Patch applied to work around this issue. - -- Issue #5400: Added patch for multiprocessing on netbsd compilation/support - -- Issue #5387: Fixed mmap.move crash by integer overflow. - -- Issue #5261: Patch multiprocessing's semaphore.c to support context - manager use: "with multiprocessing.Lock()" works now. - -- Issue #5236: Change time.strptime() to only take strings. Didn't work with - bytes already but the failure was non-obvious. - -- Issue #5177: Multiprocessing's SocketListener class now uses - socket.SO_REUSEADDR on all connections so that the user no longer needs - to wait 120 seconds for the socket to expire. - -- Issue #5595: Fix UnboundedLocalError in ntpath.ismount(). - -- Issue #1174606: Calling read() without arguments of an unbounded file - (typically /dev/zero under Unix) could crash the interpreter. - -- The max_buffer_size arguments of io.BufferedWriter, io.BufferedRWPair, and - io.BufferedRandom have been deprecated for removal in Python 3.2. - -- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop - forever on incomplete input. That caused tarfile.open() to hang when used - with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or - partial bzip2 compressed data. - -- Issue #2110: Add support for thousands separator and 'n' type - specifier to Decimal.__format__ - -- Fix Decimal.__format__ bug that swapped the meanings of the '<' and - '>' alignment characters. - -- The error detection code in FileIO.close() could fail to reflect the `errno` - value, and report it as -1 instead. - -- Issue #5016: FileIO.seekable() could return False if the file position - was negative when truncated to a C int. Patch by Victor Stinner. - -Extension Modules ------------------ - -- Issue #5391: mmap now deals exclusively with bytes. - -- Issue #5463: In struct module, remove deprecated overflow wrapping - when packing an integer: struct.pack('=L', -1) now raises - struct.error instead of returning b'\xff\xff\xff\xff'. The - _PY_STRUCT_RANGE_CHECKING and _PY_STRUCT_OVERFLOW_MASKING constants - have been removed from the struct module. - - -What's New in Python 3.1 alpha 1 -================================ - -*Release date: 2009-03-07* - -Core and Builtins ------------------ - -- The io module has been reimplemented in C for speed. - -- Give dict views an informative __repr__. - -- Issue #5247: Improve error message when unknown format codes are - used when using str.format() with str, int, and float arguments. - -- Issue #5249: time.strftime returned malformed string when format string - contained non ascii character on windows. - -- Issue #4626: compile(), exec(), and eval() ignore the coding cookie if the - source has already been decoded into str. - -- Issue #5186: Reduce hash collisions for objects with no __hash__ method by - rotating the object pointer by 4 bits to the right. - -- Issue #4575: Fix Py_IS_INFINITY macro to work correctly on x87 FPUs: - it now forces its argument to double before testing for infinity. - -- Issue #5137: Make len() correctly raise a TypeError when a __len__ method - returns a non-number type. - -- Issue #5182: Removed memoryview.__str__. - -- Issue #1717: Removed builtin cmp() function, dropped tp_compare - slot, the C API functions PyObject_Compare and PyUnicode_Compare and - the type definition cmpfunc. The tp_compare slot has been renamed - to tp_reserved, and is reserved for future usage. - -- Issue #1242657: the __len__() and __length_hint__() calls in several tools - were suppressing all exceptions. These include list() and bytearray(). - -- Issue #4707: round(x, n) now returns an integer if x is an integer. - Previously it returned a float. - -- Issue #4753: By enabling a configure option named '--with-computed-gotos' - on compilers that support it (notably: gcc, SunPro, icc), the bytecode - evaluation loop is compiled with a new dispatch mechanism which gives - speedups of up to 20%, depending on the system, on various benchmarks. - -- Issue #4874: Most builtin decoders now reject unicode input. - -- Issue #4842: Don't allow trailing 'L' when constructing an integer - from a string. - -- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors. - -- Issue #4838: When a module is deallocated, free the memory backing the - optional module state data. - -- Issue #4910: Rename nb_long slot to nb_reserved, and change its - type to ``(void *)``. - -- Issue #4935: The overflow checking code in the expandtabs() method common - to str, bytes and bytearray could be optimized away by the compiler, letting - the interpreter segfault instead of raising an error. - -- Issue #3720: Fix a crash when an iterator modifies its class and removes its - __next__ method. - -- Issue #4910: Builtin int() function and PyNumber_Long/PyNumber_Int API - function no longer attempt to call the __long__ slot to convert an object - to an integer. Only the __int__ and __trunc__ slots are examined. - -- Issue #4893: Use NT threading on CE. - -- Issue #4915: Port sysmodule to Windows CE. - -- Issue #4868: utf-8, utf-16 and latin1 decoding are now 2x to 4x faster. The - common cases are optimized thanks to a dedicated fast path and a moderate - amount of loop unrolling. - -- Issue #4074: Change the criteria for doing a full garbage collection (i.e. - collecting the oldest generation) so that allocating lots of objects without - destroying them does not show quadratic performance. Based on a proposal by - Martin von L?wis at - http://mail.python.org/pipermail/python-dev/2008-June/080579.html. - -- Issue #4604: Some objects of the I/O library could still be used after - having been closed (for instance, a read() call could return some - previously buffered data). Patch by Dmitry Vasiliev. - -- Issue #4705: Fix the -u ("unbuffered binary stdout and stderr") command-line - flag to work properly. Furthermore, when specifying -u, the text stdout - and stderr streams have line-by-line buffering enabled (the default being - to buffer arbitrary chunks of data). - -- The internal table, _PyLong_DigitValue, is now an array of unsigned chars - instead of ints (reducing its size from 4 to 8 times thereby reducing - Python's overall memory). - -- Issue #1180193: When importing a module from a .pyc (or .pyo) file with - an existing .py counterpart, override the co_filename attributes of all - code objects if the original filename is obsolete (which can happen if the - file has been renamed, moved, or if it is accessed through different paths). - Patch by Ziga Seilnacht and Jean-Paul Calderone. - -- Issue #4580: Fix slicing of memoryviews when the item size is greater than - one byte. Also fixes the meaning of len() so that it returns the number of - items, rather than the size in bytes. - -- Issue #4075: Use OutputDebugStringW in Py_FatalError. - -- Issue #4747: When the terminal does not use utf-8, executing a script with - non-ascii characters in its name could fail with a "SyntaxError: None" error. - -- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed - to open file with a bytes filename on Windows. - -- Issue #3680: Reference cycles created through a dict, set or deque iterator - did not get collected. - -- Issue #4701: PyObject_Hash now implicitly calls PyType_Ready on types - where the tp_hash and tp_dict slots are both NULL. - -- Issue #4759: None is now allowed as the first argument of - bytearray.translate(). It was always allowed for bytes.translate(). - -- Added test case to ensure attempts to read from a file opened for writing - fail. - -- Issue #3106: Speedup some comparisons (str/str and int/int). - -- Issue #2183: Simplify and optimize bytecode for list, dict and set - comprehensions. Original patch for list comprehensions by Neal Norwitz. - -- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always - print elapsed times, not only when some objects are uncollectable / - unreachable. Original patch by Neil Schemenauer. - -- Issue #3439: Add a bit_length method to int. - -- Issue #2173: When getting device encoding, check that return value of - nl_langinfo is not the empty string. This was causing silent build - failures on OS X. - -- Issue #4597: Fixed several opcodes that weren't always propagating - exceptions. - -- Issue #4589: Fixed exception handling when the __exit__ function of a - context manager returns a value that cannot be converted to a bool. - -- Issue #4445: Replace "sizeof(PyBytesObject)" with - "offsetof(PyBytesObject, ob_sval) + 1" when allocating memory for - bytes instances. On a typical machine this saves 3 bytes of memory - (on average) per allocation of a bytes instance. - -- Issue #4533: File read operation was dreadfully slow due to a slowly - growing read buffer. Fixed by using the same growth rate algorithm as - Python 2.x. - -- Issue #4509: Various issues surrounding resize of bytearray objects to - which there are buffer exports (e.g. memoryview instances). - -- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` - method on file objects with closefd=False. The file descriptor is still - kept open but the file object behaves like a closed file. The ``FileIO`` - object also got a new readonly attribute ``closefd``. - -- Issue #4569: Interpreter crash when mutating a memoryview with an item size - larger than 1. - -- Issue #4748: Lambda generators no longer return a value. - -- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. - -- Issue #5108: Handle %s like %S, %R and %A in PyUnicode_FromFormatV(): Call - PyUnicode_DecodeUTF8() once, remember the result and output it in a second - step. This avoids problems with counting UTF-8 bytes that ignores the effect - of using the replace error handler in PyUnicode_DecodeUTF8(). - -Library -------- - -- Issue #7071: byte-compilation in Distutils is now done with respect to - sys.dont_write_bytecode. - -- Issue #7066: archive_util.make_archive now restores the cwd if an error is - raised. Initial patch by Ezio Melotti. - -- Issue #6516: Added owner/group support when creating tar archives in - Distutils. - -- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. - -- Issue #6163: Fixed HP-UX runtime library dir options in - distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and - Michael Haubenwallner. - -- Issue #6693: New functions in site.py to get user/global site packages paths. - -- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when - opening an empty or very small file. - -- Issue #6545: Removed assert statements in distutils.Extension, so the - behavior is similar when used with -O. - -- unittest has been split up into a package. All old names should still work. - -- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler - uses the same refactored function to get gcc/ld/dllwrap versions numbers. - It's `distutils.util.get_compiler_versions`. Added deprecation warnings - for the obsolete get_versions() functions. - -- Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list - -- Issue #6314: logging: Extra checks on the "level" argument in more places. - -- Issue #2622: Fixed an ImportError when importing email.message from a - standalone application built with py2exe or py2app. - -- Issue #6455: Fixed test_build_ext under win32. - -- Issue #6377: Enabled the compiler option, and deprecate its usage as an - attribute. - -- Issue #6413: Fixed the log level in distutils.dist for announce. - -- Issue #6403: Fixed package path usage in build_ext. - -- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was - unconditionally calling "os.close(sys.stdin.fileno())" resulting in file - descriptor errors - -- Issue #6365: Distutils build_ext inplace mode was copying the compiled - extension in a subdirectory if the extension name had dots. - -- Issue #6164: Added an AIX specific linker argument in Distutils - unixcompiler. Original patch by Sridhar Ratnakumar. - -- Issue #6286: Now Distutils upload command is based on urllib2 instead of - httplib, allowing the usage of http_proxy. - -- Issue #6287: Added the license field in Distutils documentation. - -- Issue #6263: Fixed syntax error in distutils.cygwincompiler. - -- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` - in Makefiles. This prevents compile errors when using syntax like: - `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. - -- Issue #6131: test_modulefinder leaked when run after test_distutils. - Patch by Hirokazu Yamamoto. - -- Issue #6048: Now Distutils uses the tarfile module in archive_util. - -- Issue #6062: In distutils, fixed the package option of build_ext. Feedback - and tests on pywin32 by Tim Golden. - -- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto. - -- Issue #6046: Fixed the library extension when distutils build_ext is used - inplace. Initial patch by Roumen Petrov. - -- Issue #6041: Now distutils `sdist` and `register` commands use `check` as a - subcommand. - -- Issue #6022: a test file was created in the current working directory by - test_get_outputs in Distutils. - -- Issue #5977: distutils build_ext.get_outputs was not taking into account the - inplace option. Initial patch by kxroberto. - -- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken - for old-style extensions. - -- Issue #5976: Fixed Distutils test_check_environ. - -- Issue #5941: Distutils build_clib command was not working anymore because - of an incomplete costumization of the archiver command. Added ARFLAGS in the - Makefile besides AR and make Distutils use it. Original patch by David - Cournapeau. - -- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. - -- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive - anymore. - -- Issue #5810: Fixed Distutils test_build_scripts so it uses - sysconfig.get_config_vars. - -- Issue #4951: Fixed failure in test_httpservers. - -- Issue #5795: Fixed test_distutils failure on Debian ppc. - -- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. - -- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting - a value in SafeConfigParser. - -- Issue #5732: added a new command in Distutils: check. - -- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows - platforms. Initial patch by Paul Moore. - -- Issue #5095: Added bdist_msi to the list of bdist supported formats. - Initial fix by Steven Bethard. - -- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. - Initial fix by Wayne Davison. - -- Issue #5694: removed spurious test output in Distutils (test_clean). - -- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module. - -- Issue #1665206 (partially): Move imports in cgitb to the top of the module - instead of performing them in functions. Helps prevent import deadlocking in - threads. - -- Issue #2522: locale.format now checks its first argument to ensure it has - been passed only one pattern, avoiding mysterious errors where it appeared - that it was failing to do localization. - -- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg - Brandl. - -- Issue #1222: locale.format() bug when the thousands separator is a space - character. - -- Issue #5472: Fixed distutils.test_util tear down. Original patch by - Tim Golden. - -- collections.deque() objects now have a read-only attribute called maxlen. - -- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after - it is has been populated and properly configured in order to prevent - window flashing. - -- Issue #4792: Prevent a segfault in _tkinter by using the - guaranteed to be safe interp argument given to the PythonCmd in place of - the Tcl interpreter taken from a PythonCmd_ClientData. - -- Issue #5193: Guarantee that tkinter.Text.search returns a string. - -- Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler. - Original patch by Akira Kitada. - -- Issue #5334: array.fromfile() failed to insert values when EOFError was raised. - -- Issue #5385: Fixed mmap crash after resize failure on windows. - -- Issue #5179: Fixed subprocess handle leak on failure on windows. - -- PEP 372: Added collections.OrderedDict(). - -- The _asdict() for method for namedtuples now returns an OrderedDict(). - -- configparser now defaults to using an ordered dictionary. - -- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes - import guess_extension`` was used. - -- Issue #1733986: Fixed mmap crash in accessing elements of second map object - with same tagname but larger size than first map. (Windows) - -- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer - overrun. - -- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils - bdist_rpm command. - -- Issue #5378: added --quiet option to Distutils bdist_rpm command. - -- Issue #5052: make Distutils compatible with 2.3 again. - -- Issue #5316: Fixed buildbot failures introduced by multiple inheritance - in Distutils tests. - -- Issue #5287: Add exception handling around findCaller() call to help out - IronPython. - -- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, - The file was resized to wrong size. - -- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. - -- Issue #2279: distutils.sdist.add_defaults now add files - from the package_data and the data_files metadata. - -- Issue #5257: refactored all tests in distutils, so they use - support.TempdirManager, to avoid writing in the tests directory. - -- Issue #4524: distutils build_script command failed with --with-suffix=3. - Initial patch by Amaury Forgeot d'Arc. - -- Issue #2461: added tests for distutils.util - -- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions - which inherited from numbers.py which did not have __slots__ defined. The - numbers hierarchy now has its own __slots__ declarations. - -- Issue #4631: Fix urlopen() result when an HTTP response uses chunked - encoding. - -- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a - function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). - -- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored - under NT and OS2. Patch by Philip Jenvey. - -- Issue #5128: Make compileall properly inspect bytecode to determine if needs - to be recreated. This avoids a timing hole thanks to the old reliance on the - ctime of the files involved. - -- Issue #5122: Synchronize tk load failure check to prevent a potential - deadlock. - -- Issue #1818: collections.namedtuple() now supports a keyword argument - 'rename' which lets invalid fieldnames be automatically converted to - positional names in the form, _1, _2, ... - -- Issue #4890: Handle empty text search pattern in Tkinter.Text.search. - -- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a - public documented method ``ZipImporter.get_filename()``. - -- Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support - the execution of packages by looking for and executing a ``__main__`` - submodule when a package name is supplied. Initial patch by Andi - Vajda. - -- Issue #1731706: Call Tcl_ConditionFinalize for Tcl_Conditions that will - not be used again (this requires Tcl/Tk 8.3.1), also fix a memory leak in - Tkapp_Call when calling from a thread different than the one that created - the Tcl interpreter. Patch by Robert Hancock. - -- Issue #4285: Change sys.version_info to be a named tuple. Patch by - Ross Light. - -- Issue #1520877: Now distutils.sysconfig reads $AR from the - environment/Makefile. Patch by Douglas Greiman. - -- Issue #1276768: The verbose option was not used in the code of - distutils.file_util and distutils.dir_util. - -- Issue #5132: Fixed trouble building extensions under Solaris with - --enabled-shared activated. Initial patch by Dave Peterson. - -- Issue #1581476: Always use the Tcl global namespace when calling into Tcl. - -- The shelve module now defaults to pickle protocol 3. - -- Fix a bug in the trace module where a bytes object from co_lnotab had its - items being passed through ord(). - -- Issue #2047: shutil.move() could believe that its destination path was - inside its source path if it began with the same letters (e.g. "src" vs. - "src.new"). - -- Added the ttk module. See issue #2983: Ttk support for Tkinter. - -- Removed isSequenceType(), isMappingType, and isNumberType() from the - operator module; use the abstract base classes instead. Also removed - the repeat() function; use mul() instead. - -- Issue #5021: doctest.testfile() did not create __name__ and - collections.namedtuple() relied on __name__ being defined. - -- Backport importlib from Python 3.1. Only the import_module() function has - been backported to help facilitate transitions from 2.7 to 3.1. - -- Issue #1885: distutils. When running sdist with --formats=tar,gztar - the tar file was overriden by the gztar one. - -- Issue #4863: distutils.mwerkscompiler has been removed. - -- Added a new itertools functions: combinations_with_replacement() - and compress(). - -- Issue #5032: added a step argument to itertools.count() and - allowed non-integer arguments. - -- Fix and properly document the multiprocessing module's logging - support, expose the internal levels and provide proper usage - examples. - -- Issue #1672332: fix unpickling of subnormal floats, which was - producing a ValueError on some platforms. - -- Issue #3881: Help Tcl to load even when started through the - unreadable local symlink to "Program Files" on Vista. - -- Issue #4710: Extract directories properly in the zipfile module; - allow adding directories to a zipfile. - -- Issue #3807: _multiprocessing build fails when configure is passed - --without-threads argument. When this occurs, _multiprocessing will - be disabled, and not compiled. - -- Issue #5008: When a file is opened in append mode with the new IO library, - do an explicit seek to the end of file (so that e.g. tell() returns the - file size rather than 0). This is consistent with the behaviour of the - traditional 2.x file object. - -- Issue #5013: Fixed a bug in FileHandler which occurred when the delay - parameter was set. - -- Issue #4842: Always append a trailing 'L' when pickling longs using - pickle protocol 0. When reading, the 'L' is optional. - -- Add the importlib package. - -- Issue #4301: Patch the logging module to add processName support, remove - _check_logger_class from multiprocessing. - -- Issue #3325: Remove python2.x try: except: imports for old cPickle from - multiprocessing. - -- Issue #4959: inspect.formatargspec now works for keyword only arguments - without defaults. - -- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks - for Unix machines for negative handles and large int handles. Without this check - it is possible to segfault the interpreter. - -- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue - in sharedctypes.py. - -- Issue #1225107: inspect.isclass() returned True for instances with a custom - __getattr__. - -- Issue #3826 and #4791: The socket module now closes the underlying socket - appropriately when it is being used via socket.makefile() objects - rather than delaying the close by waiting for garbage collection to do it. - -- Issue #1696199: Add collections.Counter() for rapid and convenient - counting. - -- Issue #3860: GzipFile and BZ2File now support the context manager protocol. - -- Issue #4867: Fixed a crash in ctypes when passing a string to a - function without defining argtypes. - -- Issue #4272: Add an optional argument to the GzipFile constructor to override - the timestamp in the gzip stream. The default value remains the current time. - The information can be used by e.g. gunzip when decompressing. Patch by - Jacques Frechet. - -- Restore Python 2.3 compatibility for decimal.py. - -- Issue #3638: Remove functions from _tkinter module level that depend on - TkappObject to work with multiple threads. - -- Issue #4718: Adapt the wsgiref package so that it actually works with - Python 3.x, in accordance with the `official amendments of the spec - `_. - -- Issue #4796: Added Decimal.from_float() and Context.create_decimal_from_float() - to the decimal module. - -- Fractions.from_float() no longer loses precision for integers too big to - cast as floats. - -- Issue #4812: add missing underscore prefix to some internal-use-only - constants in the decimal module. (Dec_0 becomes _Dec_0, etc.) - -- Issue #4790: The nsmallest() and nlargest() functions in the heapq module - did unnecessary work in the common case where no key function was specified. - -- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when - the function is not a generator. - -- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case - no MSVC compiler is found under Windows. Original patch by Philip Jenvey. - -- Issue #4646: distutils was choking on empty options arg in the setup - function. Original patch by Thomas Heller. - -- Issue #3767: Convert Tk object to string in tkColorChooser. - -- Issue #3248: Allow placing ScrolledText in a PanedWindow. - -- Issue #4444: Allow assertRaises() to be used as a context handler, so that - the code under test can be written inline if more practical. - -- Issue #4739: Add pydoc help topics for symbols, so that e.g. help('@') - works as expected in the interactive environment. - -- Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by - Gabriel Genellina. - -- Issue #4574: reading an UTF16-encoded text file crashes if \r on 64-char - boundary. - -- Issue #4223: inspect.getsource() will now correctly display source code - for packages loaded via zipimport (or any other conformant PEP 302 - loader). Original patch by Alexander Belopolsky. - -- Issue #4201: pdb can now access and display source code loaded via - zipimport (or any other conformant PEP 302 loader). Original patch by - Alexander Belopolsky. - -- Issue #4197: doctests in modules loaded via zipimport (or any other PEP - 302 conformant loader) will now work correctly in most cases (they - are still subject to the constraints that exist for all code running - from inside a module loaded via a PEP 302 loader and attempting to - perform IO operations based on __file__). Original patch by - Alexander Belopolsky. - -- Issues #4082 and #4512: Add runpy support to zipimport in a manner that - allows backporting to maintenance branches. Original patch by - Alexander Belopolsky. - -- Issue #4163: textwrap module: allow word splitting on a hyphen preceded by - a non-ASCII letter. - -- Issue #4616: TarFile.utime(): Restore directory times on Windows. - -- Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the - codec cannot be found. This is for compatibility with the builtin behavior. - -- Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to - give correct results in the case where one argument is a quiet NaN - and the other is a finite number that requires rounding. - -- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat - libs. - -- Added the subprocess.check_call_output() convenience function to get output - from a subprocess on success or raise an exception on error. - -- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to - support unusual filenames (such as those containing semi-colons) in - Content-Disposition headers. - -- Issue #4384: Added logging integration with warnings module using - captureWarnings(). This change includes a NullHandler which does nothing; - it will be of use to library developers who want to avoid the "No handlers - could be found for logger XXX" message which can appear if the library user - doesn't configure logging. - -- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an - exception. - -- Issue #4529: fix the parser module's validation of try-except-finally - statements. - -- Issue #4458: getopt.gnu_getopt() now recognizes a single "-" as an argument, - not a malformed option. - -- Added the subprocess.check_output() convenience function to get output - from a subprocess on success or raise an exception on error. - -- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input; - the corresponding tests now pass. - -- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because - it was calling the wrong open() function. - -- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to - support unusual filenames (such as those containing semi-colons) in - Content-Disposition headers. - -- Issue #4861: ctypes.util.find_library(): Robustify. Fix library detection on - biarch systems. Try to rely on ldconfig only, without using objdump and gcc. - -- Issue #5104: The socket module now raises OverflowError when 16-bit port and - protocol numbers are supplied outside the allowed 0-65536 range on bind() - and getservbyport(). - -- Windows locale mapping updated to Vista. - -Tools/Demos ------------ - -- Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1, - and make it 2.6-compatible. - -- Ttk demos added in Demo/tkinter/ttk/ - -- Issue #4677: add two list comprehension tests to pybench. - - -Build ------ - -- Issue #6094: Build correctly with Subversion 1.7. - -- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. - -- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the - linker, rather than always exit successfully. Patch by Floris Bruynooghe. - -- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify - the order that backends for the dbm extension are checked. - -- Link the shared python library with $(MODLIBS). - -- Issue #5134: Silence compiler warnings when compiling sqlite with VC++. - -- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. - -- Issue #4895: Use _strdup on Windows CE. - -- Issue #4472: "configure --enable-shared" now works on OSX - -- Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. - -- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". - -- Issue #4289: Remove Cancel button from AdvancedDlg. - -- Issue #1656675: Register a drop handler for .py* files on Windows. - -- Issue #4120: Exclude manifest from extension modules in VS2008. - -- Issue #4091: Install pythonxy.dll in system32 again. - -- Issue #4018: Disable "for me" installations on Vista. - -- Issue #3758: Add ``patchcheck`` build target to .PHONY. - -- Issue #4204: Fixed module build errors on FreeBSD 4. - - -C-API ------ - -- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with - NUL: Bogus TypeError detail string. - -- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError - for negative arguments. Previously, it raised TypeError. - -- Issue #4720: The format for PyArg_ParseTupleAndKeywords can begin with '|'. - -- Issue #3632: from the gdb debugger, the 'pyo' macro can now be called when - the GIL is released, or owned by another thread. - -- Issue #4122: On Windows, fix a compilation error when using the - Py_UNICODE_ISSPACE macro in an extension module. - - -Extension Modules ------------------ - -- Issue #3745: Fix hashlib to always reject unicode and non buffer-api - supporting objects as input no matter how it was compiled (built in - implementations or external openssl library). - -- Issue #4397: Fix occasional test_socket failure on OS X. - -- Issue #4279: Fix build of parsermodule under Cygwin. - -- Issue #4751: hashlib now releases the GIL when hashing large buffers - (with a hardwired threshold of 2048 bytes), allowing better parallelization - on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner. - -- Issue #4051: Prevent conflict of UNICODE macros in cPickle. - -- Issue #4738: Each zlib object now has a separate lock, allowing to compress - or decompress several streams at once on multi-CPU systems. Also, the GIL - is now released when computing the CRC of a large buffer. Patch by ebfe. - -- Issue #4228: Pack negative values the same way as 2.4 in struct's L format. - -- Issue #1040026: Fix os.times result on systems where HZ is incorrect. - -- Issues #3167, #3682: Fix test_math failures for log, log10 on Solaris, - OpenBSD. - -- Issue #4583: array.array would not always prohibit resizing when a buffer - has been exported, resulting in an interpreter crash when accessing the - buffer. - - -- Issue #5228: Make functools.partial objects can now be pickled. - -Tests ------ - -- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running - regression tests in parallel, shortening the total runtime. - -- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to - Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate - the same behaviour as test_ttkguionly (and now also test_tk) which is to - skip the tests if DISPLAY is defined but can't be used. - -- regrtest no longer treats ImportError as equivalent to SkipTest. Imports - that should cause a test to be skipped are now done using import_module - from test support, which does the conversion. - -- Issue #5083: New 'gui' resource for regrtest. - - -Docs ----- - - **(For information about older versions, consult the HISTORY file.)** -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 19:09:08 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 19:09:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Several_improv?= =?utf-8?q?ements_to_the_HTML_NEWS_version=3A?= Message-ID: <3XVqj01Y1czQcF@mail.python.org> http://hg.python.org/cpython/rev/821f473c4ad9 changeset: 79369:821f473c4ad9 branch: 3.3 parent: 79366:7a7913a11350 user: Georg Brandl date: Mon Oct 01 19:08:50 2012 +0200 summary: Several improvements to the HTML NEWS version: * rename to "Changelog" * recognize more issue links * add NEWS as a dependency for Sphinx files: Doc/tools/sphinxext/pyspecific.py | 12 +++++++----- Doc/whatsnew/news.rst | 6 +++--- Doc/whatsnew/index.rst | 8 ++++---- Misc/NEWS | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -149,10 +149,9 @@ import re import codecs -from docutils.statemachine import string2lines -from sphinx.util.nodes import nested_parse_with_titles -issue_re = re.compile('Issue #([0-9]+)') +issue_re = re.compile('([Ii])ssue #([0-9]+)') +whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$") class MiscNews(Directive): has_content = False @@ -166,8 +165,10 @@ source = self.state_machine.input_lines.source( self.lineno - self.state_machine.input_offset - 1) source_dir = path.dirname(path.abspath(source)) + fpath = path.join(source_dir, fname) + self.state.document.settings.record_dependencies.add(fpath) try: - fp = codecs.open(path.join(source_dir, fname), encoding='utf-8') + fp = codecs.open(fpath, encoding='utf-8') try: content = fp.read() finally: @@ -176,8 +177,9 @@ text = 'The NEWS file is not available.' node = nodes.strong(text, text) return [node] - content = issue_re.sub(r'`Issue #\1 `__', + content = issue_re.sub(r'`\1ssue #\2 `__', content) + content = whatsnew_re.sub(r'\1', content) # remove first 3 lines as they are the main heading lines = content.splitlines()[3:] self.state_machine.insert_input(lines, fname) diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/changelog.rst rename from Doc/whatsnew/news.rst rename to Doc/whatsnew/changelog.rst --- a/Doc/whatsnew/news.rst +++ b/Doc/whatsnew/changelog.rst @@ -1,6 +1,6 @@ -+++++++++++ -Python News -+++++++++++ ++++++++++ +Changelog ++++++++++ .. raw:: html diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst --- a/Doc/whatsnew/index.rst +++ b/Doc/whatsnew/index.rst @@ -24,10 +24,10 @@ 2.1.rst 2.0.rst -The "Python News" is a HTML version of the file :source:`Misc/NEWS` which -contains *all* nontrivial changes to Python. +The "Changelog" is a HTML version of the file :source:`Misc/NEWS` which +contains *all* nontrivial changes to Python for the current version. .. toctree:: - :maxdepth: 1 + :maxdepth: 2 - news.rst + changelog.rst diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -75,7 +75,7 @@ - Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to Popen when %action substitutions produce empty strings. -- Issues #12776, #11839: call argparse type function (specified by add_argument) +- Issue #12776, issue #11839: call argparse type function (specified by add_argument) only once. Before, the type function was called twice in the case where the default was specified and the argument was given as well. This was especially problematic for the FileType type, as a default file would always be opened, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 19:09:09 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 19:09:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2Ugd2l0aCAzLjMu?= Message-ID: <3XVqj15NYxzQmv@mail.python.org> http://hg.python.org/cpython/rev/d0e52f29744e changeset: 79370:d0e52f29744e parent: 79368:ac15e2de062b parent: 79369:821f473c4ad9 user: Georg Brandl date: Mon Oct 01 19:09:00 2012 +0200 summary: merge with 3.3. files: Doc/tools/sphinxext/pyspecific.py | 12 +++++++----- Doc/whatsnew/news.rst | 6 +++--- Doc/whatsnew/index.rst | 8 ++++---- Misc/NEWS | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -149,10 +149,9 @@ import re import codecs -from docutils.statemachine import string2lines -from sphinx.util.nodes import nested_parse_with_titles -issue_re = re.compile('Issue #([0-9]+)') +issue_re = re.compile('([Ii])ssue #([0-9]+)') +whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$") class MiscNews(Directive): has_content = False @@ -166,8 +165,10 @@ source = self.state_machine.input_lines.source( self.lineno - self.state_machine.input_offset - 1) source_dir = path.dirname(path.abspath(source)) + fpath = path.join(source_dir, fname) + self.state.document.settings.record_dependencies.add(fpath) try: - fp = codecs.open(path.join(source_dir, fname), encoding='utf-8') + fp = codecs.open(fpath, encoding='utf-8') try: content = fp.read() finally: @@ -176,8 +177,9 @@ text = 'The NEWS file is not available.' node = nodes.strong(text, text) return [node] - content = issue_re.sub(r'`Issue #\1 `__', + content = issue_re.sub(r'`\1ssue #\2 `__', content) + content = whatsnew_re.sub(r'\1', content) # remove first 3 lines as they are the main heading lines = content.splitlines()[3:] self.state_machine.insert_input(lines, fname) diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/changelog.rst rename from Doc/whatsnew/news.rst rename to Doc/whatsnew/changelog.rst --- a/Doc/whatsnew/news.rst +++ b/Doc/whatsnew/changelog.rst @@ -1,6 +1,6 @@ -+++++++++++ -Python News -+++++++++++ ++++++++++ +Changelog ++++++++++ .. raw:: html diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst --- a/Doc/whatsnew/index.rst +++ b/Doc/whatsnew/index.rst @@ -25,10 +25,10 @@ 2.1.rst 2.0.rst -The "Python News" is a HTML version of the file :source:`Misc/NEWS` which -contains *all* nontrivial changes to Python. +The "Changelog" is a HTML version of the file :source:`Misc/NEWS` which +contains *all* nontrivial changes to Python for the current version. .. toctree:: - :maxdepth: 1 + :maxdepth: 2 - news.rst + changelog.rst diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -78,7 +78,7 @@ - Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to Popen when %action substitutions produce empty strings. -- Issues #12776, #11839: call argparse type function (specified by add_argument) +- Issue #12776, issue #11839: call argparse type function (specified by add_argument) only once. Before, the type function was called twice in the case where the default was specified and the argument was given as well. This was especially problematic for the FileType type, as a default file would always be opened, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 1 19:27:35 2012 From: python-checkins at python.org (georg.brandl) Date: Mon, 1 Oct 2012 19:27:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_page_name?= =?utf-8?q?=2E?= Message-ID: <3XVr6H0YsBzQv3@mail.python.org> http://hg.python.org/cpython/rev/f182a64bf09d changeset: 79371:f182a64bf09d branch: 3.3 parent: 79369:821f473c4ad9 user: Georg Brandl date: Mon Oct 01 19:26:09 2012 +0200 summary: Fix page name. files: Doc/tools/sphinxext/layout.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -8,7 +8,7 @@ {% block extrahead %} {% if not embedded %}{% endif %} - {% if pagename == 'whatsnew/news' %} + {% if pagename == 'whatsnew/changelog %} {% endif %} - {% if pagename == 'whatsnew/news' %} + {% if pagename == 'whatsnew/changelog %} {% endif %} - {% if pagename == 'whatsnew/changelog %} + {% if pagename == 'whatsnew/changelog' %} {% endif %} - {% if pagename == 'whatsnew/changelog %} + {% if pagename == 'whatsnew/changelog' %} {% endif %} {% if pagename == 'whatsnew/changelog' %} {% endif %} {{ super() }} @@ -31,7 +71,7 @@
© Copyright {{ copyright|e }}.
- The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
Last updated on {{ last_updated|e }}. diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst --- a/Doc/whatsnew/changelog.rst +++ b/Doc/whatsnew/changelog.rst @@ -2,13 +2,5 @@ Changelog +++++++++ -.. raw:: html - -

- Filter entries by content: - - -

- .. miscnews:: ../../Misc/NEWS -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 00:47:22 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 2 Oct 2012 00:47:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_changelog_filtering_fixes/improvements_with_3=2E3?= =?utf-8?q?=2E?= Message-ID: <3XVzCG1rNLzQq2@mail.python.org> http://hg.python.org/cpython/rev/f7851b05325f changeset: 79392:f7851b05325f parent: 79390:559a430e563c parent: 79391:e9c28d6983f4 user: Ezio Melotti date: Tue Oct 02 01:46:49 2012 +0300 summary: Merge changelog filtering fixes/improvements with 3.3. files: Doc/tools/sphinxext/layout.html | 66 ++++++++++++++++---- Doc/whatsnew/changelog.rst | 8 -- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -10,19 +10,59 @@ {% if not embedded %}{% endif %} {% if pagename == 'whatsnew/changelog' %} {% endif %} {{ super() }} @@ -31,7 +71,7 @@
© Copyright {{ copyright|e }}.
- The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
Last updated on {{ last_updated|e }}. diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst --- a/Doc/whatsnew/changelog.rst +++ b/Doc/whatsnew/changelog.rst @@ -2,13 +2,5 @@ Changelog +++++++++ -.. raw:: html - -

- Filter entries by content: - - -

- .. miscnews:: ../../Misc/NEWS -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 00:59:56 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 2 Oct 2012 00:59:56 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2315766=3A_Catch_ex?= =?utf-8?q?ceptions_while_raising_the_ImportError_in?= Message-ID: <3XVzTm53K0zQqv@mail.python.org> http://hg.python.org/cpython/rev/f3ed5e211fcc changeset: 79393:f3ed5e211fcc user: Victor Stinner date: Tue Oct 02 00:55:07 2012 +0200 summary: Close #15766: Catch exceptions while raising the ImportError in imp.load_dynamic() files: Python/dynload_shlib.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -129,19 +129,30 @@ handle = dlopen(pathname, dlopenflags); if (handle == NULL) { - PyObject *mod_name = NULL; - PyObject *path = NULL; - PyObject *error_ob = NULL; + PyObject *mod_name; + PyObject *path; + PyObject *error_ob; const char *error = dlerror(); if (error == NULL) error = "unknown dlopen() error"; error_ob = PyUnicode_FromString(error); + if (error_ob == NULL) + return NULL; + mod_name = PyUnicode_FromString(shortname); + if (mod_name == NULL) { + Py_DECREF(error_ob); + return NULL; + } path = PyUnicode_FromString(pathname); - mod_name = PyUnicode_FromString(shortname); + if (path == NULL) { + Py_DECREF(error_ob); + Py_DECREF(mod_name); + return NULL; + } PyErr_SetImportError(error_ob, mod_name, path); - Py_XDECREF(error_ob); - Py_XDECREF(path); - Py_XDECREF(mod_name); + Py_DECREF(error_ob); + Py_DECREF(mod_name); + Py_DECREF(path); return NULL; } if (fp != NULL && nhandles < 128) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 03:48:12 2012 From: python-checkins at python.org (r.david.murray) Date: Tue, 2 Oct 2012 03:48:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzExMTA5OiBjbGVh?= =?utf-8?q?n_up_docs=2C_add_whatsnew_entry=2C_and_fix_Justin=27s_last_name?= =?utf-8?q?=2E?= Message-ID: <3XW3Cw2QsNzQss@mail.python.org> http://hg.python.org/cpython/rev/991c24b8969d changeset: 79394:991c24b8969d branch: 3.3 parent: 79391:e9c28d6983f4 user: R David Murray date: Mon Oct 01 21:43:46 2012 -0400 summary: #11109: clean up docs, add whatsnew entry, and fix Justin's last name. files: Doc/library/socketserver.rst | 18 ++++++++++-------- Doc/whatsnew/3.3.rst | 10 ++++++++++ Lib/socketserver.py | 2 +- Misc/NEWS | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -153,20 +153,22 @@ .. method:: BaseServer.serve_forever(poll_interval=0.5) - Handle requests until an explicit :meth:`shutdown` request. - Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It also calls - :meth:`service_actions` which may be used by a subclass or Mixin to provide - various cleanup actions. For e.g. ForkingMixin class uses - :meth:`service_actions` to cleanup the zombie child processes. + Handle requests until an explicit :meth:`shutdown` request. Poll for + shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It + also calls :meth:`service_actions`, which may be used by a subclass or mixin + to provide actions specific to a given service. For example, the + :class:`ForkingMixIn` class uses :meth:`service_actions` to clean up zombie + child processes. .. versionchanged:: 3.3 - Added service_actions call to the serve_forever method. + Added ``service_actions`` call to the ``serve_forever`` method. .. method:: BaseServer.service_actions() - This is called by the serve_forever loop. This method is can be overridden - by Mixin's to add cleanup or service specific actions. + This is called in the :meth:`serve_forever` loop. This method is can be + overridden by subclasses or mixin classes to perform actions specific to + a given service, such as cleanup actions. .. versionadded:: 3.3 diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1805,6 +1805,16 @@ (Contributed by Ross Lagerwall in :issue:`10866`.) +socketserver +------------ + +:class:`~socketserver.BaseServer` now has an overridable method +:meth:`~socketserver.BaseServer.service_actions` that is called by the +:meth:`~socketserver.BaseServer.serve_forever` method in the service loop. +:class:`~socketserver.ForkingMixIn` now uses this to clean up zombie +child proceses. (Contributed by Justin Warkentin in :issue:`11109`.) + + sqlite3 ------- diff --git a/Lib/socketserver.py b/Lib/socketserver.py --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -562,7 +562,7 @@ self.collect_children() def service_actions(self): - """Collect the zombie child processes regularly in the ForkingMixin. + """Collect the zombie child processes regularly in the ForkingMixIn. service_actions is called in the BaseServer's serve_forver loop. """ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3296,7 +3296,7 @@ if the file is closed. - Issue #11109: New service_action method for BaseServer, used by ForkingMixin - class for cleanup. Initial Patch by Justin Wark. + class for cleanup. Initial Patch by Justin Warkentin. - Issue #12045: Avoid duplicate execution of command in ctypes.util._get_soname(). Patch by Sijin Joseph. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 03:48:13 2012 From: python-checkins at python.org (r.david.murray) Date: Tue, 2 Oct 2012 03:48:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_=2311109=3A_clean_up_docs=2C_add_whatsnew_entry=2C?= =?utf-8?q?_and_fix_Justin=27s_last_name=2E?= Message-ID: <3XW3Cx5fTYzQtT@mail.python.org> http://hg.python.org/cpython/rev/1234300bc056 changeset: 79395:1234300bc056 parent: 79393:f3ed5e211fcc parent: 79394:991c24b8969d user: R David Murray date: Mon Oct 01 21:47:57 2012 -0400 summary: Merge #11109: clean up docs, add whatsnew entry, and fix Justin's last name. files: Doc/library/socketserver.rst | 18 ++++++++++-------- Doc/whatsnew/3.3.rst | 10 ++++++++++ Lib/socketserver.py | 2 +- Misc/HISTORY | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -153,20 +153,22 @@ .. method:: BaseServer.serve_forever(poll_interval=0.5) - Handle requests until an explicit :meth:`shutdown` request. - Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It also calls - :meth:`service_actions` which may be used by a subclass or Mixin to provide - various cleanup actions. For e.g. ForkingMixin class uses - :meth:`service_actions` to cleanup the zombie child processes. + Handle requests until an explicit :meth:`shutdown` request. Poll for + shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It + also calls :meth:`service_actions`, which may be used by a subclass or mixin + to provide actions specific to a given service. For example, the + :class:`ForkingMixIn` class uses :meth:`service_actions` to clean up zombie + child processes. .. versionchanged:: 3.3 - Added service_actions call to the serve_forever method. + Added ``service_actions`` call to the ``serve_forever`` method. .. method:: BaseServer.service_actions() - This is called by the serve_forever loop. This method is can be overridden - by Mixin's to add cleanup or service specific actions. + This is called in the :meth:`serve_forever` loop. This method is can be + overridden by subclasses or mixin classes to perform actions specific to + a given service, such as cleanup actions. .. versionadded:: 3.3 diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1805,6 +1805,16 @@ (Contributed by Ross Lagerwall in :issue:`10866`.) +socketserver +------------ + +:class:`~socketserver.BaseServer` now has an overridable method +:meth:`~socketserver.BaseServer.service_actions` that is called by the +:meth:`~socketserver.BaseServer.serve_forever` method in the service loop. +:class:`~socketserver.ForkingMixIn` now uses this to clean up zombie +child proceses. (Contributed by Justin Warkentin in :issue:`11109`.) + + sqlite3 ------- diff --git a/Lib/socketserver.py b/Lib/socketserver.py --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -562,7 +562,7 @@ self.collect_children() def service_actions(self): - """Collect the zombie child processes regularly in the ForkingMixin. + """Collect the zombie child processes regularly in the ForkingMixIn. service_actions is called in the BaseServer's serve_forver loop. """ diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -3187,8 +3187,8 @@ - Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if the file is closed. -- Issue #11109: New service_action method for BaseServer, used by ForkingMixin - class for cleanup. Initial Patch by Justin Wark. +- Issue #11109: New service_action method for BaseServer, used by ForkingMixIn + class for cleanup. Initial Patch by Justin Warkentin. - Issue #12045: Avoid duplicate execution of command in ctypes.util._get_soname(). Patch by Sijin Joseph. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 04:11:04 2012 From: python-checkins at python.org (r.david.murray) Date: Tue, 2 Oct 2012 04:11:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_threading?= =?utf-8?q?=2Eget=5Fident_to_whatsnew=2E?= Message-ID: <3XW3kJ41vmzQnx@mail.python.org> http://hg.python.org/cpython/rev/ee59d137a71b changeset: 79396:ee59d137a71b branch: 3.3 parent: 79394:991c24b8969d user: R David Murray date: Mon Oct 01 22:10:15 2012 -0400 summary: Add threading.get_ident to whatsnew. files: Doc/whatsnew/3.3.rst | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1911,6 +1911,12 @@ argument to override the default behavior of inheriting the ``deamon`` flag value from the parent thread (:issue:`6064`). +The formerly private function ``_thread.get_ident`` is now available as the +public function :func:`~threading.get_ident`. This eliminates several cases of +direct access to the ``_thread`` module in the stdlib. Third party code that +used ``_thread.get_ident`` should likewise be changed to use the new public +interface. + time ---- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 04:11:05 2012 From: python-checkins at python.org (r.david.murray) Date: Tue, 2 Oct 2012 04:11:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Add_threading=2Eget=5Fident_to_whatsnew=2E?= Message-ID: <3XW3kK6jqwzQpS@mail.python.org> http://hg.python.org/cpython/rev/735ab542fbc8 changeset: 79397:735ab542fbc8 parent: 79395:1234300bc056 parent: 79396:ee59d137a71b user: R David Murray date: Mon Oct 01 22:10:53 2012 -0400 summary: Merge: Add threading.get_ident to whatsnew. files: Doc/whatsnew/3.3.rst | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1911,6 +1911,12 @@ argument to override the default behavior of inheriting the ``deamon`` flag value from the parent thread (:issue:`6064`). +The formerly private function ``_thread.get_ident`` is now available as the +public function :func:`~threading.get_ident`. This eliminates several cases of +direct access to the ``_thread`` module in the stdlib. Third party code that +used ``_thread.get_ident`` should likewise be changed to use the new public +interface. + time ---- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 05:02:29 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 2 Oct 2012 05:02:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1OTc5OiBpbXBy?= =?utf-8?q?ove_timeit_documentation=2E?= Message-ID: <3XW4sd6t0dzQsH@mail.python.org> http://hg.python.org/cpython/rev/60c831305e73 changeset: 79398:60c831305e73 branch: 2.7 parent: 79359:ed76eac4491e user: Ezio Melotti date: Tue Oct 02 05:34:38 2012 +0300 summary: #15979: improve timeit documentation. files: Doc/library/timeit.rst | 292 +++++++++++++++++----------- Misc/NEWS | 2 + 2 files changed, 180 insertions(+), 114 deletions(-) diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -16,122 +16,163 @@ -------------- This module provides a simple way to time small bits of Python code. It has both -command line as well as callable interfaces. It avoids a number of common traps -for measuring execution times. See also Tim Peters' introduction to the -"Algorithms" chapter in the Python Cookbook, published by O'Reilly. +a :ref:`command-line-interface` as well as a :ref:`callable ` +one. It avoids a number of common traps for measuring execution times. +See also Tim Peters' introduction to the "Algorithms" chapter in the *Python +Cookbook*, published by O'Reilly. -The module defines the following public class: + +Basic Examples +-------------- + +The following example shows how the :ref:`command-line-interface` +can be used to compare three different expressions: + +.. code-block:: sh + + $ python -m timeit '"-".join(str(n) for n in range(100))' + 10000 loops, best of 3: 40.3 usec per loop + $ python -m timeit '"-".join([str(n) for n in range(100)])' + 10000 loops, best of 3: 33.4 usec per loop + $ python -m timeit '"-".join(map(str, range(100)))' + 10000 loops, best of 3: 25.2 usec per loop + +This can be achieved from the :ref:`python-interface` with:: + + >>> import timeit + >>> timeit.timeit('"-".join(str(n) for n in range(100))', number=10000) + 0.8187260627746582 + >>> timeit.timeit('"-".join([str(n) for n in range(100)])', number=10000) + 0.7288308143615723 + >>> timeit.timeit('"-".join(map(str, range(100)))', number=10000) + 0.5858950614929199 + +Note however that :mod:`timeit` will automatically determine the number of +repetitions only when the command-line interface is used. In the +:ref:`timeit-examples` section you can find more advanced examples. + + +.. _python-interface: + +Python Interface +---------------- + +The module defines three convenience functions and a public class: + + +.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.timeit` method with *number* executions. + + .. versionadded:: 2.6 + + +.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.repeat` method with the given *repeat* + count and *number* executions. + + .. versionadded:: 2.6 + + +.. function:: default_timer() + + Define a default timer, in a platform-specific manner. On Windows, + :func:`time.clock` has microsecond granularity, but :func:`time.time`'s + granularity is 1/60th of a second. On Unix, :func:`time.clock` has 1/100th of + a second granularity, and :func:`time.time` is much more precise. On either + platform, :func:`default_timer` measures wall clock time, not the CPU + time. This means that other processes running on the same computer may + interfere with the timing. .. class:: Timer(stmt='pass', setup='pass', timer=) Class for timing execution speed of small code snippets. - The constructor takes a statement to be timed, an additional statement used for - setup, and a timer function. Both statements default to ``'pass'``; the timer - function is platform-dependent (see the module doc string). *stmt* and *setup* - may also contain multiple statements separated by ``;`` or newlines, as long as - they don't contain multi-line string literals. + The constructor takes a statement to be timed, an additional statement used + for setup, and a timer function. Both statements default to ``'pass'``; + the timer function is platform-dependent (see the module doc string). + *stmt* and *setup* may also contain multiple statements separated by ``;`` + or newlines, as long as they don't contain multi-line string literals. - To measure the execution time of the first statement, use the :meth:`Timer.timeit` - method. The :meth:`repeat` method is a convenience to call :meth:`.timeit` + To measure the execution time of the first statement, use the :meth:`.timeit` + method. The :meth:`.repeat` method is a convenience to call :meth:`.timeit` multiple times and return a list of results. .. versionchanged:: 2.6 - The *stmt* and *setup* parameters can now also take objects that are callable - without arguments. This will embed calls to them in a timer function that will - then be executed by :meth:`.timeit`. Note that the timing overhead is a - little larger in this case because of the extra function calls. + The *stmt* and *setup* parameters can now also take objects that are + callable without arguments. This will embed calls to them in a timer + function that will then be executed by :meth:`.timeit`. Note that the + timing overhead is a little larger in this case because of the extra + function calls. -.. method:: Timer.print_exc(file=None) + .. method:: Timer.timeit(number=1000000) - Helper to print a traceback from the timed code. + Time *number* executions of the main statement. This executes the setup + statement once, and then returns the time it takes to execute the main + statement a number of times, measured in seconds as a float. + The argument is the number of times through the loop, defaulting to one + million. The main statement, the setup statement and the timer function + to be used are passed to the constructor. - Typical use:: + .. note:: - t = Timer(...) # outside the try/except - try: - t.timeit(...) # or t.repeat(...) - except: - t.print_exc() + By default, :meth:`.timeit` temporarily turns off :term:`garbage + collection` during the timing. The advantage of this approach is that + it makes independent timings more comparable. This disadvantage is + that GC may be an important component of the performance of the + function being measured. If so, GC can be re-enabled as the first + statement in the *setup* string. For example:: - The advantage over the standard traceback is that source lines in the compiled - template will be displayed. The optional *file* argument directs where the - traceback is sent; it defaults to ``sys.stderr``. + timeit.Timer('for i in xrange(10): oct(i)', 'gc.enable()').timeit() -.. method:: Timer.repeat(repeat=3, number=1000000) + .. method:: Timer.repeat(repeat=3, number=1000000) - Call :meth:`.timeit` a few times. + Call :meth:`.timeit` a few times. - This is a convenience function that calls the :meth:`.timeit` repeatedly, - returning a list of results. The first argument specifies how many times to - call :meth:`.timeit`. The second argument specifies the *number* argument for - :meth:`.timeit`. + This is a convenience function that calls the :meth:`.timeit` repeatedly, + returning a list of results. The first argument specifies how many times + to call :meth:`.timeit`. The second argument specifies the *number* + argument for :meth:`.timeit`. - .. note:: + .. note:: - It's tempting to calculate mean and standard deviation from the result vector - and report these. However, this is not very useful. In a typical case, the - lowest value gives a lower bound for how fast your machine can run the given - code snippet; higher values in the result vector are typically not caused by - variability in Python's speed, but by other processes interfering with your - timing accuracy. So the :func:`min` of the result is probably the only number - you should be interested in. After that, you should look at the entire vector - and apply common sense rather than statistics. + It's tempting to calculate mean and standard deviation from the result + vector and report these. However, this is not very useful. + In a typical case, the lowest value gives a lower bound for how fast + your machine can run the given code snippet; higher values in the + result vector are typically not caused by variability in Python's + speed, but by other processes interfering with your timing accuracy. + So the :func:`min` of the result is probably the only number you + should be interested in. After that, you should look at the entire + vector and apply common sense rather than statistics. -.. method:: Timer.timeit(number=1000000) + .. method:: Timer.print_exc(file=None) - Time *number* executions of the main statement. This executes the setup - statement once, and then returns the time it takes to execute the main statement - a number of times, measured in seconds as a float. The argument is the number - of times through the loop, defaulting to one million. The main statement, the - setup statement and the timer function to be used are passed to the constructor. + Helper to print a traceback from the timed code. - .. note:: + Typical use:: - By default, :meth:`.timeit` temporarily turns off :term:`garbage collection` - during the timing. The advantage of this approach is that it makes - independent timings more comparable. This disadvantage is that GC may be - an important component of the performance of the function being measured. - If so, GC can be re-enabled as the first statement in the *setup* string. - For example:: + t = Timer(...) # outside the try/except + try: + t.timeit(...) # or t.repeat(...) + except: + t.print_exc() - timeit.Timer('for i in xrange(10): oct(i)', 'gc.enable()').timeit() + The advantage over the standard traceback is that source lines in the + compiled template will be displayed. The optional *file* argument directs + where the traceback is sent; it defaults to :data:`sys.stderr`. -The module also defines three convenience functions: +.. _command-line-interface: -.. function:: default_timer() - - Define a default timer, in a platform specific manner. On Windows, - :func:`time.clock` has microsecond granularity but :func:`time.time`'s - granularity is 1/60th of a second; on Unix, :func:`time.clock` has 1/100th of - a second granularity and :func:`time.time` is much more precise. On either - platform, :func:`default_timer` measures wall clock time, not the CPU - time. This means that other processes running on the same computer may - interfere with the timing. - -.. function:: repeat(stmt, setup='pass', timer=default_timer, repeat=3 , number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`repeat` method with the given repeat count and - *number* executions. - - .. versionadded:: 2.6 - - -.. function:: timeit(stmt, setup='pass', timer=default_timer, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`.timeit` method with *number* executions. - - .. versionadded:: 2.6 - - -Command Line Interface +Command-Line Interface ---------------------- When called as a program from the command line, the following form is used:: @@ -189,25 +230,55 @@ There is a certain baseline overhead associated with executing a pass statement. The code here doesn't try to hide it, but you should be aware of it. The - baseline overhead can be measured by invoking the program without arguments. + baseline overhead can be measured by invoking the program without arguments, and + it might differ between Python versions. Also, to fairly compare older Python + versions to Python 2.3, you may want to use Python's :option:`-O` option for + the older versions to avoid timing ``SET_LINENO`` instructions. -The baseline overhead differs between Python versions! Also, to fairly compare -older Python versions to Python 2.3, you may want to use Python's :option:`-O` -option for the older versions to avoid timing ``SET_LINENO`` instructions. +.. _timeit-examples: Examples -------- -Here are two example sessions (one using the command line, one using the module -interface) that compare the cost of using :func:`hasattr` vs. -:keyword:`try`/:keyword:`except` to test for missing and present object -attributes. :: +It is possible to provide a setup statement that is executed only once at the beginning: + +.. code-block:: sh + + $ python -m timeit -s 'text = "sample string"; char = "g"' 'char in text' + 10000000 loops, best of 3: 0.0877 usec per loop + $ python -m timeit -s 'text = "sample string"; char = "g"' 'text.find(char)' + 1000000 loops, best of 3: 0.342 usec per loop + +:: + + >>> import timeit + >>> timeit.timeit('char in text', setup='text = "sample string"; char = "g"') + 0.41440500499993504 + >>> timeit.timeit('text.find(char)', setup='text = "sample string"; char = "g"') + 1.7246671520006203 + +The same can be done using the :class:`Timer` class and its methods:: + + >>> import timeit + >>> t = timeit.Timer('char in text', setup='text = "sample string"; char = "g"') + >>> t.timeit() + 0.3955516149999312 + >>> t.repeat() + [0.40193588800002544, 0.3960157959998014, 0.39594301399984033] + + +The following examples show how to time expressions that contain multiple lines. +Here we compare the cost of using :func:`hasattr` vs. :keyword:`try`/:keyword:`except` +to test for missing and present object attributes: + +.. code-block:: sh $ python -m timeit 'try:' ' str.__nonzero__' 'except AttributeError:' ' pass' 100000 loops, best of 3: 15.7 usec per loop $ python -m timeit 'if hasattr(str, "__nonzero__"): pass' 100000 loops, best of 3: 4.26 usec per loop + $ python -m timeit 'try:' ' int.__nonzero__' 'except AttributeError:' ' pass' 1000000 loops, best of 3: 1.43 usec per loop $ python -m timeit 'if hasattr(int, "__nonzero__"): pass' @@ -216,36 +287,31 @@ :: >>> import timeit + >>> # attribute is missing >>> s = """\ ... try: ... str.__nonzero__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000) - 17.09 usec/pass - >>> s = """\ - ... if hasattr(str, '__nonzero__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000) - 4.85 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.9138244460009446 + >>> s = "if hasattr(str, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.5829014980008651 + >>> + >>> # attribute is present >>> s = """\ ... try: ... int.__nonzero__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000) - 1.97 usec/pass - >>> s = """\ - ... if hasattr(int, '__nonzero__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000) - 3.15 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.04215312199994514 + >>> s = "if hasattr(int, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.08588060699912603 To give the :mod:`timeit` module access to functions you define, you can pass a *setup* parameter which contains an import statement:: @@ -257,7 +323,5 @@ L.append(i) if __name__ == '__main__': - from timeit import Timer - t = Timer("test()", "from __main__ import test") - print t.timeit() - + import timeit + print(timeit.timeit("test()", setup="from __main__ import test")) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -459,6 +459,8 @@ Documentation ------------- +- Issue #15979: Improve timeit documentation. + - Issue #16036: Improve documentation of built-in int()'s signature and arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 05:02:31 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 2 Oct 2012 05:02:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTc5OiBpbXBy?= =?utf-8?q?ove_timeit_documentation=2E?= Message-ID: <3XW4sg5t0NzQsm@mail.python.org> http://hg.python.org/cpython/rev/d5a4300702c1 changeset: 79399:d5a4300702c1 branch: 3.2 parent: 79353:c8b94273c5ee user: Ezio Melotti date: Tue Oct 02 05:35:39 2012 +0300 summary: #15979: improve timeit documentation. files: Doc/library/timeit.rst | 278 +++++++++++++++++----------- Misc/NEWS | 2 + 2 files changed, 171 insertions(+), 109 deletions(-) diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -14,119 +14,157 @@ -------------- This module provides a simple way to time small bits of Python code. It has both -command line as well as callable interfaces. It avoids a number of common traps -for measuring execution times. See also Tim Peters' introduction to the -"Algorithms" chapter in the Python Cookbook, published by O'Reilly. +a :ref:`command-line-interface` as well as a :ref:`callable ` +one. It avoids a number of common traps for measuring execution times. +See also Tim Peters' introduction to the "Algorithms" chapter in the *Python +Cookbook*, published by O'Reilly. -The module defines the following public class: + +Basic Examples +-------------- + +The following example shows how the :ref:`command-line-interface` +can be used to compare three different expressions: + +.. code-block:: sh + + $ python -m timeit '"-".join(str(n) for n in range(100))' + 10000 loops, best of 3: 40.3 usec per loop + $ python -m timeit '"-".join([str(n) for n in range(100)])' + 10000 loops, best of 3: 33.4 usec per loop + $ python -m timeit '"-".join(map(str, range(100)))' + 10000 loops, best of 3: 25.2 usec per loop + +This can be achieved from the :ref:`python-interface` with:: + + >>> import timeit + >>> timeit.timeit('"-".join(str(n) for n in range(100))', number=10000) + 0.8187260627746582 + >>> timeit.timeit('"-".join([str(n) for n in range(100)])', number=10000) + 0.7288308143615723 + >>> timeit.timeit('"-".join(map(str, range(100)))', number=10000) + 0.5858950614929199 + +Note however that :mod:`timeit` will automatically determine the number of +repetitions only when the command-line interface is used. In the +:ref:`timeit-examples` section you can find more advanced examples. + + +.. _python-interface: + +Python Interface +---------------- + +The module defines three convenience functions and a public class: + + +.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.timeit` method with *number* executions. + + +.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.repeat` method with the given *repeat* + count and *number* executions. + + +.. function:: default_timer() + + Define a default timer, in a platform-specific manner. On Windows, + :func:`time.clock` has microsecond granularity, but :func:`time.time`'s + granularity is 1/60th of a second. On Unix, :func:`time.clock` has 1/100th of + a second granularity, and :func:`time.time` is much more precise. On either + platform, :func:`default_timer` measures wall clock time, not the CPU + time. This means that other processes running on the same computer may + interfere with the timing. .. class:: Timer(stmt='pass', setup='pass', timer=) Class for timing execution speed of small code snippets. - The constructor takes a statement to be timed, an additional statement used for - setup, and a timer function. Both statements default to ``'pass'``; the timer - function is platform-dependent (see the module doc string). *stmt* and *setup* - may also contain multiple statements separated by ``;`` or newlines, as long as - they don't contain multi-line string literals. + The constructor takes a statement to be timed, an additional statement used + for setup, and a timer function. Both statements default to ``'pass'``; + the timer function is platform-dependent (see the module doc string). + *stmt* and *setup* may also contain multiple statements separated by ``;`` + or newlines, as long as they don't contain multi-line string literals. - To measure the execution time of the first statement, use the :meth:`Timer.timeit` - method. The :meth:`repeat` method is a convenience to call :meth:`.timeit` + To measure the execution time of the first statement, use the :meth:`.timeit` + method. The :meth:`.repeat` method is a convenience to call :meth:`.timeit` multiple times and return a list of results. The *stmt* and *setup* parameters can also take objects that are callable - without arguments. This will embed calls to them in a timer function that + without arguments. This will embed calls to them in a timer function that will then be executed by :meth:`.timeit`. Note that the timing overhead is a little larger in this case because of the extra function calls. -.. method:: Timer.print_exc(file=None) + .. method:: Timer.timeit(number=1000000) - Helper to print a traceback from the timed code. + Time *number* executions of the main statement. This executes the setup + statement once, and then returns the time it takes to execute the main + statement a number of times, measured in seconds as a float. + The argument is the number of times through the loop, defaulting to one + million. The main statement, the setup statement and the timer function + to be used are passed to the constructor. - Typical use:: + .. note:: - t = Timer(...) # outside the try/except - try: - t.timeit(...) # or t.repeat(...) - except: - t.print_exc() + By default, :meth:`.timeit` temporarily turns off :term:`garbage + collection` during the timing. The advantage of this approach is that + it makes independent timings more comparable. This disadvantage is + that GC may be an important component of the performance of the + function being measured. If so, GC can be re-enabled as the first + statement in the *setup* string. For example:: - The advantage over the standard traceback is that source lines in the compiled - template will be displayed. The optional *file* argument directs where the - traceback is sent; it defaults to ``sys.stderr``. + timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() -.. method:: Timer.repeat(repeat=3, number=1000000) + .. method:: Timer.repeat(repeat=3, number=1000000) - Call :meth:`.timeit` a few times. + Call :meth:`.timeit` a few times. - This is a convenience function that calls the :meth:`.timeit` repeatedly, - returning a list of results. The first argument specifies how many times to - call :meth:`.timeit`. The second argument specifies the *number* argument for - :meth:`.timeit`. + This is a convenience function that calls the :meth:`.timeit` repeatedly, + returning a list of results. The first argument specifies how many times + to call :meth:`.timeit`. The second argument specifies the *number* + argument for :meth:`.timeit`. - .. note:: + .. note:: - It's tempting to calculate mean and standard deviation from the result vector - and report these. However, this is not very useful. In a typical case, the - lowest value gives a lower bound for how fast your machine can run the given - code snippet; higher values in the result vector are typically not caused by - variability in Python's speed, but by other processes interfering with your - timing accuracy. So the :func:`min` of the result is probably the only number - you should be interested in. After that, you should look at the entire vector - and apply common sense rather than statistics. + It's tempting to calculate mean and standard deviation from the result + vector and report these. However, this is not very useful. + In a typical case, the lowest value gives a lower bound for how fast + your machine can run the given code snippet; higher values in the + result vector are typically not caused by variability in Python's + speed, but by other processes interfering with your timing accuracy. + So the :func:`min` of the result is probably the only number you + should be interested in. After that, you should look at the entire + vector and apply common sense rather than statistics. -.. method:: Timer.timeit(number=1000000) + .. method:: Timer.print_exc(file=None) - Time *number* executions of the main statement. This executes the setup - statement once, and then returns the time it takes to execute the main statement - a number of times, measured in seconds as a float. The argument is the number - of times through the loop, defaulting to one million. The main statement, the - setup statement and the timer function to be used are passed to the constructor. + Helper to print a traceback from the timed code. - .. note:: + Typical use:: - By default, :meth:`.timeit` temporarily turns off :term:`garbage collection` - during the timing. The advantage of this approach is that it makes - independent timings more comparable. This disadvantage is that GC may be - an important component of the performance of the function being measured. - If so, GC can be re-enabled as the first statement in the *setup* string. - For example:: + t = Timer(...) # outside the try/except + try: + t.timeit(...) # or t.repeat(...) + except: + t.print_exc() - timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() + The advantage over the standard traceback is that source lines in the + compiled template will be displayed. The optional *file* argument directs + where the traceback is sent; it defaults to :data:`sys.stderr`. -The module also defines three convenience functions: +.. _command-line-interface: - -.. function:: default_timer() - - Define a default timer, in a platform specific manner. On Windows, - :func:`time.clock` has microsecond granularity but :func:`time.time`'s - granularity is 1/60th of a second; on Unix, :func:`time.clock` has 1/100th of - a second granularity and :func:`time.time` is much more precise. On either - platform, :func:`default_timer` measures wall clock time, not the CPU - time. This means that other processes running on the same computer may - interfere with the timing. - - -.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`repeat` method with the given repeat count and - *number* executions. - - -.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`.timeit` method with *number* executions. - - -Command Line Interface +Command-Line Interface ---------------------- When called as a program from the command line, the following form is used:: @@ -184,25 +222,53 @@ There is a certain baseline overhead associated with executing a pass statement. The code here doesn't try to hide it, but you should be aware of it. The - baseline overhead can be measured by invoking the program without arguments. + baseline overhead can be measured by invoking the program without arguments, + and it might differ between Python versions. -The baseline overhead differs between Python versions! Also, to fairly compare -older Python versions to Python 2.3, you may want to use Python's :option:`-O` -option for the older versions to avoid timing ``SET_LINENO`` instructions. +.. _timeit-examples: Examples -------- -Here are two example sessions (one using the command line, one using the module -interface) that compare the cost of using :func:`hasattr` vs. -:keyword:`try`/:keyword:`except` to test for missing and present object -attributes. :: +It is possible to provide a setup statement that is executed only once at the beginning: + +.. code-block:: sh + + $ python -m timeit -s 'text = "sample string"; char = "g"' 'char in text' + 10000000 loops, best of 3: 0.0877 usec per loop + $ python -m timeit -s 'text = "sample string"; char = "g"' 'text.find(char)' + 1000000 loops, best of 3: 0.342 usec per loop + +:: + + >>> import timeit + >>> timeit.timeit('char in text', setup='text = "sample string"; char = "g"') + 0.41440500499993504 + >>> timeit.timeit('text.find(char)', setup='text = "sample string"; char = "g"') + 1.7246671520006203 + +The same can be done using the :class:`Timer` class and its methods:: + + >>> import timeit + >>> t = timeit.Timer('char in text', setup='text = "sample string"; char = "g"') + >>> t.timeit() + 0.3955516149999312 + >>> t.repeat() + [0.40193588800002544, 0.3960157959998014, 0.39594301399984033] + + +The following examples show how to time expressions that contain multiple lines. +Here we compare the cost of using :func:`hasattr` vs. :keyword:`try`/:keyword:`except` +to test for missing and present object attributes: + +.. code-block:: sh $ python -m timeit 'try:' ' str.__bool__' 'except AttributeError:' ' pass' 100000 loops, best of 3: 15.7 usec per loop $ python -m timeit 'if hasattr(str, "__bool__"): pass' 100000 loops, best of 3: 4.26 usec per loop + $ python -m timeit 'try:' ' int.__bool__' 'except AttributeError:' ' pass' 1000000 loops, best of 3: 1.43 usec per loop $ python -m timeit 'if hasattr(int, "__bool__"): pass' @@ -211,36 +277,32 @@ :: >>> import timeit + >>> # attribute is missing >>> s = """\ ... try: ... str.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 17.09 usec/pass - >>> s = """\ - ... if hasattr(str, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 4.85 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.9138244460009446 + >>> s = "if hasattr(str, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.5829014980008651 + >>> + >>> # attribute is present >>> s = """\ ... try: ... int.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 1.97 usec/pass - >>> s = """\ - ... if hasattr(int, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 3.15 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.04215312199994514 + >>> s = "if hasattr(int, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.08588060699912603 + To give the :mod:`timeit` module access to functions you define, you can pass a *setup* parameter which contains an import statement:: @@ -250,7 +312,5 @@ L = [i for i in range(100)] if __name__ == '__main__': - from timeit import Timer - t = Timer("test()", "from __main__ import test") - print(t.timeit()) - + import timeit + print(timeit.timeit("test()", setup="from __main__ import test")) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -603,6 +603,8 @@ - Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd argument. +- Issue #15979: Improve timeit documentation. + - Issue #16036: Improve documentation of built-in int()'s signature and arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 05:02:33 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 2 Oct 2012 05:02:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_=2315979=3A_merge_with_3=2E2=2E?= Message-ID: <3XW4sj4YHCzQv3@mail.python.org> http://hg.python.org/cpython/rev/ff32d390f897 changeset: 79400:ff32d390f897 branch: 3.3 parent: 79396:ee59d137a71b parent: 79399:d5a4300702c1 user: Ezio Melotti date: Tue Oct 02 06:01:16 2012 +0300 summary: #15979: merge with 3.2. files: Doc/library/timeit.rst | 269 +++++++++++++++++----------- Misc/NEWS | 2 + 2 files changed, 168 insertions(+), 103 deletions(-) diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -14,113 +14,154 @@ -------------- This module provides a simple way to time small bits of Python code. It has both -command line as well as callable interfaces. It avoids a number of common traps -for measuring execution times. See also Tim Peters' introduction to the -"Algorithms" chapter in the Python Cookbook, published by O'Reilly. +a :ref:`command-line-interface` as well as a :ref:`callable ` +one. It avoids a number of common traps for measuring execution times. +See also Tim Peters' introduction to the "Algorithms" chapter in the *Python +Cookbook*, published by O'Reilly. -The module defines the following public class: + +Basic Examples +-------------- + +The following example shows how the :ref:`command-line-interface` +can be used to compare three different expressions: + +.. code-block:: sh + + $ python -m timeit '"-".join(str(n) for n in range(100))' + 10000 loops, best of 3: 40.3 usec per loop + $ python -m timeit '"-".join([str(n) for n in range(100)])' + 10000 loops, best of 3: 33.4 usec per loop + $ python -m timeit '"-".join(map(str, range(100)))' + 10000 loops, best of 3: 25.2 usec per loop + +This can be achieved from the :ref:`python-interface` with:: + + >>> import timeit + >>> timeit.timeit('"-".join(str(n) for n in range(100))', number=10000) + 0.8187260627746582 + >>> timeit.timeit('"-".join([str(n) for n in range(100)])', number=10000) + 0.7288308143615723 + >>> timeit.timeit('"-".join(map(str, range(100)))', number=10000) + 0.5858950614929199 + +Note however that :mod:`timeit` will automatically determine the number of +repetitions only when the command-line interface is used. In the +:ref:`timeit-examples` section you can find more advanced examples. + + +.. _python-interface: + +Python Interface +---------------- + +The module defines three convenience functions and a public class: + + +.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.timeit` method with *number* executions. + + +.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.repeat` method with the given *repeat* + count and *number* executions. + + +.. function:: default_timer() + + The default timer, which is always :func:`time.perf_counter`. + + .. versionchanged:: 3.3 + :func:`time.perf_counter` is now the default timer. .. class:: Timer(stmt='pass', setup='pass', timer=) Class for timing execution speed of small code snippets. - The constructor takes a statement to be timed, an additional statement used for - setup, and a timer function. Both statements default to ``'pass'``; the timer - function is platform-dependent (see the module doc string). *stmt* and *setup* - may also contain multiple statements separated by ``;`` or newlines, as long as - they don't contain multi-line string literals. + The constructor takes a statement to be timed, an additional statement used + for setup, and a timer function. Both statements default to ``'pass'``; + the timer function is platform-dependent (see the module doc string). + *stmt* and *setup* may also contain multiple statements separated by ``;`` + or newlines, as long as they don't contain multi-line string literals. - To measure the execution time of the first statement, use the :meth:`Timer.timeit` - method. The :meth:`repeat` method is a convenience to call :meth:`.timeit` + To measure the execution time of the first statement, use the :meth:`.timeit` + method. The :meth:`.repeat` method is a convenience to call :meth:`.timeit` multiple times and return a list of results. The *stmt* and *setup* parameters can also take objects that are callable - without arguments. This will embed calls to them in a timer function that + without arguments. This will embed calls to them in a timer function that will then be executed by :meth:`.timeit`. Note that the timing overhead is a little larger in this case because of the extra function calls. -.. method:: Timer.print_exc(file=None) + .. method:: Timer.timeit(number=1000000) - Helper to print a traceback from the timed code. + Time *number* executions of the main statement. This executes the setup + statement once, and then returns the time it takes to execute the main + statement a number of times, measured in seconds as a float. + The argument is the number of times through the loop, defaulting to one + million. The main statement, the setup statement and the timer function + to be used are passed to the constructor. - Typical use:: + .. note:: - t = Timer(...) # outside the try/except - try: - t.timeit(...) # or t.repeat(...) - except: - t.print_exc() + By default, :meth:`.timeit` temporarily turns off :term:`garbage + collection` during the timing. The advantage of this approach is that + it makes independent timings more comparable. This disadvantage is + that GC may be an important component of the performance of the + function being measured. If so, GC can be re-enabled as the first + statement in the *setup* string. For example:: - The advantage over the standard traceback is that source lines in the compiled - template will be displayed. The optional *file* argument directs where the - traceback is sent; it defaults to ``sys.stderr``. + timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() -.. method:: Timer.repeat(repeat=3, number=1000000) + .. method:: Timer.repeat(repeat=3, number=1000000) - Call :meth:`.timeit` a few times. + Call :meth:`.timeit` a few times. - This is a convenience function that calls the :meth:`.timeit` repeatedly, - returning a list of results. The first argument specifies how many times to - call :meth:`.timeit`. The second argument specifies the *number* argument for - :meth:`.timeit`. + This is a convenience function that calls the :meth:`.timeit` repeatedly, + returning a list of results. The first argument specifies how many times + to call :meth:`.timeit`. The second argument specifies the *number* + argument for :meth:`.timeit`. - .. note:: + .. note:: - It's tempting to calculate mean and standard deviation from the result vector - and report these. However, this is not very useful. In a typical case, the - lowest value gives a lower bound for how fast your machine can run the given - code snippet; higher values in the result vector are typically not caused by - variability in Python's speed, but by other processes interfering with your - timing accuracy. So the :func:`min` of the result is probably the only number - you should be interested in. After that, you should look at the entire vector - and apply common sense rather than statistics. + It's tempting to calculate mean and standard deviation from the result + vector and report these. However, this is not very useful. + In a typical case, the lowest value gives a lower bound for how fast + your machine can run the given code snippet; higher values in the + result vector are typically not caused by variability in Python's + speed, but by other processes interfering with your timing accuracy. + So the :func:`min` of the result is probably the only number you + should be interested in. After that, you should look at the entire + vector and apply common sense rather than statistics. -.. method:: Timer.timeit(number=1000000) + .. method:: Timer.print_exc(file=None) - Time *number* executions of the main statement. This executes the setup - statement once, and then returns the time it takes to execute the main statement - a number of times, measured in seconds as a float. The argument is the number - of times through the loop, defaulting to one million. The main statement, the - setup statement and the timer function to be used are passed to the constructor. + Helper to print a traceback from the timed code. - .. note:: + Typical use:: - By default, :meth:`.timeit` temporarily turns off :term:`garbage collection` - during the timing. The advantage of this approach is that it makes - independent timings more comparable. This disadvantage is that GC may be - an important component of the performance of the function being measured. - If so, GC can be re-enabled as the first statement in the *setup* string. - For example:: + t = Timer(...) # outside the try/except + try: + t.timeit(...) # or t.repeat(...) + except: + t.print_exc() - timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() + The advantage over the standard traceback is that source lines in the + compiled template will be displayed. The optional *file* argument directs + where the traceback is sent; it defaults to :data:`sys.stderr`. -The module also defines three convenience functions: +.. _command-line-interface: - -.. function:: default_timer() - - The default timer, which is always :func:`time.perf_counter`. - - -.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`repeat` method with the given repeat count and - *number* executions. - - -.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`.timeit` method with *number* executions. - - -Command Line Interface +Command-Line Interface ---------------------- When called as a program from the command line, the following form is used:: @@ -184,25 +225,53 @@ There is a certain baseline overhead associated with executing a pass statement. The code here doesn't try to hide it, but you should be aware of it. The - baseline overhead can be measured by invoking the program without arguments. + baseline overhead can be measured by invoking the program without arguments, + and it might differ between Python versions. -The baseline overhead differs between Python versions! Also, to fairly compare -older Python versions to Python 2.3, you may want to use Python's :option:`-O` -option for the older versions to avoid timing ``SET_LINENO`` instructions. +.. _timeit-examples: Examples -------- -Here are two example sessions (one using the command line, one using the module -interface) that compare the cost of using :func:`hasattr` vs. -:keyword:`try`/:keyword:`except` to test for missing and present object -attributes. :: +It is possible to provide a setup statement that is executed only once at the beginning: + +.. code-block:: sh + + $ python -m timeit -s 'text = "sample string"; char = "g"' 'char in text' + 10000000 loops, best of 3: 0.0877 usec per loop + $ python -m timeit -s 'text = "sample string"; char = "g"' 'text.find(char)' + 1000000 loops, best of 3: 0.342 usec per loop + +:: + + >>> import timeit + >>> timeit.timeit('char in text', setup='text = "sample string"; char = "g"') + 0.41440500499993504 + >>> timeit.timeit('text.find(char)', setup='text = "sample string"; char = "g"') + 1.7246671520006203 + +The same can be done using the :class:`Timer` class and its methods:: + + >>> import timeit + >>> t = timeit.Timer('char in text', setup='text = "sample string"; char = "g"') + >>> t.timeit() + 0.3955516149999312 + >>> t.repeat() + [0.40193588800002544, 0.3960157959998014, 0.39594301399984033] + + +The following examples show how to time expressions that contain multiple lines. +Here we compare the cost of using :func:`hasattr` vs. :keyword:`try`/:keyword:`except` +to test for missing and present object attributes: + +.. code-block:: sh $ python -m timeit 'try:' ' str.__bool__' 'except AttributeError:' ' pass' 100000 loops, best of 3: 15.7 usec per loop $ python -m timeit 'if hasattr(str, "__bool__"): pass' 100000 loops, best of 3: 4.26 usec per loop + $ python -m timeit 'try:' ' int.__bool__' 'except AttributeError:' ' pass' 1000000 loops, best of 3: 1.43 usec per loop $ python -m timeit 'if hasattr(int, "__bool__"): pass' @@ -211,36 +280,32 @@ :: >>> import timeit + >>> # attribute is missing >>> s = """\ ... try: ... str.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 17.09 usec/pass - >>> s = """\ - ... if hasattr(str, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 4.85 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.9138244460009446 + >>> s = "if hasattr(str, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.5829014980008651 + >>> + >>> # attribute is present >>> s = """\ ... try: ... int.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 1.97 usec/pass - >>> s = """\ - ... if hasattr(int, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 3.15 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.04215312199994514 + >>> s = "if hasattr(int, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.08588060699912603 + To give the :mod:`timeit` module access to functions you define, you can pass a *setup* parameter which contains an import statement:: @@ -250,7 +315,5 @@ L = [i for i in range(100)] if __name__ == '__main__': - from timeit import Timer - t = Timer("test()", "from __main__ import test") - print(t.timeit()) - + import timeit + print(timeit.timeit("test()", setup="from __main__ import test")) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -110,6 +110,8 @@ - Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd argument. +- Issue #15979: Improve timeit documentation. + - Issue #16036: Improve documentation of built-in `int()`'s signature and arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 05:02:35 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 2 Oct 2012 05:02:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogIzE1OTc5OiBtZXJnZSB3aXRoIDMuMy4=?= Message-ID: <3XW4sl30yBzQvN@mail.python.org> http://hg.python.org/cpython/rev/85b6c1c19cb8 changeset: 79401:85b6c1c19cb8 parent: 79397:735ab542fbc8 parent: 79400:ff32d390f897 user: Ezio Melotti date: Tue Oct 02 06:02:08 2012 +0300 summary: #15979: merge with 3.3. files: Doc/library/timeit.rst | 269 +++++++++++++++++----------- Misc/NEWS | 2 + 2 files changed, 168 insertions(+), 103 deletions(-) diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -14,113 +14,154 @@ -------------- This module provides a simple way to time small bits of Python code. It has both -command line as well as callable interfaces. It avoids a number of common traps -for measuring execution times. See also Tim Peters' introduction to the -"Algorithms" chapter in the Python Cookbook, published by O'Reilly. +a :ref:`command-line-interface` as well as a :ref:`callable ` +one. It avoids a number of common traps for measuring execution times. +See also Tim Peters' introduction to the "Algorithms" chapter in the *Python +Cookbook*, published by O'Reilly. -The module defines the following public class: + +Basic Examples +-------------- + +The following example shows how the :ref:`command-line-interface` +can be used to compare three different expressions: + +.. code-block:: sh + + $ python -m timeit '"-".join(str(n) for n in range(100))' + 10000 loops, best of 3: 40.3 usec per loop + $ python -m timeit '"-".join([str(n) for n in range(100)])' + 10000 loops, best of 3: 33.4 usec per loop + $ python -m timeit '"-".join(map(str, range(100)))' + 10000 loops, best of 3: 25.2 usec per loop + +This can be achieved from the :ref:`python-interface` with:: + + >>> import timeit + >>> timeit.timeit('"-".join(str(n) for n in range(100))', number=10000) + 0.8187260627746582 + >>> timeit.timeit('"-".join([str(n) for n in range(100)])', number=10000) + 0.7288308143615723 + >>> timeit.timeit('"-".join(map(str, range(100)))', number=10000) + 0.5858950614929199 + +Note however that :mod:`timeit` will automatically determine the number of +repetitions only when the command-line interface is used. In the +:ref:`timeit-examples` section you can find more advanced examples. + + +.. _python-interface: + +Python Interface +---------------- + +The module defines three convenience functions and a public class: + + +.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.timeit` method with *number* executions. + + +.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.repeat` method with the given *repeat* + count and *number* executions. + + +.. function:: default_timer() + + The default timer, which is always :func:`time.perf_counter`. + + .. versionchanged:: 3.3 + :func:`time.perf_counter` is now the default timer. .. class:: Timer(stmt='pass', setup='pass', timer=) Class for timing execution speed of small code snippets. - The constructor takes a statement to be timed, an additional statement used for - setup, and a timer function. Both statements default to ``'pass'``; the timer - function is platform-dependent (see the module doc string). *stmt* and *setup* - may also contain multiple statements separated by ``;`` or newlines, as long as - they don't contain multi-line string literals. + The constructor takes a statement to be timed, an additional statement used + for setup, and a timer function. Both statements default to ``'pass'``; + the timer function is platform-dependent (see the module doc string). + *stmt* and *setup* may also contain multiple statements separated by ``;`` + or newlines, as long as they don't contain multi-line string literals. - To measure the execution time of the first statement, use the :meth:`Timer.timeit` - method. The :meth:`repeat` method is a convenience to call :meth:`.timeit` + To measure the execution time of the first statement, use the :meth:`.timeit` + method. The :meth:`.repeat` method is a convenience to call :meth:`.timeit` multiple times and return a list of results. The *stmt* and *setup* parameters can also take objects that are callable - without arguments. This will embed calls to them in a timer function that + without arguments. This will embed calls to them in a timer function that will then be executed by :meth:`.timeit`. Note that the timing overhead is a little larger in this case because of the extra function calls. -.. method:: Timer.print_exc(file=None) + .. method:: Timer.timeit(number=1000000) - Helper to print a traceback from the timed code. + Time *number* executions of the main statement. This executes the setup + statement once, and then returns the time it takes to execute the main + statement a number of times, measured in seconds as a float. + The argument is the number of times through the loop, defaulting to one + million. The main statement, the setup statement and the timer function + to be used are passed to the constructor. - Typical use:: + .. note:: - t = Timer(...) # outside the try/except - try: - t.timeit(...) # or t.repeat(...) - except: - t.print_exc() + By default, :meth:`.timeit` temporarily turns off :term:`garbage + collection` during the timing. The advantage of this approach is that + it makes independent timings more comparable. This disadvantage is + that GC may be an important component of the performance of the + function being measured. If so, GC can be re-enabled as the first + statement in the *setup* string. For example:: - The advantage over the standard traceback is that source lines in the compiled - template will be displayed. The optional *file* argument directs where the - traceback is sent; it defaults to ``sys.stderr``. + timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() -.. method:: Timer.repeat(repeat=3, number=1000000) + .. method:: Timer.repeat(repeat=3, number=1000000) - Call :meth:`.timeit` a few times. + Call :meth:`.timeit` a few times. - This is a convenience function that calls the :meth:`.timeit` repeatedly, - returning a list of results. The first argument specifies how many times to - call :meth:`.timeit`. The second argument specifies the *number* argument for - :meth:`.timeit`. + This is a convenience function that calls the :meth:`.timeit` repeatedly, + returning a list of results. The first argument specifies how many times + to call :meth:`.timeit`. The second argument specifies the *number* + argument for :meth:`.timeit`. - .. note:: + .. note:: - It's tempting to calculate mean and standard deviation from the result vector - and report these. However, this is not very useful. In a typical case, the - lowest value gives a lower bound for how fast your machine can run the given - code snippet; higher values in the result vector are typically not caused by - variability in Python's speed, but by other processes interfering with your - timing accuracy. So the :func:`min` of the result is probably the only number - you should be interested in. After that, you should look at the entire vector - and apply common sense rather than statistics. + It's tempting to calculate mean and standard deviation from the result + vector and report these. However, this is not very useful. + In a typical case, the lowest value gives a lower bound for how fast + your machine can run the given code snippet; higher values in the + result vector are typically not caused by variability in Python's + speed, but by other processes interfering with your timing accuracy. + So the :func:`min` of the result is probably the only number you + should be interested in. After that, you should look at the entire + vector and apply common sense rather than statistics. -.. method:: Timer.timeit(number=1000000) + .. method:: Timer.print_exc(file=None) - Time *number* executions of the main statement. This executes the setup - statement once, and then returns the time it takes to execute the main statement - a number of times, measured in seconds as a float. The argument is the number - of times through the loop, defaulting to one million. The main statement, the - setup statement and the timer function to be used are passed to the constructor. + Helper to print a traceback from the timed code. - .. note:: + Typical use:: - By default, :meth:`.timeit` temporarily turns off :term:`garbage collection` - during the timing. The advantage of this approach is that it makes - independent timings more comparable. This disadvantage is that GC may be - an important component of the performance of the function being measured. - If so, GC can be re-enabled as the first statement in the *setup* string. - For example:: + t = Timer(...) # outside the try/except + try: + t.timeit(...) # or t.repeat(...) + except: + t.print_exc() - timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() + The advantage over the standard traceback is that source lines in the + compiled template will be displayed. The optional *file* argument directs + where the traceback is sent; it defaults to :data:`sys.stderr`. -The module also defines three convenience functions: +.. _command-line-interface: - -.. function:: default_timer() - - The default timer, which is always :func:`time.perf_counter`. - - -.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`repeat` method with the given repeat count and - *number* executions. - - -.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`.timeit` method with *number* executions. - - -Command Line Interface +Command-Line Interface ---------------------- When called as a program from the command line, the following form is used:: @@ -184,25 +225,53 @@ There is a certain baseline overhead associated with executing a pass statement. The code here doesn't try to hide it, but you should be aware of it. The - baseline overhead can be measured by invoking the program without arguments. + baseline overhead can be measured by invoking the program without arguments, + and it might differ between Python versions. -The baseline overhead differs between Python versions! Also, to fairly compare -older Python versions to Python 2.3, you may want to use Python's :option:`-O` -option for the older versions to avoid timing ``SET_LINENO`` instructions. +.. _timeit-examples: Examples -------- -Here are two example sessions (one using the command line, one using the module -interface) that compare the cost of using :func:`hasattr` vs. -:keyword:`try`/:keyword:`except` to test for missing and present object -attributes. :: +It is possible to provide a setup statement that is executed only once at the beginning: + +.. code-block:: sh + + $ python -m timeit -s 'text = "sample string"; char = "g"' 'char in text' + 10000000 loops, best of 3: 0.0877 usec per loop + $ python -m timeit -s 'text = "sample string"; char = "g"' 'text.find(char)' + 1000000 loops, best of 3: 0.342 usec per loop + +:: + + >>> import timeit + >>> timeit.timeit('char in text', setup='text = "sample string"; char = "g"') + 0.41440500499993504 + >>> timeit.timeit('text.find(char)', setup='text = "sample string"; char = "g"') + 1.7246671520006203 + +The same can be done using the :class:`Timer` class and its methods:: + + >>> import timeit + >>> t = timeit.Timer('char in text', setup='text = "sample string"; char = "g"') + >>> t.timeit() + 0.3955516149999312 + >>> t.repeat() + [0.40193588800002544, 0.3960157959998014, 0.39594301399984033] + + +The following examples show how to time expressions that contain multiple lines. +Here we compare the cost of using :func:`hasattr` vs. :keyword:`try`/:keyword:`except` +to test for missing and present object attributes: + +.. code-block:: sh $ python -m timeit 'try:' ' str.__bool__' 'except AttributeError:' ' pass' 100000 loops, best of 3: 15.7 usec per loop $ python -m timeit 'if hasattr(str, "__bool__"): pass' 100000 loops, best of 3: 4.26 usec per loop + $ python -m timeit 'try:' ' int.__bool__' 'except AttributeError:' ' pass' 1000000 loops, best of 3: 1.43 usec per loop $ python -m timeit 'if hasattr(int, "__bool__"): pass' @@ -211,36 +280,32 @@ :: >>> import timeit + >>> # attribute is missing >>> s = """\ ... try: ... str.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 17.09 usec/pass - >>> s = """\ - ... if hasattr(str, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 4.85 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.9138244460009446 + >>> s = "if hasattr(str, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.5829014980008651 + >>> + >>> # attribute is present >>> s = """\ ... try: ... int.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 1.97 usec/pass - >>> s = """\ - ... if hasattr(int, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 3.15 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.04215312199994514 + >>> s = "if hasattr(int, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.08588060699912603 + To give the :mod:`timeit` module access to functions you define, you can pass a *setup* parameter which contains an import statement:: @@ -250,7 +315,5 @@ L = [i for i in range(100)] if __name__ == '__main__': - from timeit import Timer - t = Timer("test()", "from __main__ import test") - print(t.timeit()) - + import timeit + print(timeit.timeit("test()", setup="from __main__ import test")) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -116,6 +116,8 @@ - Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd argument. +- Issue #15979: Improve timeit documentation. + - Issue #16036: Improve documentation of built-in `int()`'s signature and arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 08:26:40 2012 From: python-checkins at python.org (georg.brandl) Date: Tue, 2 Oct 2012 08:26:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Reword_lifespan_to_make_it_cl?= =?utf-8?q?earer=2E?= Message-ID: <3XW9PD4V9VzQmL@mail.python.org> http://hg.python.org/peps/rev/1a6f5a3ca15a changeset: 4533:1a6f5a3ca15a user: Georg Brandl date: Tue Oct 02 08:26:31 2012 +0200 summary: Reword lifespan to make it clearer. files: pep-0392.txt | 9 +++++---- pep-0398.txt | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pep-0392.txt b/pep-0392.txt --- a/pep-0392.txt +++ b/pep-0392.txt @@ -34,10 +34,11 @@ 3.2 Lifespan ============ -3.2 will receive bugfix updates approximately every 4-6 months until -one release after the release of 3.3.0 final. After that, security -updates (source only) will be released until 5 years after the release -of 3.2 final, which will be February 2016. +3.2 will receive bugfix updates approximately every 4-6 months for +approximately 18 months. After the release of 3.3.0 final (see PEP +398), a final 3.2 bugfix update will be released. After that, +security updates (source only) will be released until 5 years after +the release of 3.2 final, which will be February 2016. Release Schedule diff --git a/pep-0398.txt b/pep-0398.txt --- a/pep-0398.txt +++ b/pep-0398.txt @@ -34,10 +34,11 @@ 3.3 Lifespan ============ -3.3 will receive bugfix updates approximately every 4-6 months until -one release after the release of 3.4.0 final. After that, security -updates (source only) will be released until 5 years after the release -of 3.3.0 final, which will be September 2017. +3.3 will receive bugfix updates approximately every 4-6 months for +approximately 18 months. After the release of 3.4.0 final, a final +3.3 bugfix update will be released. After that, security updates +(source only) will be released until 5 years after the release of 3.3 +final, which will be September 2017. Release Schedule -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Tue Oct 2 10:16:34 2012 From: python-checkins at python.org (georg.brandl) Date: Tue, 2 Oct 2012 10:16:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_In_this_case_i?= =?utf-8?q?t_is_not_useful_to_hide_=22threading=22=2E?= Message-ID: <3XWCr23j6HzQqT@mail.python.org> http://hg.python.org/cpython/rev/df7c0f25294c changeset: 79402:df7c0f25294c branch: 3.3 parent: 79400:ff32d390f897 user: Georg Brandl date: Tue Oct 02 10:16:19 2012 +0200 summary: In this case it is not useful to hide "threading". files: Doc/whatsnew/3.3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1912,7 +1912,7 @@ value from the parent thread (:issue:`6064`). The formerly private function ``_thread.get_ident`` is now available as the -public function :func:`~threading.get_ident`. This eliminates several cases of +public function :func:`threading.get_ident`. This eliminates several cases of direct access to the ``_thread`` module in the stdlib. Third party code that used ``_thread.get_ident`` should likewise be changed to use the new public interface. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 10:16:35 2012 From: python-checkins at python.org (georg.brandl) Date: Tue, 2 Oct 2012 10:16:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2Ugd2l0aCAzLjMu?= Message-ID: <3XWCr36HHMzQs5@mail.python.org> http://hg.python.org/cpython/rev/c3549f6c4a6e changeset: 79403:c3549f6c4a6e parent: 79401:85b6c1c19cb8 parent: 79402:df7c0f25294c user: Georg Brandl date: Tue Oct 02 10:16:26 2012 +0200 summary: merge with 3.3. files: Doc/whatsnew/3.3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1912,7 +1912,7 @@ value from the parent thread (:issue:`6064`). The formerly private function ``_thread.get_ident`` is now available as the -public function :func:`~threading.get_ident`. This eliminates several cases of +public function :func:`threading.get_ident`. This eliminates several cases of direct access to the ``_thread`` module in the stdlib. Third party code that used ``_thread.get_ident`` should likewise be changed to use the new public interface. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 12:54:15 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 2 Oct 2012 12:54:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315609=3A_Fix_refl?= =?utf-8?q?eak_introduced_by_my_last_optimization?= Message-ID: <3XWHKz5bxtzQry@mail.python.org> http://hg.python.org/cpython/rev/5ddc7b3f2795 changeset: 79404:5ddc7b3f2795 user: Victor Stinner date: Tue Oct 02 12:54:07 2012 +0200 summary: Issue #15609: Fix refleak introduced by my last optimization files: Objects/unicodeobject.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13449,8 +13449,11 @@ break; } - if (_PyLong_FormatWriter(writer, v, base, alternate) == -1) + if (_PyLong_FormatWriter(writer, v, base, alternate) == -1) { + Py_DECREF(iobj); return -1; + } + Py_DECREF(iobj); return 1; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 16:20:23 2012 From: python-checkins at python.org (r.david.murray) Date: Tue, 2 Oct 2012 16:20:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_multiproce?= =?utf-8?q?ssing=2EProcess=2Esentinel_to_whatsnew=2C_mention_SSLFakeFile_r?= =?utf-8?q?emoval=2E?= Message-ID: <3XWMvq5KCTzQqs@mail.python.org> http://hg.python.org/cpython/rev/9a8c193adf84 changeset: 79405:9a8c193adf84 branch: 3.3 parent: 79402:df7c0f25294c user: R David Murray date: Tue Oct 02 10:19:08 2012 -0400 summary: Add multiprocessing.Process.sentinel to whatsnew, mention SSLFakeFile removal. files: Doc/whatsnew/3.3.rst | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1481,6 +1481,11 @@ to override the default behavior of inheriting the ``daemon`` flag from the parent process (:issue:`6064`). +New attribute attribute :data:`multiprocessing.Process.sentinel` allows a +program to wait on multiple :class:`~multiprocessing.Process` objects at one +time using the appropriate OS primitives (for example, :mod:`select` on +posix systems). + nntplib ------- @@ -2278,6 +2283,10 @@ * The deprecated variable ``time.accept2dyear`` has been removed. +* The undocumented internal helper class ``SSLFakeFile`` has been + removed from :mod:`smtplib`, since its functionality has long been + provided directly by :meth:`socket.socket.makefile`. + Porting C code -------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 16:20:26 2012 From: python-checkins at python.org (r.david.murray) Date: Tue, 2 Oct 2012 16:20:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Add_multiprocessing=2EProcess=2Esentinel_to_wha?= =?utf-8?q?tsnew=2C_mention_SSLFakeFile?= Message-ID: <3XWMvt1mQVzQsx@mail.python.org> http://hg.python.org/cpython/rev/76435de68379 changeset: 79406:76435de68379 parent: 79404:5ddc7b3f2795 parent: 79405:9a8c193adf84 user: R David Murray date: Tue Oct 02 10:19:48 2012 -0400 summary: Merge: Add multiprocessing.Process.sentinel to whatsnew, mention SSLFakeFile removal. files: Doc/whatsnew/3.3.rst | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1481,6 +1481,11 @@ to override the default behavior of inheriting the ``daemon`` flag from the parent process (:issue:`6064`). +New attribute attribute :data:`multiprocessing.Process.sentinel` allows a +program to wait on multiple :class:`~multiprocessing.Process` objects at one +time using the appropriate OS primitives (for example, :mod:`select` on +posix systems). + nntplib ------- @@ -2278,6 +2283,10 @@ * The deprecated variable ``time.accept2dyear`` has been removed. +* The undocumented internal helper class ``SSLFakeFile`` has been + removed from :mod:`smtplib`, since its functionality has long been + provided directly by :meth:`socket.socket.makefile`. + Porting C code -------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 16:56:41 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 2 Oct 2012 16:56:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315452=3A_Added_ve?= =?utf-8?q?rify_option_for_logging_configuration_socket_listener=2E?= Message-ID: <3XWNjj19QNzQq3@mail.python.org> http://hg.python.org/cpython/rev/26c3d170fd56 changeset: 79407:26c3d170fd56 user: Vinay Sajip date: Tue Oct 02 15:56:16 2012 +0100 summary: Issue #15452: Added verify option for logging configuration socket listener. files: Doc/library/logging.config.rst | 20 +++++- Lib/logging/config.py | 46 +++++++----- Lib/test/test_logging.py | 76 ++++++++++++++++++++- 3 files changed, 115 insertions(+), 27 deletions(-) diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst --- a/Doc/library/logging.config.rst +++ b/Doc/library/logging.config.rst @@ -95,7 +95,7 @@ logging configuration. -.. function:: listen(port=DEFAULT_LOGGING_CONFIG_PORT) +.. function:: listen(port=DEFAULT_LOGGING_CONFIG_PORT, verify=None) Starts up a socket server on the specified port, and listens for new configurations. If no port is specified, the module's default @@ -105,6 +105,17 @@ server, and which you can :meth:`join` when appropriate. To stop the server, call :func:`stopListening`. + The ``verify`` argument, if specified, should be a callable which should + verify whether bytes received across the socket are valid and should be + processed. This could be done by encrypting and/or signing what is sent + across the socket, such that the ``verify`` callable can perform + signature verification and/or decryption. The ``verify`` callable is called + with a single argument - the bytes received across the socket - and should + return the bytes to be processed, or None to indicate that the bytes should + be discarded. The returned bytes could be the same as the passed in bytes + (e.g. when only verification is done), or they could be completely different + (perhaps if decryption were performed). + To send a configuration to the socket, read in the configuration file and send it to the socket as a string of bytes preceded by a four-byte length string packed in binary using ``struct.pack('>L', n)``. @@ -121,7 +132,12 @@ :func:`listen` socket and sending a configuration which runs whatever code the attacker wants to have executed in the victim's process. This is especially easy to do if the default port is used, but not hard even if a - different port is used). + different port is used). To avoid the risk of this happening, use the + ``verify`` argument to :func:`listen` to prevent unrecognised + configurations from being applied. + + .. versionchanged:: 3.4. + The ``verify`` argument was added. .. function:: stopListening() diff --git a/Lib/logging/config.py b/Lib/logging/config.py --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -773,7 +773,7 @@ dictConfigClass(config).configure() -def listen(port=DEFAULT_LOGGING_CONFIG_PORT): +def listen(port=DEFAULT_LOGGING_CONFIG_PORT, verify=None): """ Start up a socket server on the specified port, and listen for new configurations. @@ -809,22 +809,25 @@ chunk = self.connection.recv(slen) while len(chunk) < slen: chunk = chunk + conn.recv(slen - len(chunk)) - chunk = chunk.decode("utf-8") - try: - import json - d =json.loads(chunk) - assert isinstance(d, dict) - dictConfig(d) - except: - #Apply new configuration. + if self.server.verify is not None: + chunk = self.server.verify(chunk) + if chunk is not None: # verified, can process + chunk = chunk.decode("utf-8") + try: + import json + d =json.loads(chunk) + assert isinstance(d, dict) + dictConfig(d) + except: + #Apply new configuration. - file = io.StringIO(chunk) - try: - fileConfig(file) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: - traceback.print_exc() + file = io.StringIO(chunk) + try: + fileConfig(file) + except (KeyboardInterrupt, SystemExit): #pragma: no cover + raise + except: + traceback.print_exc() if self.server.ready: self.server.ready.set() except socket.error as e: @@ -843,13 +846,14 @@ allow_reuse_address = 1 def __init__(self, host='localhost', port=DEFAULT_LOGGING_CONFIG_PORT, - handler=None, ready=None): + handler=None, ready=None, verify=None): ThreadingTCPServer.__init__(self, (host, port), handler) logging._acquireLock() self.abort = 0 logging._releaseLock() self.timeout = 1 self.ready = ready + self.verify = verify def serve_until_stopped(self): import select @@ -867,16 +871,18 @@ class Server(threading.Thread): - def __init__(self, rcvr, hdlr, port): + def __init__(self, rcvr, hdlr, port, verify): super(Server, self).__init__() self.rcvr = rcvr self.hdlr = hdlr self.port = port + self.verify = verify self.ready = threading.Event() def run(self): server = self.rcvr(port=self.port, handler=self.hdlr, - ready=self.ready) + ready=self.ready, + verify=self.verify) if self.port == 0: self.port = server.server_address[1] self.ready.set() @@ -886,7 +892,7 @@ logging._releaseLock() server.serve_until_stopped() - return Server(ConfigSocketReceiver, ConfigStreamHandler, port) + return Server(ConfigSocketReceiver, ConfigStreamHandler, port, verify) def stopListening(): """ diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -150,14 +150,17 @@ finally: logging._releaseLock() - def assert_log_lines(self, expected_values, stream=None): + def assert_log_lines(self, expected_values, stream=None, pat=None): """Match the collected log lines against the regular expression self.expected_log_pat, and compare the extracted group values to the expected_values list of tuples.""" stream = stream or self.stream - pat = re.compile(self.expected_log_pat) + pat = re.compile(pat or self.expected_log_pat) try: - stream.reset() + if hasattr(stream, 'reset'): + stream.reset() + elif hasattr(stream, 'seek'): + stream.seek(0) actual_lines = stream.readlines() except AttributeError: # StringIO.StringIO lacks a reset() method. @@ -2601,10 +2604,10 @@ self.assertRaises(Exception, self.apply_config, self.config13) @unittest.skipUnless(threading, 'listen() needs threading to work') - def setup_via_listener(self, text): + def setup_via_listener(self, text, verify=None): text = text.encode("utf-8") # Ask for a randomly assigned port (by using port 0) - t = logging.config.listen(0) + t = logging.config.listen(0, verify) t.start() t.ready.wait() # Now get the port allocated @@ -2664,6 +2667,69 @@ # Original logger output is empty. self.assert_log_lines([]) + @unittest.skipUnless(threading, 'Threading required for this test.') + def test_listen_verify(self): + + def verify_fail(stuff): + return None + + def verify_reverse(stuff): + return stuff[::-1] + + logger = logging.getLogger("compiler.parser") + to_send = textwrap.dedent(ConfigFileTest.config1) + # First, specify a verification function that will fail. + # We expect to see no output, since our configuration + # never took effect. + with captured_stdout() as output: + self.setup_via_listener(to_send, verify_fail) + # Both will output a message + logger.info(self.next_message()) + logger.error(self.next_message()) + self.assert_log_lines([], stream=output) + # Original logger output has the stuff we logged. + self.assert_log_lines([ + ('INFO', '1'), + ('ERROR', '2'), + ], pat=r"^[\w.]+ -> ([\w]+): ([\d]+)$") + + # Now, perform no verification. Our configuration + # should take effect. + + with captured_stdout() as output: + self.setup_via_listener(to_send) # no verify callable specified + logger = logging.getLogger("compiler.parser") + # Both will output a message + logger.info(self.next_message()) + logger.error(self.next_message()) + self.assert_log_lines([ + ('INFO', '3'), + ('ERROR', '4'), + ], stream=output) + # Original logger output still has the stuff we logged before. + self.assert_log_lines([ + ('INFO', '1'), + ('ERROR', '2'), + ], pat=r"^[\w.]+ -> ([\w]+): ([\d]+)$") + + # Now, perform verification which transforms the bytes. + + with captured_stdout() as output: + self.setup_via_listener(to_send[::-1], verify_reverse) + logger = logging.getLogger("compiler.parser") + # Both will output a message + logger.info(self.next_message()) + logger.error(self.next_message()) + self.assert_log_lines([ + ('INFO', '5'), + ('ERROR', '6'), + ], stream=output) + # Original logger output still has the stuff we logged before. + self.assert_log_lines([ + ('INFO', '1'), + ('ERROR', '2'), + ], pat=r"^[\w.]+ -> ([\w]+): ([\d]+)$") + def test_baseconfig(self): d = { 'atuple': (1, 2, 3), -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 17:15:57 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 2 Oct 2012 17:15:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Updated_docstring_for_logg?= =?utf-8?b?aW5nLmNvbmZpZy5saXN0ZW4oKS4=?= Message-ID: <3XWP7x4hGzzP2X@mail.python.org> http://hg.python.org/cpython/rev/6df80e09ad5e changeset: 79408:6df80e09ad5e user: Vinay Sajip date: Tue Oct 02 16:15:33 2012 +0100 summary: Updated docstring for logging.config.listen(). files: Lib/logging/config.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Lib/logging/config.py b/Lib/logging/config.py --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -1,4 +1,4 @@ -# Copyright 2001-2010 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -19,7 +19,7 @@ is based on PEP 282 and comments thereto in comp.lang.python, and influenced by Apache's log4j system. -Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved. +Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved. To use, simply 'import logging' and log away! """ @@ -782,6 +782,15 @@ Returns a Thread object on which you can call start() to start the server, and which you can join() when appropriate. To stop the server, call stopListening(). + + Use the ``verify`` argument to verify any bytes received across the wire + from a client. If specified, it should be a callable which receives a + single argument - the bytes of configuration data received across the + network - and it should return either ``None``, to indicate that the + passed in bytes could not be verified and should be discarded, or a + byte string which is then passed to the configuration machinery as + normal. Note that you can return transformed bytes, e.g. by decrypting + the bytes passed in. """ if not thread: #pragma: no cover raise NotImplementedError("listen() needs threading to work") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 17:40:28 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 2 Oct 2012 17:40:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Close_open_bra?= =?utf-8?q?cket=2C_thanks_to_Josh_Helzer_from_docs=40?= Message-ID: <3XWPhD2SLKzQvX@mail.python.org> http://hg.python.org/cpython/rev/e46bf2cb36c7 changeset: 79409:e46bf2cb36c7 branch: 3.2 parent: 79399:d5a4300702c1 user: Andrew Svetlov date: Tue Oct 02 18:39:25 2012 +0300 summary: Close open bracket, thanks to Josh Helzer from docs@ files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -305,7 +305,7 @@ A bytes object is an immutable array. The items are 8-bit bytes, represented by integers in the range 0 <= x < 256. Bytes literals - (like ``b'abc'`` and the built-in function :func:`bytes` can be used to + (like ``b'abc'``) and the built-in function :func:`bytes` can be used to construct bytes objects. Also, bytes objects can be decoded to strings via the :meth:`decode` method. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 17:40:29 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 2 Oct 2012 17:40:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Close_open_bracket=2C_thanks_to_Josh_Helzer_fro?= =?utf-8?q?m_docs=40?= Message-ID: <3XWPhF510QzQvg@mail.python.org> http://hg.python.org/cpython/rev/2e2839dc682c changeset: 79410:2e2839dc682c parent: 79408:6df80e09ad5e parent: 79409:e46bf2cb36c7 user: Andrew Svetlov date: Tue Oct 02 18:40:00 2012 +0300 summary: Merge: Close open bracket, thanks to Josh Helzer from docs@ files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -312,7 +312,7 @@ A bytes object is an immutable array. The items are 8-bit bytes, represented by integers in the range 0 <= x < 256. Bytes literals - (like ``b'abc'`` and the built-in function :func:`bytes` can be used to + (like ``b'abc'``) and the built-in function :func:`bytes` can be used to construct bytes objects. Also, bytes objects can be decoded to strings via the :meth:`decode` method. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 17:42:34 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 2 Oct 2012 17:42:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge=3A_Close_open_bracket=2C_thanks_to_Josh_Helzer_from_docs?= =?utf-8?q?=40?= Message-ID: <3XWPkf1pbgzQvX@mail.python.org> http://hg.python.org/cpython/rev/0837285721ab changeset: 79411:0837285721ab branch: 3.3 parent: 79405:9a8c193adf84 parent: 79409:e46bf2cb36c7 user: Andrew Svetlov date: Tue Oct 02 18:42:22 2012 +0300 summary: Merge: Close open bracket, thanks to Josh Helzer from docs@ files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -312,7 +312,7 @@ A bytes object is an immutable array. The items are 8-bit bytes, represented by integers in the range 0 <= x < 256. Bytes literals - (like ``b'abc'`` and the built-in function :func:`bytes` can be used to + (like ``b'abc'``) and the built-in function :func:`bytes` can be used to construct bytes objects. Also, bytes objects can be decoded to strings via the :meth:`decode` method. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 17:43:08 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 2 Oct 2012 17:43:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Null_merge?= Message-ID: <3XWPlJ18WxzQvX@mail.python.org> http://hg.python.org/cpython/rev/7b9ecbbca7a7 changeset: 79412:7b9ecbbca7a7 parent: 79410:2e2839dc682c parent: 79411:0837285721ab user: Andrew Svetlov date: Tue Oct 02 18:43:00 2012 +0300 summary: Null merge files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 18:00:12 2012 From: python-checkins at python.org (nick.coghlan) Date: Tue, 2 Oct 2012 18:00:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Reword_the_nex?= =?utf-8?q?t_version_placeholder_now_that_the_changelog_is_part_of_the?= Message-ID: <3XWQ702703zQpn@mail.python.org> http://hg.python.org/cpython/rev/4bf73d604537 changeset: 79413:4bf73d604537 branch: 3.3 parent: 79411:0837285721ab user: Nick Coghlan date: Tue Oct 02 21:29:59 2012 +0530 summary: Reword the next version placeholder now that the changelog is part of the published What's New docs files: Misc/NEWS | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -5,7 +5,9 @@ What's New in Python 3.3.1? =========================== -*Release date: XX-XXX-2012* +*Not yet released, see sections below for changes released in 3.3.0* + +.. *Release date: XX-XXX-2012* Core and Builtins ----------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 2 18:45:25 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 2 Oct 2012 18:45:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_unnecessary_=5B=5D?= =?utf-8?q?=2E?= Message-ID: <3XWR792bzbzQwM@mail.python.org> http://hg.python.org/cpython/rev/0b650272f58f changeset: 79414:0b650272f58f parent: 79412:7b9ecbbca7a7 user: Ezio Melotti date: Tue Oct 02 19:45:00 2012 +0300 summary: Remove unnecessary []. files: Lib/test/test_logging.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -81,7 +81,7 @@ """Base class for logging tests.""" log_format = "%(name)s -> %(levelname)s: %(message)s" - expected_log_pat = r"^([\w.]+) -> ([\w]+): ([\d]+)$" + expected_log_pat = r"^([\w.]+) -> (\w+): (\d+)$" message_num = 0 def setUp(self): @@ -438,7 +438,7 @@ """Test various filtering possibilities with custom logging levels.""" # Skip the logger name group. - expected_log_pat = r"^[\w.]+ -> ([\w]+): ([\d]+)$" + expected_log_pat = r"^[\w.]+ -> (\w+): (\d+)$" def setUp(self): BaseTest.setUp(self) @@ -999,7 +999,7 @@ """Tests for the MemoryHandler.""" # Do not bother with a logger name group. - expected_log_pat = r"^[\w.]+ -> ([\w]+): ([\d]+)$" + expected_log_pat = r"^[\w.]+ -> (\w+): (\d+)$" def setUp(self): BaseTest.setUp(self) @@ -1052,7 +1052,7 @@ """Reading logging config from a .ini-style config file.""" - expected_log_pat = r"^([\w]+) \+\+ ([\w]+)$" + expected_log_pat = r"^(\w+) \+\+ (\w+)$" # config0 is a standard configuration. config0 = """ @@ -1795,7 +1795,7 @@ """Reading logging config from a dictionary.""" - expected_log_pat = r"^([\w]+) \+\+ ([\w]+)$" + expected_log_pat = r"^(\w+) \+\+ (\w+)$" # config0 is a standard configuration. config0 = { @@ -2691,7 +2691,7 @@ self.assert_log_lines([ ('INFO', '1'), ('ERROR', '2'), - ], pat=r"^[\w.]+ -> ([\w]+): ([\d]+)$") + ], pat=r"^[\w.]+ -> (\w+): (\d+)$") # Now, perform no verification. Our configuration # should take effect. @@ -2710,7 +2710,7 @@ self.assert_log_lines([ ('INFO', '1'), ('ERROR', '2'), - ], pat=r"^[\w.]+ -> ([\w]+): ([\d]+)$") + ], pat=r"^[\w.]+ -> (\w+): (\d+)$") # Now, perform verification which transforms the bytes. @@ -2728,7 +2728,7 @@ self.assert_log_lines([ ('INFO', '1'), ('ERROR', '2'), - ], pat=r"^[\w.]+ -> ([\w]+): ([\d]+)$") + ], pat=r"^[\w.]+ -> (\w+): (\d+)$") def test_baseconfig(self): d = { @@ -2832,7 +2832,7 @@ class QueueHandlerTest(BaseTest): # Do not bother with a logger name group. - expected_log_pat = r"^[\w.]+ -> ([\w]+): ([\d]+)$" + expected_log_pat = r"^[\w.]+ -> (\w+): (\d+)$" def setUp(self): BaseTest.setUp(self) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 00:27:55 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 3 Oct 2012 00:27:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_More_whatsnew_?= =?utf-8?q?updates=2E?= Message-ID: <3XWZkM4gkTzP8b@mail.python.org> http://hg.python.org/cpython/rev/fa3dcc8c9e52 changeset: 79415:fa3dcc8c9e52 branch: 3.3 parent: 79413:4bf73d604537 user: R David Murray date: Tue Oct 02 18:24:56 2012 -0400 summary: More whatsnew updates. files: Doc/whatsnew/3.3.rst | 91 ++++++++++++++++++++++--------- Misc/NEWS | 2 +- 2 files changed, 65 insertions(+), 28 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1328,7 +1328,24 @@ Other API Changes ~~~~~~~~~~~~~~~~~ -Added :class:`email.parser.BytesHeaderParser`. +New :class:`~email.parser.BytesHeaderParser`, added to the :mod:`~email.parser` +module to complement :class:`~email.parser.HeaderParser` and complete the Bytes +API. + +New utility functions: + + * :func:`~email.utils.format_datetime`: given a :class:`~datetime.datetime`, + produce a string formatted for use in an email header. + + * :func:`~email.utils.parsedate_to_datetime`: given a date string from + an email header, convert it into an aware :class:`~datetime.datetime`, + or a naive :class:`~datetime.datetime` if the offset is ``-0000``. + + * :func:`~email.utils.localtime`: With no argument, returns the + current local time as an aware :class:`~datetime.datetime` using the local + :class:`~datetime.timezone`. Given an aware :class:`~datetime.datetime`, + converts it into an aware :class:`~datetime.datetime` using the + local :class:`~datetime.timezone`. ftplib @@ -1453,8 +1470,14 @@ logging ------- -:func:`~logging.basicConfig` now supports an optional ``handlers`` argument -taking an iterable of handlers to be added to the root logger. +The :func:`~logging.basicConfig` function now supports an optional ``handlers`` +argument taking an iterable of handlers to be added to the root logger. + +A class level attribute :attr:`~logging.handlers.SysLogHandler.append_nul` has +been added to :class:`~logging.handlers.SysLogHandler` to allow control of the +appending of the ``NUL`` (``\000``) byte to syslog records, since for some +deamons it is required while for others it is passed through to the log. + math @@ -1466,6 +1489,15 @@ (Written by Mark Dickinson in :issue:`11888`). +mmap +---- + +The :meth:`~mmap.mmap.read` method is now more compatible with other file-like +objects: if the argument is omitted or specified as ``None``, it returns the +bytes from the current file position to the end of the mapping. (Contributed +by Petri Lehtinen in :issue:`12021`.) + + multiprocessing --------------- @@ -1752,34 +1784,28 @@ instead of a RuntimeError: OSError has an errno attribute. -smtp ----- +smtpd +----- + +The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870` +(size extension). Per the standard, these extensions are enabled if and only +if the client initiates the session with an ``EHLO`` command. + +(Initial ``ELHO`` support by Alberto Trevino. Size extension by Juhana +Jauhiainen. Substantial additional work on the patch contributed by Michele +Orr? and Dan Boswell. :issue:`8739`) + + +smtplib +------- :class:`~smtplib.SMTP` now supports the context manager protocol, allowing an ``SMTP`` instance to be used in a ``with`` statement. (Contributed by Giampaolo Rodol? in :issue:`11289`.) - -smtpd ------ - -The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870` -(size extension). Per the standard, these extensions are enabled if and only -if the client initiates the session with an ``EHLO`` command. - -(Initial ``ELHO`` support by Alberto Trevino. Size extension by Juhana -Jauhiainen. Substantial additional work on the patch contributed by Michele -Orr? and Dan Boswell. :issue:`8739`) - - -smtplib -------- - The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls` method now accept an SSLContext parameter to control parameters of the secure -channel. - -(Contributed by Kasun Herath in :issue:`8809`) +channel. (Contributed by Kasun Herath in :issue:`8809`) socket @@ -1942,6 +1968,10 @@ :func:`~time.clock_settime` functions with ``CLOCK_xxx`` constants. (Contributed by Victor Stinner in :issue:`10278`) +To improve cross platform consistency, :func:`~time.sleep` now raises a +:exc:`ValueError` when passed a negative sleep value. Previously this was an +error on posix, but produced an infinite sleep on Windows. + types ----- @@ -2283,9 +2313,16 @@ * The deprecated variable ``time.accept2dyear`` has been removed. -* The undocumented internal helper class ``SSLFakeFile`` has been - removed from :mod:`smtplib`, since its functionality has long been - provided directly by :meth:`socket.socket.makefile`. +* The undocumented internal helper class ``SSLFakeFile`` has been removed + from :mod:`smtplib`, since its functionality has long been provided directly + by :meth:`socket.socket.makefile`. + +* Passing a negative value to :func:`time.sleep` on Windows now raises an + error instead of sleeping forever. It has always raised an error on posix. + +* The ``ast.__version__`` constant has been removed. If you need to + make decisions affected by the AST version, use :attr:`sys.version_info` + to make the decision. Porting C code diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3147,7 +3147,7 @@ - Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by the garbage collector while the Heap lock is held. -- Issue #12462: time.sleep() now calls immediatly the (Python) signal handler +- Issue #12462: time.sleep() now immediately calls the (Python) signal handler if it is interrupted by a signal, instead of having to wait until the next instruction. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 00:27:57 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 3 Oct 2012 00:27:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_More_whatsnew_updates=2E?= Message-ID: <3XWZkP1gbszQYr@mail.python.org> http://hg.python.org/cpython/rev/8aaa2ad6cdc6 changeset: 79416:8aaa2ad6cdc6 parent: 79414:0b650272f58f parent: 79415:fa3dcc8c9e52 user: R David Murray date: Tue Oct 02 18:26:31 2012 -0400 summary: More whatsnew updates. files: Doc/whatsnew/3.3.rst | 91 ++++++++++++++++++++++--------- Misc/HISTORY | 2 +- 2 files changed, 65 insertions(+), 28 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1328,7 +1328,24 @@ Other API Changes ~~~~~~~~~~~~~~~~~ -Added :class:`email.parser.BytesHeaderParser`. +New :class:`~email.parser.BytesHeaderParser`, added to the :mod:`~email.parser` +module to complement :class:`~email.parser.HeaderParser` and complete the Bytes +API. + +New utility functions: + + * :func:`~email.utils.format_datetime`: given a :class:`~datetime.datetime`, + produce a string formatted for use in an email header. + + * :func:`~email.utils.parsedate_to_datetime`: given a date string from + an email header, convert it into an aware :class:`~datetime.datetime`, + or a naive :class:`~datetime.datetime` if the offset is ``-0000``. + + * :func:`~email.utils.localtime`: With no argument, returns the + current local time as an aware :class:`~datetime.datetime` using the local + :class:`~datetime.timezone`. Given an aware :class:`~datetime.datetime`, + converts it into an aware :class:`~datetime.datetime` using the + local :class:`~datetime.timezone`. ftplib @@ -1453,8 +1470,14 @@ logging ------- -:func:`~logging.basicConfig` now supports an optional ``handlers`` argument -taking an iterable of handlers to be added to the root logger. +The :func:`~logging.basicConfig` function now supports an optional ``handlers`` +argument taking an iterable of handlers to be added to the root logger. + +A class level attribute :attr:`~logging.handlers.SysLogHandler.append_nul` has +been added to :class:`~logging.handlers.SysLogHandler` to allow control of the +appending of the ``NUL`` (``\000``) byte to syslog records, since for some +deamons it is required while for others it is passed through to the log. + math @@ -1466,6 +1489,15 @@ (Written by Mark Dickinson in :issue:`11888`). +mmap +---- + +The :meth:`~mmap.mmap.read` method is now more compatible with other file-like +objects: if the argument is omitted or specified as ``None``, it returns the +bytes from the current file position to the end of the mapping. (Contributed +by Petri Lehtinen in :issue:`12021`.) + + multiprocessing --------------- @@ -1752,34 +1784,28 @@ instead of a RuntimeError: OSError has an errno attribute. -smtp ----- +smtpd +----- + +The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870` +(size extension). Per the standard, these extensions are enabled if and only +if the client initiates the session with an ``EHLO`` command. + +(Initial ``ELHO`` support by Alberto Trevino. Size extension by Juhana +Jauhiainen. Substantial additional work on the patch contributed by Michele +Orr? and Dan Boswell. :issue:`8739`) + + +smtplib +------- :class:`~smtplib.SMTP` now supports the context manager protocol, allowing an ``SMTP`` instance to be used in a ``with`` statement. (Contributed by Giampaolo Rodol? in :issue:`11289`.) - -smtpd ------ - -The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870` -(size extension). Per the standard, these extensions are enabled if and only -if the client initiates the session with an ``EHLO`` command. - -(Initial ``ELHO`` support by Alberto Trevino. Size extension by Juhana -Jauhiainen. Substantial additional work on the patch contributed by Michele -Orr? and Dan Boswell. :issue:`8739`) - - -smtplib -------- - The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls` method now accept an SSLContext parameter to control parameters of the secure -channel. - -(Contributed by Kasun Herath in :issue:`8809`) +channel. (Contributed by Kasun Herath in :issue:`8809`) socket @@ -1942,6 +1968,10 @@ :func:`~time.clock_settime` functions with ``CLOCK_xxx`` constants. (Contributed by Victor Stinner in :issue:`10278`) +To improve cross platform consistency, :func:`~time.sleep` now raises a +:exc:`ValueError` when passed a negative sleep value. Previously this was an +error on posix, but produced an infinite sleep on Windows. + types ----- @@ -2283,9 +2313,16 @@ * The deprecated variable ``time.accept2dyear`` has been removed. -* The undocumented internal helper class ``SSLFakeFile`` has been - removed from :mod:`smtplib`, since its functionality has long been - provided directly by :meth:`socket.socket.makefile`. +* The undocumented internal helper class ``SSLFakeFile`` has been removed + from :mod:`smtplib`, since its functionality has long been provided directly + by :meth:`socket.socket.makefile`. + +* Passing a negative value to :func:`time.sleep` on Windows now raises an + error instead of sleeping forever. It has always raised an error on posix. + +* The ``ast.__version__`` constant has been removed. If you need to + make decisions affected by the AST version, use :attr:`sys.version_info` + to make the decision. Porting C code diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -3035,7 +3035,7 @@ - Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by the garbage collector while the Heap lock is held. -- Issue #12462: time.sleep() now calls immediatly the (Python) signal handler +- Issue #12462: time.sleep() now immediately calls the (Python) signal handler if it is interrupted by a signal, instead of having to wait until the next instruction. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 00:39:29 2012 From: python-checkins at python.org (alexander.belopolsky) Date: Wed, 3 Oct 2012 00:39:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=239650=3A_List_comm?= =?utf-8?q?only_used_format_codes_in_time=2Estrftime_and_time=2Estrptime?= Message-ID: <3XWZzj0wZpzQkc@mail.python.org> http://hg.python.org/cpython/rev/3a0acdc25cca changeset: 79417:3a0acdc25cca user: Alexander Belopolsky date: Tue Oct 02 18:39:16 2012 -0400 summary: Issue #9650: List commonly used format codes in time.strftime and time.strptime docsttings. files: Misc/NEWS | 3 +++ Modules/timemodule.c | 28 +++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -33,6 +33,9 @@ Library ------- +- Issue #9650: List commonly used format codes in time.strftime and + time.strptime docsttings. Original patch by Mike Hoy. + - Issue #16034: Fix performance regressions in the new `bz2.BZ2File` implementation. Initial patch by Serhiy Storchaka. diff --git a/Modules/timemodule.c b/Modules/timemodule.c --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -539,6 +539,26 @@ /* wcsftime() doesn't format correctly time zones, see issue #10653 */ # undef HAVE_WCSFTIME #endif +#define STRFTIME_FORMAT_CODES \ +"Commonly used format codes:\n\ +\n\ +%Y Year with century as a decimal number.\n\ +%m Month as a decimal number [01,12].\n\ +%d Day of the month as a decimal number [01,31].\n\ +%H Hour (24-hour clock) as a decimal number [00,23].\n\ +%M Minute as a decimal number [00,59].\n\ +%S Second as a decimal number [00,61].\n\ +%z Time zone offset from UTC.\n\ +%a Locale's abbreviated weekday name.\n\ +%A Locale's full weekday name.\n\ +%b Locale's abbreviated month name.\n\ +%B Locale's full month name.\n\ +%c Locale's appropriate date and time representation.\n\ +%I Hour (12-hour clock) as a decimal number [01,12].\n\ +%p Locale's equivalent of either AM or PM.\n\ +\n\ +Other codes may be available on your platform. See documentation for\n\ +the C library strftime function.\n" #ifdef HAVE_STRFTIME #ifdef HAVE_WCSFTIME @@ -683,13 +703,13 @@ #undef time_char #undef format_time - PyDoc_STRVAR(strftime_doc, "strftime(format[, tuple]) -> string\n\ \n\ Convert a time tuple to a string according to a format specification.\n\ See the library reference manual for formatting codes. When the time tuple\n\ -is not present, current time as returned by localtime() is used."); +is not present, current time as returned by localtime() is used.\n\ +\n" STRFTIME_FORMAT_CODES); #endif /* HAVE_STRFTIME */ static PyObject * @@ -712,7 +732,9 @@ "strptime(string, format) -> struct_time\n\ \n\ Parse a string to a time tuple according to a format specification.\n\ -See the library reference manual for formatting codes (same as strftime())."); +See the library reference manual for formatting codes (same as\n\ +strftime()).\n\ +\n" STRFTIME_FORMAT_CODES); static PyObject * _asctime(struct tm *timeptr) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:03 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNTg5?= =?utf-8?q?7=3A_zipimport=2Ec_doesn=27t_check_return_value_of_fseek=28=29?= Message-ID: <3XWfBW5gl1zQpn@mail.python.org> http://hg.python.org/cpython/rev/39e608d462b6 changeset: 79418:39e608d462b6 branch: 2.7 parent: 79398:60c831305e73 user: Jesus Cea date: Wed Oct 03 02:13:05 2012 +0200 summary: Closes #15897: zipimport.c doesn't check return value of fseek() files: Misc/ACKS | 1 + Misc/NEWS | 3 ++ Modules/zipimport.c | 42 +++++++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -204,6 +204,7 @@ Jeremy Craven Laura Creighton Simon Cross +Felipe Cruz Drew Csillag Joaquin Cuenca Abela John Cugini diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -38,6 +38,9 @@ - Issue #15368: An issue that caused bytecode generation to be non-deterministic when using randomized hashing (-R) has been fixed. +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, return the proper failure return value (1). Patch contributed by Jeff Knupp. diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -709,7 +709,12 @@ "'%.200s'", archive); return NULL; } - fseek(fp, -22, SEEK_END); + + if (fseek(fp, -22, SEEK_END) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %s", archive); + return NULL; + } header_position = ftell(fp); if (fread(endof_central_dir, 1, 22, fp) != 22) { fclose(fp); @@ -743,11 +748,13 @@ PyObject *t; int err; - fseek(fp, header_offset, 0); /* Start of file header */ + if (fseek(fp, header_offset, 0) == -1) /* Start of file header */ + goto fseek_error; l = PyMarshal_ReadLongFromFile(fp); if (l != 0x02014B50) break; /* Bad: Central Dir File Header */ - fseek(fp, header_offset + 10, 0); + if (fseek(fp, header_offset + 10, 0) == -1) + goto fseek_error; compress = PyMarshal_ReadShortFromFile(fp); time = PyMarshal_ReadShortFromFile(fp); date = PyMarshal_ReadShortFromFile(fp); @@ -758,7 +765,8 @@ header_size = 46 + name_size + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); - fseek(fp, header_offset + 42, 0); + if (fseek(fp, header_offset + 42, 0) == -1) + goto fseek_error; file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; if (name_size > MAXPATHLEN) name_size = MAXPATHLEN; @@ -790,6 +798,11 @@ PySys_WriteStderr("# zipimport: found %ld names in %s\n", count, archive); return files; +fseek_error: + fclose(fp); + Py_XDECREF(files); + PyErr_Format(ZipImportError, "can't read Zip file: %s", archive); + return NULL; error: fclose(fp); Py_XDECREF(files); @@ -857,7 +870,12 @@ } /* Check to make sure the local file header is correct */ - fseek(fp, file_offset, 0); + if (fseek(fp, file_offset, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %s", archive); + return NULL; + } + l = PyMarshal_ReadLongFromFile(fp); if (l != 0x04034B50) { /* Bad: Local File Header */ @@ -867,7 +885,12 @@ fclose(fp); return NULL; } - fseek(fp, file_offset + 26, 0); + if (fseek(fp, file_offset + 26, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %s", archive); + return NULL; + } + l = 30 + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); /* local header size */ file_offset += l; /* Start of file data */ @@ -881,8 +904,13 @@ buf = PyString_AsString(raw_data); err = fseek(fp, file_offset, 0); - if (err == 0) + if (err == 0) { bytes_read = fread(buf, 1, data_size, fp); + } else { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %s", archive); + return NULL; + } fclose(fp); if (err || bytes_read != data_size) { PyErr_SetString(PyExc_IOError, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:05 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_Misc/ACKS_?= =?utf-8?q?alphabetic_order?= Message-ID: <3XWfBY0m94zQpv@mail.python.org> http://hg.python.org/cpython/rev/2eaaa7b0e7a9 changeset: 79419:2eaaa7b0e7a9 branch: 2.7 user: Jesus Cea date: Wed Oct 03 02:14:14 2012 +0200 summary: Fix Misc/ACKS alphabetic order files: Misc/ACKS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -37,7 +37,6 @@ Jason Asbahr David Ascher Chris AtLee -Jes?s Cea Avi?n John Aycock Jan-Hein B?hrman Donovan Baarda @@ -151,6 +150,7 @@ Lorenzo M. Catucci Donn Cave Charles Cazabon +Jes?s Cea Avi?n Per Cederqvist Carl Cerecke Octavian Cerna -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:06 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNTg5?= =?utf-8?q?7=3A_zipimport=2Ec_doesn=27t_check_return_value_of_fseek=28=29?= Message-ID: <3XWfBZ4CCszQny@mail.python.org> http://hg.python.org/cpython/rev/4da48083aaab changeset: 79420:4da48083aaab branch: 3.2 parent: 79409:e46bf2cb36c7 user: Jesus Cea date: Wed Oct 03 02:13:05 2012 +0200 summary: Closes #15897: zipimport.c doesn't check return value of fseek() files: Misc/ACKS | 1 + Misc/NEWS | 3 ++ Modules/zipimport.c | 43 +++++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -227,6 +227,7 @@ Jeremy Craven Laura Creighton Simon Cross +Felipe Cruz Drew Csillag Joaquin Cuenca Abela John Cugini diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,9 @@ - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, return the proper failure return value (1). Patch contributed by Jeff Knupp. diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -741,7 +741,12 @@ PyErr_Format(ZipImportError, "can't open Zip file: '%U'", archive_obj); return NULL; } - fseek(fp, -22, SEEK_END); + + if (fseek(fp, -22, SEEK_END) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } header_position = ftell(fp); if (fread(endof_central_dir, 1, 22, fp) != 22) { fclose(fp); @@ -773,11 +778,13 @@ PyObject *t; int err; - fseek(fp, header_offset, 0); /* Start of file header */ + if (fseek(fp, header_offset, 0) == -1) /* Start of file header */ + goto fseek_error; l = PyMarshal_ReadLongFromFile(fp); if (l != 0x02014B50) break; /* Bad: Central Dir File Header */ - fseek(fp, header_offset + 8, 0); + if (fseek(fp, header_offset + 8, 0) == -1) + goto fseek_error; flags = (unsigned short)PyMarshal_ReadShortFromFile(fp); compress = PyMarshal_ReadShortFromFile(fp); time = PyMarshal_ReadShortFromFile(fp); @@ -789,7 +796,8 @@ header_size = 46 + name_size + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); - fseek(fp, header_offset + 42, 0); + if (fseek(fp, header_offset + 42, 0) == -1) + goto fseek_error; file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; if (name_size > MAXPATHLEN) name_size = MAXPATHLEN; @@ -849,6 +857,12 @@ PySys_FormatStderr("# zipimport: found %ld names in %U\n", count, archive_obj); return files; +fseek_error: + fclose(fp); + Py_XDECREF(files); + Py_XDECREF(nameobj); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; error: fclose(fp); Py_XDECREF(files); @@ -918,7 +932,12 @@ } /* Check to make sure the local file header is correct */ - fseek(fp, file_offset, 0); + if (fseek(fp, file_offset, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = PyMarshal_ReadLongFromFile(fp); if (l != 0x04034B50) { /* Bad: Local File Header */ @@ -928,7 +947,12 @@ fclose(fp); return NULL; } - fseek(fp, file_offset + 26, 0); + if (fseek(fp, file_offset + 26, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = 30 + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); /* local header size */ file_offset += l; /* Start of file data */ @@ -945,8 +969,13 @@ buf = PyBytes_AsString(raw_data); err = fseek(fp, file_offset, 0); - if (err == 0) + if (err == 0) { bytes_read = fread(buf, 1, data_size, fp); + } else { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } fclose(fp); if (err || bytes_read != data_size) { PyErr_SetString(PyExc_IOError, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:07 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_Misc/ACKS_?= =?utf-8?q?alphabetic_order?= Message-ID: <3XWfBb6ZbfzQpv@mail.python.org> http://hg.python.org/cpython/rev/6b3d7c64d465 changeset: 79421:6b3d7c64d465 branch: 3.2 user: Jesus Cea date: Wed Oct 03 02:14:14 2012 +0200 summary: Fix Misc/ACKS alphabetic order files: Misc/ACKS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -44,7 +44,6 @@ Jason Asbahr David Ascher Chris AtLee -Jes?s Cea Avi?n John Aycock Jan-Hein B?hrman Donovan Baarda @@ -168,6 +167,7 @@ Lorenzo M. Catucci Donn Cave Charles Cazabon +Jes?s Cea Avi?n Per Cederqvist Matej Cepl Carl Cerecke -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:09 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_MERGE=3A_Closes_=2315897=3A_zipimport=2Ec_doesn=27t_check_retu?= =?utf-8?q?rn_value_of_fseek=28=29?= Message-ID: <3XWfBd35ctzQqT@mail.python.org> http://hg.python.org/cpython/rev/0f1637c4d673 changeset: 79422:0f1637c4d673 branch: 3.3 parent: 79415:fa3dcc8c9e52 parent: 79420:4da48083aaab user: Jesus Cea date: Wed Oct 03 03:00:37 2012 +0200 summary: MERGE: Closes #15897: zipimport.c doesn't check return value of fseek() files: Misc/ACKS | 1 + Misc/NEWS | 3 ++ Modules/zipimport.c | 43 +++++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -246,6 +246,7 @@ Jeremy Craven Laura Creighton Simon Cross +Felipe Cruz Drew Csillag Joaquin Cuenca Abela John Cugini diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -467,6 +467,9 @@ - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, return the proper failure return value (1). Patch contributed by Jeff Knupp. diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -875,7 +875,12 @@ PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); return NULL; } - fseek(fp, -22, SEEK_END); + + if (fseek(fp, -22, SEEK_END) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } header_position = ftell(fp); if (fread(endof_central_dir, 1, 22, fp) != 22) { fclose(fp); @@ -904,11 +909,13 @@ PyObject *t; int err; - fseek(fp, header_offset, 0); /* Start of file header */ + if (fseek(fp, header_offset, 0) == -1) /* Start of file header */ + goto fseek_error; l = PyMarshal_ReadLongFromFile(fp); if (l != 0x02014B50) break; /* Bad: Central Dir File Header */ - fseek(fp, header_offset + 8, 0); + if (fseek(fp, header_offset + 8, 0) == -1) + goto fseek_error; flags = (unsigned short)PyMarshal_ReadShortFromFile(fp); compress = PyMarshal_ReadShortFromFile(fp); time = PyMarshal_ReadShortFromFile(fp); @@ -920,7 +927,8 @@ header_size = 46 + name_size + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); - fseek(fp, header_offset + 42, 0); + if (fseek(fp, header_offset + 42, 0) == -1) + goto fseek_error; file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; if (name_size > MAXPATHLEN) name_size = MAXPATHLEN; @@ -980,6 +988,12 @@ PySys_FormatStderr("# zipimport: found %ld names in %R\n", count, archive); return files; +fseek_error: + fclose(fp); + Py_XDECREF(files); + Py_XDECREF(nameobj); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; error: fclose(fp); Py_XDECREF(files); @@ -1050,7 +1064,12 @@ } /* Check to make sure the local file header is correct */ - fseek(fp, file_offset, 0); + if (fseek(fp, file_offset, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = PyMarshal_ReadLongFromFile(fp); if (l != 0x04034B50) { /* Bad: Local File Header */ @@ -1060,7 +1079,12 @@ fclose(fp); return NULL; } - fseek(fp, file_offset + 26, 0); + if (fseek(fp, file_offset + 26, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = 30 + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); /* local header size */ file_offset += l; /* Start of file data */ @@ -1077,8 +1101,13 @@ buf = PyBytes_AsString(raw_data); err = fseek(fp, file_offset, 0); - if (err == 0) + if (err == 0) { bytes_read = fread(buf, 1, data_size, fp); + } else { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } fclose(fp); if (err || bytes_read != data_size) { PyErr_SetString(PyExc_IOError, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:10 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_MERGE=3A_Fix_Misc/ACKS_alphabetic_order?= Message-ID: <3XWfBf5RJRzQqP@mail.python.org> http://hg.python.org/cpython/rev/83a04e45323e changeset: 79423:83a04e45323e branch: 3.3 parent: 79422:0f1637c4d673 parent: 79421:6b3d7c64d465 user: Jesus Cea date: Wed Oct 03 03:01:13 2012 +0200 summary: MERGE: Fix Misc/ACKS alphabetic order files: Misc/ACKS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -49,7 +49,6 @@ David Ascher Chris AtLee Aymeric Augustin -Jes?s Cea Avi?n John Aycock Donovan Baarda Attila Babo @@ -183,6 +182,7 @@ Lorenzo M. Catucci Donn Cave Charles Cazabon +Jes?s Cea Avi?n Per Cederqvist Matej Cepl Carl Cerecke -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:12 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Closes_=2315897=3A_zipimport=2Ec_doesn=27t_chec?= =?utf-8?q?k_return_value_of_fseek=28=29?= Message-ID: <3XWfBh21B0zQqP@mail.python.org> http://hg.python.org/cpython/rev/ad63e5246306 changeset: 79424:ad63e5246306 parent: 79417:3a0acdc25cca parent: 79422:0f1637c4d673 user: Jesus Cea date: Wed Oct 03 03:03:04 2012 +0200 summary: MERGE: Closes #15897: zipimport.c doesn't check return value of fseek() files: Misc/ACKS | 1 + Misc/NEWS | 3 ++ Modules/zipimport.c | 43 +++++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -246,6 +246,7 @@ Jeremy Craven Laura Creighton Simon Cross +Felipe Cruz Drew Csillag Joaquin Cuenca Abela John Cugini diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -27,6 +27,9 @@ - Issue #15846: Fix SystemError which happened when using `ast.parse()` in an exception handler on code with syntax errors. +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + - Issue #15801: Make sure mappings passed to '%' formatting are actually subscriptable. diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -875,7 +875,12 @@ PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); return NULL; } - fseek(fp, -22, SEEK_END); + + if (fseek(fp, -22, SEEK_END) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } header_position = ftell(fp); if (fread(endof_central_dir, 1, 22, fp) != 22) { fclose(fp); @@ -904,11 +909,13 @@ PyObject *t; int err; - fseek(fp, header_offset, 0); /* Start of file header */ + if (fseek(fp, header_offset, 0) == -1) /* Start of file header */ + goto fseek_error; l = PyMarshal_ReadLongFromFile(fp); if (l != 0x02014B50) break; /* Bad: Central Dir File Header */ - fseek(fp, header_offset + 8, 0); + if (fseek(fp, header_offset + 8, 0) == -1) + goto fseek_error; flags = (unsigned short)PyMarshal_ReadShortFromFile(fp); compress = PyMarshal_ReadShortFromFile(fp); time = PyMarshal_ReadShortFromFile(fp); @@ -920,7 +927,8 @@ header_size = 46 + name_size + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); - fseek(fp, header_offset + 42, 0); + if (fseek(fp, header_offset + 42, 0) == -1) + goto fseek_error; file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; if (name_size > MAXPATHLEN) name_size = MAXPATHLEN; @@ -980,6 +988,12 @@ PySys_FormatStderr("# zipimport: found %ld names in %R\n", count, archive); return files; +fseek_error: + fclose(fp); + Py_XDECREF(files); + Py_XDECREF(nameobj); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; error: fclose(fp); Py_XDECREF(files); @@ -1050,7 +1064,12 @@ } /* Check to make sure the local file header is correct */ - fseek(fp, file_offset, 0); + if (fseek(fp, file_offset, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = PyMarshal_ReadLongFromFile(fp); if (l != 0x04034B50) { /* Bad: Local File Header */ @@ -1060,7 +1079,12 @@ fclose(fp); return NULL; } - fseek(fp, file_offset + 26, 0); + if (fseek(fp, file_offset + 26, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = 30 + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); /* local header size */ file_offset += l; /* Start of file data */ @@ -1077,8 +1101,13 @@ buf = PyBytes_AsString(raw_data); err = fseek(fp, file_offset, 0); - if (err == 0) + if (err == 0) { bytes_read = fread(buf, 1, data_size, fp); + } else { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } fclose(fp); if (err || bytes_read != data_size) { PyErr_SetString(PyExc_IOError, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:04:13 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:04:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Fix_Misc/ACKS_alphabetic_order?= Message-ID: <3XWfBj4nPbzQqT@mail.python.org> http://hg.python.org/cpython/rev/28d4d753228a changeset: 79425:28d4d753228a parent: 79424:ad63e5246306 parent: 79423:83a04e45323e user: Jesus Cea date: Wed Oct 03 03:03:22 2012 +0200 summary: MERGE: Fix Misc/ACKS alphabetic order files: Misc/ACKS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -49,7 +49,6 @@ David Ascher Chris AtLee Aymeric Augustin -Jes?s Cea Avi?n John Aycock Donovan Baarda Attila Babo @@ -183,6 +182,7 @@ Lorenzo M. Catucci Donn Cave Charles Cazabon +Jes?s Cea Avi?n Per Cederqvist Matej Cepl Carl Cerecke -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:19:12 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:19:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNTg5?= =?utf-8?q?7=3A_zipimport=2Ec_doesn=27t_check_return_value_of_fseek=28=29?= =?utf-8?q?=2E_Typo?= Message-ID: <3XWfX04Z8tzNbq@mail.python.org> http://hg.python.org/cpython/rev/0f4d4f4db724 changeset: 79426:0f4d4f4db724 branch: 3.2 parent: 79421:6b3d7c64d465 user: Jesus Cea date: Wed Oct 03 03:16:42 2012 +0200 summary: Closes #15897: zipimport.c doesn't check return value of fseek(). Typo files: Modules/zipimport.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -744,7 +744,7 @@ if (fseek(fp, -22, SEEK_END) == -1) { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive_obj); return NULL; } header_position = ftell(fp); @@ -861,7 +861,7 @@ fclose(fp); Py_XDECREF(files); Py_XDECREF(nameobj); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive_obj); return NULL; error: fclose(fp); @@ -934,7 +934,7 @@ /* Check to make sure the local file header is correct */ if (fseek(fp, file_offset, 0) == -1) { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive); return NULL; } @@ -949,7 +949,7 @@ } if (fseek(fp, file_offset + 26, 0) == -1) { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive); return NULL; } @@ -973,7 +973,7 @@ bytes_read = fread(buf, 1, data_size, fp); } else { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive); return NULL; } fclose(fp); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:19:13 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:19:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_NULL_merge?= Message-ID: <3XWfX16vPkzP2h@mail.python.org> http://hg.python.org/cpython/rev/4906d2eb55ef changeset: 79427:4906d2eb55ef branch: 3.3 parent: 79423:83a04e45323e parent: 79426:0f4d4f4db724 user: Jesus Cea date: Wed Oct 03 03:18:05 2012 +0200 summary: NULL merge files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 03:19:15 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 3 Oct 2012 03:19:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_NULL_merge?= Message-ID: <3XWfX32DvwzQlk@mail.python.org> http://hg.python.org/cpython/rev/b40025e37bcd changeset: 79428:b40025e37bcd parent: 79425:28d4d753228a parent: 79427:4906d2eb55ef user: Jesus Cea date: Wed Oct 03 03:18:33 2012 +0200 summary: NULL merge files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 08:48:37 2012 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 Oct 2012 08:48:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Add_a_note_to_doctest_until_the_example_rendering_is_fixed?= Message-ID: <3XWnr54FvPzP0f@mail.python.org> http://hg.python.org/cpython/rev/662fb4bd5f84 changeset: 79429:662fb4bd5f84 branch: 2.7 parent: 79419:2eaaa7b0e7a9 user: Nick Coghlan date: Wed Oct 03 12:18:23 2012 +0530 summary: Issue #12947: Add a note to doctest until the example rendering is fixed files: Doc/library/doctest.rst | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -680,6 +680,14 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. +.. note:: + Due to an `unfortunate bug`_ in our documentation publishing process, the + directives in the following examples are not being displayed in the + rendered HTML version. Please use the "Show Source" link in the sidebar + to view the details of the directive usage examples. + + .. _unfortunate bug: http://bugs.python.org/issue12947 + For example, this test passes:: >>> print range(20) #doctest: +NORMALIZE_WHITESPACE -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 08:52:31 2012 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 Oct 2012 08:52:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Add_a_note_to_doctest_until_the_example_rendering_is_fixed?= Message-ID: <3XWnwb4l6YzNw3@mail.python.org> http://hg.python.org/cpython/rev/679b3e3aadae changeset: 79430:679b3e3aadae branch: 3.3 parent: 79427:4906d2eb55ef user: Nick Coghlan date: Wed Oct 03 12:21:44 2012 +0530 summary: Issue #12947: Add a note to doctest until the example rendering is fixed files: Doc/library/doctest.rst | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -650,6 +650,14 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. +.. note:: + Due to an `unfortunate bug`_ in our documentation publishing process, the + directives in the following examples are not being displayed in the + rendered HTML version. Please use the "Show Source" link in the sidebar + to view the details of the directive usage examples. + + .. _unfortunate bug: http://bugs.python.org/issue12947 + For example, this test passes:: >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 08:52:32 2012 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 Oct 2012 08:52:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_doctest_note_from_3=2E3?= Message-ID: <3XWnwd00HtzP2X@mail.python.org> http://hg.python.org/cpython/rev/c31df2631ca4 changeset: 79431:c31df2631ca4 parent: 79428:b40025e37bcd parent: 79430:679b3e3aadae user: Nick Coghlan date: Wed Oct 03 12:22:16 2012 +0530 summary: Merge doctest note from 3.3 files: Doc/library/doctest.rst | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -650,6 +650,14 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. +.. note:: + Due to an `unfortunate bug`_ in our documentation publishing process, the + directives in the following examples are not being displayed in the + rendered HTML version. Please use the "Show Source" link in the sidebar + to view the details of the directive usage examples. + + .. _unfortunate bug: http://bugs.python.org/issue12947 + For example, this test passes:: >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 10:18:28 2012 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 Oct 2012 10:18:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Better_workaround_for_the_problem_with_doctest_directives_b?= =?utf-8?q?eing?= Message-ID: <3XWqqm2XmKzQX6@mail.python.org> http://hg.python.org/cpython/rev/18d927fb8671 changeset: 79432:18d927fb8671 branch: 2.7 parent: 79429:662fb4bd5f84 user: Nick Coghlan date: Wed Oct 03 13:48:17 2012 +0530 summary: Issue #12947: Better workaround for the problem with doctest directives being stripped from code examples that are intended to illustrate those directives files: Doc/library/doctest.rst | 38 ++++++++++++++++++---------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -681,14 +681,15 @@ example. Use ``+`` to enable the named behavior, or ``-`` to disable it. .. note:: - Due to an `unfortunate bug`_ in our documentation publishing process, the - directives in the following examples are not being displayed in the - rendered HTML version. Please use the "Show Source" link in the sidebar - to view the details of the directive usage examples. - - .. _unfortunate bug: http://bugs.python.org/issue12947 - -For example, this test passes:: + Due to an `unfortunate limitation`_ of our current documentation + publishing process, syntax highlighting has been disabled in the examples + below in order to ensure the doctest directives are correctly displayed. + + .. _unfortunate limitation: http://bugs.python.org/issue12947 + +For example, this test passes: + +.. code-block:: text >>> print range(20) #doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -697,18 +698,25 @@ Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so:: - - >>> print range(20) # doctest:+ELLIPSIS +so: + +.. code-block:: text + + >>> print range(20) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] -Multiple directives can be used on a single physical line, separated by commas:: +Multiple directives can be used on a single physical line, separated by +commas: + +.. code-block:: text >>> print range(20) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined:: +combined: + +.. code-block:: text >>> print range(20) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -716,7 +724,9 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line:: +a directive to comfortably fit on the same line: + +.. code-block:: text >>> print range(5) + range(10,20) + range(30,40) + range(50,60) ... # doctest: +ELLIPSIS -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 10:23:39 2012 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 Oct 2012 10:23:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Better_workaround_for_the_problem_with_doctest_directives_b?= =?utf-8?q?eing?= Message-ID: <3XWqxl6VQxzNn8@mail.python.org> http://hg.python.org/cpython/rev/d93a59a0a984 changeset: 79433:d93a59a0a984 branch: 3.3 parent: 79430:679b3e3aadae user: Nick Coghlan date: Wed Oct 03 13:52:48 2012 +0530 summary: Issue #12947: Better workaround for the problem with doctest directives being stripped from code examples that are intended to illustrate those directives files: Doc/library/doctest.rst | 34 ++++++++++++++++++---------- 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -651,14 +651,15 @@ example. Use ``+`` to enable the named behavior, or ``-`` to disable it. .. note:: - Due to an `unfortunate bug`_ in our documentation publishing process, the - directives in the following examples are not being displayed in the - rendered HTML version. Please use the "Show Source" link in the sidebar - to view the details of the directive usage examples. - - .. _unfortunate bug: http://bugs.python.org/issue12947 - -For example, this test passes:: + Due to an `unfortunate limitation`_ of our current documentation + publishing process, syntax highlighting has been disabled in the examples + below in order to ensure the doctest directives are correctly displayed. + + .. _unfortunate limitation: http://bugs.python.org/issue12947 + +For example, this test passes: + +.. code-block:: text >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -667,18 +668,25 @@ Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so:: +so: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] -Multiple directives can be used on a single physical line, separated by commas:: +Multiple directives can be used on a single physical line, separated by +commas: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined:: +combined: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -686,7 +694,9 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line:: +a directive to comfortably fit on the same line: + +.. code-block:: text >>> print(list(range(5)) + list(range(10, 20)) + list(range(30, 40))) ... # doctest: +ELLIPSIS -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 10:23:41 2012 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 Oct 2012 10:23:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_=2312947_workaround_from_3=2E3?= Message-ID: <3XWqxn1g9qzQd7@mail.python.org> http://hg.python.org/cpython/rev/26200f535296 changeset: 79434:26200f535296 parent: 79431:c31df2631ca4 parent: 79433:d93a59a0a984 user: Nick Coghlan date: Wed Oct 03 13:53:28 2012 +0530 summary: Merge #12947 workaround from 3.3 files: Doc/library/doctest.rst | 34 ++++++++++++++++++---------- 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -651,14 +651,15 @@ example. Use ``+`` to enable the named behavior, or ``-`` to disable it. .. note:: - Due to an `unfortunate bug`_ in our documentation publishing process, the - directives in the following examples are not being displayed in the - rendered HTML version. Please use the "Show Source" link in the sidebar - to view the details of the directive usage examples. - - .. _unfortunate bug: http://bugs.python.org/issue12947 - -For example, this test passes:: + Due to an `unfortunate limitation`_ of our current documentation + publishing process, syntax highlighting has been disabled in the examples + below in order to ensure the doctest directives are correctly displayed. + + .. _unfortunate limitation: http://bugs.python.org/issue12947 + +For example, this test passes: + +.. code-block:: text >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -667,18 +668,25 @@ Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so:: +so: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] -Multiple directives can be used on a single physical line, separated by commas:: +Multiple directives can be used on a single physical line, separated by +commas: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined:: +combined: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -686,7 +694,9 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line:: +a directive to comfortably fit on the same line: + +.. code-block:: text >>> print(list(range(5)) + list(range(10, 20)) + list(range(30, 40))) ... # doctest: +ELLIPSIS -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 23:14:22 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 3 Oct 2012 23:14:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Unicode=3A_resize=5Fcompac?= =?utf-8?q?t=28=29_and_resize=5Finplace=28=29_fills_also_the_Unicode_strin?= =?utf-8?q?gs?= Message-ID: <3XX9324B1VzQGK@mail.python.org> http://hg.python.org/cpython/rev/4e9755900ad6 changeset: 79435:4e9755900ad6 user: Victor Stinner date: Wed Oct 03 23:03:17 2012 +0200 summary: Unicode: resize_compact() and resize_inplace() fills also the Unicode strings with invalid bytes in debug mode, as done by PyUnicode_New() files: Objects/unicodeobject.c | 38 +++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -640,6 +640,25 @@ } } +#ifdef Py_DEBUG +/* Fill the data of an Unicode string with invalid characters to detect bugs + earlier. + + _PyUnicode_CheckConsistency(str, 1) detects invalid characters, at least for + ASCII and UCS-4 strings. U+00FF is invalid in ASCII and U+FFFFFFFF is an + invalid character in Unicode 6.0. */ +static void +unicode_fill_invalid(PyObject *unicode, Py_ssize_t old_length) +{ + int kind = PyUnicode_KIND(unicode); + Py_UCS1 *data = PyUnicode_1BYTE_DATA(unicode); + Py_ssize_t length = _PyUnicode_LENGTH(unicode); + if (length <= old_length) + return; + memset(data + old_length * kind, 0xff, (length - old_length) * kind); +} +#endif + static PyObject* resize_compact(PyObject *unicode, Py_ssize_t length) { @@ -648,6 +667,10 @@ Py_ssize_t new_size; int share_wstr; PyObject *new_unicode; +#ifdef Py_DEBUG + Py_ssize_t old_length = _PyUnicode_LENGTH(unicode); +#endif + assert(unicode_modifiable(unicode)); assert(PyUnicode_IS_READY(unicode)); assert(PyUnicode_IS_COMPACT(unicode)); @@ -683,6 +706,9 @@ if (!PyUnicode_IS_ASCII(unicode)) _PyUnicode_WSTR_LENGTH(unicode) = length; } +#ifdef Py_DEBUG + unicode_fill_invalid(unicode, old_length); +#endif PyUnicode_WRITE(PyUnicode_KIND(unicode), PyUnicode_DATA(unicode), length, 0); assert(_PyUnicode_CheckConsistency(unicode, 0)); @@ -701,6 +727,9 @@ Py_ssize_t char_size; int share_wstr, share_utf8; void *data; +#ifdef Py_DEBUG + Py_ssize_t old_length = _PyUnicode_LENGTH(unicode); +#endif data = _PyUnicode_DATA_ANY(unicode); char_size = PyUnicode_KIND(unicode); @@ -736,6 +765,9 @@ } _PyUnicode_LENGTH(unicode) = length; PyUnicode_WRITE(PyUnicode_KIND(unicode), data, length, 0); +#ifdef Py_DEBUG + unicode_fill_invalid(unicode, old_length); +#endif if (share_wstr || _PyUnicode_WSTR(unicode) == NULL) { assert(_PyUnicode_CheckConsistency(unicode, 0)); return 0; @@ -1060,11 +1092,7 @@ } } #ifdef Py_DEBUG - /* Fill the data with invalid characters to detect bugs earlier. - _PyUnicode_CheckConsistency(str, 1) detects invalid characters, - at least for ASCII and UCS-4 strings. U+00FF is invalid in ASCII - and U+FFFFFFFF is an invalid character in Unicode 6.0. */ - memset(data, 0xff, size * kind); + unicode_fill_invalid((PyObject*)unicode, 0); #endif assert(_PyUnicode_CheckConsistency((PyObject*)unicode, 0)); return obj; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 3 23:14:23 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 3 Oct 2012 23:14:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_PyUnicode=5FFormat=28=29?= =?utf-8?q?=3A_disable_overallocation_when_we_are_writing_the_last_part?= Message-ID: <3XX9336WSZzQGK@mail.python.org> http://hg.python.org/cpython/rev/93757fb49837 changeset: 79436:93757fb49837 user: Victor Stinner date: Wed Oct 03 23:03:46 2012 +0200 summary: PyUnicode_Format(): disable overallocation when we are writing the last part of the output string files: Objects/unicodeobject.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13583,8 +13583,10 @@ fmtpos++; fmtcnt--; } - if (fmtcnt < 0) + if (fmtcnt < 0) { fmtpos--; + writer.overallocate = 0; + } sublen = fmtpos - nonfmtpos; maxchar = _PyUnicode_FindMaxChar(uformat, nonfmtpos, nonfmtpos + sublen); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:28:04 2012 From: python-checkins at python.org (victor.stinner) Date: Thu, 4 Oct 2012 02:28:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Split_the_huge_PyUnicode?= =?utf-8?q?=5FFormat=28=29_function_=28+540_lines=29_into_subfunctions?= Message-ID: <3XXFLX1fg0zQVS@mail.python.org> http://hg.python.org/cpython/rev/7b9a7d4609c7 changeset: 79437:7b9a7d4609c7 user: Victor Stinner date: Thu Oct 04 02:19:54 2012 +0200 summary: Split the huge PyUnicode_Format() function (+540 lines) into subfunctions files: Objects/unicodeobject.c | 1109 +++++++++++++++----------- 1 files changed, 621 insertions(+), 488 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13224,16 +13224,39 @@ /* Helpers for PyUnicode_Format() */ +struct unicode_formatter_t { + PyObject *args; + int args_owned; + Py_ssize_t arglen, argidx; + PyObject *dict; + + enum PyUnicode_Kind fmtkind; + Py_ssize_t fmtcnt, fmtpos; + void *fmtdata; + PyObject *fmtstr; + + _PyUnicodeWriter writer; +}; + +struct unicode_format_arg_t { + Py_UCS4 ch; + int flags; + Py_ssize_t width; + int prec; + int sign; +}; + static PyObject * -getnextarg(PyObject *args, Py_ssize_t arglen, Py_ssize_t *p_argidx) -{ - Py_ssize_t argidx = *p_argidx; - if (argidx < arglen) { - (*p_argidx)++; - if (arglen < 0) - return args; +unicode_format_getnextarg(struct unicode_formatter_t *ctx) +{ + Py_ssize_t argidx = ctx->argidx; + + if (argidx < ctx->arglen) { + ctx->argidx++; + if (ctx->arglen < 0) + return ctx->args; else - return PyTuple_GetItem(args, argidx); + return PyTuple_GetItem(ctx->args, argidx); } PyErr_SetString(PyExc_TypeError, "not enough arguments for format string"); @@ -13242,23 +13265,34 @@ /* Returns a new reference to a PyUnicode object, or NULL on failure. */ +/* Format a float into the writer if the writer is not NULL, or into *p_output + otherwise. + + Return 0 on success, raise an exception and return -1 on error. */ static int -formatfloat(PyObject *v, int flags, int prec, int type, - PyObject **p_output, _PyUnicodeWriter *writer) +formatfloat(PyObject *v, struct unicode_format_arg_t *arg, + PyObject **p_output, + _PyUnicodeWriter *writer) { char *p; double x; Py_ssize_t len; + int prec; + int dtoa_flags; x = PyFloat_AsDouble(v); if (x == -1.0 && PyErr_Occurred()) return -1; + prec = arg->prec; if (prec < 0) prec = 6; - p = PyOS_double_to_string(x, type, prec, - (flags & F_ALT) ? Py_DTSF_ALT : 0, NULL); + if (arg->flags & F_ALT) + dtoa_flags = Py_DTSF_ALT; + else + dtoa_flags = 0; + p = PyOS_double_to_string(x, arg->ch, prec, dtoa_flags, NULL); if (p == NULL) return -1; len = strlen(p); @@ -13295,7 +13329,7 @@ * produce a '-' sign, but can for Python's unbounded ints. */ static PyObject* -formatlong(PyObject *val, int flags, int prec, int type) +formatlong(PyObject *val, struct unicode_format_arg_t *arg) { PyObject *result = NULL; char *buf; @@ -13305,6 +13339,8 @@ Py_ssize_t llen; int numdigits; /* len == numnondigits + numdigits */ int numnondigits = 0; + int prec = arg->prec; + int type = arg->ch; /* Avoid exceeding SSIZE_T_MAX */ if (prec > INT_MAX-3) { @@ -13363,7 +13399,7 @@ assert(numdigits > 0); /* Get rid of base marker unless F_ALT */ - if (((flags & F_ALT) == 0 && + if (((arg->flags & F_ALT) == 0 && (type == 'o' || type == 'x' || type == 'X'))) { assert(buf[sign] == '0'); assert(buf[sign+1] == 'x' || buf[sign+1] == 'X' || @@ -13424,14 +13460,16 @@ /* Format an integer. * Return 1 if the number has been formatted into the writer, - * 0 if the number has been formatted into *p_result + * 0 if the number has been formatted into *p_output * -1 and raise an exception on error */ static int -mainformatlong(_PyUnicodeWriter *writer, PyObject *v, - int c, Py_ssize_t width, int prec, int flags, - PyObject **p_result) +mainformatlong(PyObject *v, + struct unicode_format_arg_t *arg, + PyObject **p_output, + _PyUnicodeWriter *writer) { PyObject *iobj, *res; + char type = (char)arg->ch; if (!PyNumber_Check(v)) goto wrongtype; @@ -13451,15 +13489,15 @@ } if (PyLong_CheckExact(v) - && width == -1 && prec == -1 - && !(flags & (F_SIGN | F_BLANK)) - && c != 'X') + && arg->width == -1 && arg->prec == -1 + && !(arg->flags & (F_SIGN | F_BLANK)) + && type != 'X') { /* Fast path */ - int alternate = flags & F_ALT; + int alternate = arg->flags & F_ALT; int base; - switch(c) + switch(type) { default: assert(0 && "'type' not in [diuoxX]"); @@ -13485,17 +13523,18 @@ return 1; } - res = formatlong(iobj, flags, prec, c); + res = formatlong(iobj, arg); Py_DECREF(iobj); if (res == NULL) return -1; - *p_result = res; + *p_output = res; return 0; wrongtype: PyErr_Format(PyExc_TypeError, "%%%c format: a number is required, " - "not %.200s", (char)c, Py_TYPE(v)->tp_name); + "not %.200s", + type, Py_TYPE(v)->tp_name); return -1; } @@ -13531,494 +13570,588 @@ return (Py_UCS4) -1; } +/* Parse options of an argument: flags, width, precision. + Handle also "%(name)" syntax. + + Return 0 if the argument has been formatted into arg->str. + Return 1 if the argument has been written into ctx->writer, + Raise an exception and return -1 on error. */ +static int +unicode_format_arg_parse(struct unicode_formatter_t *ctx, + struct unicode_format_arg_t *arg) +{ +#define FORMAT_READ(ctx) \ + PyUnicode_READ((ctx)->fmtkind, (ctx)->fmtdata, (ctx)->fmtpos) + + PyObject *v; + + arg->ch = FORMAT_READ(ctx); + if (arg->ch == '(') { + /* Get argument value from a dictionary. Example: "%(name)s". */ + Py_ssize_t keystart; + Py_ssize_t keylen; + PyObject *key; + int pcount = 1; + + if (ctx->dict == NULL) { + PyErr_SetString(PyExc_TypeError, + "format requires a mapping"); + return -1; + } + ++ctx->fmtpos; + --ctx->fmtcnt; + keystart = ctx->fmtpos; + /* Skip over balanced parentheses */ + while (pcount > 0 && --ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + if (arg->ch == ')') + --pcount; + else if (arg->ch == '(') + ++pcount; + ctx->fmtpos++; + } + keylen = ctx->fmtpos - keystart - 1; + if (ctx->fmtcnt < 0 || pcount > 0) { + PyErr_SetString(PyExc_ValueError, + "incomplete format key"); + return -1; + } + key = PyUnicode_Substring(ctx->fmtstr, + keystart, keystart + keylen); + if (key == NULL) + return -1; + if (ctx->args_owned) { + Py_DECREF(ctx->args); + ctx->args_owned = 0; + } + ctx->args = PyObject_GetItem(ctx->dict, key); + Py_DECREF(key); + if (ctx->args == NULL) + return -1; + ctx->args_owned = 1; + ctx->arglen = -1; + ctx->argidx = -2; + } + + /* Parse flags. Example: "%+i" => flags=F_SIGN. */ + arg->flags = 0; + while (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + switch (arg->ch) { + case '-': arg->flags |= F_LJUST; continue; + case '+': arg->flags |= F_SIGN; continue; + case ' ': arg->flags |= F_BLANK; continue; + case '#': arg->flags |= F_ALT; continue; + case '0': arg->flags |= F_ZERO; continue; + } + break; + } + + /* Parse width. Example: "%10s" => width=10 */ + arg->width = -1; + if (arg->ch == '*') { + v = unicode_format_getnextarg(ctx); + if (v == NULL) + return -1; + if (!PyLong_Check(v)) { + PyErr_SetString(PyExc_TypeError, + "* wants int"); + return -1; + } + arg->width = PyLong_AsLong(v); + if (arg->width == -1 && PyErr_Occurred()) + return -1; + if (arg->width < 0) { + arg->flags |= F_LJUST; + arg->width = -arg->width; + } + if (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + } + } + else if (arg->ch >= '0' && arg->ch <= '9') { + arg->width = arg->ch - '0'; + while (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + if (arg->ch < '0' || arg->ch > '9') + break; + /* Since arg->ch is unsigned, the RHS would end up as unsigned, + mixing signed and unsigned comparison. Since arg->ch is between + '0' and '9', casting to int is safe. */ + if (arg->width > (PY_SSIZE_T_MAX - ((int)arg->ch - '0')) / 10) { + PyErr_SetString(PyExc_ValueError, + "width too big"); + return -1; + } + arg->width = arg->width*10 + (arg->ch - '0'); + } + } + + /* Parse precision. Example: "%.3f" => prec=3 */ + arg->prec = -1; + if (arg->ch == '.') { + arg->prec = 0; + if (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + } + if (arg->ch == '*') { + v = unicode_format_getnextarg(ctx); + if (v == NULL) + return -1; + if (!PyLong_Check(v)) { + PyErr_SetString(PyExc_TypeError, + "* wants int"); + return -1; + } + arg->prec = PyLong_AsLong(v); + if (arg->prec == -1 && PyErr_Occurred()) + return -1; + if (arg->prec < 0) + arg->prec = 0; + if (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + } + } + else if (arg->ch >= '0' && arg->ch <= '9') { + arg->prec = arg->ch - '0'; + while (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + if (arg->ch < '0' || arg->ch > '9') + break; + if (arg->prec > (INT_MAX - ((int)arg->ch - '0')) / 10) { + PyErr_SetString(PyExc_ValueError, + "prec too big"); + return -1; + } + arg->prec = arg->prec*10 + (arg->ch - '0'); + } + } + } + + /* Ignore "h", "l" and "L" format prefix (ex: "%hi" or "%ls") */ + if (ctx->fmtcnt >= 0) { + if (arg->ch == 'h' || arg->ch == 'l' || arg->ch == 'L') { + if (--ctx->fmtcnt >= 0) { + arg->ch = FORMAT_READ(ctx); + ctx->fmtpos++; + } + } + } + if (ctx->fmtcnt < 0) { + PyErr_SetString(PyExc_ValueError, + "incomplete format"); + return -1; + } + return 0; + +#undef FORMAT_READ +} + +/* Format one argument. Supported conversion specifiers: + + - "s", "r", "a": any type + - "i", "d", "u", "o", "x", "X": int + - "e", "E", "f", "F", "g", "G": float + - "c": int or str (1 character) + + Return 0 if the argument has been formatted into *p_str, + 1 if the argument has been written into ctx->writer, + -1 on error. */ +static int +unicode_format_arg_format(struct unicode_formatter_t *ctx, + struct unicode_format_arg_t *arg, + PyObject **p_str) +{ + PyObject *v; + _PyUnicodeWriter *writer = &ctx->writer; + + if (ctx->fmtcnt == 0) + ctx->writer.overallocate = 0; + + if (arg->ch == '%') { + if (_PyUnicodeWriter_Prepare(writer, 1, '%') == -1) + return -1; + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, '%'); + writer->pos += 1; + return 1; + } + + v = unicode_format_getnextarg(ctx); + if (v == NULL) + return -1; + + arg->sign = 0; + + switch (arg->ch) { + + case 's': + case 'r': + case 'a': + if (PyLong_CheckExact(v) && arg->width == -1 && arg->prec == -1) { + /* Fast path */ + if (_PyLong_FormatWriter(writer, v, 10, arg->flags & F_ALT) == -1) + return -1; + return 1; + } + + if (PyUnicode_CheckExact(v) && arg->ch == 's') { + *p_str = v; + Py_INCREF(*p_str); + } + else { + if (arg->ch == 's') + *p_str = PyObject_Str(v); + else if (arg->ch == 'r') + *p_str = PyObject_Repr(v); + else + *p_str = PyObject_ASCII(v); + } + break; + + case 'i': + case 'd': + case 'u': + case 'o': + case 'x': + case 'X': + { + int ret = mainformatlong(v, arg, p_str, writer); + if (ret != 0) + return ret; + arg->sign = 1; + break; + } + + case 'e': + case 'E': + case 'f': + case 'F': + case 'g': + case 'G': + if (arg->width == -1 && arg->prec == -1 + && !(arg->flags & (F_SIGN | F_BLANK))) + { + /* Fast path */ + if (formatfloat(v, arg, NULL, writer) == -1) + return -1; + return 1; + } + + arg->sign = 1; + if (formatfloat(v, arg, p_str, NULL) == -1) + return -1; + break; + + case 'c': + { + Py_UCS4 ch = formatchar(v); + if (ch == (Py_UCS4) -1) + return -1; + if (arg->width == -1 && arg->prec == -1) { + /* Fast path */ + if (_PyUnicodeWriter_Prepare(writer, 1, ch) == -1) + return -1; + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, ch); + writer->pos += 1; + return 1; + } + *p_str = PyUnicode_FromOrdinal(ch); + break; + } + + default: + PyErr_Format(PyExc_ValueError, + "unsupported format character '%c' (0x%x) " + "at index %zd", + (31<=arg->ch && arg->ch<=126) ? (char)arg->ch : '?', + (int)arg->ch, + ctx->fmtpos - 1); + return -1; + } + if (*p_str == NULL) + return -1; + assert (PyUnicode_Check(*p_str)); + return 0; +} + +static int +unicode_format_arg_output(struct unicode_formatter_t *ctx, + struct unicode_format_arg_t *arg, + PyObject *str) +{ + Py_ssize_t len; + enum PyUnicode_Kind kind; + void *pbuf; + Py_ssize_t pindex; + Py_UCS4 signchar; + Py_ssize_t buflen; + Py_UCS4 maxchar, bufmaxchar; + Py_ssize_t sublen; + _PyUnicodeWriter *writer = &ctx->writer; + Py_UCS4 fill; + + fill = ' '; + if (arg->sign && arg->flags & F_ZERO) + fill = '0'; + + if (PyUnicode_READY(str) == -1) + return -1; + + len = PyUnicode_GET_LENGTH(str); + if ((arg->width == -1 || arg->width <= len) + && (arg->prec == -1 || arg->prec >= len) + && !(arg->flags & (F_SIGN | F_BLANK))) + { + /* Fast path */ + if (_PyUnicodeWriter_WriteStr(writer, str) == -1) + return -1; + return 0; + } + + /* Truncate the string for "s", "r" and "a" formats + if the precision is set */ + if (arg->ch == 's' || arg->ch == 'r' || arg->ch == 'a') { + if (arg->prec >= 0 && len > arg->prec) + len = arg->prec; + } + + /* Adjust sign and width */ + kind = PyUnicode_KIND(str); + pbuf = PyUnicode_DATA(str); + pindex = 0; + signchar = '\0'; + if (arg->sign) { + Py_UCS4 ch = PyUnicode_READ(kind, pbuf, pindex); + if (ch == '-' || ch == '+') { + signchar = ch; + len--; + pindex++; + } + else if (arg->flags & F_SIGN) + signchar = '+'; + else if (arg->flags & F_BLANK) + signchar = ' '; + else + arg->sign = 0; + } + if (arg->width < len) + arg->width = len; + + /* Prepare the writer */ + bufmaxchar = 127; + if (!(arg->flags & F_LJUST)) { + if (arg->sign) { + if ((arg->width-1) > len) + bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill); + } + else { + if (arg->width > len) + bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill); + } + } + maxchar = _PyUnicode_FindMaxChar(str, 0, pindex+len); + bufmaxchar = MAX_MAXCHAR(bufmaxchar, maxchar); + buflen = arg->width; + if (arg->sign && len == arg->width) + buflen++; + if (_PyUnicodeWriter_Prepare(writer, buflen, bufmaxchar) == -1) + return -1; + + /* Write the sign if needed */ + if (arg->sign) { + if (fill != ' ') { + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, signchar); + writer->pos += 1; + } + if (arg->width > len) + arg->width--; + } + + /* Write the numeric prefix for "x", "X" and "o" formats + if the alternate form is used. + For example, write "0x" for the "%#x" format. */ + if ((arg->flags & F_ALT) && (arg->ch == 'x' || arg->ch == 'X' || arg->ch == 'o')) { + assert(PyUnicode_READ(kind, pbuf, pindex) == '0'); + assert(PyUnicode_READ(kind, pbuf, pindex + 1) == arg->ch); + if (fill != ' ') { + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, '0'); + PyUnicode_WRITE(writer->kind, writer->data, writer->pos+1, arg->ch); + writer->pos += 2; + pindex += 2; + } + arg->width -= 2; + if (arg->width < 0) + arg->width = 0; + len -= 2; + } + + /* Pad left with the fill character if needed */ + if (arg->width > len && !(arg->flags & F_LJUST)) { + sublen = arg->width - len; + FILL(writer->kind, writer->data, fill, writer->pos, sublen); + writer->pos += sublen; + arg->width = len; + } + + /* If padding with spaces: write sign if needed and/or numeric prefix if + the alternate form is used */ + if (fill == ' ') { + if (arg->sign) { + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, signchar); + writer->pos += 1; + } + if ((arg->flags & F_ALT) && (arg->ch == 'x' || arg->ch == 'X' || arg->ch == 'o')) { + assert(PyUnicode_READ(kind, pbuf, pindex) == '0'); + assert(PyUnicode_READ(kind, pbuf, pindex+1) == arg->ch); + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, '0'); + PyUnicode_WRITE(writer->kind, writer->data, writer->pos+1, arg->ch); + writer->pos += 2; + pindex += 2; + } + } + + /* Write characters */ + if (len) { + _PyUnicode_FastCopyCharacters(writer->buffer, writer->pos, + str, pindex, len); + writer->pos += len; + } + + /* Pad right with the fill character if needed */ + if (arg->width > len) { + sublen = arg->width - len; + FILL(writer->kind, writer->data, ' ', writer->pos, sublen); + writer->pos += sublen; + } + return 0; +} + +/* Helper of PyUnicode_Format(): format one arg. + Return 0 on success, raise an exception and return -1 on error. */ +static int +unicode_format_arg(struct unicode_formatter_t *ctx) +{ + struct unicode_format_arg_t arg; + PyObject *str; + int ret; + + ret = unicode_format_arg_parse(ctx, &arg); + if (ret == -1) + return -1; + + ret = unicode_format_arg_format(ctx, &arg, &str); + if (ret == -1) + return -1; + + if (ret != 1) { + ret = unicode_format_arg_output(ctx, &arg, str); + Py_DECREF(str); + if (ret == -1) + return -1; + } + + if (ctx->dict && (ctx->argidx < ctx->arglen) && arg.ch != '%') { + PyErr_SetString(PyExc_TypeError, + "not all arguments converted during string formatting"); + return -1; + } + return 0; +} + PyObject * PyUnicode_Format(PyObject *format, PyObject *args) { - Py_ssize_t fmtcnt, fmtpos, arglen, argidx; - int args_owned = 0; - PyObject *dict = NULL; - PyObject *temp = NULL; - PyObject *second = NULL; - PyObject *uformat; - void *fmt; - enum PyUnicode_Kind kind, fmtkind; - _PyUnicodeWriter writer; - Py_ssize_t sublen; - Py_UCS4 maxchar; + struct unicode_formatter_t ctx; if (format == NULL || args == NULL) { PyErr_BadInternalCall(); return NULL; } - uformat = PyUnicode_FromObject(format); - if (uformat == NULL) - return NULL; - if (PyUnicode_READY(uformat) == -1) - Py_DECREF(uformat); - - fmt = PyUnicode_DATA(uformat); - fmtkind = PyUnicode_KIND(uformat); - fmtcnt = PyUnicode_GET_LENGTH(uformat); - fmtpos = 0; - - _PyUnicodeWriter_Init(&writer, fmtcnt + 100); + + ctx.fmtstr = PyUnicode_FromObject(format); + if (ctx.fmtstr == NULL) + return NULL; + if (PyUnicode_READY(ctx.fmtstr) == -1) { + Py_DECREF(ctx.fmtstr); + return NULL; + } + ctx.fmtdata = PyUnicode_DATA(ctx.fmtstr); + ctx.fmtkind = PyUnicode_KIND(ctx.fmtstr); + ctx.fmtcnt = PyUnicode_GET_LENGTH(ctx.fmtstr); + ctx.fmtpos = 0; + + _PyUnicodeWriter_Init(&ctx.writer, ctx.fmtcnt + 100); if (PyTuple_Check(args)) { - arglen = PyTuple_Size(args); - argidx = 0; + ctx.arglen = PyTuple_Size(args); + ctx.argidx = 0; } else { - arglen = -1; - argidx = -2; - } + ctx.arglen = -1; + ctx.argidx = -2; + } + ctx.args_owned = 0; if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyUnicode_Check(args)) - dict = args; - - while (--fmtcnt >= 0) { - if (PyUnicode_READ(fmtkind, fmt, fmtpos) != '%') { - Py_ssize_t nonfmtpos; - nonfmtpos = fmtpos++; - while (fmtcnt >= 0 && - PyUnicode_READ(fmtkind, fmt, fmtpos) != '%') { - fmtpos++; - fmtcnt--; - } - if (fmtcnt < 0) { - fmtpos--; - writer.overallocate = 0; - } - sublen = fmtpos - nonfmtpos; - maxchar = _PyUnicode_FindMaxChar(uformat, + ctx.dict = args; + else + ctx.dict = NULL; + ctx.args = args; + + while (--ctx.fmtcnt >= 0) { + if (PyUnicode_READ(ctx.fmtkind, ctx.fmtdata, ctx.fmtpos) != '%') { + Py_ssize_t nonfmtpos, sublen; + Py_UCS4 maxchar; + + nonfmtpos = ctx.fmtpos++; + while (ctx.fmtcnt >= 0 && + PyUnicode_READ(ctx.fmtkind, ctx.fmtdata, ctx.fmtpos) != '%') { + ctx.fmtpos++; + ctx.fmtcnt--; + } + if (ctx.fmtcnt < 0) { + ctx.fmtpos--; + ctx.writer.overallocate = 0; + } + sublen = ctx.fmtpos - nonfmtpos; + maxchar = _PyUnicode_FindMaxChar(ctx.fmtstr, nonfmtpos, nonfmtpos + sublen); - if (_PyUnicodeWriter_Prepare(&writer, sublen, maxchar) == -1) + if (_PyUnicodeWriter_Prepare(&ctx.writer, sublen, maxchar) == -1) goto onError; - _PyUnicode_FastCopyCharacters(writer.buffer, writer.pos, - uformat, nonfmtpos, sublen); - writer.pos += sublen; + _PyUnicode_FastCopyCharacters(ctx.writer.buffer, ctx.writer.pos, + ctx.fmtstr, nonfmtpos, sublen); + ctx.writer.pos += sublen; } else { - /* Got a format specifier */ - int flags = 0; - Py_ssize_t width = -1; - int prec = -1; - Py_UCS4 c = '\0'; - Py_UCS4 fill; - int sign; - Py_UCS4 signchar; - PyObject *v = NULL; - void *pbuf = NULL; - Py_ssize_t pindex, len; - Py_UCS4 bufmaxchar; - Py_ssize_t buflen; - - fmtpos++; - c = PyUnicode_READ(fmtkind, fmt, fmtpos); - if (c == '(') { - Py_ssize_t keystart; - Py_ssize_t keylen; - PyObject *key; - int pcount = 1; - - if (dict == NULL) { - PyErr_SetString(PyExc_TypeError, - "format requires a mapping"); - goto onError; - } - ++fmtpos; - --fmtcnt; - keystart = fmtpos; - /* Skip over balanced parentheses */ - while (pcount > 0 && --fmtcnt >= 0) { - c = PyUnicode_READ(fmtkind, fmt, fmtpos); - if (c == ')') - --pcount; - else if (c == '(') - ++pcount; - fmtpos++; - } - keylen = fmtpos - keystart - 1; - if (fmtcnt < 0 || pcount > 0) { - PyErr_SetString(PyExc_ValueError, - "incomplete format key"); - goto onError; - } - key = PyUnicode_Substring(uformat, - keystart, keystart + keylen); - if (key == NULL) - goto onError; - if (args_owned) { - Py_DECREF(args); - args_owned = 0; - } - args = PyObject_GetItem(dict, key); - Py_DECREF(key); - if (args == NULL) { - goto onError; - } - args_owned = 1; - arglen = -1; - argidx = -2; - } - while (--fmtcnt >= 0) { - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - switch (c) { - case '-': flags |= F_LJUST; continue; - case '+': flags |= F_SIGN; continue; - case ' ': flags |= F_BLANK; continue; - case '#': flags |= F_ALT; continue; - case '0': flags |= F_ZERO; continue; - } - break; - } - if (c == '*') { - v = getnextarg(args, arglen, &argidx); - if (v == NULL) - goto onError; - if (!PyLong_Check(v)) { - PyErr_SetString(PyExc_TypeError, - "* wants int"); - goto onError; - } - width = PyLong_AsLong(v); - if (width == -1 && PyErr_Occurred()) - goto onError; - if (width < 0) { - flags |= F_LJUST; - width = -width; - } - if (--fmtcnt >= 0) - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - } - else if (c >= '0' && c <= '9') { - width = c - '0'; - while (--fmtcnt >= 0) { - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - if (c < '0' || c > '9') - break; - /* Since c is unsigned, the RHS would end up as unsigned, - mixing signed and unsigned comparison. Since c is between - '0' and '9', casting to int is safe. */ - if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) { - PyErr_SetString(PyExc_ValueError, - "width too big"); - goto onError; - } - width = width*10 + (c - '0'); - } - } - if (c == '.') { - prec = 0; - if (--fmtcnt >= 0) - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - if (c == '*') { - v = getnextarg(args, arglen, &argidx); - if (v == NULL) - goto onError; - if (!PyLong_Check(v)) { - PyErr_SetString(PyExc_TypeError, - "* wants int"); - goto onError; - } - prec = PyLong_AsLong(v); - if (prec == -1 && PyErr_Occurred()) - goto onError; - if (prec < 0) - prec = 0; - if (--fmtcnt >= 0) - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - } - else if (c >= '0' && c <= '9') { - prec = c - '0'; - while (--fmtcnt >= 0) { - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - if (c < '0' || c > '9') - break; - if (prec > (INT_MAX - ((int)c - '0')) / 10) { - PyErr_SetString(PyExc_ValueError, - "prec too big"); - goto onError; - } - prec = prec*10 + (c - '0'); - } - } - } /* prec */ - if (fmtcnt >= 0) { - if (c == 'h' || c == 'l' || c == 'L') { - if (--fmtcnt >= 0) - c = PyUnicode_READ(fmtkind, fmt, fmtpos++); - } - } - if (fmtcnt < 0) { - PyErr_SetString(PyExc_ValueError, - "incomplete format"); + ctx.fmtpos++; + if (unicode_format_arg(&ctx) == -1) goto onError; - } - if (fmtcnt == 0) - writer.overallocate = 0; - - if (c == '%') { - if (_PyUnicodeWriter_Prepare(&writer, 1, '%') == -1) - goto onError; - PyUnicode_WRITE(writer.kind, writer.data, writer.pos, '%'); - writer.pos += 1; - continue; - } - - v = getnextarg(args, arglen, &argidx); - if (v == NULL) - goto onError; - - sign = 0; - signchar = '\0'; - fill = ' '; - switch (c) { - - case 's': - case 'r': - case 'a': - if (PyLong_CheckExact(v) && width == -1 && prec == -1) { - /* Fast path */ - if (_PyLong_FormatWriter(&writer, v, 10, flags & F_ALT) == -1) - goto onError; - goto nextarg; - } - - if (PyUnicode_CheckExact(v) && c == 's') { - temp = v; - Py_INCREF(temp); - } - else { - if (c == 's') - temp = PyObject_Str(v); - else if (c == 'r') - temp = PyObject_Repr(v); - else - temp = PyObject_ASCII(v); - } - break; - - case 'i': - case 'd': - case 'u': - case 'o': - case 'x': - case 'X': - { - int ret = mainformatlong(&writer, v, c, width, prec, - flags, &temp); - if (ret == 1) - goto nextarg; - if (ret == -1) - goto onError; - sign = 1; - if (flags & F_ZERO) - fill = '0'; - break; - } - - case 'e': - case 'E': - case 'f': - case 'F': - case 'g': - case 'G': - if (width == -1 && prec == -1 - && !(flags & (F_SIGN | F_BLANK))) - { - /* Fast path */ - if (formatfloat(v, flags, prec, c, NULL, &writer) == -1) - goto onError; - goto nextarg; - } - - sign = 1; - if (flags & F_ZERO) - fill = '0'; - if (formatfloat(v, flags, prec, c, &temp, NULL) == -1) - temp = NULL; - break; - - case 'c': - { - Py_UCS4 ch = formatchar(v); - if (ch == (Py_UCS4) -1) - goto onError; - if (width == -1 && prec == -1) { - /* Fast path */ - if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1) - goto onError; - PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch); - writer.pos += 1; - goto nextarg; - } - temp = PyUnicode_FromOrdinal(ch); - break; - } - - default: - PyErr_Format(PyExc_ValueError, - "unsupported format character '%c' (0x%x) " - "at index %zd", - (31<=c && c<=126) ? (char)c : '?', - (int)c, - fmtpos - 1); - goto onError; - } - if (temp == NULL) - goto onError; - assert (PyUnicode_Check(temp)); - - if (PyUnicode_READY(temp) == -1) { - Py_CLEAR(temp); - goto onError; - } - - len = PyUnicode_GET_LENGTH(temp); - if ((width == -1 || width <= len) - && (prec == -1 || prec >= len) - && !(flags & (F_SIGN | F_BLANK))) - { - /* Fast path */ - if (_PyUnicodeWriter_WriteStr(&writer, temp) == -1) - goto onError; - goto nextarg; - } - - if (c == 's' || c == 'r' || c == 'a') { - if (prec >= 0 && len > prec) - len = prec; - } - - /* pbuf is initialized here. */ - kind = PyUnicode_KIND(temp); - pbuf = PyUnicode_DATA(temp); - pindex = 0; - if (sign) { - Py_UCS4 ch = PyUnicode_READ(kind, pbuf, pindex); - if (ch == '-' || ch == '+') { - signchar = ch; - len--; - pindex++; - } - else if (flags & F_SIGN) - signchar = '+'; - else if (flags & F_BLANK) - signchar = ' '; - else - sign = 0; - } - if (width < len) - width = len; - - /* Compute the length and maximum character of the - written characters */ - bufmaxchar = 127; - if (!(flags & F_LJUST)) { - if (sign) { - if ((width-1) > len) - bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill); - } - else { - if (width > len) - bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill); - } - } - maxchar = _PyUnicode_FindMaxChar(temp, 0, pindex+len); - bufmaxchar = MAX_MAXCHAR(bufmaxchar, maxchar); - - buflen = width; - if (sign && len == width) - buflen++; - - if (_PyUnicodeWriter_Prepare(&writer, buflen, bufmaxchar) == -1) - goto onError; - - /* Write characters */ - if (sign) { - if (fill != ' ') { - PyUnicode_WRITE(writer.kind, writer.data, writer.pos, signchar); - writer.pos += 1; - } - if (width > len) - width--; - } - if ((flags & F_ALT) && (c == 'x' || c == 'X' || c == 'o')) { - assert(PyUnicode_READ(kind, pbuf, pindex) == '0'); - assert(PyUnicode_READ(kind, pbuf, pindex + 1) == c); - if (fill != ' ') { - PyUnicode_WRITE(writer.kind, writer.data, writer.pos, '0'); - PyUnicode_WRITE(writer.kind, writer.data, writer.pos+1, c); - writer.pos += 2; - pindex += 2; - } - width -= 2; - if (width < 0) - width = 0; - len -= 2; - } - if (width > len && !(flags & F_LJUST)) { - sublen = width - len; - FILL(writer.kind, writer.data, fill, writer.pos, sublen); - writer.pos += sublen; - width = len; - } - if (fill == ' ') { - if (sign) { - PyUnicode_WRITE(writer.kind, writer.data, writer.pos, signchar); - writer.pos += 1; - } - if ((flags & F_ALT) && (c == 'x' || c == 'X' || c == 'o')) { - assert(PyUnicode_READ(kind, pbuf, pindex) == '0'); - assert(PyUnicode_READ(kind, pbuf, pindex+1) == c); - PyUnicode_WRITE(writer.kind, writer.data, writer.pos, '0'); - PyUnicode_WRITE(writer.kind, writer.data, writer.pos+1, c); - writer.pos += 2; - pindex += 2; - } - } - - if (len) { - _PyUnicode_FastCopyCharacters(writer.buffer, writer.pos, - temp, pindex, len); - writer.pos += len; - } - if (width > len) { - sublen = width - len; - FILL(writer.kind, writer.data, ' ', writer.pos, sublen); - writer.pos += sublen; - } - -nextarg: - if (dict && (argidx < arglen) && c != '%') { - PyErr_SetString(PyExc_TypeError, - "not all arguments converted during string formatting"); - goto onError; - } - Py_CLEAR(temp); - } /* '%' */ - } /* until end */ - if (argidx < arglen && !dict) { + } + } + + if (ctx.argidx < ctx.arglen && !ctx.dict) { PyErr_SetString(PyExc_TypeError, "not all arguments converted during string formatting"); goto onError; } - if (args_owned) { - Py_DECREF(args); - } - Py_DECREF(uformat); - Py_XDECREF(temp); - Py_XDECREF(second); - return _PyUnicodeWriter_Finish(&writer); + if (ctx.args_owned) { + Py_DECREF(ctx.args); + } + Py_DECREF(ctx.fmtstr); + return _PyUnicodeWriter_Finish(&ctx.writer); onError: - Py_DECREF(uformat); - Py_XDECREF(temp); - Py_XDECREF(second); - _PyUnicodeWriter_Dealloc(&writer); - if (args_owned) { - Py_DECREF(args); + Py_DECREF(ctx.fmtstr); + _PyUnicodeWriter_Dealloc(&ctx.writer); + if (ctx.args_owned) { + Py_DECREF(ctx.args); } return NULL; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:40:50 2012 From: python-checkins at python.org (victor.stinner) Date: Thu, 4 Oct 2012 02:40:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_unicode=5Fresult=5Fwchar?= =?utf-8?b?KCk6IG1vdmUgdGhlIGFzc2VydCgpIHRvIHRoZSAiI2lmZGVmIFB5X0RFQlVH?= =?utf-8?q?=22_block?= Message-ID: <3XXFdG1WX3zQhb@mail.python.org> http://hg.python.org/cpython/rev/afe4b2921bb7 changeset: 79438:afe4b2921bb7 user: Victor Stinner date: Thu Oct 04 02:32:58 2012 +0200 summary: unicode_result_wchar(): move the assert() to the "#ifdef Py_DEBUG" block files: Objects/unicodeobject.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -412,8 +412,6 @@ #ifndef Py_DEBUG Py_ssize_t len; - assert(Py_REFCNT(unicode) == 1); - len = _PyUnicode_WSTR_LENGTH(unicode); if (len == 0) { Py_INCREF(unicode_empty); @@ -431,10 +429,12 @@ } if (_PyUnicode_Ready(unicode) < 0) { - Py_XDECREF(unicode); + Py_DECREF(unicode); return NULL; } #else + assert(Py_REFCNT(unicode) == 1); + /* don't make the result ready in debug mode to ensure that the caller makes the string ready before using it */ assert(_PyUnicode_CheckConsistency(unicode, 1)); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:47:03 2012 From: python-checkins at python.org (victor.stinner) Date: Thu, 4 Oct 2012 02:47:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_long=5Fto=5Fdecimal=5Fstri?= =?utf-8?q?ng=5Finternal=28=29_doesn=27t_need_to_write_the_final_NULL_char?= =?utf-8?q?acter?= Message-ID: <3XXFmR0fnczQk3@mail.python.org> http://hg.python.org/cpython/rev/bd5c74def80d changeset: 79439:bd5c74def80d user: Victor Stinner date: Thu Oct 04 02:43:02 2012 +0200 summary: long_to_decimal_string_internal() doesn't need to write the final NULL character files: Objects/longobject.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -1651,7 +1651,6 @@ else \ p = (TYPE*)PyUnicode_DATA(str) + strlen; \ \ - *p = '\0'; \ /* pout[0] through pout[size-2] contribute exactly \ _PyLong_DECIMAL_SHIFT digits each */ \ for (i=0; i < size - 1; i++) { \ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:53:08 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 02:53:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_whatsnew?= Message-ID: <3XXFvS6rn9zQkB@mail.python.org> http://hg.python.org/cpython/rev/bdbbd6bb5c55 changeset: 79440:bdbbd6bb5c55 branch: 3.3 parent: 79433:d93a59a0a984 user: Jesus Cea date: Thu Oct 04 02:51:22 2012 +0200 summary: whatsnew files: Doc/whatsnew/3.3.rst | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1722,6 +1722,13 @@ :issue:`13245`) +select +------ + +Solaris and derived platforms have a new class :class:`select.devpoll` +for high performance asyncronous sockets via :file:`/dev/poll`. + + shlex ----- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:53:10 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 02:53:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_whatsnew?= Message-ID: <3XXFvV2bSHzQmf@mail.python.org> http://hg.python.org/cpython/rev/20888406207a changeset: 79441:20888406207a parent: 79439:bd5c74def80d parent: 79440:bdbbd6bb5c55 user: Jesus Cea date: Thu Oct 04 02:51:44 2012 +0200 summary: MERGE: whatsnew files: Doc/whatsnew/3.3.rst | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1722,6 +1722,13 @@ :issue:`13245`) +select +------ + +Solaris and derived platforms have a new class :class:`select.devpoll` +for high performance asyncronous sockets via :file:`/dev/poll`. + + shlex ----- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:59:33 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 02:59:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Whatsnew_typo?= Message-ID: <3XXG2s6bp2zQXD@mail.python.org> http://hg.python.org/cpython/rev/b9d67293d970 changeset: 79442:b9d67293d970 branch: 3.3 parent: 79440:bdbbd6bb5c55 user: Jesus Cea date: Thu Oct 04 02:58:48 2012 +0200 summary: Whatsnew typo files: Doc/whatsnew/3.3.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1725,8 +1725,8 @@ select ------ -Solaris and derived platforms have a new class :class:`select.devpoll` -for high performance asyncronous sockets via :file:`/dev/poll`. +Solaris and derivatives platforms have a new class :class:`select.devpoll` +for high performance asynchronous sockets via :file:`/dev/poll`. shlex -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 02:59:35 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 02:59:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Whatsnew_typo?= Message-ID: <3XXG2v2B9PzQnS@mail.python.org> http://hg.python.org/cpython/rev/da3badae1765 changeset: 79443:da3badae1765 parent: 79441:20888406207a parent: 79442:b9d67293d970 user: Jesus Cea date: Thu Oct 04 02:59:09 2012 +0200 summary: MERGE: Whatsnew typo files: Doc/whatsnew/3.3.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1725,8 +1725,8 @@ select ------ -Solaris and derived platforms have a new class :class:`select.devpoll` -for high performance asyncronous sockets via :file:`/dev/poll`. +Solaris and derivatives platforms have a new class :class:`select.devpoll` +for high performance asynchronous sockets via :file:`/dev/poll`. shlex -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 12:38:44 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 12:38:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2315488=3A_Closed_?= =?utf-8?q?files_keep_their_buffer_alive?= Message-ID: <3XXVv856HCzQxH@mail.python.org> http://hg.python.org/cpython/rev/4141c36954cd changeset: 79444:4141c36954cd user: Jesus Cea date: Thu Oct 04 12:37:56 2012 +0200 summary: Closes #15488: Closed files keep their buffer alive files: Lib/test/test_io.py | 8 ++++++++ Misc/NEWS | 3 +++ Modules/_io/bufferedio.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -815,6 +815,14 @@ bufio = self.tp(rawio, buffer_size=bufsize2) self.assertEqual(sys.getsizeof(bufio), size + bufsize2) + @support.cpython_only + def test_buffer_freeing(self) : + bufsize = 4096 + rawio = self.MockRawIO() + bufio = self.tp(rawio, buffer_size=bufsize) + size = sys.getsizeof(bufio) - bufsize + bufio.close() + self.assertEqual(sys.getsizeof(bufio), size) class BufferedReaderTest(unittest.TestCase, CommonBufferedTests): read_mode = "rb" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,9 @@ - Issue #15839: Convert SystemErrors in `super()` to RuntimeErrors. +- Issue #15448: Buffered IO now frees the buffer when closed, instead + of when deallocating. + - Issue #15846: Fix SystemError which happened when using `ast.parse()` in an exception handler on code with syntax errors. diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -519,6 +519,11 @@ res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_close, NULL); + if (self->buffer) { + PyMem_Free(self->buffer); + self->buffer = NULL; + } + end: LEAVE_BUFFERED(self) return res; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 13:58:42 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 13:58:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNjEx?= =?utf-8?q?2=3A_platform=2Earchitecture_does_not_correctly_escape_argument?= =?utf-8?q?_to?= Message-ID: <3XXXgQ1nfjzQyp@mail.python.org> http://hg.python.org/cpython/rev/c73b90b6dadd changeset: 79445:c73b90b6dadd branch: 2.7 parent: 79432:18d927fb8671 user: Jesus Cea date: Thu Oct 04 13:46:33 2012 +0200 summary: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file files: Lib/platform.py | 13 ++++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -113,7 +113,7 @@ __version__ = '1.0.7' -import sys,string,os,re +import sys,string,os,re,subprocess ### Globals & Constants @@ -1023,13 +1023,16 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target).replace('"', '\\"') + target = _follow_symlinks(target) try: - f = os.popen('file "%s" 2> %s' % (target, DEV_NULL)) + with open(DEV_NULL) as dev_null: + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=dev_null) + except (AttributeError,os.error): return default - output = string.strip(f.read()) - rc = f.close() + output = proc.stdout.read() + rc = proc.wait() if not output or rc: return default else: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -77,6 +77,7 @@ Ben Bell Thomas Bellman Alexander ?????? Belopolsky +David Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,9 @@ io.BytesIO and io.StringIO objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + - Issue #12776,#11839: call argparse type function (specified by add_argument) only once. Before, the type function was called twice in the case where the default was specified and the argument was given as well. This was -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 13:58:43 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 13:58:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNjEx?= =?utf-8?q?2=3A_platform=2Earchitecture_does_not_correctly_escape_argument?= =?utf-8?q?_to?= Message-ID: <3XXXgR4mqZzR05@mail.python.org> http://hg.python.org/cpython/rev/6c830b657900 changeset: 79446:6c830b657900 branch: 3.2 parent: 79426:0f4d4f4db724 user: Jesus Cea date: Thu Oct 04 13:51:43 2012 +0200 summary: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file files: Lib/platform.py | 12 +++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -111,7 +111,7 @@ __version__ = '1.0.7' -import sys, os, re +import sys, os, re, subprocess ### Globals & Constants @@ -995,13 +995,15 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target).replace('"', '\\"') + target = _follow_symlinks(target) try: - f = os.popen('file -b "%s" 2> %s' % (target, DEV_NULL)) + with open(DEV_NULL) as dev_null: + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=dev_null) except (AttributeError,os.error): return default - output = f.read().strip() - rc = f.close() + output = proc.stdout.read() + rc = proc.wait() if not output or rc: return default else: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -87,6 +87,7 @@ Thomas Bellman Alexander ?????? Belopolsky Eli Bendersky +David Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -160,6 +160,9 @@ - Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to Popen when %action substitutions produce empty strings. +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + - Issue #12776,#11839: call argparse type function (specified by add_argument) only once. Before, the type function was called twice in the case where the default was specified and the argument was given as well. This was -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 13:58:45 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 13:58:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_MERGE=3A_Closes_=2316112=3A_platform=2Earchitecture_does_not_c?= =?utf-8?q?orrectly_escape_argument?= Message-ID: <3XXXgT0SrjzR0H@mail.python.org> http://hg.python.org/cpython/rev/3112bf7e0ecb changeset: 79447:3112bf7e0ecb branch: 3.3 parent: 79442:b9d67293d970 parent: 79446:6c830b657900 user: Jesus Cea date: Thu Oct 04 13:56:23 2012 +0200 summary: MERGE: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file files: Lib/platform.py | 13 ++++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -112,7 +112,7 @@ __version__ = '1.0.7' import collections -import sys, os, re +import sys, os, re, subprocess ### Globals & Constants @@ -922,13 +922,16 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target).replace('"', '\\"') + target = _follow_symlinks(target) try: - f = os.popen('file -b "%s" 2> %s' % (target, DEV_NULL)) + with open(DEV_NULL) as dev_null: + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=dev_null) + except (AttributeError,os.error): return default - output = f.read().strip() - rc = f.close() + output = proc.stdout.read() + rc = proc.wait() if not output or rc: return default else: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -93,6 +93,7 @@ Thomas Bellman Alexander ?????? Belopolsky Eli Bendersky +David Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,9 @@ - Issue #16034: Fix performance regressions in the new `bz2.BZ2File` implementation. Initial patch by Serhiy Storchaka. +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + - Issue #15756: `subprocess.poll()` now properly handles `errno.ECHILD` to return a returncode of 0 when the child has already exited or cannot be waited on. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 13:58:46 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 13:58:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Closes_=2316112=3A_platform=2Earchitecture_does?= =?utf-8?q?_not_correctly_escape_argument?= Message-ID: <3XXXgV2r6pzR0f@mail.python.org> http://hg.python.org/cpython/rev/cd026866b333 changeset: 79448:cd026866b333 parent: 79444:4141c36954cd parent: 79447:3112bf7e0ecb user: Jesus Cea date: Thu Oct 04 13:58:22 2012 +0200 summary: MERGE: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file files: Lib/platform.py | 13 ++++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -112,7 +112,7 @@ __version__ = '1.0.7' import collections -import sys, os, re +import sys, os, re, subprocess ### Globals & Constants @@ -922,13 +922,16 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target).replace('"', '\\"') + target = _follow_symlinks(target) try: - f = os.popen('file -b "%s" 2> %s' % (target, DEV_NULL)) + with open(DEV_NULL) as dev_null: + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=dev_null) + except (AttributeError,os.error): return default - output = f.read().strip() - rc = f.close() + output = proc.stdout.read() + rc = proc.wait() if not output or rc: return default else: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -93,6 +93,7 @@ Thomas Bellman Alexander ?????? Belopolsky Eli Bendersky +David Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -65,6 +65,9 @@ - Issue #15421: Fix an OverflowError in `Calendar.itermonthdates()` after `datetime.MAXYEAR`. Patch by C?dric Krier. +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + - Issue #15970: `xml.etree.ElementTree` now serializes correctly the empty HTML elements 'meta' and 'param'. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 14:22:37 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 14:22:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backed_out_cha?= =?utf-8?q?ngeset_c73b90b6dadd?= Message-ID: <3XXYC157rQzR0d@mail.python.org> http://hg.python.org/cpython/rev/5abacebec9d2 changeset: 79449:5abacebec9d2 branch: 2.7 parent: 79445:c73b90b6dadd user: Jesus Cea date: Thu Oct 04 14:22:16 2012 +0200 summary: Backed out changeset c73b90b6dadd files: Lib/platform.py | 13 +++++-------- Misc/ACKS | 1 - Misc/NEWS | 3 --- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -113,7 +113,7 @@ __version__ = '1.0.7' -import sys,string,os,re,subprocess +import sys,string,os,re ### Globals & Constants @@ -1023,16 +1023,13 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target) + target = _follow_symlinks(target).replace('"', '\\"') try: - with open(DEV_NULL) as dev_null: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=dev_null) - + f = os.popen('file "%s" 2> %s' % (target, DEV_NULL)) except (AttributeError,os.error): return default - output = proc.stdout.read() - rc = proc.wait() + output = string.strip(f.read()) + rc = f.close() if not output or rc: return default else: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -77,7 +77,6 @@ Ben Bell Thomas Bellman Alexander ?????? Belopolsky -David Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,9 +143,6 @@ io.BytesIO and io.StringIO objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. -- Issue #16112: platform.architecture does not correctly escape argument to - /usr/bin/file. Patch by David Benjamin. - - Issue #12776,#11839: call argparse type function (specified by add_argument) only once. Before, the type function was called twice in the case where the default was specified and the argument was given as well. This was -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 15:15:10 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 15:15:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backed_out_cha?= =?utf-8?q?ngeset_5abacebec9d2?= Message-ID: <3XXZMf4N1yzR1d@mail.python.org> http://hg.python.org/cpython/rev/de5d5cbf1b45 changeset: 79450:de5d5cbf1b45 branch: 2.7 user: Jesus Cea date: Thu Oct 04 15:06:57 2012 +0200 summary: Backed out changeset 5abacebec9d2 files: Lib/platform.py | 13 ++++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -113,7 +113,7 @@ __version__ = '1.0.7' -import sys,string,os,re +import sys,string,os,re,subprocess ### Globals & Constants @@ -1023,13 +1023,16 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target).replace('"', '\\"') + target = _follow_symlinks(target) try: - f = os.popen('file "%s" 2> %s' % (target, DEV_NULL)) + with open(DEV_NULL) as dev_null: + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=dev_null) + except (AttributeError,os.error): return default - output = string.strip(f.read()) - rc = f.close() + output = proc.stdout.read() + rc = proc.wait() if not output or rc: return default else: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -77,6 +77,7 @@ Ben Bell Thomas Bellman Alexander ?????? Belopolsky +David Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,9 @@ io.BytesIO and io.StringIO objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + - Issue #12776,#11839: call argparse type function (specified by add_argument) only once. Before, the type function was called twice in the case where the default was specified and the argument was given as well. This was -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 15:15:11 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 15:15:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNjEx?= =?utf-8?q?2=3A_platform=2Earchitecture_does_not_correctly_escape_argument?= =?utf-8?q?_to?= Message-ID: <3XXZMg6cvczQys@mail.python.org> http://hg.python.org/cpython/rev/d6d908dc11f2 changeset: 79451:d6d908dc11f2 branch: 2.7 user: Jesus Cea date: Thu Oct 04 15:14:56 2012 +0200 summary: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Solve a 2.7 bootstrap issue files: Lib/platform.py | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -113,7 +113,7 @@ __version__ = '1.0.7' -import sys,string,os,re,subprocess +import sys,string,os,re ### Globals & Constants @@ -1020,6 +1020,26 @@ case the command should fail. """ + + # We do the import here to avoid a bootstrap issue. + # See c73b90b6dadd changeset. + # + # [..] + # ranlib libpython2.7.a + # gcc -o python \ + # Modules/python.o \ + # libpython2.7.a -lsocket -lnsl -ldl -lm + # Traceback (most recent call last): + # File "./setup.py", line 8, in + # from platform import machine as platform_machine + # File "[..]/build/Lib/platform.py", line 116, in + # import sys,string,os,re,subprocess + # File "[..]/build/Lib/subprocess.py", line 429, in + # import select + # ImportError: No module named select + + import subprocess + if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 16:07:20 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 16:07:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogQ2xvc2VzICMxNjEy?= =?utf-8?q?6=3A_PyErr=5FFormat_format_mismatch_in_=5Ftestcapimodule=2Ec?= Message-ID: <3XXbWr0PJVzR3J@mail.python.org> http://hg.python.org/cpython/rev/0fc259ac8733 changeset: 79452:0fc259ac8733 branch: 3.3 parent: 79447:3112bf7e0ecb user: Jesus Cea date: Thu Oct 04 16:06:30 2012 +0200 summary: Closes #16126: PyErr_Format format mismatch in _testcapimodule.c files: Lib/test/test_capi.py | 11 +++++++++++ Misc/NEWS | 3 +++ Modules/_testcapimodule.c | 2 +- 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -316,6 +316,17 @@ c, i, when_skipped, when_not_skipped)) self.assertIs(when_skipped, when_not_skipped, message) + def test_parse_tuple_and_keywords(self): + # parse_tuple_and_keywords error handling tests + self.assertRaises(TypeError, _testcapi.parse_tuple_and_keywords, + (), {}, 42, []) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [''] * 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [42]) + def test_main(): support.run_unittest(CAPITest, TestPendingCalls, Test6012, EmbeddingTest, SkipitemTest) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -73,6 +73,9 @@ `io.BytesIO` and `io.StringIO` objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. +- Issue #16126: PyErr_Format format mismatch in _testcapimodule.c. + Patch by Serhiy Storchaka. + - Issue #15447: Use `subprocess.DEVNULL` in webbrowser, instead of opening `os.devnull` explicitly and leaving it open. diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1238,7 +1238,7 @@ o = PySequence_Fast_GET_ITEM(sub_keywords, i); if (!PyUnicode_FSConverter(o, (void *)(converted + i))) { PyErr_Format(PyExc_ValueError, - "parse_tuple_and_keywords: could not convert keywords[%s] to narrow string", i); + "parse_tuple_and_keywords: could not convert keywords[%zd] to narrow string", i); goto exit; } keywords[i] = PyBytes_AS_STRING(converted[i]); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 16:07:21 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 4 Oct 2012 16:07:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Closes_=2316126=3A_PyErr=5FFormat_format_mismat?= =?utf-8?q?ch_in_=5Ftestcapimodule=2Ec?= Message-ID: <3XXbWs3rWQzR22@mail.python.org> http://hg.python.org/cpython/rev/366c19bb5ca2 changeset: 79453:366c19bb5ca2 parent: 79448:cd026866b333 parent: 79452:0fc259ac8733 user: Jesus Cea date: Thu Oct 04 16:07:03 2012 +0200 summary: MERGE: Closes #16126: PyErr_Format format mismatch in _testcapimodule.c files: Lib/test/test_capi.py | 11 +++++++++++ Misc/NEWS | 3 +++ Modules/_testcapimodule.c | 2 +- 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -316,6 +316,17 @@ c, i, when_skipped, when_not_skipped)) self.assertIs(when_skipped, when_not_skipped, message) + def test_parse_tuple_and_keywords(self): + # parse_tuple_and_keywords error handling tests + self.assertRaises(TypeError, _testcapi.parse_tuple_and_keywords, + (), {}, 42, []) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [''] * 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [42]) + def test_main(): support.run_unittest(CAPITest, TestPendingCalls, Test6012, EmbeddingTest, SkipitemTest) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -83,6 +83,9 @@ `io.BytesIO` and `io.StringIO` objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. +- Issue #16126: PyErr_Format format mismatch in _testcapimodule.c. + Patch by Serhiy Storchaka. + - Issue #15447: Use `subprocess.DEVNULL` in webbrowser, instead of opening `os.devnull` explicitly and leaving it open. diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1238,7 +1238,7 @@ o = PySequence_Fast_GET_ITEM(sub_keywords, i); if (!PyUnicode_FSConverter(o, (void *)(converted + i))) { PyErr_Format(PyExc_ValueError, - "parse_tuple_and_keywords: could not convert keywords[%s] to narrow string", i); + "parse_tuple_and_keywords: could not convert keywords[%zd] to narrow string", i); goto exit; } keywords[i] = PyBytes_AS_STRING(converted[i]); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 18:30:06 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 18:30:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typo_in_do?= =?utf-8?q?cumentation_for_collections=2EChainMap=2C_thanks_to_Olivier_Ber?= =?utf-8?q?nard?= Message-ID: <3XXfhZ33hzzR3b@mail.python.org> http://hg.python.org/cpython/rev/87e4fdaa60bc changeset: 79454:87e4fdaa60bc branch: 3.3 parent: 79452:0fc259ac8733 user: Andrew Svetlov date: Thu Oct 04 19:29:25 2012 +0300 summary: Fix typo in documentation for collections.ChainMap, thanks to Olivier Bernard from docs@ files: Doc/library/collections.rst | 2 +- Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -159,7 +159,7 @@ d['x'] # Get first key in the chain of contexts d['x'] = 1 # Set value in current context - del['x'] # Delete from current context + del d['x'] # Delete from current context list(d) # All nested values k in d # Check all nested values len(d) # Number of nested values diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -101,6 +101,7 @@ Michel Van den Bergh Julian Berman Brice Berna +Olivier Bernard Eric Beser Steven Bethard Stephen Bevan -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 18:30:07 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 18:30:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Fix_typo_in_documentation_for_collections=2ECha?= =?utf-8?q?inMap=2C_thanks_to_Olivier?= Message-ID: <3XXfhb5SVjzR3b@mail.python.org> http://hg.python.org/cpython/rev/748fe6a84525 changeset: 79455:748fe6a84525 parent: 79453:366c19bb5ca2 parent: 79454:87e4fdaa60bc user: Andrew Svetlov date: Thu Oct 04 19:29:55 2012 +0300 summary: Merge: Fix typo in documentation for collections.ChainMap, thanks to Olivier Bernard from docs@ files: Doc/library/collections.rst | 2 +- Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -159,7 +159,7 @@ d['x'] # Get first key in the chain of contexts d['x'] = 1 # Set value in current context - del['x'] # Delete from current context + del d['x'] # Delete from current context list(d) # All nested values k in d # Check all nested values len(d) # Number of nested values diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -101,6 +101,7 @@ Michel Van den Bergh Julian Berman Brice Berna +Olivier Bernard Eric Beser Steven Bethard Stephen Bevan -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 18:45:22 2012 From: python-checkins at python.org (benjamin.peterson) Date: Thu, 4 Oct 2012 18:45:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbjogMy4zIC0+IDMuNCAoY2xvc2Vz?= =?utf-8?q?_=2316130=29?= Message-ID: <3XXg2B2XHVzR6X@mail.python.org> http://hg.python.org/cpython/rev/b21288c1ec68 changeset: 79456:b21288c1ec68 user: Benjamin Peterson date: Thu Oct 04 12:45:10 2012 -0400 summary: 3.3 -> 3.4 (closes #16130) files: Doc/whatsnew/3.4.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -195,7 +195,7 @@ * None yet. -Porting to Python 3.3 +Porting to Python 3.4 ===================== This section lists previously described changes and other bugfixes -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 18:55:12 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 18:55:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typo_in_do?= =?utf-8?q?cumentation_for_time_module=2C_thanks_to_docs=40?= Message-ID: <3XXgFX5gQQzQq5@mail.python.org> http://hg.python.org/cpython/rev/aa7f9b4a7508 changeset: 79457:aa7f9b4a7508 branch: 3.3 parent: 79454:87e4fdaa60bc user: Andrew Svetlov date: Thu Oct 04 19:52:32 2012 +0300 summary: Fix typo in documentation for time module, thanks to docs@ files: Doc/library/time.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/time.rst b/Doc/library/time.rst --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -557,7 +557,7 @@ :exc:`TypeError` is raised. .. versionchanged:: 3.3 - :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are avaliable on platforms + :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms with C library supporting the corresponding fields in ``struct tm``. .. function:: time() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 18:55:14 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 18:55:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Fix_typo_in_documentation_for_time_module=2C_th?= =?utf-8?q?anks_to_docs=40?= Message-ID: <3XXgFZ1BXczR1g@mail.python.org> http://hg.python.org/cpython/rev/d32b4503358b changeset: 79458:d32b4503358b parent: 79455:748fe6a84525 parent: 79457:aa7f9b4a7508 user: Andrew Svetlov date: Thu Oct 04 19:52:56 2012 +0300 summary: Merge: Fix typo in documentation for time module, thanks to docs@ files: Doc/library/time.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/time.rst b/Doc/library/time.rst --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -557,7 +557,7 @@ :exc:`TypeError` is raised. .. versionchanged:: 3.3 - :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are avaliable on platforms + :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms with C library supporting the corresponding fields in ``struct tm``. .. function:: time() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 18:55:15 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 18:55:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_Merge_heads?= Message-ID: <3XXgFb3VSHzQq5@mail.python.org> http://hg.python.org/cpython/rev/a213cef1396a changeset: 79459:a213cef1396a parent: 79456:b21288c1ec68 parent: 79458:d32b4503358b user: Andrew Svetlov date: Thu Oct 04 19:55:04 2012 +0300 summary: Merge heads files: Doc/library/time.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/time.rst b/Doc/library/time.rst --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -557,7 +557,7 @@ :exc:`TypeError` is raised. .. versionchanged:: 3.3 - :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are avaliable on platforms + :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms with C library supporting the corresponding fields in ``struct tm``. .. function:: time() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 19:56:17 2012 From: python-checkins at python.org (antoine.pitrou) Date: Thu, 4 Oct 2012 19:56:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MDg5?= =?utf-8?q?=3A_Allow_ElementTree=2ETreeBuilder_to_work_again_with_a_non-El?= =?utf-8?q?ement?= Message-ID: <3XXhc15xZlzR5k@mail.python.org> http://hg.python.org/cpython/rev/7bd9626d8b4f changeset: 79460:7bd9626d8b4f branch: 3.3 parent: 79457:aa7f9b4a7508 user: Antoine Pitrou date: Thu Oct 04 19:53:29 2012 +0200 summary: Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element element_factory (fixes a regression in SimpleTAL). files: Lib/test/test_xml_etree.py | 44 +++++++++- Lib/xml/etree/ElementTree.py | 4 +- Misc/NEWS | 3 + Modules/_elementtree.c | 107 ++++++++++++++++------ 4 files changed, 127 insertions(+), 31 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1893,10 +1893,23 @@ sample1 = ('' - 'text') + 'text
subtext
tail') sample2 = '''sometext''' + def _check_sample1_element(self, e): + self.assertEqual(e.tag, 'html') + self.assertEqual(e.text, 'text') + self.assertEqual(e.tail, None) + self.assertEqual(e.attrib, {}) + children = list(e) + self.assertEqual(len(children), 1) + child = children[0] + self.assertEqual(child.tag, 'div') + self.assertEqual(child.text, 'subtext') + self.assertEqual(child.tail, 'tail') + self.assertEqual(child.attrib, {}) + def test_dummy_builder(self): class BaseDummyBuilder: def close(self): @@ -1929,7 +1942,7 @@ parser.feed(self.sample1) e = parser.close() - self.assertEqual(e.tag, 'html') + self._check_sample1_element(e) def test_element_factory(self): lst = [] @@ -1945,6 +1958,33 @@ self.assertEqual(lst, ['toplevel']) + def _check_element_factory_class(self, cls): + tb = ET.TreeBuilder(element_factory=cls) + + parser = ET.XMLParser(target=tb) + parser.feed(self.sample1) + e = parser.close() + self.assertIsInstance(e, cls) + self._check_sample1_element(e) + + def test_element_factory_subclass(self): + class MyElement(ET.Element): + pass + self._check_element_factory_class(MyElement) + + def test_element_factory_pure_python_subclass(self): + # Mimick SimpleTAL's behaviour (issue #16089): both versions of + # TreeBuilder should be able to cope with a subclass of the + # pure Python Element class. + base = ET._Element + # Not from a C extension + self.assertEqual(base.__module__, 'xml.etree.ElementTree') + # Force some multiple inheritance with a C class to make things + # more interesting. + class MyElement(base, ValueError): + pass + self._check_element_factory_class(MyElement) + def test_doctype(self): class DoctypeParser: _doctype = None diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -303,7 +303,9 @@ self._children.insert(index, element) def _assert_is_element(self, e): - if not isinstance(e, Element): + # Need to refer to the actual Python implementation, not the + # shadowing C implementation. + if not isinstance(e, _Element): raise TypeError('expected an Element, not %s' % type(e).__name__) ## diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -34,6 +34,9 @@ Library ------- +- Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element + element_factory (fixes a regression in SimpleTAL). + - Issue #16034: Fix performance regressions in the new `bz2.BZ2File` implementation. Initial patch by Serhiy Storchaka. diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -1997,8 +1997,8 @@ PyObject *root; /* root node (first created node) */ - ElementObject *this; /* current node */ - ElementObject *last; /* most recently created node */ + PyObject *this; /* current node */ + PyObject *last; /* most recently created node */ PyObject *data; /* data collector (string or list), or NULL */ @@ -2030,9 +2030,9 @@ t->root = NULL; Py_INCREF(Py_None); - t->this = (ElementObject *)Py_None; + t->this = Py_None; Py_INCREF(Py_None); - t->last = (ElementObject *)Py_None; + t->last = Py_None; t->data = NULL; t->element_factory = NULL; @@ -2113,6 +2113,64 @@ } /* -------------------------------------------------------------------- */ +/* helpers for handling of arbitrary element-like objects */ + +static int +treebuilder_set_element_text_or_tail(PyObject *element, PyObject *data, + PyObject **dest, _Py_Identifier *name) +{ + if (Element_CheckExact(element)) { + Py_DECREF(JOIN_OBJ(*dest)); + *dest = JOIN_SET(data, PyList_CheckExact(data)); + return 0; + } + else { + PyObject *joined = list_join(data); + int r; + if (joined == NULL) + return -1; + r = _PyObject_SetAttrId(element, name, joined); + Py_DECREF(joined); + return r; + } +} + +/* These two functions steal a reference to data */ +static int +treebuilder_set_element_text(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(text); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->text, &PyId_text); +} + +static int +treebuilder_set_element_tail(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(tail); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->tail, &PyId_tail); +} + +static int +treebuilder_add_subelement(PyObject *element, PyObject *child) +{ + _Py_IDENTIFIER(append); + if (Element_CheckExact(element)) { + ElementObject *elem = (ElementObject *) element; + return element_add_subelement(elem, child); + } + else { + PyObject *res; + res = _PyObject_CallMethodId(element, &PyId_append, "O", child); + if (res == NULL) + return -1; + Py_DECREF(res); + return 0; + } +} + +/* -------------------------------------------------------------------- */ /* handlers */ LOCAL(PyObject*) @@ -2124,15 +2182,12 @@ if (self->data) { if (self->this == self->last) { - Py_DECREF(JOIN_OBJ(self->last->text)); - self->last->text = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); - } else { - Py_DECREF(JOIN_OBJ(self->last->tail)); - self->last->tail = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; + } + else { + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; } self->data = NULL; } @@ -2146,10 +2201,10 @@ return NULL; } - this = (PyObject*) self->this; + this = self->this; if (this != Py_None) { - if (element_add_subelement((ElementObject*) this, node) < 0) + if (treebuilder_add_subelement(this, node) < 0) goto error; } else { if (self->root) { @@ -2175,11 +2230,11 @@ Py_DECREF(this); Py_INCREF(node); - self->this = (ElementObject*) node; + self->this = node; Py_DECREF(self->last); Py_INCREF(node); - self->last = (ElementObject*) node; + self->last = node; if (self->start_event_obj) { PyObject* res; @@ -2203,7 +2258,7 @@ treebuilder_handle_data(TreeBuilderObject* self, PyObject* data) { if (!self->data) { - if (self->last == (ElementObject*) Py_None) { + if (self->last == Py_None) { /* ignore calls to data before the first call to start */ Py_RETURN_NONE; } @@ -2243,15 +2298,11 @@ if (self->data) { if (self->this == self->last) { - Py_DECREF(JOIN_OBJ(self->last->text)); - self->last->text = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; } else { - Py_DECREF(JOIN_OBJ(self->last->tail)); - self->last->tail = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; } self->data = NULL; } @@ -2271,8 +2322,8 @@ Py_DECREF(self->last); - self->last = (ElementObject*) self->this; - self->this = (ElementObject*) item; + self->last = self->this; + self->this = item; if (self->end_event_obj) { PyObject* res; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 19:56:19 2012 From: python-checkins at python.org (antoine.pitrou) Date: Thu, 4 Oct 2012 19:56:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316089=3A_Allow_ElementTree=2ETreeBuilder_to_wor?= =?utf-8?q?k_again_with_a_non-Element?= Message-ID: <3XXhc33bckzR66@mail.python.org> http://hg.python.org/cpython/rev/a8c044188731 changeset: 79461:a8c044188731 parent: 79459:a213cef1396a parent: 79460:7bd9626d8b4f user: Antoine Pitrou date: Thu Oct 04 19:54:53 2012 +0200 summary: Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element element_factory (fixes a regression in SimpleTAL). files: Lib/test/test_xml_etree.py | 44 +++++++++- Lib/xml/etree/ElementTree.py | 4 +- Misc/NEWS | 3 + Modules/_elementtree.c | 107 ++++++++++++++++------ 4 files changed, 127 insertions(+), 31 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1893,10 +1893,23 @@ sample1 = ('' - 'text') + 'text
subtext
tail') sample2 = '''sometext''' + def _check_sample1_element(self, e): + self.assertEqual(e.tag, 'html') + self.assertEqual(e.text, 'text') + self.assertEqual(e.tail, None) + self.assertEqual(e.attrib, {}) + children = list(e) + self.assertEqual(len(children), 1) + child = children[0] + self.assertEqual(child.tag, 'div') + self.assertEqual(child.text, 'subtext') + self.assertEqual(child.tail, 'tail') + self.assertEqual(child.attrib, {}) + def test_dummy_builder(self): class BaseDummyBuilder: def close(self): @@ -1929,7 +1942,7 @@ parser.feed(self.sample1) e = parser.close() - self.assertEqual(e.tag, 'html') + self._check_sample1_element(e) def test_element_factory(self): lst = [] @@ -1945,6 +1958,33 @@ self.assertEqual(lst, ['toplevel']) + def _check_element_factory_class(self, cls): + tb = ET.TreeBuilder(element_factory=cls) + + parser = ET.XMLParser(target=tb) + parser.feed(self.sample1) + e = parser.close() + self.assertIsInstance(e, cls) + self._check_sample1_element(e) + + def test_element_factory_subclass(self): + class MyElement(ET.Element): + pass + self._check_element_factory_class(MyElement) + + def test_element_factory_pure_python_subclass(self): + # Mimick SimpleTAL's behaviour (issue #16089): both versions of + # TreeBuilder should be able to cope with a subclass of the + # pure Python Element class. + base = ET._Element + # Not from a C extension + self.assertEqual(base.__module__, 'xml.etree.ElementTree') + # Force some multiple inheritance with a C class to make things + # more interesting. + class MyElement(base, ValueError): + pass + self._check_element_factory_class(MyElement) + def test_doctype(self): class DoctypeParser: _doctype = None diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -303,7 +303,9 @@ self._children.insert(index, element) def _assert_is_element(self, e): - if not isinstance(e, Element): + # Need to refer to the actual Python implementation, not the + # shadowing C implementation. + if not isinstance(e, _Element): raise TypeError('expected an Element, not %s' % type(e).__name__) ## diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,9 @@ Library ------- +- Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element + element_factory (fixes a regression in SimpleTAL). + - Issue #9650: List commonly used format codes in time.strftime and time.strptime docsttings. Original patch by Mike Hoy. diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -1997,8 +1997,8 @@ PyObject *root; /* root node (first created node) */ - ElementObject *this; /* current node */ - ElementObject *last; /* most recently created node */ + PyObject *this; /* current node */ + PyObject *last; /* most recently created node */ PyObject *data; /* data collector (string or list), or NULL */ @@ -2030,9 +2030,9 @@ t->root = NULL; Py_INCREF(Py_None); - t->this = (ElementObject *)Py_None; + t->this = Py_None; Py_INCREF(Py_None); - t->last = (ElementObject *)Py_None; + t->last = Py_None; t->data = NULL; t->element_factory = NULL; @@ -2113,6 +2113,64 @@ } /* -------------------------------------------------------------------- */ +/* helpers for handling of arbitrary element-like objects */ + +static int +treebuilder_set_element_text_or_tail(PyObject *element, PyObject *data, + PyObject **dest, _Py_Identifier *name) +{ + if (Element_CheckExact(element)) { + Py_DECREF(JOIN_OBJ(*dest)); + *dest = JOIN_SET(data, PyList_CheckExact(data)); + return 0; + } + else { + PyObject *joined = list_join(data); + int r; + if (joined == NULL) + return -1; + r = _PyObject_SetAttrId(element, name, joined); + Py_DECREF(joined); + return r; + } +} + +/* These two functions steal a reference to data */ +static int +treebuilder_set_element_text(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(text); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->text, &PyId_text); +} + +static int +treebuilder_set_element_tail(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(tail); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->tail, &PyId_tail); +} + +static int +treebuilder_add_subelement(PyObject *element, PyObject *child) +{ + _Py_IDENTIFIER(append); + if (Element_CheckExact(element)) { + ElementObject *elem = (ElementObject *) element; + return element_add_subelement(elem, child); + } + else { + PyObject *res; + res = _PyObject_CallMethodId(element, &PyId_append, "O", child); + if (res == NULL) + return -1; + Py_DECREF(res); + return 0; + } +} + +/* -------------------------------------------------------------------- */ /* handlers */ LOCAL(PyObject*) @@ -2124,15 +2182,12 @@ if (self->data) { if (self->this == self->last) { - Py_DECREF(JOIN_OBJ(self->last->text)); - self->last->text = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); - } else { - Py_DECREF(JOIN_OBJ(self->last->tail)); - self->last->tail = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; + } + else { + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; } self->data = NULL; } @@ -2146,10 +2201,10 @@ return NULL; } - this = (PyObject*) self->this; + this = self->this; if (this != Py_None) { - if (element_add_subelement((ElementObject*) this, node) < 0) + if (treebuilder_add_subelement(this, node) < 0) goto error; } else { if (self->root) { @@ -2175,11 +2230,11 @@ Py_DECREF(this); Py_INCREF(node); - self->this = (ElementObject*) node; + self->this = node; Py_DECREF(self->last); Py_INCREF(node); - self->last = (ElementObject*) node; + self->last = node; if (self->start_event_obj) { PyObject* res; @@ -2203,7 +2258,7 @@ treebuilder_handle_data(TreeBuilderObject* self, PyObject* data) { if (!self->data) { - if (self->last == (ElementObject*) Py_None) { + if (self->last == Py_None) { /* ignore calls to data before the first call to start */ Py_RETURN_NONE; } @@ -2243,15 +2298,11 @@ if (self->data) { if (self->this == self->last) { - Py_DECREF(JOIN_OBJ(self->last->text)); - self->last->text = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; } else { - Py_DECREF(JOIN_OBJ(self->last->tail)); - self->last->tail = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; } self->data = NULL; } @@ -2271,8 +2322,8 @@ Py_DECREF(self->last); - self->last = (ElementObject*) self->this; - self->this = (ElementObject*) item; + self->last = self->this; + self->this = item; if (self->end_event_obj) { PyObject* res; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 20:49:10 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 20:49:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315417=3A_Add_supp?= =?utf-8?q?ort_for_csh_and_fish_in_venv_activation_scripts=2E?= Message-ID: <3XXjn21Fm2zR67@mail.python.org> http://hg.python.org/cpython/rev/c519b490f4e4 changeset: 79462:c519b490f4e4 user: Andrew Svetlov date: Thu Oct 04 21:48:58 2012 +0300 summary: Issue #15417: Add support for csh and fish in venv activation scripts. files: Doc/using/venv-create.inc | 27 +++-- Lib/venv/scripts/posix/activate.csh | 37 ++++++++ Lib/venv/scripts/posix/activate.fish | 74 ++++++++++++++++ 3 files changed, 125 insertions(+), 13 deletions(-) diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -56,20 +56,21 @@ provided path. Once a venv has been created, it can be "activated" using a script in the -venv's binary directory. The invocation of the script is platform-specific: on -a Posix platform, you would typically do:: +venv's binary directory. The invocation of the script is platform-specific: - $ source /bin/activate - -whereas on Windows, you might do:: - - C:\> /Scripts/activate - -if you are using the ``cmd.exe`` shell, or perhaps:: - - PS C:\> /Scripts/Activate.ps1 - -if you use PowerShell. ++-------------+-----------------+-----------------------------------------+ +| Platform | Shell | Command to activate virtual environment | ++=============+=================+=========================================+ +| Posix | bash/zsh | $ source /bin/activate | ++-------------+-----------------+-----------------------------------------+ +| | fish | $ . /bin/activate.fish | ++-------------+-----------------+-----------------------------------------+ +| | csh/tcsh | $ source /bin/activate.csh | ++-------------+-----------------+-----------------------------------------+ +| Windows | cmd.exe | C:\> /Scripts/activate.bat | ++-------------+-----------------+-----------------------------------------+ +| | PowerShell | PS C:\> /Scripts/Activate.ps1 | ++-------------+-----------------+-----------------------------------------+ You don't specifically *need* to activate an environment; activation just prepends the venv's binary directory to your path, so that "python" invokes the diff --git a/Lib/venv/scripts/posix/activate.csh b/Lib/venv/scripts/posix/activate.csh new file mode 100644 --- /dev/null +++ b/Lib/venv/scripts/posix/activate.csh @@ -0,0 +1,37 @@ +# This file must be used with "source bin/activate.csh" *from csh*. +# You cannot run it directly. +# Created by Davide Di Blasi . +# Ported to Python 3.3 venv by Andrew Svetlov + +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate' + +# Unset irrelavent variables. +deactivate nondestructive + +setenv VIRTUAL_ENV "__VENV_DIR__" + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/__VENV_BIN_NAME__:$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + if ("__VENV_NAME__" != "") then + set env_name = "__VENV_NAME__" + else + if (`basename "VIRTUAL_ENV"` == "__") then + # special case for Aspen magic directories + # see http://www.zetadev.com/software/aspen/ + set env_name = `basename \`dirname "$VIRTUAL_ENV"\`` + else + set env_name = `basename "$VIRTUAL_ENV"` + endif + endif + set prompt = "[$env_name] $prompt" + unset env_name +endif + +alias pydoc python -m pydoc + +rehash diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish new file mode 100644 --- /dev/null +++ b/Lib/venv/scripts/posix/activate.fish @@ -0,0 +1,74 @@ +# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org) +# you cannot run it directly + +function deactivate -d "Exit virtualenv and return to normal shell environment" + # reset old environment variables + if test -n "$_OLD_VIRTUAL_PATH" + set -gx PATH $_OLD_VIRTUAL_PATH + set -e _OLD_VIRTUAL_PATH + end + if test -n "$_OLD_VIRTUAL_PYTHONHOME" + set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME + set -e _OLD_VIRTUAL_PYTHONHOME + end + + if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + functions -e fish_prompt + set -e _OLD_FISH_PROMPT_OVERRIDE + . ( begin + printf "function fish_prompt\n\t#" + functions _old_fish_prompt + end | psub ) + functions -e _old_fish_prompt + end + + set -e VIRTUAL_ENV + if test "$argv[1]" != "nondestructive" + # Self destruct! + functions -e deactivate + end +end + +# unset irrelavent variables +deactivate nondestructive + +set -gx VIRTUAL_ENV "__VENV_DIR__" + +set -gx _OLD_VIRTUAL_PATH $PATH +set -gx PATH "$VIRTUAL_ENV/__VENV_BIN_NAME__" $PATH + +# unset PYTHONHOME if set +if set -q PYTHONHOME + set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME + set -e PYTHONHOME +end + +if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + # fish uses a function instead of an env var to generate the prompt. + + # save the current fish_prompt function as the function _old_fish_prompt + . ( begin + printf "function _old_fish_prompt\n\t#" + functions fish_prompt + end | psub ) + + # with the original prompt function renamed, we can override with our own. + function fish_prompt + # Prompt override? + if test -n "__VENV_NAME__" + printf "%s%s%s" "__VENV_NAME__" (set_color normal) (_old_fish_prompt) + return + end + # ...Otherwise, prepend env + set -l _checkbase (basename "$VIRTUAL_ENV") + if test $_checkbase = "__" + # special case for Aspen magic directories + # see http://www.zetadev.com/software/aspen/ + printf "%s[%s]%s %s" (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal) (_old_fish_prompt) + else + printf "%s(%s)%s%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal) (_old_fish_prompt) + end + end + + set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" +end -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 21:10:20 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 21:10:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2314446=3A_Remove_d?= =?utf-8?q?eprecated_tkinter_functions?= Message-ID: <3XXkFS2TsWzR72@mail.python.org> http://hg.python.org/cpython/rev/83da5729e362 changeset: 79463:83da5729e362 user: Andrew Svetlov date: Thu Oct 04 22:10:09 2012 +0300 summary: Issue #14446: Remove deprecated tkinter functions Thanks to Michael Driscoll files: Doc/library/tkinter.rst | 26 -------- Lib/tkinter/__init__.py | 39 ------------ Modules/_tkinter.c | 88 ----------------------------- 3 files changed, 0 insertions(+), 153 deletions(-) diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -750,32 +750,6 @@ displayed. You can use these :mod:`tkinter` functions to access these special points in text widgets: -.. function:: AtEnd() - refers to the last position in the text - - .. deprecated:: 3.3 - -.. function:: AtInsert() - refers to the point where the text cursor is - - .. deprecated:: 3.3 - -.. function:: AtSelFirst() - indicates the beginning point of the selected text - - .. deprecated:: 3.3 - -.. function:: AtSelLast() - denotes the last point of the selected text and finally - - .. deprecated:: 3.3 - -.. function:: At(x[, y]) - refers to the character at pixel location *x*, *y* (with *y* not used in the - case of a text entry widget, which contains a single line of text). - - .. deprecated:: 3.3 - Text widget indexes The index notation for Text widgets is very rich and is best described in the Tk man pages. diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -2146,45 +2146,6 @@ """ return self.tk.call(self._w, 'invoke') - -# Indices: -# XXX I don't like these -- take them away -def AtEnd(): - warnings.warn("tkinter.AtEnd will be removed in 3.4", - DeprecationWarning, stacklevel=2) - return 'end' - - -def AtInsert(*args): - warnings.warn("tkinter.AtInsert will be removed in 3.4", - DeprecationWarning, stacklevel=2) - s = 'insert' - for a in args: - if a: s = s + (' ' + a) - return s - - -def AtSelFirst(): - warnings.warn("tkinter.AtSelFirst will be removed in 3.4", - DeprecationWarning, stacklevel=2) - return 'sel.first' - - -def AtSelLast(): - warnings.warn("tkinter.AtSelLast will be removed in 3.4", - DeprecationWarning, stacklevel=2) - return 'sel.last' - - -def At(x, y=None): - warnings.warn("tkinter.At will be removed in 3.4", - DeprecationWarning, stacklevel=2) - if y is None: - return '@%r' % (x,) - else: - return '@%r,%r' % (x, y) - - class Canvas(Widget, XView, YView): """Canvas widget to display graphical elements like lines or text.""" def __init__(self, master=None, cnf={}, **kw): diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -1332,42 +1332,6 @@ static PyObject * -Tkapp_GlobalCall(PyObject *self, PyObject *args) -{ - /* Could do the same here as for Tkapp_Call(), but this is not used - much, so I can't be bothered. Unfortunately Tcl doesn't export a - way for the user to do what all its Global* variants do (save and - reset the scope pointer, call the local version, restore the saved - scope pointer). */ - - char *cmd; - PyObject *res = NULL; - - if (PyErr_WarnEx(PyExc_DeprecationWarning, - "globalcall is deprecated and will be removed in 3.4", - 1) < 0) - return 0; - - CHECK_TCL_APPARTMENT; - - cmd = Merge(args); - if (cmd) { - int err; - ENTER_TCL - err = Tcl_GlobalEval(Tkapp_Interp(self), cmd); - ENTER_OVERLAP - if (err == TCL_ERROR) - res = Tkinter_Error(self); - else - res = PyUnicode_FromString(Tkapp_Result(self)); - LEAVE_OVERLAP_TCL - ckfree(cmd); - } - - return res; -} - -static PyObject * Tkapp_Eval(PyObject *self, PyObject *args) { char *script; @@ -1391,34 +1355,6 @@ } static PyObject * -Tkapp_GlobalEval(PyObject *self, PyObject *args) -{ - char *script; - PyObject *res = NULL; - int err; - - if (PyErr_WarnEx(PyExc_DeprecationWarning, - "globaleval is deprecated and will be removed in 3.4", - 1) < 0) - return 0; - - if (!PyArg_ParseTuple(args, "s:globaleval", &script)) - return NULL; - - CHECK_TCL_APPARTMENT; - - ENTER_TCL - err = Tcl_GlobalEval(Tkapp_Interp(self), script); - ENTER_OVERLAP - if (err == TCL_ERROR) - res = Tkinter_Error(self); - else - res = PyUnicode_FromString(Tkapp_Result(self)); - LEAVE_OVERLAP_TCL - return res; -} - -static PyObject * Tkapp_EvalFile(PyObject *self, PyObject *args) { char *fileName; @@ -1961,27 +1897,6 @@ return v; } -static PyObject * -Tkapp_Merge(PyObject *self, PyObject *args) -{ - char *s; - PyObject *res = NULL; - - if (PyErr_WarnEx(PyExc_DeprecationWarning, - "merge is deprecated and will be removed in 3.4", - 1) < 0) - return 0; - - s = Merge(args); - - if (s) { - res = PyUnicode_FromString(s); - ckfree(s); - } - - return res; -} - /** Tcl Command **/ @@ -2695,9 +2610,7 @@ {"willdispatch", Tkapp_WillDispatch, METH_NOARGS}, {"wantobjects", Tkapp_WantObjects, METH_VARARGS}, {"call", Tkapp_Call, METH_VARARGS}, - {"globalcall", Tkapp_GlobalCall, METH_VARARGS}, {"eval", Tkapp_Eval, METH_VARARGS}, - {"globaleval", Tkapp_GlobalEval, METH_VARARGS}, {"evalfile", Tkapp_EvalFile, METH_VARARGS}, {"record", Tkapp_Record, METH_VARARGS}, {"adderrorinfo", Tkapp_AddErrorInfo, METH_VARARGS}, @@ -2716,7 +2629,6 @@ {"exprboolean", Tkapp_ExprBoolean, METH_VARARGS}, {"splitlist", Tkapp_SplitList, METH_VARARGS}, {"split", Tkapp_Split, METH_VARARGS}, - {"merge", Tkapp_Merge, METH_VARARGS}, {"createcommand", Tkapp_CreateCommand, METH_VARARGS}, {"deletecommand", Tkapp_DeleteCommand, METH_VARARGS}, #ifdef HAVE_CREATEFILEHANDLER -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 21:49:09 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 21:49:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0OTk3?= =?utf-8?q?=3A_disable_=3CF5=3E_in_idle_shell_window=2E?= Message-ID: <3XXl6F5sddzR7p@mail.python.org> http://hg.python.org/cpython/rev/f6aaac839d83 changeset: 79464:f6aaac839d83 branch: 3.2 parent: 79446:6c830b657900 user: Andrew Svetlov date: Thu Oct 04 22:48:34 2012 +0300 summary: Issue #14997: disable in idle shell window. Thanks to Roger Serwy for patch. files: Lib/idlelib/config-extensions.def | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def --- a/Lib/idlelib/config-extensions.def +++ b/Lib/idlelib/config-extensions.def @@ -46,6 +46,8 @@ [ScriptBinding] enable=1 +enable_shell=0 +enable_editor=1 [ScriptBinding_cfgBindings] run-module= check-module= -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 21:52:40 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 21:52:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge=3A_Issue_=2314997=3A_disable_=3CF5=3E_in_idle_shell_wind?= =?utf-8?b?b3cu?= Message-ID: <3XXlBJ25dlzMgy@mail.python.org> http://hg.python.org/cpython/rev/52ef53398096 changeset: 79465:52ef53398096 branch: 3.3 parent: 79460:7bd9626d8b4f parent: 79464:f6aaac839d83 user: Andrew Svetlov date: Thu Oct 04 22:50:13 2012 +0300 summary: Merge: Issue #14997: disable in idle shell window. Thanks to Roger Serwy for patch. files: Lib/idlelib/config-extensions.def | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def --- a/Lib/idlelib/config-extensions.def +++ b/Lib/idlelib/config-extensions.def @@ -46,6 +46,8 @@ [ScriptBinding] enable=1 +enable_shell=0 +enable_editor=1 [ScriptBinding_cfgBindings] run-module= check-module= -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 21:52:41 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 21:52:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Issue_=2314997=3A_disable_=3CF5=3E_in_idle_shel?= =?utf-8?q?l_window=2E?= Message-ID: <3XXlBK4NPQzR7h@mail.python.org> http://hg.python.org/cpython/rev/a40981be184d changeset: 79466:a40981be184d parent: 79463:83da5729e362 parent: 79465:52ef53398096 user: Andrew Svetlov date: Thu Oct 04 22:50:58 2012 +0300 summary: Merge: Issue #14997: disable in idle shell window. Thanks to Roger Serwy for patch. files: Lib/idlelib/config-extensions.def | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def --- a/Lib/idlelib/config-extensions.def +++ b/Lib/idlelib/config-extensions.def @@ -46,6 +46,8 @@ [ScriptBinding] enable=1 +enable_shell=0 +enable_editor=1 [ScriptBinding_cfgBindings] run-module= check-module= -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 21:52:42 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 4 Oct 2012 21:52:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0OTk3?= =?utf-8?q?=3A_disable_=3CF5=3E_in_idle_shell_window=2E?= Message-ID: <3XXlBL7485zR7x@mail.python.org> http://hg.python.org/cpython/rev/06772ba3d001 changeset: 79467:06772ba3d001 branch: 2.7 parent: 79451:d6d908dc11f2 user: Andrew Svetlov date: Thu Oct 04 22:52:07 2012 +0300 summary: Issue #14997: disable in idle shell window. Thanks to Roger Serwy for patch. files: Lib/idlelib/config-extensions.def | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def --- a/Lib/idlelib/config-extensions.def +++ b/Lib/idlelib/config-extensions.def @@ -46,6 +46,8 @@ [ScriptBinding] enable=1 +enable_shell=0 +enable_editor=1 [ScriptBinding_cfgBindings] run-module= check-module= -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 4 21:58:23 2012 From: python-checkins at python.org (victor.stinner) Date: Thu, 4 Oct 2012 21:58:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Enable_also_ptr=3D=3Dptr_o?= =?utf-8?q?ptimization_in_PyUnicode=5FCompare=28=29?= Message-ID: <3XXlJv2qfbzR7j@mail.python.org> http://hg.python.org/cpython/rev/5e0a1f116521 changeset: 79468:5e0a1f116521 parent: 79466:a40981be184d user: Victor Stinner date: Thu Oct 04 21:53:50 2012 +0200 summary: Enable also ptr==ptr optimization in PyUnicode_Compare() It was already implemented in PyUnicode_RichCompare() files: Include/unicodeobject.h | 3 ++- Objects/unicodeobject.c | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1951,7 +1951,8 @@ ); /* Compare two strings and return -1, 0, 1 for less than, equal, - greater than resp. */ + greater than resp. + Raise an exception and return -1 on error. */ PyAPI_FUNC(int) PyUnicode_Compare( PyObject *left, /* Left string */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10445,6 +10445,10 @@ void *data1, *data2; Py_ssize_t len1, len2, i; + /* a string is equal to itself */ + if (str1 == str2) + return 0; + kind1 = PyUnicode_KIND(str1); kind2 = PyUnicode_KIND(str2); data1 = PyUnicode_DATA(str1); @@ -10531,10 +10535,7 @@ return Py_True; } } - if (left == right) - result = 0; - else - result = unicode_compare(left, right); + result = unicode_compare(left, right); /* Convert the return value to a Boolean */ switch (op) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 00:00:06 2012 From: python-checkins at python.org (victor.stinner) Date: Fri, 5 Oct 2012 00:00:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Optimize_unicode=5Fcompare?= =?utf-8?q?=28=29=3A_use_memcmp=28=29_when_comparing_two_UCS1_strings?= Message-ID: <3XXp1L291ZzNZF@mail.python.org> http://hg.python.org/cpython/rev/54154be6b27d changeset: 79469:54154be6b27d user: Victor Stinner date: Thu Oct 04 22:59:45 2012 +0200 summary: Optimize unicode_compare(): use memcmp() when comparing two UCS1 strings files: Objects/unicodeobject.c | 41 ++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10443,7 +10443,8 @@ { int kind1, kind2; void *data1, *data2; - Py_ssize_t len1, len2, i; + Py_ssize_t len1, len2; + Py_ssize_t i, len; /* a string is equal to itself */ if (str1 == str2) @@ -10455,17 +10456,33 @@ data2 = PyUnicode_DATA(str2); len1 = PyUnicode_GET_LENGTH(str1); len2 = PyUnicode_GET_LENGTH(str2); - - for (i = 0; i < len1 && i < len2; ++i) { - Py_UCS4 c1, c2; - c1 = PyUnicode_READ(kind1, data1, i); - c2 = PyUnicode_READ(kind2, data2, i); - - if (c1 != c2) - return (c1 < c2) ? -1 : 1; - } - - return (len1 < len2) ? -1 : (len1 != len2); + len = Py_MIN(len1, len2); + + if (kind1 == 1 && kind2 == 1) { + int cmp = memcmp(data1, data2, len); + /* normalize result of memcmp() into the range [-1; 1] */ + if (cmp < 0) + return -1; + if (cmp > 0) + return 1; + } + else { + for (i = 0; i < len; ++i) { + Py_UCS4 c1, c2; + c1 = PyUnicode_READ(kind1, data1, i); + c2 = PyUnicode_READ(kind2, data2, i); + + if (c1 != c2) + return (c1 < c2) ? -1 : 1; + } + } + + if (len1 == len2) + return 0; + if (len1 < len2) + return -1; + else + return 1; } int -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 00:26:36 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 00:26:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Write_down_issues_documenting?= =?utf-8?q?_OS/2_and_VMS_support_removal?= Message-ID: <3XXpbw0NspzQkN@mail.python.org> http://hg.python.org/peps/rev/2d86508e8465 changeset: 4534:2d86508e8465 user: Jesus Cea date: Fri Oct 05 00:26:16 2012 +0200 summary: Write down issues documenting OS/2 and VMS support removal files: pep-0011.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0011.txt b/pep-0011.txt --- a/pep-0011.txt +++ b/pep-0011.txt @@ -199,11 +199,11 @@ | Unsupported in: Python 3.2 | Code removed in: Python 3.3 -* | Name: OS/2 +* | Name: OS/2 (issue 16135) | Unsupported in: Python 3.3 | Code removed in: Python 3.4 -* | Name: VMS +* | Name: VMS (issue 16136) | Unsupported in: Python 3.3 | Code removed in: Python 3.4 -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Fri Oct 5 00:39:30 2012 From: python-checkins at python.org (victor.stinner) Date: Fri, 5 Oct 2012 00:39:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_PyUnicode?= =?utf-8?q?=5FFormat=28=29=3A_return_NULL_if_PyUnicode=5FREADY=28uformat?= =?utf-8?q?=29_failed?= Message-ID: <3XXptp5TFbzNtj@mail.python.org> http://hg.python.org/cpython/rev/6ea8019307a9 changeset: 79470:6ea8019307a9 branch: 3.3 parent: 79465:52ef53398096 user: Victor Stinner date: Fri Oct 05 00:09:33 2012 +0200 summary: Fix PyUnicode_Format(): return NULL if PyUnicode_READY(uformat) failed This error cannot occur in practice: PyUnicode_FromObject() always return a "ready" string. files: Objects/unicodeobject.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13442,8 +13442,10 @@ uformat = PyUnicode_FromObject(format); if (uformat == NULL) return NULL; - if (PyUnicode_READY(uformat) == -1) + if (PyUnicode_READY(uformat) == -1) { Py_DECREF(uformat); + return NULL; + } fmt = PyUnicode_DATA(uformat); fmtkind = PyUnicode_KIND(uformat); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 00:41:02 2012 From: python-checkins at python.org (victor.stinner) Date: Fri, 5 Oct 2012 00:41:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_3=2E3_=28bug_already_fixed=2C_differently=2C_in_de?= =?utf-8?q?fault=29?= Message-ID: <3XXpwZ3T8RzP4k@mail.python.org> http://hg.python.org/cpython/rev/91a796832eb3 changeset: 79471:91a796832eb3 parent: 79469:54154be6b27d parent: 79470:6ea8019307a9 user: Victor Stinner date: Fri Oct 05 00:37:11 2012 +0200 summary: merge 3.3 (bug already fixed, differently, in default) files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 01:05:50 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 01:05:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28I=29?= Message-ID: <3XXqTB4xSDzNxV@mail.python.org> http://hg.python.org/cpython/rev/ffc6e6b00949 changeset: 79472:ffc6e6b00949 user: Jesus Cea date: Fri Oct 05 01:04:27 2012 +0200 summary: #16135: Removal of OS/2 support (I) files: Mac/Tools/bundlebuilder.py | 2 +- Misc/NEWS | 2 + Python/dynload_os2.c | 42 --- Python/dynload_shlib.c | 11 - Python/importdl.h | 5 - Python/thread.c | 4 - Python/thread_os2.h | 267 ------------------------- 7 files changed, 3 insertions(+), 330 deletions(-) diff --git a/Mac/Tools/bundlebuilder.py b/Mac/Tools/bundlebuilder.py --- a/Mac/Tools/bundlebuilder.py +++ b/Mac/Tools/bundlebuilder.py @@ -270,7 +270,7 @@ del __load """ -MAYMISS_MODULES = ['mac', 'os2', 'nt', 'ntpath', 'dos', 'dospath', +MAYMISS_MODULES = ['mac', 'nt', 'ntpath', 'dos', 'dospath', 'win32api', 'ce', '_winreg', 'nturl2path', 'sitecustomize', 'org.python.core', 'riscos', 'riscosenviron', 'riscospath' ] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -125,6 +125,8 @@ - Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError after 2801bf875a24 (see #15801). +- Issue #16135: Remove OS/2 support. + - Issue #15819: Make sure we can build Python out-of-tree from a readonly source directory. (Somewhat related to Issue #9860.) diff --git a/Python/dynload_os2.c b/Python/dynload_os2.c deleted file mode 100644 --- a/Python/dynload_os2.c +++ /dev/null @@ -1,42 +0,0 @@ - -/* Support for dynamic loading of extension modules */ - -#define INCL_DOSERRORS -#define INCL_DOSMODULEMGR -#include - -#include "Python.h" -#include "importdl.h" - - -const char *_PyImport_DynLoadFiletab[] = {".pyd", ".dll", NULL}; - -dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, - const char *pathname, FILE *fp) -{ - dl_funcptr p; - APIRET rc; - HMODULE hDLL; - char failreason[256]; - char funcname[258]; - - rc = DosLoadModule(failreason, - sizeof(failreason), - pathname, - &hDLL); - - if (rc != NO_ERROR) { - char errBuf[256]; - PyOS_snprintf(errBuf, sizeof(errBuf), - "DLL load failed, rc = %d: %.200s", - rc, failreason); - PyErr_SetString(PyExc_ImportError, errBuf); - return NULL; - } - - PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname); - rc = DosQueryProcAddr(hDLL, 0L, funcname, &p); - if (rc != NO_ERROR) - p = NULL; /* Signify Failure to Acquire Entrypoint */ - return p; -} diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -18,10 +18,6 @@ #ifdef HAVE_DLFCN_H #include -#else -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#include "dlfcn.h" -#endif #endif #if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__) @@ -40,10 +36,6 @@ #ifdef __CYGWIN__ ".dll", #else /* !__CYGWIN__ */ -#if defined(PYOS_OS2) && defined(PYCC_GCC) - ".pyd", - ".dll", -#else /* !(defined(PYOS_OS2) && defined(PYCC_GCC)) */ #ifdef __VMS ".exe", ".EXE", @@ -52,7 +44,6 @@ ".abi" PYTHON_ABI_STRING ".so", ".so", #endif /* __VMS */ -#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */ #endif /* __CYGWIN__ */ NULL, }; @@ -111,9 +102,7 @@ } } -#if !(defined(PYOS_OS2) && defined(PYCC_GCC)) dlopenflags = PyThreadState_GET()->interp->dlopenflags; -#endif #ifdef __VMS /* VMS currently don't allow a pathname, use a logical name instead */ diff --git a/Python/importdl.h b/Python/importdl.h --- a/Python/importdl.h +++ b/Python/importdl.h @@ -18,13 +18,8 @@ #include typedef FARPROC dl_funcptr; #else -#if defined(PYOS_OS2) && !defined(PYCC_GCC) -#include -typedef int (* APIENTRY dl_funcptr)(); -#else typedef void (*dl_funcptr)(void); #endif -#endif #ifdef __cplusplus diff --git a/Python/thread.c b/Python/thread.c --- a/Python/thread.c +++ b/Python/thread.c @@ -91,10 +91,6 @@ #include "thread_nt.h" #endif -#ifdef OS2_THREADS -#define PYTHREAD_NAME "os2" -#include "thread_os2.h" -#endif /* #ifdef FOOBAR_THREADS diff --git a/Python/thread_os2.h b/Python/thread_os2.h deleted file mode 100644 --- a/Python/thread_os2.h +++ /dev/null @@ -1,267 +0,0 @@ -/* This code implemented by cvale at netcom.com */ - -#define INCL_DOSPROCESS -#define INCL_DOSSEMAPHORES -#include "os2.h" -#include "limits.h" - -#include "process.h" - -#if defined(PYCC_GCC) -#include -#include -#else -long PyThread_get_thread_ident(void); -#endif - -/* default thread stack size of 64kB */ -#if !defined(THREAD_STACK_SIZE) -#define THREAD_STACK_SIZE 0x10000 -#endif - -#define OS2_STACKSIZE(x) (x ? x : THREAD_STACK_SIZE) - -/* - * Initialization of the C package, should not be needed. - */ -static void -PyThread__init_thread(void) -{ -} - -/* - * Thread support. - */ -long -PyThread_start_new_thread(void (*func)(void *), void *arg) -{ - int thread_id; - - thread_id = _beginthread(func, - NULL, - OS2_STACKSIZE(_pythread_stacksize), - arg); - - if (thread_id == -1) { - dprintf(("_beginthread failed. return %ld\n", errno)); - } - - return thread_id; -} - -long -PyThread_get_thread_ident(void) -{ -#if !defined(PYCC_GCC) - PPIB pib; - PTIB tib; -#endif - - if (!initialized) - PyThread_init_thread(); - -#if defined(PYCC_GCC) - return _gettid(); -#else - DosGetInfoBlocks(&tib, &pib); - return tib->tib_ptib2->tib2_ultid; -#endif -} - -void -PyThread_exit_thread(void) -{ - dprintf(("%ld: PyThread_exit_thread called\n", - PyThread_get_thread_ident())); - if (!initialized) - exit(0); - _endthread(); -} - -/* - * Lock support. This is implemented with an event semaphore and critical - * sections to make it behave more like a posix mutex than its OS/2 - * counterparts. - */ - -typedef struct os2_lock_t { - int is_set; - HEV changed; -} *type_os2_lock; - -PyThread_type_lock -PyThread_allocate_lock(void) -{ -#if defined(PYCC_GCC) - _fmutex *sem = malloc(sizeof(_fmutex)); - if (!initialized) - PyThread_init_thread(); - dprintf(("%ld: PyThread_allocate_lock() -> %lx\n", - PyThread_get_thread_ident(), - (long)sem)); - if (_fmutex_create(sem, 0)) { - free(sem); - sem = NULL; - } - return (PyThread_type_lock)sem; -#else - APIRET rc; - type_os2_lock lock = (type_os2_lock)malloc(sizeof(struct os2_lock_t)); - - dprintf(("PyThread_allocate_lock called\n")); - if (!initialized) - PyThread_init_thread(); - - lock->is_set = 0; - - DosCreateEventSem(NULL, &lock->changed, 0, 0); - - dprintf(("%ld: PyThread_allocate_lock() -> %p\n", - PyThread_get_thread_ident(), - lock->changed)); - - return (PyThread_type_lock)lock; -#endif -} - -void -PyThread_free_lock(PyThread_type_lock aLock) -{ -#if !defined(PYCC_GCC) - type_os2_lock lock = (type_os2_lock)aLock; -#endif - - dprintf(("%ld: PyThread_free_lock(%p) called\n", - PyThread_get_thread_ident(),aLock)); - -#if defined(PYCC_GCC) - if (aLock) { - _fmutex_close((_fmutex *)aLock); - free((_fmutex *)aLock); - } -#else - DosCloseEventSem(lock->changed); - free(aLock); -#endif -} - -/* - * Return 1 on success if the lock was acquired - * - * and 0 if the lock was not acquired. - */ -int -PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag) -{ -#if !defined(PYCC_GCC) - int done = 0; - ULONG count; - PID pid = 0; - TID tid = 0; - type_os2_lock lock = (type_os2_lock)aLock; -#endif - - dprintf(("%ld: PyThread_acquire_lock(%p, %d) called\n", - PyThread_get_thread_ident(), - aLock, - waitflag)); - -#if defined(PYCC_GCC) - /* always successful if the lock doesn't exist */ - if (aLock && - _fmutex_request((_fmutex *)aLock, waitflag ? 0 : _FMR_NOWAIT)) - return 0; -#else - while (!done) { - /* if the lock is currently set, we have to wait for - * the state to change - */ - if (lock->is_set) { - if (!waitflag) - return 0; - DosWaitEventSem(lock->changed, SEM_INDEFINITE_WAIT); - } - - /* enter a critical section and try to get the semaphore. If - * it is still locked, we will try again. - */ - if (DosEnterCritSec()) - return 0; - - if (!lock->is_set) { - lock->is_set = 1; - DosResetEventSem(lock->changed, &count); - done = 1; - } - - DosExitCritSec(); - } -#endif - - return 1; -} - -void -PyThread_release_lock(PyThread_type_lock aLock) -{ -#if !defined(PYCC_GCC) - type_os2_lock lock = (type_os2_lock)aLock; -#endif - - dprintf(("%ld: PyThread_release_lock(%p) called\n", - PyThread_get_thread_ident(), - aLock)); - -#if defined(PYCC_GCC) - if (aLock) - _fmutex_release((_fmutex *)aLock); -#else - if (!lock->is_set) { - dprintf(("%ld: Could not PyThread_release_lock(%p) error: %l\n", - PyThread_get_thread_ident(), - aLock, - GetLastError())); - return; - } - - if (DosEnterCritSec()) { - dprintf(("%ld: Could not PyThread_release_lock(%p) error: %l\n", - PyThread_get_thread_ident(), - aLock, - GetLastError())); - return; - } - - lock->is_set = 0; - DosPostEventSem(lock->changed); - - DosExitCritSec(); -#endif -} - -/* minimum/maximum thread stack sizes supported */ -#define THREAD_MIN_STACKSIZE 0x8000 /* 32kB */ -#define THREAD_MAX_STACKSIZE 0x2000000 /* 32MB */ - -/* set the thread stack size. - * Return 0 if size is valid, -1 otherwise. - */ -static int -_pythread_os2_set_stacksize(size_t size) -{ - /* set to default */ - if (size == 0) { - _pythread_stacksize = 0; - return 0; - } - - /* valid range? */ - if (size >= THREAD_MIN_STACKSIZE && size < THREAD_MAX_STACKSIZE) { - _pythread_stacksize = size; - return 0; - } - - return -1; -} - -#define THREAD_SET_STACKSIZE(x) _pythread_os2_set_stacksize(x) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 01:11:24 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 01:11:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28Docs=29?= Message-ID: <3XXqbc1GYgzLyL@mail.python.org> http://hg.python.org/cpython/rev/b08416a31d15 changeset: 79473:b08416a31d15 user: Jesus Cea date: Fri Oct 05 01:11:10 2012 +0200 summary: #16135: Removal of OS/2 support (Docs) files: Doc/library/os.path.rst | 1 - Doc/library/os.rst | 2 +- Doc/library/sys.rst | 3 --- Doc/library/sysconfig.rst | 2 -- 4 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -37,7 +37,6 @@ * :mod:`posixpath` for UNIX-style paths * :mod:`ntpath` for Windows paths * :mod:`macpath` for old-style MacOS paths - * :mod:`os2emxpath` for OS/2 EMX paths .. function:: abspath(path) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -54,7 +54,7 @@ The name of the operating system dependent module imported. The following names have currently been registered: ``'posix'``, ``'nt'``, ``'mac'``, - ``'os2'``, ``'ce'``, ``'java'``. + ``'ce'``, ``'java'``. .. seealso:: :attr:`sys.platform` has a finer granularity. :func:`os.uname` gives diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -837,8 +837,6 @@ Windows ``'win32'`` Windows/Cygwin ``'cygwin'`` Mac OS X ``'darwin'`` - OS/2 ``'os2'`` - OS/2 EMX ``'os2emx'`` ================ =========================== .. versionchanged:: 3.3 @@ -1117,7 +1115,6 @@ | :const:`name` | Name of the thread implementation: | | | | | | * ``'nt'``: Windows threads | - | | * ``'os2'``: OS/2 threads | | | * ``'pthread'``: POSIX threads | | | * ``'solaris'``: Solaris threads | +------------------+---------------------------------------------------------+ diff --git a/Doc/library/sysconfig.rst b/Doc/library/sysconfig.rst --- a/Doc/library/sysconfig.rst +++ b/Doc/library/sysconfig.rst @@ -83,8 +83,6 @@ located under the user home directory. - *nt*: scheme for NT platforms like Windows. - *nt_user*: scheme for NT platforms, when the *user* option is used. -- *os2*: scheme for OS/2 platforms. -- *os2_home*: scheme for OS/2 patforms, when the *user* option is used. Each scheme is itself composed of a series of paths and each path has a unique identifier. Python currently uses eight paths: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 01:48:24 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 01:48:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28posixmodule_y_platform_dependent_files=29?= Message-ID: <3XXrQJ390szP3V@mail.python.org> http://hg.python.org/cpython/rev/29155fa21a41 changeset: 79474:29155fa21a41 user: Jesus Cea date: Fri Oct 05 01:48:08 2012 +0200 summary: #16135: Removal of OS/2 support (posixmodule y platform dependent files) files: Modules/main.c | 6 +- Modules/posixmodule.c | 554 +--------- PC/os2emx/Makefile | 672 ----------- PC/os2emx/README.os2emx | 663 ----------- PC/os2emx/config.c | 164 -- PC/os2emx/dlfcn.c | 223 --- PC/os2emx/dlfcn.h | 51 - PC/os2emx/dllentry.c | 42 - PC/os2emx/getpathp.c | 418 ------- PC/os2emx/pyconfig.h | 332 ----- PC/os2emx/python34.def | 1314 ---------------------- PC/os2emx/pythonpm.c | 124 -- PC/os2vacpp/_tkinter.def | 8 - PC/os2vacpp/config.c | 99 - PC/os2vacpp/getpathp.c | 482 -------- PC/os2vacpp/makefile | 1549 -------------------------- PC/os2vacpp/makefile.omk | 1047 ----------------- PC/os2vacpp/pyconfig.h | 212 --- PC/os2vacpp/python.def | 479 -------- PC/os2vacpp/readme.txt | 114 - 20 files changed, 9 insertions(+), 8544 deletions(-) diff --git a/Modules/main.c b/Modules/main.c --- a/Modules/main.c +++ b/Modules/main.c @@ -22,15 +22,11 @@ #include #endif -#if (defined(PYOS_OS2) && !defined(PYCC_GCC)) || defined(MS_WINDOWS) +#if defined(MS_WINDOWS) #define PYTHONHOMEHELP "\\lib" #else -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#define PYTHONHOMEHELP "/Lib" -#else #define PYTHONHOMEHELP "/pythonX.X" #endif -#endif #include "pygetopt.h" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1,15 +1,12 @@ /* POSIX module implementation */ -/* This file is also used for Windows NT/MS-Win and OS/2. In that case the - module actually calls itself 'nt' or 'os2', not 'posix', and a few +/* This file is also used for Windows NT/MS-Win. In that case the + module actually calls itself 'nt', not 'posix', and a few functions are either unimplemented or implemented differently. The source assumes that for Windows NT, the macro 'MS_WINDOWS' is defined independent of the compiler used. Different compilers define their own feature - test macro, e.g. '__BORLANDC__' or '_MSC_VER'. For OS/2, the compiler - independent macro PYOS_OS2 should be defined. On OS/2 the default - compiler is assumed to be IBM's VisualAge C++ (VACPP). PYCC_GCC is used - as the compiler specific macro for the EMX port of gcc to OS/2. */ + test macro, e.g. '__BORLANDC__' or '_MSC_VER'. */ #ifdef __APPLE__ /* @@ -43,22 +40,6 @@ corresponding Unix manual entries for more information on calls."); -#if defined(PYOS_OS2) -#error "PEP 11: OS/2 is now unsupported, code will be removed in Python 3.4" -#define INCL_DOS -#define INCL_DOSERRORS -#define INCL_DOSPROCESS -#define INCL_NOPMAPI -#include -#if defined(PYCC_GCC) -#include -#include -#include -#include -#endif -#include "osdefs.h" -#endif - #ifdef HAVE_SYS_UIO_H #include #endif @@ -143,17 +124,10 @@ /* Various compilers have only certain posix functions */ /* XXX Gosh I wish these were all moved into pyconfig.h */ -#if defined(PYCC_VACPP) && defined(PYOS_OS2) -#include -#else #if defined(__WATCOMC__) && !defined(__QNX__) /* Watcom compiler */ #define HAVE_GETCWD 1 #define HAVE_OPENDIR 1 #define HAVE_SYSTEM 1 -#if defined(__OS2__) -#define HAVE_EXECV 1 -#define HAVE_WAIT 1 -#endif #include #else #ifdef __BORLANDC__ /* Borland compiler */ @@ -176,8 +150,8 @@ #define HAVE_FSYNC 1 #define fsync _commit #else -#if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS) -/* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */ +#if defined(__VMS) +/* Everything needed is defined in vms/pyconfig.h */ #else /* all other compilers */ /* Unix functions that the configure script doesn't check for */ #define HAVE_EXECV 1 @@ -197,11 +171,10 @@ #define HAVE_SYSTEM 1 #define HAVE_WAIT 1 #define HAVE_TTYNAME 1 -#endif /* PYOS_OS2 && PYCC_GCC && __VMS */ +#endif /* __VMS */ #endif /* _MSC_VER */ #endif /* __BORLANDC__ */ #endif /* ! __WATCOMC__ || __QNX__ */ -#endif /* ! __IBMC__ */ @@ -332,10 +305,6 @@ #endif #endif /* _MSC_VER */ -#if defined(PYCC_VACPP) && defined(PYOS_OS2) -#include -#endif /* OS2 */ - #ifndef MAXPATHLEN #if defined(PATH_MAX) && PATH_MAX > 1024 #define MAXPATHLEN PATH_MAX @@ -970,10 +939,6 @@ #else char **e; #endif -#if defined(PYOS_OS2) - APIRET rc; - char buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */ -#endif d = PyDict_New(); if (d == NULL) @@ -1042,20 +1007,6 @@ Py_DECREF(v); } #endif -#if defined(PYOS_OS2) - rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH); - if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */ - PyObject *v = PyBytes_FromString(buffer); - PyDict_SetItemString(d, "BEGINLIBPATH", v); - Py_DECREF(v); - } - rc = DosQueryExtLIBPATH(buffer, END_LIBPATH); - if (rc == NO_ERROR) { /* (not a typo, envname is NOT 'END_LIBPATH') */ - PyObject *v = PyBytes_FromString(buffer); - PyDict_SetItemString(d, "ENDLIBPATH", v); - Py_DECREF(v); - } -#endif return d; } @@ -1155,83 +1106,6 @@ #endif } -#if defined(PYOS_OS2) -/********************************************************************** - * Helper Function to Trim and Format OS/2 Messages - **********************************************************************/ -static void -os2_formatmsg(char *msgbuf, int msglen, char *reason) -{ - msgbuf[msglen] = '\0'; /* OS/2 Doesn't Guarantee a Terminator */ - - if (strlen(msgbuf) > 0) { /* If Non-Empty Msg, Trim CRLF */ - char *lastc = &msgbuf[ strlen(msgbuf)-1 ]; - - while (lastc > msgbuf && isspace(Py_CHARMASK(*lastc))) - *lastc-- = '\0'; /* Trim Trailing Whitespace (CRLF) */ - } - - /* Add Optional Reason Text */ - if (reason) { - strcat(msgbuf, " : "); - strcat(msgbuf, reason); - } -} - -/********************************************************************** - * Decode an OS/2 Operating System Error Code - * - * A convenience function to lookup an OS/2 error code and return a - * text message we can use to raise a Python exception. - * - * Notes: - * The messages for errors returned from the OS/2 kernel reside in - * the file OSO001.MSG in the \OS2 directory hierarchy. - * - **********************************************************************/ -static char * -os2_strerror(char *msgbuf, int msgbuflen, int errorcode, char *reason) -{ - APIRET rc; - ULONG msglen; - - /* Retrieve Kernel-Related Error Message from OSO001.MSG File */ - Py_BEGIN_ALLOW_THREADS - rc = DosGetMessage(NULL, 0, msgbuf, msgbuflen, - errorcode, "oso001.msg", &msglen); - Py_END_ALLOW_THREADS - - if (rc == NO_ERROR) - os2_formatmsg(msgbuf, msglen, reason); - else - PyOS_snprintf(msgbuf, msgbuflen, - "unknown OS error #%d", errorcode); - - return msgbuf; -} - -/* Set an OS/2-specific error and return NULL. OS/2 kernel - errors are not in a global variable e.g. 'errno' nor are - they congruent with posix error numbers. */ - -static PyObject * -os2_error(int code) -{ - char text[1024]; - PyObject *v; - - os2_strerror(text, sizeof(text), code, ""); - - v = Py_BuildValue("(is)", code, text); - if (v != NULL) { - PyErr_SetObject(PyExc_OSError, v); - Py_DECREF(v); - } - return NULL; /* Signal to Python that an Exception is Pending */ -} - -#endif /* OS2 */ - /* POSIX generic methods */ static PyObject * @@ -2569,8 +2443,6 @@ else result = win32_chdir(path.narrow); result = !result; /* on unix, success = 0, on windows, success = !0 */ -#elif defined(PYOS_OS2) && defined(PYCC_GCC) - result = _chdir2(path.narrow); #else #ifdef HAVE_FCHDIR if (path.fd != -1) @@ -3145,11 +3017,7 @@ #endif Py_BEGIN_ALLOW_THREADS -#if defined(PYOS_OS2) && defined(PYCC_GCC) - res = _getcwd2(buf, sizeof buf); -#else res = getcwd(buf, sizeof buf); -#endif Py_END_ALLOW_THREADS if (res == NULL) return posix_error(); @@ -3313,17 +3181,6 @@ Py_ssize_t len = sizeof(namebuf)-5; PyObject *po = NULL; wchar_t *wnamebuf = NULL; -#elif defined(PYOS_OS2) -#ifndef MAX_PATH -#define MAX_PATH CCHMAXPATH -#endif - char *pt; - PyObject *v; - char namebuf[MAX_PATH+5]; - HDIR hdir = 1; - ULONG srchcnt = 1; - FILEFINDBUF3 ep; - APIRET rc; #else PyObject *v; DIR *dirp = NULL; @@ -3485,68 +3342,6 @@ return list; -#elif defined(PYOS_OS2) - if (path.length >= MAX_PATH) { - PyErr_SetString(PyExc_ValueError, "path too long"); - goto exit; - } - strcpy(namebuf, path.narrow); - for (pt = namebuf; *pt; pt++) - if (*pt == ALTSEP) - *pt = SEP; - if (namebuf[len-1] != SEP) - namebuf[len++] = SEP; - strcpy(namebuf + len, "*.*"); - - if ((list = PyList_New(0)) == NULL) { - goto exit; - } - - rc = DosFindFirst(namebuf, /* Wildcard Pattern to Match */ - &hdir, /* Handle to Use While Search Directory */ - FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY, - &ep, sizeof(ep), /* Structure to Receive Directory Entry */ - &srchcnt, /* Max and Actual Count of Entries Per Iteration */ - FIL_STANDARD); /* Format of Entry (EAs or Not) */ - - if (rc != NO_ERROR) { - errno = ENOENT; - Py_DECREF(list); - list = posix_error_with_filename(path.narrow); - goto exit; - } - - if (srchcnt > 0) { /* If Directory is NOT Totally Empty, */ - do { - if (ep.achName[0] == '.' - && (ep.achName[1] == '\0' || (ep.achName[1] == '.' && ep.achName[2] == '\0'))) - continue; /* Skip Over "." and ".." Names */ - - strcpy(namebuf, ep.achName); - - /* Leave Case of Name Alone -- In Native Form */ - /* (Removed Forced Lowercasing Code) */ - - v = PyBytes_FromString(namebuf); - if (v == NULL) { - Py_DECREF(list); - list = NULL; - break; - } - if (PyList_Append(list, v) != 0) { - Py_DECREF(v); - Py_DECREF(list); - list = NULL; - break; - } - Py_DECREF(v); - } while (DosFindNext(hdir, &ep, sizeof(ep), &srchcnt) == NO_ERROR && srchcnt > 0); - } - -exit: - path_cleanup(&path); - - return list; #else errno = 0; @@ -4852,10 +4647,6 @@ goto error; } -#if defined(PYOS_OS2) - /* Omit Pseudo-Env Vars that Would Confuse Programs if Passed On */ - if (stricmp(k, "BEGINLIBPATH") != 0 && stricmp(k, "ENDLIBPATH") != 0) { -#endif k = PyBytes_AsString(key2); v = PyBytes_AsString(val2); len = PyBytes_GET_SIZE(key2) + PyBytes_GET_SIZE(val2) + 2; @@ -4871,9 +4662,6 @@ envlist[envc++] = p; Py_DECREF(key2); Py_DECREF(val2); -#if defined(PYOS_OS2) - } -#endif } Py_DECREF(vals); Py_DECREF(keys); @@ -5114,18 +4902,12 @@ } argvlist[argc] = NULL; -#if defined(PYOS_OS2) && defined(PYCC_GCC) - Py_BEGIN_ALLOW_THREADS - spawnval = spawnv(mode, path, argvlist); - Py_END_ALLOW_THREADS -#else if (mode == _OLD_P_OVERLAY) mode = _P_OVERLAY; Py_BEGIN_ALLOW_THREADS spawnval = _spawnv(mode, path, argvlist); Py_END_ALLOW_THREADS -#endif free_string_array(argvlist, argc); Py_DECREF(opath); @@ -5213,18 +4995,12 @@ if (envlist == NULL) goto fail_1; -#if defined(PYOS_OS2) && defined(PYCC_GCC) - Py_BEGIN_ALLOW_THREADS - spawnval = spawnve(mode, path, argvlist, envlist); - Py_END_ALLOW_THREADS -#else if (mode == _OLD_P_OVERLAY) mode = _P_OVERLAY; Py_BEGIN_ALLOW_THREADS spawnval = _spawnve(mode, path, argvlist, envlist); Py_END_ALLOW_THREADS -#endif if (spawnval == -1) (void) posix_error(); @@ -5245,183 +5021,6 @@ return res; } -/* OS/2 supports spawnvp & spawnvpe natively */ -#if defined(PYOS_OS2) -PyDoc_STRVAR(posix_spawnvp__doc__, -"spawnvp(mode, file, args)\n\n\ -Execute the program 'file' in a new process, using the environment\n\ -search path to find the file.\n\ -\n\ - mode: mode of process creation\n\ - file: executable file name\n\ - args: tuple or list of strings"); - -static PyObject * -posix_spawnvp(PyObject *self, PyObject *args) -{ - PyObject *opath; - char *path; - PyObject *argv; - char **argvlist; - int mode, i, argc; - Py_intptr_t spawnval; - PyObject *(*getitem)(PyObject *, Py_ssize_t); - - /* spawnvp has three arguments: (mode, path, argv), where - argv is a list or tuple of strings. */ - - if (!PyArg_ParseTuple(args, "iO&O:spawnvp", &mode, - PyUnicode_FSConverter, - &opath, &argv)) - return NULL; - path = PyBytes_AsString(opath); - if (PyList_Check(argv)) { - argc = PyList_Size(argv); - getitem = PyList_GetItem; - } - else if (PyTuple_Check(argv)) { - argc = PyTuple_Size(argv); - getitem = PyTuple_GetItem; - } - else { - PyErr_SetString(PyExc_TypeError, - "spawnvp() arg 2 must be a tuple or list"); - Py_DECREF(opath); - return NULL; - } - - argvlist = PyMem_NEW(char *, argc+1); - if (argvlist == NULL) { - Py_DECREF(opath); - return PyErr_NoMemory(); - } - for (i = 0; i < argc; i++) { - if (!fsconvert_strdup((*getitem)(argv, i), - &argvlist[i])) { - free_string_array(argvlist, i); - PyErr_SetString( - PyExc_TypeError, - "spawnvp() arg 2 must contain only strings"); - Py_DECREF(opath); - return NULL; - } - } - argvlist[argc] = NULL; - - Py_BEGIN_ALLOW_THREADS -#if defined(PYCC_GCC) - spawnval = spawnvp(mode, path, argvlist); -#else - spawnval = _spawnvp(mode, path, argvlist); -#endif - Py_END_ALLOW_THREADS - - free_string_array(argvlist, argc); - Py_DECREF(opath); - - if (spawnval == -1) - return posix_error(); - else - return Py_BuildValue("l", (long) spawnval); -} - - -PyDoc_STRVAR(posix_spawnvpe__doc__, -"spawnvpe(mode, file, args, env)\n\n\ -Execute the program 'file' in a new process, using the environment\n\ -search path to find the file.\n\ -\n\ - mode: mode of process creation\n\ - file: executable file name\n\ - args: tuple or list of arguments\n\ - env: dictionary of strings mapping to strings"); - -static PyObject * -posix_spawnvpe(PyObject *self, PyObject *args) -{ - PyObject *opath; - char *path; - PyObject *argv, *env; - char **argvlist; - char **envlist; - PyObject *res=NULL; - int mode; - Py_ssize_t argc, i, envc; - Py_intptr_t spawnval; - PyObject *(*getitem)(PyObject *, Py_ssize_t); - int lastarg = 0; - - /* spawnvpe has four arguments: (mode, path, argv, env), where - argv is a list or tuple of strings and env is a dictionary - like posix.environ. */ - - if (!PyArg_ParseTuple(args, "ietOO:spawnvpe", &mode, - PyUnicode_FSConverter, - &opath, &argv, &env)) - return NULL; - path = PyBytes_AsString(opath); - if (PyList_Check(argv)) { - argc = PyList_Size(argv); - getitem = PyList_GetItem; - } - else if (PyTuple_Check(argv)) { - argc = PyTuple_Size(argv); - getitem = PyTuple_GetItem; - } - else { - PyErr_SetString(PyExc_TypeError, - "spawnvpe() arg 2 must be a tuple or list"); - goto fail_0; - } - if (!PyMapping_Check(env)) { - PyErr_SetString(PyExc_TypeError, - "spawnvpe() arg 3 must be a mapping object"); - goto fail_0; - } - - argvlist = PyMem_NEW(char *, argc+1); - if (argvlist == NULL) { - PyErr_NoMemory(); - goto fail_0; - } - for (i = 0; i < argc; i++) { - if (!fsconvert_strdup((*getitem)(argv, i), - &argvlist[i])) - { - lastarg = i; - goto fail_1; - } - } - lastarg = argc; - argvlist[argc] = NULL; - - envlist = parse_envlist(env, &envc); - if (envlist == NULL) - goto fail_1; - - Py_BEGIN_ALLOW_THREADS -#if defined(PYCC_GCC) - spawnval = spawnvpe(mode, path, argvlist, envlist); -#else - spawnval = _spawnvpe(mode, path, argvlist, envlist); -#endif - Py_END_ALLOW_THREADS - - if (spawnval == -1) - (void) posix_error(); - else - res = Py_BuildValue("l", (long) spawnval); - - while (--envc >= 0) - PyMem_DEL(envlist[envc]); - PyMem_DEL(envlist); - fail_1: - free_string_array(argvlist, lastarg); - fail_0: - Py_DECREF(opath); - return res; -} -#endif /* PYOS_OS2 */ #endif /* HAVE_SPAWNV */ @@ -6420,23 +6019,8 @@ int sig; if (!PyArg_ParseTuple(args, _Py_PARSE_PID "i:kill", &pid, &sig)) return NULL; -#if defined(PYOS_OS2) && !defined(PYCC_GCC) - if (sig == XCPT_SIGNAL_INTR || sig == XCPT_SIGNAL_BREAK) { - APIRET rc; - if ((rc = DosSendSignalException(pid, sig)) != NO_ERROR) - return os2_error(rc); - - } else if (sig == XCPT_SIGNAL_KILLPROC) { - APIRET rc; - if ((rc = DosKillProcess(DKP_PROCESS, pid)) != NO_ERROR) - return os2_error(rc); - - } else - return NULL; /* Unrecognized Signal Requested */ -#else if (kill(pid, sig) == -1) return posix_error(); -#endif Py_INCREF(Py_None); return Py_None; } @@ -7333,31 +6917,7 @@ times. The object behaves like a named tuple with these fields:\n\ (utime, stime, cutime, cstime, elapsed_time)"); -#if defined(PYCC_VACPP) && defined(PYOS_OS2) -static long -system_uptime(void) -{ - ULONG value = 0; - - Py_BEGIN_ALLOW_THREADS - DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &value, sizeof(value)); - Py_END_ALLOW_THREADS - - return value; -} - -static PyObject * -posix_times(PyObject *self, PyObject *noargs) -{ - /* Currently Only Uptime is Provided -- Others Later */ - return build_times_result( - (double)0 /* t.tms_utime / HZ */, - (double)0 /* t.tms_stime / HZ */, - (double)0 /* t.tms_cutime / HZ */, - (double)0 /* t.tms_cstime / HZ */, - (double)system_uptime() / 1000); -} -#elif defined(MS_WINDOWS) +#if defined(MS_WINDOWS) static PyObject * posix_times(PyObject *self, PyObject *noargs) { @@ -7379,7 +6939,7 @@ (double)0, (double)0); } -#else /* Neither Windows nor OS/2 */ +#else /* Not Windows */ #define NEED_TICKS_PER_SECOND static long ticks_per_second = -1; static PyObject * @@ -8123,16 +7683,6 @@ static PyObject * posix_pipe(PyObject *self, PyObject *noargs) { -#if defined(PYOS_OS2) - HFILE read, write; - APIRET rc; - - rc = DosCreatePipe( &read, &write, 4096); - if (rc != NO_ERROR) - return os2_error(rc); - - return Py_BuildValue("(ii)", read, write); -#else #if !defined(MS_WINDOWS) int fds[2]; int res; @@ -8151,7 +7701,6 @@ write_fd = _open_osfhandle((Py_intptr_t)write, 1); return Py_BuildValue("(ii)", read_fd, write_fd); #endif /* MS_WINDOWS */ -#endif } #endif /* HAVE_PIPE */ @@ -10825,10 +10374,6 @@ #ifdef HAVE_SPAWNV {"spawnv", posix_spawnv, METH_VARARGS, posix_spawnv__doc__}, {"spawnve", posix_spawnve, METH_VARARGS, posix_spawnve__doc__}, -#if defined(PYOS_OS2) - {"spawnvp", posix_spawnvp, METH_VARARGS, posix_spawnvp__doc__}, - {"spawnvpe", posix_spawnvpe, METH_VARARGS, posix_spawnvpe__doc__}, -#endif /* PYOS_OS2 */ #endif /* HAVE_SPAWNV */ #ifdef HAVE_FORK1 {"fork1", posix_fork1, METH_NOARGS, posix_fork1__doc__}, @@ -11155,59 +10700,6 @@ return PyModule_AddIntConstant(module, symbol, value); } -#if defined(PYOS_OS2) -/* Insert Platform-Specific Constant Values (Strings & Numbers) of Common Use */ -static int insertvalues(PyObject *module) -{ - APIRET rc; - ULONG values[QSV_MAX+1]; - PyObject *v; - char *ver, tmp[50]; - - Py_BEGIN_ALLOW_THREADS - rc = DosQuerySysInfo(1L, QSV_MAX, &values[1], sizeof(ULONG) * QSV_MAX); - Py_END_ALLOW_THREADS - - if (rc != NO_ERROR) { - os2_error(rc); - return -1; - } - - if (ins(module, "meminstalled", values[QSV_TOTPHYSMEM])) return -1; - if (ins(module, "memkernel", values[QSV_TOTRESMEM])) return -1; - if (ins(module, "memvirtual", values[QSV_TOTAVAILMEM])) return -1; - if (ins(module, "maxpathlen", values[QSV_MAX_PATH_LENGTH])) return -1; - if (ins(module, "maxnamelen", values[QSV_MAX_COMP_LENGTH])) return -1; - if (ins(module, "revision", values[QSV_VERSION_REVISION])) return -1; - if (ins(module, "timeslice", values[QSV_MIN_SLICE])) return -1; - - switch (values[QSV_VERSION_MINOR]) { - case 0: ver = "2.00"; break; - case 10: ver = "2.10"; break; - case 11: ver = "2.11"; break; - case 30: ver = "3.00"; break; - case 40: ver = "4.00"; break; - case 50: ver = "5.00"; break; - default: - PyOS_snprintf(tmp, sizeof(tmp), - "%d-%d", values[QSV_VERSION_MAJOR], - values[QSV_VERSION_MINOR]); - ver = &tmp[0]; - } - - /* Add Indicator of the Version of the Operating System */ - if (PyModule_AddStringConstant(module, "version", tmp) < 0) - return -1; - - /* Add Indicator of Which Drive was Used to Boot the System */ - tmp[0] = 'A' + values[QSV_BOOT_DRIVE] - 1; - tmp[1] = ':'; - tmp[2] = '\0'; - - return PyModule_AddStringConstant(module, "bootdrive", tmp); -} -#endif - #if defined(HAVE_SYMLINK) && defined(MS_WINDOWS) static int enable_symlink() @@ -11542,35 +11034,12 @@ #endif #ifdef HAVE_SPAWNV -#if defined(PYOS_OS2) && defined(PYCC_GCC) - if (ins(d, "P_WAIT", (long)P_WAIT)) return -1; - if (ins(d, "P_NOWAIT", (long)P_NOWAIT)) return -1; - if (ins(d, "P_OVERLAY", (long)P_OVERLAY)) return -1; - if (ins(d, "P_DEBUG", (long)P_DEBUG)) return -1; - if (ins(d, "P_SESSION", (long)P_SESSION)) return -1; - if (ins(d, "P_DETACH", (long)P_DETACH)) return -1; - if (ins(d, "P_PM", (long)P_PM)) return -1; - if (ins(d, "P_DEFAULT", (long)P_DEFAULT)) return -1; - if (ins(d, "P_MINIMIZE", (long)P_MINIMIZE)) return -1; - if (ins(d, "P_MAXIMIZE", (long)P_MAXIMIZE)) return -1; - if (ins(d, "P_FULLSCREEN", (long)P_FULLSCREEN)) return -1; - if (ins(d, "P_WINDOWED", (long)P_WINDOWED)) return -1; - if (ins(d, "P_FOREGROUND", (long)P_FOREGROUND)) return -1; - if (ins(d, "P_BACKGROUND", (long)P_BACKGROUND)) return -1; - if (ins(d, "P_NOCLOSE", (long)P_NOCLOSE)) return -1; - if (ins(d, "P_NOSESSION", (long)P_NOSESSION)) return -1; - if (ins(d, "P_QUOTE", (long)P_QUOTE)) return -1; - if (ins(d, "P_TILDE", (long)P_TILDE)) return -1; - if (ins(d, "P_UNRELATED", (long)P_UNRELATED)) return -1; - if (ins(d, "P_DEBUGDESC", (long)P_DEBUGDESC)) return -1; -#else if (ins(d, "P_WAIT", (long)_P_WAIT)) return -1; if (ins(d, "P_NOWAIT", (long)_P_NOWAIT)) return -1; if (ins(d, "P_OVERLAY", (long)_OLD_P_OVERLAY)) return -1; if (ins(d, "P_NOWAITO", (long)_P_NOWAITO)) return -1; if (ins(d, "P_DETACH", (long)_P_DETACH)) return -1; #endif -#endif #ifdef HAVE_SCHED_H if (ins(d, "SCHED_OTHER", (long)SCHED_OTHER)) return -1; @@ -11630,9 +11099,6 @@ if (PyModule_AddIntMacro(d, RTLD_DEEPBIND)) return -1; #endif -#if defined(PYOS_OS2) - if (insertvalues(d)) return -1; -#endif return 0; } @@ -11641,10 +11107,6 @@ #define INITFUNC PyInit_nt #define MODNAME "nt" -#elif defined(PYOS_OS2) -#define INITFUNC PyInit_os2 -#define MODNAME "os2" - #else #define INITFUNC PyInit_posix #define MODNAME "posix" diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile deleted file mode 100644 --- a/PC/os2emx/Makefile +++ /dev/null @@ -1,672 +0,0 @@ -#####################==================---------------- -# -# Top-Level Makefile for Building Python 2.6 for OS/2 using GCC/EMX -# Originally written by Andrew Zabolotny, for Python 1.5.2 -# Modified by Andrew MacIntyre, for Python 2.6 -# -# This makefile was developed for use with [P]GCC/EMX compiler any -# version and GNU Make. -# -# The output of the build is a largish Python26.DLL containing the -# essential modules of Python and a small Python.exe program to start -# the interpreter. When embedding Python within another program, only -# Python26.DLL is needed. We also build python_s.a static library (which -# can be converted into OMF (.lib) format using emxomf tool) and both -# python.a and python.lib import libraries. Then the optional -# extension modules, which are OS/2 DLLs renamed with a PYD file extension. -# -# Recommended build order: -# make depend (if you have makedep) -# make all -# make lx (if you have lxlite) -# make test (optional) -# -#####################==================---------------- - -# === Compilation mode: debug or release === -MODE= optimize -#MODE= debug -# === Assert() enabled === -ASSERTIONS=no -#ASSERTIONS=yes -# === Hard-wire installation location === -FIXED_PYHOME=no -#FIXED_PYHOME=yes - -# === Optional modules === -# Do you have the InfoZip compression library installed? -HAVE_ZLIB= no -# Do you have the Ultra Fast Crypt (UFC) library installed? -HAVE_UFC= no -# Do you have the Tcl/Tk library installed? -HAVE_TCLTK= no -# Do you have the GNU readline library installed? -# NOTE: I'm using a modified version of Kai Uwe Rommel's port that -# - is compiled with multithreading enabled -# - is linked statically -# I have had no success trying to use a DLL version, even when -# compiled with multithreading enabled. -HAVE_GREADLINE= no -# Do you have the BSD DB library (v1.85) as included in the EMXBSD package? -# NOTE: this library needs to be recompiled with a structure member -# renamed to avoid problems with the multithreaded errno support -# (there is a structure member called errno, used for shadowing the -# real errno, which conflicts with the errno redefinition of -Zmt) -HAVE_BSDDB= no -# Do you have the ncurses library installed? EMX's BSD curses aren't enough! -HAVE_NCURSES= no -# Do you have the GDBM library installed? -HAVE_GDBM= no -# Do you have the BZ2 compression library installed? -HAVE_BZ2= no -# Do you have the OpenSSL libraries installed -HAVE_OPENSSL= no - -# === install locations === -# default value of PYTHONHOME -LIB_DIR=C:/Python26 -# default is to have everything in or under PYTHONHOME -EXE_DIR=$(LIB_DIR) -DLL_DIR=$(EXE_DIR) - - -# === The Tools === -CC= gcc -CFLAGS= -Zmt -Wall $(INCLUDE) -CFLAGS.LIB= $(CFLAGS) -LD= gcc -LDFLAGS= -Zmt -Zcrtdll -L. -lgcc -LDFLAGS.EXE= $(LDFLAGS) -LDFLAGS.DLL= $(LDFLAGS) -Zdll -LDFLAGS.A= $(LDFLAGS) $(LIBS) -ARFLAGS= crs -IMPLIB= emximp -EXPLIB= emxexp -EXEOPT= emxbind -PY_DEF= -DPy_BUILD_CORE - - -# adjust C compiler settings based on build options -ifeq ($(MODE),debug) - CFLAGS+= -g -O - LDFLAGS+= -g -else - CFLAGS+= -s -O3 -fomit-frame-pointer -mprobe - LDFLAGS+= -s -endif -CFLAGS+= $(PY_DEF) -ifeq ($(ASSERTIONS),no) - CFLAGS+= -DNDEBUG -endif -ifeq ($(FIXED_PYHOME),yes) - CFLAGS+= -DPREFIX=$(DQUOTE)$(LIB_DIR)$(DQUOTE) -endif - -# We're using the OMF format since EMX's ld has a obscure bug -# because of which it sometimes fails to build relocations -# in .data segment that point to another .data locations -# (except for the final linking if the .EXEs) -OMF= yes - -# if fork() support is required, the main executable must be linked with ld -EXEOMF= no - -# File extensions -MODULE.EXT= .pyd -MODLIB.EXT= .dll -ifeq ($(OMF),yes) - O= .obj - A= .lib - AR= emxomfar - CFLAGS+= -Zomf - LDFLAGS+= -Zomf - ifeq ($(MODE),debug) - ARFLAGS= -p64 crs - else - ARFLAGS= -p32 crs - endif -else - O= .o - A= .a - AR= ar -endif - - -# === Build time resource settings === - -# EMX's default number of file handles is 40, which is sometimes insufficient -# (the tempfile regression test tries to create 100 temporary files) -NFILES=250 - -# The default stack size for child threads is 64k bytes, which is -# insufficient for some applications which do a lot of work in threads -# (such as Zope, especially in conjunction with Plone). -# Note that this setting is distinct from the stack size for the main -# thread, which is set via the %.def rule below. -# EMX documents that the thread stack size should be at least 32768 bytes; -# for Zope/Plone at least 128k bytes is recommended. -# Uncomment & adjust the next line to override the default stack size: -#CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 - - -# === The environment === - -# Source file paths -SRCPATH=.;../../Python;../../Parser;../../Objects;../../Include;../../Modules -# Python contains the central core, containing the builtins and interpreter. -# Parser contains Python's Internal Parser and -# Standalone Parser Generator Program (Shares Some of Python's Modules) -# Objects contains Python Object Types -# Modules contains extension Modules (Built-In or as Separate DLLs) - -# Unix shells tend to use "$" as delimiter for variable names. -# Test for this behaviour and set $(BUCK) variable correspondigly ... -__TMP__:=$(shell echo $$$$) -ifeq ($(__TMP__),$$$$) - BUCK= $$ - BRO= ( - BRC= ) -else - BUCK= \$$ - BRO= \( - BRC= \) -endif -# Compute the "double quote" variable -__TMP__:=$(shell echo "") -ifeq ($(__TMP__),"") - DQUOTE= " -else - DQUOTE= \" -endif - -# Include paths -#INCLUDE= -I$(subst ;, -I, $(SRCPATH)) -INCLUDE= -I. -I../../Include - -# Path to search for .c files -vpath %.c .;..;$(SRCPATH) - -# Top of the package tree -TOP= ../../ - -# Directory for output files -OUTBASE= out/ -OUT= $(OUTBASE)$(MODE)/ - -# Additional libraries -LIBS= -lsocket - -# Utility macro: replacement for $^ -^^= $(filter-out %$A,$^) -# Use $(L^) to link with all libraries specified as dependencies -L^= $(addprefix -l,$(basename $(notdir $(filter %$A,$+)))) - -# Build rules -$(OUT)%$O: %.c - $(CC) $(CFLAGS.LIB) -c $< -o $@ - -%.a: - $(LD) $(LDFLAGS.A) -o $@ $(^^) $(L^) - -%.dll: - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) - -%.pyd: $(OUT)%module$O $(OUT)%_m.def - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(PYTHON.IMPLIB) $(LIBS) - -%.exe: - $(LD) $(LDFLAGS.EXE) -o $@ $(^^) $(L^) - -%_m.def: - @echo Creating .DEF file: $@ - @echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@ - ifeq ($(DESCRIPTION.$(notdir $*)$(MODULE.EXT)),) - @echo DESCRIPTION $(DQUOTE)Python standard module $(notdir $*)$(DQUOTE) >>$@ - else - @echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*)$(MODULE.EXT))$(DQUOTE) >>$@ - endif - @echo DATA MULTIPLE NONSHARED >>$@ - @echo EXPORTS >>$@ - @echo init$(notdir $*) >>$@ - -%.def: - @echo Creating .DEF file: $@ - @echo NAME $(notdir $*) $(EXETYPE.$(notdir $*).exe) >$@ - @echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*).exe)$(DQUOTE) >>$@ - @echo STACKSIZE 2097152 >>$@ - -# Output file names -PYTHON_VER= 2.6 -PYTHON_LIB= python34 -PYTHON.LIB= $(PYTHON_LIB)_s$A -PYTHON.IMPLIB= $(PYTHON_LIB)$A -ifeq ($(EXEOMF),yes) - PYTHON.EXEIMP= $(PYTHON.IMPLIB) - LDMODE.EXE= -Zomf -else - PYTHON.EXEIMP= $(PYTHON_LIB).a - LDMODE.EXE = -endif -PYTHON.DLL= $(PYTHON_LIB).dll -PYTHON.DEF= $(PYTHON_LIB).def -PYTHON.EXE= python.exe -PYTHONPM.EXE= pythonpm.exe -PGEN.EXE= pgen.exe -LIBRARY= $(PYTHON.LIB) -LD_LIBRARY= $(PYTHON.IMPLIB) - -# Additional executable parameters -EXETYPE.$(PYTHON.EXE)= WINDOWCOMPAT -EXETYPE.$(PYTHONPM.EXE)= WINDOWAPI -EXETYPE.$(PGEN.EXE)= WINDOWCOMPAT -DESCRIPTION.$(PYTHON.EXE)= Python object-oriented programming language interpreter for OS/2 -DESCRIPTION.$(PYTHONPM.EXE)= $(DESCRIPTION.$(PYTHON.EXE)) -DESCRIPTION.$(PGEN.EXE)= Python object-oriented programming language parser generator for OS/2 - -# Module descriptions -DESCRIPTION.zlib$(MODULE.EXT)= Python Extension DLL for accessing the InfoZip compression library -DESCRIPTION.crypt$(MODULE.EXT)= Python Extension DLL implementing the crypt$(BRO)$(BRC) function -DESCRIPTION._tkinter$(MODULE.EXT)= Python Extension DLL for access to Tcl/Tk Environment -DESCRIPTION.readline$(MODULE.EXT)= Python Extension DLL for access to GNU ReadLine library -DESCRIPTION._curses$(MODLIB.EXT)= Python Extension DLL for access to ncurses library -DESCRIPTION.pyexpat$(MODULE.EXT)= Python Extension DLL for access to expat library -DESCRIPTION.bz2$(MODULE.EXT)= Python Extension DLL for accessing the bz2 compression library - -# Source files -SRC.OS2EMX= config.c dlfcn.c getpathp.c -SRC.MAIN= $(addprefix $(TOP), \ - Modules/getbuildinfo.c \ - Modules/main.c) -SRC.MODULES= $(addprefix $(TOP), \ - Modules/gcmodule.c \ - Modules/signalmodule.c \ - Modules/posixmodule.c \ - Modules/_threadmodule.c \ - Modules/arraymodule.c \ - Modules/binascii.c \ - Modules/cmathmodule.c \ - Modules/_codecsmodule.c \ - Modules/collectionsmodule.c \ - Modules/_csv.c \ - Modules/datetimemodule.c \ - Modules/errnomodule.c \ - Modules/fcntlmodule.c \ - Modules/_functoolsmodule.c \ - Modules/_heapqmodule.c \ - Modules/imageop.c \ - Modules/itertoolsmodule.c \ - Modules/_localemodule.c \ - Modules/mathmodule.c \ - Modules/operator.c \ - Modules/_randommodule.c \ - Modules/sha256module.c \ - Modules/sha512module.c \ - Modules/_sre.c \ - Modules/_struct.c \ - Modules/symtablemodule.c \ - Modules/termios.c \ - Modules/timemodule.c \ - Modules/_weakref.c \ - Modules/xxsubtype.c \ - Modules/zipimport.c) -SRC.PARSE1= $(addprefix $(TOP), \ - Parser/acceler.c \ - Parser/grammar1.c \ - Parser/listnode.c \ - Parser/node.c \ - Parser/parser.c \ - Parser/parsetok.c \ - Parser/bitset.c \ - Parser/metagrammar.c) -SRC.PARSE2= $(addprefix $(TOP), \ - Parser/tokenizer.c \ - Parser/myreadline.c) -SRC.PARSER= $(SRC.PARSE1) \ - $(SRC.PARSE2) -SRC.PYTHON= $(addprefix $(TOP), \ - Python/Python-ast.c \ - Python/asdl.c \ - Python/ast.c \ - Python/bltinmodule.c \ - Python/exceptions.c \ - Python/ceval.c \ - Python/compile.c \ - Python/codecs.c \ - Python/dynamic_annotations.c \ - Python/errors.c \ - Python/frozen.c \ - Python/frozenmain.c \ - Python/future.c \ - Python/getargs.c \ - Python/getcompiler.c \ - Python/getcopyright.c \ - Python/getplatform.c \ - Python/getversion.c \ - Python/graminit.c \ - Python/import.c \ - Python/importdl.c \ - Python/marshal.c \ - Python/modsupport.c \ - Python/mysnprintf.c \ - Python/mystrtoul.c \ - Python/pyarena.c \ - Python/pyctype.c \ - Python/pyfpe.c \ - Python/pystate.c \ - Python/pystrtod.c \ - Python/pythonrun.c \ - Python/structmember.c \ - Python/symtable.c \ - Python/sysmodule.c \ - Python/traceback.c \ - Python/getopt.c \ - Python/dynload_shlib.c \ - Python/thread.c) -SRC.OBJECT= $(addprefix $(TOP), \ - Objects/abstract.c \ - Objects/boolobject.c \ - Objects/cellobject.c \ - Objects/classobject.c \ - Objects/cobject.c \ - Objects/codeobject.c \ - Objects/complexobject.c \ - Objects/descrobject.c \ - Objects/dictobject.c \ - Objects/enumobject.c \ - Objects/fileobject.c \ - Objects/floatobject.c \ - Objects/frameobject.c \ - Objects/funcobject.c \ - Objects/genobject.c \ - Objects/iterobject.c \ - Objects/listobject.c \ - Objects/longobject.c \ - Objects/methodobject.c \ - Objects/moduleobject.c \ - Objects/object.c \ - Objects/obmalloc.c \ - Objects/rangeobject.c \ - Objects/setobject.c \ - Objects/sliceobject.c \ - Objects/stringobject.c \ - Objects/structseq.c \ - Objects/tupleobject.c \ - Objects/typeobject.c \ - Objects/unicodeobject.c \ - Objects/unicodectype.c \ - Objects/weakrefobject.c) - -SRC.LIB= $(SRC.OS2EMX) \ - $(SRC.MAIN) \ - $(SRC.PARSER) \ - $(SRC.OBJECT) \ - $(SRC.PYTHON) \ - $(SRC.MODULES) -OBJ.LIB= $(addprefix $(OUT),$(notdir $(SRC.LIB:.c=$O))) - -SRC.PGEN= $(SRC.PARSE1) \ - $(addprefix $(TOP), \ - Objects/obmalloc.c) \ - $(addprefix $(TOP), \ - Python/mysnprintf.c) \ - $(addprefix $(TOP), \ - Parser/tokenizer_pgen.c \ - Parser/pgenmain.c \ - Parser/pgen.c \ - Parser/printgrammar.c \ - Parser/grammar.c \ - Parser/firstsets.c) \ - -OBJ.PGEN= $(addprefix $(OUT),$(notdir $(SRC.PGEN:.c=$O))) - -SRC.EXE= $(TOP)Modules/python.c -SRC.PMEXE= pythonpm.c - -# Python modules to be dynamically loaded that: -# 1) have only single source file and require no extra libs -# 2) use the standard module naming convention -# (the 'module' in ?????module.c is assumed) -# - these can be built with implicit rules -EASYEXTMODULES= fpectl \ - fpetest \ - parser \ - pwd \ - select - -# Python modules to be dynamically loaded that need explicit build rules -# (either multiple source files and/or non-standard module naming) -# (NOTE: use shortened names for modules affected by 8 char name limit) -HARDEXTMODULES= _socket \ - _testcap \ - unicoded - -# Python modules that are used as libraries and therefore must use -# a .DLL extension -LIBEXTMODULES= - -# Python external ($(MODULE.EXT)) modules - can be EASY or HARD -ifeq ($(HAVE_ZLIB),yes) - HARDEXTMODULES+= zlib -endif -ifeq ($(HAVE_UFC),yes) - HARDEXTMODULES+= crypt -endif -ifeq ($(HAVE_TCLTK),yes) - HARDEXTMODULES+= _tkinter - CFLAGS+= -DHAS_DIRENT -I/TclTk80/include - TK_LIBS+= -L/TclTk80/lib -ltcl80 -ltk80 -endif -ifeq ($(HAVE_GREADLINE),yes) - HARDEXTMODULES+= readline -endif -ifeq ($(HAVE_NCURSES),yes) - LIBEXTMODULES+= _curses - HARDEXTMODULES+= _curses_ -endif -ifeq ($(HAVE_GDBM),yes) - HARDEXTMODULES+= _gdbm _dbm -endif -ifeq ($(HAVE_BZ2),yes) - HARDEXTMODULES+= bz2 -endif -ifeq ($(HAVE_OPENSSL),yes) - HARDEXTMODULES+= _ssl -endif - -# Expat is now distributed with the Python source -HARDEXTMODULES+= pyexpat -EXPAT.INC= -I../../Modules/expat -EXPAT.DEF= -DHAVE_EXPAT_H -DXML_NS=1 -DXML_DTD=1 -DXML_BYTE_ORDER=12 \ - -DXML_CONTENT_BYTES=1024 -DHAVE_MEMMOVE=1 -DHAVE_BCOPY=1 -EXPAT.SRC= $(addprefix ../../Modules/expat/, \ - xmlparse.c \ - xmlrole.c \ - xmltok.c) - -# all the external modules -EXTERNDLLS= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(EASYEXTMODULES))) -EXTERNDLLS+= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(HARDEXTMODULES))) -EXTERNDLLS+= $(addsuffix $(MODLIB.EXT),$(patsubst %module,%,$(LIBEXTMODULES))) - -# Targets -all: $(OUT) $(PYTHON.LIB) $(PYTHON.DEF) $(PYTHON.IMPLIB) $(PYTHON.DLL) \ - python_noncore - -python_noncore: - make PY_DEF= $(PYTHON.EXE) $(PYTHONPM.EXE) $(PGEN.EXE) $(EXTERNDLLS) - -clean: - rm -f $(OUT)* - rm -f $(PYTHON.LIB) $(PYTHON.IMPLIB) $(PYTHON.EXEIMP) $(PYTHON.DLL) \ - $(PYTHON.EXE) $(PYTHONPM.EXE) $(PGEN.EXE) *$(MODULE.EXT) *.dll - find ../../Lib -name "*.py[co]" -exec rm {} ";" - -lx: - @echo Packing everything with lxLite... - lxlite $(PYTHON.DLL) $(PYTHON.EXE) $(PYTHONPM.EXE) $(PGEN.EXE) - -depend: $(OUTBASE) - makedep -f $(OUTBASE)python.dep -o $(BUCK)O -p $(BUCK)\(OUT\) \ - -r -c $(INCLUDE) $(SRC.LIB) $(SRC.PGEN) - -$(OUT): $(OUTBASE) - -$(OUT) $(OUTBASE): - mkdir.exe $@ - -$(PYTHON.LIB): $(OBJ.LIB) - rm.exe -f $@ - $(AR) $(ARFLAGS) $@ $^ - -# the Python core DLL .def file needs to have a number of non-static -# symbols that aren't part of the Python C API removed (commented out) -# from the DLL export list. -$(PYTHON.DEF): $(PYTHON.LIB) - @echo Creating .DEF file: $@ - @echo LIBRARY $(PYTHON_LIB) INITINSTANCE TERMINSTANCE >$@ - @echo DESCRIPTION $(DQUOTE)Python $(PYTHON_VER) Core DLL$(DQUOTE) >>$@ - @echo PROTMODE >>$@ - @echo DATA MULTIPLE NONSHARED >>$@ - @echo EXPORTS >>$@ - $(EXPLIB) -u $(PYTHON.LIB) |\ - sed -e "/^ .init.*/s/^ /; /" \ - -e "/^ .pcre_.*/s/^ /; /" \ - -e "/^ .array_methods/s/^ /; /" \ - -e "/^ .fast_save_leave/s/^ /; /" \ - -e "/^ .dlopen/s/^ /; /" \ - -e "/^ .dlsym/s/^ /; /" \ - -e "/^ .dlclose/s/^ /; /" \ - -e "/^ .dlerror/s/^ /; /" \ - -e "/^ ._Py_re_.*/s/^ /; /" \ - -e "/^ ._Py_MD5.*/s/^ /; /" >>$@ - -$(PYTHON.IMPLIB): $(PYTHON.DEF) - $(IMPLIB) -o $@ $^ - -$(PYTHON.EXEIMP): $(PYTHON.DEF) - $(IMPLIB) -o $@ $^ - -$(PYTHON.DLL): $(OUT)dllentry$O $(PYTHON.LIB) $(PYTHON.DEF) - -# Explicit make targets for the .EXEs to be able to use LD to link -# (so that fork() will work if required) - -$(PYTHON.EXE): $(SRC.EXE) $(PYTHON.EXEIMP) $(OUT)python.def - $(CC) -Zmt $(LDMODE.EXE) -Zcrtdll -Wall $(INCLUDE) -L. -lgcc -o $@ $(SRC.EXE) $(PYTHON.EXEIMP) $(LIBS) $(OUT)python.def - $(EXEOPT) -aq $(PYTHON.EXE) -h$(NFILES) - -$(PYTHONPM.EXE): $(SRC.PMEXE) $(PYTHON.EXEIMP) $(OUT)pythonpm.def - $(CC) -Zmt $(LDMODE.EXE) -Zcrtdll -Wall $(INCLUDE) -L. -lgcc -o $@ $(SRC.PMEXE) $(PYTHON.EXEIMP) $(LIBS) $(OUT)pythonpm.def - $(EXEOPT) -aq $(PYTHONPM.EXE) -h$(NFILES) - -$(PGEN.EXE): $(OBJ.PGEN) $(OUT)pgen.def - -# Explicit building instructions for those external modules that require -# awkward handling (due e.g. to non-std naming, or multiple source files) -# - standard modules - -_socket$(MODULE.EXT): $(OUT)socketmodule$O $(OUT)_socket_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) - -# _testcapi needs to be renamed to be useful -_testcapi$(MODULE.EXT): $(OUT)_testcapimodule$O $(OUT)_testcapi_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) - -_testcap$(MODULE.EXT): _testcapi$(MODULE.EXT) - cp $^ $@ - -# unicodedata needs to be renamed to be useful -unicodedata$(MODULE.EXT): $(OUT)unicodedata$O $(OUT)unicodedata_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) $(MODULE_LIBS) - -unicoded$(MODULE.EXT): unicodedata$(MODULE.EXT) - cp $^ $@ - -crypt$(MODULE.EXT): $(OUT)cryptmodule$O $(OUT)crypt_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) -lufc $(LIBS) - -# The _curses_panel module requires a couple of ncurses library entry -# points, which are best exposed as exports from the _curses module DLL -$(OUT)_curses_m.def: - @echo Creating .DEF file: $@ - @echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@ - @echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*)$(MODLIB.EXT))$(DQUOTE) >>$@ - @echo DATA MULTIPLE NONSHARED >>$@ - @echo EXPORTS >>$@ - @echo init_curses >>$@ - @echo wnoutrefresh >>$@ - @echo _nc_panelhook >>$@ - @echo is_linetouched >>$@ - @echo mvwin >>$@ - @echo stdscr >>$@ - @echo wtouchln >>$@ - -$(OUT)_curses_panel_m.def: - @echo Creating .DEF file: $@ - @echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@ - @echo DESCRIPTION $(DQUOTE)Python standard module $(notdir $*)$(DQUOTE) >>$@ - @echo DATA MULTIPLE NONSHARED >>$@ - @echo IMPORTS >>$@ - @echo _curses.wnoutrefresh >>$@ - @echo _curses._nc_panelhook >>$@ - @echo _curses.is_linetouched >>$@ - @echo _curses.mvwin >>$@ - @echo _curses.stdscr >>$@ - @echo _curses.wtouchln >>$@ - @echo EXPORTS >>$@ - @echo init_curses_panel >>$@ - -_curses$(MODLIB.EXT): $(OUT)_cursesmodule$O $(OUT)_curses_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lncurses - -# curses_panel needs to be renamed to be useful -_curses_panel$(MODULE.EXT): $(OUT)_curses_panel$O $(OUT)_curses_panel_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lpanel - -_curses_$(MODULE.EXT): _curses_panel$(MODULE.EXT) - cp $^ $@ - -_dbm$(MODULE.EXT): $(OUT)_dbmmodule$O $(OUT)dbm_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lgdbm - -_gdbm$(MODULE.EXT): $(OUT)_gdbmmodule$O $(OUT)gdbm_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lgdbm - - -# Expat is now distributed with Python, so use the included version -$(OUT)pyexpat$O: ../../Modules/pyexpat.c - $(CC) $(CFLAGS) $(EXPAT.INC) -c -o $@ $^ -$(OUT)xmlparse$O: ../../Modules/expat/xmlparse.c - $(CC) $(CFLAGS) $(EXPAT.INC) $(EXPAT.DEF) -c -o $@ $^ -$(OUT)xmlrole$O: ../../Modules/expat/xmlrole.c - $(CC) $(CFLAGS) $(EXPAT.INC) $(EXPAT.DEF) -c -o $@ $^ -$(OUT)xmltok$O: ../../Modules/expat/xmltok.c - $(CC) $(CFLAGS) $(EXPAT.INC) $(EXPAT.DEF) -c -o $@ $^ -pyexpat$(MODULE.EXT): $(OUT)pyexpat$O $(OUT)xmlparse$O $(OUT)xmlrole$O \ - $(OUT)xmltok$O $(OUT)pyexpat_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) - -readline$(MODULE.EXT): $(OUT)readline$O $(OUT)readline_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lreadline -lncurses - -#_tkinter$(MODULE.EXT): $(OUT)_tkinter$O $(OUT)tclNotify$O $(OUT)tkappinit$O -_tkinter$(MODULE.EXT): $(OUT)_tkinter$O $(OUT)tclNotify$O \ - $(OUT)_tkinter_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) $(TK_LIBS) - -zlib$(MODULE.EXT): $(OUT)zlibmodule$O $(OUT)zlib_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lz - -bz2$(MODULE.EXT): $(OUT)bz2module$O $(OUT)bz2_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lbz2 - -_ssl$(MODULE.EXT): $(OUT)_ssl$O $(OUT)_ssl_m.def $(PYTHON.IMPLIB) - $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lssl -lcrypto - -# the test target -test: - -find ../../Lib -name "*.py[co]" -exec rm {} ";" - -./python -E ../../lib/test/regrtest.py -l -u "network" - ./python -E ../../lib/test/regrtest.py -l -u "network" - --include $(OUTBASE)python.dep diff --git a/PC/os2emx/README.os2emx b/PC/os2emx/README.os2emx deleted file mode 100644 --- a/PC/os2emx/README.os2emx +++ /dev/null @@ -1,663 +0,0 @@ -This is a port of Python 2.6 to OS/2 using the EMX development tools -========================================================================= - -What's new since the previous release -------------------------------------- - -Another day, another version... - - -Licenses and info about Python and EMX --------------------------------------- - -Please read the file README.Python-2.6 included in this package for -information about Python 2.6. This file is the README file from the -Python 2.6 source distribution available via http://www.python.org/ -and its mirrors. The file LICENCE.Python-2.6 is the text of the Licence -from the Python 2.6 source distribution. - -Note that the EMX package that this package depends on is released under -the GNU General Public Licence. Please refer to the documentation -accompanying the EMX Runtime libraries for more information about the -implications of this. A copy of version 2 of the GPL is included as the -file COPYING.gpl2. - -Readline and GDBM are covered by the GNU General Public Licence. I think -Eberhard Mattes' porting changes to BSD DB v1.85 are also GPL'ed (BSD DB -itself is BSD Licenced). ncurses and expat appear to be covered by MIT -style licences - please refer to the source distributions for more detail. -zlib is distributable under a very free license. GNU UFC is under the -GNU LGPL (see file COPYING.lib). - -My patches to the Python-2.x source distributions, and any other packages -used in this port, are placed in the public domain. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the author be held liable for any damages arising from the -use of the software. - -I do hope however that it proves useful to someone. - - -Other ports ------------ - -There have been ports of previous versions of Python to OS/2. - -The best known would be that by Jeff Rush, most recently of version -1.5.2. Jeff used IBM's Visual Age C++ (v3) for his ports, and his -patches have been included in the Python 2.6 source distribution. - -Andy Zabolotny implemented a port of Python v1.5.2 using the EMX -development tools. His patches against the Python v1.5.2 source -distribution have become the core of this port, and without his efforts -this port wouldn't exist. Andy's port also appears to have been -compiled with his port of gcc 2.95.2 to EMX, which I have but have -chosen not to use for the binary distribution of this port (see item 16 -of the "YOU HAVE BEEN WARNED" section below). - -It is possible to have these earlier ports still usable after installing -this port - see the README.os2emx.multiple_versions file, contributed by -Dr David Mertz, for a suggested approach to achieving this. - - -Software requirements ---------------------- - -This package requires the EMX Runtime package, available from the -Hobbes (http://hobbes.nmsu.edu/) and LEO (http://archiv.leo.org/) -archives of OS/2 software. I have used EMX version 0.9d fix04 in -developing this port. - -My development system is running OS/2 v4 with fixpack 12. - -3rd party software which has been linked into dynamically loaded modules: -- ncurses (see http://dickey.his.com/ for more info, v5.2) -- GNU Readline (Kai Uwe Rommel's port available from Hobbes or LEO, v2.1) -- GNU GDBM (Kai Uwe Rommel's port available from Hobbes or LEO, v1.7.3) -- zlib (derived from Hung-Chi Chu's port of v1.1.3, v1.1.4) -- expat (distributed with Python, v1.95.6) -- GNU UFC (Kai Uwe Rommel's port available from LEO, v2.0.4) - - -About this port ---------------- - -I have attempted to make this port as complete and functional as I can, -notwithstanding the issues in the "YOU HAVE BEEN WARNED" section below. - -Core components: - -Python.exe is linked as an a.out executable, ie using EMX method E1 -to compile & link the executable. This is so that fork() works (see -"YOU HAVE BEEN WARNED" item 1). - -Python26.dll is created as a normal OMF DLL, with an OMF import -library and module definition file. There is also an a.out (.a) import -library to support linking the DLL to a.out executables. The DLL -requires the EMX runtime DLLs. - -This port has been built with complete support for multithreading. - -Modules: - -With the exception of modules that have a significant code size, or are -not recommended or desired for normal use, the standard modules are now -built into the core DLL rather than configured as dynamically loadable -modules. This is for both reasons of performance (startup time) and -memory use (lots of small DLLs fragment the address space). - -I haven't yet changed the building of Python's dynamically loadable -modules over to using the DistUtils. - -See "YOU HAVE BEEN WARNED" item 3 for notes about the fcntl module, and -"YOU HAVE BEEN WARNED" item 10 for notes about the pwd and grp modules. - -This port supports case sensitive module import semantics, matching -the Windows release. This can be deactivated by setting the PYTHONCASEOK -environment variable (the value doesn't matter) - see "YOU HAVE BEEN WARNED" -item 12. - -Optional modules: - -Where I've been able to locate the required 3rd party packages already -ported to OS/2, I've built and included them. - -These include ncurses (_curses, _curses_panel), -GNU GDBM (gdbm, dbm), zlib (zlib), GNU Readline (readline), and GNU UFC -(crypt). - -Expat is now included in the Python release sourceball, and the pyexpat -module is always built. - -I have built these modules statically linked against the 3rd party -libraries. Unfortunately my attempts to use the dll version of GNU -readline have been a dismal failure, in that when the dynamically -linked readline module is active other modules immediately provoke a -core dump when imported. - -Only the BSD DB package (part of the BSD package distributed with EMX) -needs source modifications to be used for this port, pertaining to use -of errno with multithreading. - -The other packages, except for ncurses and zlib, needed Makefile changes -for multithreading support but no source changes. - -The _curses_panel module is a potential problem - see "YOU HAVE BEEN -WARNED" item 13. - -Upstream source patches: - -No updates to the Python 2.6 release have become available. - -Library and other distributed Python code: - -The Python standard library lives in the Lib directory. All the standard -library code included with the Python 2.6 source distribution is included -in the binary archive, with the exception of the dos-8x3 and tkinter -subdirectories which have been omitted to reduce the size of the binary -archive - the dos-8x3 components are unnecessary duplicates and Tkinter -is not supported by this port (yet). All the plat-* subdirectories in the -source distribution have also been omitted, except for the plat-os2emx -subdirectory. - -The Tools and Demo directories contain a collection of Python scripts. -To reduce the size of the binary archive, the Demo/sgi, Demo/Tix, -Demo/tkinter, Tools/audiopy and Tools/IDLE subdirectories have been -omitted as not being supported by this port. The Misc directory has -also been omitted. - -All subdirectories omitted from the binary archive can be reconstituted -from the Python 2.6 source distribution, if desired. - -Support for building Python extensions: - -The Config subdirectory contains the files describing the configuration -of the interpreter and the Makefile, import libraries for the Python DLL, -and the module definition file used to create the Python DLL. The -Include subdirectory contains all the standard Python header files -needed for building extensions. - -As I don't have the Visual Age C++ compiler, I've made no attempt to -have this port support extensions built with that compiler. - - -Packaging ---------- - -This port is packaged as follows: -- python-2.6-os2emx-bin-03????.zip (binaries, library modules) -- python-2.6-os2emx-src-03???? (patches+makefiles for non-Python code) - -As all the Python specific patches for the port are now part of the -Python release tarball, only the patches and makefiles involved in -building external libraries for optional extensions are included in -the source archive. - -Documentation for the Python language, as well as the Python 2.6 -source distibution, can be obtained from the Python website -(http://www.python.org/) or the Python project pages at Sourceforge -(http://sf.net/projects/python/). - - -Installation ------------- - -Obtain and install, as per the included instructions, the EMX runtime -package. - -Unpack this archive, preserving the subdirectories, in the root directory -of the drive where you want Python to live. - -Add the Python directory (eg C:\Python26) to the PATH and LIBPATH -variables in CONFIG.SYS. - -You should then set the PYTHONHOME and PYTHONPATH environment variables -in CONFIG.SYS. - -PYTHONHOME should be set to Python's top level directory. PYTHONPATH -should be set to the semicolon separated list of principal Python library -directories. -I use: - SET PYTHONHOME=F:/Python26 - SET PYTHONPATH=F:/Python26/Lib;F:/Python26/Lib/plat-os2emx; - F:/Python26/Lib/lib-dynload;F:/Python26/Lib/site-packages - -NOTE!: the PYTHONPATH setting above is linewrapped for this document - it -should all be on one line in CONFIG.SYS! - -If you wish to use the curses module, you should set the TERM and TERMINFO -environment variables appropriately. - -If you don't already have ncurses installed, I have included a copy of the -EMX subset of the Terminfo database included with the ncurses-5.2 source -distribution. This can be used by setting the TERMINFO environment variable -to the path of the Terminfo subdirectory below the Python home directory. -On my system this looks like: - SET TERMINFO=F:/Python26/Terminfo - -For the TERM environment variable, I would try one of the following: - SET TERM=ansi - SET TERM=os2 - SET TERM=window - -You will have to reboot your system for these changes to CONFIG.SYS to take -effect. - -If you wish to compile all the included Python library modules to bytecode, -you can change into the Python home directory and run the COMPILEALL.CMD -batch file. - -You can execute the regression tests included with the Python 2.6 source -distribution by changing to the Python 2.6 home directory and executing the -REGRTEST.CMD batch file. The following tests are known to fail at this -time: -- test_mhlib (I don't know of any port of MH to OS/2); -- test_strptime (see "YOU HAVE BEEN WARNED" item 22); -- test_time (see "YOU HAVE BEEN WARNED" item 22); -- test_posixpath (see "YOU HAVE BEEN WARNED" item 23). - -Note that some of the network related tests expect the loopback interface -(interface "lo", with IP address 127.0.0.1) to be enabled, which from my -experience is not the default configuration. Additionally, test_popen2 -expects the "cat" utility (such as found in ports of the GNU tools) to -be installed. - - -Building from source --------------------- - -With the EMX port now checked into Python's CVS repository, the build -infrastructure is part of the Python release sourceball. - -Prerequisites - -First and foremost, you need an operational EMX development installation - -EMX v0.9d with fix04 (the latest at time of writing) & the gcc 2.8.1 -compiler released by Eberhard Mattes is the recommended setup. - -If you have a different version of gcc installed, see "YOU HAVE BEEN -WARNED" item 16. - -Other items of software required:- - -- GNU make (I'm using v3.76.1) -- rm, cp, mkdir from the GNU file utilities package -- GNU find -- GNU sed - -Procedure - -0. all changes mentioned apply to files in the PC/os2emx subdirectory - of the Python release source tree. make is also executed from this - directory, so change into this directory before proceeding. - -1. decide if you need to change the location of the Python installation. - If you wish to do this, set the value of the Makefile variable LIB_DIR - to the directory you wish to use for PYTHONHOME - (eg /usr/local/lib/python2.6). - - If you want Python to find its library without the PYTHONHOME - environment variable set, set the value of the Makefile variable - FIXED_PYHOME to "yes" (uncomment the appropriate line). - -2. If you wish the Python executables (python.exe, pythonpm.exe & pgen.exe) - to be installed in a directory other than the PYTHONHOME directory, set - the value of the Makefile variable EXE_DIR to the appropriate directory. - -3. If you wish the Python core DLL (python34.dll) to be installed in a - directory other than the directory in which the Python executables are - installed (by default, the PYTHONHOME directory), set the value of the - Makefile variable DLL_DIR to the appropriate directory. This DLL must - be placed in a directory on the system's LIBPATH, or that gets set - with BEGINLIBPATH or ENDLIBPATH. - -4. If you have installed any of the libraries that can be used to build - optional Python modules, set the value of the relevant HAVE_ - Makefile variable to "yes". The Makefile currently supports: - - library Makefile variable - ........................................ - zlib (1.1.4) HAVE_ZLIB - GNU UltraFast Crypt HAVE_UFC - Tcl/Tk HAVE_TCLTK (not known to work) - GNU Readline HAVE_GREADLINE - ncurses HAVE_NCURSES - GNU gdbm HAVE_GDBM - libbz2 HAVE_BZ2 - OpenSSL HAVE_OPENSSL - - Please note that you need to check that what you have installed - is compatible with Python's build options. In particular, the - BSD DB v1.85 library needs to be rebuilt with a source patch for - multithread support (doesn't change the library's reentrant status - but allows it to be linked to Python which is multithreaded). - Widely available binary packages of other librarys & DLLs are - not built/linked with multithread support. Beware! - - Also note that the Makefile currently expects any libraries to be - found with the default library search path. You may need to add - -L switches to the LDFLAGS Makefile variable if you have installed - libraries in directories not in the default search path (which can - be controlled by the LIBRARY_PATH environment variable used by EMX). - -5. make - - It is usually a good idea to redirect the stdout and stderr streams - of the make process to log files, so that you can review any messages. - -6. make test - - This runs the Python regression tests, and completion is a sign of - a usable build. You should check the list of skipped modules to - ensure that any optional modules you selected have been built; - checking the list of failures against the list of known failures - elsewhere in this document is also prudent. - -7. make install - >>>>>> NOT YET COMPLETE <<<<<< - -8. change to a directory outside the Python source tree and start Python. - Check the version and build date to confirm satisfactory installation. - - -YOU HAVE BEEN WARNED!! ----------------------- - -I know about a number of nasties in this port. - -1. Eberhard Mattes, author of EMX, writes in his documentation that fork() -is very inefficient in the OS/2 environment. It also requires that the -executable be linked in a.out format rather than OMF. Use the os.exec -and/or the os.spawn family of functions where possible. - -2. In the absence of GNU Readline, terminating the interpreter requires a -control-Z (^Z) followed by a carriage return. Jeff Rush documented this -problem in his Python 1.5.2 port. With Readline, a control-D (^D) works -as per the standard Unix environment. - -3. EMX only has a partial implementation of fcntl(). The fcntl module -in this port supports what EMX supports. If fcntl is important to you, -please review the EMX C Library Reference (included in .INF format in the -EMXVIEW.ZIP archive as part of the complete EMX development tools suite). -Because of other side-effects I have modified the test_fcntl.py test -script to deactivate the exercising of the missing functionality. - -4. The readline module has been linked against ncurses rather than the -termcap library supplied with EMX. - -5. I have configured this port to use "/" as the preferred path separator -character, rather than "\" ('\\'), in line with the convention supported -by EMX. Backslashes are still supported of course, and still appear in -unexpected places due to outside sources that don't get normalised. - -6. While the DistUtils components are now functional, other -packaging/binary handling tools and utilities such as those included in -the Demo and Tools directories - freeze in particular - are unlikely to -work. If you do get them going, I'd like to know about your success. - -7. I haven't set out to support the [BEGIN|END]LIBPATH functionality -supported by one of the earlier ports (Rush's??). If it works let me know. - -8. As a result of the limitations imposed by EMX's library routines, the -standard extension module pwd only synthesises a simple passwd database, -and the grp module cannot be supported at all. - -I have written pure Python substitutes for pwd and grp, which can process -real passwd and group files for those applications (such as MailMan) that -require more than EMX emulates. I have placed pwd.py and grp.py in -Lib/plat-os2emx, which is usually before Lib/lib-dynload (which contains -pwd.pyd) in the PYTHONPATH. If you have become attached to what pwd.pyd -supports, you can put Lib/lib-dynload before Lib/plat-os2emx in PYTHONPATH -or delete/rename pwd.py & grp.py. - -pwd.py & grp.py support locating their data files by looking in the -environment for them in the following sequence: -pwd.py: $ETC_PASSWD (%ETC_PASSWD%) - $ETC/passwd (%ETC%/passwd) - $PYTHONHOME/Etc/passwd (%PYTHONHOME%/Etc/passwd) -grp.py: $ETC_GROUP (%ETC_GROUP%) - $ETC/group (%ETC%/group) - $PYTHONHOME/Etc/group (%PYTHONHOME%/Etc/group) - -The ETC_PASSWD and ETC_GROUP environment variables are intended to allow -support for multiple passwd/grp files, where other applications may not -support as wide a variety of input variations (drive remappings, -separators etc). - -Both modules support using either the ":" character (Unix standard) or -";" (OS/2, DOS, Windows standard) field separator character, and pwd.py -implements the following drive letter conversions for the home_directory and -shell fields (for the ":" separator only): - $x -> x: - x; -> x: - -Example versions of passwd and group are in the Etc subdirectory. The -regression tests (test_pwd and test_grp) will fail if valid password and -group files cannot be found, but should pass otherwise. - -Be aware that Python's pwd & group modules are for reading password and -group information only. - -11. EMX's termios routines don't support all of the functionality now -exposed by the termios module - refer to the EMX documentation to find -out what is supported. - -12. The case sensitive import semantics introduced in Python 2.1 for other -case insensitive but case preserving file/operating systems (Windows etc), -have been incorporated into this port, and are active by default. Setting -the PYTHONCASEOK environment variable (to any value) reverts to the -previous (case insensitive) semantics. This can be an issue with some -file management utilities that do not preserve the case of file and -directory names. - -13. Because I am statically linking ncurses, the _curses_panel -module has potential problems arising from separate library data areas. -To avoid this, I have configured the _curses_.pyd (imported as -"_curses_panel") to import the ncurses symbols it needs from _curses.dll -(which is the curses module, but with a .dll extension rather than .pyd -so that the dynamic loader can actually import the symbols from it as a -DLL). - -The site module (Lib/site.py) has code added to tweak BEGINLIBPATH so -that _curses.dll is found when _curses_panel is imported. If you have -problems attempting to use the _curses_panel support please let me know, -and I'll have another look at this. - -14. sys.platform reports "os2emx" instead of "os2". os.name still -reports "os2". This change was to make it easier to distinguish between -the VAC++ build (formerly maintained by Michael Muller) and the EMX build -(this port), principally for DistUtils. - -15. it appears that the %W substitution in the EMX strftime() routine has -an off-by-one bug. strftime was listed as passing the regression tests -in previous releases, but this fact appears to have been an oversight in -the regression test suite. To fix this really requires a portable -strftime routine - I'm looking into using one from FreeBSD, but its not -ready yet. - -16. I have successfully built this port with Andy Zabolotny's ports of -pgcc 2.95 and gcc 3.2.1, in addition to EM's gcc 2.8.1. - -I have not attempted to compile Python with any version of gcc prior to -v2.8.1. - -This release sees the default optimisation change to -"-O3 -fomit-frame-pointer -mprobe". This works fine too for pgcc 2.95 -but not for gcc 3.2.1. - -With gcc 3.2.1, -O3 causes 2 unexpected test failures: test_format and -test_unicode. Both these tests pass if -O2 is instead of -O3 with this -compiler, and the performance difference is negligible (in contrast to -gcc 2.8.1 and pgcc 2.95, where the performance difference between the -2 optimisation settings approaches 10%). - -17. os.spawnv() and os.spawnve() expose EMX's library routines rather -than use the emulation in os.py. - -In order to make use of some of the features this makes available in -the OS/2 environment, you should peruse the relevant EMX documentation -(EMXLIB.INF in the EMXVIEW.ZIP archive accompanying the EMX archives -on Hobbes or LEO). Be aware that I have exposed all the "mode" options -supported by EMX, but there are combinations that either cannot be -practically used by/in Python or have the potential to compromise your -system's stability. - -18. pythonpm.exe used to be just python.exe with the WINDOWAPI linker -option set in the pythonpm.def file. In practice, this turns out to do -nothing useful. - -I have written a replacement which wraps the Python DLL in a genuine -Presentation Manager application. This version actually runs the -Python interpreter in a separate thread from the PM shell, in order -that PythonPM has a functioning message queue as good PM apps should. -In its current state, PythonPM's window is hidden. It can be displayed, -although it will have no content as nothing is ever written to the -window. Only the "hide" button is available. Although the code -has support for shutting PythonPM down when the Python interpreter is -still busy (via the "control" menu), this is not well tested and given -comments I've come across in EMX documentation suggesting that the -thread killing operation has problems I would suggest caution in -relying on this capability. - -PythonPM processes commandline parameters normally. The standard input, -output and error streams are only useful if redirected, as PythonPM's -window is not a console in any form and so cannot accept or display -anything. This means that the -i option is ineffective. - -Because the Python thread doesn't create its own message queue, creating -PM Windows and performing most PM operations is not possible from within -this thread. How this will affect supporting PM extensions (such as -Tkinter using a PM port of Tcl/Tk, or wxPython using the PM port of -WxWindows) is still being researched. - -Note that os.fork() _DOES_NOT_WORK_ in PythonPM - SYS3175s are the result -of trying. os.spawnv() _does_ work. PythonPM passes all regression tests -that the standard Python interpreter (python.exe) passes, with the exception -of test_fork1 and test_socket which both attempt to use os.fork(). - -I very much want feedback on the performance, behaviour and utility of -PythonPM. I would like to add a PM console capability to it, but that -will be a non-trivial effort. I may be able to leverage the code in -Illya Vaes' Tcl/Tk port, which would make it easier. - -19. os.chdir() uses EMX's _chdir2(), which supports changing both drive -and directory at once. Similarly, os.getcwd() uses EMX's _getcwd() -which returns drive as well as path. - -20. pyconfig.h is installed in the Include subdirectory with all -other include files. - -21. the default build explicitly sets the number of file handles -available to a Python process to 250. EMX default is 40, which is -insufficient for the tempfile regression test (test_tempfile) which -tries to create 100 temporary files. - -This setting can be overridden via the EMXOPT environment variable: - set EMXOPT=-h250 -is equivalent to the setting currently used. The emxbind utility (if you -have it installed) can also be used to permanently change the setting in -python.exe - please refer to the EMX documentation for more information. - -22. a pure python strptime module is now part of the Python standard -library, superceding a platform specific extension module. This module -leverages the strftime module, and as a result test_strptime fails -due to the EMX strftime bug in item 20 above. - -23. test_posixpath attempts to exercise various Posix path related -functionality. Most of the sub-tests pass, but the "ismount" and -"samestat" subtests fail: -- EMX provides not satisfactory mount point emulation, so "ismount" - cannot succeed; -- EMX documents that successive stat() calls will produce different - results, so "samestat" cannot succeed. - -test_posixpath should skip these tests on EMX. - -24. I have reports of BitTorrent not working. It appears that the -EMX select() emulation, possibly in concert with bugs in the TCP/IP -stack, runs into problems under the stress imposed by this application. -I think it suffices to say that BitTorrent is a fair stress test of a -system's networking capability. - -25. In the absence of an EMX implementation of the link() function, I've -implemented a crude Python emulation, in the file -Lib/plat-os2emx/_emx_link.py. This is imported into the os module, and -becomes available as os.link() in the normal way. - -The emulation copies the source file in binary mode, and will fail if -disk space is exhausted. The call fails if the target already exists. -There are no guarantees to thread safety with this emulation - beware! - -The emulation was written to support a link() based file locking system -used in GNU Mailman. - -26. AF_UNIX sockets, otherwise known as Unix domain sockets, are now -supported. Unfortunately, there are some traps arising from the -implementation in IBM's TCP/IP stack:- -- the path name must start with '\\socket\\' ('/socket/' won't work!), - with the length of the full path name less than 108 characters; -- unlike Unix, the socket endpoints don't exist in the filesystem; -- by default, sockets are in binary mode. - -27. As of Python 2.4, the mpz, rotor and xreadlines modules have been -dropped from the Python source tree. - -28. The subprocess module was added to the standard library relatively -late in the 2.4 development cycle. Unfortunately I haven't had the -round tuits to adapt the module to the EMX environment yet, and -test_subprocess has a number of failures as a result. - -29. The default stack size for threads has been 64k. This is proving -insufficient for some codebases, such as Zope. The thread stack size -still defaults to 64k, but this can now be increased via the stack_size() -function exposed by the threading & thread modules as well as by defining -THREAD_STACK_SIZE to an appropriate value in the Makefile (which contains -a commented out definition for 128kB thread stacks). I have seen -references to heavy Zope/Plone usage requiring 1MB thread stacks on -FreeBSD and Linux, but doubt that for most likely usage on OS/2 that -more than 256kB is necessary. The size of the required stacks (main -and thread) can vary significantly depending on which version of gcc -is used along with the compiler optimisations selected. Note that the -main thread stack size is set during linking and is currently 2MB. - -... probably other issues that I've not encountered, or don't remember :-( - -If you encounter other difficulties with this port, which can be -characterised as peculiar to this port rather than to the Python release, -I would like to hear about them. However I cannot promise to be able to do -anything to resolve such problems. See the Contact section below... - - -To do... --------- - -In no particular order of apparent importance or likelihood... - -- support Tkinter and/or alternative GUI (wxWindows??) - - -Credits -------- - -In addition to people identified above, I'd like to thank: -- the BDFL, Guido van Rossum, and crew for Python; -- Dr David Mertz, for trying out a pre-release of this port; -- the Python-list/comp.lang.python community; -- John Poltorak, for input about pwd/grp. - -Contact -------- - -Constructive feedback, negative or positive, about this port is welcome -and should be addressed to me at the e-mail addresses below. - -I have a private mailing list for announcements of fixes & updates to -this port. If you wish to receive such e-mail announcments, please send -me an e-mail requesting that you be added to this list. - -Andrew MacIntyre -E-mail: andymac at bullseye.apana.org.au, or andymac at pcug.org.au -Web: http://www.andymac.org/ - -28 January, 2008. diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c deleted file mode 100644 --- a/PC/os2emx/config.c +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- C -*- *********************************************** -Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, -The Netherlands. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the names of Stichting Mathematisch -Centrum or CWI or Corporation for National Research Initiatives or -CNRI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -While CWI is the initial source for this software, a modified version -is made available by the Corporation for National Research Initiatives -(CNRI) at the Internet address ftp://ftp.python.org. - -STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH -CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -******************************************************************/ - -/* Module configuration */ - -/* This file contains the table of built-in modules. - See init_builtin() in import.c. */ - -#include "Python.h" - -extern void initos2(); -extern void initsignal(); -#ifdef WITH_THREAD -extern void init_thread(); -#endif -extern void init_codecs(); -extern void init_csv(); -extern void init_locale(); -extern void init_random(); -extern void init_sre(); -extern void init_symtable(); -extern void init_weakref(); -extern void initarray(); -extern void initbinascii(); -extern void initcollections(); -extern void initcmath(); -extern void initdatetime(); -extern void initdl(); -extern void initerrno(); -extern void initfcntl(); -extern void init_functools(); -extern void init_heapq(); -extern void initimageop(); -extern void inititertools(); -extern void initmath(); -extern void init_md5(); -extern void initoperator(); -extern void init_sha(); -extern void init_sha256(); -extern void init_sha512(); -extern void init_struct(); -extern void inittermios(); -extern void inittime(); -extern void initxxsubtype(); -extern void initzipimport(); -#if !HAVE_DYNAMIC_LOADING -extern void init_curses(); -extern void init_curses_panel(); -extern void init_testcapi(); -extern void initbz2(); -extern void initfpectl(); -extern void initfpetest(); -extern void initparser(); -extern void initpwd(); -extern void initunicodedata(); -extern void initzlib(); -#ifdef USE_SOCKET -extern void init_socket(); -extern void initselect(); -#endif -#endif -/* -- ADDMODULE MARKER 1 -- */ - -extern void PyMarshal_Init(); -extern void initimp(); -extern void initgc(); - -struct _inittab _PyImport_Inittab[] = { - - {"os2", initos2}, - {"signal", initsignal}, -#ifdef WITH_THREAD - {"_thread", init_thread}, -#endif - {"_codecs", init_codecs}, - {"_csv", init_csv}, - {"_locale", init_locale}, - {"_random", init_random}, - {"_sre", init_sre}, - {"_symtable", init_symtable}, - {"_weakref", init_weakref}, - {"array", initarray}, - {"binascii", initbinascii}, - {"collections", initcollections}, - {"cmath", initcmath}, - {"datetime", initdatetime}, - {"dl", initdl}, - {"errno", initerrno}, - {"fcntl", initfcntl}, - {"_functools", init_functools}, - {"_heapq", init_heapq}, - {"imageop", initimageop}, - {"itertools", inititertools}, - {"math", initmath}, - {"operator", initoperator}, - {"_sha256", init_sha256}, - {"_sha512", init_sha512}, - {"_struct", init_struct}, - {"termios", inittermios}, - {"time", inittime}, - {"xxsubtype", initxxsubtype}, - {"zipimport", initzipimport}, -#if !HAVE_DYNAMIC_LOADING - {"_curses", init_curses}, - {"_curses_panel", init_curses_panel}, - {"_testcapi", init_testcapi}, - {"bz2", initbz2}, - {"fpectl", initfpectl}, - {"fpetest", initfpetest}, - {"parser", initparser}, - {"pwd", initpwd}, - {"unicodedata", initunicodedata}, - {"zlib", initzlib}, -#ifdef USE_SOCKET - {"_socket", init_socket}, - {"select", initselect}, -#endif -#endif -/* -- ADDMODULE MARKER 2 -- */ - - /* This module "lives in" with marshal.c */ - {"marshal", PyMarshal_Init}, - - /* This lives it with import.c */ - {"_imp", initimp}, - - /* These entries are here for sys.builtin_module_names */ - {"builtins", NULL}, - {"sys", NULL}, - - /* This lives in gcmodule.c */ - {"gc", initgc}, - - /* Sentinel */ - {0, 0} -}; diff --git a/PC/os2emx/dlfcn.c b/PC/os2emx/dlfcn.c deleted file mode 100644 --- a/PC/os2emx/dlfcn.c +++ /dev/null @@ -1,223 +0,0 @@ -/* -*- C -*- *********************************************** -Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, -The Netherlands. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the names of Stichting Mathematisch -Centrum or CWI or Corporation for National Research Initiatives or -CNRI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -While CWI is the initial source for this software, a modified version -is made available by the Corporation for National Research Initiatives -(CNRI) at the Internet address ftp://ftp.python.org. - -STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH -CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -******************************************************************/ - -/* This library implements dlopen() - Unix-like dynamic linking - * emulation functions for OS/2 using DosLoadModule() and company. - */ - -#define INCL_DOS -#define INCL_DOSERRORS -#define INCL_DOSSESMGR -#define INCL_WINPROGRAMLIST -#define INCL_WINFRAMEMGR -#include - -#include -#include -#include -#include - -typedef struct _track_rec { - char *name; - HMODULE handle; - void *id; - struct _track_rec *next; -} tDLLchain, *DLLchain; - -static DLLchain dlload = NULL; /* A simple chained list of DLL names */ -static char dlerr [256]; /* last error text string */ -static void *last_id; - -static DLLchain find_id(void *id) -{ - DLLchain tmp; - - for (tmp = dlload; tmp; tmp = tmp->next) - if (id == tmp->id) - return tmp; - - return NULL; -} - -/* load a dynamic-link library and return handle */ -void *dlopen(char *filename, int flags) -{ - HMODULE hm; - DLLchain tmp; - char err[256]; - char *errtxt; - int rc = 0, set_chain = 0; - - for (tmp = dlload; tmp; tmp = tmp->next) - if (strnicmp(tmp->name, filename, 999) == 0) - break; - - if (!tmp) - { - tmp = (DLLchain) malloc(sizeof(tDLLchain)); - if (!tmp) - goto nomem; - tmp->name = strdup(filename); - tmp->next = dlload; - set_chain = 1; - } - - switch (rc = DosLoadModule((PSZ)&err, sizeof(err), filename, &hm)) - { - case NO_ERROR: - tmp->handle = hm; - if (set_chain) - { - do - last_id++; - while ((last_id == 0) || (find_id(last_id))); - tmp->id = last_id; - dlload = tmp; - } - return tmp->id; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - errtxt = "module `%s' not found"; - break; - case ERROR_TOO_MANY_OPEN_FILES: - case ERROR_NOT_ENOUGH_MEMORY: - case ERROR_SHARING_BUFFER_EXCEEDED: -nomem: - errtxt = "out of system resources"; - break; - case ERROR_ACCESS_DENIED: - errtxt = "access denied"; - break; - case ERROR_BAD_FORMAT: - case ERROR_INVALID_SEGMENT_NUMBER: - case ERROR_INVALID_ORDINAL: - case ERROR_INVALID_MODULETYPE: - case ERROR_INVALID_EXE_SIGNATURE: - case ERROR_EXE_MARKED_INVALID: - case ERROR_ITERATED_DATA_EXCEEDS_64K: - case ERROR_INVALID_MINALLOCSIZE: - case ERROR_INVALID_SEGDPL: - case ERROR_AUTODATASEG_EXCEEDS_64K: - case ERROR_RELOCSRC_CHAIN_EXCEEDS_SEGLIMIT: - errtxt = "invalid module format"; - break; - case ERROR_INVALID_NAME: - errtxt = "filename doesn't match module name"; - break; - case ERROR_SHARING_VIOLATION: - case ERROR_LOCK_VIOLATION: - errtxt = "sharing violation"; - break; - case ERROR_INIT_ROUTINE_FAILED: - errtxt = "module initialization failed"; - break; - default: - errtxt = "cause `%s', error code = %d"; - break; - } - snprintf(dlerr, sizeof(dlerr), errtxt, &err, rc); - if (tmp) - { - if (tmp->name) - free(tmp->name); - free(tmp); - } - return 0; -} - -/* return a pointer to the `symbol' in DLL */ -void *dlsym(void *handle, char *symbol) -{ - int rc = 0; - PFN addr; - char *errtxt; - int symord = 0; - DLLchain tmp = find_id(handle); - - if (!tmp) - goto inv_handle; - - if (*symbol == '#') - symord = atoi(symbol + 1); - - switch (rc = DosQueryProcAddr(tmp->handle, symord, symbol, &addr)) - { - case NO_ERROR: - return (void *)addr; - case ERROR_INVALID_HANDLE: -inv_handle: - errtxt = "invalid module handle"; - break; - case ERROR_PROC_NOT_FOUND: - case ERROR_INVALID_NAME: - errtxt = "no symbol `%s' in module"; - break; - default: - errtxt = "symbol `%s', error code = %d"; - break; - } - snprintf(dlerr, sizeof(dlerr), errtxt, symbol, rc); - return NULL; -} - -/* free dynamically-linked library */ -int dlclose(void *handle) -{ - int rc; - DLLchain tmp = find_id(handle); - - if (!tmp) - goto inv_handle; - - switch (rc = DosFreeModule(tmp->handle)) - { - case NO_ERROR: - free(tmp->name); - dlload = tmp->next; - free(tmp); - return 0; - case ERROR_INVALID_HANDLE: -inv_handle: - strcpy(dlerr, "invalid module handle"); - return -1; - case ERROR_INVALID_ACCESS: - strcpy(dlerr, "access denied"); - return -1; - default: - return -1; - } -} - -/* return a string describing last occurred dl error */ -char *dlerror() -{ - return dlerr; -} diff --git a/PC/os2emx/dlfcn.h b/PC/os2emx/dlfcn.h deleted file mode 100644 --- a/PC/os2emx/dlfcn.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- C -*- *********************************************** -Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, -The Netherlands. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the names of Stichting Mathematisch -Centrum or CWI or Corporation for National Research Initiatives or -CNRI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -While CWI is the initial source for this software, a modified version -is made available by the Corporation for National Research Initiatives -(CNRI) at the Internet address ftp://ftp.python.org. - -STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH -CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -******************************************************************/ - -/* This library implements dlopen() - Unix-like dynamic linking - * emulation functions for OS/2 using DosLoadModule() and company. - */ - -#ifndef _DLFCN_H -#define _DLFCN_H - -/* load a dynamic-link library and return handle */ -void *dlopen(char *filename, int flags); - -/* return a pointer to the `symbol' in DLL */ -void *dlsym(void *handle, char *symbol); - -/* free dynamically-linked library */ -int dlclose(void *handle); - -/* return a string describing last occurred dl error */ -char *dlerror(void); - -#endif /* !_DLFCN_H */ diff --git a/PC/os2emx/dllentry.c b/PC/os2emx/dllentry.c deleted file mode 100644 --- a/PC/os2emx/dllentry.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This is the entry point for the Python 2.3 core DLL. - */ - -#define NULL 0 - -#define REF(s) extern void s(); void *____ref_##s = &s; - -/* Make references to imported symbols to pull them from static library */ -REF(Py_Main); - -#include - -extern int _CRT_init(void); -extern void _CRT_term(void); -extern void __ctordtorInit(void); -extern void __ctordtorTerm(void); - -unsigned long _DLL_InitTerm(unsigned long mod_handle, unsigned long flag) -{ - switch (flag) - { - case 0: - if (_CRT_init()) - return 0; - __ctordtorInit(); - - /* Ignore fatal signals */ - signal(SIGSEGV, SIG_IGN); - signal(SIGFPE, SIG_IGN); - - return 1; - - case 1: - __ctordtorTerm(); - _CRT_term(); - return 1; - - default: - return 0; - } -} diff --git a/PC/os2emx/getpathp.c b/PC/os2emx/getpathp.c deleted file mode 100644 --- a/PC/os2emx/getpathp.c +++ /dev/null @@ -1,418 +0,0 @@ - -/* Return the initial module search path. */ -/* This version used by OS/2+EMX */ - -/* ---------------------------------------------------------------- - PATH RULES FOR OS/2+EMX: - This describes how sys.path is formed on OS/2+EMX. It describes the - functionality, not the implementation (ie, the order in which these - are actually fetched is different) - - * Python always adds an empty entry at the start, which corresponds - to the current directory. - - * If the PYTHONPATH env. var. exists, its entries are added next. - - * We attempt to locate the "Python Home" - if the PYTHONHOME env var - is set, we believe it. Otherwise, we use the path of our host .EXE's - to try and locate our "landmark" (lib\\os.py) and deduce our home. - - If we DO have a Python Home: The relevant sub-directories (Lib, - plat-win, etc) are based on the Python Home - - If we DO NOT have a Python Home, the core Python Path is - loaded from the registry. This is the main PythonPath key, - and both HKLM and HKCU are combined to form the path) - - * Iff - we can not locate the Python Home, and have not had a PYTHONPATH - specified (ie, we have _nothing_ we can assume is a good path), a - default path with relative entries is used (eg. .\Lib;.\plat-win, etc) - - - The end result of all this is: - * When running python.exe, or any other .exe in the main Python directory - (either an installed version, or directly from the PCbuild directory), - the core path is deduced. - - * When Python is hosted in another exe (different directory, embedded via - COM, etc), the Python Home will not be deduced, so the core path from - the registry is used. Other "application paths "in the registry are - always read. - - * If Python can't find its home and there is no registry (eg, frozen - exe, some very strange installation setup) you get a path with - some default, but relative, paths. - - ---------------------------------------------------------------- */ - - -#include "Python.h" -#include "osdefs.h" - -#ifndef PYOS_OS2 -#error This file only compilable on OS/2 -#endif - -#define INCL_DOS -#include - -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ - -/* Search in some common locations for the associated Python libraries. - * - * Py_GetPath() tries to return a sensible Python module search path. - * - * The approach is an adaptation for Windows of the strategy used in - * ../Modules/getpath.c; it uses the Windows Registry as one of its - * information sources. - */ - -#ifndef LANDMARK -#if defined(PYCC_GCC) -#define LANDMARK "lib/os.py" -#else -#define LANDMARK "lib\\os.py" -#endif -#endif - -static char prefix[MAXPATHLEN+1]; -static char progpath[MAXPATHLEN+1]; -static char *module_search_path = NULL; - - -static int -is_sep(char ch) /* determine if "ch" is a separator character */ -{ -#ifdef ALTSEP - return ch == SEP || ch == ALTSEP; -#else - return ch == SEP; -#endif -} - -/* assumes 'dir' null terminated in bounds. - * Never writes beyond existing terminator. - */ -static void -reduce(char *dir) -{ - size_t i = strlen(dir); - while (i > 0 && !is_sep(dir[i])) - --i; - dir[i] = '\0'; -} - -static int -exists(char *filename) -{ - struct stat buf; - return stat(filename, &buf) == 0; -} - -/* Is module (check for .pyc/.pyo too) - * Assumes 'filename' MAXPATHLEN+1 bytes long - - * may extend 'filename' by one character. - */ -static int -ismodule(char *filename) -{ - if (exists(filename)) - return 1; - - /* Check for the compiled version of prefix. */ - if (strlen(filename) < MAXPATHLEN) { - strcat(filename, Py_OptimizeFlag ? "o" : "c"); - if (exists(filename)) - return 1; - } - return 0; -} - -/* Add a path component, by appending stuff to buffer. - buffer must have at least MAXPATHLEN + 1 bytes allocated, and contain a - NUL-terminated string with no more than MAXPATHLEN characters (not counting - the trailing NUL). It's a fatal error if it contains a string longer than - that (callers must be careful!). If these requirements are met, it's - guaranteed that buffer will still be a NUL-terminated string with no more - than MAXPATHLEN characters at exit. If stuff is too long, only as much of - stuff as fits will be appended. -*/ - -static void -join(char *buffer, char *stuff) -{ - size_t n, k; - if (is_sep(stuff[0])) - n = 0; - else { - n = strlen(buffer); - if (n > 0 && !is_sep(buffer[n-1]) && n < MAXPATHLEN) - buffer[n++] = SEP; - } - if (n > MAXPATHLEN) - Py_FatalError("buffer overflow in getpathp.c's joinpath()"); - k = strlen(stuff); - if (n + k > MAXPATHLEN) - k = MAXPATHLEN - n; - strncpy(buffer+n, stuff, k); - buffer[n+k] = '\0'; -} - -/* gotlandmark only called by search_for_prefix, which ensures - * 'prefix' is null terminated in bounds. join() ensures - * 'landmark' can not overflow prefix if too long. - */ -static int -gotlandmark(char *landmark) -{ - int n, ok; - - n = strlen(prefix); - join(prefix, landmark); - ok = ismodule(prefix); - prefix[n] = '\0'; - return ok; -} - -/* assumes argv0_path is MAXPATHLEN+1 bytes long, already \0 term'd. - * assumption provided by only caller, calculate_path() - */ -static int -search_for_prefix(char *argv0_path, char *landmark) -{ - /* Search from argv0_path, until landmark is found */ - strcpy(prefix, argv0_path); - do { - if (gotlandmark(landmark)) - return 1; - reduce(prefix); - } while (prefix[0]); - return 0; -} - - -static void -get_progpath(void) -{ - extern char *Py_GetProgramName(void); - char *path = getenv("PATH"); - char *prog = Py_GetProgramName(); - - PPIB pib; - if ((DosGetInfoBlocks(NULL, &pib) == 0) && - (DosQueryModuleName(pib->pib_hmte, sizeof(progpath), progpath) == 0)) - return; - - if (prog == NULL || *prog == '\0') - prog = "python"; - - /* If there is no slash in the argv0 path, then we have to - * assume python is on the user's $PATH, since there's no - * other way to find a directory to start the search from. If - * $PATH isn't exported, you lose. - */ -#ifdef ALTSEP - if (strchr(prog, SEP) || strchr(prog, ALTSEP)) -#else - if (strchr(prog, SEP)) -#endif - strncpy(progpath, prog, MAXPATHLEN); - else if (path) { - while (1) { - char *delim = strchr(path, DELIM); - - if (delim) { - size_t len = delim - path; - /* ensure we can't overwrite buffer */ -#if !defined(PYCC_GCC) - len = min(MAXPATHLEN,len); -#else - len = MAXPATHLEN < len ? MAXPATHLEN : len; -#endif - strncpy(progpath, path, len); - *(progpath + len) = '\0'; - } - else - strncpy(progpath, path, MAXPATHLEN); - - /* join() is safe for MAXPATHLEN+1 size buffer */ - join(progpath, prog); - if (exists(progpath)) - break; - - if (!delim) { - progpath[0] = '\0'; - break; - } - path = delim + 1; - } - } - else - progpath[0] = '\0'; -} - -static void -calculate_path(void) -{ - char argv0_path[MAXPATHLEN+1]; - char *buf; - size_t bufsz; - char *pythonhome = Py_GetPythonHome(); - char *envpath = getenv("PYTHONPATH"); - char zip_path[MAXPATHLEN+1]; - size_t len; - - get_progpath(); - /* progpath guaranteed \0 terminated in MAXPATH+1 bytes. */ - strcpy(argv0_path, progpath); - reduce(argv0_path); - if (pythonhome == NULL || *pythonhome == '\0') { - if (search_for_prefix(argv0_path, LANDMARK)) - pythonhome = prefix; - else - pythonhome = NULL; - } - else - strncpy(prefix, pythonhome, MAXPATHLEN); - - if (envpath && *envpath == '\0') - envpath = NULL; - - /* Calculate zip archive path */ - strncpy(zip_path, progpath, MAXPATHLEN); - zip_path[MAXPATHLEN] = '\0'; - len = strlen(zip_path); - if (len > 4) { - zip_path[len-3] = 'z'; /* change ending to "zip" */ - zip_path[len-2] = 'i'; - zip_path[len-1] = 'p'; - } - else { - zip_path[0] = 0; - } - - /* We need to construct a path from the following parts. - * (1) the PYTHONPATH environment variable, if set; - * (2) the zip archive file path; - * (3) the PYTHONPATH config macro, with the leading "." - * of each component replaced with pythonhome, if set; - * (4) the directory containing the executable (argv0_path). - * The length calculation calculates #3 first. - */ - - /* Calculate size of return buffer */ - if (pythonhome != NULL) { - char *p; - bufsz = 1; - for (p = PYTHONPATH; *p; p++) { - if (*p == DELIM) - bufsz++; /* number of DELIM plus one */ - } - bufsz *= strlen(pythonhome); - } - else - bufsz = 0; - bufsz += strlen(PYTHONPATH) + 1; - bufsz += strlen(argv0_path) + 1; - bufsz += strlen(zip_path) + 1; - if (envpath != NULL) - bufsz += strlen(envpath) + 1; - - module_search_path = buf = malloc(bufsz); - if (buf == NULL) { - /* We can't exit, so print a warning and limp along */ - fprintf(stderr, "Can't malloc dynamic PYTHONPATH.\n"); - if (envpath) { - fprintf(stderr, "Using environment $PYTHONPATH.\n"); - module_search_path = envpath; - } - else { - fprintf(stderr, "Using default static path.\n"); - module_search_path = PYTHONPATH; - } - return; - } - - if (envpath) { - strcpy(buf, envpath); - buf = strchr(buf, '\0'); - *buf++ = DELIM; - } - if (zip_path[0]) { - strcpy(buf, zip_path); - buf = strchr(buf, '\0'); - *buf++ = DELIM; - } - - if (pythonhome == NULL) { - strcpy(buf, PYTHONPATH); - buf = strchr(buf, '\0'); - } - else { - char *p = PYTHONPATH; - char *q; - size_t n; - for (;;) { - q = strchr(p, DELIM); - if (q == NULL) - n = strlen(p); - else - n = q-p; - if (p[0] == '.' && is_sep(p[1])) { - strcpy(buf, pythonhome); - buf = strchr(buf, '\0'); - p++; - n--; - } - strncpy(buf, p, n); - buf += n; - if (q == NULL) - break; - *buf++ = DELIM; - p = q+1; - } - } - if (argv0_path) { - *buf++ = DELIM; - strcpy(buf, argv0_path); - buf = strchr(buf, '\0'); - } - *buf = '\0'; -} - - -/* External interface */ - -char * -Py_GetPath(void) -{ - if (!module_search_path) - calculate_path(); - return module_search_path; -} - -char * -Py_GetPrefix(void) -{ - if (!module_search_path) - calculate_path(); - return prefix; -} - -char * -Py_GetExecPrefix(void) -{ - return Py_GetPrefix(); -} - -char * -Py_GetProgramFullPath(void) -{ - if (!module_search_path) - calculate_path(); - return progpath; -} diff --git a/PC/os2emx/pyconfig.h b/PC/os2emx/pyconfig.h deleted file mode 100644 --- a/PC/os2emx/pyconfig.h +++ /dev/null @@ -1,332 +0,0 @@ -#ifndef Py_CONFIG_H -#define Py_CONFIG_H - -#error "PEP 11: OS/2 is now unsupported, code will be removed in Python 3.4" - -/* config.h. - * At some time in the past, generated automatically by/from configure. - * now maintained manually. - */ - -/* build environment */ -#define PLATFORM "os2emx" -#define COMPILER "[EMX GCC " __VERSION__ "]" -#define PYOS_OS2 1 -#define PYCC_GCC 1 - -/* default location(s) */ -#ifndef PREFIX -#define PREFIX "" -#endif -#ifndef PYTHONPATH -#define PYTHONPATH "./Lib;./Lib/plat-" PLATFORM \ - ";./Lib/lib-dynload;./Lib/site-packages" -#endif - -/* Debugging */ -#ifndef Py_DEBUG -/*#define Py_DEBUG 1*/ -#endif - -/* if building an extension or wrapper executable, - * mark Python API symbols "extern" so that symbols - * imported from the Python core DLL aren't duplicated. - */ -#ifdef Py_BUILD_CORE -# define PyAPI_FUNC(RTYPE) RTYPE -#else -# define PyAPI_FUNC(RTYPE) extern RTYPE -#endif -#define PyAPI_DATA(RTYPE) extern RTYPE -#define PyMODINIT_FUNC void - -/* Use OS/2 flavour of threads */ -#define WITH_THREAD 1 -#define OS2_THREADS 1 - -/* We want sockets */ -#define TCPIPV4 1 -#define USE_SOCKET 1 -#define socklen_t int -#define FD_SETSIZE 1024 - -/* enable the Python object allocator */ -#define WITH_PYMALLOC 1 - -/* enable the GC module */ -#define WITH_CYCLE_GC 1 - -/* Define if you want documentation strings in extension modules */ -#define WITH_DOC_STRINGS 1 - -/* Unicode related */ -#define PY_UNICODE_TYPE wchar_t -#define Py_UNICODE_SIZE SIZEOF_SHORT - -/* EMX defines ssize_t */ -#define HAVE_SSIZE_T 1 - -/* system capabilities */ -#define HAVE_TTYNAME 1 -#define HAVE_WAIT 1 -#define HAVE_GETEGID 1 -#define HAVE_GETEUID 1 -#define HAVE_GETGID 1 -#define HAVE_GETPPID 1 -#define HAVE_GETUID 1 -#define HAVE_OPENDIR 1 -#define HAVE_PIPE 1 -#define HAVE_POPEN 1 -#define HAVE_SYSTEM 1 -#define HAVE_TTYNAME 1 -#define HAVE_DYNAMIC_LOADING 1 - -/* if port of GDBM installed, it includes NDBM emulation */ -#define HAVE_NDBM_H 1 - -/* need this for spawnv code in posixmodule (cloned from WIN32 def'n) */ -typedef long intptr_t; - -/* we don't have tm_zone but do have the external array tzname */ -#define HAVE_TZNAME 1 - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define this if you have the type long long. */ -#define HAVE_LONG_LONG 1 - -/* Define if your compiler supports function prototypes. */ -#define HAVE_PROTOTYPES 1 - -/* Define if your compiler supports variable length function prototypes - * (e.g. void fprintf(FILE *, char *, ...);) *and* . - */ -#define HAVE_STDARG_PROTOTYPES 1 - -/* Define if malloc(0) returns a NULL pointer. */ -#define MALLOC_ZERO_RETURNS_NULL 1 - -/* Define to force use of thread-safe errno, h_errno, and other functions. */ -#define _REENTRANT 1 - -/* Define if you can safely include both and - * (which you can't on SCO ODT 3.0). - */ -#define SYS_SELECT_WITH_SYS_TIME 1 - -/* The number of bytes in an off_t. */ -#define SIZEOF_OFF_T 4 - -/* The number of bytes in an time_t. */ -#define SIZEOF_TIME_T 4 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long long. */ -#define SIZEOF_LONG_LONG 8 - -/* The number of bytes in a void *. */ -#define SIZEOF_VOID_P 4 - -/* The number of bytes in a size_t. */ -#define SIZEOF_SIZE_T 4 - -/* Define if you have the alarm function. */ -#define HAVE_ALARM 1 - -/* Define if you have the clock function. */ -#define HAVE_CLOCK 1 - -/* Define if you have the dup2 function. */ -#define HAVE_DUP2 1 - -/* Define if you have the execv function. */ -#define HAVE_EXECV 1 - -/* Define if you have the spawnv function. */ -#define HAVE_SPAWNV 1 - -/* Define if you have the flock function. */ -#define HAVE_FLOCK 1 - -/* Define if you have the fork function. */ -#define HAVE_FORK 1 - -/* Define if you have the fsync function. */ -#define HAVE_FSYNC 1 - -/* Define if you have the ftime function. */ -#define HAVE_FTIME 1 - -/* Define if you have the ftruncate function. */ -#define HAVE_FTRUNCATE 1 - -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 - -/* Define if you have the getpeername function. */ -#define HAVE_GETPEERNAME 1 - -/* Define if you have the getpgrp function. */ -#define HAVE_GETPGRP 1 - -/* Define if you have the getpid function. */ -#define HAVE_GETPID 1 - -/* Define if you have the getpwent function. */ -#define HAVE_GETPWENT 1 - -/* Define if you have the gettimeofday function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define if you have the getwd function. */ -#define HAVE_GETWD 1 - -/* Define if you have the hypot function. */ -#define HAVE_HYPOT 1 - -/* Define if you have the kill function. */ -#define HAVE_KILL 1 - -/* Define if you have the memmove function. */ -#define HAVE_MEMMOVE 1 - -/* Define if you have the mktime function. */ -#define HAVE_MKTIME 1 - -/* Define if you have the pause function. */ -#define HAVE_PAUSE 1 - -/* Define if you have the putenv function. */ -#define HAVE_PUTENV 1 - -/* Define if you have the select function. */ -#define HAVE_SELECT 1 - -/* Define if you have the setgid function. */ -#define HAVE_SETGID 1 - -/* Define if you have the setlocale function. */ -#define HAVE_SETLOCALE 1 - -/* Define if you have the setpgid function. */ -#define HAVE_SETPGID 1 - -/* Define if you have the setuid function. */ -#define HAVE_SETUID 1 - -/* Define if you have the setvbuf function. */ -#define HAVE_SETVBUF 1 - -/* Define if you have the sigaction function. */ -#define HAVE_SIGACTION 1 - -/* Define if you have the strerror function. */ -#define HAVE_STRERROR 1 - -/* Define if you have the strftime function. */ -#define HAVE_STRFTIME 1 - -/* Define if you have the tcgetpgrp function. */ -#define HAVE_TCGETPGRP 1 - -/* Define if you have the tcsetpgrp function. */ -#define HAVE_TCSETPGRP 1 - -/* Define if you have the tmpfile function. */ -#define HAVE_TMPFILE 1 - -/* Define if you have the times function. */ -#define HAVE_TIMES 1 - -/* Define if you have the truncate function. */ -#define HAVE_TRUNCATE 1 - -/* Define if you have the uname function. */ -#define HAVE_UNAME 1 - -/* Define if you have the waitpid function. */ -#define HAVE_WAITPID 1 - -/* Define if you have the header file. */ -#undef HAVE_CONIO_H - -/* Define if you have the header file. */ -#undef HAVE_DIRECT_H - -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have the header file. */ -#undef HAVE_IO_H - -/* Define if you have the header file. */ -#define HAVE_NCURSES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_PROCESS_H 1 - -/* Define if you have the header file. */ -#define HAVE_SIGNAL_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_FILE_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_TIMES_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_UN_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_UTSNAME_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you have the header file. */ -#define HAVE_UTIME_H 1 - -/* EMX has an snprintf(). */ -#define HAVE_SNPRINTF 1 - -#endif /* !Py_CONFIG_H */ - diff --git a/PC/os2emx/python34.def b/PC/os2emx/python34.def deleted file mode 100644 --- a/PC/os2emx/python34.def +++ /dev/null @@ -1,1314 +0,0 @@ -LIBRARY python34 INITINSTANCE TERMINSTANCE -DESCRIPTION "Python 2.6 Core DLL" -PROTMODE -DATA MULTIPLE NONSHARED -EXPORTS - -; From python34_s.lib(config) - "_PyImport_Inittab" - -; From python34_s.lib(dlfcn) -; "dlopen" -; "dlsym" -; "dlclose" -; "dlerror" - -; From python34_s.lib(getpathp) - "Py_GetProgramFullPath" - "Py_GetPrefix" - "Py_GetExecPrefix" - "Py_GetPath" - -; From python34_s.lib(getbuildinfo) - "Py_GetBuildInfo" - "_Py_svnversion" - -; From python34_s.lib(main) - "Py_Main" - "Py_GetArgcArgv" - -; From python34_s.lib(acceler) - "PyGrammar_AddAccelerators" - "PyGrammar_RemoveAccelerators" - -; From python34_s.lib(grammar1) - "PyGrammar_FindDFA" - "PyGrammar_LabelRepr" - -; From python34_s.lib(listnode) - "PyNode_ListTree" - -; From python34_s.lib(node) - "PyNode_New" - "PyNode_AddChild" - "PyNode_Free" - -; From python34_s.lib(parser) - "PyParser_AddToken" - "PyParser_New" - "PyParser_Delete" - -; From python34_s.lib(parsetok) - "PyParser_ParseString" - "PyParser_ParseStringFlagsFilename" - "PyParser_ParseFile" - "PyParser_ParseFileFlags" - "PyParser_ParseStringFlags" - -; From python34_s.lib(bitset) - "_Py_newbitset" - "_Py_delbitset" - "_Py_addbit" - "_Py_samebitset" - "_Py_mergebitset" - -; From python34_s.lib(metagrammar) - "_Py_meta_grammar" - "Py_meta_grammar" - -; From python34_s.lib(tokenizer) - "PyToken_OneChar" - "PyToken_TwoChars" - "PyToken_ThreeChars" - "PyTokenizer_FromString" - "PyTokenizer_Free" - "PyTokenizer_FromFile" - "PyTokenizer_Get" - "_PyParser_TokenNames" - -; From python34_s.lib(myreadline) - "_PyOS_ReadlineTState" - "PyOS_ReadlineFunctionPointer" - "PyOS_StdioReadline" - "PyOS_Readline" - "PyOS_InputHook" - -; From python34_s.lib(abstract) - "_PyObject_LengthHint" - "PyMapping_Size" - "PyObject_CallMethod" - "PyObject_GetItem" - "PySequence_GetItem" - "PyObject_SetItem" - "PySequence_SetItem" - "PyObject_DelItem" - "PySequence_DelItem" - "PyNumber_Multiply" - "PyNumber_InPlaceAdd" - "PyNumber_InPlaceMultiply" - "PyNumber_Int" - "PyNumber_Long" - "PyNumber_Float" - "PySequence_Concat" - "PySequence_Repeat" - "PySequence_InPlaceConcat" - "PySequence_InPlaceRepeat" - "PySequence_GetSlice" - "PySequence_SetSlice" - "PySequence_Tuple" - "PyObject_GetIter" - "PyIter_Next" - "PySequence_Fast" - "_PySequence_IterSearch" - "PyObject_CallFunction" - "_PyObject_CallFunction_SizeT" - "_PyObject_CallMethod_SizeT" - "PyObject_CallMethodObjArgs" - "PyObject_CallFunctionObjArgs" - "PyObject_Cmp" - "PyObject_Call" - "PyObject_CallObject" - "PyObject_Type" - "PyObject_Size" - "PyObject_Length" - "PyObject_DelItemString" - "PyObject_AsCharBuffer" - "PyObject_CheckReadBuffer" - "PyObject_AsReadBuffer" - "PyObject_AsWriteBuffer" - "PyNumber_Check" - "PyNumber_Add" - "PyNumber_Subtract" - "PyNumber_Divide" - "PyNumber_FloorDivide" - "PyNumber_TrueDivide" - "PyNumber_Remainder" - "PyNumber_Divmod" - "PyNumber_Power" - "PyNumber_Negative" - "PyNumber_Positive" - "PyNumber_Absolute" - "PyNumber_Invert" - "PyNumber_Lshift" - "PyNumber_Rshift" - "PyNumber_And" - "PyNumber_Xor" - "PyNumber_Or" - "PyNumber_Index" - "PyNumber_InPlaceSubtract" - "PyNumber_InPlaceDivide" - "PyNumber_InPlaceFloorDivide" - "PyNumber_InPlaceTrueDivide" - "PyNumber_InPlaceRemainder" - "PyNumber_InPlacePower" - "PyNumber_InPlaceLshift" - "PyNumber_InPlaceRshift" - "PyNumber_InPlaceAnd" - "PyNumber_InPlaceXor" - "PyNumber_InPlaceOr" - "PySequence_Check" - "PySequence_Size" - "PySequence_Length" - "PySequence_DelSlice" - "PySequence_List" - "PySequence_Count" - "PySequence_Contains" - "PySequence_In" - "PySequence_Index" - "PyMapping_Check" - "PyMapping_Length" - "PyMapping_HasKeyString" - "PyMapping_HasKey" - "PyMapping_GetItemString" - "PyMapping_SetItemString" - "PyObject_IsInstance" - "PyObject_IsSubclass" - -; From python34_s.lib(boolobject) - "PyBool_FromLong" - "PyBool_Type" - "_Py_ZeroStruct" - "_Py_TrueStruct" - -; From python34_s.lib(bufferobject) - "PyBuffer_FromObject" - "PyBuffer_FromReadWriteObject" - "PyBuffer_FromMemory" - "PyBuffer_FromReadWriteMemory" - "PyBuffer_New" - "PyBuffer_Type" - -; From python34_s.lib(cellobject) - "PyCell_New" - "PyCell_Get" - "PyCell_Set" - "PyCell_Type" - -; From python34_s.lib(classobject) - "PyClass_New" - "PyClass_IsSubclass" - "PyInstance_New" - "PyInstance_NewRaw" - "PyMethod_New" - "PyMethod_Function" - "PyMethod_Self" - "PyMethod_Class" - "_PyInstance_Lookup" - "PyMethod_Fini" - "PyClass_Type" - "PyInstance_Type" - "PyMethod_Type" - -; From python34_s.lib(capsule) - "PyCapsule_GetContext" - "PyCapsule_GetDestructor" - "PyCapsule_GetName" - "PyCapsule_GetPointer" - "PyCapsule_Import" - "PyCapsule_IsValid" - "PyCapsule_New" - "PyCapsule_SetContext" - "PyCapsule_SetDestructor" - "PyCapsule_SetName" - "PyCapsule_SetPointer" - -; From python34_s.lib(cobject) - "PyCObject_FromVoidPtr" - "PyCObject_FromVoidPtrAndDesc" - "PyCObject_AsVoidPtr" - "PyCObject_GetDesc" - "PyCObject_Import" - "PyCObject_SetVoidPtr" - "PyCObject_Type" - -; From python34_s.lib(codeobject) - "PyCode_New" - "PyCode_Addr2Line" - "PyCode_CheckLineNumber" - "PyCode_Type" - -; From python34_s.lib(complexobject) - "_Py_c_pow" - "_Py_c_sum" - "_Py_c_diff" - "_Py_c_neg" - "_Py_c_prod" - "_Py_c_quot" - "PyComplex_FromCComplex" - "PyComplex_FromDoubles" - "PyComplex_RealAsDouble" - "PyComplex_ImagAsDouble" - "PyComplex_AsCComplex" - "PyComplex_Type" - -; From python34_s.lib(descrobject) - "PyWrapper_New" - "PyDescr_NewMethod" - "PyDescr_NewClassMethod" - "PyDescr_NewMember" - "PyDescr_NewGetSet" - "PyDescr_NewWrapper" - "PyDictProxy_New" - "PyWrapperDescr_Type" - "PyProperty_Type" - -; From python34_s.lib(dictobject) - "PyDict_New" - "PyDict_GetItem" - "PyDict_SetItem" - "PyDict_DelItem" - "PyDict_Clear" - "PyDict_MergeFromSeq2" - "PyDict_Merge" - "PyDict_Keys" - "PyDict_Values" - "PyDict_Contains" - "PyDict_Next" - "PyDict_Items" - "PyDict_Size" - "PyDict_Copy" - "PyDict_Update" - "PyDict_GetItemString" - "PyDict_SetItemString" - "PyDict_DelItemString" - "PyDict_Type" - "PyDictIterKey_Type" - "PyDictIterValue_Type" - "PyDictIterItem_Type" - -; From python34_s.lib(enumobject) - "PyEnum_Type" - "PyReversed_Type" - -; From python34_s.lib(fileobject) - "PyFile_FromString" - "Py_UniversalNewlineFread" - "PyFile_GetLine" - "PyFile_SoftSpace" - "PyFile_WriteObject" - "PyFile_WriteString" - "PyObject_AsFileDescriptor" - "Py_UniversalNewlineFgets" - "PyFile_SetBufSize" - "PyFile_SetEncoding" - "PyFile_FromFile" - "PyFile_AsFile" - "PyFile_Name" - "PyFile_Type" - -; From python34_s.lib(floatobject) - "PyFloat_FromString" - "PyFloat_AsDouble" - "PyFloat_Fini" - "_PyFloat_Pack4" - "_PyFloat_Pack8" - "_PyFloat_Unpack4" - "_PyFloat_Unpack8" - "PyFloat_FromDouble" - "PyFloat_AsReprString" - "PyFloat_AsString" - "_PyFloat_Init" - "PyFloat_AsStringEx" - "PyFloat_Type" - -; From python34_s.lib(frameobject) - "PyFrame_New" - "PyFrame_FastToLocals" - "PyFrame_LocalsToFast" - "_PyFrame_Init" - "PyFrame_Fini" - "PyFrame_BlockSetup" - "PyFrame_BlockPop" - "PyFrame_Type" - -; From python34_s.lib(funcobject) - "PyFunction_New" - "PyFunction_GetCode" - "PyFunction_GetGlobals" - "PyFunction_GetModule" - "PyFunction_GetDefaults" - "PyFunction_SetDefaults" - "PyFunction_GetClosure" - "PyFunction_SetClosure" - "PyClassMethod_New" - "PyStaticMethod_New" - "PyFunction_Type" - "PyClassMethod_Type" - "PyStaticMethod_Type" - -; From python34_s.lib(genobject) - "PyGen_New" - "PyGen_NeedsFinalizing" - "PyGen_Type" - -; From python34_s.lib(intobject) - "PyInt_AsLong" - "PyInt_AsUnsignedLongMask" - "PyInt_AsUnsignedLongLongMask" - "PyInt_FromString" - "PyInt_AsSsize_t" - "PyInt_Fini" - "PyInt_FromUnicode" - "PyInt_FromLong" - "PyInt_FromSize_t" - "PyInt_FromSsize_t" - "PyInt_GetMax" - "_PyInt_Init" - "PyInt_Type" - -; From python34_s.lib(iterobject) - "PySeqIter_New" - "PyCallIter_New" - "PySeqIter_Type" - "PyCallIter_Type" - -; From python34_s.lib(listobject) - "PyList_New" - "PyList_Append" - "PyList_Size" - "PyList_GetItem" - "PyList_SetItem" - "PyList_Insert" - "PyList_GetSlice" - "PyList_SetSlice" - "PyList_Sort" - "PyList_Reverse" - "PyList_AsTuple" - "_PyList_Extend" - "PyList_Fini" - "PyList_Type" - "PyListIter_Type" - "PyListRevIter_Type" - -; From python34_s.lib(longobject) - "PyLong_FromDouble" - "PyLong_AsLong" - "_PyLong_AsSsize_t" - "PyLong_AsUnsignedLong" - "_PyLong_FromByteArray" - "_PyLong_AsByteArray" - "PyLong_AsDouble" - "PyLong_FromLongLong" - "PyLong_AsLongLong" - "PyLong_FromString" - "PyLong_FromLong" - "PyLong_FromUnsignedLong" - "PyLong_AsUnsignedLongMask" - "_PyLong_FromSize_t" - "_PyLong_FromSsize_t" - "_PyLong_AsScaledDouble" - "PyLong_FromVoidPtr" - "PyLong_AsVoidPtr" - "PyLong_FromUnsignedLongLong" - "PyLong_AsUnsignedLongLong" - "PyLong_AsUnsignedLongLongMask" - "PyLong_FromUnicode" - "_PyLong_Sign" - "_PyLong_NumBits" - "_PyLong_New" - "_PyLong_Copy" - "PyLong_Type" - "_PyLong_DigitValue" - -; From python34_s.lib(methodobject) - "PyCFunction_Call" - "Py_FindMethodInChain" - "PyCFunction_GetFunction" - "PyCFunction_GetSelf" - "PyCFunction_GetFlags" - "Py_FindMethod" - "PyCFunction_NewEx" - "PyCFunction_Fini" - "PyCFunction_New" - "PyCFunction_Type" - -; From python34_s.lib(moduleobject) - "PyModule_New" - "_PyModule_Clear" - "PyModule_GetDict" - "PyModule_GetName" - "PyModule_GetFilename" - "PyModule_Type" - -; From python34_s.lib(object) - "Py_DivisionWarningFlag" - "PyObject_Str" - "PyObject_Repr" - "_PyObject_Str" - "PyObject_Unicode" - "PyObject_GetAttr" - "PyObject_IsTrue" - "PyNumber_CoerceEx" - "PyObject_Compare" - "PyObject_RichCompare" - "_Py_HashDouble" - "PyObject_Hash" - "PyObject_SetAttr" - "PyObject_GenericGetAttr" - "PyObject_GenericSetAttr" - "PyCallable_Check" - "PyObject_Dir" - "PyMem_Malloc" - "PyMem_Realloc" - "PyMem_Free" - "PyObject_Print" - "_PyObject_Dump" - "PyObject_RichCompareBool" - "PyObject_GetAttrString" - "PyObject_SetAttrString" - "PyObject_HasAttrString" - "PyObject_HasAttr" - "_PyObject_GetDictPtr" - "PyObject_SelfIter" - "PyObject_Not" - "PyNumber_Coerce" - "Py_ReprEnter" - "Py_ReprLeave" - "_Py_HashPointer" - "Py_IncRef" - "Py_DecRef" - "_PyTrash_deposit_object" - "_PyTrash_destroy_chain" - "PyObject_Init" - "PyObject_InitVar" - "_PyObject_New" - "_PyObject_NewVar" - "_PyObject_Del" - "_Py_ReadyTypes" - "_Py_SwappedOp" - "_Py_NotImplementedStruct" - "_Py_NoneStruct" - "_Py_cobject_hack" - "_Py_abstract_hack" - "_PyTrash_delete_nesting" - "_PyTrash_delete_later" - -; From python34_s.lib(obmalloc) - "PyObject_Malloc" - "PyObject_Free" - "PyObject_Realloc" - -; From python34_s.lib(rangeobject) - "PyRange_Type" - -; From python34_s.lib(setobject) - "PySet_Pop" - "PySet_New" - "PyFrozenSet_New" - "PySet_Size" - "PySet_Clear" - "PySet_Contains" - "PySet_Discard" - "PySet_Add" - "_PySet_Next" - "_PySet_Update" - "PySet_Fini" - "PySet_Type" - "PyFrozenSet_Type" - -; From python34_s.lib(sliceobject) - "_PySlice_FromIndices" - "PySlice_GetIndices" - "PySlice_GetIndicesEx" - "PySlice_New" - "_Py_EllipsisObject" - "PySlice_Type" - -; From python34_s.lib(stringobject) - "PyString_FromStringAndSize" - "PyString_InternInPlace" - "PyString_FromString" - "PyString_FromFormatV" - "PyString_AsString" - "_PyString_Resize" - "PyString_FromFormat" - "PyString_AsDecodedString" - "PyString_AsEncodedString" - "PyString_DecodeEscape" - "PyString_Repr" - "PyString_AsStringAndSize" - "_PyString_FormatLong" - "PyString_Format" - "_Py_ReleaseInternedStrings" - "PyString_Size" - "PyString_Concat" - "PyString_ConcatAndDel" - "_PyString_Eq" - "PyString_InternImmortal" - "PyString_InternFromString" - "_PyString_Join" - "PyString_Decode" - "PyString_Encode" - "PyString_AsEncodedObject" - "PyString_AsDecodedObject" - "PyString_Fini" - "PyString_Type" - "PyBaseString_Type" - -; From python34_s.lib(structseq) - "PyStructSequence_InitType" - "PyStructSequence_New" - "PyStructSequence_UnnamedField" - -; From python34_s.lib(tupleobject) - "PyTuple_New" - "PyTuple_Pack" - "_PyTuple_Resize" - "PyTuple_Size" - "PyTuple_GetItem" - "PyTuple_SetItem" - "PyTuple_GetSlice" - "PyTuple_Fini" - "PyTuple_Type" - "PyTupleIter_Type" - -; From python34_s.lib(typeobject) - "PyType_IsSubtype" - "_PyType_Lookup" - "PyType_Ready" - "PyType_GenericAlloc" - "_PyObject_SlotCompare" - "PyType_GenericNew" - "PyType_Type" - "PyBaseObject_Type" - "PySuper_Type" - -; From python34_s.lib(unicodeobject) - "PyUnicodeUCS2_Resize" - "PyUnicodeUCS2_FromOrdinal" - "PyUnicodeUCS2_FromObject" - "PyUnicodeUCS2_FromEncodedObject" - "PyUnicodeUCS2_Decode" - "PyUnicodeUCS2_GetDefaultEncoding" - "PyUnicodeUCS2_DecodeUTF8" - "PyUnicodeUCS2_DecodeLatin1" - "PyUnicodeUCS2_DecodeASCII" - "PyUnicodeUCS2_AsEncodedString" - "PyUnicodeUCS2_AsUTF8String" - "PyUnicodeUCS2_AsLatin1String" - "PyUnicodeUCS2_AsASCIIString" - "PyUnicode_DecodeUTF7" - "PyUnicode_EncodeUTF7" - "PyUnicodeUCS2_DecodeUTF8Stateful" - "PyUnicodeUCS2_EncodeUTF8" - "PyUnicodeUCS2_DecodeUTF16Stateful" - "PyUnicodeUCS2_AsUTF16String" - "PyUnicodeUCS2_DecodeUnicodeEscape" - "PyUnicodeUCS2_DecodeRawUnicodeEscape" - "PyUnicodeUCS2_EncodeRawUnicodeEscape" - "_PyUnicode_DecodeUnicodeInternal" - "PyUnicodeUCS2_DecodeCharmap" - "PyUnicode_BuildEncodingMap" - "PyUnicodeUCS2_EncodeCharmap" - "PyUnicodeUCS2_TranslateCharmap" - "PyUnicodeUCS2_EncodeDecimal" - "PyUnicodeUCS2_Count" - "PyUnicodeUCS2_Find" - "PyUnicodeUCS2_Join" - "PyUnicodeUCS2_Splitlines" - "PyUnicodeUCS2_Compare" - "PyUnicodeUCS2_Contains" - "PyUnicodeUCS2_Concat" - "_PyUnicode_XStrip" - "PyUnicodeUCS2_Replace" - "PyUnicodeUCS2_Split" - "PyUnicodeUCS2_RSplit" - "PyUnicodeUCS2_Format" - "_PyUnicodeUCS2_Init" - "_PyUnicodeUCS2_Fini" - "PyUnicodeUCS2_FromUnicode" - "PyUnicodeUCS2_AsUnicode" - "PyUnicodeUCS2_GetSize" - "PyUnicodeUCS2_GetMax" - "_PyUnicodeUCS2_AsDefaultEncodedString" - "PyUnicodeUCS2_SetDefaultEncoding" - "PyUnicodeUCS2_Encode" - "PyUnicodeUCS2_AsEncodedObject" - "PyUnicodeUCS2_DecodeUTF16" - "PyUnicodeUCS2_EncodeUTF16" - "PyUnicodeUCS2_AsUnicodeEscapeString" - "PyUnicodeUCS2_EncodeUnicodeEscape" - "PyUnicodeUCS2_AsRawUnicodeEscapeString" - "PyUnicodeUCS2_EncodeLatin1" - "PyUnicodeUCS2_EncodeASCII" - "PyUnicodeUCS2_AsCharmapString" - "PyUnicodeUCS2_Partition" - "PyUnicodeUCS2_RPartition" - "PyUnicodeUCS2_Translate" - "PyUnicodeUCS2_Tailmatch" - "PyUnicode_AsDecodedObject" - "PyUnicode_Type" - -; From python34_s.lib(unicodectype) - "_PyUnicode_TypeRecords" - "_PyUnicodeUCS2_ToNumeric" - "_PyUnicodeUCS2_IsLowercase" - "_PyUnicodeUCS2_IsUppercase" - "_PyUnicodeUCS2_IsTitlecase" - "_PyUnicodeUCS2_IsWhitespace" - "_PyUnicodeUCS2_IsLinebreak" - "_PyUnicodeUCS2_ToLowercase" - "_PyUnicodeUCS2_ToUppercase" - "_PyUnicodeUCS2_ToTitlecase" - "_PyUnicodeUCS2_ToDecimalDigit" - "_PyUnicodeUCS2_ToDigit" - "_PyUnicodeUCS2_IsDecimalDigit" - "_PyUnicodeUCS2_IsDigit" - "_PyUnicodeUCS2_IsNumeric" - "_PyUnicodeUCS2_IsAlpha" - -; From python34_s.lib(weakrefobject) - "PyWeakref_NewRef" - "PyWeakref_NewProxy" - "PyObject_ClearWeakRefs" - "PyWeakref_GetObject" - "_PyWeakref_GetWeakrefCount" - "_PyWeakref_ClearRef" - "_PyWeakref_RefType" - "_PyWeakref_ProxyType" - "_PyWeakref_CallableProxyType" - -; From python34_s.lib(Python-ast) -; "init_ast" - "Module" - "Interactive" - "Expression" - "Suite" - "FunctionDef" - "ClassDef" - "Return" - "Delete" - "Assign" - "AugAssign" - "Print" - "For" - "While" - "If" - "With" - "Raise" - "TryExcept" - "TryFinally" - "Assert" - "Import" - "ImportFrom" - "Exec" - "Global" - "Expr" - "Pass" - "Break" - "Continue" - "BoolOp" - "BinOp" - "UnaryOp" - "Lambda" - "IfExp" - "Dict" - "ListComp" - "GeneratorExp" - "Yield" - "Compare" - "Call" - "Repr" - "Num" - "Str" - "Attribute" - "Subscript" - "Name" - "List" - "Tuple" - "Ellipsis" - "Slice" - "ExtSlice" - "Index" - "comprehension" - "excepthandler" - "arguments" - "keyword" - "alias" - "PyAST_mod2obj" - -; From python34_s.lib(asdl) - "asdl_seq_new" - "asdl_int_seq_new" - -; From python34_s.lib(ast) - "PyAST_FromNode" - -; From python34_s.lib(bltinmodule) - "_PyBuiltin_Init" - "Py_FileSystemDefaultEncoding" - -; From python34_s.lib(exceptions) - "PyUnicodeEncodeError_GetStart" - "PyUnicodeDecodeError_GetStart" - "PyUnicodeEncodeError_GetEnd" - "PyUnicodeDecodeError_GetEnd" - "_PyExc_Init" - "PyUnicodeDecodeError_Create" - "PyUnicodeEncodeError_Create" - "PyUnicodeTranslateError_Create" - "PyUnicodeEncodeError_GetEncoding" - "PyUnicodeDecodeError_GetEncoding" - "PyUnicodeEncodeError_GetObject" - "PyUnicodeDecodeError_GetObject" - "PyUnicodeTranslateError_GetObject" - "PyUnicodeTranslateError_GetStart" - "PyUnicodeEncodeError_SetStart" - "PyUnicodeDecodeError_SetStart" - "PyUnicodeTranslateError_SetStart" - "PyUnicodeTranslateError_GetEnd" - "PyUnicodeEncodeError_SetEnd" - "PyUnicodeDecodeError_SetEnd" - "PyUnicodeTranslateError_SetEnd" - "PyUnicodeEncodeError_GetReason" - "PyUnicodeDecodeError_GetReason" - "PyUnicodeTranslateError_GetReason" - "PyUnicodeEncodeError_SetReason" - "PyUnicodeDecodeError_SetReason" - "PyUnicodeTranslateError_SetReason" - "_PyExc_Fini" - "PyExc_BaseException" - "PyExc_Exception" - "PyExc_StandardError" - "PyExc_TypeError" - "PyExc_StopIteration" - "PyExc_GeneratorExit" - "PyExc_SystemExit" - "PyExc_KeyboardInterrupt" - "PyExc_ImportError" - "PyExc_EnvironmentError" - "PyExc_IOError" - "PyExc_OSError" - "PyExc_EOFError" - "PyExc_RuntimeError" - "PyExc_NotImplementedError" - "PyExc_NameError" - "PyExc_UnboundLocalError" - "PyExc_AttributeError" - "PyExc_IndexError" - "PyExc_SyntaxError" - "PyExc_IndentationError" - "PyExc_TabError" - "PyExc_LookupError" - "PyExc_KeyError" - "PyExc_ValueError" - "PyExc_UnicodeError" - "PyExc_UnicodeEncodeError" - "PyExc_UnicodeDecodeError" - "PyExc_UnicodeTranslateError" - "PyExc_AssertionError" - "PyExc_ArithmeticError" - "PyExc_FloatingPointError" - "PyExc_OverflowError" - "PyExc_ZeroDivisionError" - "PyExc_SystemError" - "PyExc_ReferenceError" - "PyExc_MemoryError" - "PyExc_Warning" - "PyExc_UserWarning" - "PyExc_DeprecationWarning" - "PyExc_PendingDeprecationWarning" - "PyExc_SyntaxWarning" - "PyExc_RuntimeWarning" - "PyExc_FutureWarning" - "PyExc_ImportWarning" - "PyExc_MemoryErrorInst" - -; From python34_s.lib(ceval) - "PyEval_EvalFrameEx" - "PyEval_CallObjectWithKeywords" - "PyEval_EvalCodeEx" - "PyEval_GetFrame" - "PyEval_CallObject" - "PyEval_SetProfile" - "PyEval_SetTrace" - "PyEval_GetBuiltins" - "PyEval_GetGlobals" - "PyEval_GetLocals" - "PyEval_GetRestricted" - "PyEval_MergeCompilerFlags" - "Py_FlushLine" - "Py_AddPendingCall" - "Py_MakePendingCalls" - "Py_SetRecursionLimit" - "Py_GetRecursionLimit" - "_Py_CheckRecursiveCall" - "PyEval_GetFuncName" - "PyEval_GetFuncDesc" - "PyEval_GetCallStats" - "PyEval_EvalFrame" - "PyEval_SaveThread" - "PyEval_RestoreThread" - "PyEval_ThreadsInitialized" - "PyEval_InitThreads" - "PyEval_AcquireLock" - "PyEval_ReleaseLock" - "PyEval_AcquireThread" - "PyEval_ReleaseThread" - "PyEval_ReInitThreads" - "_PyEval_SliceIndex" - "PyEval_EvalCode" - "_PyEval_CallTracing" - "_Py_CheckRecursionLimit" - "_Py_CheckInterval" - "_Py_Ticker" - -; From python34_s.lib(compile) - "_Py_Mangle" - "PyAST_Compile" - "PyNode_Compile" - "Py_OptimizeFlag" - -; From python34_s.lib(codecs) - "_PyCodec_Lookup" - "PyCodec_Encode" - "PyCodec_Decode" - "PyCodec_IgnoreErrors" - "PyCodec_ReplaceErrors" - "PyCodec_XMLCharRefReplaceErrors" - "PyCodec_BackslashReplaceErrors" - "PyCodec_Register" - "PyCodec_Encoder" - "PyCodec_Decoder" - "PyCodec_IncrementalEncoder" - "PyCodec_IncrementalDecoder" - "PyCodec_StreamReader" - "PyCodec_StreamWriter" - "PyCodec_RegisterError" - "PyCodec_LookupError" - "PyCodec_StrictErrors" - -; From python34_s.lib(errors) - "PyErr_SetNone" - "PyErr_SetString" - "PyErr_GivenExceptionMatches" - "PyErr_NormalizeException" - "PyErr_Fetch" - "PyErr_Clear" - "PyErr_NoMemory" - "PyErr_SetFromErrnoWithFilenameObject" - "PyErr_Format" - "PyErr_NewException" - "PyErr_WriteUnraisable" - "PyErr_SyntaxLocation" - "PyErr_ProgramText" - "PyErr_SetObject" - "PyErr_Occurred" - "PyErr_Restore" - "PyErr_ExceptionMatches" - "PyErr_BadArgument" - "PyErr_SetFromErrno" - "PyErr_SetFromErrnoWithFilename" - "PyErr_BadInternalCall" - "_PyErr_BadInternalCall" - "PyErr_Warn" - "PyErr_WarnExplicit" - -; From python34_s.lib(frozen) - "PyImport_FrozenModules" - -; From python34_s.lib(frozenmain) - "Py_FrozenMain" - -; From python34_s.lib(future) - "PyFuture_FromAST" - -; From python34_s.lib(getargs) - "PyArg_Parse" - "_PyArg_Parse_SizeT" - "PyArg_ParseTuple" - "_PyArg_ParseTuple_SizeT" - "PyArg_ParseTupleAndKeywords" - "_PyArg_ParseTupleAndKeywords_SizeT" - "PyArg_UnpackTuple" - "_PyArg_NoKeywords" - "PyArg_VaParse" - "PyArg_VaParseTupleAndKeywords" - "_PyArg_VaParse_SizeT" - "_PyArg_VaParseTupleAndKeywords_SizeT" - -; From python34_s.lib(getcompiler) - "Py_GetCompiler" - -; From python34_s.lib(getcopyright) - "Py_GetCopyright" - -; From python34_s.lib(getplatform) - "Py_GetPlatform" - -; From python34_s.lib(getversion) - "Py_GetVersion" - -; From python34_s.lib(graminit) - "_PyParser_Grammar" - -; From python34_s.lib(import) - "_PyImport_Init" - "_PyImportHooks_Init" - "PyImport_ImportModule" - "PyImport_Cleanup" - "_PyImport_FixupExtension" - "PyImport_AddModule" - "PyImport_ExecCodeModuleEx" - "PyImport_ImportFrozenModule" - "PyImport_ImportModuleEx" - "PyImport_ImportModuleLevel" - "PyImport_ReloadModule" - "PyImport_Import" -; "initimp" - "_PyImport_Fini" - "PyImport_GetMagicNumber" - "PyImport_ExecCodeModule" - "PyImport_GetModuleDict" - "_PyImport_FindModule" - "_PyImport_IsScript" - "_PyImport_ReInitLock" - "_PyImport_FindExtension" - "PyImport_AppendInittab" - "PyImport_ExtendInittab" - "PyImport_Inittab" - "_PyImport_Filetab" - -; From python34_s.lib(importdl) - "_PyImport_LoadDynamicModule" - -; From python34_s.lib(marshal) - "PyMarshal_ReadLongFromFile" - "PyMarshal_WriteObjectToString" - "PyMarshal_WriteLongToFile" - "PyMarshal_WriteObjectToFile" - "PyMarshal_ReadShortFromFile" - "PyMarshal_ReadObjectFromFile" - "PyMarshal_ReadLastObjectFromFile" - "PyMarshal_ReadObjectFromString" - "PyMarshal_Init" - -; From python34_s.lib(modsupport) - "Py_InitModule4" - "Py_BuildValue" - "_Py_BuildValue_SizeT" - "PyEval_CallFunction" - "PyEval_CallMethod" - "_Py_VaBuildValue_SizeT" - "Py_VaBuildValue" - "PyModule_AddObject" - "PyModule_AddIntConstant" - "PyModule_AddStringConstant" - "_Py_PackageContext" - -; From python34_s.lib(mysnprintf) - "PyOS_snprintf" - "PyOS_vsnprintf" - -; From python34_s.lib(mystrtoul) - "PyOS_strtoul" - "PyOS_strtol" - -; From python34_s.lib(pyarena) - "PyArena_New" - "PyArena_Free" - "PyArena_Malloc" - "PyArena_AddPyObject" - -; From python34_s.lib(pyfpe) - "PyFPE_dummy" - -; From python34_s.lib(pystate) - "PyInterpreterState_Clear" - "PyThreadState_Clear" - "_PyThread_CurrentFrames" - "PyGILState_Ensure" - "PyGILState_Release" - "PyInterpreterState_New" - "PyInterpreterState_Delete" - "PyThreadState_Delete" - "PyThreadState_New" - "PyThreadState_DeleteCurrent" - "PyThreadState_Get" - "PyThreadState_Swap" - "PyThreadState_GetDict" - "PyThreadState_SetAsyncExc" - "PyGILState_GetThisThreadState" - "PyInterpreterState_Head" - "PyInterpreterState_Next" - "PyInterpreterState_ThreadHead" - "PyThreadState_Next" - "_PyGILState_Init" - "_PyGILState_Fini" - "_PyThreadState_Current" - "_PyThreadState_GetFrame" - -; From python34_s.lib(pythonrun) - "Py_IgnoreEnvironmentFlag" - "Py_DebugFlag" - "Py_VerboseFlag" - "Py_NoSiteFlag" - "Py_InteractiveFlag" - "Py_FrozenFlag" - "Py_InitializeEx" - "Py_FatalError" - "Py_NewInterpreter" - "PyErr_Print" - "PyRun_InteractiveOneFlags" - "PyParser_ASTFromFile" - "PyRun_SimpleFileExFlags" - "PyRun_FileExFlags" - "Py_Exit" - "PyErr_PrintEx" - "PyErr_Display" - "Py_SetProgramName" - "Py_GetProgramName" - "Py_SetPythonHome" - "Py_GetPythonHome" - "Py_Initialize" - "Py_Finalize" - "Py_IsInitialized" - "Py_EndInterpreter" - "PyRun_AnyFileFlags" - "Py_FdIsInteractive" - "PyRun_InteractiveLoopFlags" - "PyRun_AnyFileExFlags" - "PyRun_SimpleStringFlags" - "PyRun_StringFlags" - "PyParser_ASTFromString" - "PyParser_SimpleParseStringFlags" - "PyParser_SimpleParseFileFlags" - "Py_CompileStringFlags" - "Py_SymtableString" - "Py_AtExit" - "PyOS_getsig" - "PyOS_setsig" - "PyParser_SetError" - "PyModule_GetWarningsModule" - "PyParser_SimpleParseStringFlagsFilename" - "PyParser_SimpleParseStringFilename" - "PyParser_SimpleParseFile" - "PyParser_SimpleParseString" - "PyRun_AnyFile" - "PyRun_AnyFileEx" - "PyRun_File" - "PyRun_FileEx" - "PyRun_FileFlags" - "PyRun_SimpleFile" - "PyRun_SimpleFileEx" - "PyRun_String" - "PyRun_SimpleString" - "Py_CompileString" - "PyRun_InteractiveOne" - "PyRun_InteractiveLoop" - "Py_UseClassExceptionsFlag" - "Py_UnicodeFlag" - "_Py_QnewFlag" - -; From python34_s.lib(structmember) - "PyMember_Get" - "PyMember_GetOne" - "PyMember_SetOne" - "PyMember_Set" - -; From python34_s.lib(symtable) - "PySymtable_Build" - "PySymtable_Free" - "PyST_GetScope" - "PySymtable_Lookup" - "PySTEntry_Type" - -; From python34_s.lib(sysmodule) - "_PySys_Init" - "PySys_WriteStderr" - "PySys_SetPath" - "PySys_SetArgv" - "PySys_WriteStdout" - "Py_SubversionRevision" - "Py_SubversionShortBranch" - "PySys_GetObject" - "PySys_SetObject" - "PySys_GetFile" - "PySys_ResetWarnOptions" - "PySys_AddWarnOption" - -; From python34_s.lib(traceback) - "PyTraceBack_Here" - "PyTraceBack_Print" - "PyTraceBack_Type" - -; From python34_s.lib(getopt) - "_PyOS_GetOpt" - "_PyOS_opterr" - "_PyOS_optind" - "_PyOS_optarg" - -; From python34_s.lib(dynload_shlib) - "_PyImport_DynLoadFiletab" - "_PyImport_GetDynLoadFunc" - -; From python34_s.lib(thread) - "PyThread_delete_key_value" - "PyThread_init_thread" - "PyThread_start_new_thread" - "PyThread_exit_thread" - "PyThread_get_thread_ident" - "PyThread_allocate_lock" - "PyThread_free_lock" - "PyThread_acquire_lock" - "PyThread_release_lock" - "PyThread_get_stacksize" - "PyThread_set_stacksize" - "PyThread_create_key" - "PyThread_delete_key" - "PyThread_set_key_value" - "PyThread_get_key_value" - -; From python34_s.lib(gcmodule) -; "initgc" - "_PyObject_GC_New" - "_PyObject_GC_NewVar" - "PyGC_Collect" - "_PyObject_GC_Resize" - "_PyObject_GC_Malloc" - "PyObject_GC_Track" - "PyObject_GC_UnTrack" - "PyObject_GC_Del" - "_PyGC_Dump" - "_PyObject_GC_Track" - "_PyObject_GC_UnTrack" - "_PyObject_GC_Del" - "_PyGC_generation0" - -; From python34_s.lib(signalmodule) -; "initsignal" - "PyErr_CheckSignals" - "PyErr_SetInterrupt" - "PyOS_FiniInterrupts" - "PyOS_InterruptOccurred" - "PyOS_InitInterrupts" - "PyOS_AfterFork" - -; From python34_s.lib(posixmodule) -; "initos2" - -; From python34_s.lib(_threadmodule) -; "init_thread" - -; From python34_s.lib(arraymodule) -; "initarray" -; "array_methods" - -; From python34_s.lib(binascii) -; "initbinascii" - -; From python34_s.lib(cmathmodule) -; "initcmath" - -; From python34_s.lib(_codecsmodule) -; "init_codecs" - -; From python34_s.lib(collectionsmodule) -; "initcollections" - "dequeiter_type" - "dequereviter_type" - -; From python34_s.lib(cPickle) -; "initcPickle" -; "fast_save_leave" - -; From python34_s.lib(_csv) -; "init_csv" - -; From python34_s.lib(datetimemodule) -; "initdatetime" - -; From python34_s.lib(dlmodule) -; "initdl" - -; From python34_s.lib(errnomodule) -; "initerrno" - -; From python34_s.lib(fcntlmodule) -; "initfcntl" - -; From python34_s.lib(_functoolsmodule) -; "init_functools" - -; From python34_s.lib(_heapqmodule) -; "init_heapq" - -; From python34_s.lib(imageop) -; "initimageop" - -; From python34_s.lib(itertoolsmodule) -; "inititertools" - -; From python34_s.lib(_localemodule) -; "init_locale" - -; From python34_s.lib(mathmodule) -; "initmath" - -; From python34_s.lib(md5) - "md5_finish" - "md5_init" - "md5_append" - -; From python34_s.lib(md5module) -; "init_md5" - -; From python34_s.lib(operator) -; "initoperator" - -; From python34_s.lib(_randommodule) -; "init_random" - -; From python34_s.lib(rgbimgmodule) -; "initrgbimg" - -; From python34_s.lib(shamodule) -; "init_sha" - -; From python34_s.lib(sha256module) -; "init_sha256" - -; From python34_s.lib(sha512module) -; "init_sha512" - -; From python34_s.lib(_sre) -; "init_sre" - -; From python34_s.lib(stropmodule) -; "initstrop" - -; From python34_s.lib(_struct) -; "init_struct" - -; From python34_s.lib(symtablemodule) -; "init_symtable" - -; From python34_s.lib(termios) -; "inittermios" - -; From python34_s.lib(timemodule) -; "inittime" - "_PyTime_DoubleToTimet" -; "inittimezone" - -; From python34_s.lib(timingmodule) -; "inittiming" - -; From python34_s.lib(_weakref) -; "init_weakref" - -; From python34_s.lib(xxsubtype) -; "initxxsubtype" - -; From python34_s.lib(zipimport) -; "initzipimport" diff --git a/PC/os2emx/pythonpm.c b/PC/os2emx/pythonpm.c deleted file mode 100644 --- a/PC/os2emx/pythonpm.c +++ /dev/null @@ -1,124 +0,0 @@ -/* OS/2 PM main program - creates a hidden window, and starts Python - * interpreter in a separate thread, so that Python scripts can be - * run in PM process space without a console Window. The interpreter - * is incorporated by linking in the Python DLL. - * - * As it stands, I don't think this is adequate for supporting Python - * GUI modules, as the Python thread doesn't have its own message - * queue - which is required of threads that want to create/use - * PM windows. - * - * This code owes a lot to "OS/2 Presentation Manager Programming", by - * Charles Petzold. - * - * Andrew MacIntyre , August 2001. - * Released under the terms of the Python 2.1.1 licence - see the LICENCE - * file in the Python v2.1.1 (or later) source distribution. - * Copyright assigned to the Python Software Foundation, 2001. - */ - -#define INCL_DOS -#define INCL_WIN -#include -#include - -#include "Python.h" - -/* use structure to pass command line to Python thread */ -typedef struct -{ - int argc; - char **argv; - HWND Frame; - int running; -} arglist; - -/* make this a global to simplify access. - * it should only be set from the Python thread, or by the code that - * initiates the Python thread when the thread cannot be created. - */ -int PythonRC; - -extern DL_EXPORT(int) Py_Main(int, char **); -void PythonThread(void *); - -int -main(int argc, char **argv) -{ - ULONG FrameFlags = FCF_TITLEBAR | - FCF_SYSMENU | - FCF_SIZEBORDER | - FCF_HIDEBUTTON | - FCF_SHELLPOSITION | - FCF_TASKLIST; - HAB hab; - HMQ hmq; - HWND Client; - QMSG qmsg; - arglist args; - int python_tid; - - /* init PM and create message queue */ - hab = WinInitialize(0); - hmq = WinCreateMsgQueue(hab, 0); - - /* create a (hidden) Window to house the window procedure */ - args.Frame = WinCreateStdWindow(HWND_DESKTOP, - 0, - &FrameFlags, - NULL, - "PythonPM", - 0L, - 0, - 0, - &Client); - - /* run Python interpreter in a thread */ - args.argc = argc; - args.argv = argv; - args.running = 0; - if (-1 == (python_tid = _beginthread(PythonThread, NULL, 1024 * 1024, &args))) - { - /* couldn't start thread */ - WinAlarm(HWND_DESKTOP, WA_ERROR); - PythonRC = 1; - } - else - { - /* process PM messages, until Python exits */ - while (WinGetMsg(hab, &qmsg, NULLHANDLE, 0, 0)) - WinDispatchMsg(hab, &qmsg); - if (args.running > 0) - DosKillThread(python_tid); - } - - /* destroy window, shutdown message queue and PM */ - WinDestroyWindow(args.Frame); - WinDestroyMsgQueue(hmq); - WinTerminate(hab); - - return PythonRC; -} - -void PythonThread(void *argl) -{ - HAB hab; - arglist *args; - - /* PM initialisation */ - hab = WinInitialize(0); - - /* start Python */ - args = (arglist *)argl; - args->running = 1; - PythonRC = Py_Main(args->argc, args->argv); - - /* enter a critical section and send the termination message */ - DosEnterCritSec(); - args->running = 0; - WinPostMsg(args->Frame, WM_QUIT, NULL, NULL); - - /* shutdown PM and terminate thread */ - WinTerminate(hab); - _endthread(); -} diff --git a/PC/os2vacpp/_tkinter.def b/PC/os2vacpp/_tkinter.def deleted file mode 100644 --- a/PC/os2vacpp/_tkinter.def +++ /dev/null @@ -1,8 +0,0 @@ -LIBRARY _TKINTER INITINSTANCE TERMINSTANCE -DESCRIPTION 'Python Extension DLL v1.0 for Access to Tcl/Tk Environment' -PROTMODE -DATA MULTIPLE NONSHARED - -EXPORTS - init_tkinter - diff --git a/PC/os2vacpp/config.c b/PC/os2vacpp/config.c deleted file mode 100644 --- a/PC/os2vacpp/config.c +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C -*- *********************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/* Module configuration */ - -/* This file contains the table of built-in modules. - See init_builtin() in import.c. */ - -#include "Python.h" - -extern void initarray(void); -extern void initaudioop(void); -extern void initbinascii(void); -extern void initcmath(void); -extern void initerrno(void); -extern void initimageop(void); -extern void initmath(void); -extern void initmd5(void); -extern void initnt(void); -extern void initos2(void); -extern void initoperator(void); -extern void initposix(void); -extern void initrgbimg(void); -extern void initsignal(void); -extern void initselect(void); -extern void init_socket(void); -extern void initstruct(void); -extern void inittime(void); -extern void init_thread(void); -extern void initpcre(void); -#ifdef WIN32 -extern void initmsvcrt(void); -#endif - -/* -- ADDMODULE MARKER 1 -- */ - -extern void PyMarshal_Init(void); -extern void initimp(void); - -struct _inittab _PyImport_Inittab[] = { - - {"array", initarray}, -#ifdef M_I386 - {"audioop", initaudioop}, -#endif - {"binascii", initbinascii}, - {"cmath", initcmath}, - {"errno", initerrno}, -// {"imageop", initimageop}, - {"math", initmath}, - {"md5", initmd5}, -#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) - {"nt", initnt}, /* Use the NT os functions, not posix */ -#else -#if defined(PYOS_OS2) - {"os2", initos2}, -#else - {"posix", initposix}, -#endif -#endif - {"operator", initoperator}, -// {"rgbimg", initrgbimg}, - {"signal", initsignal}, -#ifdef USE_SOCKET - {"_socket", init_socket}, - {"select", initselect}, -#endif - {"struct", initstruct}, - {"time", inittime}, -#ifdef WITH_THREAD - {"_thread", init_thread}, -#endif - {"pcre", initpcre}, -#ifdef WIN32 - {"msvcrt", initmsvcrt}, -#endif - -/* -- ADDMODULE MARKER 2 -- */ - - /* This module "lives in" with marshal.c */ - {"marshal", PyMarshal_Init}, - - /* This lives it with import.c */ - {"_imp", initimp}, - - /* These entries are here for sys.builtin_module_names */ - {"builtins", NULL}, - {"sys", NULL}, - - /* Sentinel */ - {0, 0} -}; diff --git a/PC/os2vacpp/getpathp.c b/PC/os2vacpp/getpathp.c deleted file mode 100644 --- a/PC/os2vacpp/getpathp.c +++ /dev/null @@ -1,482 +0,0 @@ - -/* Return the initial module search path. */ -/* Used by DOS, OS/2, Windows 3.1. Works on NT too. */ - -#include "Python.h" -#include "osdefs.h" - -#ifdef MS_WIN32 -#include -extern BOOL PyWin_IsWin32s(void); -#endif - -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ - -/* Search in some common locations for the associated Python libraries. - * - * Two directories must be found, the platform independent directory - * (prefix), containing the common .py and .pyc files, and the platform - * dependent directory (exec_prefix), containing the shared library - * modules. Note that prefix and exec_prefix can be the same directory, - * but for some installations, they are different. - * - * Py_GetPath() tries to return a sensible Python module search path. - * - * First, we look to see if the executable is in a subdirectory of - * the Python build directory. We calculate the full path of the - * directory containing the executable as progpath. We work backwards - * along progpath and look for $dir/Modules/Setup.in, a distinctive - * landmark. If found, we use $dir/Lib as $root. The returned - * Python path is the compiled #define PYTHONPATH with all the initial - * "./lib" replaced by $root. - * - * Otherwise, if there is a PYTHONPATH environment variable, we return that. - * - * Otherwise we try to find $progpath/lib/os.py, and if found, then - * root is $progpath/lib, and we return Python path as compiled PYTHONPATH - * with all "./lib" replaced by $root (as above). - * - */ - -#ifndef LANDMARK -#define LANDMARK "lib\\os.py" -#endif - -static char prefix[MAXPATHLEN+1]; -static char exec_prefix[MAXPATHLEN+1]; -static char progpath[MAXPATHLEN+1]; -static char *module_search_path = NULL; - - -static int -is_sep(char ch) /* determine if "ch" is a separator character */ -{ -#ifdef ALTSEP - return ch == SEP || ch == ALTSEP; -#else - return ch == SEP; -#endif -} - - -static void -reduce(char *dir) -{ - int i = strlen(dir); - while (i > 0 && !is_sep(dir[i])) - --i; - dir[i] = '\0'; -} - - -static int -exists(char *filename) -{ - struct stat buf; - return stat(filename, &buf) == 0; -} - - -/* Add a path component, by appending stuff to buffer. - buffer must have at least MAXPATHLEN + 1 bytes allocated, and contain a - NUL-terminated string with no more than MAXPATHLEN characters (not counting - the trailing NUL). It's a fatal error if it contains a string longer than - that (callers must be careful!). If these requirements are met, it's - guaranteed that buffer will still be a NUL-terminated string with no more - than MAXPATHLEN characters at exit. If stuff is too long, only as much of - stuff as fits will be appended. -*/ -static void -join(char *buffer, char *stuff) -{ - int n, k; - if (is_sep(stuff[0])) - n = 0; - else { - n = strlen(buffer); - if (n > 0 && !is_sep(buffer[n-1]) && n < MAXPATHLEN) - buffer[n++] = SEP; - } - if (n > MAXPATHLEN) - Py_FatalError("buffer overflow in getpathp.c's joinpath()"); - k = strlen(stuff); - if (n + k > MAXPATHLEN) - k = MAXPATHLEN - n; - strncpy(buffer+n, stuff, k); - buffer[n+k] = '\0'; -} - - -static int -search_for_prefix(char *argv0_path, char *landmark) -{ - int n; - - /* Search from argv0_path, until root is found */ - strcpy(prefix, argv0_path); - do { - n = strlen(prefix); - join(prefix, landmark); - if (exists(prefix)) { - prefix[n] = '\0'; - return 1; - } - prefix[n] = '\0'; - reduce(prefix); - } while (prefix[0]); - return 0; -} - -#ifdef MS_WIN32 -#include "malloc.h" // for alloca - see comments below! -extern const char *PyWin_DLLVersionString; // a string loaded from the DLL at startup. - - -/* Load a PYTHONPATH value from the registry. - Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER. - - Returns NULL, or a pointer that should be freed. -*/ - -static char * -getpythonregpath(HKEY keyBase, BOOL bWin32s) -{ - HKEY newKey = 0; - DWORD nameSize = 0; - DWORD dataSize = 0; - DWORD numEntries = 0; - LONG rc; - char *retval = NULL; - char *dataBuf; - const char keyPrefix[] = "Software\\Python\\PythonCore\\"; - const char keySuffix[] = "\\PythonPath"; - int versionLen; - char *keyBuf; - - // Tried to use sysget("winver") but here is too early :-( - versionLen = strlen(PyWin_DLLVersionString); - // alloca == no free required, but memory only local to fn. - // also no heap fragmentation! Am I being silly? - keyBuf = alloca(sizeof(keyPrefix)-1 + versionLen + sizeof(keySuffix)); // chars only, plus 1 NULL. - // lots of constants here for the compiler to optimize away :-) - memcpy(keyBuf, keyPrefix, sizeof(keyPrefix)-1); - memcpy(keyBuf+sizeof(keyPrefix)-1, PyWin_DLLVersionString, versionLen); - memcpy(keyBuf+sizeof(keyPrefix)-1+versionLen, keySuffix, sizeof(keySuffix)); // NULL comes with this one! - - rc=RegOpenKey(keyBase, - keyBuf, - &newKey); - if (rc==ERROR_SUCCESS) { - RegQueryInfoKey(newKey, NULL, NULL, NULL, NULL, NULL, NULL, - &numEntries, &nameSize, &dataSize, NULL, NULL); - } - if (bWin32s && numEntries==0 && dataSize==0) { - /* must hardcode for Win32s */ - numEntries = 1; - dataSize = 511; - } - if (numEntries) { - /* Loop over all subkeys. */ - /* Win32s doesnt know how many subkeys, so we do - it twice */ - char keyBuf[MAX_PATH+1]; - int index = 0; - int off = 0; - for(index=0;;index++) { - long reqdSize = 0; - DWORD rc = RegEnumKey(newKey, - index, keyBuf, MAX_PATH+1); - if (rc) break; - rc = RegQueryValue(newKey, keyBuf, NULL, &reqdSize); - if (rc) break; - if (bWin32s && reqdSize==0) reqdSize = 512; - dataSize += reqdSize + 1; /* 1 for the ";" */ - } - dataBuf = malloc(dataSize+1); - if (dataBuf==NULL) - return NULL; /* pretty serious? Raise error? */ - /* Now loop over, grabbing the paths. - Subkeys before main library */ - for(index=0;;index++) { - int adjust; - long reqdSize = dataSize; - DWORD rc = RegEnumKey(newKey, - index, keyBuf,MAX_PATH+1); - if (rc) break; - rc = RegQueryValue(newKey, - keyBuf, dataBuf+off, &reqdSize); - if (rc) break; - if (reqdSize>1) { - /* If Nothing, or only '\0' copied. */ - adjust = strlen(dataBuf+off); - dataSize -= adjust; - off += adjust; - dataBuf[off++] = ';'; - dataBuf[off] = '\0'; - dataSize--; - } - } - /* Additionally, win32s doesnt work as expected, so - the specific strlen() is required for 3.1. */ - rc = RegQueryValue(newKey, "", dataBuf+off, &dataSize); - if (rc==ERROR_SUCCESS) { - if (strlen(dataBuf)==0) - free(dataBuf); - else - retval = dataBuf; /* caller will free */ - } - else - free(dataBuf); - } - - if (newKey) - RegCloseKey(newKey); - return retval; -} -#endif /* MS_WIN32 */ - -static void -get_progpath(void) -{ - extern char *Py_GetProgramName(void); - char *path = getenv("PATH"); - char *prog = Py_GetProgramName(); - -#ifdef MS_WIN32 - if (GetModuleFileName(NULL, progpath, MAXPATHLEN)) - return; -#endif - if (prog == NULL || *prog == '\0') - prog = "python"; - - /* If there is no slash in the argv0 path, then we have to - * assume python is on the user's $PATH, since there's no - * other way to find a directory to start the search from. If - * $PATH isn't exported, you lose. - */ -#ifdef ALTSEP - if (strchr(prog, SEP) || strchr(prog, ALTSEP)) -#else - if (strchr(prog, SEP)) -#endif - strcpy(progpath, prog); - else if (path) { - while (1) { - char *delim = strchr(path, DELIM); - - if (delim) { - int len = delim - path; - strncpy(progpath, path, len); - *(progpath + len) = '\0'; - } - else - strcpy(progpath, path); - - join(progpath, prog); - if (exists(progpath)) - break; - - if (!delim) { - progpath[0] = '\0'; - break; - } - path = delim + 1; - } - } - else - progpath[0] = '\0'; -} - -static void -calculate_path(void) -{ - char argv0_path[MAXPATHLEN+1]; - char *buf; - int bufsz; - char *pythonhome = Py_GetPythonHome(); - char *envpath = Py_GETENV("PYTHONPATH"); -#ifdef MS_WIN32 - char *machinepath, *userpath; - - /* Are we running under Windows 3.1(1) Win32s? */ - if (PyWin_IsWin32s()) { - /* Only CLASSES_ROOT is supported */ - machinepath = getpythonregpath(HKEY_CLASSES_ROOT, TRUE); - userpath = NULL; - } else { - machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, FALSE); - userpath = getpythonregpath(HKEY_CURRENT_USER, FALSE); - } -#endif - - get_progpath(); - strcpy(argv0_path, progpath); - reduce(argv0_path); - if (pythonhome == NULL || *pythonhome == '\0') { - if (search_for_prefix(argv0_path, LANDMARK)) - pythonhome = prefix; - else - pythonhome = NULL; - } - else { - char *delim; - - strcpy(prefix, pythonhome); - - /* Extract Any Optional Trailing EXEC_PREFIX */ - /* e.g. PYTHONHOME=: */ - delim = strchr(prefix, DELIM); - if (delim) { - *delim = '\0'; - strcpy(exec_prefix, delim+1); - } else - strcpy(exec_prefix, EXEC_PREFIX); - } - - if (envpath && *envpath == '\0') - envpath = NULL; - - /* We need to construct a path from the following parts: - (1) the PYTHONPATH environment variable, if set; - (2) for Win32, the machinepath and userpath, if set; - (3) the PYTHONPATH config macro, with the leading "." - of each component replaced with pythonhome, if set; - (4) the directory containing the executable (argv0_path). - The length calculation calculates #3 first. - */ - - /* Calculate size of return buffer */ - if (pythonhome != NULL) { - char *p; - bufsz = 1; - for (p = PYTHONPATH; *p; p++) { - if (*p == DELIM) - bufsz++; /* number of DELIM plus one */ - } - bufsz *= strlen(pythonhome); - } - else - bufsz = 0; - bufsz += strlen(PYTHONPATH) + 1; - if (envpath != NULL) - bufsz += strlen(envpath) + 1; - bufsz += strlen(argv0_path) + 1; -#ifdef MS_WIN32 - if (machinepath) - bufsz += strlen(machinepath) + 1; - if (userpath) - bufsz += strlen(userpath) + 1; -#endif - - module_search_path = buf = malloc(bufsz); - if (buf == NULL) { - /* We can't exit, so print a warning and limp along */ - fprintf(stderr, "Can't malloc dynamic PYTHONPATH.\n"); - if (envpath) { - fprintf(stderr, "Using default static $PYTHONPATH.\n"); - module_search_path = envpath; - } - else { - fprintf(stderr, "Using environment $PYTHONPATH.\n"); - module_search_path = PYTHONPATH; - } - return; - } - - if (envpath) { - strcpy(buf, envpath); - buf = strchr(buf, '\0'); - *buf++ = DELIM; - } -#ifdef MS_WIN32 - if (machinepath) { - strcpy(buf, machinepath); - buf = strchr(buf, '\0'); - *buf++ = DELIM; - } - if (userpath) { - strcpy(buf, userpath); - buf = strchr(buf, '\0'); - *buf++ = DELIM; - } -#endif - if (pythonhome == NULL) { - strcpy(buf, PYTHONPATH); - buf = strchr(buf, '\0'); - } - else { - char *p = PYTHONPATH; - char *q; - int n; - for (;;) { - q = strchr(p, DELIM); - if (q == NULL) - n = strlen(p); - else - n = q-p; - if (p[0] == '.' && is_sep(p[1])) { - strcpy(buf, pythonhome); - buf = strchr(buf, '\0'); - p++; - n--; - } - strncpy(buf, p, n); - buf += n; - if (q == NULL) - break; - *buf++ = DELIM; - p = q+1; - } - } - if (argv0_path) { - *buf++ = DELIM; - strcpy(buf, argv0_path); - buf = strchr(buf, '\0'); - } - *buf = '\0'; -} - - -/* External interface */ - -char * -Py_GetPath(void) -{ - if (!module_search_path) - calculate_path(); - - return module_search_path; -} - -char * -Py_GetPrefix(void) -{ - if (!module_search_path) - calculate_path(); - - return prefix; -} - -char * -Py_GetExecPrefix(void) -{ - if (!module_search_path) - calculate_path(); - - return exec_prefix; -} - -char * -Py_GetProgramFullPath(void) -{ - if (!module_search_path) - calculate_path(); - - return progpath; -} diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile deleted file mode 100644 --- a/PC/os2vacpp/makefile +++ /dev/null @@ -1,1549 +0,0 @@ -###################################################################### -# -# Top-Level Makefile for Building Python for OS/2 -# -# This makefile was developed for use with IBM's VisualAge C/C++ -# for OS/2 compiler, version 3.0, with Fixpack 8 applied. It uses -# version 4.0 of the NMAKE tool that comes with that package. -# -# The output of the build is a largish Python23.DLL containing the -# essential modules of Python and a small Python.exe program to start -# the interpreter. When embedding Python within another program, only -# Python23.DLL is needed. -# -# These two binaries can be statically linked with the VisualAge C/C++ -# runtime library (producing larger binaries), or dynamically linked -# to make smaller ones that require the compiler to be installed on -# any system Python is used on. Review the /Gd+ compiler option for -# how to do this. -# -# NOTE: IBM's NMAKE 4.0 is rather dumb, requiring this makefile to -# be much more complicated than necessary. I use OpusMAKE -# myself for a much more powerful MAKE tool but not everyone -# wishes to buy it. However, as a result I didn't hook in -# the dependencies on the include files as NMAKE has no easy -# way to do this without explicitly spelling it all out. -# -# History (Most Recent First) -# -# 26-Sep-98 jrr Retested and adjusted for building w/Python 1.5.2a1 -# 20-Nov-97 jrr Cleaned Up for Applying to Distribution -# 29-Oct-97 jrr Modified for Use with Python 1.5 Alpha 4 -# 03-Aug-96 jrr Original for Use with Python 1.4 Release -# -###################################################################### - -################### -# Places and Things -################### -PY_MODULES = ..\..\Modules -PY_OBJECTS = ..\..\Objects -PY_PARSER = ..\..\Parser -PY_PYTHON = ..\..\Python -PY_INCLUDE = ..\..\Include -PY_INCLUDES = .;$(PY_INCLUDE);$(PY_MODULES);$(PY_OBJECTS);$(PY_PARSER);$(PY_PYTHON) - -# File to Collect Wordy Compiler Output re Errors -ERRS = make.out - -# Where to Find the IBM TCP/IP Socket Includes and Libraries -OS2TCPIP = C:\MPTN - -# Where to Find the Tcl/Tk Base Directory for Libs/Includes -TCLTK = D:\TclTk -TCLBASE = D:\Tcl7.6\OS2 -TKBASE = D:\Tk4.2\OS2 - -# Where to Put the .OBJ Files, To Keep Them Out of the Way -PATHOBJ = obj - -# Search Path for Include Files -PROJINCLUDE = .;$(TCLBASE);$(TKBASE);$(OS2TCPIP)\Include;$(PY_INCLUDES) - -# Place to Search for Sources re OpusMAKE Dependency Generator (Commercial) -MKMF_SRCS = $(PY_MODULES)\*.c $(PY_OBJECTS)\*.c $(PY_PARSER)\*.c $(PY_PYTHON)\*.c - -#.HDRPATH.c := $(PROJINCLUDE,;= ) $(.HDRPATH.c) -#.PATH.c = .;$(PY_MODULES);$(PY_OBJECTS);$(PY_PARSER);$(PY_PYTHON) -OTHERLIBS = so32dll.lib tcp32dll.lib # Tcl76.lib Tk42.lib - -################# -# Inference Rules -################# -{$(PY_MODULES)\}.c{$(PATHOBJ)\}.obj: # Compile C Code into a .OBJ File - @ Echo Compiling $< - @ $(CC) -c $(CFLAGS) -Fo$@ $< >>$(ERRS) - -{$(PY_OBJECTS)\}.c{$(PATHOBJ)\}.obj: # Compile C Code into a .OBJ File - @ Echo Compiling $< - @ $(CC) -c $(CFLAGS) -Fo$@ $< >>$(ERRS) - -{$(PY_PARSER)\}.c{$(PATHOBJ)\}.obj: # Compile C Code into a .OBJ File - @ Echo Compiling $< - @ $(CC) -c $(CFLAGS) -Fo$@ $< >>$(ERRS) - -{$(PY_PYTHON)\}.c{$(PATHOBJ)\}.obj: # Compile C Code into a .OBJ File - @ Echo Compiling $< - @ $(CC) -c $(CFLAGS) -Fo$@ $< >>$(ERRS) - -.c{$(PATHOBJ)\}.obj: # Compile C Code into a .OBJ File - @ Echo Compiling $< - @ $(CC) -c $(CFLAGS) -Fo$@ $< >>$(ERRS) - -################### -# Python Subsystems -################### - -# PYTHON is the central core, containing the builtins and interpreter. -PYTHON = \ - $(PATHOBJ)\BltinModule.obj \ - $(PATHOBJ)\CEval.obj \ - $(PATHOBJ)\Compile.obj \ - $(PATHOBJ)\Errors.obj \ - $(PATHOBJ)\Frozen.obj \ - $(PATHOBJ)\Getargs.obj \ - $(PATHOBJ)\GetCompiler.obj \ - $(PATHOBJ)\GetCopyright.obj \ - $(PATHOBJ)\GetMTime.obj \ - $(PATHOBJ)\GetOpt.obj \ - $(PATHOBJ)\GetPlatform.obj \ - $(PATHOBJ)\GetVersion.obj \ - $(PATHOBJ)\GramInit.obj \ - $(PATHOBJ)\Import.obj \ - $(PATHOBJ)\ImportDL.obj \ - $(PATHOBJ)\Marshal.obj \ - $(PATHOBJ)\ModSupport.obj \ - $(PATHOBJ)\MyStrtoul.obj \ - $(PATHOBJ)\PyState.obj \ - $(PATHOBJ)\PythonRun.obj \ - $(PATHOBJ)\StructMember.obj \ - $(PATHOBJ)\SysModule.obj \ - $(PATHOBJ)\Thread.obj \ - $(PATHOBJ)\TraceBack.obj \ - $(PATHOBJ)\FrozenMain.obj \ - $(PATHOBJ)\exceptions.obj \ - $(PATHOBJ)\symtable.obj \ - $(PATHOBJ)\codecs.obj \ - $(PATHOBJ)\future.obj \ - $(PATHOBJ)\dynload_os2.obj \ - $(PATHOBJ)\mysnprintf.obj \ - $(PATHOBJ)\iterobject.obj - -# Python's Internal Parser -PARSER = \ - $(PATHOBJ)\Acceler.obj \ - $(PATHOBJ)\Grammar1.obj \ - $(PATHOBJ)\ListNode.obj \ - $(PATHOBJ)\Node.obj \ - $(PATHOBJ)\Parser.obj \ - $(PATHOBJ)\ParseTok.obj \ - $(PATHOBJ)\BitSet.obj \ - $(PATHOBJ)\MetaGrammar.obj \ - $(PATHOBJ)\Tokenizer.obj \ - $(PATHOBJ)\MyReadline.obj - -# Python Object Types -OBJECTS = \ - $(PATHOBJ)\Abstract.obj \ - $(PATHOBJ)\BoolObject.obj \ - $(PATHOBJ)\BufferObject.obj \ - $(PATHOBJ)\CellObject.obj \ - $(PATHOBJ)\ClassObject.obj \ - $(PATHOBJ)\CObject.obj \ - $(PATHOBJ)\ComplexObject.obj \ - $(PATHOBJ)\DescrObject.obj \ - $(PATHOBJ)\DictObject.obj \ - $(PATHOBJ)\EnumObject.obj \ - $(PATHOBJ)\FileObject.obj \ - $(PATHOBJ)\FloatObject.obj \ - $(PATHOBJ)\FrameObject.obj \ - $(PATHOBJ)\FuncObject.obj \ - $(PATHOBJ)\IterObject.obj \ - $(PATHOBJ)\ListObject.obj \ - $(PATHOBJ)\LongObject.obj \ - $(PATHOBJ)\MethodObject.obj \ - $(PATHOBJ)\ModuleObject.obj \ - $(PATHOBJ)\Object.obj \ - $(PATHOBJ)\ObMalloc.obj \ - $(PATHOBJ)\RangeObject.obj \ - $(PATHOBJ)\SliceObject.obj \ - $(PATHOBJ)\StringObject.obj \ - $(PATHOBJ)\StructSeq.obj \ - $(PATHOBJ)\TupleObject.obj \ - $(PATHOBJ)\TypeObject.obj \ - $(PATHOBJ)\UnicodeObject.obj \ - $(PATHOBJ)\UnicodeCType.obj \ - $(PATHOBJ)\WeakrefObject.obj - -# Extension Modules (Built-In or as Separate DLLs) -MODULES = \ - $(PATHOBJ)\ArrayModule.obj \ - $(PATHOBJ)\BinAscii.obj \ - $(PATHOBJ)\CMathModule.obj \ - $(PATHOBJ)\ErrnoModule.obj \ - $(PATHOBJ)\GCModule.obj \ - $(PATHOBJ)\GetBuildInfo.obj \ - $(PATHOBJ)\GetPathP.obj \ - $(PATHOBJ)\Main.obj \ - $(PATHOBJ)\MathModule.obj \ - $(PATHOBJ)\MD5c.obj \ - $(PATHOBJ)\MD5Module.obj \ - $(PATHOBJ)\Operator.obj \ - $(PATHOBJ)\PCREModule.obj \ - $(PATHOBJ)\PyPCRE.obj \ - $(PATHOBJ)\PosixModule.obj \ - $(PATHOBJ)\RegexModule.obj \ - $(PATHOBJ)\RegExpr.obj \ - $(PATHOBJ)\SelectModule.obj \ - $(PATHOBJ)\SignalModule.obj \ - $(PATHOBJ)\SocketModule.obj \ - $(PATHOBJ)\StropModule.obj \ - $(PATHOBJ)\StructModule.obj \ - $(PATHOBJ)\TimeModule.obj \ - $(PATHOBJ)\ThreadModule.obj - -# Standalone Parser Generator Program (Shares Some of Python's Modules) -PGEN = \ - $(PATHOBJ)\PGen.obj \ - $(PATHOBJ)\PGenMain.obj \ - $(PATHOBJ)\MySNPrintf.obj \ - $(PATHOBJ)\Tokenizer_Pgen.obj \ - $(PATHOBJ)\PrintGrammar.obj \ - $(PATHOBJ)\Grammar.obj \ - $(PATHOBJ)\FirstSets.obj - -################## -# Macros and Flags -################## -_BASE = /Q /W2 /I$(PROJINCLUDE) - # /Q = Omit IBM Copyright - # /W2 = Show Warnings/Errors Only - -_GEN = /G4 /Gm /Gd- - # /G4 = Generate Code for 486 (Use 386 for Debugger) - # /Gm = Use Multithread Runtime - # /Gd = Dynamically Load Runtime - # /Ms = Use _System Calling Convention (vs _Optlink) - # (to allow non-VAC++ code to call into Python23.dll) - -_OPT = /O /Gl - # /O = Enable Speed-Optimizations - # /Ol = Pass Code Thru Intermediate Linker - # /Gu = Advise Linker All Ext Data is ID'd - # /Gl = Have Linker Remove Unused Fns - -_DBG = /Wpro- /Ti- /DHAVE_CONFIG_H /DUSE_SOCKET - # /Wpro= Generate Compiler Warnings re Missing Prototypes - # /Ti = Embed Debugger/Analyzer Recs - # /Tm = Enable Debug Memory Fns - # /Tx = Request Full Dump Upon Exception - # /DHAVE_CONFIG_H = Causes Use of CONFIG.H Settings - # /DUSE_SOCKET = Enables Building In of Socket API - -_OUT = - # /Fb = Embed Browser Recs - # /Gh = Generate Code for Profiler Hooks - # /Fl = Output C/C++ Listing Files - # /Lf = Provide Full (Detailed) Listing Files - # /Fm. = Output Linker Map File - # /Ft. = Output C++ Template Resolution Files - -_MAP = /FmNoise\$(@R).map - -_DLL = /Ge- -_EXE = /Ge - # /Ge = Create an EXE, not DLL - -CFLAGS = $(_BASE) $(_GEN) $(_OPT) $(_DBG) $(_OUT) $(_EXE) /Ss - -################### -# Primary Target(s) -################### -All: obj noise PyCore.lib Python23.lib PGen.exe \ - Python.exe PythonPM.exe Python23.dll # _tkinter.dll - -Modules: $(MODULES) -Objects: $(OBJECTS) -Parser: $(PARSER) -Python: $(PYTHON) - -# Directory to Keep .OBJ Files Out of the Way -obj: - @-mkdir obj >>NUL - -# Directory to Keep .MAP and Such Text Files Out of the Way -noise: - @-mkdir noise >>NUL - -############## -# -############## - -# Python Extension DLL: Tcl/Tk Interface -#_tkinter.dll: $(PATHOBJ)\_tkinter.obj Python23.lib _tkinter.def -# @ Echo Linking $@ As DLL -# @ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS) - -#$(PATHOBJ)\_tkinter.obj: $(PY_MODULES)\_tkinter.c -# @ Echo Compiling $** -# @ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS) - -# Object Library of All Essential Python Routines -PyCore.lib: $(MODULES) $(OBJECTS) $(PARSER) $(PYTHON) $(PATHOBJ)\Config.obj - @ Echo Adding Updated Object Files to Link Library $@ - @ ! ILIB $@ /NOLOGO /NOBACKUP -+$? ; >>$(ERRS) - -Python23.dll: $(PATHOBJ)\Compile.obj PyCore.lib Python.def - @ Echo Linking $@ As DLL - @ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS) -# @ Echo Compressing $@ with LxLite -# @ lxlite $@ - -# IBM Linker Requires One Explicit .OBJ To Build a .DLL from a .LIB -$(PATHOBJ)\Compile.obj: $(PY_PYTHON)\Compile.c - @ Echo Compiling $** - @ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS) - -# Import Library for Using the Python23.dll -Python23.lib: Python.def - @ Echo Making $@ - @ IMPLIB /NOLOGO /NOIGNORE $@ $** >>$(ERRS) - @ ILIB /NOLOGO /CONVFORMAT /NOEXTDICTIONARY /NOBROWSE /NOBACKUP $@; >>$(ERRS) - -# Small Command-Line Program to Start Interpreter in Python23.dll -Python.exe: $(PATHOBJ)\Python.obj Python23.lib - @ Echo Linking $@ As EXE - @ $(CC) $(CFLAGS) $(_EXE) /B"/PM:VIO /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS) - -# Small PM-GUI Program to Start Interpreter in Python23.dll -PythonPM.exe: $(PATHOBJ)\Python.obj Python23.lib - @ Echo Linking $@ As EXE - @ $(CC) $(CFLAGS) $(_EXE) /B"/PM:PM /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS) - -PGen.exe: $(PGEN) PyCore.lib - @ Echo Linking $@ As EXE - @ $(CC) $(CFLAGS) $(_EXE) /B"/STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS) - -####################### -# Miscellaneous Targets -####################### - -# Remove Intermediate Targets but Leave Executable Binaries -clean: - -- Del /Q $(PATHOBJ)\*.obj >NUL 2>&1 - -- Del /Q /Y Noise >NUL 2>&1 - -- Del /Q $(ERRS) >NUL 2>&1 - -# Remove All Targets, Including Final Binaries -distclean: clean - -- Del /Q PyCore.lib Python23.lib >NUL 2>&1 - -- Del /Q Python23.dll Python.exe PGen.exe >NUL 2>&1 - -release: Python.exe Python23.dll Python23.lib - -- @Echo Y | copy /U Python.exe D:\EXEs - -- @Echo Y | copy /U Python23.dll D:\DLLs - -- @Echo Y | copy /U Python23.lib E:\Tau\Lib - -- @Echo Y | copy /U _tkinter.dll D:\Python - -test: - python ..\..\lib\test\regrtest.py - -# Update Dependencies on Targets (Uses OpusMAKE Commercial Product) -depend: - D:\OpusMake\os2mkmf -c -s - -### OPUS MKMF: Do not remove this line! Generated dependencies follow. - -_tkinter.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -arraymodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -audioop.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\mymath.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -binascii.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -cmathmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -cpickle.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -cryptmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -cursesmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -_dbmmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -errno.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -errnomodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -fcntlmodule.obj: $(PY_INCLUDE)\abstract.h $(OS2TCPIP)\Include\sys\ioctl.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -fpectlmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -fpetestmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -_gdbmmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -getbuildinfo.obj: pyconfig.h - -getpath.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\osdefs.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -grpmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(OS2TCPIP)\Include\grp.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -imageop.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -main.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -mathmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\mymath.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -mpzmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longintrepr.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -nismodule.obj: $(PY_INCLUDE)\abstract.h $(OS2TCPIP)\Include\sys\time.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -operator.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -parsermodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h \ - $(PY_INCLUDE)\complexobject.h pyconfig.h $(PY_INCLUDE)\dictobject.h \ - $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h \ - $(PY_INCLUDE)\graminit.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\token.h \ - $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -posix.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\mytime.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -posixmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\mytime.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -pwdmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(OS2TCPIP)\Include\pwd.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -readline.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -resource.obj: $(PY_INCLUDE)\abstract.h $(OS2TCPIP)\Include\sys\time.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -selectmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\myselect.h $(PY_INCLUDE)\mytime.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -signalmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -socketmodule.obj: $(PY_INCLUDE)\abstract.h $(OS2TCPIP)\Include\netinet\in.h \ - $(OS2TCPIP)\Include\sys\socket.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\mytime.h $(OS2TCPIP)\Include\netdb.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -structmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -syslogmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(OS2TCPIP)\Include\syslog.h $(PY_INCLUDE)\sysmodule.h \ - $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -termios.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -_threadmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\thread.h \ - $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -timemodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\mytime.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -xxmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -zlibmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -abstract.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -classobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -cobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -complexobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -dictobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -fileobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\structmember.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -floatobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -frameobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h \ - $(PY_INCLUDE)\complexobject.h pyconfig.h $(PY_INCLUDE)\dictobject.h \ - $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\frameobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\opcode.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -funcobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -listobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -longobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longintrepr.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\mymath.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -methodobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\token.h \ - $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -moduleobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -object.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -rangeobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -sliceobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -stringobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -tupleobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -typeobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -xxobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -acceler.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\node.h \ - $(PY_PARSER)\parser.h $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\token.h - -bitset.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h - -firstsets.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\pgenheaders.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h - -grammar.obj: $(PY_INCLUDE)\bitset.h pyconfig.h \ - $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h - -grammar1.obj: $(PY_INCLUDE)\bitset.h pyconfig.h \ - $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h - -intrcheck.obj: pyconfig.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h - -listnode.obj: pyconfig.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\token.h - -metagrammar.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\metagrammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_PARSER)\pgen.h $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h - -myreadline.obj: pyconfig.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h - -node.obj: pyconfig.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\node.h \ - $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h - -parser.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \ - $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_PARSER)\parser.h $(PY_INCLUDE)\pgenheaders.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h - -parsetok.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \ - $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_PARSER)\parser.h $(PY_INCLUDE)\parsetok.h \ - $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h \ - $(PY_PARSER)\tokenizer.h - -pgen.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\metagrammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_PARSER)\pgen.h $(PY_INCLUDE)\pgenheaders.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h - -pgenmain.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\node.h \ - $(PY_INCLUDE)\parsetok.h $(PY_PARSER)\pgen.h $(PY_INCLUDE)\pgenheaders.h \ - $(PY_INCLUDE)\pydebug.h - -printgrammar.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\pgenheaders.h \ - $(PY_INCLUDE)\pydebug.h - -tokenizer.obj: pyconfig.h $(PY_INCLUDE)\errcode.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\token.h $(PY_PARSER)\tokenizer.h - -atof.obj: pyconfig.h - -bltinmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h \ - $(PY_INCLUDE)\complexobject.h pyconfig.h $(PY_INCLUDE)\dictobject.h \ - $(PY_INCLUDE)\eval.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\mymath.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\node.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -ceval.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\eval.h \ - $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\frameobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\opcode.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -compile.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\graminit.h \ - $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h \ - $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\opcode.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\token.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -errors.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -fmod.obj: pyconfig.h $(PY_INCLUDE)\mymath.h - -frozen.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -frozenmain.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -getargs.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -getcompiler.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -getcopyright.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -getplatform.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -getversion.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\patchlevel.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -graminit.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\pgenheaders.h \ - $(PY_INCLUDE)\pydebug.h - -hypot.obj: pyconfig.h $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h - -import.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\errcode.h $(PY_INCLUDE)\eval.h \ - $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h \ - $(PY_INCLUDE)\import.h $(PY_PYTHON)\importdl.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\marshal.h $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\osdefs.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\token.h \ - $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -importdl.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_PYTHON)\importdl.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\osdefs.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -marshal.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longintrepr.h $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\marshal.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -modsupport.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -mystrtoul.obj: pyconfig.h - -pyfpe.obj: pyconfig.h $(PY_INCLUDE)\pyfpe.h - -pystate.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -pythonrun.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\bitset.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h \ - $(PY_INCLUDE)\complexobject.h pyconfig.h $(PY_INCLUDE)\dictobject.h \ - $(PY_INCLUDE)\errcode.h $(PY_INCLUDE)\eval.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\grammar.h \ - $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h \ - $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\marshal.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\node.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\parsetok.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -sigcheck.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \ - $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \ - $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \ - $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -strdup.obj: pyconfig.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h - -strtod.obj: pyconfig.h - -structmember.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h - -sysmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \ - $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\osdefs.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - -thread.obj: pyconfig.h $(PY_INCLUDE)\thread.h - -traceback.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \ - $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\compile.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\frameobject.h \ - $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \ - $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \ - $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \ - $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \ - $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\osdefs.h \ - $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \ - $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \ - $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \ - $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk deleted file mode 100644 --- a/PC/os2vacpp/makefile.omk +++ /dev/null @@ -1,1047 +0,0 @@ -###################################################################### -# -# Top-Level Makefile for Building Python for OS/2 -# -# This makefile was developed for use with IBM's VisualAge C/C++ -# for OS/2 compiler, version 3.0, with Fixpack 8 applied. It uses -# the commercial OpusMAKE tool. -# -# The output of the build is a largish Python15.DLL containing the -# essential modules of Python and a small Python.exe program to start -# the interpreter. When embedding Python within another program, only -# Python15.DLL is needed. -# -# These two binaries can be statically linked with the VisualAge C/C++ -# runtime library (producing larger binaries), or dynamically linked -# to make smaller ones that require the compiler to be installed on -# any system Python is used on. -# -# History (Most Recent First) -# -# 20-Nov-97 jrr Cleaned Up for Applying to Distribution -# 29-Oct-97 jrr Modified for Use with Python 1.5 Alpha 4 -# 03-Aug-96 jrr Original for Use with Python 1.4 Release -# -###################################################################### - -################### -# Places and Things -################### -PY_MODULES = ..\..\Modules -PY_OBJECTS = ..\..\Objects -PY_PARSER = ..\..\Parser -PY_PYTHON = ..\..\Python -PY_INCLUDE = ..\..\Include -PY_INCLUDES = .;$(PY_INCLUDE);$(PY_MODULES);$(PY_OBJECTS);$(PY_PARSER);$(PY_PYTHON) - -# Where to Find the IBM TCP/IP Socket Includes and Libraries -OS2TCPIP = C:\MPTN - -# Where to Put the .OBJ Files, To Keep Them Out of the Way -.PATH.obj = obj - -# Search Path for Include Files -PROJINCLUDE = .;$(OS2TCPIP)\Include;$(PY_INCLUDES) - -# Place to Search for Sources re OpusMAKE Dependency Generator (Commercial) -MKMF_SRCS = $(PY_MODULES)\*.c $(PY_OBJECTS)\*.c $(PY_PARSER)\*.c $(PY_PYTHON)\*.c - -.HDRPATH.c := $(PROJINCLUDE,;= ) $(.HDRPATH.c) -.PATH.c = .;$(PY_MODULES);$(PY_OBJECTS);$(PY_PARSER);$(PY_PYTHON) -OTHERLIBS = $(OS2TCPIP)\lib\so32dll.lib $(OS2TCPIP)\lib\tcp32dll.lib - -################# -# Inference Rules -################# - - -################### -# Python Subsystems -################### - -# PYTHON is the central core, containing the builtins and interpreter. -PYTHON = \ - BltinModule.obj \ - CEval.obj \ - Compile.obj \ - Errors.obj \ - Frozen.obj \ - Getargs.obj \ - GetCompiler.obj \ - GetCopyright.obj \ - GetMTime.obj \ - GetOpt.obj \ - GetPlatform.obj \ - GetVersion.obj \ - GramInit.obj \ - Import.obj \ - ImportDL.obj \ - Marshal.obj \ - ModSupport.obj \ - MyStrtoul.obj \ - PyState.obj \ - PythonRun.obj \ - StructMember.obj \ - SysModule.obj \ - Thread.obj \ - TraceBack.obj \ - FrozenMain.obj - -# Omitted Python Elements (and Reason): - # atof.c -- Implementation for Platforms w/o This Function - # dup2.c -- Implementation for Platforms w/o This Function - # fmod.c -- Implementation for Platforms w/o This Function - # getcwd.c -- Implementation for Platforms w/o This Function - # hypot.c -- Implementation for Platforms w/o This Function - # memmove.c -- Implementation for Platforms w/o This Function - # strdup.c -- Implementation for Platforms w/o This Function - # strerror.c -- Implementation for Platforms w/o This Function - # strtod.c -- Implementation for Platforms w/o This Function - - # sigcheck.c -- Primitive Signal Catcher (SignalModule.c Used Instead) - # pyfpe.c -- Primitive FPE Catcher (Not Referenced by Anyone) - # frozenmain.c - -# Python's Internal Parser -PARSER = \ - Acceler.obj \ - Grammar1.obj \ - MyReadline.obj \ - Node.obj \ - Parser.obj \ - ParseTok.obj \ - Tokenizer.obj - -# Python Object Types -OBJECTS = \ - Abstract.obj \ - ClassObject.obj \ - CObject.obj \ - ComplexObject.obj \ - DictObject.obj \ - FileObject.obj \ - FloatObject.obj \ - FrameObject.obj \ - FuncObject.obj \ - ListObject.obj \ - LongObject.obj \ - MethodObject.obj \ - ModuleObject.obj \ - Object.obj \ - RangeObject.obj \ - SliceObject.obj \ - StringObject.obj \ - TupleObject.obj \ - TypeObject.obj - -# Omitted Objects (and Reason): - # xxobject.c -- Template to Create Your Own Object Types - -# Extension Modules (Built-In or as Separate DLLs) -MODULES = \ - ArrayModule.obj \ - BinAscii.obj \ - CMathModule.obj \ - ErrnoModule.obj \ - GetBuildInfo.obj \ - GetPathP.obj \ - Main.obj \ - MathModule.obj \ - MD5c.obj \ - MD5Module.obj \ - Operator.obj \ - PosixModule.obj \ - RegexModule.obj \ - RegExpr.obj \ - ReopModule.obj \ - SelectModule.obj \ - SignalModule.obj \ - SocketModule.obj \ - SoundEx.obj \ - StropModule.obj \ - StructModule.obj \ - TimeModule.obj \ - ThreadModule.obj - -# Omitted Modules (and Description/Reason): - # - # Multimedia: - # audioop.c -- Various Compute Operations on Audio Samples - - # Database: - # _dbmmodule.c -- Wrapper of DBM Database API (Generic Flavor) - # _gdbmmodule.c -- Wrapper of DBM Database API (GNU Flavor) - - # Cryptography: - # cryptmodule.c -- Simple Wrapper for crypt() Function - -# fcntlmodule.obj \ -# fpectlmodule.obj \ -# fpetestmodule.obj \ -# Unix-Specific getpath.obj \ -# grpmodule.obj \ -# mpzmodule.obj \ -# nismodule.obj \ -# parsermodule.obj \ -# pwdmodule.obj \ -# readline.obj \ -# resource.obj \ -# syslogmodule.obj \ -# termios.obj \ - - # User Interface: -# _tkinter.obj \ -# stdwinmodule.obj \ -# cursesmodule.obj \ -# tclNotify.obj \ -# tkappinit.obj \ - # flmodule.c -- Wrapper of FORMS Library (Screen Forms) - - # zlibmodule.c -- Wrapper of ZLib Compression API (GZip Format) - # puremodule.c -- Wrapper of Purify Debugging API (Probably Non-OS/2) - # xxmodule.c -- Template to Create Your Own Module - -# -# Standalone Parser Generator Program (Shares Some of Python's Modules) -PGEN = \ - PGenMain.obj \ - PGen.obj \ - PrintGrammar.obj \ - ListNode.obj \ - Grammar.obj \ - BitSet.obj \ - FirstSets.obj \ - MetaGrammar.obj - -# Omitted Parser Elements (and Reason): - # intrcheck.c -- Not Referenced by Anyone (?) - -################## -# Macros and Flags -################## -_BASE = /Q /W2 /I$(PROJINCLUDE) - # /Q = Omit IBM Copyright - # /W2 = Show Warnings/Errors Only - # /Fi = Create Precompiled Headers - # /Si = Utilize Precompiled Headers - -_GEN = /G4 /Gm /Gd /B"/STACK:360000" - # /G4 = Generate Code for 486 (Use 386 for Debugger) - # /Gm = Use Multithread Runtime - # /Gd = Dynamically Load Runtime - # /Gs = Remove Code for Stack Probes - # /Gx = Remove C++ Exception-Handling Info - # /Tdp = Generate Code for C++ Templates - # /Rn = Generate Code without a Runtime - # /B"/STACK:n" = Set Stack Size - -_OPT = /O /Gl - # /O = Enable Speed-Optimizations - # /Ol = Pass Code Thru Intermediate Linker - # /Gu = Advise Linker All Ext Data is ID'd - # /Gl = Have Linker Remove Unused Fns - -_DBG = /DHAVE_CONFIG_H /DUSE_SOCKET - # /Ti = Embed Debugger/Analyzer Recs - # /Tm = Enable Debug Memory Fns - # /Tx = Request Full Dump Upon Exception - # /DDEBUG = Enable App-Internal Debugging Code - # /DUSE_SOCKET = - # /DUSE_DL_EXPORT = - -_OUT = - # /Fb = Embed Browser Recs - # /Gh = Generate Code for Profiler Hooks - # /Fl = Output C/C++ Listing Files - # /Lf = Provide Full (Detailed) Listing Files - # /Fm. = Output Linker Map File - # /Ft. = Output C++ Template Resolution Files - -_MAP = /FmNoise\$(.TARGET,B,>.map) - -_DLL = /Ge- -_EXE = /Ge - # /Ge = Create an EXE, not DLL - -CFLAGS = $(_BASE) $(_GEN) $(_OPT) $(_DBG) $(_OUT) $(_EXE) /Ss -CPPFLAGS = $(_BASE) $(_GEN) $(_OPT) $(_DBG) $(_OUT) $(_EXE) - -################### -# Primary Target(s) -################### -All: obj noise PyCore.lib Python15.lib Python15.dll Python.exe PGen.exe - -############## -# -############## - -# Object Library of All Essential Python Routines -PyCore.lib: $(MODULES) $(OBJECTS) $(PARSER) $(PYTHON) Config.obj - %do "%.lib" - -Python15.dll: Compile.obj PyCore.lib Python.def - %do "%.dll" CPPFLAGS+=/B"/NOE" CPPFLAGS+=$(_MAP) - -Compile.obj: Compile.c - %do ".c.obj" CFLAGS+=$(_DLL) - -# Import Library for Using the Python15.dll -Python15.lib: Python.def - %do ".def.lib" - -# Small Program to Start Interpreter in Python15.dll -Python.exe: Python.obj Python15.lib - %do "%.exe" CPPFLAGS+=$(_MAP) - -#Python.obj: Python.c -# %do ".c.obj" CFLAGS+=$(_EXE) - -PGen.exe: $(PGEN) PyCore.lib - %do "%.exe" CPPFLAGS+=$(_MAP) - -####################### -# Miscellaneous Targets -####################### - -# Remove Intermediate Targets but Leave Executable Binaries -clean: - -- Del /Q $(.PATH.obj)\*.obj >NUL 2>&1 - -- Del /Q /Y Noise >NUL 2>&1 - -- Del /Q $(ERRS) >NUL 2>&1 - -# Remove All Targets, Including Final Binaries -distclean: clean - -- Del /Q PyCore.lib Python15.lib >NUL 2>&1 - -- Del /Q Python15.dll Python.exe >NUL 2>&1 - -release: Python.exe Python15.dll Python15.lib - -- @Echo Y | copy /U $(.SOURCES,M"*.exe") D:\EXEs - -- @Echo Y | copy /U $(.SOURCES,M"*.dll") D:\DLLs - -- @Echo Y | copy /U $(.SOURCES,M"*.lib") E:\Tau\Lib - -test: - python ..\..\lib\test\regrtest.py - -# Update Dependencies on Targets (Uses OpusMAKE Commercial Product) -depend: - D:\OpusMake\os2mkmf -c -s - -### OPUS MKMF: Do not remove this line! Generated dependencies follow. - -_tkinter.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -arraymodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -audioop.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h mymath.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -binascii.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -cmathmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h mymath.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -cpickle.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - mymath.h myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -cryptmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -cursesmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -_dbmmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -errno.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -errnomodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -fcntlmodule.obj: abstract.h c:\mptn\include\sys\ioctl.h ceval.h \ - classobject.h cobject.h complexobject.h pyconfig.h dictobject.h \ - fileobject.h floatobject.h funcobject.h import.h intobject.h \ - intrcheck.h listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h pydebug.h \ - pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \ - sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h - -fpectlmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -fpetestmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -_gdbmmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -getbuildinfo.obj: pyconfig.h - -getpath.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h osdefs.h pydebug.h pyerrors.h pyfpe.h pystate.h \ - python.h pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - sysmodule.h traceback.h tupleobject.h - -grpmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - grp.h import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -imageop.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -main.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -mathmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h mymath.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -mpzmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longintrepr.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h pydebug.h \ - pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \ - sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h - -nismodule.obj: abstract.h c:\mptn\include\sys\time.h ceval.h classobject.h \ - cobject.h complexobject.h pyconfig.h dictobject.h fileobject.h \ - floatobject.h funcobject.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h pydebug.h \ - pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \ - sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h - -operator.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -parsermodule.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h graminit.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h node.h object.h objimpl.h \ - pydebug.h pyerrors.h pyfpe.h pystate.h python.h pythonrun.h \ - rangeobject.h sliceobject.h stringobject.h sysmodule.h token.h \ - traceback.h tupleobject.h - -posix.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - mytime.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h \ - python.h pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - sysmodule.h traceback.h tupleobject.h - -posixmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - mytime.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h \ - python.h pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - sysmodule.h traceback.h tupleobject.h - -pwdmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pwd.h pydebug.h pyerrors.h pyfpe.h pystate.h \ - python.h pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - sysmodule.h traceback.h tupleobject.h - -readline.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -resource.obj: abstract.h c:\mptn\include\sys\time.h ceval.h classobject.h \ - cobject.h complexobject.h pyconfig.h dictobject.h fileobject.h \ - floatobject.h funcobject.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h pydebug.h \ - pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \ - sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h - -selectmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h myselect.h mytime.h object.h objimpl.h pydebug.h \ - pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \ - sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h - -signalmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -socketmodule.obj: abstract.h c:\mptn\include\netinet\in.h \ - c:\mptn\include\sys\socket.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h mytime.h netdb.h object.h objimpl.h pydebug.h pyerrors.h \ - pyfpe.h pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -structmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - mymath.h myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -syslogmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h syslog.h sysmodule.h traceback.h tupleobject.h - -termios.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -_threadmodule.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h thread.h traceback.h tupleobject.h - -timemodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - mytime.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h \ - python.h pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - sysmodule.h traceback.h tupleobject.h - -xxmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -zlibmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -abstract.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -classobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - structmember.h sysmodule.h traceback.h tupleobject.h - -cobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -complexobject.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - mymath.h myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -dictobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -fileobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - structmember.h sysmodule.h traceback.h tupleobject.h - -floatobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h mymath.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -frameobject.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - frameobject.h funcobject.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h opcode.h \ - pydebug.h pyerrors.h pyfpe.h pystate.h python.h pythonrun.h \ - rangeobject.h sliceobject.h stringobject.h structmember.h \ - sysmodule.h traceback.h tupleobject.h - -funcobject.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h structmember.h sysmodule.h traceback.h \ - tupleobject.h - -listobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -longobject.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longintrepr.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h mymath.h myproto.h object.h objimpl.h \ - pydebug.h pyerrors.h pyfpe.h pystate.h python.h pythonrun.h \ - rangeobject.h sliceobject.h stringobject.h sysmodule.h traceback.h \ - tupleobject.h - -methodobject.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h token.h traceback.h tupleobject.h - -moduleobject.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -object.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -rangeobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -sliceobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -stringobject.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - mymath.h myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -tupleobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -typeobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -xxobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -acceler.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h node.h \ - parser.h pgenheaders.h pydebug.h token.h - -bitset.obj: bitset.h pyconfig.h mymalloc.h myproto.h pgenheaders.h pydebug.h - -firstsets.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \ - pgenheaders.h pydebug.h token.h - -grammar.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \ - pgenheaders.h pydebug.h token.h - -grammar1.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \ - pgenheaders.h pydebug.h token.h - -intrcheck.obj: pyconfig.h intrcheck.h mymalloc.h myproto.h - -listnode.obj: pyconfig.h mymalloc.h myproto.h node.h pgenheaders.h pydebug.h \ - token.h - -metagrammar.obj: bitset.h pyconfig.h grammar.h metagrammar.h mymalloc.h \ - myproto.h pgen.h pgenheaders.h pydebug.h - -myreadline.obj: pyconfig.h intrcheck.h mymalloc.h myproto.h - -node.obj: pyconfig.h mymalloc.h myproto.h node.h pgenheaders.h pydebug.h - -parser.obj: bitset.h pyconfig.h errcode.h grammar.h mymalloc.h \ - myproto.h node.h parser.h pgenheaders.h pydebug.h token.h - -parsetok.obj: bitset.h pyconfig.h errcode.h grammar.h mymalloc.h myproto.h \ - node.h parser.h parsetok.h pgenheaders.h pydebug.h token.h \ - tokenizer.h - -pgen.obj: bitset.h pyconfig.h grammar.h metagrammar.h mymalloc.h \ - myproto.h node.h pgen.h pgenheaders.h pydebug.h token.h - -pgenmain.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h node.h \ - parsetok.h pgen.h pgenheaders.h pydebug.h - -printgrammar.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \ - pgenheaders.h pydebug.h - -tokenizer.obj: pyconfig.h errcode.h mymalloc.h myproto.h pgenheaders.h \ - pydebug.h token.h tokenizer.h - -atof.obj: pyconfig.h - -bltinmodule.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h eval.h fileobject.h \ - floatobject.h funcobject.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h mymath.h myproto.h node.h object.h \ - objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -ceval.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h eval.h fileobject.h \ - floatobject.h frameobject.h funcobject.h import.h intobject.h \ - intrcheck.h listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h opcode.h \ - pydebug.h pyerrors.h pyfpe.h pystate.h python.h pythonrun.h \ - rangeobject.h sliceobject.h stringobject.h sysmodule.h traceback.h \ - tupleobject.h - -compile.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h graminit.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h node.h object.h objimpl.h \ - opcode.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - structmember.h sysmodule.h token.h traceback.h tupleobject.h - -errors.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -fmod.obj: pyconfig.h mymath.h - -frozen.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -frozenmain.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -getargs.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -getcompiler.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -getcopyright.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -getplatform.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -getversion.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h patchlevel.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -graminit.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \ - pgenheaders.h pydebug.h - -hypot.obj: pyconfig.h mymath.h myproto.h - -import.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h errcode.h eval.h \ - fileobject.h floatobject.h funcobject.h import.h importdl.h \ - intobject.h intrcheck.h listobject.h longobject.h marshal.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - node.h object.h objimpl.h osdefs.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h token.h traceback.h tupleobject.h - -importdl.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h importdl.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h osdefs.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -marshal.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longintrepr.h longobject.h marshal.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h pydebug.h \ - pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \ - sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h - -modsupport.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -mystrtoul.obj: pyconfig.h - -pyfpe.obj: pyconfig.h pyfpe.h - -pystate.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -pythonrun.obj: abstract.h bitset.h ceval.h classobject.h cobject.h \ - compile.h complexobject.h pyconfig.h dictobject.h errcode.h eval.h \ - fileobject.h floatobject.h funcobject.h grammar.h import.h \ - intobject.h intrcheck.h listobject.h longobject.h marshal.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - node.h object.h objimpl.h parsetok.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h sysmodule.h traceback.h tupleobject.h - -sigcheck.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \ - pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \ - traceback.h tupleobject.h - -strdup.obj: pyconfig.h mymalloc.h myproto.h - -strtod.obj: pyconfig.h - -structmember.obj: abstract.h ceval.h classobject.h cobject.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - funcobject.h import.h intobject.h intrcheck.h listobject.h \ - longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \ - myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \ - pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \ - stringobject.h structmember.h sysmodule.h traceback.h \ - tupleobject.h - -sysmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \ - pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \ - import.h intobject.h intrcheck.h listobject.h longobject.h \ - methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \ - object.h objimpl.h osdefs.h pydebug.h pyerrors.h pyfpe.h pystate.h \ - python.h pythonrun.h rangeobject.h sliceobject.h stringobject.h \ - sysmodule.h traceback.h tupleobject.h - -thread.obj: pyconfig.h thread.h - -traceback.obj: abstract.h ceval.h classobject.h cobject.h compile.h \ - complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \ - frameobject.h funcobject.h import.h intobject.h intrcheck.h \ - listobject.h longobject.h methodobject.h modsupport.h \ - moduleobject.h mymalloc.h myproto.h object.h objimpl.h osdefs.h \ - pydebug.h pyerrors.h pyfpe.h pystate.h python.h pythonrun.h \ - rangeobject.h sliceobject.h stringobject.h structmember.h \ - sysmodule.h traceback.h tupleobject.h diff --git a/PC/os2vacpp/pyconfig.h b/PC/os2vacpp/pyconfig.h deleted file mode 100644 --- a/PC/os2vacpp/pyconfig.h +++ /dev/null @@ -1,212 +0,0 @@ -#ifndef Py_CONFIG_H -#define Py_CONFIG_H - -/********************************************************************** - * pyconfig.h. NOT Generated automatically by configure. - * - * This is a manually maintained version used for the IBM VisualAge - * C/C++ compiler on the OS/2 platform. It is a standard part of - * the Python distribution. - * - * FILESYSTEM DEFINES: - * The code specific to a particular way of naming files and - * directory paths should be wrapped around one of the following - * #defines: - * - * DOSFILESYS PCDOS-Style (for PCDOS, Windows and OS/2) - * MACFILESYS Macintosh-Style - * UNIXFILESYS Unix-Style - * AMIGAFILESYS AmigaDOS-Style - * - * Because of the different compilers and operating systems in - * use on the Intel platform, neither the compiler name nor - * the operating system name is sufficient. - * - * OS/2 DEFINES: - * The code specific to OS/2's Program API should be wrapped around - * - * __TOS_OS2__ Target Operating System, OS/2 - * - * Any code specific to the compiler itself should be wrapped with - * - * __IBMC__ IBM C Compiler - * __IBMCPP__ IBM C++ Compiler - * - * Note that since the VisualAge C/C++ compiler is also available - * for the Windows platform, it may be necessary to use both a - * __TOS_OS2__ and a __IBMC__ to select a very specific environment. - * - **********************************************************************/ - -/* - * Some systems require special declarations for data items imported - * or exported from dynamic link libraries. Note that the definition - * of DL_IMPORT covers both cases. Define USE_DL_IMPORT for the client - * of a DLL. Define USE_DL_EXPORT when making a DLL. - */ - -#include - -/* Configuration Options for Finding Modules */ -#define PREFIX "" -#define EXEC_PREFIX "" - -/* Provide a default library so writers of extension modules - * won't have to explicitly specify it anymore - */ -#pragma library("Python24.lib") - -/***************************************************/ -/* 32-Bit IBM VisualAge C/C++ v3.0 for OS/2 */ -/* (Convert Compiler Flags into Useful Switches) */ -/***************************************************/ -#define PLATFORM "os2" -#define COMPILER "[VisualAge C/C++]" -#define PYOS_OS2 /* Define Indicator of Operating System */ -#define PYCC_VACPP /* Define Indicator of C Compiler */ - - /* Platform Filesystem */ -#define PYTHONPATH ".;.\\lib;.\\lib\\plat-win" -#define DOSFILESYS /* OS/2 Uses the DOS File Naming Conventions */ -/* #define IMPORT_8x3_NAMES (let's move up to long filenames) */ - - /* Platform CPU-Mode Dependencies */ -#define WORD_BIT 32 /* OS/2 is a 32-Bit Operating System */ -#define LONG_BIT 32 -#define SIZEOF_INT 4 /* Count of Bytes in an (int) */ -#define SIZEOF_LONG 4 /* Count of Bytes in a (long) */ -#define SIZEOF_VOID_P 4 /* Count of Bytes in a (void *) */ -/* #define HAVE_LONG_LONG 1 */ /* VAC++ does not support (long long) */ -/* #define SIZEOF_LONG_LONG 8 */ /* Count of Bytes in a (long long) */ - -/* unicode definines */ -#define PY_UNICODE_TYPE wchar_t -#define Py_UNICODE_SIZE SIZEOF_SHORT - -/* dynamic loading */ -#define HAVE_DYNAMIC_LOADING 1 - -/* Define if type char is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -/* #undef __CHAR_UNSIGNED__ */ -#endif - -typedef int mode_t; -typedef int uid_t; -typedef int gid_t; -typedef int pid_t; - -#if defined(__MULTI__) /* If Compiler /Gt+ Multithread Option Enabled, */ - #define WITH_THREAD 1 /* Enable Threading Throughout Python */ - #define OS2_THREADS 1 /* And Use the OS/2 Flavor of Threads */ -/* #define _REENTRANT 1 */ /* Use thread-safe errno, h_errno, and other fns */ -#endif - - /* Compiler Runtime Library Capabilities */ -#include -#include -/* #undef BAD_STATIC_FORWARD */ /* if compiler botches static fwd decls */ - -#define STDC_HEADERS 1 /* VAC++ is an ANSI C Compiler */ -#define HAVE_HYPOT 1 /* hypot() */ -#define HAVE_PUTENV 1 /* putenv() */ -/* #define VA_LIST_IS_ARRAY 1 */ /* if va_list is an array of some kind */ -/* #define HAVE_CONIO_H 1 */ /* #include */ -#define HAVE_ERRNO_H 1 /* #include */ -#define HAVE_SYS_STAT_H 1 /* #include */ -#define HAVE_SYS_TYPES_H 1 /* #include */ - - /* Variable-Arguments/Prototypes */ -#define HAVE_PROTOTYPES 1 /* VAC++ supports C Function Prototypes */ -#define HAVE_STDARG_PROTOTYPES 1 /* Our has prototypes */ - - /* String/Memory/Locale Operations */ -#define HAVE_MEMMOVE 1 /* memmove() */ -#define HAVE_STRERROR 1 /* strerror() */ -#define HAVE_SETLOCALE 1 /* setlocale() */ -#define MALLOC_ZERO_RETURNS_NULL 1 /* Our malloc(0) returns a NULL ptr */ - - /* Signal Handling */ -#define HAVE_SIGNAL_H 1 /* signal.h */ -#define RETSIGTYPE void /* Return type of handlers (int or void) */ -/* #undef WANT_SIGFPE_HANDLER */ /* Handle SIGFPE (see Include/pyfpe.h) */ -/* #define HAVE_ALARM 1 */ /* alarm() */ -/* #define HAVE_SIGINTERRUPT 1 */ /* siginterrupt() */ -/* #define HAVE_SIGRELSE 1 */ /* sigrelse() */ -#define DONT_HAVE_SIG_ALARM 1 -#define DONT_HAVE_SIG_PAUSE 1 - - /* Clock/Time Support */ -#define HAVE_FTIME 1 /* We have ftime() in */ -#define HAVE_CLOCK 1 /* clock() */ -#define HAVE_STRFTIME 1 /* strftime() */ -#define HAVE_MKTIME 1 /* mktime() */ -#define HAVE_TZNAME 1 /* No tm_zone but do have tzname[] */ -#define HAVE_TIMES 1 /* #include */ -#define HAVE_SYS_UTIME_H 1 /* #include */ -/* #define HAVE_UTIME_H 1 */ /* #include */ -#define HAVE_SYS_TIME_H 1 /* #include */ -/* #define TM_IN_SYS_TIME 1 */ /* declares struct tm */ -#define HAVE_GETTIMEOFDAY 1 /* gettimeofday() */ -/* #define GETTIMEOFDAY_NO_TZ 1 */ /* gettimeofday() does not have 2nd arg */ -/* #define HAVE_TIMEGM 1 */ /* timegm() */ -#define TIME_WITH_SYS_TIME 1 /* Mix and */ -#define SYS_SELECT_WITH_SYS_TIME 1 /* Mix and */ -/* #define HAVE_ALTZONE 1 */ /* if defines altzone */ - - /* Network/Sockets Support */ -#define HAVE_SYS_SELECT_H 1 /* #include */ -#define BSD_SELECT 1 /* Use BSD versus OS/2 form of select() */ -#define HAVE_SELECT 1 /* select() */ -#define HAVE_GETPEERNAME 1 /* getpeername() */ -/* #undef HAVE_GETHOSTNAME_R 1 */ /* gethostname_r() */ - - /* File I/O */ -#define HAVE_DUP2 1 /* dup2() */ -#define HAVE_EXECV 1 /* execv() */ -#define HAVE_SETVBUF 1 /* setvbuf() */ -#define HAVE_GETCWD 1 /* getcwd() */ -#define HAVE_PIPE 1 /* pipe() [OS/2-specific code added] */ -#define HAVE_IO_H 1 /* #include */ -#define HAVE_FCNTL_H 1 /* #include */ -#define HAVE_DIRECT_H 1 /* #include */ -/* #define HAVE_FLOCK 1 */ /* flock() */ -/* #define HAVE_TRUNCATE 1 */ /* truncate() */ -/* #define HAVE_FTRUNCATE 1 */ /* ftruncate() */ -/* #define HAVE_LSTAT 1 */ /* lstat() */ -/* #define HAVE_DIRENT_H 1 */ /* #include */ -/* #define HAVE_OPENDIR 1 */ /* opendir() */ - - /* Process Operations */ -#define HAVE_PROCESS_H 1 /* #include */ -#define HAVE_GETPID 1 /* getpid() */ -#define HAVE_SYSTEM 1 /* system() */ -#define HAVE_WAIT 1 /* wait() */ -#define HAVE_KILL 1 /* kill() [OS/2-specific code added] */ -#define HAVE_POPEN 1 /* popen() [OS/2-specific code added] */ -/* #define HAVE_GETPPID 1 */ /* getppid() */ -/* #define HAVE_WAITPID 1 */ /* waitpid() */ -/* #define HAVE_FORK 1 */ /* fork() */ - - /* User/Group ID Queries */ -/* #define HAVE_GETEGID 1 */ -/* #define HAVE_GETEUID 1 */ -/* #define HAVE_GETGID 1 */ -/* #define HAVE_GETUID 1 */ - - /* Unix-Specific */ -/* #define HAVE_SYS_UN_H 1 /* #include */ -/* #define HAVE_SYS_UTSNAME_H 1 */ /* #include */ -/* #define HAVE_SYS_WAIT_H 1 */ /* #include */ -/* #define HAVE_UNISTD_H 1 */ /* #include */ -/* #define HAVE_UNAME 1 */ /* uname () */ - -/* Define if you want documentation strings in extension modules */ -#define WITH_DOC_STRINGS 1 - -#ifdef USE_DL_EXPORT - #define DL_IMPORT(RTYPE) RTYPE _System -#endif - -#endif /* !Py_CONFIG_H */ - diff --git a/PC/os2vacpp/python.def b/PC/os2vacpp/python.def deleted file mode 100644 --- a/PC/os2vacpp/python.def +++ /dev/null @@ -1,479 +0,0 @@ -LIBRARY PYTHON24 INITINSTANCE TERMINSTANCE -DESCRIPTION 'Python 2.4 Core DLL' -PROTMODE -DATA MULTIPLE NONSHARED - -EXPORTS - ; Data - PyCFunction_Type - PyCapsule_Type - PyCObject_Type - PyClass_Type - PyCode_Type - PyComplex_Type - PyDict_Type - PyExc_ArithmeticError - PyExc_AssertionError - PyExc_AttributeError - PyExc_EOFError - PyExc_EnvironmentError - PyExc_Exception - PyExc_FloatingPointError - PyExc_IOError - PyExc_ImportError - PyExc_IndexError - PyExc_KeyError - PyExc_KeyboardInterrupt - PyExc_LookupError - PyExc_MemoryError - PyExc_MemoryErrorInst - PyExc_NameError - PyExc_OSError - PyExc_OverflowError - PyExc_RuntimeError - PyExc_SyntaxError - PyExc_SystemError - PyExc_SystemExit - PyExc_TypeError - PyExc_ValueError - PyExc_ZeroDivisionError - PyFile_Type - PyFloat_Type - PyFrame_Type - PyFunction_Type - PyImport_FrozenModules - PyImport_Inittab - PyInstance_Type - PyInt_Type - PyList_Type - PyLong_Type - PyMethod_Type - PyModule_Type - PyOS_InputHook - PyOS_ReadlineFunctionPointer - PyRange_Type - PySlice_Type - PyString_Type - PyTraceBack_Type - PyTuple_Type - PyType_Type - Py_DebugFlag - Py_FrozenFlag - Py_InteractiveFlag - Py_NoSiteFlag - Py_OptimizeFlag - Py_UseClassExceptionsFlag - Py_VerboseFlag - _PyImport_Filetab - _PyImport_Inittab - _PyParser_Grammar - _PyParser_TokenNames - _Py_EllipsisObject - _Py_NoneStruct - _Py_PackageContext - _Py_TrueStruct - _Py_ZeroStruct - _Py_abstract_hack - _Py_capsule_hack - _Py_re_syntax - _Py_re_syntax_table - - ; Code - PyArg_Parse - PyArg_ParseTuple - PyArg_ParseTupleAndKeywords - PyArg_VaParse - PyCFunction_Fini - PyCFunction_GetFlags - PyCFunction_GetFunction - PyCFunction_GetSelf - PyCFunction_New - PyCapsule_GetContext - PyCapsule_GetDestructor - PyCapsule_GetName - PyCapsule_GetPointer - PyCapsule_Import - PyCapsule_IsValid - PyCapsule_New - PyCapsule_SetContext - PyCapsule_SetDestructor - PyCapsule_SetName - PyCapsule_SetPointer - PyCObject_AsVoidPtr - PyCObject_FromVoidPtrAndDesc - PyCObject_FromVoidPtr - PyCObject_GetDesc - PyCObject_Import - PyCallable_Check - PyClass_IsSubclass - PyClass_New - PyCode_Addr2Line - PyCode_New - PyComplex_AsCComplex - PyComplex_FromCComplex - PyComplex_FromDoubles - PyComplex_ImagAsDouble - PyComplex_RealAsDouble - PyDict_Clear - PyDict_DelItem - PyDict_DelItemString - PyDict_GetItem - PyDict_GetItemString - PyDict_Items - PyDict_Keys - PyDict_New - PyDict_Next - PyDict_SetItem - PyDict_SetItemString - PyDict_Size - PyDict_Values - PyErr_BadArgument - PyErr_BadInternalCall - PyErr_CheckSignals - PyErr_Clear - PyErr_ExceptionMatches - PyErr_Fetch - PyErr_Format - PyErr_GivenExceptionMatches - PyErr_NewException - PyErr_NoMemory - PyErr_NormalizeException - PyErr_Occurred - PyErr_Print - PyErr_PrintEx - PyErr_Restore - PyErr_SetFromErrno - PyErr_SetFromErrnoWithFilename - PyErr_SetInterrupt - PyErr_SetNone - PyErr_SetObject - PyErr_SetString - PyEval_AcquireLock - PyEval_AcquireThread - PyEval_CallFunction - PyEval_CallMethod - PyEval_CallObject - PyEval_CallObjectWithKeywords - PyEval_EvalCode - PyEval_GetBuiltins - PyEval_GetFrame - PyEval_GetGlobals - PyEval_GetLocals - PyEval_GetRestricted - PyEval_InitThreads - PyEval_ReleaseLock - PyEval_ReleaseThread - PyEval_RestoreThread - PyEval_SaveThread - PyFile_AsFile - PyFile_FromFile - PyFile_FromString - PyFile_GetLine - PyFile_Name - PyFile_SetBufSize - PyFile_SoftSpace - PyFile_WriteObject - PyFile_WriteString - PyFloat_AsDouble - PyFloat_AsString - PyFloat_Fini - PyFloat_FromDouble - PyFrame_BlockPop - PyFrame_BlockSetup - PyFrame_FastToLocals - PyFrame_Fini - PyFrame_LocalsToFast - PyFrame_New - PyFunction_GetCode - PyFunction_GetDefaults - PyFunction_GetGlobals - PyFunction_New - PyFunction_SetDefaults - PyGrammar_AddAccelerators - PyGrammar_FindDFA - PyGrammar_LabelRepr - PyGrammar_RemoveAccelerators - PyImport_AddModule - PyImport_AppendInittab - PyImport_Cleanup - PyImport_ExecCodeModule - PyImport_ExecCodeModuleEx - PyImport_ExtendInittab - PyImport_GetMagicNumber - PyImport_GetModuleDict - PyImport_Import - PyImport_ImportFrozenModule - PyImport_ImportModule - PyImport_ImportModuleEx - PyImport_ReloadModule - PyInstance_DoBinOp - PyInstance_New - PyInt_AsLong - PyInt_Fini - PyInt_FromLong - PyInt_GetMax - PyInterpreterState_Clear - PyInterpreterState_Delete - PyInterpreterState_New - PyList_Append - PyList_AsTuple - PyList_GetItem - PyList_GetSlice - PyList_Insert - PyList_New - PyList_Reverse - PyList_SetItem - PyList_SetSlice - PyList_Size - PyList_Sort - PyLong_AsDouble - PyLong_AsLong -; PyLong_AsLongLong - PyLong_AsUnsignedLong -; PyLong_AsUnsignedLongLong - PyLong_AsVoidPtr - PyLong_FromDouble - PyLong_FromLong -; PyLong_FromLongLong - PyLong_FromString - PyLong_FromUnsignedLong -; PyLong_FromUnsignedLongLong - PyLong_FromVoidPtr - PyMapping_Check - PyMapping_GetItemString - PyMapping_HasKey - PyMapping_HasKeyString - PyMapping_Length - PyMapping_SetItemString - PyMarshal_Init - PyMarshal_ReadLongFromFile - PyMarshal_ReadObjectFromFile - PyMarshal_ReadObjectFromString - PyMarshal_WriteLongToFile - PyMarshal_WriteObjectToFile - PyMarshal_WriteObjectToString - PyMem_Free - PyMem_Malloc - PyMem_Realloc - PyMethod_Class - PyMethod_Fini - PyMethod_Function - PyMethod_New - PyMethod_Self - PyModule_GetDict - PyModule_GetName - PyModule_New - PyNode_AddChild - PyNode_Compile - PyNode_Free -; PyNode_ListTree - PyNode_New - PyNumber_Absolute - PyNumber_Add - PyNumber_And - PyNumber_Check - PyNumber_Coerce - PyNumber_CoerceEx - PyNumber_Divide - PyNumber_Divmod - PyNumber_Float - PyNumber_Int - PyNumber_Invert - PyNumber_Long - PyNumber_Lshift - PyNumber_Multiply - PyNumber_Negative - PyNumber_Or - PyNumber_Positive - PyNumber_Power - PyNumber_Remainder - PyNumber_Rshift - PyNumber_Subtract - PyNumber_Xor - PyOS_AfterFork - PyOS_FiniInterrupts - PyOS_InitInterrupts - PyOS_InterruptOccurred - PyOS_Readline - PyOS_StdioReadline - PyOS_strtol - PyOS_strtoul - PyObject_CallFunction - PyObject_CallMethod - PyObject_CallObject - PyObject_Cmp - PyObject_Compare - PyObject_DelItem - PyObject_GetAttr - PyObject_GetAttrString - PyObject_GetItem - PyObject_HasAttr - PyObject_HasAttrString - PyObject_Hash - PyObject_IsTrue - PyObject_Length - PyObject_Not - PyObject_Print - PyObject_Repr - PyObject_SetAttr - PyObject_SetAttrString - PyObject_SetItem - PyObject_Str - PyObject_Type - PyParser_AddToken - PyParser_Delete - PyParser_New - PyParser_ParseFile - PyParser_ParseString - PyParser_SimpleParseFile - PyParser_SimpleParseString - PyRange_New - PyRun_AnyFile - PyRun_File - PyRun_InteractiveLoop - PyRun_InteractiveOne - PyRun_SimpleFile - PyRun_SimpleString - PyRun_String - PySequence_Check - PySequence_Concat - PySequence_Contains - PySequence_Count - PySequence_DelItem - PySequence_DelSlice - PySequence_GetItem - PySequence_GetSlice - PySequence_In - PySequence_Index - PySequence_Length - PySequence_List - PySequence_Repeat - PySequence_SetItem - PySequence_SetSlice - PySequence_Tuple - PySlice_GetIndices - PySlice_New - PyString_AsString - PyString_Concat - PyString_ConcatAndDel - PyString_Fini - PyString_Format - PyString_FromString - PyString_FromStringAndSize - PyString_InternFromString - PyString_InternInPlace - PyString_Size - PySys_GetFile - PySys_GetObject - PySys_SetArgv - PySys_SetObject - PySys_SetPath - PySys_WriteStderr - PySys_WriteStdout - PyThreadState_Clear - PyThreadState_Delete - PyThreadState_Get - PyThreadState_GetDict - PyThreadState_New - PyThreadState_Swap - PyThread_acquire_lock - PyThread_allocate_lock - PyThread_allocate_sema - PyThread_down_sema - PyThread_exit_thread - PyThread_free_lock - PyThread_free_sema - PyThread_get_thread_ident - PyThread_init_thread - PyThread_release_lock - PyThread_start_new_thread - PyThread_up_sema - PyToken_OneChar - PyToken_TwoChars - PyTokenizer_Free - PyTokenizer_FromFile - PyTokenizer_FromString - PyTokenizer_Get - PyTraceBack_Here - PyTraceBack_Print - PyTuple_Fini - PyTuple_GetItem - PyTuple_GetSlice - PyTuple_New - PyTuple_SetItem - PyTuple_Size - Py_AddPendingCall - Py_AtExit - Py_BuildValue - Py_CompileString - Py_EndInterpreter - Py_Exit - Py_FatalError - Py_FdIsInteractive - Py_Finalize - Py_FindMethod - Py_FindMethodInChain - Py_FlushLine - Py_Free - Py_GetArgcArgv - Py_GetBuildInfo - Py_GetCompiler - Py_GetCopyright - Py_GetExecPrefix - Py_GetPath - Py_GetPlatform - Py_GetPrefix - Py_GetProgramFullPath - Py_GetProgramName - Py_GetPythonHome - Py_GetVersion - Py_InitModule4 - Py_Initialize - Py_IsInitialized - Py_Main - Py_MakePendingCalls - Py_Malloc - Py_NewInterpreter - Py_Realloc - Py_ReprEnter - Py_ReprLeave - Py_SetProgramName - Py_SetPythonHome - Py_VaBuildValue - _PyBuiltin_Fini_1 - _PyBuiltin_Fini_2 - _PyBuiltin_Init_1 - _PyBuiltin_Init_2 - _PyImport_FindExtension - _PyImport_Fini - _PyImport_FixupExtension - _PyImport_Init - _PyImport_LoadDynamicModule - _PyLong_New - _PyModule_Clear - _PyObject_New - _PyObject_NewVar - _PyString_Resize - _PySys_Init - _PyTuple_Resize - _Py_MD5Final - _Py_MD5Init - _Py_MD5Update -; _Py_addbit - _Py_c_diff - _Py_c_neg - _Py_c_pow - _Py_c_prod - _Py_c_quot - _Py_c_sum -; _Py_delbitset -; _Py_mergebitset -; _Py_meta_grammar -; _Py_newbitset -; _Py_samebitset - PyBuffer_Type - PyBuffer_FromObject - PyBuffer_FromMemory - PyBuffer_FromReadWriteMemory - PyBuffer_New - diff --git a/PC/os2vacpp/readme.txt b/PC/os2vacpp/readme.txt deleted file mode 100644 --- a/PC/os2vacpp/readme.txt +++ /dev/null @@ -1,119 +0,0 @@ -IBM VisualAge C/C++ for OS/2 -============================ - -To build Python for OS/2, change into ./os2vacpp and issue an 'NMAKE' -command. This will build a PYTHON15.DLL containing the set of Python -modules listed in config.c and a small PYTHON.EXE to start the -interpreter. - -By changing the C compiler flag /Gd- in the makefile to /Gd+, you can -reduce the size of these by causing Python to dynamically link to the -C runtime DLLs instead of including their bulk in your binaries. -However, this means that any system on which you run Python must have -the VAC++ compiler installed in order to have those DLLs available. - -During the build process you may see a couple of harmless warnings: - - From the C Compiler, "No function prototype given for XXX", which - comes from the use of K&R parameters within Python for portability. - - From the ILIB librarian, "Module Not Found (XXX)", which comes - from its attempt to perform the (-+) operation, which removes and - then adds a .OBJ to the library. The first time a build is done, - it obviously cannot remove what is not yet built. - -This build includes support for most Python functionality as well as -TCP/IP sockets. It omits the Posix ability to 'fork' a process but -supports threads using OS/2 native capabilities. I have tried to -support everything possible but here are a few usage notes. - - --- os.popen() Usage Warnings - -With respect to my implementation of popen() under OS/2: - - import os - - fd = os.popen("pkzip.exe -@ junk.zip", 'wb') - fd.write("file1.txt\n") - fd.write("file2.txt\n") - fd.write("file3.txt\n") - fd.write("\x1a") # Should Not Be Necessary But Is - fd.close() - -There is a bug, either in the VAC++ compiler or OS/2 itself, where the -simple closure of the write-side of a pipe -to- a process does not -send an EOF to that process. I find I must explicitly write a -control-Z (EOF) before closing the pipe. This is not a problem when -using popen() in read mode. - -One other slight difference with my popen() is that I return None -from the close(), instead of the Unix convention of the return code -of the spawned program. I could find no easy way to do this under -OS/2. - - --- BEGINLIBPATH/ENDLIBPATH - -With respect to environment variables, this OS/2 port supports the -special-to-OS/2 magic names of 'BEGINLIBPATH' and 'ENDLIBPATH' to -control where to load conventional DLLs from. Those names are -intercepted and converted to calls on the OS/2 kernel APIs and -are inherited by child processes, whether Python-based or not. - -A few new attributes have been added to the os module: - - os.meminstalled # Count of Bytes of RAM Installed on Machine - os.memkernel # Count of Bytes of RAM Reserved (Non-Swappable) - os.memvirtual # Count of Bytes of Virtual RAM Possible - os.timeslice # Duration of Scheduler Timeslice, in Milliseconds - os.maxpathlen # Maximum Length of a Path Specification, in chars - os.maxnamelen # Maximum Length of a Single Dir/File Name, in chars - os.version # Version of OS/2 Being Run e.g. "4.00" - os.revision # Revision of OS/2 Being Run (usually zero) - os.bootdrive # Drive that System Booted From e.g. "C:" - # (useful to find the CONFIG.SYS used to boot with) - - --- Using Python as the Default OS/2 Batch Language - -Note that OS/2 supports the Unix technique of putting the special -comment line at the time of scripts e.g. "#!/usr/bin/python" in -a different syntactic form. To do this, put your script into a file -with a .CMD extension and added 'extproc' to the top as follows: - - extproc C:\Python\Python.exe -x - import os - print "Hello from Python" - -The '-x' option tells Python to skip the first line of the file -while processing the rest as normal Python source. - - --- Suggested Environment Variable Setup - -With respect to the environment variables for Python, I use the -following setup: - - Set PYTHONHOME=E:\Tau\Projects\Python;D:\DLLs - Set PYTHONPATH=.;E:\Tau\Projects\Python\Lib; \ - E:\Tau\Projects\Python\Lib\plat-win - -The EXEC_PREFIX (optional second pathspec on PYTHONHOME) is where -you put any Python extension DLLs you may create/obtain. There -are none provided with this release. - - --- Contact Info - -Jeff Rush is no longer supporting the VACPP port :-( - -I don't have the VACPP compiler, so can't reliably maintain this port. - -Anyone with VACPP who can contribute patches to keep this port buildable -should upload them to the Python Patch Manager at Sourceforge and -assign them to me for review/checkin. - -Andrew MacIntyre -aimacintyre at users.sourceforge.net -August 18, 2002. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 02:11:50 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 02:11:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28Modules/*=29?= Message-ID: <3XXrxL178yzNCJ@mail.python.org> http://hg.python.org/cpython/rev/dea15868963f changeset: 79475:dea15868963f user: Jesus Cea date: Fri Oct 05 02:11:36 2012 +0200 summary: #16135: Removal of OS/2 support (Modules/*) files: Modules/_dbmmodule.c | 4 - Modules/_lsprof.c | 4 - Modules/faulthandler.c | 3 - Modules/fcntlmodule.c | 6 - Modules/pwdmodule.c | 4 - Modules/readline.c | 4 - Modules/selectmodule.c | 5 - Modules/signalmodule.c | 5 - Modules/socketmodule.c | 97 +----------------------------- Modules/socketmodule.h | 2 +- Modules/timemodule.c | 27 -------- 11 files changed, 4 insertions(+), 157 deletions(-) diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -14,11 +14,7 @@ */ #if defined(HAVE_NDBM_H) #include -#if defined(PYOS_OS2) && !defined(PYCC_GCC) -static char *which_dbm = "ndbm"; -#else static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ -#endif #elif defined(HAVE_GDBM_NDBM_H) #include static char *which_dbm = "GNU gdbm"; diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -36,12 +36,8 @@ #error "This module requires gettimeofday() on non-Windows platforms!" #endif -#if (defined(PYOS_OS2) && defined(PYCC_GCC)) -#include -#else #include #include -#endif static PY_LONG_LONG hpTimer(void) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -79,9 +79,6 @@ static user_signal_t *user_signals; /* the following macros come from Python: Modules/signalmodule.c */ -#if defined(PYOS_OS2) && !defined(PYCC_GCC) -#define NSIG 12 -#endif #ifndef NSIG # if defined(_NSIG) # define NSIG _NSIG /* For BSD/SysV */ diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -325,11 +325,6 @@ &lenobj, &startobj, &whence)) return NULL; -#if defined(PYOS_OS2) && defined(PYCC_GCC) - PyErr_SetString(PyExc_NotImplementedError, - "lockf not supported on OS/2 (EMX)"); - return NULL; -#else #ifndef LOCK_SH #define LOCK_SH 1 /* shared lock */ #define LOCK_EX 2 /* exclusive lock */ @@ -383,7 +378,6 @@ } Py_INCREF(Py_None); return Py_None; -#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */ } PyDoc_STRVAR(lockf_doc, diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c --- a/Modules/pwdmodule.c +++ b/Modules/pwdmodule.c @@ -160,12 +160,8 @@ struct passwd *p; if ((d = PyList_New(0)) == NULL) return NULL; -#if defined(PYOS_OS2) && defined(PYCC_GCC) - if ((p = getpwuid(0)) != NULL) { -#else setpwent(); while ((p = getpwent()) != NULL) { -#endif PyObject *v = mkpwent(p); if (v == NULL || PyList_Append(d, v) != 0) { Py_XDECREF(v); diff --git a/Modules/readline.c b/Modules/readline.c --- a/Modules/readline.c +++ b/Modules/readline.c @@ -901,10 +901,6 @@ using_history(); rl_readline_name = "python"; -#if defined(PYOS_OS2) && defined(PYCC_GCC) - /* Allow $if term= in .inputrc to work */ - rl_terminal_name = getenv("TERM"); -#endif /* Force rebind of TAB to insert-tab */ rl_bind_key('\t', rl_insert); /* Bind both ESC-TAB and ESC-ESC to the completion function */ diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -47,11 +47,6 @@ #include #endif -#if defined(PYOS_OS2) && !defined(PYCC_GCC) -#include -#include -#endif - #ifdef MS_WINDOWS # define WIN32_LEAN_AND_MEAN # include diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -34,11 +34,6 @@ #define SIG_ERR ((PyOS_sighandler_t)(-1)) #endif -#if defined(PYOS_OS2) && !defined(PYCC_GCC) -#define NSIG 12 -#include -#endif - #ifndef NSIG # if defined(_NSIG) # define NSIG _NSIG /* For BSD/SysV */ diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -223,13 +223,6 @@ #endif -#if defined(PYOS_OS2) -# define INCL_DOS -# define INCL_DOSERRORS -# define INCL_NOPMAPI -# include -#endif - #if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI /* make sure that the reentrant (gethostbyaddr_r etc) functions are declared correctly if compiling with @@ -286,12 +279,7 @@ # include /* Headers needed for inet_ntoa() and inet_addr() */ -# if defined(PYOS_OS2) && defined(PYCC_VACPP) -# include -typedef size_t socklen_t; -# else # include -# endif # include @@ -395,11 +383,6 @@ #define snprintf _snprintf #endif -#if defined(PYOS_OS2) && !defined(PYCC_GCC) -#define SOCKETCLOSE soclose -#define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */ -#endif - #ifndef SOCKETCLOSE #define SOCKETCLOSE close #endif @@ -534,42 +517,6 @@ return PyErr_SetExcFromWindowsErr(PyExc_OSError, err_no); #endif -#if defined(PYOS_OS2) && !defined(PYCC_GCC) - if (sock_errno() != NO_ERROR) { - APIRET rc; - ULONG msglen; - char outbuf[100]; - int myerrorcode = sock_errno(); - - /* Retrieve socket-related error message from MPTN.MSG file */ - rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf), - myerrorcode - SOCBASEERR + 26, - "mptn.msg", - &msglen); - if (rc == NO_ERROR) { - PyObject *v; - - /* OS/2 doesn't guarantee a terminator */ - outbuf[msglen] = '\0'; - if (strlen(outbuf) > 0) { - /* If non-empty msg, trim CRLF */ - char *lastc = &outbuf[ strlen(outbuf)-1 ]; - while (lastc > outbuf && - isspace(Py_CHARMASK(*lastc))) { - /* Trim trailing whitespace (CRLF) */ - *lastc-- = '\0'; - } - } - v = Py_BuildValue("(is)", myerrorcode, outbuf); - if (v != NULL) { - PyErr_SetObject(PyExc_OSError, v); - Py_DECREF(v); - } - return NULL; - } - } -#endif - return PyErr_SetFromErrno(PyExc_OSError); } @@ -658,20 +605,17 @@ Py_BEGIN_ALLOW_THREADS #ifndef MS_WINDOWS -#if defined(PYOS_OS2) && !defined(PYCC_GCC) - block = !block; - ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block)); -#elif defined(__VMS) +#if defined(__VMS) block = !block; ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block); -#else /* !PYOS_OS2 && !__VMS */ +#else /* !__VMS */ delay_flag = fcntl(s->sock_fd, F_GETFL, 0); if (block) delay_flag &= (~O_NONBLOCK); else delay_flag |= O_NONBLOCK; fcntl(s->sock_fd, F_SETFL, delay_flag); -#endif /* !PYOS_OS2 */ +#endif /* !__VMS */ #else /* MS_WINDOWS */ block = !block; ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block); @@ -1329,11 +1273,7 @@ } addr->sun_family = s->sock_family; memcpy(addr->sun_path, path, len); -#if defined(PYOS_OS2) - *len_ret = sizeof(*addr); -#else *len_ret = len + offsetof(struct sockaddr_un, sun_path); -#endif retval = 1; unix_out: Py_DECREF(args); @@ -2820,13 +2760,8 @@ timeout = internal_select_ex(s, 0, interval); if (!timeout) { #ifndef MS_WINDOWS -#if defined(PYOS_OS2) && !defined(PYCC_GCC) - n = recvfrom(s->sock_fd, cbuf, len, flags, - SAS2SA(&addrbuf), &addrlen); -#else n = recvfrom(s->sock_fd, cbuf, len, flags, (void *) &addrbuf, &addrlen); -#endif #else n = recvfrom(s->sock_fd, cbuf, len, flags, SAS2SA(&addrbuf), &addrlen); @@ -5509,32 +5444,6 @@ #endif /* MS_WINDOWS */ -#ifdef PYOS_OS2 -#define OS_INIT_DEFINED - -/* Additional initialization for OS/2 */ - -static int -os_init(void) -{ -#ifndef PYCC_GCC - int rc = sock_init(); - - if (rc == 0) { - return 1; /* Success */ - } - - PyErr_Format(PyExc_ImportError, "OS/2 TCP/IP Error# %d", sock_errno()); - - return 0; /* Failure */ -#else - /* No need to initialize sockets with GCC/EMX */ - return 1; /* Success */ -#endif -} - -#endif /* PYOS_OS2 */ - #ifndef OS_INIT_DEFINED static int diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -8,7 +8,7 @@ # include # endif # include -# if !(defined(__CYGWIN__) || (defined(PYOS_OS2) && defined(PYCC_VACPP))) +# if !defined(__CYGWIN__) # include # endif diff --git a/Modules/timemodule.c b/Modules/timemodule.c --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -37,16 +37,6 @@ #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ -#if defined(PYOS_OS2) -#define INCL_DOS -#define INCL_ERRORS -#include -#endif - -#if defined(PYCC_VACPP) -#include -#endif - #if defined(__APPLE__) #include #endif @@ -1284,19 +1274,11 @@ #if defined(HAVE_TZNAME) && !defined(__GLIBC__) && !defined(__CYGWIN__) PyObject *otz0, *otz1; tzset(); -#ifdef PYOS_OS2 - PyModule_AddIntConstant(m, "timezone", _timezone); -#else /* !PYOS_OS2 */ PyModule_AddIntConstant(m, "timezone", timezone); -#endif /* PYOS_OS2 */ #ifdef HAVE_ALTZONE PyModule_AddIntConstant(m, "altzone", altzone); #else -#ifdef PYOS_OS2 - PyModule_AddIntConstant(m, "altzone", _timezone-3600); -#else /* !PYOS_OS2 */ PyModule_AddIntConstant(m, "altzone", timezone-3600); -#endif /* PYOS_OS2 */ #endif PyModule_AddIntConstant(m, "daylight", daylight); otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape"); @@ -1602,15 +1584,6 @@ } Py_END_ALLOW_THREADS } -#elif defined(PYOS_OS2) - /* This Sleep *IS* Interruptable by Exceptions */ - Py_BEGIN_ALLOW_THREADS - if (DosSleep(secs * 1000) != NO_ERROR) { - Py_BLOCK_THREADS - PyErr_SetFromErrno(PyExc_IOError); - return -1; - } - Py_END_ALLOW_THREADS #else /* XXX Can't interrupt this sleep */ Py_BEGIN_ALLOW_THREADS -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 02:27:53 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 02:27:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28C_code_and_Docs=29?= Message-ID: <3XXsHs02DtzNjW@mail.python.org> http://hg.python.org/cpython/rev/42c063b3821f changeset: 79476:42c063b3821f user: Jesus Cea date: Fri Oct 05 02:27:40 2012 +0200 summary: #16135: Removal of OS/2 support (C code and Docs) files: Include/osdefs.h | 8 +------- Include/pyport.h | 3 --- PC/python.mk | 5 ----- PC/readme.txt | 13 ------------- Tools/freeze/freeze.py | 2 +- 5 files changed, 2 insertions(+), 29 deletions(-) diff --git a/Include/osdefs.h b/Include/osdefs.h --- a/Include/osdefs.h +++ b/Include/osdefs.h @@ -9,16 +9,10 @@ /* Mod by chrish: QNX has WATCOM, but isn't DOS */ #if !defined(__QNX__) -#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#define MAXPATHLEN 260 -#define SEP L'/' -#define ALTSEP L'\\' -#else +#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) #define SEP L'\\' #define ALTSEP L'/' #define MAXPATHLEN 256 -#endif #define DELIM L';' #endif #endif diff --git a/Include/pyport.h b/Include/pyport.h --- a/Include/pyport.h +++ b/Include/pyport.h @@ -379,9 +379,6 @@ #endif #ifdef HAVE_SYS_STAT_H -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#include -#endif #include #elif defined(HAVE_STAT_H) #include diff --git a/PC/python.mk b/PC/python.mk deleted file mode 100644 --- a/PC/python.mk +++ /dev/null @@ -1,5 +0,0 @@ -project : n:\python\python-1.5.1\pc\wat_os2\pyth_os2.exe n:\python\python-1.& -5.1\pc\wat_dos\pyth_dos.exe .SYMBOLIC - -!include n:\python\python-1.5.1\pc\wat_os2\pyth_os2.mk1 -!include n:\python\python-1.5.1\pc\wat_dos\pyth_dos.mk1 diff --git a/PC/readme.txt b/PC/readme.txt --- a/PC/readme.txt +++ b/PC/readme.txt @@ -79,19 +79,6 @@ The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older versions of Microsoft Visual Studio. See PCbuild/readme.txt. -EMX development tools for OS/2 -============================== - -See os2emx/readme.txt. This platform is maintained by Andrew MacIntyre. - -IBM VisualAge C/C++ for OS/2 -============================ - -See os2vacpp/readme.txt. This platform is supported by Jeff Rush. - -NOTE: Support for os2vacpp may be dropped in the near future. Please move - to EMX. - Note for Windows 3.x and DOS users ================================== diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -125,7 +125,7 @@ # default the exclude list for each platform if win: exclude = exclude + [ 'dos', 'dospath', 'mac', 'macpath', 'macfs', 'MACFS', 'posix', - 'os2', 'ce', + 'ce', ] fail_import = exclude[:] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 02:34:15 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 5 Oct 2012 02:34:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzE2MTI3OiByZW1v?= =?utf-8?q?ve_outdated_references_to_narrow_builds=2E__Patch_by_Serhiy_Sto?= =?utf-8?q?rchaka=2E?= Message-ID: <3XXsRC3jWgzM4S@mail.python.org> http://hg.python.org/cpython/rev/a1aa13ef00c5 changeset: 79477:a1aa13ef00c5 branch: 3.3 parent: 79470:6ea8019307a9 user: Ezio Melotti date: Fri Oct 05 03:33:31 2012 +0300 summary: #16127: remove outdated references to narrow builds. Patch by Serhiy Storchaka. files: Doc/c-api/unicode.rst | 2 -- Doc/reference/lexical_analysis.rst | 4 +--- Include/unicodeobject.h | 3 +-- Objects/unicodeobject.c | 14 ++++---------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -1083,8 +1083,6 @@ After completion, *\*byteorder* is set to the current byte order at the end of input data. - In a narrow build codepoints outside the BMP will be decoded as surrogate pairs. - If *byteorder* is *NULL*, the codec starts in native order mode. Return *NULL* if an exception was raised by the codec. diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -538,9 +538,7 @@ this escape sequence. Exactly four hex digits are required. (6) - Any Unicode character can be encoded this way, but characters outside the Basic - Multilingual Plane (BMP) will be encoded using a surrogate pair if Python is - compiled to use 16-bit code units (the default). Exactly eight hex digits + Any Unicode character can be encoded this way. Exactly eight hex digits are required. diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1022,8 +1022,7 @@ /* Create a Unicode Object from the given Unicode code point ordinal. - The ordinal must be in range(0x10000) on narrow Python builds - (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is + The ordinal must be in range(0x110000). A ValueError is raised in case it is not. */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5772,18 +5772,12 @@ void *data; Py_ssize_t expandsize = 0; - /* Initial allocation is based on the longest-possible unichr + /* Initial allocation is based on the longest-possible character escape. - In wide (UTF-32) builds '\U00xxxxxx' is 10 chars per source - unichr, so in this case it's the longest unichr escape. In - narrow (UTF-16) builds this is five chars per source unichr - since there are two unichrs in the surrogate pair, so in narrow - (UTF-16) builds it's not the longest unichr escape. - - In wide or narrow builds '\uxxxx' is 6 chars per source unichr, - so in the narrow (UTF-16) build case it's the longest unichr - escape. + For UCS1 strings it's '\xxx', 4 bytes per source character. + For UCS2 strings it's '\uxxxx', 6 bytes per source character. + For UCS4 strings it's '\U00xxxxxx', 10 bytes per source character. */ if (!PyUnicode_Check(unicode)) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 02:34:16 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 5 Oct 2012 02:34:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogIzE2MTI3OiBtZXJnZSB3aXRoIDMuMy4=?= Message-ID: <3XXsRD6fcRzNjW@mail.python.org> http://hg.python.org/cpython/rev/89ee959a9b54 changeset: 79478:89ee959a9b54 parent: 79476:42c063b3821f parent: 79477:a1aa13ef00c5 user: Ezio Melotti date: Fri Oct 05 03:34:02 2012 +0300 summary: #16127: merge with 3.3. files: Doc/c-api/unicode.rst | 2 -- Doc/reference/lexical_analysis.rst | 4 +--- Include/unicodeobject.h | 3 +-- Objects/unicodeobject.c | 14 ++++---------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -1083,8 +1083,6 @@ After completion, *\*byteorder* is set to the current byte order at the end of input data. - In a narrow build codepoints outside the BMP will be decoded as surrogate pairs. - If *byteorder* is *NULL*, the codec starts in native order mode. Return *NULL* if an exception was raised by the codec. diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -538,9 +538,7 @@ this escape sequence. Exactly four hex digits are required. (6) - Any Unicode character can be encoded this way, but characters outside the Basic - Multilingual Plane (BMP) will be encoded using a surrogate pair if Python is - compiled to use 16-bit code units (the default). Exactly eight hex digits + Any Unicode character can be encoded this way. Exactly eight hex digits are required. diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1022,8 +1022,7 @@ /* Create a Unicode Object from the given Unicode code point ordinal. - The ordinal must be in range(0x10000) on narrow Python builds - (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is + The ordinal must be in range(0x110000). A ValueError is raised in case it is not. */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5800,18 +5800,12 @@ void *data; Py_ssize_t expandsize = 0; - /* Initial allocation is based on the longest-possible unichr + /* Initial allocation is based on the longest-possible character escape. - In wide (UTF-32) builds '\U00xxxxxx' is 10 chars per source - unichr, so in this case it's the longest unichr escape. In - narrow (UTF-16) builds this is five chars per source unichr - since there are two unichrs in the surrogate pair, so in narrow - (UTF-16) builds it's not the longest unichr escape. - - In wide or narrow builds '\uxxxx' is 6 chars per source unichr, - so in the narrow (UTF-16) build case it's the longest unichr - escape. + For UCS1 strings it's '\xxx', 4 bytes per source character. + For UCS2 strings it's '\uxxxx', 6 bytes per source character. + For UCS4 strings it's '\U00xxxxxx', 10 bytes per source character. */ if (!PyUnicode_Check(unicode)) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 03:16:01 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 03:16:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28Remove_OS2_and_OS/2_references=29?= Message-ID: <3XXtMP4jdSzP08@mail.python.org> http://hg.python.org/cpython/rev/d853354e1470 changeset: 79479:d853354e1470 user: Jesus Cea date: Fri Oct 05 02:48:46 2012 +0200 summary: #16135: Removal of OS/2 support (Remove OS2 and OS/2 references) files: Lib/dbm/__init__.py | 6 +- Lib/mailbox.py | 3 - Lib/ntpath.py | 6 +- Lib/os2emxpath.py | 158 -------------- Lib/plat-os2emx/IN.py | 82 ------- Lib/plat-os2emx/SOCKET.py | 106 --------- Lib/plat-os2emx/_emx_link.py | 79 ------- Lib/plat-os2emx/grp.py | 182 ---------------- Lib/plat-os2emx/pwd.py | 208 ------------------- Lib/plat-os2emx/regen | 7 - Lib/platform.py | 4 +- Lib/test/test_fcntl.py | 15 +- Lib/test/test_socketserver.py | 16 +- Lib/webbrowser.py | 11 - Misc/RPM/python-3.4.spec | 3 +- PC/getpathp.c | 2 +- Tools/stringbench/stringbench.py | 2 +- setup.py | 2 +- 18 files changed, 14 insertions(+), 878 deletions(-) diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py --- a/Lib/dbm/__init__.py +++ b/Lib/dbm/__init__.py @@ -106,10 +106,8 @@ try: f = io.open(filename + ".pag", "rb") f.close() - # dbm linked with gdbm on OS/2 doesn't have .dir file - if not (ndbm.library == "GNU gdbm" and sys.platform == "os2emx"): - f = io.open(filename + ".dir", "rb") - f.close() + f = io.open(filename + ".dir", "rb") + f.close() return "dbm.ndbm" except IOError: # some dbm emulations based on Berkeley DB generate a .db file diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -22,9 +22,6 @@ import io import contextlib try: - if sys.platform == 'os2emx': - # OS/2 EMX fcntl() not adequate - raise ImportError import fcntl except ImportError: fcntl = None diff --git a/Lib/ntpath.py b/Lib/ntpath.py --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -30,9 +30,6 @@ defpath = '.;C:\\bin' if 'ce' in sys.builtin_module_names: defpath = '\\Windows' -elif 'os2' in sys.builtin_module_names: - # OS/2 w/ VACPP - altsep = '/' devnull = 'nul' def _get_empty(path): @@ -320,8 +317,7 @@ def islink(path): """Test whether a path is a symbolic link. - This will always return false for Windows prior to 6.0 - and for OS/2. + This will always return false for Windows prior to 6.0. """ try: st = os.lstat(path) diff --git a/Lib/os2emxpath.py b/Lib/os2emxpath.py deleted file mode 100644 --- a/Lib/os2emxpath.py +++ /dev/null @@ -1,158 +0,0 @@ -# Module 'os2emxpath' -- common operations on OS/2 pathnames -"""Common pathname manipulations, OS/2 EMX version. - -Instead of importing this module directly, import os and refer to this -module as os.path. -""" - -import os -import stat -from genericpath import * -from ntpath import (expanduser, expandvars, isabs, islink, splitdrive, - splitext, split) - -__all__ = ["normcase","isabs","join","splitdrive","split","splitext", - "basename","dirname","commonprefix","getsize","getmtime", - "getatime","getctime", "islink","exists","lexists","isdir","isfile", - "ismount","expanduser","expandvars","normpath","abspath", - "splitunc","curdir","pardir","sep","pathsep","defpath","altsep", - "extsep","devnull","realpath","supports_unicode_filenames"] - -# strings representing various path-related bits and pieces -curdir = '.' -pardir = '..' -extsep = '.' -sep = '/' -altsep = '\\' -pathsep = ';' -defpath = '.;C:\\bin' -devnull = 'nul' - -# Normalize the case of a pathname and map slashes to backslashes. -# Other normalizations (such as optimizing '../' away) are not done -# (this is done by normpath). - -def normcase(s): - """Normalize case of pathname. - - Makes all characters lowercase and all altseps into seps.""" - if not isinstance(s, (bytes, str)): - raise TypeError("normcase() argument must be str or bytes, " - "not '{}'".format(s.__class__.__name__)) - return s.replace('\\', '/').lower() - - -# Join two (or more) paths. - -def join(a, *p): - """Join two or more pathname components, inserting sep as needed""" - path = a - for b in p: - if isabs(b): - path = b - elif path == '' or path[-1:] in '/\\:': - path = path + b - else: - path = path + '/' + b - return path - - -# Parse UNC paths -def splitunc(p): - """Split a pathname into UNC mount point and relative path specifiers. - - Return a 2-tuple (unc, rest); either part may be empty. - If unc is not empty, it has the form '//host/mount' (or similar - using backslashes). unc+rest is always the input path. - Paths containing drive letters never have an UNC part. - """ - if p[1:2] == ':': - return '', p # Drive letter present - firstTwo = p[0:2] - if firstTwo == '/' * 2 or firstTwo == '\\' * 2: - # is a UNC path: - # vvvvvvvvvvvvvvvvvvvv equivalent to drive letter - # \\machine\mountpoint\directories... - # directory ^^^^^^^^^^^^^^^ - normp = normcase(p) - index = normp.find('/', 2) - if index == -1: - ##raise RuntimeError, 'illegal UNC path: "' + p + '"' - return ("", p) - index = normp.find('/', index + 1) - if index == -1: - index = len(p) - return p[:index], p[index:] - return '', p - - -# Return the tail (basename) part of a path. - -def basename(p): - """Returns the final component of a pathname""" - return split(p)[1] - - -# Return the head (dirname) part of a path. - -def dirname(p): - """Returns the directory component of a pathname""" - return split(p)[0] - - -# alias exists to lexists -lexists = exists - - -# Is a path a directory? - -# Is a path a mount point? Either a root (with or without drive letter) -# or an UNC path with at most a / or \ after the mount point. - -def ismount(path): - """Test whether a path is a mount point (defined as root of drive)""" - unc, rest = splitunc(path) - if unc: - return rest in ("", "/", "\\") - p = splitdrive(path)[1] - return len(p) == 1 and p[0] in '/\\' - - -# Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B. - -def normpath(path): - """Normalize path, eliminating double slashes, etc.""" - path = path.replace('\\', '/') - prefix, path = splitdrive(path) - while path[:1] == '/': - prefix = prefix + '/' - path = path[1:] - comps = path.split('/') - i = 0 - while i < len(comps): - if comps[i] == '.': - del comps[i] - elif comps[i] == '..' and i > 0 and comps[i-1] not in ('', '..'): - del comps[i-1:i+1] - i = i - 1 - elif comps[i] == '' and i > 0 and comps[i-1] != '': - del comps[i] - else: - i = i + 1 - # If the path is now empty, substitute '.' - if not prefix and not comps: - comps.append('.') - return prefix + '/'.join(comps) - - -# Return an absolute path. -def abspath(path): - """Return the absolute version of a path""" - if not isabs(path): - path = join(os.getcwd(), path) - return normpath(path) - -# realpath is a no-op on systems without islink support -realpath = abspath - -supports_unicode_filenames = False diff --git a/Lib/plat-os2emx/IN.py b/Lib/plat-os2emx/IN.py deleted file mode 100644 --- a/Lib/plat-os2emx/IN.py +++ /dev/null @@ -1,82 +0,0 @@ -# Generated by h2py from f:/emx/include/netinet/in.h - -# Included from sys/param.h -PAGE_SIZE = 0x1000 -HZ = 100 -MAXNAMLEN = 260 -MAXPATHLEN = 260 -def htonl(X): return _swapl(X) - -def ntohl(X): return _swapl(X) - -def htons(X): return _swaps(X) - -def ntohs(X): return _swaps(X) - -IPPROTO_IP = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_TCP = 6 -IPPROTO_EGP = 8 -IPPROTO_PUP = 12 -IPPROTO_UDP = 17 -IPPROTO_IDP = 22 -IPPROTO_TP = 29 -IPPROTO_EON = 80 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 5000 -def IN_CLASSA(i): return (((int)(i) & 0x80000000) == 0) - -IN_CLASSA_NET = 0xff000000 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((int)(i) & 0xc0000000) == 0x80000000) - -IN_CLASSB_NET = 0xffff0000 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((int)(i) & 0xe0000000) == 0xc0000000) - -IN_CLASSC_NET = 0xffffff00 -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((int)(i) & 0xf0000000) == 0xe0000000) - -IN_CLASSD_NET = 0xf0000000 -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((int)(i) & 0xe0000000) == 0xe0000000) - -def IN_BADCLASS(i): return (((int)(i) & 0xf0000000) == 0xf0000000) - -INADDR_ANY = 0x00000000 -INADDR_LOOPBACK = 0x7f000001 -INADDR_BROADCAST = 0xffffffff -INADDR_NONE = 0xffffffff -INADDR_UNSPEC_GROUP = 0xe0000000 -INADDR_ALLHOSTS_GROUP = 0xe0000001 -INADDR_MAX_LOCAL_GROUP = 0xe00000ff -IN_LOOPBACKNET = 127 -IP_OPTIONS = 1 -IP_MULTICAST_IF = 2 -IP_MULTICAST_TTL = 3 -IP_MULTICAST_LOOP = 4 -IP_ADD_MEMBERSHIP = 5 -IP_DROP_MEMBERSHIP = 6 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 diff --git a/Lib/plat-os2emx/SOCKET.py b/Lib/plat-os2emx/SOCKET.py deleted file mode 100644 --- a/Lib/plat-os2emx/SOCKET.py +++ /dev/null @@ -1,106 +0,0 @@ -# Generated by h2py from f:/emx/include/sys/socket.h - -# Included from sys/types.h -FD_SETSIZE = 256 - -# Included from sys/uio.h -FREAD = 1 -FWRITE = 2 -SOCK_STREAM = 1 -SOCK_DGRAM = 2 -SOCK_RAW = 3 -SOCK_RDM = 4 -SOCK_SEQPACKET = 5 -SO_DEBUG = 0x0001 -SO_ACCEPTCONN = 0x0002 -SO_REUSEADDR = 0x0004 -SO_KEEPALIVE = 0x0008 -SO_DONTROUTE = 0x0010 -SO_BROADCAST = 0x0020 -SO_USELOOPBACK = 0x0040 -SO_LINGER = 0x0080 -SO_OOBINLINE = 0x0100 -SO_L_BROADCAST = 0x0200 -SO_RCV_SHUTDOWN = 0x0400 -SO_SND_SHUTDOWN = 0x0800 -SO_SNDBUF = 0x1001 -SO_RCVBUF = 0x1002 -SO_SNDLOWAT = 0x1003 -SO_RCVLOWAT = 0x1004 -SO_SNDTIMEO = 0x1005 -SO_RCVTIMEO = 0x1006 -SO_ERROR = 0x1007 -SO_TYPE = 0x1008 -SO_OPTIONS = 0x1010 -SOL_SOCKET = 0xffff -AF_UNSPEC = 0 -AF_UNIX = 1 -AF_INET = 2 -AF_IMPLINK = 3 -AF_PUP = 4 -AF_CHAOS = 5 -AF_NS = 6 -AF_NBS = 7 -AF_ISO = 7 -AF_OSI = AF_ISO -AF_ECMA = 8 -AF_DATAKIT = 9 -AF_CCITT = 10 -AF_SNA = 11 -AF_DECnet = 12 -AF_DLI = 13 -AF_LAT = 14 -AF_HYLINK = 15 -AF_APPLETALK = 16 -AF_NB = 17 -AF_NETBIOS = AF_NB -AF_OS2 = AF_UNIX -AF_MAX = 18 -PF_UNSPEC = AF_UNSPEC -PF_UNIX = AF_UNIX -PF_INET = AF_INET -PF_IMPLINK = AF_IMPLINK -PF_PUP = AF_PUP -PF_CHAOS = AF_CHAOS -PF_NS = AF_NS -PF_NBS = AF_NBS -PF_ISO = AF_ISO -PF_OSI = AF_ISO -PF_ECMA = AF_ECMA -PF_DATAKIT = AF_DATAKIT -PF_CCITT = AF_CCITT -PF_SNA = AF_SNA -PF_DECnet = AF_DECnet -PF_DLI = AF_DLI -PF_LAT = AF_LAT -PF_HYLINK = AF_HYLINK -PF_APPLETALK = AF_APPLETALK -PF_NB = AF_NB -PF_NETBIOS = AF_NB -PF_OS2 = AF_UNIX -PF_MAX = AF_MAX -SOMAXCONN = 5 -MSG_OOB = 0x1 -MSG_PEEK = 0x2 -MSG_DONTROUTE = 0x4 -MSG_EOR = 0x8 -MSG_TRUNC = 0x10 -MSG_CTRUNC = 0x20 -MSG_WAITALL = 0x40 -MSG_MAXIOVLEN = 16 -SCM_RIGHTS = 0x01 -MT_FREE = 0 -MT_DATA = 1 -MT_HEADER = 2 -MT_SOCKET = 3 -MT_PCB = 4 -MT_RTABLE = 5 -MT_HTABLE = 6 -MT_ATABLE = 7 -MT_SONAME = 8 -MT_ZOMBIE = 9 -MT_SOOPTS = 10 -MT_FTABLE = 11 -MT_RIGHTS = 12 -MT_IFADDR = 13 -MAXSOCKETS = 2048 diff --git a/Lib/plat-os2emx/_emx_link.py b/Lib/plat-os2emx/_emx_link.py deleted file mode 100644 --- a/Lib/plat-os2emx/_emx_link.py +++ /dev/null @@ -1,79 +0,0 @@ -# _emx_link.py - -# Written by Andrew I MacIntyre, December 2002. - -"""_emx_link.py is a simplistic emulation of the Unix link(2) library routine -for creating so-called hard links. It is intended to be imported into -the os module in place of the unimplemented (on OS/2) Posix link() -function (os.link()). - -We do this on OS/2 by implementing a file copy, with link(2) semantics:- - - the target cannot already exist; - - we hope that the actual file open (if successful) is actually - atomic... - -Limitations of this approach/implementation include:- - - no support for correct link counts (EMX stat(target).st_nlink - is always 1); - - thread safety undefined; - - default file permissions (r+w) used, can't be over-ridden; - - implemented in Python so comparatively slow, especially for large - source files; - - need sufficient free disk space to store the copy. - -Behaviour:- - - any exception should propagate to the caller; - - want target to be an exact copy of the source, so use binary mode; - - returns None, same as os.link() which is implemented in posixmodule.c; - - target removed in the event of a failure where possible; - - given the motivation to write this emulation came from trying to - support a Unix resource lock implementation, where minimal overhead - during creation of the target is desirable and the files are small, - we read a source block before attempting to create the target so that - we're ready to immediately write some data into it. -""" - -import os -import errno - -__all__ = ['link'] - -def link(source, target): - """link(source, target) -> None - - Attempt to hard link the source file to the target file name. - On OS/2, this creates a complete copy of the source file. - """ - - s = os.open(source, os.O_RDONLY | os.O_BINARY) - if os.isatty(s): - raise OSError(errno.EXDEV, 'Cross-device link') - data = os.read(s, 1024) - - try: - t = os.open(target, os.O_WRONLY | os.O_BINARY | os.O_CREAT | os.O_EXCL) - except OSError: - os.close(s) - raise - - try: - while data: - os.write(t, data) - data = os.read(s, 1024) - except OSError: - os.close(s) - os.close(t) - os.unlink(target) - raise - - os.close(s) - os.close(t) - -if __name__ == '__main__': - import sys - try: - link(sys.argv[1], sys.argv[2]) - except IndexError: - print('Usage: emx_link ') - except OSError: - print('emx_link: %s' % str(sys.exc_info()[1])) diff --git a/Lib/plat-os2emx/grp.py b/Lib/plat-os2emx/grp.py deleted file mode 100644 --- a/Lib/plat-os2emx/grp.py +++ /dev/null @@ -1,182 +0,0 @@ -# this module is an OS/2 oriented replacement for the grp standard -# extension module. - -# written by Andrew MacIntyre, April 2001. -# updated July 2003, adding field accessor support - -# note that this implementation checks whether ":" or ";" as used as -# the field separator character. - -"""Replacement for grp standard extension module, intended for use on -OS/2 and similar systems which don't normally have an /etc/group file. - -The standard Unix group database is an ASCII text file with 4 fields per -record (line), separated by a colon: - - group name (string) - - group password (optional encrypted string) - - group id (integer) - - group members (comma delimited list of userids, with no spaces) - -Note that members are only included in the group file for groups that -aren't their primary groups. -(see the section 8.2 of the Python Library Reference) - -This implementation differs from the standard Unix implementation by -allowing use of the platform's native path separator character - ';' on OS/2, -DOS and MS-Windows - as the field separator in addition to the Unix -standard ":". - -The module looks for the group database at the following locations -(in order first to last): - - ${ETC_GROUP} (or %ETC_GROUP%) - - ${ETC}/group (or %ETC%/group) - - ${PYTHONHOME}/Etc/group (or %PYTHONHOME%/Etc/group) - -Classes -------- - -None - -Functions ---------- - -getgrgid(gid) - return the record for group-id gid as a 4-tuple - -getgrnam(name) - return the record for group 'name' as a 4-tuple - -getgrall() - return a list of 4-tuples, each tuple being one record - (NOTE: the order is arbitrary) - -Attributes ----------- - -group_file - the path of the group database file - -""" - -import os - -# try and find the group file -__group_path = [] -if 'ETC_GROUP' in os.environ: - __group_path.append(os.environ['ETC_GROUP']) -if 'ETC' in os.environ: - __group_path.append('%s/group' % os.environ['ETC']) -if 'PYTHONHOME' in os.environ: - __group_path.append('%s/Etc/group' % os.environ['PYTHONHOME']) - -group_file = None -for __i in __group_path: - try: - __f = open(__i, 'r') - __f.close() - group_file = __i - break - except: - pass - -# decide what field separator we can try to use - Unix standard, with -# the platform's path separator as an option. No special field conversion -# handlers are required for the group file. -__field_sep = [':'] -if os.pathsep: - if os.pathsep != ':': - __field_sep.append(os.pathsep) - -# helper routine to identify which separator character is in use -def __get_field_sep(record): - fs = None - for c in __field_sep: - # there should be 3 delimiter characters (for 4 fields) - if record.count(c) == 3: - fs = c - break - if fs: - return fs - else: - raise KeyError('>> group database fields not delimited <<') - -# class to match the new record field name accessors. -# the resulting object is intended to behave like a read-only tuple, -# with each member also accessible by a field name. -class Group: - def __init__(self, name, passwd, gid, mem): - self.__dict__['gr_name'] = name - self.__dict__['gr_passwd'] = passwd - self.__dict__['gr_gid'] = gid - self.__dict__['gr_mem'] = mem - self.__dict__['_record'] = (self.gr_name, self.gr_passwd, - self.gr_gid, self.gr_mem) - - def __len__(self): - return 4 - - def __getitem__(self, key): - return self._record[key] - - def __setattr__(self, name, value): - raise AttributeError('attribute read-only: %s' % name) - - def __repr__(self): - return str(self._record) - - def __cmp__(self, other): - this = str(self._record) - if this == other: - return 0 - elif this < other: - return -1 - else: - return 1 - - -# read the whole file, parsing each entry into tuple form -# with dictionaries to speed recall by GID or group name -def __read_group_file(): - if group_file: - group = open(group_file, 'r') - else: - raise KeyError('>> no group database <<') - gidx = {} - namx = {} - sep = None - while 1: - entry = group.readline().strip() - if len(entry) > 3: - if sep is None: - sep = __get_field_sep(entry) - fields = entry.split(sep) - fields[2] = int(fields[2]) - fields[3] = [f.strip() for f in fields[3].split(',')] - record = Group(*fields) - if fields[2] not in gidx: - gidx[fields[2]] = record - if fields[0] not in namx: - namx[fields[0]] = record - elif len(entry) > 0: - pass # skip empty or malformed records - else: - break - group.close() - if len(gidx) == 0: - raise KeyError - return (gidx, namx) - -# return the group database entry by GID -def getgrgid(gid): - g, n = __read_group_file() - return g[gid] - -# return the group database entry by group name -def getgrnam(name): - g, n = __read_group_file() - return n[name] - -# return all the group database entries -def getgrall(): - g, n = __read_group_file() - return g.values() - -# test harness -if __name__ == '__main__': - getgrall() diff --git a/Lib/plat-os2emx/pwd.py b/Lib/plat-os2emx/pwd.py deleted file mode 100644 --- a/Lib/plat-os2emx/pwd.py +++ /dev/null @@ -1,208 +0,0 @@ -# this module is an OS/2 oriented replacement for the pwd standard -# extension module. - -# written by Andrew MacIntyre, April 2001. -# updated July 2003, adding field accessor support - -# note that this implementation checks whether ":" or ";" as used as -# the field separator character. Path conversions are are applied when -# the database uses ":" as the field separator character. - -"""Replacement for pwd standard extension module, intended for use on -OS/2 and similar systems which don't normally have an /etc/passwd file. - -The standard Unix password database is an ASCII text file with 7 fields -per record (line), separated by a colon: - - user name (string) - - password (encrypted string, or "*" or "") - - user id (integer) - - group id (integer) - - description (usually user's name) - - home directory (path to user's home directory) - - shell (path to the user's login shell) - -(see the section 8.1 of the Python Library Reference) - -This implementation differs from the standard Unix implementation by -allowing use of the platform's native path separator character - ';' on OS/2, -DOS and MS-Windows - as the field separator in addition to the Unix -standard ":". Additionally, when ":" is the separator path conversions -are applied to deal with any munging of the drive letter reference. - -The module looks for the password database at the following locations -(in order first to last): - - ${ETC_PASSWD} (or %ETC_PASSWD%) - - ${ETC}/passwd (or %ETC%/passwd) - - ${PYTHONHOME}/Etc/passwd (or %PYTHONHOME%/Etc/passwd) - -Classes -------- - -None - -Functions ---------- - -getpwuid(uid) - return the record for user-id uid as a 7-tuple - -getpwnam(name) - return the record for user 'name' as a 7-tuple - -getpwall() - return a list of 7-tuples, each tuple being one record - (NOTE: the order is arbitrary) - -Attributes ----------- - -passwd_file - the path of the password database file - -""" - -import os - -# try and find the passwd file -__passwd_path = [] -if 'ETC_PASSWD' in os.environ: - __passwd_path.append(os.environ['ETC_PASSWD']) -if 'ETC' in os.environ: - __passwd_path.append('%s/passwd' % os.environ['ETC']) -if 'PYTHONHOME' in os.environ: - __passwd_path.append('%s/Etc/passwd' % os.environ['PYTHONHOME']) - -passwd_file = None -for __i in __passwd_path: - try: - __f = open(__i, 'r') - __f.close() - passwd_file = __i - break - except: - pass - -# path conversion handlers -def __nullpathconv(path): - return path.replace(os.altsep, os.sep) - -def __unixpathconv(path): - # two known drive letter variations: "x;" and "$x" - if path[0] == '$': - conv = path[1] + ':' + path[2:] - elif path[1] == ';': - conv = path[0] + ':' + path[2:] - else: - conv = path - return conv.replace(os.altsep, os.sep) - -# decide what field separator we can try to use - Unix standard, with -# the platform's path separator as an option. No special field conversion -# handler is required when using the platform's path separator as field -# separator, but are required for the home directory and shell fields when -# using the standard Unix (":") field separator. -__field_sep = {':': __unixpathconv} -if os.pathsep: - if os.pathsep != ':': - __field_sep[os.pathsep] = __nullpathconv - -# helper routine to identify which separator character is in use -def __get_field_sep(record): - fs = None - for c in __field_sep.keys(): - # there should be 6 delimiter characters (for 7 fields) - if record.count(c) == 6: - fs = c - break - if fs: - return fs - else: - raise KeyError('>> passwd database fields not delimited <<') - -# class to match the new record field name accessors. -# the resulting object is intended to behave like a read-only tuple, -# with each member also accessible by a field name. -class Passwd: - def __init__(self, name, passwd, uid, gid, gecos, dir, shell): - self.__dict__['pw_name'] = name - self.__dict__['pw_passwd'] = passwd - self.__dict__['pw_uid'] = uid - self.__dict__['pw_gid'] = gid - self.__dict__['pw_gecos'] = gecos - self.__dict__['pw_dir'] = dir - self.__dict__['pw_shell'] = shell - self.__dict__['_record'] = (self.pw_name, self.pw_passwd, - self.pw_uid, self.pw_gid, - self.pw_gecos, self.pw_dir, - self.pw_shell) - - def __len__(self): - return 7 - - def __getitem__(self, key): - return self._record[key] - - def __setattr__(self, name, value): - raise AttributeError('attribute read-only: %s' % name) - - def __repr__(self): - return str(self._record) - - def __cmp__(self, other): - this = str(self._record) - if this == other: - return 0 - elif this < other: - return -1 - else: - return 1 - - -# read the whole file, parsing each entry into tuple form -# with dictionaries to speed recall by UID or passwd name -def __read_passwd_file(): - if passwd_file: - passwd = open(passwd_file, 'r') - else: - raise KeyError('>> no password database <<') - uidx = {} - namx = {} - sep = None - while True: - entry = passwd.readline().strip() - if len(entry) > 6: - if sep is None: - sep = __get_field_sep(entry) - fields = entry.split(sep) - for i in (2, 3): - fields[i] = int(fields[i]) - for i in (5, 6): - fields[i] = __field_sep[sep](fields[i]) - record = Passwd(*fields) - if fields[2] not in uidx: - uidx[fields[2]] = record - if fields[0] not in namx: - namx[fields[0]] = record - elif len(entry) > 0: - pass # skip empty or malformed records - else: - break - passwd.close() - if len(uidx) == 0: - raise KeyError - return (uidx, namx) - -# return the passwd database entry by UID -def getpwuid(uid): - u, n = __read_passwd_file() - return u[uid] - -# return the passwd database entry by passwd name -def getpwnam(name): - u, n = __read_passwd_file() - return n[name] - -# return all the passwd database entries -def getpwall(): - u, n = __read_passwd_file() - return n.values() - -# test harness -if __name__ == '__main__': - getpwall() diff --git a/Lib/plat-os2emx/regen b/Lib/plat-os2emx/regen deleted file mode 100755 --- a/Lib/plat-os2emx/regen +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh -export INCLUDE=$C_INCLUDE_PATH -set -v -python.exe ../../Tools/scripts/h2py.py $C_INCLUDE_PATH/fcntl.h -python.exe ../../Tools/scripts/h2py.py $C_INCLUDE_PATH/sys/socket.h -python.exe ../../Tools/scripts/h2py.py -i '(u_long)' $C_INCLUDE_PATH/netinet/in.h -#python.exe ../../Tools/scripts/h2py.py $C_INCLUDE_PATH/termios.h diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -403,13 +403,13 @@ def _syscmd_ver(system='', release='', version='', - supported_platforms=('win32','win16','dos','os2')): + supported_platforms=('win32','win16','dos')): """ Tries to figure out the OS version used and returns a tuple (system,release,version). It uses the "ver" shell command for this which is known - to exists on Windows, DOS and OS/2. XXX Others too ? + to exists on Windows, DOS. XXX Others too ? In case this fails, the given parameters are used as defaults. diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -1,7 +1,4 @@ """Test program for the fcntl C module. - -OS/2+EMX doesn't support the file locking operations. - """ import os import struct @@ -35,8 +32,6 @@ fcntl.F_WRLCK, 0) elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']: lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) - elif sys.platform in ['os2emx']: - lockdata = None else: lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) if lockdata: @@ -62,18 +57,16 @@ rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) if verbose: print('Status from fcntl with O_NONBLOCK: ', rv) - if sys.platform not in ['os2emx']: - rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETLKW, lockdata) - if verbose: - print('String from fcntl with F_SETLKW: ', repr(rv)) + rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETLKW, lockdata) + if verbose: + print('String from fcntl with F_SETLKW: ', repr(rv)) self.f.close() def test_fcntl_file_descriptor(self): # again, but pass the file rather than numeric descriptor self.f = open(TESTFN, 'wb') rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK) - if sys.platform not in ['os2emx']: - rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) + rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) self.f.close() def test_fcntl_64_bit(self): diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -27,7 +27,7 @@ HOST = test.support.HOST HAVE_UNIX_SOCKETS = hasattr(socket, "AF_UNIX") -HAVE_FORKING = hasattr(os, "fork") and os.name != "os2" +HAVE_FORKING = hasattr(os, "fork") def signal_alarm(n): """Call signal.alarm when it exists (i.e. not on Windows).""" @@ -93,21 +93,7 @@ # XXX: We need a way to tell AF_UNIX to pick its own name # like AF_INET provides port==0. dir = None - if os.name == 'os2': - dir = '\socket' fn = tempfile.mktemp(prefix='unix_socket.', dir=dir) - if os.name == 'os2': - # AF_UNIX socket names on OS/2 require a specific prefix - # which can't include a drive letter and must also use - # backslashes as directory separators - if fn[1] == ':': - fn = fn[2:] - if fn[0] in (os.sep, os.altsep): - fn = fn[1:] - if os.sep == '/': - fn = fn.replace(os.sep, os.altsep) - else: - fn = fn.replace(os.altsep, os.sep) self.test_files.append(fn) return fn diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -638,17 +638,6 @@ register("MacOSX", None, MacOSXOSAScript('default'), -1) -# -# Platform support for OS/2 -# - -if sys.platform[:3] == "os2" and _iscommand("netscape"): - _tryorder = [] - _browsers = {} - register("os2netscape", None, - GenericBrowser(["start", "netscape", "%s"]), -1) - - # OK, now that we know what the default preference orders for each # platform are, allow user to override them with the BROWSER variable. if "BROWSER" in os.environ: diff --git a/Misc/RPM/python-3.4.spec b/Misc/RPM/python-3.4.spec --- a/Misc/RPM/python-3.4.spec +++ b/Misc/RPM/python-3.4.spec @@ -83,8 +83,7 @@ libraries, as well as to various window systems, and is extensible in C or C++. It is also usable as an extension language for applications that need a programmable interface. Finally, Python is portable: it runs on many -brands of UNIX, on PCs under Windows, MS-DOS, and OS/2, and on the -Mac. +brands of UNIX, on PCs under Windows, MS-DOS, and on the Mac. %package devel Summary: The libraries and header files needed for Python extension development. diff --git a/PC/getpathp.c b/PC/getpathp.c --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -1,6 +1,6 @@ /* Return the initial module search path. */ -/* Used by DOS, OS/2, Windows 3.1, Windows 95/98, Windows NT. */ +/* Used by DOS, Windows 3.1, Windows 95/98, Windows NT. */ /* ---------------------------------------------------------------- PATH RULES FOR WINDOWS: diff --git a/Tools/stringbench/stringbench.py b/Tools/stringbench/stringbench.py --- a/Tools/stringbench/stringbench.py +++ b/Tools/stringbench/stringbench.py @@ -808,7 +808,7 @@ programmers report substantial productivity gains and feel the language encourages the development of higher quality, more maintainable code. -Python runs on Windows, Linux/Unix, Mac OS X, OS/2, Amiga, Palm +Python runs on Windows, Linux/Unix, Mac OS X, Amiga, Palm Handhelds, and Nokia mobile phones. Python has also been ported to the Java and .NET virtual machines. diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -2103,7 +2103,7 @@ programmable interface. The Python implementation is portable: it runs on many brands of UNIX, -on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't +on Windows, DOS, Mac, Amiga... If your favorite system isn't listed here, it may still be supported, if there's a C compiler for it. Ask around on comp.lang.python -- or just try compiling Python yourself. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 03:16:03 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 03:16:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316135=3A_Removal_of_OS/?= =?utf-8?q?2_support_=28Python_code_partial_cleanup=29?= Message-ID: <3XXtMR1jD2zQhb@mail.python.org> http://hg.python.org/cpython/rev/15949f34e08f changeset: 79480:15949f34e08f user: Jesus Cea date: Fri Oct 05 03:15:39 2012 +0200 summary: #16135: Removal of OS/2 support (Python code partial cleanup) files: Lib/_osx_support.py | 2 +- Lib/importlib/_bootstrap.py | 5 +--- Lib/mailbox.py | 6 +--- Lib/os.py | 32 +++--------------------- Lib/platform.py | 6 ++-- Lib/pydoc.py | 2 +- Lib/site.py | 21 +--------------- Lib/sysconfig.py | 23 +---------------- Lib/tarfile.py | 3 +- Lib/test/test_tempfile.py | 6 ++-- Lib/test/test_threading.py | 3 +- 11 files changed, 20 insertions(+), 89 deletions(-) diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -38,7 +38,7 @@ paths = path.split(os.pathsep) base, ext = os.path.splitext(executable) - if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'): + if (sys.platform == 'win32') and (ext != '.exe'): executable = executable + '.exe' if not os.path.isfile(executable): diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1709,7 +1709,7 @@ builtin_module = sys.modules[builtin_name] setattr(self_module, builtin_name, builtin_module) - os_details = ('posix', ['/']), ('nt', ['\\', '/']), ('os2', ['\\', '/']) + os_details = ('posix', ['/']), ('nt', ['\\', '/']) for builtin_os, path_separators in os_details: # Assumption made in _path_join() assert all(len(sep) == 1 for sep in path_separators) @@ -1720,9 +1720,6 @@ else: try: os_module = BuiltinImporter.load_module(builtin_os) - # TODO: rip out os2 code after 3.3 is released as per PEP 11 - if builtin_os == 'os2' and 'EMX GCC' in sys.version: - path_sep = path_separators[1] break except ImportError: continue diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -707,8 +707,7 @@ try: os.rename(new_file.name, self._path) except OSError as e: - if e.errno == errno.EEXIST or \ - (os.name == 'os2' and e.errno == errno.EACCES): + if e.errno == errno.EEXIST: os.remove(self._path) os.rename(new_file.name, self._path) else: @@ -2093,8 +2092,7 @@ os.rename(pre_lock.name, f.name + '.lock') dotlock_done = True except OSError as e: - if e.errno == errno.EEXIST or \ - (os.name == 'os2' and e.errno == errno.EACCES): + if e.errno == errno.EEXIST: os.remove(pre_lock.name) raise ExternalClashError('dot lock unavailable: %s' % f.name) diff --git a/Lib/os.py b/Lib/os.py --- a/Lib/os.py +++ b/Lib/os.py @@ -1,9 +1,9 @@ r"""OS routines for Mac, NT, or Posix depending on what system we're on. This exports: - - all functions from posix, nt, os2, or ce, e.g. unlink, stat, etc. + - all functions from posix, nt or ce, e.g. unlink, stat, etc. - os.path is either posixpath or ntpath - - os.name is either 'posix', 'nt', 'os2' or 'ce'. + - os.name is either 'posix', 'nt' or 'ce'. - os.curdir is a string representing the current directory ('.' or ':') - os.pardir is a string representing the parent directory ('..' or '::') - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\') @@ -81,30 +81,6 @@ except ImportError: pass -elif 'os2' in _names: - name = 'os2' - linesep = '\r\n' - from os2 import * - try: - from os2 import _exit - __all__.append('_exit') - except ImportError: - pass - if sys.version.find('EMX GCC') == -1: - import ntpath as path - else: - import os2emxpath as path - from _emx_link import link - - import os2 - __all__.extend(_get_exports_list(os2)) - del os2 - - try: - from os2 import _have_functions - except ImportError: - pass - elif 'ce' in _names: name = 'ce' linesep = '\r\n' @@ -715,7 +691,7 @@ __all__.append("unsetenv") def _createenviron(): - if name in ('os2', 'nt'): + if name == 'nt': # Where Env Var Names Must Be UPPERCASE def check_str(value): if not isinstance(value, str): @@ -755,7 +731,7 @@ key, default and the result are str.""" return environ.get(key, default) -supports_bytes_environ = name not in ('os2', 'nt') +supports_bytes_environ = (name != 'nt') __all__.extend(("getenv", "supports_bytes_environ")) if supports_bytes_environ: diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -122,7 +122,7 @@ except AttributeError: # os.devnull was added in Python 2.4, so emulate it for earlier # Python versions - if sys.platform in ('dos','win32','win16','os2'): + if sys.platform in ('dos','win32','win16'): # Use the old CP/M NUL as device name DEV_NULL = 'NUL' else: @@ -896,7 +896,7 @@ """ Interface to the system's uname command. """ - if sys.platform in ('dos','win32','win16','os2'): + if sys.platform in ('dos','win32','win16'): # XXX Others too ? return default try: @@ -919,7 +919,7 @@ default in case the command should fail. """ - if sys.platform in ('dos','win32','win16','os2'): + if sys.platform in ('dos','win32','win16'): # XXX Others too ? return default target = _follow_symlinks(target) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1393,7 +1393,7 @@ return lambda text: pipepager(text, os.environ['PAGER']) if os.environ.get('TERM') in ('dumb', 'emacs'): return plainpager - if sys.platform == 'win32' or sys.platform.startswith('os2'): + if sys.platform == 'win32': return lambda text: tempfilepager(plain(text), 'more <') if hasattr(os, 'system') and os.system('(less) 2>/dev/null') == 0: return lambda text: pipepager(text, 'less') diff --git a/Lib/site.py b/Lib/site.py --- a/Lib/site.py +++ b/Lib/site.py @@ -300,7 +300,7 @@ continue seen.add(prefix) - if sys.platform in ('os2emx', 'riscos'): + if sys.platform == 'riscos': sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': sitepackages.append(os.path.join(prefix, "lib", @@ -329,23 +329,6 @@ return known_paths -def setBEGINLIBPATH(): - """The OS/2 EMX port has optional extension modules that do double duty - as DLLs (and must use the .DLL file extension) for other extensions. - The library search path needs to be amended so these will be found - during module import. Use BEGINLIBPATH so that these are at the start - of the library search path. - - """ - dllpath = os.path.join(sys.prefix, "Lib", "lib-dynload") - libpath = os.environ['BEGINLIBPATH'].split(';') - if libpath[-1]: - libpath.append(dllpath) - else: - libpath[-1] = dllpath - os.environ['BEGINLIBPATH'] = ';'.join(libpath) - - def setquit(): """Define new builtins 'quit' and 'exit'. @@ -595,8 +578,6 @@ ENABLE_USER_SITE = check_enableusersite() known_paths = addusersitepackages(known_paths) known_paths = addsitepackages(known_paths) - if sys.platform == 'os2emx': - setBEGINLIBPATH() setquit() setcopyright() sethelper() diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -52,25 +52,6 @@ 'scripts': '{base}/Scripts', 'data': '{base}', }, - 'os2': { - 'stdlib': '{installed_base}/Lib', - 'platstdlib': '{base}/Lib', - 'purelib': '{base}/Lib/site-packages', - 'platlib': '{base}/Lib/site-packages', - 'include': '{installed_base}/Include', - 'platinclude': '{installed_base}/Include', - 'scripts': '{base}/Scripts', - 'data': '{base}', - }, - 'os2_home': { - 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data': '{userbase}', - }, 'nt_user': { 'stdlib': '{userbase}/Python{py_version_nodot}', 'platstdlib': '{userbase}/Python{py_version_nodot}', @@ -210,7 +191,7 @@ def joinuser(*args): return os.path.expanduser(os.path.join(*args)) - # what about 'os2emx', 'riscos' ? + # what about 'riscos' ? if os.name == "nt": base = os.environ.get("APPDATA") or "~" if env_base: @@ -524,7 +505,7 @@ # sys.abiflags may not be defined on all platforms. _CONFIG_VARS['abiflags'] = '' - if os.name in ('nt', 'os2'): + if os.name == 'nt': _init_non_posix(_CONFIG_VARS) if os.name == 'posix': _init_posix(_CONFIG_VARS) diff --git a/Lib/tarfile.py b/Lib/tarfile.py --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2213,8 +2213,7 @@ if tarinfo.issym() and hasattr(os, "lchown"): os.lchown(targetpath, u, g) else: - if sys.platform != "os2emx": - os.chown(targetpath, u, g) + os.chown(targetpath, u, g) except EnvironmentError as e: raise ExtractError("could not change owner") diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -276,7 +276,7 @@ file = self.do_create() mode = stat.S_IMODE(os.stat(file.name).st_mode) expected = 0o600 - if sys.platform in ('win32', 'os2emx'): + if sys.platform == 'win32': # There's no distinction among 'user', 'group' and 'world'; # replicate the 'user' bits. user = expected >> 6 @@ -310,7 +310,7 @@ # On Windows a spawn* /path/ with embedded spaces shouldn't be quoted, # but an arg with embedded spaces should be decorated with double # quotes on each end - if sys.platform in ('win32',): + if sys.platform == 'win32': decorated = '"%s"' % sys.executable tester = '"%s"' % tester else: @@ -479,7 +479,7 @@ mode = stat.S_IMODE(os.stat(dir).st_mode) mode &= 0o777 # Mask off sticky bits inherited from /tmp expected = 0o700 - if sys.platform in ('win32', 'os2emx'): + if sys.platform == 'win32': # There's no distinction among 'user', 'group' and 'world'; # replicate the 'user' bits. user = expected >> 6 diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -451,8 +451,7 @@ # #12316 and #11870), and fork() from a worker thread is known to trigger # problems with some operating systems (issue #3863): skip problematic tests # on platforms known to behave badly. - platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5', - 'os2emx') + platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5') def _run_and_join(self, script): script = """if 1: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 03:38:41 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 03:38:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Test_should_be_skipped_in_?= =?utf-8?q?=27riscos=27=2C_as_intented?= Message-ID: <3XXtsY6CWLzQpv@mail.python.org> http://hg.python.org/cpython/rev/f14f30b3891a changeset: 79481:f14f30b3891a user: Jesus Cea date: Fri Oct 05 03:28:20 2012 +0200 summary: Test should be skipped in 'riscos', as intented files: Lib/test/test_select.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py --- a/Lib/test/test_select.py +++ b/Lib/test/test_select.py @@ -5,7 +5,8 @@ import unittest from test import support - at unittest.skipIf(sys.platform[:3] in ('win', 'os2', 'riscos'), + at unittest.skipIf(sys.platform[:3] in ('win', 'os2') or \ + sys.platform=='riscos'), "can't easily test on this system") class SelectTestCase(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 03:38:43 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 03:38:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316135=3A_Removal?= =?utf-8?q?_of_OS/2_support?= Message-ID: <3XXtsb2kwFzQq5@mail.python.org> http://hg.python.org/cpython/rev/9ba1f113c3ec changeset: 79482:9ba1f113c3ec user: Jesus Cea date: Fri Oct 05 03:36:11 2012 +0200 summary: Closes #16135: Removal of OS/2 support files: Lib/test/regrtest.py | 14 - Lib/test/test_bz2.py | 2 +- Lib/test/test_mailbox.py | 2 +- Lib/test/test_select.py | 3 +- Lib/test/test_signal.py | 2 +- Lib/test/test_site.py | 2 +- Lib/test/test_sundry.py | 1 - Lib/test/test_sys.py | 2 +- Lib/test/test_sysconfig.py | 2 +- Lib/test/test_thread.py | 2 +- Lib/test/test_threadsignals.py | 2 +- Python/importlib.h | 210 ++++++++++---------- 12 files changed, 111 insertions(+), 133 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1621,20 +1621,6 @@ test_ossaudiodev test_socketserver """), - ('os2emx', - """ - test_audioop - test_curses - test_epoll - test_kqueue - test_largefile - test_mmap - test_openpty - test_ossaudiodev - test_pty - test_resource - test_signal - """), ('freebsd', """ test_devpoll diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -18,7 +18,7 @@ bz2 = support.import_module('bz2') from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor -has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx") +has_cmdline_bunzip2 = (sys.platform != "win32") class BaseTest(unittest.TestCase): "Base for other testcases." diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -596,7 +596,7 @@ def setUp(self): TestMailbox.setUp(self) - if os.name in ('nt', 'os2') or sys.platform == 'cygwin': + if (os.name == 'nt') or (sys.platform == 'cygwin'): self._box.colon = '!' def assertMailboxEmpty(self): diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py --- a/Lib/test/test_select.py +++ b/Lib/test/test_select.py @@ -5,8 +5,7 @@ import unittest from test import support - at unittest.skipIf(sys.platform[:3] in ('win', 'os2') or \ - sys.platform=='riscos'), + at unittest.skipIf((sys.platform[:3]=='win') or (sys.platform=='riscos'), "can't easily test on this system") class SelectTestCase(unittest.TestCase): diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -15,7 +15,7 @@ except ImportError: threading = None -if sys.platform in ('os2', 'riscos'): +if sys.platform == 'riscos': raise unittest.SkipTest("Can't test signal on %s" % sys.platform) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -222,7 +222,7 @@ site.PREFIXES = ['xoxo'] dirs = site.getsitepackages() - if sys.platform in ('os2emx', 'riscos'): + if sys.platform == 'riscos': self.assertEqual(len(dirs), 1) wanted = os.path.join('xoxo', 'Lib', 'site-packages') self.assertEqual(dirs[0], wanted) diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py --- a/Lib/test/test_sundry.py +++ b/Lib/test/test_sundry.py @@ -48,7 +48,6 @@ import macurl2path import mailcap import nturl2path - import os2emxpath import pstats import py_compile import sndhdr diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -482,7 +482,7 @@ def test_thread_info(self): info = sys.thread_info self.assertEqual(len(info), 3) - self.assertIn(info.name, ('nt', 'os2', 'pthread', 'solaris', None)) + self.assertIn(info.name, ('nt', 'pthread', 'solaris', None)) self.assertIn(info.lock, ('semaphore', 'mutex+cond', None)) def test_43581(self): diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -234,7 +234,7 @@ self.assertTrue(os.path.isfile(config_h), config_h) def test_get_scheme_names(self): - wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user', + wanted = ('nt', 'nt_user', 'osx_framework_user', 'posix_home', 'posix_prefix', 'posix_user') self.assertEqual(get_scheme_names(), wanted) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -68,7 +68,7 @@ thread.stack_size(0) self.assertEqual(thread.stack_size(), 0, "stack_size not reset to default") - if os.name not in ("nt", "os2", "posix"): + if os.name not in ("nt", "posix"): return tss_supported = True diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py --- a/Lib/test/test_threadsignals.py +++ b/Lib/test/test_threadsignals.py @@ -8,7 +8,7 @@ thread = import_module('_thread') import time -if sys.platform[:3] in ('win', 'os2') or sys.platform=='riscos': +if (sys.platform[:3] == 'win') or (sys.platform=='riscos'): raise unittest.SkipTest("Can't test signal on %s" % sys.platform) process_pid = os.getpid() diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 03:58:10 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 03:58:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2314446=3A_Remove_d?= =?utf-8?q?eprecated_tkinter_functions=3A_Delete_an_unused_function_to?= Message-ID: <3XXvJ22PcGzQX6@mail.python.org> http://hg.python.org/cpython/rev/f4f45d8ff785 changeset: 79483:f4f45d8ff785 user: Jesus Cea date: Fri Oct 05 03:57:56 2012 +0200 summary: Issue #14446: Remove deprecated tkinter functions: Delete an unused function to avoid a warning files: Modules/_tkinter.c | 76 ---------------------------------- 1 files changed, 0 insertions(+), 76 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -356,82 +356,6 @@ #define ARGSZ 64 -static char * -Merge(PyObject *args) -{ - PyObject *tmp = NULL; - char *argvStore[ARGSZ]; - char **argv = NULL; - int fvStore[ARGSZ]; - int *fv = NULL; - int argc = 0, fvc = 0, i; - char *res = NULL; - - if (!(tmp = PyList_New(0))) - return NULL; - - argv = argvStore; - fv = fvStore; - - if (args == NULL) - argc = 0; - - else if (!PyTuple_Check(args)) { - argc = 1; - fv[0] = 0; - if (!(argv[0] = AsString(args, tmp))) - goto finally; - } - else { - argc = PyTuple_Size(args); - - if (argc > ARGSZ) { - argv = (char **)ckalloc(argc * sizeof(char *)); - fv = (int *)ckalloc(argc * sizeof(int)); - if (argv == NULL || fv == NULL) { - PyErr_NoMemory(); - goto finally; - } - } - - for (i = 0; i < argc; i++) { - PyObject *v = PyTuple_GetItem(args, i); - if (PyTuple_Check(v)) { - fv[i] = 1; - if (!(argv[i] = Merge(v))) - goto finally; - fvc++; - } - else if (v == Py_None) { - argc = i; - break; - } - else { - fv[i] = 0; - if (!(argv[i] = AsString(v, tmp))) - goto finally; - fvc++; - } - } - } - res = Tcl_Merge(argc, argv); - if (res == NULL) - PyErr_SetString(Tkinter_TclError, "merge failed"); - - finally: - for (i = 0; i < fvc; i++) - if (fv[i]) { - ckfree(argv[i]); - } - if (argv != argvStore) - ckfree(FREECAST argv); - if (fv != fvStore) - ckfree(FREECAST fv); - - Py_DECREF(tmp); - return res; -} - static PyObject * -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 04:03:15 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 04:03:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2314446=3A_Remove_d?= =?utf-8?q?eprecated_tkinter_functions=3A_Delete_an_unused_function_to?= Message-ID: <3XXvPv5FVtzQqk@mail.python.org> http://hg.python.org/cpython/rev/e278f3ab0190 changeset: 79484:e278f3ab0190 user: Jesus Cea date: Fri Oct 05 04:02:41 2012 +0200 summary: Issue #14446: Remove deprecated tkinter functions: Delete an unused function to avoid a warning files: Modules/_tkinter.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -323,36 +323,6 @@ #endif /* WITH_THREAD */ -static char * -AsString(PyObject *value, PyObject *tmp) -{ - if (PyBytes_Check(value)) - return PyBytes_AsString(value); - else if (PyUnicode_Check(value)) { - PyObject *v = PyUnicode_AsUTF8String(value); - if (v == NULL) - return NULL; - if (PyList_Append(tmp, v) != 0) { - Py_DECREF(v); - return NULL; - } - Py_DECREF(v); - return PyBytes_AsString(v); - } - else { - PyObject *v = PyObject_Str(value); - if (v == NULL) - return NULL; - if (PyList_Append(tmp, v) != 0) { - Py_DECREF(v); - return NULL; - } - Py_DECREF(v); - return PyBytes_AsString(v); - } -} - - #define ARGSZ 64 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 04:50:40 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 04:50:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MTEyOiBwbGF0?= =?utf-8?q?form=2Earchitecture_does_not_correctly_escape_argument_to?= Message-ID: <3XXwSc1K4XzQX0@mail.python.org> http://hg.python.org/cpython/rev/b94a9ff13199 changeset: 79485:b94a9ff13199 branch: 2.7 parent: 79467:06772ba3d001 user: Jesus Cea date: Fri Oct 05 04:50:17 2012 +0200 summary: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Use 'communicate()' files: Lib/platform.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1045,13 +1045,12 @@ return default target = _follow_symlinks(target) try: - with open(DEV_NULL) as dev_null: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=dev_null) + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) except (AttributeError,os.error): return default - output = proc.stdout.read() + output = proc.communicate()[0] rc = proc.wait() if not output or rc: return default -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 05:19:02 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 05:19:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MTEyOiBwbGF0?= =?utf-8?q?form=2Earchitecture_does_not_correctly_escape_argument_to?= Message-ID: <3XXx5L12szzP7v@mail.python.org> http://hg.python.org/cpython/rev/04f39958aea9 changeset: 79486:04f39958aea9 branch: 3.2 parent: 79464:f6aaac839d83 user: Jesus Cea date: Fri Oct 05 04:58:38 2012 +0200 summary: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Use 'communicate()' and decode the bytes files: Lib/platform.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -997,12 +997,11 @@ return default target = _follow_symlinks(target) try: - with open(DEV_NULL) as dev_null: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=dev_null) + proc = subprocess.Popen(['file', '-b', '--', target], + stdout=subprocess.PIPE, stderr=dev_null) except (AttributeError,os.error): return default - output = proc.stdout.read() + output = proc.communicate()[0].decode("latin-1") rc = proc.wait() if not output or rc: return default -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 05:19:03 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 05:19:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MTEyOiBwbGF0?= =?utf-8?q?form=2Earchitecture_does_not_correctly_escape_argument_to?= Message-ID: <3XXx5M3TK4zP7v@mail.python.org> http://hg.python.org/cpython/rev/19d37c8d1882 changeset: 79487:19d37c8d1882 branch: 2.7 parent: 79485:b94a9ff13199 user: Jesus Cea date: Fri Oct 05 05:18:47 2012 +0200 summary: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch files: Lib/platform.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1045,8 +1045,8 @@ return default target = _follow_symlinks(target) try: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + proc = subprocess.Popen(['file', target], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except (AttributeError,os.error): return default -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 05:37:17 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 05:37:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MTEyOiBwbGF0?= =?utf-8?q?form=2Earchitecture_does_not_correctly_escape_argument_to?= Message-ID: <3XXxVP5VXCzNk8@mail.python.org> http://hg.python.org/cpython/rev/9838ae397a19 changeset: 79488:9838ae397a19 branch: 3.2 parent: 79486:04f39958aea9 user: Jesus Cea date: Fri Oct 05 05:21:42 2012 +0200 summary: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch files: Lib/platform.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -997,8 +997,8 @@ return default target = _follow_symlinks(target) try: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=dev_null) + proc = subprocess.Popen(['file', target], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except (AttributeError,os.error): return default output = proc.communicate()[0].decode("latin-1") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 05:37:19 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 05:37:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_MERGE=3A_=2316112=3A_platform=2Earchitecture_does_not_correctl?= =?utf-8?q?y_escape_argument_to?= Message-ID: <3XXxVR1gwKzQmv@mail.python.org> http://hg.python.org/cpython/rev/64a0caf49429 changeset: 79489:64a0caf49429 branch: 3.3 parent: 79477:a1aa13ef00c5 parent: 79488:9838ae397a19 user: Jesus Cea date: Fri Oct 05 05:31:31 2012 +0200 summary: MERGE: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch files: Lib/platform.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -924,13 +924,12 @@ return default target = _follow_symlinks(target) try: - with open(DEV_NULL) as dev_null: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=dev_null) + proc = subprocess.Popen(['file', target], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except (AttributeError,os.error): return default - output = proc.stdout.read() + output = proc.communicate()[0].decode('latin-1') rc = proc.wait() if not output or rc: return default -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 05:37:20 2012 From: python-checkins at python.org (jesus.cea) Date: Fri, 5 Oct 2012 05:37:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_=2316112=3A_platform=2Earchitecture_does_not_co?= =?utf-8?q?rrectly_escape_argument_to?= Message-ID: <3XXxVS42WqzQX0@mail.python.org> http://hg.python.org/cpython/rev/b9ac3c44a4eb changeset: 79490:b9ac3c44a4eb parent: 79484:e278f3ab0190 parent: 79489:64a0caf49429 user: Jesus Cea date: Fri Oct 05 05:32:10 2012 +0200 summary: MERGE: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch files: Lib/platform.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -924,13 +924,12 @@ return default target = _follow_symlinks(target) try: - with open(DEV_NULL) as dev_null: - proc = subprocess.Popen(['file', '-b', '--', target], - stdout=subprocess.PIPE, stderr=dev_null) + proc = subprocess.Popen(['file', target], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except (AttributeError,os.error): return default - output = proc.stdout.read() + output = proc.communicate()[0].decode('latin-1') rc = proc.wait() if not output or rc: return default -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Fri Oct 5 05:56:01 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Fri, 05 Oct 2012 05:56:01 +0200 Subject: [Python-checkins] Daily reference leaks (15949f34e08f): sum=0 Message-ID: results for 15949f34e08f on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogtzs53R', '-x'] From andrew.svetlov at gmail.com Fri Oct 5 09:31:53 2012 From: andrew.svetlov at gmail.com (Andrew Svetlov) Date: Fri, 5 Oct 2012 10:31:53 +0300 Subject: [Python-checkins] cpython: Issue #14446: Remove deprecated tkinter functions: Delete an unused function to In-Reply-To: <3XXvPv5FVtzQqk@mail.python.org> References: <3XXvPv5FVtzQqk@mail.python.org> Message-ID: Thank you, Jesus. I've missed this function. On Fri, Oct 5, 2012 at 5:03 AM, jesus.cea wrote: > http://hg.python.org/cpython/rev/e278f3ab0190 > changeset: 79484:e278f3ab0190 > user: Jesus Cea > date: Fri Oct 05 04:02:41 2012 +0200 > summary: > Issue #14446: Remove deprecated tkinter functions: Delete an unused function to avoid a warning > > files: > Modules/_tkinter.c | 30 ------------------------------ > 1 files changed, 0 insertions(+), 30 deletions(-) > > > diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c > --- a/Modules/_tkinter.c > +++ b/Modules/_tkinter.c > @@ -323,36 +323,6 @@ > #endif /* WITH_THREAD */ > > > -static char * > -AsString(PyObject *value, PyObject *tmp) > -{ > - if (PyBytes_Check(value)) > - return PyBytes_AsString(value); > - else if (PyUnicode_Check(value)) { > - PyObject *v = PyUnicode_AsUTF8String(value); > - if (v == NULL) > - return NULL; > - if (PyList_Append(tmp, v) != 0) { > - Py_DECREF(v); > - return NULL; > - } > - Py_DECREF(v); > - return PyBytes_AsString(v); > - } > - else { > - PyObject *v = PyObject_Str(value); > - if (v == NULL) > - return NULL; > - if (PyList_Append(tmp, v) != 0) { > - Py_DECREF(v); > - return NULL; > - } > - Py_DECREF(v); > - return PyBytes_AsString(v); > - } > -} > - > - > > #define ARGSZ 64 > > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > -- Thanks, Andrew Svetlov From python-checkins at python.org Fri Oct 5 12:27:14 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 12:27:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MTM4?= =?utf-8?q?=3A_fix_typo=2E?= Message-ID: <3XY6bQ0lSHzP3V@mail.python.org> http://hg.python.org/cpython/rev/7cf0d8b2744b changeset: 79491:7cf0d8b2744b branch: 3.2 parent: 79488:9838ae397a19 user: Andrew Svetlov date: Fri Oct 05 13:26:10 2012 +0300 summary: Issue #16138: fix typo. files: Doc/glossary.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -562,7 +562,7 @@ sequence An :term:`iterable` which supports efficient element access using integer indices via the :meth:`__getitem__` special method and defines a - :meth:`len` method that returns the length of the sequence. + :meth:`__len__` method that returns the length of the sequence. Some built-in sequence types are :class:`list`, :class:`str`, :class:`tuple`, and :class:`bytes`. Note that :class:`dict` also supports :meth:`__getitem__` and :meth:`__len__`, but is considered a -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 12:27:15 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 12:27:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2316138=3A_fix_typo=2E?= Message-ID: <3XY6bR33CDzMBZ@mail.python.org> http://hg.python.org/cpython/rev/a093d39fdda4 changeset: 79492:a093d39fdda4 branch: 3.3 parent: 79489:64a0caf49429 parent: 79491:7cf0d8b2744b user: Andrew Svetlov date: Fri Oct 05 13:26:42 2012 +0300 summary: Merge issue #16138: fix typo. files: Doc/glossary.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -660,7 +660,7 @@ sequence An :term:`iterable` which supports efficient element access using integer indices via the :meth:`__getitem__` special method and defines a - :meth:`len` method that returns the length of the sequence. + :meth:`__len__` method that returns the length of the sequence. Some built-in sequence types are :class:`list`, :class:`str`, :class:`tuple`, and :class:`bytes`. Note that :class:`dict` also supports :meth:`__getitem__` and :meth:`__len__`, but is considered a -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 12:27:16 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 12:27:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316138=3A_fix_typo=2E?= Message-ID: <3XY6bS5jH7zQnq@mail.python.org> http://hg.python.org/cpython/rev/cbb9b5dcb88a changeset: 79493:cbb9b5dcb88a parent: 79490:b9ac3c44a4eb parent: 79492:a093d39fdda4 user: Andrew Svetlov date: Fri Oct 05 13:27:02 2012 +0300 summary: Merge issue #16138: fix typo. files: Doc/glossary.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -660,7 +660,7 @@ sequence An :term:`iterable` which supports efficient element access using integer indices via the :meth:`__getitem__` special method and defines a - :meth:`len` method that returns the length of the sequence. + :meth:`__len__` method that returns the length of the sequence. Some built-in sequence types are :class:`list`, :class:`str`, :class:`tuple`, and :class:`bytes`. Note that :class:`dict` also supports :meth:`__getitem__` and :meth:`__len__`, but is considered a -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 13:11:20 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 5 Oct 2012 13:11:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_The_file_obj_p?= =?utf-8?q?assed_to_ftp=2Estorbinary/storlines_must_be_opened_in_binary_mo?= =?utf-8?b?ZGUu?= Message-ID: <3XY7ZJ1lswzQnS@mail.python.org> http://hg.python.org/cpython/rev/40bd8afa6b29 changeset: 79494:40bd8afa6b29 branch: 3.2 parent: 79491:7cf0d8b2744b user: Ezio Melotti date: Fri Oct 05 14:09:59 2012 +0300 summary: The file obj passed to ftp.storbinary/storlines must be opened in binary mode. files: Doc/library/ftplib.rst | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -259,12 +259,12 @@ .. method:: FTP.storbinary(cmd, file, blocksize=8192, callback=None, rest=None) Store a file in binary transfer mode. *cmd* should be an appropriate - ``STOR`` command: ``"STOR filename"``. *file* is an open :term:`file object` - which is read until EOF using its :meth:`read` method in blocks of size - *blocksize* to provide the data to be stored. The *blocksize* argument - defaults to 8192. *callback* is an optional single parameter callable that - is called on each block of data after it is sent. *rest* means the same thing - as in the :meth:`transfercmd` method. + ``STOR`` command: ``"STOR filename"``. *file* is a :term:`file object` + (opened in binary mode) which is read until EOF using its :meth:`read` + method in blocks of size *blocksize* to provide the data to be stored. + The *blocksize* argument defaults to 8192. *callback* is an optional single + parameter callable that is called on each block of data after it is sent. + *rest* means the same thing as in the :meth:`transfercmd` method. .. versionchanged:: 3.2 *rest* parameter added. @@ -274,9 +274,9 @@ Store a file in ASCII transfer mode. *cmd* should be an appropriate ``STOR`` command (see :meth:`storbinary`). Lines are read until EOF from the - open :term:`file object` *file* using its :meth:`readline` method to provide - the data to be stored. *callback* is an optional single parameter callable - that is called on each line after it is sent. + :term:`file object` *file* (opened in binary mode) using its :meth:`readline` + method to provide the data to be stored. *callback* is an optional single + parameter callable that is called on each line after it is sent. .. method:: FTP.transfercmd(cmd, rest=None) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 13:11:21 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 5 Oct 2012 13:11:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_ftplib_doc_fix_with_3=2E2=2E?= Message-ID: <3XY7ZK4Y8zzQq0@mail.python.org> http://hg.python.org/cpython/rev/5ae9a90811ff changeset: 79495:5ae9a90811ff branch: 3.3 parent: 79492:a093d39fdda4 parent: 79494:40bd8afa6b29 user: Ezio Melotti date: Fri Oct 05 14:10:39 2012 +0300 summary: Merge ftplib doc fix with 3.2. files: Doc/library/ftplib.rst | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -270,12 +270,12 @@ .. method:: FTP.storbinary(cmd, file, blocksize=8192, callback=None, rest=None) Store a file in binary transfer mode. *cmd* should be an appropriate - ``STOR`` command: ``"STOR filename"``. *file* is an open :term:`file object` - which is read until EOF using its :meth:`read` method in blocks of size - *blocksize* to provide the data to be stored. The *blocksize* argument - defaults to 8192. *callback* is an optional single parameter callable that - is called on each block of data after it is sent. *rest* means the same thing - as in the :meth:`transfercmd` method. + ``STOR`` command: ``"STOR filename"``. *file* is a :term:`file object` + (opened in binary mode) which is read until EOF using its :meth:`read` + method in blocks of size *blocksize* to provide the data to be stored. + The *blocksize* argument defaults to 8192. *callback* is an optional single + parameter callable that is called on each block of data after it is sent. + *rest* means the same thing as in the :meth:`transfercmd` method. .. versionchanged:: 3.2 *rest* parameter added. @@ -285,9 +285,9 @@ Store a file in ASCII transfer mode. *cmd* should be an appropriate ``STOR`` command (see :meth:`storbinary`). Lines are read until EOF from the - open :term:`file object` *file* using its :meth:`readline` method to provide - the data to be stored. *callback* is an optional single parameter callable - that is called on each line after it is sent. + :term:`file object` *file* (opened in binary mode) using its :meth:`readline` + method to provide the data to be stored. *callback* is an optional single + parameter callable that is called on each line after it is sent. .. method:: FTP.transfercmd(cmd, rest=None) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 13:11:22 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 5 Oct 2012 13:11:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_ftplib_doc_fix_with_3=2E3=2E?= Message-ID: <3XY7ZL6j9tzQq0@mail.python.org> http://hg.python.org/cpython/rev/58c90cf81293 changeset: 79496:58c90cf81293 parent: 79493:cbb9b5dcb88a parent: 79495:5ae9a90811ff user: Ezio Melotti date: Fri Oct 05 14:10:57 2012 +0300 summary: Merge ftplib doc fix with 3.3. files: Doc/library/ftplib.rst | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -270,12 +270,12 @@ .. method:: FTP.storbinary(cmd, file, blocksize=8192, callback=None, rest=None) Store a file in binary transfer mode. *cmd* should be an appropriate - ``STOR`` command: ``"STOR filename"``. *file* is an open :term:`file object` - which is read until EOF using its :meth:`read` method in blocks of size - *blocksize* to provide the data to be stored. The *blocksize* argument - defaults to 8192. *callback* is an optional single parameter callable that - is called on each block of data after it is sent. *rest* means the same thing - as in the :meth:`transfercmd` method. + ``STOR`` command: ``"STOR filename"``. *file* is a :term:`file object` + (opened in binary mode) which is read until EOF using its :meth:`read` + method in blocks of size *blocksize* to provide the data to be stored. + The *blocksize* argument defaults to 8192. *callback* is an optional single + parameter callable that is called on each block of data after it is sent. + *rest* means the same thing as in the :meth:`transfercmd` method. .. versionchanged:: 3.2 *rest* parameter added. @@ -285,9 +285,9 @@ Store a file in ASCII transfer mode. *cmd* should be an appropriate ``STOR`` command (see :meth:`storbinary`). Lines are read until EOF from the - open :term:`file object` *file* using its :meth:`readline` method to provide - the data to be stored. *callback* is an optional single parameter callable - that is called on each line after it is sent. + :term:`file object` *file* (opened in binary mode) using its :meth:`readline` + method to provide the data to be stored. *callback* is an optional single + parameter callable that is called on each line after it is sent. .. method:: FTP.transfercmd(cmd, rest=None) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 20:21:23 2012 From: python-checkins at python.org (antoine.pitrou) Date: Fri, 5 Oct 2012 20:21:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Push_PEP_428_-_object-oriente?= =?utf-8?q?d_filesystem_paths?= Message-ID: <3XYK6W68qSzM88@mail.python.org> http://hg.python.org/peps/rev/cd9ddbed7c8d changeset: 4535:cd9ddbed7c8d user: Antoine Pitrou date: Fri Oct 05 20:19:40 2012 +0200 summary: Push PEP 428 - object-oriented filesystem paths files: pep-0428.txt | 568 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 568 insertions(+), 0 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt new file mode 100644 --- /dev/null +++ b/pep-0428.txt @@ -0,0 +1,568 @@ +PEP: 428 +Title: The pathlib module -- object-oriented filesystem paths +Version: $Revision$ +Last-Modified: $Date +Author: Antoine Pitrou +Status: Draft +Type: Standards Track +Content-Type: text/x-rst +Created: 30-July-2012 +Python-Version: 3.4 +Post-History: + + +Abstract +======== + +This PEP proposes the inclusion of a third-party module, `pathlib`_, in +the standard library. The inclusion is proposed under the provisional +label, as described in :pep:`411`. Therefore, API changes can be done, +either as part of the PEP process, or after acceptance in the standard +library (and until the provisional label is removed). + +The aim of this library is to provide a simple hierarchy of classes to +handle filesystem paths and the common operations users do over them. + +.. _`pathlib`: http://pypi.python.org/pypi/pathlib/ + + +Related work +============ + +An object-oriented API for filesystem paths has already been proposed +and rejected in :pep:`355`. Several third-party implementations of the +idea of object-oriented filesystem paths exist in the wild: + +* The historical `path.py module`_ by Jason Orendorff, Jason R. Coombs + and others, which provides a ``str``-subclassing ``Path`` class; + +* Twisted's slightly specialized `FilePath class`_; + +* An `AlternativePathClass proposal`_, subclassing ``tuple`` rather than + ``str``; + +* `Unipath`_, a variation on the str-subclassing approach with two public + classes, an ``AbstractPath`` class for operations which don't do I/O and a + ``Path`` class for all common operations. + +This proposal attempts to learn from these previous attempts and the +rejection of :pep:`355`. + + +.. _`path.py module`: https://github.com/jaraco/path.py +.. _`FilePath class`: http://twistedmatrix.com/documents/current/api/twisted.python.filepath.FilePath.html +.. _`AlternativePathClass proposal`: http://wiki.python.org/moin/AlternativePathClass +.. _`Unipath`: https://bitbucket.org/sluggo/unipath/overview + + +Why an object-oriented API +========================== + +The rationale to represent filesystem paths using dedicated classes is the +same as for other kinds of stateless objects, such as dates, times or IP +addresses. Python has been slowly moving away from strictly replicating +the C language's APIs to providing better, more helpful abstractions around +all kinds of common functionality. Even if this PEP isn't accepted, it is +likely that another form of filesystem handling abstraction will be adopted +one day into the standard library. + +Indeed, many people will prefer handling dates and times using the high-level +objects provided by the ``datetime`` module, rather than using numeric +timestamps and the ``time`` module API. Moreover, using a dedicated class +allows to enable desirable behaviours by default, for example the case +insensitivity of Windows paths. + + +Proposal +======== + +Class hierarchy +--------------- + +The `pathlib`_ module implements a simple hierarchy of classes:: + + +----------+ + | | + ---------| PurePath |-------- + | | | | + | +----------+ | + | | | + | | | + v | v + +---------------+ | +------------+ + | | | | | + | PurePosixPath | | | PureNTPath | + | | | | | + +---------------+ | +------------+ + | v | + | +------+ | + | | | | + | -------| Path |------ | + | | | | | | + | | +------+ | | + | | | | + | | | | + v v v v + +-----------+ +--------+ + | | | | + | PosixPath | | NTPath | + | | | | + +-----------+ +--------+ + + +This hierarchy divides path classes along two dimensions: + +* a path class can be either pure or concrete: pure classes support only + operations that don't need to do any actual I/O, which are most path + manipulation operations; concrete classes support all the operations + of pure classes, plus operations that do I/O. + +* a path class is of a given flavour according to the kind of operating + system paths it represents. `pathlib`_ implements two flavours: NT paths + for the filesystem semantics embodied in Windows systems, POSIX paths for + other systems (``os.name``'s terminology is re-used here). + +Any pure class can be instantiated on any system: for example, you can +manipulate ``PurePosixPath`` objects under Windows, ``PureNTPath`` objects +under Unix, and so on. However, concrete classes can only be instantiated +on a matching system: indeed, it would be error-prone to start doing I/O +with ``NTPath`` objects under Unix, or vice-versa. + +Furthermore, there are two base classes which also act as system-dependent +factories: ``PurePath`` will instantiate either a ``PurePosixPath`` or a +``PureNTPath`` depending on the operating system. Similarly, ``Path`` +will instantiate either a ``PosixPath`` or a ``NTPath``. + +It is expected that, in most uses, using the ``Path`` class is adequate, +which is why it has the shortest name of all. + + +No confusion with builtins +-------------------------- + +In this proposal, the path classes do not derive from a builtin type. This +contrasts with some other Path class proposals which were derived from +``str``. They also do not pretend to implement the sequence protocol: +if you want a path to act as a sequence, you have to lookup a dedicate +attribute (the ``parts`` attribute). + +By avoiding to pass as builtin types, the path classes minimize the potential +for confusion if they are combined by accident with genuine builtin types. + + +Immutability +------------ + +Path objects are immutable, which makes them hashable and also prevents a +class of programming errors. + + +Sane behaviour +-------------- + +Little of the functionality from os.path is reused. Many os.path functions +are tied by backwards compatibility to confusing or plain wrong behaviour +(for example, the fact that ``os.path.abspath()`` simplifies ".." path +components without resolving symlinks first). + +Also, using classes instead of plain strings helps make system-dependent +behaviours natural. For example, comparing and ordering Windows path +objects is case-insensitive, and path separators are automatically converted +to the platform default. + + +Useful notations +---------------- + +The API tries to provide useful notations all the while avoiding magic. +Some examples:: + + >>> p = Path('/home/antoine/pathlib/setup.py') + >>> p.name + 'setup.py' + >>> p.ext + '.py' + >>> p.root + '/' + >>> p.parts + + >>> list(p.parents()) + [PosixPath('/home/antoine/pathlib'), PosixPath('/home/antoine'), PosixPath('/home'), PosixPath('/')] + >>> p.exists() + True + >>> p.st_size + 928 + + +Pure paths API +============== + +The philosophy of the ``PurePath`` API is to provide a consistent array of +useful path manipulation operations, without exposing a hodge-podge of +functions like ``os.path`` does. + + +Definitions +----------- + +First a couple of conventions: + +* All paths can have a drive and a root. For POSIX paths, the drive is + always empty. + +* A relative path has neither drive nor root. + +* A POSIX path is absolute if it has a root. A Windows path is absolute if + it has both a drive *and* a root. A Windows UNC path (e.g. + ``\\some\\share\\myfile.txt``) always has a drive and a root + (here, ``\\some\\share`` and ``\\``, respectively). + +* A drive which has either a drive *or* a root is said to be anchored. + Its anchor is the concatenation of the drive and root. Under POSIX, + "anchored" is the same as "absolute". + + +Construction and joining +------------------------ + +We will present construction and joining together since they expose +similar semantics. + +The simplest way to construct a path is to pass it its string representation:: + + >>> PurePath('setup.py') + PurePosixPath('setup.py') + +Extraneous path separators and ``"."`` components are eliminated:: + + >>> PurePath('a///b/c/./d/') + PurePosixPath('a/b/c/d') + +If you pass several arguments, they will be automatically joined:: + + >>> PurePath('docs', 'Makefile') + PurePosixPath('docs/Makefile') + +Joining semantics are similar to os.path.join, in that anchored paths ignore +the information from the previously joined components:: + + >>> PurePath('/etc', '/usr', 'bin') + PurePosixPath('/usr/bin') + +However, with Windows paths, the drive is retained as necessary:: + + >>> PureNTPath('c:/foo', '/Windows') + PureNTPath('c:\\Windows') + >>> PureNTPath('c:/foo', 'd:') + PureNTPath('d:') + +Calling the constructor without any argument creates a path object pointing +to the logical "current directory":: + + >>> PurePosixPath() + PurePosixPath('.') + +A path can be joined with another using the ``__getitem__`` operator:: + + >>> p = PurePosixPath('foo') + >>> p['bar'] + PurePosixPath('foo/bar') + >>> p[PurePosixPath('bar')] + PurePosixPath('foo/bar') + +As with constructing, multiple path components can be specified at once:: + + >>> p['bar/xyzzy'] + PurePosixPath('foo/bar/xyzzy') + +A join() method is also provided, with the same behaviour. It can serve +as a factory function:: + + >>> path_factory = p.join + >>> path_factory('bar') + PurePosixPath('foo/bar') + + +Representing +------------ + +To represent a path (e.g. to pass it to third-party libraries), just call +``str()`` on it:: + + >>> p = PurePath('/home/antoine/pathlib/setup.py') + >>> str(p) + '/home/antoine/pathlib/setup.py' + >>> p = PureNTPath('c:/windows') + >>> str(p) + 'c:\\windows' + +To force the string representation with forward slashes, use the ``as_posix()`` +method:: + + >>> p.as_posix() + 'c:/windows' + +To get the bytes representation (which might be useful under Unix systems), +call ``bytes()`` on it, or use the ``as_bytes()`` method:: + + >>> bytes(p) + b'/home/antoine/pathlib/setup.py' + + +Properties +---------- + +Five simple properties are provided on every path (each can be empty):: + + >>> p = PureNTPath('c:/pathlib/setup.py') + >>> p.drive + 'c:' + >>> p.root + '\\' + >>> p.anchor + 'c:\\' + >>> p.name + 'setup.py' + >>> p.ext + '.py' + + +Sequence-like access +-------------------- + +The ``parts`` property provides read-only sequence access to a path object:: + + >>> p = PurePosixPath('/etc/init.d') + >>> p.parts + + +Simple indexing returns the invidual path component as a string, while +slicing returns a new path object constructed from the selected components:: + + >>> p.parts[-1] + 'init.d' + >>> p.parts[:-1] + PurePosixPath('/etc') + +Windows paths handle the drive and the root as a single path component:: + + >>> p = PureNTPath('c:/setup.py') + >>> p.parts + + >>> p.root + '\\' + >>> p.parts[0] + 'c:\\' + +(separating them would be wrong, since ``C:`` is not the parent of ``C:\\``). + +The ``parent()`` method returns an ancestor of the path:: + + >>> p.parent() + PureNTPath('c:\\python33\\bin') + >>> p.parent(2) + PureNTPath('c:\\python33') + >>> p.parent(3) + PureNTPath('c:\\') + +The ``parents()`` method automates repeated invocations of ``parent()``, until +the anchor is reached:: + + >>> p = PureNTPath('c:/python33/bin/python.exe') + >>> for parent in p.parents(): parent + ... + PureNTPath('c:\\python33\\bin') + PureNTPath('c:\\python33') + PureNTPath('c:\\') + + +Querying +-------- + +``is_relative()`` returns True if the path is relative (see definition +above), False otherwise. + +``is_reserved()`` returns True if a Windows path is a reserved path such +as ``CON`` or ``NUL``. It always returns False for POSIX paths. + +``match()`` matches the path against a glob pattern:: + + >>> PureNTPath('c:/PATHLIB/setup.py').match('c:*lib/*.PY') + True + +``relative()`` returns a new relative path by stripping the drive and root:: + + >>> PurePosixPath('setup.py').relative() + PurePosixPath('setup.py') + >>> PurePosixPath('/setup.py').relative() + PurePosixPath('setup.py') + +``relative_to()`` computes the relative difference of a path to another:: + + >>> PurePosixPath('/usr/bin/python').relative_to('/usr') + PurePosixPath('bin/python') + +``normcase()`` returns a case-folded version of the path for NT paths:: + + >>> PurePosixPath('CAPS').normcase() + PurePosixPath('CAPS') + >>> PureNTPath('CAPS').normcase() + PureNTPath('caps') + + +Concrete paths API +================== + +In addition to the operations of the pure API, concrete paths provide +additional methods which actually access the filesystem to query or mutate +information. + + +Constructing +------------ + +The classmethod ``cwd()`` creates a path object pointing to the current +working directory in absolute form:: + + >>> Path.cwd() + PosixPath('/home/antoine/pathlib') + + +File metadata +------------- + +The ``stat()`` method caches and returns the file's stat() result; +``restat()`` forces refreshing of the cache. ``lstat()`` is also provided, +but doesn't have any caching behaviour:: + + >>> p.stat() + posix.stat_result(st_mode=33277, st_ino=7483155, st_dev=2053, st_nlink=1, st_uid=500, st_gid=500, st_size=928, st_atime=1343597970, st_mtime=1328287308, st_ctime=1343597964) + +For ease of use, direct attribute access to the fields of the stat structure +is provided over the path object itself:: + + >>> p.st_size + 928 + >>> p.st_mtime + 1328287308.889562 + +Higher-level methods help examine the kind of the file:: + + >>> p.exists() + True + >>> p.is_file() + True + >>> p.is_dir() + False + >>> p.is_symlink() + False + +The file owner and group names (rather than numeric ids) are queried +through matching properties:: + + >>> p = Path('/etc/shadow') + >>> p.owner + 'root' + >>> p.group + 'shadow' + + +Path resolution +--------------- + +The ``resolve()`` method makes a path absolute, resolving any symlink on +the way. It is the only operation which will remove "``..``" path components. + + +Directory walking +----------------- + +Simple (non-recursive) directory access is done by iteration:: + + >>> p = Path('docs') + >>> for child in p: child + ... + PosixPath('docs/conf.py') + PosixPath('docs/_templates') + PosixPath('docs/make.bat') + PosixPath('docs/index.rst') + PosixPath('docs/_build') + PosixPath('docs/_static') + PosixPath('docs/Makefile') + +This allows simple filtering through list comprehensions:: + + >>> p = Path('.') + >>> [child for child in p if child.is_dir()] + [PosixPath('.hg'), PosixPath('docs'), PosixPath('dist'), PosixPath('__pycache__'), PosixPath('build')] + +Simple and recursive globbing is also provided:: + + >>> for child in p.glob('**/*.py'): child + ... + PosixPath('test_pathlib.py') + PosixPath('setup.py') + PosixPath('pathlib.py') + PosixPath('docs/conf.py') + PosixPath('build/lib/pathlib.py') + + +File opening +------------ + +The ``open()`` method provides a file opening API similar to the builtin +``open()`` method:: + + >>> p = Path('setup.py') + >>> with p.open() as f: f.readline() + ... + '#!/usr/bin/env python3\n' + +The ``raw_open()`` method, on the other hand, is similar to ``os.open``:: + + >>> fd = p.raw_open(os.O_RDONLY) + >>> os.read(fd, 15) + b'#!/usr/bin/env ' + + +Filesystem alteration +--------------------- + +Several common filesystem operations are provided as methods: ``touch()``, +``mkdir()``, ``rename()``, ``replace()``, ``unlink()``, ``rmdir()``, +``chmod()``, ``lchmod()``, ``symlink_to()``. More operations could be +provided, for example some of the functionality of the shutil module. + + +Experimental openat() support +----------------------------- + +On compatible POSIX systems, the concrete PosixPath class can take advantage +of \*at() functions (`openat()`_ and friends), and manages the bookkeeping of +open file descriptors as necessary. Support is enabled by passing the +*use_openat* argument to the constructor:: + + >>> p = Path(".", use_openat=True) + +Then all paths constructed by navigating this path (either by iteration or +indexing) will also use the openat() family of functions. The point of using +these functions is to avoid race conditions whereby a given directory is +silently replaced with another (often a symbolic link to a sensitive system +location) between two accesses. + +.. _`openat()`: http://pubs.opengroup.org/onlinepubs/9699919799/functions/open.html + + +Copyright +========= + +This document has been placed into the public domain. + + +.. + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + coding: utf-8 -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Fri Oct 5 21:17:05 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 21:17:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316123=3A_IDLE_-_d?= =?utf-8?q?eprecate_running_without_a_subprocess=2E?= Message-ID: <3XYLLn6d3HzNmb@mail.python.org> http://hg.python.org/cpython/rev/0430986a8c03 changeset: 79497:0430986a8c03 user: Andrew Svetlov date: Fri Oct 05 22:12:44 2012 +0300 summary: Issue #16123: IDLE - deprecate running without a subprocess. Patch by Roger Serwy files: Lib/idlelib/PyShell.py | 10 ++++++++-- Lib/idlelib/help.txt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1008,7 +1008,10 @@ self.close() return False else: - nosub = "==== No Subprocess ====" + nosub = ("==== No Subprocess ====\n\n" + + "WARNING: Running IDLE without a Subprocess is deprecated\n" + + "and will be removed in a later version. See Help/IDLE Help\n" + + "for details.\n\n") sys.displayhook = rpc.displayhook self.write("Python %s on %s\n%s\n%s" % @@ -1295,7 +1298,8 @@ idle [-dns] [-t title] - [arg]* -h print this help message and exit - -n run IDLE without a subprocess (see Help/IDLE Help for details) + -n run IDLE without a subprocess (DEPRECATED, + see Help/IDLE Help for details) The following options will override the IDLE 'settings' configuration: @@ -1373,6 +1377,8 @@ if o == '-i': enable_shell = True if o == '-n': + print(" Warning: running IDLE without a subprocess is deprecated.", + file=sys.stderr) use_subprocess = False if o == '-r': script = a diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -256,7 +256,7 @@ Enter idle -h at the command prompt to get a usage message. -Running without a subprocess: +Running without a subprocess: (DEPRECATED) If IDLE is started with the -n command line switch it will run in a single process and will not create the subprocess which runs the RPC -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 21:17:07 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 21:17:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_normalize_whitespaces?= Message-ID: <3XYLLq2X7PzNwD@mail.python.org> http://hg.python.org/cpython/rev/5c2aabd7619b changeset: 79498:5c2aabd7619b user: Andrew Svetlov date: Fri Oct 05 22:16:55 2012 +0300 summary: normalize whitespaces files: Lib/idlelib/PyShell.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1009,7 +1009,7 @@ return False else: nosub = ("==== No Subprocess ====\n\n" + - "WARNING: Running IDLE without a Subprocess is deprecated\n" + + "WARNING: Running IDLE without a Subprocess is deprecated\n" + "and will be removed in a later version. See Help/IDLE Help\n" + "for details.\n\n") sys.displayhook = rpc.displayhook -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 21:53:23 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 21:53:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Add_test_for_check_that_executable_arg_to_Popen=28=29_takes?= Message-ID: <3XYM8g4qMJzNCJ@mail.python.org> http://hg.python.org/cpython/rev/0df5aeab229f changeset: 79499:0df5aeab229f branch: 3.3 parent: 79495:5ae9a90811ff user: Andrew Svetlov date: Fri Oct 05 22:52:15 2012 +0300 summary: Issue #16115: Add test for check that executable arg to Popen() takes precedence over args[0] arg\n \n Patch by Kushal Das files: Lib/test/test_subprocess.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -299,6 +299,16 @@ # argument. For test runs in the build directory, see #7774. self._assert_cwd('', "somethingyoudonthave", executable=sys.executable) + def test_executable_precedence(self): + # To the precedence of executable argument over args[0] + # For a normal installation, it should work without 'cwd' + # argument. For test runs in the build directory, see #7774. + python_dir = os.path.dirname(os.path.realpath(sys.executable)) + p = subprocess.Popen(["nonexistent","-c",'import sys; sys.exit(42)'], + executable=sys.executable, cwd=python_dir) + p.wait() + self.assertEqual(p.returncode, 42) + def test_stdin_pipe(self): # stdin redirection p = subprocess.Popen([sys.executable, "-c", -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 21:53:25 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 5 Oct 2012 21:53:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316115=3A_Add_test_for_check_that_executab?= =?utf-8?q?le_arg_to_Popen=28=29_takes?= Message-ID: <3XYM8j0GcYzNmb@mail.python.org> http://hg.python.org/cpython/rev/0fcfb6066e17 changeset: 79500:0fcfb6066e17 parent: 79498:5c2aabd7619b parent: 79499:0df5aeab229f user: Andrew Svetlov date: Fri Oct 05 22:53:12 2012 +0300 summary: Merge issue #16115: Add test for check that executable arg to Popen() takes precedence over args[0] arg\n \n Patch by Kushal Das files: Lib/test/test_subprocess.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -299,6 +299,16 @@ # argument. For test runs in the build directory, see #7774. self._assert_cwd('', "somethingyoudonthave", executable=sys.executable) + def test_executable_precedence(self): + # To the precedence of executable argument over args[0] + # For a normal installation, it should work without 'cwd' + # argument. For test runs in the build directory, see #7774. + python_dir = os.path.dirname(os.path.realpath(sys.executable)) + p = subprocess.Popen(["nonexistent","-c",'import sys; sys.exit(42)'], + executable=sys.executable, cwd=python_dir) + p.wait() + self.assertEqual(p.returncode, 42) + def test_stdin_pipe(self): # stdin redirection p = subprocess.Popen([sys.executable, "-c", -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 5 23:29:26 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 5 Oct 2012 23:29:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_add_missing_=24?= Message-ID: <3XYPHV5WGmzP0f@mail.python.org> http://hg.python.org/peps/rev/794d568f1c1f changeset: 4536:794d568f1c1f user: Benjamin Peterson date: Fri Oct 05 17:29:21 2012 -0400 summary: add missing $ files: pep-0428.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -1,7 +1,7 @@ PEP: 428 Title: The pathlib module -- object-oriented filesystem paths Version: $Revision$ -Last-Modified: $Date +Last-Modified: $Date$ Author: Antoine Pitrou Status: Draft Type: Standards Track -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 00:41:01 2012 From: python-checkins at python.org (victor.stinner) Date: Sat, 6 Oct 2012 00:41:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_In_debug_mode=2C_unicode?= =?utf-8?q?=5Fwrite=5Fcstr=28=29_now_checks_that_non-ASCII_characters_are?= Message-ID: <3XYQt52qRszNCv@mail.python.org> http://hg.python.org/cpython/rev/17af0691bd5f changeset: 79501:17af0691bd5f user: Victor Stinner date: Sat Oct 06 00:40:45 2012 +0200 summary: In debug mode, unicode_write_cstr() now checks that non-ASCII characters are not written into an ASCII string files: Objects/unicodeobject.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1700,6 +1700,14 @@ switch (kind) { case PyUnicode_1BYTE_KIND: { assert(index + len <= PyUnicode_GET_LENGTH(unicode)); +#ifdef Py_DEBUG + if (PyUnicode_IS_ASCII(unicode)) { + Py_UCS4 maxchar = ucs1lib_find_max_char( + (const Py_UCS1*)str, + (const Py_UCS1*)str + len); + assert(maxchar < 128); + } +#endif memcpy((char *) data + index, str, len); break; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 01:14:55 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sat, 6 Oct 2012 01:14:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Fix_UNC_path_example_=28Oleg_?= =?utf-8?q?Broytman=29?= Message-ID: <3XYRdC5xk8zNZP@mail.python.org> http://hg.python.org/peps/rev/eb540519b359 changeset: 4537:eb540519b359 user: Antoine Pitrou date: Sat Oct 06 01:04:26 2012 +0200 summary: Fix UNC path example (Oleg Broytman) files: pep-0428.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -214,8 +214,8 @@ * A POSIX path is absolute if it has a root. A Windows path is absolute if it has both a drive *and* a root. A Windows UNC path (e.g. - ``\\some\\share\\myfile.txt``) always has a drive and a root - (here, ``\\some\\share`` and ``\\``, respectively). + ``\\some\share\myfile.txt``) always has a drive and a root + (here, ``\\some\share`` and ``\``, respectively). * A drive which has either a drive *or* a root is said to be anchored. Its anchor is the concatenation of the drive and root. Under POSIX, -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 01:14:57 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sat, 6 Oct 2012 01:14:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Add_Post-History?= Message-ID: <3XYRdF0z0pzNjW@mail.python.org> http://hg.python.org/peps/rev/05968fff611a changeset: 4538:05968fff611a user: Antoine Pitrou date: Sat Oct 06 01:04:50 2012 +0200 summary: Add Post-History files: pep-0428.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -8,7 +8,7 @@ Content-Type: text/x-rst Created: 30-July-2012 Python-Version: 3.4 -Post-History: +Post-History: http://mail.python.org/pipermail/python-ideas/2012-October/016338.html Abstract -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 01:14:58 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sat, 6 Oct 2012 01:14:58 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Detail_the_semantics_more=2C_?= =?utf-8?q?following_python-ideas_questions?= Message-ID: <3XYRdG2rdSzNqX@mail.python.org> http://hg.python.org/peps/rev/4fad5d465cc1 changeset: 4539:4fad5d465cc1 user: Antoine Pitrou date: Sat Oct 06 01:13:30 2012 +0200 summary: Detail the semantics more, following python-ideas questions files: pep-0428.txt | 51 +++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 6 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -165,10 +165,32 @@ (for example, the fact that ``os.path.abspath()`` simplifies ".." path components without resolving symlinks first). -Also, using classes instead of plain strings helps make system-dependent -behaviours natural. For example, comparing and ordering Windows path -objects is case-insensitive, and path separators are automatically converted -to the platform default. + +Comparisons +----------- + +Paths of the same flavour are comparable and orderable, whether pure or not:: + + >>> PurePosixPath('a') == PurePosixPath('b') + False + >>> PurePosixPath('a') < PurePosixPath('b') + True + >>> PurePosixPath('a') == PosixPath('a') + True + +Comparing and ordering Windows path objects is case-insensitive:: + + >>> PureNTPath('a') == PureNTPath('A') + True + +Paths of different flavours always compare unequal, and cannot be ordered:: + + >>> PurePosixPath('a') == PureNTPath('a') + False + >>> PurePosixPath('a') < PureNTPath('a') + Traceback (most recent call last): + File "", line 1, in + TypeError: unorderable types: PurePosixPath() < PureNTPath() Useful notations @@ -222,8 +244,8 @@ "anchored" is the same as "absolute". -Construction and joining ------------------------- +Construction +------------ We will present construction and joining together since they expose similar semantics. @@ -256,12 +278,29 @@ >>> PureNTPath('c:/foo', 'd:') PureNTPath('d:') +Also, path separators are normalized to the platform default:: + + >>> PureNTPath('a/b') == PureNTPath('a\\b') + True + +Extraneous path separators and ``"."`` components are eliminated, but not +``".."`` components:: + + >>> PurePosixPath('a//b/./c/') + PurePosixPath('a/b/c') + >>> PurePosixPath('a/../b') + PurePosixPath('a/../b') + Calling the constructor without any argument creates a path object pointing to the logical "current directory":: >>> PurePosixPath() PurePosixPath('.') + +Joining +------- + A path can be joined with another using the ``__getitem__`` operator:: >>> p = PurePosixPath('foo') -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 01:19:24 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sat, 6 Oct 2012 01:19:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Add_a_couple_clarifications?= Message-ID: <3XYRkN4ZsczM9s@mail.python.org> http://hg.python.org/peps/rev/c55e3123eaee changeset: 4540:c55e3123eaee user: Antoine Pitrou date: Sat Oct 06 01:17:59 2012 +0200 summary: Add a couple clarifications files: pep-0428.txt | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -291,6 +291,14 @@ >>> PurePosixPath('a/../b') PurePosixPath('a/../b') +Multiple leading slashes are treated differently depending on the path +flavour:: + + >>> PurePosixPath('//some/path') + PurePosixPath('/some/path') + >>> PureNTPath('//some/path') + PureNTPath('\\\\some\\path\\') + Calling the constructor without any argument creates a path object pointing to the logical "current directory":: @@ -309,10 +317,13 @@ >>> p[PurePosixPath('bar')] PurePosixPath('foo/bar') -As with constructing, multiple path components can be specified at once:: +As with constructing, multiple path components can be specified, either +collapsed or separately:: >>> p['bar/xyzzy'] PurePosixPath('foo/bar/xyzzy') + >>> p['bar', 'xyzzy'] + PurePosixPath('foo/bar/xyzzy') A join() method is also provided, with the same behaviour. It can serve as a factory function:: -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 02:36:21 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 02:36:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316113=3A_integrad?= =?utf-8?q?e_SHA-3_=28Keccak=29_patch_from?= Message-ID: <3XYTR930xrzP2T@mail.python.org> http://hg.python.org/cpython/rev/11c9a894680e changeset: 79502:11c9a894680e user: Christian Heimes date: Sat Oct 06 02:23:36 2012 +0200 summary: Issue #16113: integrade SHA-3 (Keccak) patch from http://hg.python.org/sandbox/cheimes files: Doc/library/hashlib.rst | 10 +- Doc/license.rst | 19 + Doc/whatsnew/3.4.rst | 2 +- Lib/hashlib.py | 15 +- Lib/test/test_hashlib.py | 127 +- Modules/_hashopenssl.c | 22 - Modules/_sha3/cleanup.py | 49 + Modules/_sha3/keccak/KeccakF-1600-32-rvk.macros | 555 ++++ Modules/_sha3/keccak/KeccakF-1600-32-s1.macros | 1187 ++++++++++ Modules/_sha3/keccak/KeccakF-1600-32-s2.macros | 1187 ++++++++++ Modules/_sha3/keccak/KeccakF-1600-32.macros | 26 + Modules/_sha3/keccak/KeccakF-1600-64.macros | 728 ++++++ Modules/_sha3/keccak/KeccakF-1600-int-set.h | 6 + Modules/_sha3/keccak/KeccakF-1600-interface.h | 46 + Modules/_sha3/keccak/KeccakF-1600-opt32-settings.h | 6 + Modules/_sha3/keccak/KeccakF-1600-opt32.c | 524 ++++ Modules/_sha3/keccak/KeccakF-1600-opt64-settings.h | 9 + Modules/_sha3/keccak/KeccakF-1600-opt64.c | 508 ++++ Modules/_sha3/keccak/KeccakF-1600-simd128.macros | 651 +++++ Modules/_sha3/keccak/KeccakF-1600-simd64.macros | 517 ++++ Modules/_sha3/keccak/KeccakF-1600-unrolling.macros | 124 + Modules/_sha3/keccak/KeccakF-1600-xop.macros | 573 ++++ Modules/_sha3/keccak/KeccakNISTInterface.c | 83 + Modules/_sha3/keccak/KeccakNISTInterface.h | 72 + Modules/_sha3/keccak/KeccakSponge.c | 266 ++ Modules/_sha3/keccak/KeccakSponge.h | 76 + Modules/_sha3/keccak/crypto_hash.h | 0 Modules/_sha3/sha3module.c | 569 ++++ Modules/hashlib.h | 33 + setup.py | 9 + 30 files changed, 7971 insertions(+), 28 deletions(-) diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -51,9 +51,13 @@ .. index:: single: OpenSSL; (use in module hashlib) Constructors for hash algorithms that are always present in this module are -:func:`md5`, :func:`sha1`, :func:`sha224`, :func:`sha256`, :func:`sha384`, and -:func:`sha512`. Additional algorithms may also be available depending upon the -OpenSSL library that Python uses on your platform. +:func:`md5`, :func:`sha1`, :func:`sha224`, :func:`sha256`, :func:`sha384`, +:func:`sha512`, :func:`sha3_224`, :func:`sha3_256`, :func:`sha3_384`, and +:func:`sha3_512`. Additional algorithms may also be available depending upon +the OpenSSL library that Python uses on your platform. + + .. versionchanged:: 3.4 + Add sha3 family of hash algorithms. For example, to obtain the digest of the byte string ``b'Nobody inspects the spammish repetition'``:: diff --git a/Doc/license.rst b/Doc/license.rst --- a/Doc/license.rst +++ b/Doc/license.rst @@ -658,6 +658,25 @@ SUCH DAMAGE. +SHA-3 +----- + +The module :mod:`_sha3` and :mod:`hashlib` are using the reference +implementation of Keccak. The files at :file:`Modules/_sha3/keccak/` contain +the following note:: + + The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, + Micha?l Peeters and Gilles Van Assche. For more information, feedback or + questions, please refer to our website: http://keccak.noekeon.org/ + + Implementation by the designers, + hereby denoted as "the implementer". + + To the extent possible under law, the implementer has waived all copyright + and related or neighboring rights to the source code in this file. + http://creativecommons.org/publicdomain/zero/1.0/ + + strtod and dtoa --------------- diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -101,7 +101,7 @@ Significantly Improved Library Modules: -* None yet. +* SHA-3 (Keccak) support for :mod:`hashlib`. Security improvements: diff --git a/Lib/hashlib.py b/Lib/hashlib.py --- a/Lib/hashlib.py +++ b/Lib/hashlib.py @@ -54,7 +54,8 @@ # This tuple and __get_builtin_constructor() must be modified if a new # always available algorithm is added. -__always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512') +__always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512', + 'sha3_224', 'sha3_256', 'sha3_384', 'sha3_512') algorithms_guaranteed = set(__always_supported) algorithms_available = set(__always_supported) @@ -85,6 +86,18 @@ return _sha512.sha512 elif bs == '384': return _sha512.sha384 + elif name in {'sha3_224', 'sha3_256', 'sha3_384', 'sha3_512', + 'SHA3_224', 'SHA3_256', 'SHA3_384', 'SHA3_512'}: + import _sha3 + bs = name[5:] + if bs == '224': + return _sha3.sha3_224 + elif bs == '256': + return _sha3.sha3_256 + elif bs == '384': + return _sha3.sha3_384 + elif bs == '512': + return _sha3.sha3_512 except ImportError: pass # no extension module, this hash is unsupported. diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -36,7 +36,10 @@ class HashLibTestCase(unittest.TestCase): supported_hash_names = ( 'md5', 'MD5', 'sha1', 'SHA1', 'sha224', 'SHA224', 'sha256', 'SHA256', - 'sha384', 'SHA384', 'sha512', 'SHA512' ) + 'sha384', 'SHA384', 'sha512', 'SHA512', + 'sha3_224', 'sha3_256', 'sha3_384', + 'sha3_512', 'SHA3_224', 'SHA3_256', + 'SHA3_384', 'SHA3_512' ) # Issue #14693: fallback modules are always compiled under POSIX _warn_on_extension_import = os.name == 'posix' or COMPILED_WITH_PYDEBUG @@ -93,6 +96,12 @@ if _sha512: self.constructors_to_test['sha384'].add(_sha512.sha384) self.constructors_to_test['sha512'].add(_sha512.sha512) + _sha3 = self._conditional_import_module('_sha3') + if _sha3: + self.constructors_to_test['sha3_224'].add(_sha3.sha3_224) + self.constructors_to_test['sha3_256'].add(_sha3.sha3_256) + self.constructors_to_test['sha3_384'].add(_sha3.sha3_384) + self.constructors_to_test['sha3_512'].add(_sha3.sha3_512) super(HashLibTestCase, self).__init__(*args, **kwargs) @@ -158,6 +167,7 @@ self.assertEqual(m1.digest(), m2.digest()) def check(self, name, data, digest): + digest = digest.lower() constructors = self.constructors_to_test[name] # 2 is for hashlib.name(...) and hashlib.new(name, ...) self.assertGreaterEqual(len(constructors), 2) @@ -183,6 +193,10 @@ self.check_no_unicode('sha256') self.check_no_unicode('sha384') self.check_no_unicode('sha512') + self.check_no_unicode('sha3_224') + self.check_no_unicode('sha3_256') + self.check_no_unicode('sha3_384') + self.check_no_unicode('sha3_512') def test_case_md5_0(self): self.check('md5', b'', 'd41d8cd98f00b204e9800998ecf8427e') @@ -318,11 +332,122 @@ "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973eb"+ "de0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b") + # SHA-3 family + def test_case_sha3_224_0(self): + self.check('sha3_224', b"", + "F71837502BA8E10837BDD8D365ADB85591895602FC552B48B7390ABD") + + def test_case_sha3_224_1(self): + self.check('sha3_224', bytes.fromhex("CC"), + "A9CAB59EB40A10B246290F2D6086E32E3689FAF1D26B470C899F2802") + + def test_case_sha3_224_2(self): + self.check('sha3_224', bytes.fromhex("41FB"), + "615BA367AFDC35AAC397BC7EB5D58D106A734B24986D5D978FEFD62C") + + def test_case_sha3_224_3(self): + self.check('sha3_224', bytes.fromhex( + "433C5303131624C0021D868A30825475E8D0BD3052A022180398F4CA4423B9"+ + "8214B6BEAAC21C8807A2C33F8C93BD42B092CC1B06CEDF3224D5ED1EC29784"+ + "444F22E08A55AA58542B524B02CD3D5D5F6907AFE71C5D7462224A3F9D9E53"+ + "E7E0846DCBB4CE"), + "62B10F1B6236EBC2DA72957742A8D4E48E213B5F8934604BFD4D2C3A") + + @bigmemtest(size=_4G + 5, memuse=1) + def test_case_sha3_224_huge(self, size): + if size == _4G + 5: + try: + self.check('sha3_224', b'A'*size, + '58ef60057c9dddb6a87477e9ace5a26f0d9db01881cf9b10a9f8c224') + except OverflowError: + pass # 32-bit arch + + + def test_case_sha3_256_0(self): + self.check('sha3_256', b"", + "C5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470") + + def test_case_sha3_256_1(self): + self.check('sha3_256', bytes.fromhex("CC"), + "EEAD6DBFC7340A56CAEDC044696A168870549A6A7F6F56961E84A54BD9970B8A") + + def test_case_sha3_256_2(self): + self.check('sha3_256', bytes.fromhex("41FB"), + "A8EACEDA4D47B3281A795AD9E1EA2122B407BAF9AABCB9E18B5717B7873537D2") + + def test_case_sha3_256_3(self): + self.check('sha3_256', bytes.fromhex( + "433C5303131624C0021D868A30825475E8D0BD3052A022180398F4CA4423B9"+ + "8214B6BEAAC21C8807A2C33F8C93BD42B092CC1B06CEDF3224D5ED1EC29784"+ + "444F22E08A55AA58542B524B02CD3D5D5F6907AFE71C5D7462224A3F9D9E53"+ + "E7E0846DCBB4CE"), + "CE87A5173BFFD92399221658F801D45C294D9006EE9F3F9D419C8D427748DC41") + + + def test_case_sha3_384_0(self): + self.check('sha3_384', b"", + "2C23146A63A29ACF99E73B88F8C24EAA7DC60AA771780CCC006AFBFA8FE2479B"+ + "2DD2B21362337441AC12B515911957FF") + + def test_case_sha3_384_1(self): + self.check('sha3_384', bytes.fromhex("CC"), + "1B84E62A46E5A201861754AF5DC95C4A1A69CAF4A796AE405680161E29572641"+ + "F5FA1E8641D7958336EE7B11C58F73E9") + + def test_case_sha3_384_2(self): + self.check('sha3_384', bytes.fromhex("41FB"), + "495CCE2714CD72C8C53C3363D22C58B55960FE26BE0BF3BBC7A3316DD563AD1D"+ + "B8410E75EEFEA655E39D4670EC0B1792") + + def test_case_sha3_384_3(self): + self.check('sha3_384', bytes.fromhex( + "433C5303131624C0021D868A30825475E8D0BD3052A022180398F4CA4423B9"+ + "8214B6BEAAC21C8807A2C33F8C93BD42B092CC1B06CEDF3224D5ED1EC29784"+ + "444F22E08A55AA58542B524B02CD3D5D5F6907AFE71C5D7462224A3F9D9E53"+ + "E7E0846DCBB4CE"), + "135114508DD63E279E709C26F7817C0482766CDE49132E3EDF2EEDD8996F4E35"+ + "96D184100B384868249F1D8B8FDAA2C9") + + + def test_case_sha3_512_0(self): + self.check('sha3_512', b"", + "0EAB42DE4C3CEB9235FC91ACFFE746B29C29A8C366B7C60E4E67C466F36A4304"+ + "C00FA9CAF9D87976BA469BCBE06713B435F091EF2769FB160CDAB33D3670680E") + + def test_case_sha3_512_1(self): + self.check('sha3_512', bytes.fromhex("CC"), + "8630C13CBD066EA74BBE7FE468FEC1DEE10EDC1254FB4C1B7C5FD69B646E4416"+ + "0B8CE01D05A0908CA790DFB080F4B513BC3B6225ECE7A810371441A5AC666EB9") + + def test_case_sha3_512_2(self): + self.check('sha3_512', bytes.fromhex("41FB"), + "551DA6236F8B96FCE9F97F1190E901324F0B45E06DBBB5CDB8355D6ED1DC34B3"+ + "F0EAE7DCB68622FF232FA3CECE0D4616CDEB3931F93803662A28DF1CD535B731") + + def test_case_sha3_512_3(self): + self.check('sha3_512', bytes.fromhex( + "433C5303131624C0021D868A30825475E8D0BD3052A022180398F4CA4423B9"+ + "8214B6BEAAC21C8807A2C33F8C93BD42B092CC1B06CEDF3224D5ED1EC29784"+ + "444F22E08A55AA58542B524B02CD3D5D5F6907AFE71C5D7462224A3F9D9E53"+ + "E7E0846DCBB4CE"), + "527D28E341E6B14F4684ADB4B824C496C6482E51149565D3D17226828884306B"+ + "51D6148A72622C2B75F5D3510B799D8BDC03EAEDE453676A6EC8FE03A1AD0EAB") + + def test_gil(self): # Check things work fine with an input larger than the size required # for multithreaded operation (which is hardwired to 2048). gil_minsize = 2048 + for name in self.supported_hash_names: + m = hashlib.new(name) + m.update(b'1') + m.update(b'#' * gil_minsize) + m.update(b'1') + + m = hashlib.new(name, b'x' * gil_minsize) + m.update(b'1') + m = hashlib.md5() m.update(b'1') m.update(b'#' * gil_minsize) diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -17,24 +17,6 @@ #include "structmember.h" #include "hashlib.h" -#ifdef WITH_THREAD -#include "pythread.h" - #define ENTER_HASHLIB(obj) \ - if ((obj)->lock) { \ - if (!PyThread_acquire_lock((obj)->lock, 0)) { \ - Py_BEGIN_ALLOW_THREADS \ - PyThread_acquire_lock((obj)->lock, 1); \ - Py_END_ALLOW_THREADS \ - } \ - } - #define LEAVE_HASHLIB(obj) \ - if ((obj)->lock) { \ - PyThread_release_lock((obj)->lock); \ - } -#else - #define ENTER_HASHLIB(obj) - #define LEAVE_HASHLIB(obj) -#endif /* EVP is the preferred interface to hashing in OpenSSL */ #include @@ -43,10 +25,6 @@ #define MUNCH_SIZE INT_MAX -/* TODO(gps): We should probably make this a module or EVPobject attribute - * to allow the user to optimize based on the platform they're using. */ -#define HASHLIB_GIL_MINSIZE 2048 - #ifndef HASH_OBJ_CONSTRUCTOR #define HASH_OBJ_CONSTRUCTOR 0 #endif diff --git a/Modules/_sha3/cleanup.py b/Modules/_sha3/cleanup.py new file mode 100755 --- /dev/null +++ b/Modules/_sha3/cleanup.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# Copyright (C) 2012 Christian Heimes (christian at python.org) +# Licensed to PSF under a Contributor Agreement. +# +# cleanup Keccak sources + +import os +import re + +CPP1 = re.compile("^//(.*)") +CPP2 = re.compile("\ //(.*)") + +STATICS = ("void ", "int ", "HashReturn ", "const UINT64 ", "UINT16 ") + +HERE = os.path.dirname(os.path.abspath(__file__)) +KECCAK = os.path.join(HERE, "keccak") + +def getfiles(): + for name in os.listdir(KECCAK): + name = os.path.join(KECCAK, name) + if os.path.isfile(name): + yield name + +def cleanup(f): + buf = [] + for line in f: + # mark all functions and global data as static + if line.startswith(STATICS): + buf.append("static " + line) + continue + # remove UINT64 typedef, we have our own + if line.startswith("typedef unsigned long long int"): + buf.append("/* %s */\n" % line.strip()) + continue + # remove #include "brg_endian.h" + if "brg_endian.h" in line: + buf.append("/* %s */\n" % line.strip()) + continue + # transform C++ comments into ANSI C comments + line = CPP1.sub(r"/* \1 */", line) + line = CPP2.sub(r" /* \1 */", line) + buf.append(line) + return "".join(buf) + +for name in getfiles(): + with open(name) as f: + res = cleanup(f) + with open(name, "w") as f: + f.write(res) diff --git a/Modules/_sha3/keccak/KeccakF-1600-32-rvk.macros b/Modules/_sha3/keccak/KeccakF-1600-32-rvk.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-32-rvk.macros @@ -0,0 +1,555 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by Ronny Van Keer, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +static const UINT32 KeccakF1600RoundConstants_int2[2*24] = +{ + 0x00000001UL, 0x00000000UL, + 0x00000000UL, 0x00000089UL, + 0x00000000UL, 0x8000008bUL, + 0x00000000UL, 0x80008080UL, + 0x00000001UL, 0x0000008bUL, + 0x00000001UL, 0x00008000UL, + 0x00000001UL, 0x80008088UL, + 0x00000001UL, 0x80000082UL, + 0x00000000UL, 0x0000000bUL, + 0x00000000UL, 0x0000000aUL, + 0x00000001UL, 0x00008082UL, + 0x00000000UL, 0x00008003UL, + 0x00000001UL, 0x0000808bUL, + 0x00000001UL, 0x8000000bUL, + 0x00000001UL, 0x8000008aUL, + 0x00000001UL, 0x80000081UL, + 0x00000000UL, 0x80000081UL, + 0x00000000UL, 0x80000008UL, + 0x00000000UL, 0x00000083UL, + 0x00000000UL, 0x80008003UL, + 0x00000001UL, 0x80008088UL, + 0x00000000UL, 0x80000088UL, + 0x00000001UL, 0x00008000UL, + 0x00000000UL, 0x80008082UL +}; + +#undef rounds + +#define rounds \ +{ \ + UINT32 Da0, De0, Di0, Do0, Du0; \ + UINT32 Da1, De1, Di1, Do1, Du1; \ + UINT32 Ba, Be, Bi, Bo, Bu; \ + UINT32 Aba0, Abe0, Abi0, Abo0, Abu0; \ + UINT32 Aba1, Abe1, Abi1, Abo1, Abu1; \ + UINT32 Aga0, Age0, Agi0, Ago0, Agu0; \ + UINT32 Aga1, Age1, Agi1, Ago1, Agu1; \ + UINT32 Aka0, Ake0, Aki0, Ako0, Aku0; \ + UINT32 Aka1, Ake1, Aki1, Ako1, Aku1; \ + UINT32 Ama0, Ame0, Ami0, Amo0, Amu0; \ + UINT32 Ama1, Ame1, Ami1, Amo1, Amu1; \ + UINT32 Asa0, Ase0, Asi0, Aso0, Asu0; \ + UINT32 Asa1, Ase1, Asi1, Aso1, Asu1; \ + UINT32 Cw, Cx, Cy, Cz; \ + UINT32 Eba0, Ebe0, Ebi0, Ebo0, Ebu0; \ + UINT32 Eba1, Ebe1, Ebi1, Ebo1, Ebu1; \ + UINT32 Ega0, Ege0, Egi0, Ego0, Egu0; \ + UINT32 Ega1, Ege1, Egi1, Ego1, Egu1; \ + UINT32 Eka0, Eke0, Eki0, Eko0, Eku0; \ + UINT32 Eka1, Eke1, Eki1, Eko1, Eku1; \ + UINT32 Ema0, Eme0, Emi0, Emo0, Emu0; \ + UINT32 Ema1, Eme1, Emi1, Emo1, Emu1; \ + UINT32 Esa0, Ese0, Esi0, Eso0, Esu0; \ + UINT32 Esa1, Ese1, Esi1, Eso1, Esu1; \ + const UINT32 * pRoundConstants = KeccakF1600RoundConstants_int2; \ + UINT32 i; \ +\ + copyFromState(A, state) \ +\ + for( i = 12; i != 0; --i ) { \ + Cx = Abu0^Agu0^Aku0^Amu0^Asu0; \ + Du1 = Abe1^Age1^Ake1^Ame1^Ase1; \ + Da0 = Cx^ROL32(Du1, 1); \ + Cz = Abu1^Agu1^Aku1^Amu1^Asu1; \ + Du0 = Abe0^Age0^Ake0^Ame0^Ase0; \ + Da1 = Cz^Du0; \ +\ + Cw = Abi0^Agi0^Aki0^Ami0^Asi0; \ + Do0 = Cw^ROL32(Cz, 1); \ + Cy = Abi1^Agi1^Aki1^Ami1^Asi1; \ + Do1 = Cy^Cx; \ +\ + Cx = Aba0^Aga0^Aka0^Ama0^Asa0; \ + De0 = Cx^ROL32(Cy, 1); \ + Cz = Aba1^Aga1^Aka1^Ama1^Asa1; \ + De1 = Cz^Cw; \ +\ + Cy = Abo1^Ago1^Ako1^Amo1^Aso1; \ + Di0 = Du0^ROL32(Cy, 1); \ + Cw = Abo0^Ago0^Ako0^Amo0^Aso0; \ + Di1 = Du1^Cw; \ +\ + Du0 = Cw^ROL32(Cz, 1); \ + Du1 = Cy^Cx; \ +\ + Aba0 ^= Da0; \ + Ba = Aba0; \ + Age0 ^= De0; \ + Be = ROL32(Age0, 22); \ + Aki1 ^= Di1; \ + Bi = ROL32(Aki1, 22); \ + Amo1 ^= Do1; \ + Bo = ROL32(Amo1, 11); \ + Asu0 ^= Du0; \ + Bu = ROL32(Asu0, 7); \ + Eba0 = Ba ^((~Be)& Bi ) ^ *(pRoundConstants++); \ + Ebe0 = Be ^((~Bi)& Bo ); \ + Ebi0 = Bi ^((~Bo)& Bu ); \ + Ebo0 = Bo ^((~Bu)& Ba ); \ + Ebu0 = Bu ^((~Ba)& Be ); \ +\ + Abo0 ^= Do0; \ + Ba = ROL32(Abo0, 14); \ + Agu0 ^= Du0; \ + Be = ROL32(Agu0, 10); \ + Aka1 ^= Da1; \ + Bi = ROL32(Aka1, 2); \ + Ame1 ^= De1; \ + Bo = ROL32(Ame1, 23); \ + Asi1 ^= Di1; \ + Bu = ROL32(Asi1, 31); \ + Ega0 = Ba ^((~Be)& Bi ); \ + Ege0 = Be ^((~Bi)& Bo ); \ + Egi0 = Bi ^((~Bo)& Bu ); \ + Ego0 = Bo ^((~Bu)& Ba ); \ + Egu0 = Bu ^((~Ba)& Be ); \ +\ + Abe1 ^= De1; \ + Ba = ROL32(Abe1, 1); \ + Agi0 ^= Di0; \ + Be = ROL32(Agi0, 3); \ + Ako1 ^= Do1; \ + Bi = ROL32(Ako1, 13); \ + Amu0 ^= Du0; \ + Bo = ROL32(Amu0, 4); \ + Asa0 ^= Da0; \ + Bu = ROL32(Asa0, 9); \ + Eka0 = Ba ^((~Be)& Bi ); \ + Eke0 = Be ^((~Bi)& Bo ); \ + Eki0 = Bi ^((~Bo)& Bu ); \ + Eko0 = Bo ^((~Bu)& Ba ); \ + Eku0 = Bu ^((~Ba)& Be ); \ +\ + Abu1 ^= Du1; \ + Ba = ROL32(Abu1, 14); \ + Aga0 ^= Da0; \ + Be = ROL32(Aga0, 18); \ + Ake0 ^= De0; \ + Bi = ROL32(Ake0, 5); \ + Ami1 ^= Di1; \ + Bo = ROL32(Ami1, 8); \ + Aso0 ^= Do0; \ + Bu = ROL32(Aso0, 28); \ + Ema0 = Ba ^((~Be)& Bi ); \ + Eme0 = Be ^((~Bi)& Bo ); \ + Emi0 = Bi ^((~Bo)& Bu ); \ + Emo0 = Bo ^((~Bu)& Ba ); \ + Emu0 = Bu ^((~Ba)& Be ); \ +\ + Abi0 ^= Di0; \ + Ba = ROL32(Abi0, 31); \ + Ago1 ^= Do1; \ + Be = ROL32(Ago1, 28); \ + Aku1 ^= Du1; \ + Bi = ROL32(Aku1, 20); \ + Ama1 ^= Da1; \ + Bo = ROL32(Ama1, 21); \ + Ase0 ^= De0; \ + Bu = ROL32(Ase0, 1); \ + Esa0 = Ba ^((~Be)& Bi ); \ + Ese0 = Be ^((~Bi)& Bo ); \ + Esi0 = Bi ^((~Bo)& Bu ); \ + Eso0 = Bo ^((~Bu)& Ba ); \ + Esu0 = Bu ^((~Ba)& Be ); \ +\ + Aba1 ^= Da1; \ + Ba = Aba1; \ + Age1 ^= De1; \ + Be = ROL32(Age1, 22); \ + Aki0 ^= Di0; \ + Bi = ROL32(Aki0, 21); \ + Amo0 ^= Do0; \ + Bo = ROL32(Amo0, 10); \ + Asu1 ^= Du1; \ + Bu = ROL32(Asu1, 7); \ + Eba1 = Ba ^((~Be)& Bi ); \ + Eba1 ^= *(pRoundConstants++); \ + Ebe1 = Be ^((~Bi)& Bo ); \ + Ebi1 = Bi ^((~Bo)& Bu ); \ + Ebo1 = Bo ^((~Bu)& Ba ); \ + Ebu1 = Bu ^((~Ba)& Be ); \ +\ + Abo1 ^= Do1; \ + Ba = ROL32(Abo1, 14); \ + Agu1 ^= Du1; \ + Be = ROL32(Agu1, 10); \ + Aka0 ^= Da0; \ + Bi = ROL32(Aka0, 1); \ + Ame0 ^= De0; \ + Bo = ROL32(Ame0, 22); \ + Asi0 ^= Di0; \ + Bu = ROL32(Asi0, 30); \ + Ega1 = Ba ^((~Be)& Bi ); \ + Ege1 = Be ^((~Bi)& Bo ); \ + Egi1 = Bi ^((~Bo)& Bu ); \ + Ego1 = Bo ^((~Bu)& Ba ); \ + Egu1 = Bu ^((~Ba)& Be ); \ +\ + Abe0 ^= De0; \ + Ba = Abe0; \ + Agi1 ^= Di1; \ + Be = ROL32(Agi1, 3); \ + Ako0 ^= Do0; \ + Bi = ROL32(Ako0, 12); \ + Amu1 ^= Du1; \ + Bo = ROL32(Amu1, 4); \ + Asa1 ^= Da1; \ + Bu = ROL32(Asa1, 9); \ + Eka1 = Ba ^((~Be)& Bi ); \ + Eke1 = Be ^((~Bi)& Bo ); \ + Eki1 = Bi ^((~Bo)& Bu ); \ + Eko1 = Bo ^((~Bu)& Ba ); \ + Eku1 = Bu ^((~Ba)& Be ); \ +\ + Abu0 ^= Du0; \ + Ba = ROL32(Abu0, 13); \ + Aga1 ^= Da1; \ + Be = ROL32(Aga1, 18); \ + Ake1 ^= De1; \ + Bi = ROL32(Ake1, 5); \ + Ami0 ^= Di0; \ + Bo = ROL32(Ami0, 7); \ + Aso1 ^= Do1; \ + Bu = ROL32(Aso1, 28); \ + Ema1 = Ba ^((~Be)& Bi ); \ + Eme1 = Be ^((~Bi)& Bo ); \ + Emi1 = Bi ^((~Bo)& Bu ); \ + Emo1 = Bo ^((~Bu)& Ba ); \ + Emu1 = Bu ^((~Ba)& Be ); \ +\ + Abi1 ^= Di1; \ + Ba = ROL32(Abi1, 31); \ + Ago0 ^= Do0; \ + Be = ROL32(Ago0, 27); \ + Aku0 ^= Du0; \ + Bi = ROL32(Aku0, 19); \ + Ama0 ^= Da0; \ + Bo = ROL32(Ama0, 20); \ + Ase1 ^= De1; \ + Bu = ROL32(Ase1, 1); \ + Esa1 = Ba ^((~Be)& Bi ); \ + Ese1 = Be ^((~Bi)& Bo ); \ + Esi1 = Bi ^((~Bo)& Bu ); \ + Eso1 = Bo ^((~Bu)& Ba ); \ + Esu1 = Bu ^((~Ba)& Be ); \ +\ + Cx = Ebu0^Egu0^Eku0^Emu0^Esu0; \ + Du1 = Ebe1^Ege1^Eke1^Eme1^Ese1; \ + Da0 = Cx^ROL32(Du1, 1); \ + Cz = Ebu1^Egu1^Eku1^Emu1^Esu1; \ + Du0 = Ebe0^Ege0^Eke0^Eme0^Ese0; \ + Da1 = Cz^Du0; \ +\ + Cw = Ebi0^Egi0^Eki0^Emi0^Esi0; \ + Do0 = Cw^ROL32(Cz, 1); \ + Cy = Ebi1^Egi1^Eki1^Emi1^Esi1; \ + Do1 = Cy^Cx; \ +\ + Cx = Eba0^Ega0^Eka0^Ema0^Esa0; \ + De0 = Cx^ROL32(Cy, 1); \ + Cz = Eba1^Ega1^Eka1^Ema1^Esa1; \ + De1 = Cz^Cw; \ +\ + Cy = Ebo1^Ego1^Eko1^Emo1^Eso1; \ + Di0 = Du0^ROL32(Cy, 1); \ + Cw = Ebo0^Ego0^Eko0^Emo0^Eso0; \ + Di1 = Du1^Cw; \ +\ + Du0 = Cw^ROL32(Cz, 1); \ + Du1 = Cy^Cx; \ +\ + Eba0 ^= Da0; \ + Ba = Eba0; \ + Ege0 ^= De0; \ + Be = ROL32(Ege0, 22); \ + Eki1 ^= Di1; \ + Bi = ROL32(Eki1, 22); \ + Emo1 ^= Do1; \ + Bo = ROL32(Emo1, 11); \ + Esu0 ^= Du0; \ + Bu = ROL32(Esu0, 7); \ + Aba0 = Ba ^((~Be)& Bi ); \ + Aba0 ^= *(pRoundConstants++); \ + Abe0 = Be ^((~Bi)& Bo ); \ + Abi0 = Bi ^((~Bo)& Bu ); \ + Abo0 = Bo ^((~Bu)& Ba ); \ + Abu0 = Bu ^((~Ba)& Be ); \ +\ + Ebo0 ^= Do0; \ + Ba = ROL32(Ebo0, 14); \ + Egu0 ^= Du0; \ + Be = ROL32(Egu0, 10); \ + Eka1 ^= Da1; \ + Bi = ROL32(Eka1, 2); \ + Eme1 ^= De1; \ + Bo = ROL32(Eme1, 23); \ + Esi1 ^= Di1; \ + Bu = ROL32(Esi1, 31); \ + Aga0 = Ba ^((~Be)& Bi ); \ + Age0 = Be ^((~Bi)& Bo ); \ + Agi0 = Bi ^((~Bo)& Bu ); \ + Ago0 = Bo ^((~Bu)& Ba ); \ + Agu0 = Bu ^((~Ba)& Be ); \ +\ + Ebe1 ^= De1; \ + Ba = ROL32(Ebe1, 1); \ + Egi0 ^= Di0; \ + Be = ROL32(Egi0, 3); \ + Eko1 ^= Do1; \ + Bi = ROL32(Eko1, 13); \ + Emu0 ^= Du0; \ + Bo = ROL32(Emu0, 4); \ + Esa0 ^= Da0; \ + Bu = ROL32(Esa0, 9); \ + Aka0 = Ba ^((~Be)& Bi ); \ + Ake0 = Be ^((~Bi)& Bo ); \ + Aki0 = Bi ^((~Bo)& Bu ); \ + Ako0 = Bo ^((~Bu)& Ba ); \ + Aku0 = Bu ^((~Ba)& Be ); \ +\ + Ebu1 ^= Du1; \ + Ba = ROL32(Ebu1, 14); \ + Ega0 ^= Da0; \ + Be = ROL32(Ega0, 18); \ + Eke0 ^= De0; \ + Bi = ROL32(Eke0, 5); \ + Emi1 ^= Di1; \ + Bo = ROL32(Emi1, 8); \ + Eso0 ^= Do0; \ + Bu = ROL32(Eso0, 28); \ + Ama0 = Ba ^((~Be)& Bi ); \ + Ame0 = Be ^((~Bi)& Bo ); \ + Ami0 = Bi ^((~Bo)& Bu ); \ + Amo0 = Bo ^((~Bu)& Ba ); \ + Amu0 = Bu ^((~Ba)& Be ); \ +\ + Ebi0 ^= Di0; \ + Ba = ROL32(Ebi0, 31); \ + Ego1 ^= Do1; \ + Be = ROL32(Ego1, 28); \ + Eku1 ^= Du1; \ + Bi = ROL32(Eku1, 20); \ + Ema1 ^= Da1; \ + Bo = ROL32(Ema1, 21); \ + Ese0 ^= De0; \ + Bu = ROL32(Ese0, 1); \ + Asa0 = Ba ^((~Be)& Bi ); \ + Ase0 = Be ^((~Bi)& Bo ); \ + Asi0 = Bi ^((~Bo)& Bu ); \ + Aso0 = Bo ^((~Bu)& Ba ); \ + Asu0 = Bu ^((~Ba)& Be ); \ +\ + Eba1 ^= Da1; \ + Ba = Eba1; \ + Ege1 ^= De1; \ + Be = ROL32(Ege1, 22); \ + Eki0 ^= Di0; \ + Bi = ROL32(Eki0, 21); \ + Emo0 ^= Do0; \ + Bo = ROL32(Emo0, 10); \ + Esu1 ^= Du1; \ + Bu = ROL32(Esu1, 7); \ + Aba1 = Ba ^((~Be)& Bi ); \ + Aba1 ^= *(pRoundConstants++); \ + Abe1 = Be ^((~Bi)& Bo ); \ + Abi1 = Bi ^((~Bo)& Bu ); \ + Abo1 = Bo ^((~Bu)& Ba ); \ + Abu1 = Bu ^((~Ba)& Be ); \ +\ + Ebo1 ^= Do1; \ + Ba = ROL32(Ebo1, 14); \ + Egu1 ^= Du1; \ + Be = ROL32(Egu1, 10); \ + Eka0 ^= Da0; \ + Bi = ROL32(Eka0, 1); \ + Eme0 ^= De0; \ + Bo = ROL32(Eme0, 22); \ + Esi0 ^= Di0; \ + Bu = ROL32(Esi0, 30); \ + Aga1 = Ba ^((~Be)& Bi ); \ + Age1 = Be ^((~Bi)& Bo ); \ + Agi1 = Bi ^((~Bo)& Bu ); \ + Ago1 = Bo ^((~Bu)& Ba ); \ + Agu1 = Bu ^((~Ba)& Be ); \ +\ + Ebe0 ^= De0; \ + Ba = Ebe0; \ + Egi1 ^= Di1; \ + Be = ROL32(Egi1, 3); \ + Eko0 ^= Do0; \ + Bi = ROL32(Eko0, 12); \ + Emu1 ^= Du1; \ + Bo = ROL32(Emu1, 4); \ + Esa1 ^= Da1; \ + Bu = ROL32(Esa1, 9); \ + Aka1 = Ba ^((~Be)& Bi ); \ + Ake1 = Be ^((~Bi)& Bo ); \ + Aki1 = Bi ^((~Bo)& Bu ); \ + Ako1 = Bo ^((~Bu)& Ba ); \ + Aku1 = Bu ^((~Ba)& Be ); \ +\ + Ebu0 ^= Du0; \ + Ba = ROL32(Ebu0, 13); \ + Ega1 ^= Da1; \ + Be = ROL32(Ega1, 18); \ + Eke1 ^= De1; \ + Bi = ROL32(Eke1, 5); \ + Emi0 ^= Di0; \ + Bo = ROL32(Emi0, 7); \ + Eso1 ^= Do1; \ + Bu = ROL32(Eso1, 28); \ + Ama1 = Ba ^((~Be)& Bi ); \ + Ame1 = Be ^((~Bi)& Bo ); \ + Ami1 = Bi ^((~Bo)& Bu ); \ + Amo1 = Bo ^((~Bu)& Ba ); \ + Amu1 = Bu ^((~Ba)& Be ); \ +\ + Ebi1 ^= Di1; \ + Ba = ROL32(Ebi1, 31); \ + Ego0 ^= Do0; \ + Be = ROL32(Ego0, 27); \ + Eku0 ^= Du0; \ + Bi = ROL32(Eku0, 19); \ + Ema0 ^= Da0; \ + Bo = ROL32(Ema0, 20); \ + Ese1 ^= De1; \ + Bu = ROL32(Ese1, 1); \ + Asa1 = Ba ^((~Be)& Bi ); \ + Ase1 = Be ^((~Bi)& Bo ); \ + Asi1 = Bi ^((~Bo)& Bu ); \ + Aso1 = Bo ^((~Bu)& Ba ); \ + Asu1 = Bu ^((~Ba)& Be ); \ + } \ + copyToState(state, A) \ +} + +#define copyFromState(X, state) \ + X##ba0 = state[ 0]; \ + X##ba1 = state[ 1]; \ + X##be0 = state[ 2]; \ + X##be1 = state[ 3]; \ + X##bi0 = state[ 4]; \ + X##bi1 = state[ 5]; \ + X##bo0 = state[ 6]; \ + X##bo1 = state[ 7]; \ + X##bu0 = state[ 8]; \ + X##bu1 = state[ 9]; \ + X##ga0 = state[10]; \ + X##ga1 = state[11]; \ + X##ge0 = state[12]; \ + X##ge1 = state[13]; \ + X##gi0 = state[14]; \ + X##gi1 = state[15]; \ + X##go0 = state[16]; \ + X##go1 = state[17]; \ + X##gu0 = state[18]; \ + X##gu1 = state[19]; \ + X##ka0 = state[20]; \ + X##ka1 = state[21]; \ + X##ke0 = state[22]; \ + X##ke1 = state[23]; \ + X##ki0 = state[24]; \ + X##ki1 = state[25]; \ + X##ko0 = state[26]; \ + X##ko1 = state[27]; \ + X##ku0 = state[28]; \ + X##ku1 = state[29]; \ + X##ma0 = state[30]; \ + X##ma1 = state[31]; \ + X##me0 = state[32]; \ + X##me1 = state[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyToState(state, X) \ + state[ 0] = X##ba0; \ + state[ 1] = X##ba1; \ + state[ 2] = X##be0; \ + state[ 3] = X##be1; \ + state[ 4] = X##bi0; \ + state[ 5] = X##bi1; \ + state[ 6] = X##bo0; \ + state[ 7] = X##bo1; \ + state[ 8] = X##bu0; \ + state[ 9] = X##bu1; \ + state[10] = X##ga0; \ + state[11] = X##ga1; \ + state[12] = X##ge0; \ + state[13] = X##ge1; \ + state[14] = X##gi0; \ + state[15] = X##gi1; \ + state[16] = X##go0; \ + state[17] = X##go1; \ + state[18] = X##gu0; \ + state[19] = X##gu1; \ + state[20] = X##ka0; \ + state[21] = X##ka1; \ + state[22] = X##ke0; \ + state[23] = X##ke1; \ + state[24] = X##ki0; \ + state[25] = X##ki1; \ + state[26] = X##ko0; \ + state[27] = X##ko1; \ + state[28] = X##ku0; \ + state[29] = X##ku1; \ + state[30] = X##ma0; \ + state[31] = X##ma1; \ + state[32] = X##me0; \ + state[33] = X##me1; \ + state[34] = X##mi0; \ + state[35] = X##mi1; \ + state[36] = X##mo0; \ + state[37] = X##mo1; \ + state[38] = X##mu0; \ + state[39] = X##mu1; \ + state[40] = X##sa0; \ + state[41] = X##sa1; \ + state[42] = X##se0; \ + state[43] = X##se1; \ + state[44] = X##si0; \ + state[45] = X##si1; \ + state[46] = X##so0; \ + state[47] = X##so1; \ + state[48] = X##su0; \ + state[49] = X##su1; \ + diff --git a/Modules/_sha3/keccak/KeccakF-1600-32-s1.macros b/Modules/_sha3/keccak/KeccakF-1600-32-s1.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-32-s1.macros @@ -0,0 +1,1187 @@ +/* +Code automatically generated by KeccakTools! + +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + UINT32 Aba0, Abe0, Abi0, Abo0, Abu0; \ + UINT32 Aba1, Abe1, Abi1, Abo1, Abu1; \ + UINT32 Aga0, Age0, Agi0, Ago0, Agu0; \ + UINT32 Aga1, Age1, Agi1, Ago1, Agu1; \ + UINT32 Aka0, Ake0, Aki0, Ako0, Aku0; \ + UINT32 Aka1, Ake1, Aki1, Ako1, Aku1; \ + UINT32 Ama0, Ame0, Ami0, Amo0, Amu0; \ + UINT32 Ama1, Ame1, Ami1, Amo1, Amu1; \ + UINT32 Asa0, Ase0, Asi0, Aso0, Asu0; \ + UINT32 Asa1, Ase1, Asi1, Aso1, Asu1; \ + UINT32 Bba0, Bbe0, Bbi0, Bbo0, Bbu0; \ + UINT32 Bba1, Bbe1, Bbi1, Bbo1, Bbu1; \ + UINT32 Bga0, Bge0, Bgi0, Bgo0, Bgu0; \ + UINT32 Bga1, Bge1, Bgi1, Bgo1, Bgu1; \ + UINT32 Bka0, Bke0, Bki0, Bko0, Bku0; \ + UINT32 Bka1, Bke1, Bki1, Bko1, Bku1; \ + UINT32 Bma0, Bme0, Bmi0, Bmo0, Bmu0; \ + UINT32 Bma1, Bme1, Bmi1, Bmo1, Bmu1; \ + UINT32 Bsa0, Bse0, Bsi0, Bso0, Bsu0; \ + UINT32 Bsa1, Bse1, Bsi1, Bso1, Bsu1; \ + UINT32 Ca0, Ce0, Ci0, Co0, Cu0; \ + UINT32 Ca1, Ce1, Ci1, Co1, Cu1; \ + UINT32 Da0, De0, Di0, Do0, Du0; \ + UINT32 Da1, De1, Di1, Do1, Du1; \ + UINT32 Eba0, Ebe0, Ebi0, Ebo0, Ebu0; \ + UINT32 Eba1, Ebe1, Ebi1, Ebo1, Ebu1; \ + UINT32 Ega0, Ege0, Egi0, Ego0, Egu0; \ + UINT32 Ega1, Ege1, Egi1, Ego1, Egu1; \ + UINT32 Eka0, Eke0, Eki0, Eko0, Eku0; \ + UINT32 Eka1, Eke1, Eki1, Eko1, Eku1; \ + UINT32 Ema0, Eme0, Emi0, Emo0, Emu0; \ + UINT32 Ema1, Eme1, Emi1, Emo1, Emu1; \ + UINT32 Esa0, Ese0, Esi0, Eso0, Esu0; \ + UINT32 Esa1, Ese1, Esi1, Eso1, Esu1; \ + +#define prepareTheta \ + Ca0 = Aba0^Aga0^Aka0^Ama0^Asa0; \ + Ca1 = Aba1^Aga1^Aka1^Ama1^Asa1; \ + Ce0 = Abe0^Age0^Ake0^Ame0^Ase0; \ + Ce1 = Abe1^Age1^Ake1^Ame1^Ase1; \ + Ci0 = Abi0^Agi0^Aki0^Ami0^Asi0; \ + Ci1 = Abi1^Agi1^Aki1^Ami1^Asi1; \ + Co0 = Abo0^Ago0^Ako0^Amo0^Aso0; \ + Co1 = Abo1^Ago1^Ako1^Amo1^Aso1; \ + Cu0 = Abu0^Agu0^Aku0^Amu0^Asu0; \ + Cu1 = Abu1^Agu1^Aku1^Amu1^Asu1; \ + +#ifdef UseBebigokimisa +/* --- Code for round, with prepare-theta (lane complementing pattern 'bebigokimisa') */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##ba0 = Bba0 ^( Bbe0 | Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + Ca0 = E##ba0; \ + E##be0 = Bbe0 ^((~Bbi0)| Bbo0 ); \ + Ce0 = E##be0; \ + E##bi0 = Bbi0 ^( Bbo0 & Bbu0 ); \ + Ci0 = E##bi0; \ + E##bo0 = Bbo0 ^( Bbu0 | Bba0 ); \ + Co0 = E##bo0; \ + E##bu0 = Bbu0 ^( Bba0 & Bbe0 ); \ + Cu0 = E##bu0; \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##ba1 = Bba1 ^( Bbe1 | Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + Ca1 = E##ba1; \ + E##be1 = Bbe1 ^((~Bbi1)| Bbo1 ); \ + Ce1 = E##be1; \ + E##bi1 = Bbi1 ^( Bbo1 & Bbu1 ); \ + Ci1 = E##bi1; \ + E##bo1 = Bbo1 ^( Bbu1 | Bba1 ); \ + Co1 = E##bo1; \ + E##bu1 = Bbu1 ^( Bba1 & Bbe1 ); \ + Cu1 = E##bu1; \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##ga0 = Bga0 ^( Bge0 | Bgi0 ); \ + Ca0 ^= E##ga0; \ + E##ge0 = Bge0 ^( Bgi0 & Bgo0 ); \ + Ce0 ^= E##ge0; \ + E##gi0 = Bgi0 ^( Bgo0 |(~Bgu0)); \ + Ci0 ^= E##gi0; \ + E##go0 = Bgo0 ^( Bgu0 | Bga0 ); \ + Co0 ^= E##go0; \ + E##gu0 = Bgu0 ^( Bga0 & Bge0 ); \ + Cu0 ^= E##gu0; \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##ga1 = Bga1 ^( Bge1 | Bgi1 ); \ + Ca1 ^= E##ga1; \ + E##ge1 = Bge1 ^( Bgi1 & Bgo1 ); \ + Ce1 ^= E##ge1; \ + E##gi1 = Bgi1 ^( Bgo1 |(~Bgu1)); \ + Ci1 ^= E##gi1; \ + E##go1 = Bgo1 ^( Bgu1 | Bga1 ); \ + Co1 ^= E##go1; \ + E##gu1 = Bgu1 ^( Bga1 & Bge1 ); \ + Cu1 ^= E##gu1; \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ka0 = Bka0 ^( Bke0 | Bki0 ); \ + Ca0 ^= E##ka0; \ + E##ke0 = Bke0 ^( Bki0 & Bko0 ); \ + Ce0 ^= E##ke0; \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + Ci0 ^= E##ki0; \ + E##ko0 = (~Bko0)^( Bku0 | Bka0 ); \ + Co0 ^= E##ko0; \ + E##ku0 = Bku0 ^( Bka0 & Bke0 ); \ + Cu0 ^= E##ku0; \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ka1 = Bka1 ^( Bke1 | Bki1 ); \ + Ca1 ^= E##ka1; \ + E##ke1 = Bke1 ^( Bki1 & Bko1 ); \ + Ce1 ^= E##ke1; \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + Ci1 ^= E##ki1; \ + E##ko1 = (~Bko1)^( Bku1 | Bka1 ); \ + Co1 ^= E##ko1; \ + E##ku1 = Bku1 ^( Bka1 & Bke1 ); \ + Cu1 ^= E##ku1; \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##ma0 = Bma0 ^( Bme0 & Bmi0 ); \ + Ca0 ^= E##ma0; \ + E##me0 = Bme0 ^( Bmi0 | Bmo0 ); \ + Ce0 ^= E##me0; \ + E##mi0 = Bmi0 ^((~Bmo0)| Bmu0 ); \ + Ci0 ^= E##mi0; \ + E##mo0 = (~Bmo0)^( Bmu0 & Bma0 ); \ + Co0 ^= E##mo0; \ + E##mu0 = Bmu0 ^( Bma0 | Bme0 ); \ + Cu0 ^= E##mu0; \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##ma1 = Bma1 ^( Bme1 & Bmi1 ); \ + Ca1 ^= E##ma1; \ + E##me1 = Bme1 ^( Bmi1 | Bmo1 ); \ + Ce1 ^= E##me1; \ + E##mi1 = Bmi1 ^((~Bmo1)| Bmu1 ); \ + Ci1 ^= E##mi1; \ + E##mo1 = (~Bmo1)^( Bmu1 & Bma1 ); \ + Co1 ^= E##mo1; \ + E##mu1 = Bmu1 ^( Bma1 | Bme1 ); \ + Cu1 ^= E##mu1; \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + Ca0 ^= E##sa0; \ + E##se0 = (~Bse0)^( Bsi0 | Bso0 ); \ + Ce0 ^= E##se0; \ + E##si0 = Bsi0 ^( Bso0 & Bsu0 ); \ + Ci0 ^= E##si0; \ + E##so0 = Bso0 ^( Bsu0 | Bsa0 ); \ + Co0 ^= E##so0; \ + E##su0 = Bsu0 ^( Bsa0 & Bse0 ); \ + Cu0 ^= E##su0; \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + Ca1 ^= E##sa1; \ + E##se1 = (~Bse1)^( Bsi1 | Bso1 ); \ + Ce1 ^= E##se1; \ + E##si1 = Bsi1 ^( Bso1 & Bsu1 ); \ + Ci1 ^= E##si1; \ + E##so1 = Bso1 ^( Bsu1 | Bsa1 ); \ + Co1 ^= E##so1; \ + E##su1 = Bsu1 ^( Bsa1 & Bse1 ); \ + Cu1 ^= E##su1; \ +\ + +/* --- Code for round (lane complementing pattern 'bebigokimisa') */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##ba0 = Bba0 ^( Bbe0 | Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + E##be0 = Bbe0 ^((~Bbi0)| Bbo0 ); \ + E##bi0 = Bbi0 ^( Bbo0 & Bbu0 ); \ + E##bo0 = Bbo0 ^( Bbu0 | Bba0 ); \ + E##bu0 = Bbu0 ^( Bba0 & Bbe0 ); \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##ba1 = Bba1 ^( Bbe1 | Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + E##be1 = Bbe1 ^((~Bbi1)| Bbo1 ); \ + E##bi1 = Bbi1 ^( Bbo1 & Bbu1 ); \ + E##bo1 = Bbo1 ^( Bbu1 | Bba1 ); \ + E##bu1 = Bbu1 ^( Bba1 & Bbe1 ); \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##ga0 = Bga0 ^( Bge0 | Bgi0 ); \ + E##ge0 = Bge0 ^( Bgi0 & Bgo0 ); \ + E##gi0 = Bgi0 ^( Bgo0 |(~Bgu0)); \ + E##go0 = Bgo0 ^( Bgu0 | Bga0 ); \ + E##gu0 = Bgu0 ^( Bga0 & Bge0 ); \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##ga1 = Bga1 ^( Bge1 | Bgi1 ); \ + E##ge1 = Bge1 ^( Bgi1 & Bgo1 ); \ + E##gi1 = Bgi1 ^( Bgo1 |(~Bgu1)); \ + E##go1 = Bgo1 ^( Bgu1 | Bga1 ); \ + E##gu1 = Bgu1 ^( Bga1 & Bge1 ); \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ka0 = Bka0 ^( Bke0 | Bki0 ); \ + E##ke0 = Bke0 ^( Bki0 & Bko0 ); \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + E##ko0 = (~Bko0)^( Bku0 | Bka0 ); \ + E##ku0 = Bku0 ^( Bka0 & Bke0 ); \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ka1 = Bka1 ^( Bke1 | Bki1 ); \ + E##ke1 = Bke1 ^( Bki1 & Bko1 ); \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + E##ko1 = (~Bko1)^( Bku1 | Bka1 ); \ + E##ku1 = Bku1 ^( Bka1 & Bke1 ); \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##ma0 = Bma0 ^( Bme0 & Bmi0 ); \ + E##me0 = Bme0 ^( Bmi0 | Bmo0 ); \ + E##mi0 = Bmi0 ^((~Bmo0)| Bmu0 ); \ + E##mo0 = (~Bmo0)^( Bmu0 & Bma0 ); \ + E##mu0 = Bmu0 ^( Bma0 | Bme0 ); \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##ma1 = Bma1 ^( Bme1 & Bmi1 ); \ + E##me1 = Bme1 ^( Bmi1 | Bmo1 ); \ + E##mi1 = Bmi1 ^((~Bmo1)| Bmu1 ); \ + E##mo1 = (~Bmo1)^( Bmu1 & Bma1 ); \ + E##mu1 = Bmu1 ^( Bma1 | Bme1 ); \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + E##se0 = (~Bse0)^( Bsi0 | Bso0 ); \ + E##si0 = Bsi0 ^( Bso0 & Bsu0 ); \ + E##so0 = Bso0 ^( Bsu0 | Bsa0 ); \ + E##su0 = Bsu0 ^( Bsa0 & Bse0 ); \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + E##se1 = (~Bse1)^( Bsi1 | Bso1 ); \ + E##si1 = Bsi1 ^( Bso1 & Bsu1 ); \ + E##so1 = Bso1 ^( Bsu1 | Bsa1 ); \ + E##su1 = Bsu1 ^( Bsa1 & Bse1 ); \ +\ + +#else /* UseBebigokimisa */ +/* --- Code for round, with prepare-theta */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##ba0 = Bba0 ^((~Bbe0)& Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + Ca0 = E##ba0; \ + E##be0 = Bbe0 ^((~Bbi0)& Bbo0 ); \ + Ce0 = E##be0; \ + E##bi0 = Bbi0 ^((~Bbo0)& Bbu0 ); \ + Ci0 = E##bi0; \ + E##bo0 = Bbo0 ^((~Bbu0)& Bba0 ); \ + Co0 = E##bo0; \ + E##bu0 = Bbu0 ^((~Bba0)& Bbe0 ); \ + Cu0 = E##bu0; \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##ba1 = Bba1 ^((~Bbe1)& Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + Ca1 = E##ba1; \ + E##be1 = Bbe1 ^((~Bbi1)& Bbo1 ); \ + Ce1 = E##be1; \ + E##bi1 = Bbi1 ^((~Bbo1)& Bbu1 ); \ + Ci1 = E##bi1; \ + E##bo1 = Bbo1 ^((~Bbu1)& Bba1 ); \ + Co1 = E##bo1; \ + E##bu1 = Bbu1 ^((~Bba1)& Bbe1 ); \ + Cu1 = E##bu1; \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##ga0 = Bga0 ^((~Bge0)& Bgi0 ); \ + Ca0 ^= E##ga0; \ + E##ge0 = Bge0 ^((~Bgi0)& Bgo0 ); \ + Ce0 ^= E##ge0; \ + E##gi0 = Bgi0 ^((~Bgo0)& Bgu0 ); \ + Ci0 ^= E##gi0; \ + E##go0 = Bgo0 ^((~Bgu0)& Bga0 ); \ + Co0 ^= E##go0; \ + E##gu0 = Bgu0 ^((~Bga0)& Bge0 ); \ + Cu0 ^= E##gu0; \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##ga1 = Bga1 ^((~Bge1)& Bgi1 ); \ + Ca1 ^= E##ga1; \ + E##ge1 = Bge1 ^((~Bgi1)& Bgo1 ); \ + Ce1 ^= E##ge1; \ + E##gi1 = Bgi1 ^((~Bgo1)& Bgu1 ); \ + Ci1 ^= E##gi1; \ + E##go1 = Bgo1 ^((~Bgu1)& Bga1 ); \ + Co1 ^= E##go1; \ + E##gu1 = Bgu1 ^((~Bga1)& Bge1 ); \ + Cu1 ^= E##gu1; \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ka0 = Bka0 ^((~Bke0)& Bki0 ); \ + Ca0 ^= E##ka0; \ + E##ke0 = Bke0 ^((~Bki0)& Bko0 ); \ + Ce0 ^= E##ke0; \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + Ci0 ^= E##ki0; \ + E##ko0 = Bko0 ^((~Bku0)& Bka0 ); \ + Co0 ^= E##ko0; \ + E##ku0 = Bku0 ^((~Bka0)& Bke0 ); \ + Cu0 ^= E##ku0; \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ka1 = Bka1 ^((~Bke1)& Bki1 ); \ + Ca1 ^= E##ka1; \ + E##ke1 = Bke1 ^((~Bki1)& Bko1 ); \ + Ce1 ^= E##ke1; \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + Ci1 ^= E##ki1; \ + E##ko1 = Bko1 ^((~Bku1)& Bka1 ); \ + Co1 ^= E##ko1; \ + E##ku1 = Bku1 ^((~Bka1)& Bke1 ); \ + Cu1 ^= E##ku1; \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##ma0 = Bma0 ^((~Bme0)& Bmi0 ); \ + Ca0 ^= E##ma0; \ + E##me0 = Bme0 ^((~Bmi0)& Bmo0 ); \ + Ce0 ^= E##me0; \ + E##mi0 = Bmi0 ^((~Bmo0)& Bmu0 ); \ + Ci0 ^= E##mi0; \ + E##mo0 = Bmo0 ^((~Bmu0)& Bma0 ); \ + Co0 ^= E##mo0; \ + E##mu0 = Bmu0 ^((~Bma0)& Bme0 ); \ + Cu0 ^= E##mu0; \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##ma1 = Bma1 ^((~Bme1)& Bmi1 ); \ + Ca1 ^= E##ma1; \ + E##me1 = Bme1 ^((~Bmi1)& Bmo1 ); \ + Ce1 ^= E##me1; \ + E##mi1 = Bmi1 ^((~Bmo1)& Bmu1 ); \ + Ci1 ^= E##mi1; \ + E##mo1 = Bmo1 ^((~Bmu1)& Bma1 ); \ + Co1 ^= E##mo1; \ + E##mu1 = Bmu1 ^((~Bma1)& Bme1 ); \ + Cu1 ^= E##mu1; \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + Ca0 ^= E##sa0; \ + E##se0 = Bse0 ^((~Bsi0)& Bso0 ); \ + Ce0 ^= E##se0; \ + E##si0 = Bsi0 ^((~Bso0)& Bsu0 ); \ + Ci0 ^= E##si0; \ + E##so0 = Bso0 ^((~Bsu0)& Bsa0 ); \ + Co0 ^= E##so0; \ + E##su0 = Bsu0 ^((~Bsa0)& Bse0 ); \ + Cu0 ^= E##su0; \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + Ca1 ^= E##sa1; \ + E##se1 = Bse1 ^((~Bsi1)& Bso1 ); \ + Ce1 ^= E##se1; \ + E##si1 = Bsi1 ^((~Bso1)& Bsu1 ); \ + Ci1 ^= E##si1; \ + E##so1 = Bso1 ^((~Bsu1)& Bsa1 ); \ + Co1 ^= E##so1; \ + E##su1 = Bsu1 ^((~Bsa1)& Bse1 ); \ + Cu1 ^= E##su1; \ +\ + +/* --- Code for round */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##ba0 = Bba0 ^((~Bbe0)& Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + E##be0 = Bbe0 ^((~Bbi0)& Bbo0 ); \ + E##bi0 = Bbi0 ^((~Bbo0)& Bbu0 ); \ + E##bo0 = Bbo0 ^((~Bbu0)& Bba0 ); \ + E##bu0 = Bbu0 ^((~Bba0)& Bbe0 ); \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##ba1 = Bba1 ^((~Bbe1)& Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + E##be1 = Bbe1 ^((~Bbi1)& Bbo1 ); \ + E##bi1 = Bbi1 ^((~Bbo1)& Bbu1 ); \ + E##bo1 = Bbo1 ^((~Bbu1)& Bba1 ); \ + E##bu1 = Bbu1 ^((~Bba1)& Bbe1 ); \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##ga0 = Bga0 ^((~Bge0)& Bgi0 ); \ + E##ge0 = Bge0 ^((~Bgi0)& Bgo0 ); \ + E##gi0 = Bgi0 ^((~Bgo0)& Bgu0 ); \ + E##go0 = Bgo0 ^((~Bgu0)& Bga0 ); \ + E##gu0 = Bgu0 ^((~Bga0)& Bge0 ); \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##ga1 = Bga1 ^((~Bge1)& Bgi1 ); \ + E##ge1 = Bge1 ^((~Bgi1)& Bgo1 ); \ + E##gi1 = Bgi1 ^((~Bgo1)& Bgu1 ); \ + E##go1 = Bgo1 ^((~Bgu1)& Bga1 ); \ + E##gu1 = Bgu1 ^((~Bga1)& Bge1 ); \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ka0 = Bka0 ^((~Bke0)& Bki0 ); \ + E##ke0 = Bke0 ^((~Bki0)& Bko0 ); \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + E##ko0 = Bko0 ^((~Bku0)& Bka0 ); \ + E##ku0 = Bku0 ^((~Bka0)& Bke0 ); \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ka1 = Bka1 ^((~Bke1)& Bki1 ); \ + E##ke1 = Bke1 ^((~Bki1)& Bko1 ); \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + E##ko1 = Bko1 ^((~Bku1)& Bka1 ); \ + E##ku1 = Bku1 ^((~Bka1)& Bke1 ); \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##ma0 = Bma0 ^((~Bme0)& Bmi0 ); \ + E##me0 = Bme0 ^((~Bmi0)& Bmo0 ); \ + E##mi0 = Bmi0 ^((~Bmo0)& Bmu0 ); \ + E##mo0 = Bmo0 ^((~Bmu0)& Bma0 ); \ + E##mu0 = Bmu0 ^((~Bma0)& Bme0 ); \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##ma1 = Bma1 ^((~Bme1)& Bmi1 ); \ + E##me1 = Bme1 ^((~Bmi1)& Bmo1 ); \ + E##mi1 = Bmi1 ^((~Bmo1)& Bmu1 ); \ + E##mo1 = Bmo1 ^((~Bmu1)& Bma1 ); \ + E##mu1 = Bmu1 ^((~Bma1)& Bme1 ); \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + E##se0 = Bse0 ^((~Bsi0)& Bso0 ); \ + E##si0 = Bsi0 ^((~Bso0)& Bsu0 ); \ + E##so0 = Bso0 ^((~Bsu0)& Bsa0 ); \ + E##su0 = Bsu0 ^((~Bsa0)& Bse0 ); \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + E##se1 = Bse1 ^((~Bsi1)& Bso1 ); \ + E##si1 = Bsi1 ^((~Bso1)& Bsu1 ); \ + E##so1 = Bso1 ^((~Bsu1)& Bsa1 ); \ + E##su1 = Bsu1 ^((~Bsa1)& Bse1 ); \ +\ + +#endif /* UseBebigokimisa */ + +const UINT32 KeccakF1600RoundConstants_int2_0[24] = { + 0x00000001UL, + 0x00000000UL, + 0x00000000UL, + 0x00000000UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000000UL, + 0x00000000UL, + 0x00000001UL, + 0x00000000UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000000UL, + 0x00000000UL, + 0x00000000UL, + 0x00000000UL, + 0x00000001UL, + 0x00000000UL, + 0x00000001UL, + 0x00000000UL }; + +const UINT32 KeccakF1600RoundConstants_int2_1[24] = { + 0x00000000UL, + 0x00000089UL, + 0x8000008bUL, + 0x80008080UL, + 0x0000008bUL, + 0x00008000UL, + 0x80008088UL, + 0x80000082UL, + 0x0000000bUL, + 0x0000000aUL, + 0x00008082UL, + 0x00008003UL, + 0x0000808bUL, + 0x8000000bUL, + 0x8000008aUL, + 0x80000081UL, + 0x80000081UL, + 0x80000008UL, + 0x00000083UL, + 0x80008003UL, + 0x80008088UL, + 0x80000088UL, + 0x00008000UL, + 0x80008082UL }; + +#define copyFromStateAndXor1024bits(X, state, input) \ + X##ba0 = state[ 0]^input[ 0]; \ + X##ba1 = state[ 1]^input[ 1]; \ + X##be0 = state[ 2]^input[ 2]; \ + X##be1 = state[ 3]^input[ 3]; \ + X##bi0 = state[ 4]^input[ 4]; \ + X##bi1 = state[ 5]^input[ 5]; \ + X##bo0 = state[ 6]^input[ 6]; \ + X##bo1 = state[ 7]^input[ 7]; \ + X##bu0 = state[ 8]^input[ 8]; \ + X##bu1 = state[ 9]^input[ 9]; \ + X##ga0 = state[10]^input[10]; \ + X##ga1 = state[11]^input[11]; \ + X##ge0 = state[12]^input[12]; \ + X##ge1 = state[13]^input[13]; \ + X##gi0 = state[14]^input[14]; \ + X##gi1 = state[15]^input[15]; \ + X##go0 = state[16]^input[16]; \ + X##go1 = state[17]^input[17]; \ + X##gu0 = state[18]^input[18]; \ + X##gu1 = state[19]^input[19]; \ + X##ka0 = state[20]^input[20]; \ + X##ka1 = state[21]^input[21]; \ + X##ke0 = state[22]^input[22]; \ + X##ke1 = state[23]^input[23]; \ + X##ki0 = state[24]^input[24]; \ + X##ki1 = state[25]^input[25]; \ + X##ko0 = state[26]^input[26]; \ + X##ko1 = state[27]^input[27]; \ + X##ku0 = state[28]^input[28]; \ + X##ku1 = state[29]^input[29]; \ + X##ma0 = state[30]^input[30]; \ + X##ma1 = state[31]^input[31]; \ + X##me0 = state[32]; \ + X##me1 = state[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyFromStateAndXor1088bits(X, state, input) \ + X##ba0 = state[ 0]^input[ 0]; \ + X##ba1 = state[ 1]^input[ 1]; \ + X##be0 = state[ 2]^input[ 2]; \ + X##be1 = state[ 3]^input[ 3]; \ + X##bi0 = state[ 4]^input[ 4]; \ + X##bi1 = state[ 5]^input[ 5]; \ + X##bo0 = state[ 6]^input[ 6]; \ + X##bo1 = state[ 7]^input[ 7]; \ + X##bu0 = state[ 8]^input[ 8]; \ + X##bu1 = state[ 9]^input[ 9]; \ + X##ga0 = state[10]^input[10]; \ + X##ga1 = state[11]^input[11]; \ + X##ge0 = state[12]^input[12]; \ + X##ge1 = state[13]^input[13]; \ + X##gi0 = state[14]^input[14]; \ + X##gi1 = state[15]^input[15]; \ + X##go0 = state[16]^input[16]; \ + X##go1 = state[17]^input[17]; \ + X##gu0 = state[18]^input[18]; \ + X##gu1 = state[19]^input[19]; \ + X##ka0 = state[20]^input[20]; \ + X##ka1 = state[21]^input[21]; \ + X##ke0 = state[22]^input[22]; \ + X##ke1 = state[23]^input[23]; \ + X##ki0 = state[24]^input[24]; \ + X##ki1 = state[25]^input[25]; \ + X##ko0 = state[26]^input[26]; \ + X##ko1 = state[27]^input[27]; \ + X##ku0 = state[28]^input[28]; \ + X##ku1 = state[29]^input[29]; \ + X##ma0 = state[30]^input[30]; \ + X##ma1 = state[31]^input[31]; \ + X##me0 = state[32]^input[32]; \ + X##me1 = state[33]^input[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyFromState(X, state) \ + X##ba0 = state[ 0]; \ + X##ba1 = state[ 1]; \ + X##be0 = state[ 2]; \ + X##be1 = state[ 3]; \ + X##bi0 = state[ 4]; \ + X##bi1 = state[ 5]; \ + X##bo0 = state[ 6]; \ + X##bo1 = state[ 7]; \ + X##bu0 = state[ 8]; \ + X##bu1 = state[ 9]; \ + X##ga0 = state[10]; \ + X##ga1 = state[11]; \ + X##ge0 = state[12]; \ + X##ge1 = state[13]; \ + X##gi0 = state[14]; \ + X##gi1 = state[15]; \ + X##go0 = state[16]; \ + X##go1 = state[17]; \ + X##gu0 = state[18]; \ + X##gu1 = state[19]; \ + X##ka0 = state[20]; \ + X##ka1 = state[21]; \ + X##ke0 = state[22]; \ + X##ke1 = state[23]; \ + X##ki0 = state[24]; \ + X##ki1 = state[25]; \ + X##ko0 = state[26]; \ + X##ko1 = state[27]; \ + X##ku0 = state[28]; \ + X##ku1 = state[29]; \ + X##ma0 = state[30]; \ + X##ma1 = state[31]; \ + X##me0 = state[32]; \ + X##me1 = state[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyToState(state, X) \ + state[ 0] = X##ba0; \ + state[ 1] = X##ba1; \ + state[ 2] = X##be0; \ + state[ 3] = X##be1; \ + state[ 4] = X##bi0; \ + state[ 5] = X##bi1; \ + state[ 6] = X##bo0; \ + state[ 7] = X##bo1; \ + state[ 8] = X##bu0; \ + state[ 9] = X##bu1; \ + state[10] = X##ga0; \ + state[11] = X##ga1; \ + state[12] = X##ge0; \ + state[13] = X##ge1; \ + state[14] = X##gi0; \ + state[15] = X##gi1; \ + state[16] = X##go0; \ + state[17] = X##go1; \ + state[18] = X##gu0; \ + state[19] = X##gu1; \ + state[20] = X##ka0; \ + state[21] = X##ka1; \ + state[22] = X##ke0; \ + state[23] = X##ke1; \ + state[24] = X##ki0; \ + state[25] = X##ki1; \ + state[26] = X##ko0; \ + state[27] = X##ko1; \ + state[28] = X##ku0; \ + state[29] = X##ku1; \ + state[30] = X##ma0; \ + state[31] = X##ma1; \ + state[32] = X##me0; \ + state[33] = X##me1; \ + state[34] = X##mi0; \ + state[35] = X##mi1; \ + state[36] = X##mo0; \ + state[37] = X##mo1; \ + state[38] = X##mu0; \ + state[39] = X##mu1; \ + state[40] = X##sa0; \ + state[41] = X##sa1; \ + state[42] = X##se0; \ + state[43] = X##se1; \ + state[44] = X##si0; \ + state[45] = X##si1; \ + state[46] = X##so0; \ + state[47] = X##so1; \ + state[48] = X##su0; \ + state[49] = X##su1; \ + +#define copyStateVariables(X, Y) \ + X##ba0 = Y##ba0; \ + X##ba1 = Y##ba1; \ + X##be0 = Y##be0; \ + X##be1 = Y##be1; \ + X##bi0 = Y##bi0; \ + X##bi1 = Y##bi1; \ + X##bo0 = Y##bo0; \ + X##bo1 = Y##bo1; \ + X##bu0 = Y##bu0; \ + X##bu1 = Y##bu1; \ + X##ga0 = Y##ga0; \ + X##ga1 = Y##ga1; \ + X##ge0 = Y##ge0; \ + X##ge1 = Y##ge1; \ + X##gi0 = Y##gi0; \ + X##gi1 = Y##gi1; \ + X##go0 = Y##go0; \ + X##go1 = Y##go1; \ + X##gu0 = Y##gu0; \ + X##gu1 = Y##gu1; \ + X##ka0 = Y##ka0; \ + X##ka1 = Y##ka1; \ + X##ke0 = Y##ke0; \ + X##ke1 = Y##ke1; \ + X##ki0 = Y##ki0; \ + X##ki1 = Y##ki1; \ + X##ko0 = Y##ko0; \ + X##ko1 = Y##ko1; \ + X##ku0 = Y##ku0; \ + X##ku1 = Y##ku1; \ + X##ma0 = Y##ma0; \ + X##ma1 = Y##ma1; \ + X##me0 = Y##me0; \ + X##me1 = Y##me1; \ + X##mi0 = Y##mi0; \ + X##mi1 = Y##mi1; \ + X##mo0 = Y##mo0; \ + X##mo1 = Y##mo1; \ + X##mu0 = Y##mu0; \ + X##mu1 = Y##mu1; \ + X##sa0 = Y##sa0; \ + X##sa1 = Y##sa1; \ + X##se0 = Y##se0; \ + X##se1 = Y##se1; \ + X##si0 = Y##si0; \ + X##si1 = Y##si1; \ + X##so0 = Y##so0; \ + X##so1 = Y##so1; \ + X##su0 = Y##su0; \ + X##su1 = Y##su1; \ + diff --git a/Modules/_sha3/keccak/KeccakF-1600-32-s2.macros b/Modules/_sha3/keccak/KeccakF-1600-32-s2.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-32-s2.macros @@ -0,0 +1,1187 @@ +/* +Code automatically generated by KeccakTools! + +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + UINT32 Aba0, Abe0, Abi0, Abo0, Abu0; \ + UINT32 Aba1, Abe1, Abi1, Abo1, Abu1; \ + UINT32 Aga0, Age0, Agi0, Ago0, Agu0; \ + UINT32 Aga1, Age1, Agi1, Ago1, Agu1; \ + UINT32 Aka0, Ake0, Aki0, Ako0, Aku0; \ + UINT32 Aka1, Ake1, Aki1, Ako1, Aku1; \ + UINT32 Ama0, Ame0, Ami0, Amo0, Amu0; \ + UINT32 Ama1, Ame1, Ami1, Amo1, Amu1; \ + UINT32 Asa0, Ase0, Asi0, Aso0, Asu0; \ + UINT32 Asa1, Ase1, Asi1, Aso1, Asu1; \ + UINT32 Bba0, Bbe0, Bbi0, Bbo0, Bbu0; \ + UINT32 Bba1, Bbe1, Bbi1, Bbo1, Bbu1; \ + UINT32 Bga0, Bge0, Bgi0, Bgo0, Bgu0; \ + UINT32 Bga1, Bge1, Bgi1, Bgo1, Bgu1; \ + UINT32 Bka0, Bke0, Bki0, Bko0, Bku0; \ + UINT32 Bka1, Bke1, Bki1, Bko1, Bku1; \ + UINT32 Bma0, Bme0, Bmi0, Bmo0, Bmu0; \ + UINT32 Bma1, Bme1, Bmi1, Bmo1, Bmu1; \ + UINT32 Bsa0, Bse0, Bsi0, Bso0, Bsu0; \ + UINT32 Bsa1, Bse1, Bsi1, Bso1, Bsu1; \ + UINT32 Ca0, Ce0, Ci0, Co0, Cu0; \ + UINT32 Ca1, Ce1, Ci1, Co1, Cu1; \ + UINT32 Da0, De0, Di0, Do0, Du0; \ + UINT32 Da1, De1, Di1, Do1, Du1; \ + UINT32 Eba0, Ebe0, Ebi0, Ebo0, Ebu0; \ + UINT32 Eba1, Ebe1, Ebi1, Ebo1, Ebu1; \ + UINT32 Ega0, Ege0, Egi0, Ego0, Egu0; \ + UINT32 Ega1, Ege1, Egi1, Ego1, Egu1; \ + UINT32 Eka0, Eke0, Eki0, Eko0, Eku0; \ + UINT32 Eka1, Eke1, Eki1, Eko1, Eku1; \ + UINT32 Ema0, Eme0, Emi0, Emo0, Emu0; \ + UINT32 Ema1, Eme1, Emi1, Emo1, Emu1; \ + UINT32 Esa0, Ese0, Esi0, Eso0, Esu0; \ + UINT32 Esa1, Ese1, Esi1, Eso1, Esu1; \ + +#define prepareTheta \ + Ca0 = Aba0^Aga0^Aka0^Ama0^Asa0; \ + Ca1 = Aba1^Aga1^Aka1^Ama1^Asa1; \ + Ce0 = Abe0^Age0^Ake0^Ame0^Ase0; \ + Ce1 = Abe1^Age1^Ake1^Ame1^Ase1; \ + Ci0 = Abi0^Agi0^Aki0^Ami0^Asi0; \ + Ci1 = Abi1^Agi1^Aki1^Ami1^Asi1; \ + Co0 = Abo0^Ago0^Ako0^Amo0^Aso0; \ + Co1 = Abo1^Ago1^Ako1^Amo1^Aso1; \ + Cu0 = Abu0^Agu0^Aku0^Amu0^Asu0; \ + Cu1 = Abu1^Agu1^Aku1^Amu1^Asu1; \ + +#ifdef UseBebigokimisa +/* --- Code for round, with prepare-theta (lane complementing pattern 'bebigokimisa') */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + E##ba0 = Bba0 ^( Bbe0 | Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + Ca0 = E##ba0; \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + E##be0 = Bbe0 ^((~Bbi0)| Bbo0 ); \ + Ce0 = E##be0; \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##bi0 = Bbi0 ^( Bbo0 & Bbu0 ); \ + Ci0 = E##bi0; \ + E##bo0 = Bbo0 ^( Bbu0 | Bba0 ); \ + Co0 = E##bo0; \ + E##bu0 = Bbu0 ^( Bba0 & Bbe0 ); \ + Cu0 = E##bu0; \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + E##ba1 = Bba1 ^( Bbe1 | Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + Ca1 = E##ba1; \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + E##be1 = Bbe1 ^((~Bbi1)| Bbo1 ); \ + Ce1 = E##be1; \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##bi1 = Bbi1 ^( Bbo1 & Bbu1 ); \ + Ci1 = E##bi1; \ + E##bo1 = Bbo1 ^( Bbu1 | Bba1 ); \ + Co1 = E##bo1; \ + E##bu1 = Bbu1 ^( Bba1 & Bbe1 ); \ + Cu1 = E##bu1; \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + E##ga0 = Bga0 ^( Bge0 | Bgi0 ); \ + Ca0 ^= E##ga0; \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + E##ge0 = Bge0 ^( Bgi0 & Bgo0 ); \ + Ce0 ^= E##ge0; \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##gi0 = Bgi0 ^( Bgo0 |(~Bgu0)); \ + Ci0 ^= E##gi0; \ + E##go0 = Bgo0 ^( Bgu0 | Bga0 ); \ + Co0 ^= E##go0; \ + E##gu0 = Bgu0 ^( Bga0 & Bge0 ); \ + Cu0 ^= E##gu0; \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + E##ga1 = Bga1 ^( Bge1 | Bgi1 ); \ + Ca1 ^= E##ga1; \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + E##ge1 = Bge1 ^( Bgi1 & Bgo1 ); \ + Ce1 ^= E##ge1; \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##gi1 = Bgi1 ^( Bgo1 |(~Bgu1)); \ + Ci1 ^= E##gi1; \ + E##go1 = Bgo1 ^( Bgu1 | Bga1 ); \ + Co1 ^= E##go1; \ + E##gu1 = Bgu1 ^( Bga1 & Bge1 ); \ + Cu1 ^= E##gu1; \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + E##ka0 = Bka0 ^( Bke0 | Bki0 ); \ + Ca0 ^= E##ka0; \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + E##ke0 = Bke0 ^( Bki0 & Bko0 ); \ + Ce0 ^= E##ke0; \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + Ci0 ^= E##ki0; \ + E##ko0 = (~Bko0)^( Bku0 | Bka0 ); \ + Co0 ^= E##ko0; \ + E##ku0 = Bku0 ^( Bka0 & Bke0 ); \ + Cu0 ^= E##ku0; \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + E##ka1 = Bka1 ^( Bke1 | Bki1 ); \ + Ca1 ^= E##ka1; \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + E##ke1 = Bke1 ^( Bki1 & Bko1 ); \ + Ce1 ^= E##ke1; \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + Ci1 ^= E##ki1; \ + E##ko1 = (~Bko1)^( Bku1 | Bka1 ); \ + Co1 ^= E##ko1; \ + E##ku1 = Bku1 ^( Bka1 & Bke1 ); \ + Cu1 ^= E##ku1; \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + E##ma0 = Bma0 ^( Bme0 & Bmi0 ); \ + Ca0 ^= E##ma0; \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + E##me0 = Bme0 ^( Bmi0 | Bmo0 ); \ + Ce0 ^= E##me0; \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##mi0 = Bmi0 ^((~Bmo0)| Bmu0 ); \ + Ci0 ^= E##mi0; \ + E##mo0 = (~Bmo0)^( Bmu0 & Bma0 ); \ + Co0 ^= E##mo0; \ + E##mu0 = Bmu0 ^( Bma0 | Bme0 ); \ + Cu0 ^= E##mu0; \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + E##ma1 = Bma1 ^( Bme1 & Bmi1 ); \ + Ca1 ^= E##ma1; \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + E##me1 = Bme1 ^( Bmi1 | Bmo1 ); \ + Ce1 ^= E##me1; \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##mi1 = Bmi1 ^((~Bmo1)| Bmu1 ); \ + Ci1 ^= E##mi1; \ + E##mo1 = (~Bmo1)^( Bmu1 & Bma1 ); \ + Co1 ^= E##mo1; \ + E##mu1 = Bmu1 ^( Bma1 | Bme1 ); \ + Cu1 ^= E##mu1; \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + Ca0 ^= E##sa0; \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + E##se0 = (~Bse0)^( Bsi0 | Bso0 ); \ + Ce0 ^= E##se0; \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##si0 = Bsi0 ^( Bso0 & Bsu0 ); \ + Ci0 ^= E##si0; \ + E##so0 = Bso0 ^( Bsu0 | Bsa0 ); \ + Co0 ^= E##so0; \ + E##su0 = Bsu0 ^( Bsa0 & Bse0 ); \ + Cu0 ^= E##su0; \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + Ca1 ^= E##sa1; \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + E##se1 = (~Bse1)^( Bsi1 | Bso1 ); \ + Ce1 ^= E##se1; \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##si1 = Bsi1 ^( Bso1 & Bsu1 ); \ + Ci1 ^= E##si1; \ + E##so1 = Bso1 ^( Bsu1 | Bsa1 ); \ + Co1 ^= E##so1; \ + E##su1 = Bsu1 ^( Bsa1 & Bse1 ); \ + Cu1 ^= E##su1; \ +\ + +/* --- Code for round (lane complementing pattern 'bebigokimisa') */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + E##ba0 = Bba0 ^( Bbe0 | Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + E##be0 = Bbe0 ^((~Bbi0)| Bbo0 ); \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##bi0 = Bbi0 ^( Bbo0 & Bbu0 ); \ + E##bo0 = Bbo0 ^( Bbu0 | Bba0 ); \ + E##bu0 = Bbu0 ^( Bba0 & Bbe0 ); \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + E##ba1 = Bba1 ^( Bbe1 | Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + E##be1 = Bbe1 ^((~Bbi1)| Bbo1 ); \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##bi1 = Bbi1 ^( Bbo1 & Bbu1 ); \ + E##bo1 = Bbo1 ^( Bbu1 | Bba1 ); \ + E##bu1 = Bbu1 ^( Bba1 & Bbe1 ); \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + E##ga0 = Bga0 ^( Bge0 | Bgi0 ); \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + E##ge0 = Bge0 ^( Bgi0 & Bgo0 ); \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##gi0 = Bgi0 ^( Bgo0 |(~Bgu0)); \ + E##go0 = Bgo0 ^( Bgu0 | Bga0 ); \ + E##gu0 = Bgu0 ^( Bga0 & Bge0 ); \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + E##ga1 = Bga1 ^( Bge1 | Bgi1 ); \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + E##ge1 = Bge1 ^( Bgi1 & Bgo1 ); \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##gi1 = Bgi1 ^( Bgo1 |(~Bgu1)); \ + E##go1 = Bgo1 ^( Bgu1 | Bga1 ); \ + E##gu1 = Bgu1 ^( Bga1 & Bge1 ); \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + E##ka0 = Bka0 ^( Bke0 | Bki0 ); \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + E##ke0 = Bke0 ^( Bki0 & Bko0 ); \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + E##ko0 = (~Bko0)^( Bku0 | Bka0 ); \ + E##ku0 = Bku0 ^( Bka0 & Bke0 ); \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + E##ka1 = Bka1 ^( Bke1 | Bki1 ); \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + E##ke1 = Bke1 ^( Bki1 & Bko1 ); \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + E##ko1 = (~Bko1)^( Bku1 | Bka1 ); \ + E##ku1 = Bku1 ^( Bka1 & Bke1 ); \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + E##ma0 = Bma0 ^( Bme0 & Bmi0 ); \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + E##me0 = Bme0 ^( Bmi0 | Bmo0 ); \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##mi0 = Bmi0 ^((~Bmo0)| Bmu0 ); \ + E##mo0 = (~Bmo0)^( Bmu0 & Bma0 ); \ + E##mu0 = Bmu0 ^( Bma0 | Bme0 ); \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + E##ma1 = Bma1 ^( Bme1 & Bmi1 ); \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + E##me1 = Bme1 ^( Bmi1 | Bmo1 ); \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##mi1 = Bmi1 ^((~Bmo1)| Bmu1 ); \ + E##mo1 = (~Bmo1)^( Bmu1 & Bma1 ); \ + E##mu1 = Bmu1 ^( Bma1 | Bme1 ); \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + E##se0 = (~Bse0)^( Bsi0 | Bso0 ); \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##si0 = Bsi0 ^( Bso0 & Bsu0 ); \ + E##so0 = Bso0 ^( Bsu0 | Bsa0 ); \ + E##su0 = Bsu0 ^( Bsa0 & Bse0 ); \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + E##se1 = (~Bse1)^( Bsi1 | Bso1 ); \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##si1 = Bsi1 ^( Bso1 & Bsu1 ); \ + E##so1 = Bso1 ^( Bsu1 | Bsa1 ); \ + E##su1 = Bsu1 ^( Bsa1 & Bse1 ); \ +\ + +#else /* UseBebigokimisa */ +/* --- Code for round, with prepare-theta */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + E##ba0 = Bba0 ^((~Bbe0)& Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + Ca0 = E##ba0; \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + E##be0 = Bbe0 ^((~Bbi0)& Bbo0 ); \ + Ce0 = E##be0; \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##bi0 = Bbi0 ^((~Bbo0)& Bbu0 ); \ + Ci0 = E##bi0; \ + E##bo0 = Bbo0 ^((~Bbu0)& Bba0 ); \ + Co0 = E##bo0; \ + E##bu0 = Bbu0 ^((~Bba0)& Bbe0 ); \ + Cu0 = E##bu0; \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + E##ba1 = Bba1 ^((~Bbe1)& Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + Ca1 = E##ba1; \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + E##be1 = Bbe1 ^((~Bbi1)& Bbo1 ); \ + Ce1 = E##be1; \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##bi1 = Bbi1 ^((~Bbo1)& Bbu1 ); \ + Ci1 = E##bi1; \ + E##bo1 = Bbo1 ^((~Bbu1)& Bba1 ); \ + Co1 = E##bo1; \ + E##bu1 = Bbu1 ^((~Bba1)& Bbe1 ); \ + Cu1 = E##bu1; \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + E##ga0 = Bga0 ^((~Bge0)& Bgi0 ); \ + Ca0 ^= E##ga0; \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + E##ge0 = Bge0 ^((~Bgi0)& Bgo0 ); \ + Ce0 ^= E##ge0; \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##gi0 = Bgi0 ^((~Bgo0)& Bgu0 ); \ + Ci0 ^= E##gi0; \ + E##go0 = Bgo0 ^((~Bgu0)& Bga0 ); \ + Co0 ^= E##go0; \ + E##gu0 = Bgu0 ^((~Bga0)& Bge0 ); \ + Cu0 ^= E##gu0; \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + E##ga1 = Bga1 ^((~Bge1)& Bgi1 ); \ + Ca1 ^= E##ga1; \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + E##ge1 = Bge1 ^((~Bgi1)& Bgo1 ); \ + Ce1 ^= E##ge1; \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##gi1 = Bgi1 ^((~Bgo1)& Bgu1 ); \ + Ci1 ^= E##gi1; \ + E##go1 = Bgo1 ^((~Bgu1)& Bga1 ); \ + Co1 ^= E##go1; \ + E##gu1 = Bgu1 ^((~Bga1)& Bge1 ); \ + Cu1 ^= E##gu1; \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + E##ka0 = Bka0 ^((~Bke0)& Bki0 ); \ + Ca0 ^= E##ka0; \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + E##ke0 = Bke0 ^((~Bki0)& Bko0 ); \ + Ce0 ^= E##ke0; \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + Ci0 ^= E##ki0; \ + E##ko0 = Bko0 ^((~Bku0)& Bka0 ); \ + Co0 ^= E##ko0; \ + E##ku0 = Bku0 ^((~Bka0)& Bke0 ); \ + Cu0 ^= E##ku0; \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + E##ka1 = Bka1 ^((~Bke1)& Bki1 ); \ + Ca1 ^= E##ka1; \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + E##ke1 = Bke1 ^((~Bki1)& Bko1 ); \ + Ce1 ^= E##ke1; \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + Ci1 ^= E##ki1; \ + E##ko1 = Bko1 ^((~Bku1)& Bka1 ); \ + Co1 ^= E##ko1; \ + E##ku1 = Bku1 ^((~Bka1)& Bke1 ); \ + Cu1 ^= E##ku1; \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + E##ma0 = Bma0 ^((~Bme0)& Bmi0 ); \ + Ca0 ^= E##ma0; \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + E##me0 = Bme0 ^((~Bmi0)& Bmo0 ); \ + Ce0 ^= E##me0; \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##mi0 = Bmi0 ^((~Bmo0)& Bmu0 ); \ + Ci0 ^= E##mi0; \ + E##mo0 = Bmo0 ^((~Bmu0)& Bma0 ); \ + Co0 ^= E##mo0; \ + E##mu0 = Bmu0 ^((~Bma0)& Bme0 ); \ + Cu0 ^= E##mu0; \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + E##ma1 = Bma1 ^((~Bme1)& Bmi1 ); \ + Ca1 ^= E##ma1; \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + E##me1 = Bme1 ^((~Bmi1)& Bmo1 ); \ + Ce1 ^= E##me1; \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##mi1 = Bmi1 ^((~Bmo1)& Bmu1 ); \ + Ci1 ^= E##mi1; \ + E##mo1 = Bmo1 ^((~Bmu1)& Bma1 ); \ + Co1 ^= E##mo1; \ + E##mu1 = Bmu1 ^((~Bma1)& Bme1 ); \ + Cu1 ^= E##mu1; \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + Ca0 ^= E##sa0; \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + E##se0 = Bse0 ^((~Bsi0)& Bso0 ); \ + Ce0 ^= E##se0; \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##si0 = Bsi0 ^((~Bso0)& Bsu0 ); \ + Ci0 ^= E##si0; \ + E##so0 = Bso0 ^((~Bsu0)& Bsa0 ); \ + Co0 ^= E##so0; \ + E##su0 = Bsu0 ^((~Bsa0)& Bse0 ); \ + Cu0 ^= E##su0; \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + Ca1 ^= E##sa1; \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + E##se1 = Bse1 ^((~Bsi1)& Bso1 ); \ + Ce1 ^= E##se1; \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##si1 = Bsi1 ^((~Bso1)& Bsu1 ); \ + Ci1 ^= E##si1; \ + E##so1 = Bso1 ^((~Bsu1)& Bsa1 ); \ + Co1 ^= E##so1; \ + E##su1 = Bsu1 ^((~Bsa1)& Bse1 ); \ + Cu1 ^= E##su1; \ +\ + +/* --- Code for round */ +/* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da0 = Cu0^ROL32(Ce1, 1); \ + Da1 = Cu1^Ce0; \ + De0 = Ca0^ROL32(Ci1, 1); \ + De1 = Ca1^Ci0; \ + Di0 = Ce0^ROL32(Co1, 1); \ + Di1 = Ce1^Co0; \ + Do0 = Ci0^ROL32(Cu1, 1); \ + Do1 = Ci1^Cu0; \ + Du0 = Co0^ROL32(Ca1, 1); \ + Du1 = Co1^Ca0; \ +\ + A##ba0 ^= Da0; \ + Bba0 = A##ba0; \ + A##ge0 ^= De0; \ + Bbe0 = ROL32(A##ge0, 22); \ + A##ki1 ^= Di1; \ + Bbi0 = ROL32(A##ki1, 22); \ + E##ba0 = Bba0 ^((~Bbe0)& Bbi0 ); \ + E##ba0 ^= KeccakF1600RoundConstants_int2_0[i]; \ + A##mo1 ^= Do1; \ + Bbo0 = ROL32(A##mo1, 11); \ + E##be0 = Bbe0 ^((~Bbi0)& Bbo0 ); \ + A##su0 ^= Du0; \ + Bbu0 = ROL32(A##su0, 7); \ + E##bi0 = Bbi0 ^((~Bbo0)& Bbu0 ); \ + E##bo0 = Bbo0 ^((~Bbu0)& Bba0 ); \ + E##bu0 = Bbu0 ^((~Bba0)& Bbe0 ); \ +\ + A##ba1 ^= Da1; \ + Bba1 = A##ba1; \ + A##ge1 ^= De1; \ + Bbe1 = ROL32(A##ge1, 22); \ + A##ki0 ^= Di0; \ + Bbi1 = ROL32(A##ki0, 21); \ + E##ba1 = Bba1 ^((~Bbe1)& Bbi1 ); \ + E##ba1 ^= KeccakF1600RoundConstants_int2_1[i]; \ + A##mo0 ^= Do0; \ + Bbo1 = ROL32(A##mo0, 10); \ + E##be1 = Bbe1 ^((~Bbi1)& Bbo1 ); \ + A##su1 ^= Du1; \ + Bbu1 = ROL32(A##su1, 7); \ + E##bi1 = Bbi1 ^((~Bbo1)& Bbu1 ); \ + E##bo1 = Bbo1 ^((~Bbu1)& Bba1 ); \ + E##bu1 = Bbu1 ^((~Bba1)& Bbe1 ); \ +\ + A##bo0 ^= Do0; \ + Bga0 = ROL32(A##bo0, 14); \ + A##gu0 ^= Du0; \ + Bge0 = ROL32(A##gu0, 10); \ + A##ka1 ^= Da1; \ + Bgi0 = ROL32(A##ka1, 2); \ + E##ga0 = Bga0 ^((~Bge0)& Bgi0 ); \ + A##me1 ^= De1; \ + Bgo0 = ROL32(A##me1, 23); \ + E##ge0 = Bge0 ^((~Bgi0)& Bgo0 ); \ + A##si1 ^= Di1; \ + Bgu0 = ROL32(A##si1, 31); \ + E##gi0 = Bgi0 ^((~Bgo0)& Bgu0 ); \ + E##go0 = Bgo0 ^((~Bgu0)& Bga0 ); \ + E##gu0 = Bgu0 ^((~Bga0)& Bge0 ); \ +\ + A##bo1 ^= Do1; \ + Bga1 = ROL32(A##bo1, 14); \ + A##gu1 ^= Du1; \ + Bge1 = ROL32(A##gu1, 10); \ + A##ka0 ^= Da0; \ + Bgi1 = ROL32(A##ka0, 1); \ + E##ga1 = Bga1 ^((~Bge1)& Bgi1 ); \ + A##me0 ^= De0; \ + Bgo1 = ROL32(A##me0, 22); \ + E##ge1 = Bge1 ^((~Bgi1)& Bgo1 ); \ + A##si0 ^= Di0; \ + Bgu1 = ROL32(A##si0, 30); \ + E##gi1 = Bgi1 ^((~Bgo1)& Bgu1 ); \ + E##go1 = Bgo1 ^((~Bgu1)& Bga1 ); \ + E##gu1 = Bgu1 ^((~Bga1)& Bge1 ); \ +\ + A##be1 ^= De1; \ + Bka0 = ROL32(A##be1, 1); \ + A##gi0 ^= Di0; \ + Bke0 = ROL32(A##gi0, 3); \ + A##ko1 ^= Do1; \ + Bki0 = ROL32(A##ko1, 13); \ + E##ka0 = Bka0 ^((~Bke0)& Bki0 ); \ + A##mu0 ^= Du0; \ + Bko0 = ROL32(A##mu0, 4); \ + E##ke0 = Bke0 ^((~Bki0)& Bko0 ); \ + A##sa0 ^= Da0; \ + Bku0 = ROL32(A##sa0, 9); \ + E##ki0 = Bki0 ^((~Bko0)& Bku0 ); \ + E##ko0 = Bko0 ^((~Bku0)& Bka0 ); \ + E##ku0 = Bku0 ^((~Bka0)& Bke0 ); \ +\ + A##be0 ^= De0; \ + Bka1 = A##be0; \ + A##gi1 ^= Di1; \ + Bke1 = ROL32(A##gi1, 3); \ + A##ko0 ^= Do0; \ + Bki1 = ROL32(A##ko0, 12); \ + E##ka1 = Bka1 ^((~Bke1)& Bki1 ); \ + A##mu1 ^= Du1; \ + Bko1 = ROL32(A##mu1, 4); \ + E##ke1 = Bke1 ^((~Bki1)& Bko1 ); \ + A##sa1 ^= Da1; \ + Bku1 = ROL32(A##sa1, 9); \ + E##ki1 = Bki1 ^((~Bko1)& Bku1 ); \ + E##ko1 = Bko1 ^((~Bku1)& Bka1 ); \ + E##ku1 = Bku1 ^((~Bka1)& Bke1 ); \ +\ + A##bu1 ^= Du1; \ + Bma0 = ROL32(A##bu1, 14); \ + A##ga0 ^= Da0; \ + Bme0 = ROL32(A##ga0, 18); \ + A##ke0 ^= De0; \ + Bmi0 = ROL32(A##ke0, 5); \ + E##ma0 = Bma0 ^((~Bme0)& Bmi0 ); \ + A##mi1 ^= Di1; \ + Bmo0 = ROL32(A##mi1, 8); \ + E##me0 = Bme0 ^((~Bmi0)& Bmo0 ); \ + A##so0 ^= Do0; \ + Bmu0 = ROL32(A##so0, 28); \ + E##mi0 = Bmi0 ^((~Bmo0)& Bmu0 ); \ + E##mo0 = Bmo0 ^((~Bmu0)& Bma0 ); \ + E##mu0 = Bmu0 ^((~Bma0)& Bme0 ); \ +\ + A##bu0 ^= Du0; \ + Bma1 = ROL32(A##bu0, 13); \ + A##ga1 ^= Da1; \ + Bme1 = ROL32(A##ga1, 18); \ + A##ke1 ^= De1; \ + Bmi1 = ROL32(A##ke1, 5); \ + E##ma1 = Bma1 ^((~Bme1)& Bmi1 ); \ + A##mi0 ^= Di0; \ + Bmo1 = ROL32(A##mi0, 7); \ + E##me1 = Bme1 ^((~Bmi1)& Bmo1 ); \ + A##so1 ^= Do1; \ + Bmu1 = ROL32(A##so1, 28); \ + E##mi1 = Bmi1 ^((~Bmo1)& Bmu1 ); \ + E##mo1 = Bmo1 ^((~Bmu1)& Bma1 ); \ + E##mu1 = Bmu1 ^((~Bma1)& Bme1 ); \ +\ + A##bi0 ^= Di0; \ + Bsa0 = ROL32(A##bi0, 31); \ + A##go1 ^= Do1; \ + Bse0 = ROL32(A##go1, 28); \ + A##ku1 ^= Du1; \ + Bsi0 = ROL32(A##ku1, 20); \ + E##sa0 = Bsa0 ^((~Bse0)& Bsi0 ); \ + A##ma1 ^= Da1; \ + Bso0 = ROL32(A##ma1, 21); \ + E##se0 = Bse0 ^((~Bsi0)& Bso0 ); \ + A##se0 ^= De0; \ + Bsu0 = ROL32(A##se0, 1); \ + E##si0 = Bsi0 ^((~Bso0)& Bsu0 ); \ + E##so0 = Bso0 ^((~Bsu0)& Bsa0 ); \ + E##su0 = Bsu0 ^((~Bsa0)& Bse0 ); \ +\ + A##bi1 ^= Di1; \ + Bsa1 = ROL32(A##bi1, 31); \ + A##go0 ^= Do0; \ + Bse1 = ROL32(A##go0, 27); \ + A##ku0 ^= Du0; \ + Bsi1 = ROL32(A##ku0, 19); \ + E##sa1 = Bsa1 ^((~Bse1)& Bsi1 ); \ + A##ma0 ^= Da0; \ + Bso1 = ROL32(A##ma0, 20); \ + E##se1 = Bse1 ^((~Bsi1)& Bso1 ); \ + A##se1 ^= De1; \ + Bsu1 = ROL32(A##se1, 1); \ + E##si1 = Bsi1 ^((~Bso1)& Bsu1 ); \ + E##so1 = Bso1 ^((~Bsu1)& Bsa1 ); \ + E##su1 = Bsu1 ^((~Bsa1)& Bse1 ); \ +\ + +#endif /* UseBebigokimisa */ + +const UINT32 KeccakF1600RoundConstants_int2_0[24] = { + 0x00000001UL, + 0x00000000UL, + 0x00000000UL, + 0x00000000UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000000UL, + 0x00000000UL, + 0x00000001UL, + 0x00000000UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000001UL, + 0x00000000UL, + 0x00000000UL, + 0x00000000UL, + 0x00000000UL, + 0x00000001UL, + 0x00000000UL, + 0x00000001UL, + 0x00000000UL }; + +const UINT32 KeccakF1600RoundConstants_int2_1[24] = { + 0x00000000UL, + 0x00000089UL, + 0x8000008bUL, + 0x80008080UL, + 0x0000008bUL, + 0x00008000UL, + 0x80008088UL, + 0x80000082UL, + 0x0000000bUL, + 0x0000000aUL, + 0x00008082UL, + 0x00008003UL, + 0x0000808bUL, + 0x8000000bUL, + 0x8000008aUL, + 0x80000081UL, + 0x80000081UL, + 0x80000008UL, + 0x00000083UL, + 0x80008003UL, + 0x80008088UL, + 0x80000088UL, + 0x00008000UL, + 0x80008082UL }; + +#define copyFromStateAndXor1024bits(X, state, input) \ + X##ba0 = state[ 0]^input[ 0]; \ + X##ba1 = state[ 1]^input[ 1]; \ + X##be0 = state[ 2]^input[ 2]; \ + X##be1 = state[ 3]^input[ 3]; \ + X##bi0 = state[ 4]^input[ 4]; \ + X##bi1 = state[ 5]^input[ 5]; \ + X##bo0 = state[ 6]^input[ 6]; \ + X##bo1 = state[ 7]^input[ 7]; \ + X##bu0 = state[ 8]^input[ 8]; \ + X##bu1 = state[ 9]^input[ 9]; \ + X##ga0 = state[10]^input[10]; \ + X##ga1 = state[11]^input[11]; \ + X##ge0 = state[12]^input[12]; \ + X##ge1 = state[13]^input[13]; \ + X##gi0 = state[14]^input[14]; \ + X##gi1 = state[15]^input[15]; \ + X##go0 = state[16]^input[16]; \ + X##go1 = state[17]^input[17]; \ + X##gu0 = state[18]^input[18]; \ + X##gu1 = state[19]^input[19]; \ + X##ka0 = state[20]^input[20]; \ + X##ka1 = state[21]^input[21]; \ + X##ke0 = state[22]^input[22]; \ + X##ke1 = state[23]^input[23]; \ + X##ki0 = state[24]^input[24]; \ + X##ki1 = state[25]^input[25]; \ + X##ko0 = state[26]^input[26]; \ + X##ko1 = state[27]^input[27]; \ + X##ku0 = state[28]^input[28]; \ + X##ku1 = state[29]^input[29]; \ + X##ma0 = state[30]^input[30]; \ + X##ma1 = state[31]^input[31]; \ + X##me0 = state[32]; \ + X##me1 = state[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyFromStateAndXor1088bits(X, state, input) \ + X##ba0 = state[ 0]^input[ 0]; \ + X##ba1 = state[ 1]^input[ 1]; \ + X##be0 = state[ 2]^input[ 2]; \ + X##be1 = state[ 3]^input[ 3]; \ + X##bi0 = state[ 4]^input[ 4]; \ + X##bi1 = state[ 5]^input[ 5]; \ + X##bo0 = state[ 6]^input[ 6]; \ + X##bo1 = state[ 7]^input[ 7]; \ + X##bu0 = state[ 8]^input[ 8]; \ + X##bu1 = state[ 9]^input[ 9]; \ + X##ga0 = state[10]^input[10]; \ + X##ga1 = state[11]^input[11]; \ + X##ge0 = state[12]^input[12]; \ + X##ge1 = state[13]^input[13]; \ + X##gi0 = state[14]^input[14]; \ + X##gi1 = state[15]^input[15]; \ + X##go0 = state[16]^input[16]; \ + X##go1 = state[17]^input[17]; \ + X##gu0 = state[18]^input[18]; \ + X##gu1 = state[19]^input[19]; \ + X##ka0 = state[20]^input[20]; \ + X##ka1 = state[21]^input[21]; \ + X##ke0 = state[22]^input[22]; \ + X##ke1 = state[23]^input[23]; \ + X##ki0 = state[24]^input[24]; \ + X##ki1 = state[25]^input[25]; \ + X##ko0 = state[26]^input[26]; \ + X##ko1 = state[27]^input[27]; \ + X##ku0 = state[28]^input[28]; \ + X##ku1 = state[29]^input[29]; \ + X##ma0 = state[30]^input[30]; \ + X##ma1 = state[31]^input[31]; \ + X##me0 = state[32]^input[32]; \ + X##me1 = state[33]^input[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyFromState(X, state) \ + X##ba0 = state[ 0]; \ + X##ba1 = state[ 1]; \ + X##be0 = state[ 2]; \ + X##be1 = state[ 3]; \ + X##bi0 = state[ 4]; \ + X##bi1 = state[ 5]; \ + X##bo0 = state[ 6]; \ + X##bo1 = state[ 7]; \ + X##bu0 = state[ 8]; \ + X##bu1 = state[ 9]; \ + X##ga0 = state[10]; \ + X##ga1 = state[11]; \ + X##ge0 = state[12]; \ + X##ge1 = state[13]; \ + X##gi0 = state[14]; \ + X##gi1 = state[15]; \ + X##go0 = state[16]; \ + X##go1 = state[17]; \ + X##gu0 = state[18]; \ + X##gu1 = state[19]; \ + X##ka0 = state[20]; \ + X##ka1 = state[21]; \ + X##ke0 = state[22]; \ + X##ke1 = state[23]; \ + X##ki0 = state[24]; \ + X##ki1 = state[25]; \ + X##ko0 = state[26]; \ + X##ko1 = state[27]; \ + X##ku0 = state[28]; \ + X##ku1 = state[29]; \ + X##ma0 = state[30]; \ + X##ma1 = state[31]; \ + X##me0 = state[32]; \ + X##me1 = state[33]; \ + X##mi0 = state[34]; \ + X##mi1 = state[35]; \ + X##mo0 = state[36]; \ + X##mo1 = state[37]; \ + X##mu0 = state[38]; \ + X##mu1 = state[39]; \ + X##sa0 = state[40]; \ + X##sa1 = state[41]; \ + X##se0 = state[42]; \ + X##se1 = state[43]; \ + X##si0 = state[44]; \ + X##si1 = state[45]; \ + X##so0 = state[46]; \ + X##so1 = state[47]; \ + X##su0 = state[48]; \ + X##su1 = state[49]; \ + +#define copyToState(state, X) \ + state[ 0] = X##ba0; \ + state[ 1] = X##ba1; \ + state[ 2] = X##be0; \ + state[ 3] = X##be1; \ + state[ 4] = X##bi0; \ + state[ 5] = X##bi1; \ + state[ 6] = X##bo0; \ + state[ 7] = X##bo1; \ + state[ 8] = X##bu0; \ + state[ 9] = X##bu1; \ + state[10] = X##ga0; \ + state[11] = X##ga1; \ + state[12] = X##ge0; \ + state[13] = X##ge1; \ + state[14] = X##gi0; \ + state[15] = X##gi1; \ + state[16] = X##go0; \ + state[17] = X##go1; \ + state[18] = X##gu0; \ + state[19] = X##gu1; \ + state[20] = X##ka0; \ + state[21] = X##ka1; \ + state[22] = X##ke0; \ + state[23] = X##ke1; \ + state[24] = X##ki0; \ + state[25] = X##ki1; \ + state[26] = X##ko0; \ + state[27] = X##ko1; \ + state[28] = X##ku0; \ + state[29] = X##ku1; \ + state[30] = X##ma0; \ + state[31] = X##ma1; \ + state[32] = X##me0; \ + state[33] = X##me1; \ + state[34] = X##mi0; \ + state[35] = X##mi1; \ + state[36] = X##mo0; \ + state[37] = X##mo1; \ + state[38] = X##mu0; \ + state[39] = X##mu1; \ + state[40] = X##sa0; \ + state[41] = X##sa1; \ + state[42] = X##se0; \ + state[43] = X##se1; \ + state[44] = X##si0; \ + state[45] = X##si1; \ + state[46] = X##so0; \ + state[47] = X##so1; \ + state[48] = X##su0; \ + state[49] = X##su1; \ + +#define copyStateVariables(X, Y) \ + X##ba0 = Y##ba0; \ + X##ba1 = Y##ba1; \ + X##be0 = Y##be0; \ + X##be1 = Y##be1; \ + X##bi0 = Y##bi0; \ + X##bi1 = Y##bi1; \ + X##bo0 = Y##bo0; \ + X##bo1 = Y##bo1; \ + X##bu0 = Y##bu0; \ + X##bu1 = Y##bu1; \ + X##ga0 = Y##ga0; \ + X##ga1 = Y##ga1; \ + X##ge0 = Y##ge0; \ + X##ge1 = Y##ge1; \ + X##gi0 = Y##gi0; \ + X##gi1 = Y##gi1; \ + X##go0 = Y##go0; \ + X##go1 = Y##go1; \ + X##gu0 = Y##gu0; \ + X##gu1 = Y##gu1; \ + X##ka0 = Y##ka0; \ + X##ka1 = Y##ka1; \ + X##ke0 = Y##ke0; \ + X##ke1 = Y##ke1; \ + X##ki0 = Y##ki0; \ + X##ki1 = Y##ki1; \ + X##ko0 = Y##ko0; \ + X##ko1 = Y##ko1; \ + X##ku0 = Y##ku0; \ + X##ku1 = Y##ku1; \ + X##ma0 = Y##ma0; \ + X##ma1 = Y##ma1; \ + X##me0 = Y##me0; \ + X##me1 = Y##me1; \ + X##mi0 = Y##mi0; \ + X##mi1 = Y##mi1; \ + X##mo0 = Y##mo0; \ + X##mo1 = Y##mo1; \ + X##mu0 = Y##mu0; \ + X##mu1 = Y##mu1; \ + X##sa0 = Y##sa0; \ + X##sa1 = Y##sa1; \ + X##se0 = Y##se0; \ + X##se1 = Y##se1; \ + X##si0 = Y##si0; \ + X##si1 = Y##si1; \ + X##so0 = Y##so0; \ + X##so1 = Y##so1; \ + X##su0 = Y##su0; \ + X##su1 = Y##su1; \ + diff --git a/Modules/_sha3/keccak/KeccakF-1600-32.macros b/Modules/_sha3/keccak/KeccakF-1600-32.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-32.macros @@ -0,0 +1,26 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifdef UseSchedule + #if (UseSchedule == 1) + #include "KeccakF-1600-32-s1.macros" + #elif (UseSchedule == 2) + #include "KeccakF-1600-32-s2.macros" + #elif (UseSchedule == 3) + #include "KeccakF-1600-32-rvk.macros" + #else + #error "This schedule is not supported." + #endif +#else + #include "KeccakF-1600-32-s1.macros" +#endif diff --git a/Modules/_sha3/keccak/KeccakF-1600-64.macros b/Modules/_sha3/keccak/KeccakF-1600-64.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-64.macros @@ -0,0 +1,728 @@ +/* +Code automatically generated by KeccakTools! + +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + UINT64 Aba, Abe, Abi, Abo, Abu; \ + UINT64 Aga, Age, Agi, Ago, Agu; \ + UINT64 Aka, Ake, Aki, Ako, Aku; \ + UINT64 Ama, Ame, Ami, Amo, Amu; \ + UINT64 Asa, Ase, Asi, Aso, Asu; \ + UINT64 Bba, Bbe, Bbi, Bbo, Bbu; \ + UINT64 Bga, Bge, Bgi, Bgo, Bgu; \ + UINT64 Bka, Bke, Bki, Bko, Bku; \ + UINT64 Bma, Bme, Bmi, Bmo, Bmu; \ + UINT64 Bsa, Bse, Bsi, Bso, Bsu; \ + UINT64 Ca, Ce, Ci, Co, Cu; \ + UINT64 Da, De, Di, Do, Du; \ + UINT64 Eba, Ebe, Ebi, Ebo, Ebu; \ + UINT64 Ega, Ege, Egi, Ego, Egu; \ + UINT64 Eka, Eke, Eki, Eko, Eku; \ + UINT64 Ema, Eme, Emi, Emo, Emu; \ + UINT64 Esa, Ese, Esi, Eso, Esu; \ + +#define prepareTheta \ + Ca = Aba^Aga^Aka^Ama^Asa; \ + Ce = Abe^Age^Ake^Ame^Ase; \ + Ci = Abi^Agi^Aki^Ami^Asi; \ + Co = Abo^Ago^Ako^Amo^Aso; \ + Cu = Abu^Agu^Aku^Amu^Asu; \ + +#ifdef UseBebigokimisa +/* --- Code for round, with prepare-theta (lane complementing pattern 'bebigokimisa') */ +/* --- 64-bit lanes mapped to 64-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^( Bbe | Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + Ca = E##ba; \ + E##be = Bbe ^((~Bbi)| Bbo ); \ + Ce = E##be; \ + E##bi = Bbi ^( Bbo & Bbu ); \ + Ci = E##bi; \ + E##bo = Bbo ^( Bbu | Bba ); \ + Co = E##bo; \ + E##bu = Bbu ^( Bba & Bbe ); \ + Cu = E##bu; \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^( Bge | Bgi ); \ + Ca ^= E##ga; \ + E##ge = Bge ^( Bgi & Bgo ); \ + Ce ^= E##ge; \ + E##gi = Bgi ^( Bgo |(~Bgu)); \ + Ci ^= E##gi; \ + E##go = Bgo ^( Bgu | Bga ); \ + Co ^= E##go; \ + E##gu = Bgu ^( Bga & Bge ); \ + Cu ^= E##gu; \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^( Bke | Bki ); \ + Ca ^= E##ka; \ + E##ke = Bke ^( Bki & Bko ); \ + Ce ^= E##ke; \ + E##ki = Bki ^((~Bko)& Bku ); \ + Ci ^= E##ki; \ + E##ko = (~Bko)^( Bku | Bka ); \ + Co ^= E##ko; \ + E##ku = Bku ^( Bka & Bke ); \ + Cu ^= E##ku; \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^( Bme & Bmi ); \ + Ca ^= E##ma; \ + E##me = Bme ^( Bmi | Bmo ); \ + Ce ^= E##me; \ + E##mi = Bmi ^((~Bmo)| Bmu ); \ + Ci ^= E##mi; \ + E##mo = (~Bmo)^( Bmu & Bma ); \ + Co ^= E##mo; \ + E##mu = Bmu ^( Bma | Bme ); \ + Cu ^= E##mu; \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + Ca ^= E##sa; \ + E##se = (~Bse)^( Bsi | Bso ); \ + Ce ^= E##se; \ + E##si = Bsi ^( Bso & Bsu ); \ + Ci ^= E##si; \ + E##so = Bso ^( Bsu | Bsa ); \ + Co ^= E##so; \ + E##su = Bsu ^( Bsa & Bse ); \ + Cu ^= E##su; \ +\ + +/* --- Code for round (lane complementing pattern 'bebigokimisa') */ +/* --- 64-bit lanes mapped to 64-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^( Bbe | Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + E##be = Bbe ^((~Bbi)| Bbo ); \ + E##bi = Bbi ^( Bbo & Bbu ); \ + E##bo = Bbo ^( Bbu | Bba ); \ + E##bu = Bbu ^( Bba & Bbe ); \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^( Bge | Bgi ); \ + E##ge = Bge ^( Bgi & Bgo ); \ + E##gi = Bgi ^( Bgo |(~Bgu)); \ + E##go = Bgo ^( Bgu | Bga ); \ + E##gu = Bgu ^( Bga & Bge ); \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^( Bke | Bki ); \ + E##ke = Bke ^( Bki & Bko ); \ + E##ki = Bki ^((~Bko)& Bku ); \ + E##ko = (~Bko)^( Bku | Bka ); \ + E##ku = Bku ^( Bka & Bke ); \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^( Bme & Bmi ); \ + E##me = Bme ^( Bmi | Bmo ); \ + E##mi = Bmi ^((~Bmo)| Bmu ); \ + E##mo = (~Bmo)^( Bmu & Bma ); \ + E##mu = Bmu ^( Bma | Bme ); \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + E##se = (~Bse)^( Bsi | Bso ); \ + E##si = Bsi ^( Bso & Bsu ); \ + E##so = Bso ^( Bsu | Bsa ); \ + E##su = Bsu ^( Bsa & Bse ); \ +\ + +#else /* UseBebigokimisa */ +/* --- Code for round, with prepare-theta */ +/* --- 64-bit lanes mapped to 64-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^((~Bbe)& Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + Ca = E##ba; \ + E##be = Bbe ^((~Bbi)& Bbo ); \ + Ce = E##be; \ + E##bi = Bbi ^((~Bbo)& Bbu ); \ + Ci = E##bi; \ + E##bo = Bbo ^((~Bbu)& Bba ); \ + Co = E##bo; \ + E##bu = Bbu ^((~Bba)& Bbe ); \ + Cu = E##bu; \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^((~Bge)& Bgi ); \ + Ca ^= E##ga; \ + E##ge = Bge ^((~Bgi)& Bgo ); \ + Ce ^= E##ge; \ + E##gi = Bgi ^((~Bgo)& Bgu ); \ + Ci ^= E##gi; \ + E##go = Bgo ^((~Bgu)& Bga ); \ + Co ^= E##go; \ + E##gu = Bgu ^((~Bga)& Bge ); \ + Cu ^= E##gu; \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^((~Bke)& Bki ); \ + Ca ^= E##ka; \ + E##ke = Bke ^((~Bki)& Bko ); \ + Ce ^= E##ke; \ + E##ki = Bki ^((~Bko)& Bku ); \ + Ci ^= E##ki; \ + E##ko = Bko ^((~Bku)& Bka ); \ + Co ^= E##ko; \ + E##ku = Bku ^((~Bka)& Bke ); \ + Cu ^= E##ku; \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^((~Bme)& Bmi ); \ + Ca ^= E##ma; \ + E##me = Bme ^((~Bmi)& Bmo ); \ + Ce ^= E##me; \ + E##mi = Bmi ^((~Bmo)& Bmu ); \ + Ci ^= E##mi; \ + E##mo = Bmo ^((~Bmu)& Bma ); \ + Co ^= E##mo; \ + E##mu = Bmu ^((~Bma)& Bme ); \ + Cu ^= E##mu; \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + Ca ^= E##sa; \ + E##se = Bse ^((~Bsi)& Bso ); \ + Ce ^= E##se; \ + E##si = Bsi ^((~Bso)& Bsu ); \ + Ci ^= E##si; \ + E##so = Bso ^((~Bsu)& Bsa ); \ + Co ^= E##so; \ + E##su = Bsu ^((~Bsa)& Bse ); \ + Cu ^= E##su; \ +\ + +/* --- Code for round */ +/* --- 64-bit lanes mapped to 64-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^((~Bbe)& Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + E##be = Bbe ^((~Bbi)& Bbo ); \ + E##bi = Bbi ^((~Bbo)& Bbu ); \ + E##bo = Bbo ^((~Bbu)& Bba ); \ + E##bu = Bbu ^((~Bba)& Bbe ); \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^((~Bge)& Bgi ); \ + E##ge = Bge ^((~Bgi)& Bgo ); \ + E##gi = Bgi ^((~Bgo)& Bgu ); \ + E##go = Bgo ^((~Bgu)& Bga ); \ + E##gu = Bgu ^((~Bga)& Bge ); \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^((~Bke)& Bki ); \ + E##ke = Bke ^((~Bki)& Bko ); \ + E##ki = Bki ^((~Bko)& Bku ); \ + E##ko = Bko ^((~Bku)& Bka ); \ + E##ku = Bku ^((~Bka)& Bke ); \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^((~Bme)& Bmi ); \ + E##me = Bme ^((~Bmi)& Bmo ); \ + E##mi = Bmi ^((~Bmo)& Bmu ); \ + E##mo = Bmo ^((~Bmu)& Bma ); \ + E##mu = Bmu ^((~Bma)& Bme ); \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + E##se = Bse ^((~Bsi)& Bso ); \ + E##si = Bsi ^((~Bso)& Bsu ); \ + E##so = Bso ^((~Bsu)& Bsa ); \ + E##su = Bsu ^((~Bsa)& Bse ); \ +\ + +#endif /* UseBebigokimisa */ + +static const UINT64 KeccakF1600RoundConstants[24] = { + 0x0000000000000001ULL, + 0x0000000000008082ULL, + 0x800000000000808aULL, + 0x8000000080008000ULL, + 0x000000000000808bULL, + 0x0000000080000001ULL, + 0x8000000080008081ULL, + 0x8000000000008009ULL, + 0x000000000000008aULL, + 0x0000000000000088ULL, + 0x0000000080008009ULL, + 0x000000008000000aULL, + 0x000000008000808bULL, + 0x800000000000008bULL, + 0x8000000000008089ULL, + 0x8000000000008003ULL, + 0x8000000000008002ULL, + 0x8000000000000080ULL, + 0x000000000000800aULL, + 0x800000008000000aULL, + 0x8000000080008081ULL, + 0x8000000000008080ULL, + 0x0000000080000001ULL, + 0x8000000080008008ULL }; + +#define copyFromStateAndXor576bits(X, state, input) \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]; \ + X##ka = state[10]; \ + X##ke = state[11]; \ + X##ki = state[12]; \ + X##ko = state[13]; \ + X##ku = state[14]; \ + X##ma = state[15]; \ + X##me = state[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyFromStateAndXor832bits(X, state, input) \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]; \ + X##ku = state[14]; \ + X##ma = state[15]; \ + X##me = state[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyFromStateAndXor1024bits(X, state, input) \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]^input[13]; \ + X##ku = state[14]^input[14]; \ + X##ma = state[15]^input[15]; \ + X##me = state[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyFromStateAndXor1088bits(X, state, input) \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]^input[13]; \ + X##ku = state[14]^input[14]; \ + X##ma = state[15]^input[15]; \ + X##me = state[16]^input[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyFromStateAndXor1152bits(X, state, input) \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]^input[13]; \ + X##ku = state[14]^input[14]; \ + X##ma = state[15]^input[15]; \ + X##me = state[16]^input[16]; \ + X##mi = state[17]^input[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyFromStateAndXor1344bits(X, state, input) \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]^input[13]; \ + X##ku = state[14]^input[14]; \ + X##ma = state[15]^input[15]; \ + X##me = state[16]^input[16]; \ + X##mi = state[17]^input[17]; \ + X##mo = state[18]^input[18]; \ + X##mu = state[19]^input[19]; \ + X##sa = state[20]^input[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyFromState(X, state) \ + X##ba = state[ 0]; \ + X##be = state[ 1]; \ + X##bi = state[ 2]; \ + X##bo = state[ 3]; \ + X##bu = state[ 4]; \ + X##ga = state[ 5]; \ + X##ge = state[ 6]; \ + X##gi = state[ 7]; \ + X##go = state[ 8]; \ + X##gu = state[ 9]; \ + X##ka = state[10]; \ + X##ke = state[11]; \ + X##ki = state[12]; \ + X##ko = state[13]; \ + X##ku = state[14]; \ + X##ma = state[15]; \ + X##me = state[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyToState(state, X) \ + state[ 0] = X##ba; \ + state[ 1] = X##be; \ + state[ 2] = X##bi; \ + state[ 3] = X##bo; \ + state[ 4] = X##bu; \ + state[ 5] = X##ga; \ + state[ 6] = X##ge; \ + state[ 7] = X##gi; \ + state[ 8] = X##go; \ + state[ 9] = X##gu; \ + state[10] = X##ka; \ + state[11] = X##ke; \ + state[12] = X##ki; \ + state[13] = X##ko; \ + state[14] = X##ku; \ + state[15] = X##ma; \ + state[16] = X##me; \ + state[17] = X##mi; \ + state[18] = X##mo; \ + state[19] = X##mu; \ + state[20] = X##sa; \ + state[21] = X##se; \ + state[22] = X##si; \ + state[23] = X##so; \ + state[24] = X##su; \ + +#define copyStateVariables(X, Y) \ + X##ba = Y##ba; \ + X##be = Y##be; \ + X##bi = Y##bi; \ + X##bo = Y##bo; \ + X##bu = Y##bu; \ + X##ga = Y##ga; \ + X##ge = Y##ge; \ + X##gi = Y##gi; \ + X##go = Y##go; \ + X##gu = Y##gu; \ + X##ka = Y##ka; \ + X##ke = Y##ke; \ + X##ki = Y##ki; \ + X##ko = Y##ko; \ + X##ku = Y##ku; \ + X##ma = Y##ma; \ + X##me = Y##me; \ + X##mi = Y##mi; \ + X##mo = Y##mo; \ + X##mu = Y##mu; \ + X##sa = Y##sa; \ + X##se = Y##se; \ + X##si = Y##si; \ + X##so = Y##so; \ + X##su = Y##su; \ + diff --git a/Modules/_sha3/keccak/KeccakF-1600-int-set.h b/Modules/_sha3/keccak/KeccakF-1600-int-set.h new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-int-set.h @@ -0,0 +1,6 @@ +#define ProvideFast576 +#define ProvideFast832 +#define ProvideFast1024 +#define ProvideFast1088 +#define ProvideFast1152 +#define ProvideFast1344 diff --git a/Modules/_sha3/keccak/KeccakF-1600-interface.h b/Modules/_sha3/keccak/KeccakF-1600-interface.h new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-interface.h @@ -0,0 +1,46 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakPermutationInterface_h_ +#define _KeccakPermutationInterface_h_ + +#include "KeccakF-1600-int-set.h" + +static void KeccakInitialize( void ); +static void KeccakInitializeState(unsigned char *state); +static void KeccakPermutation(unsigned char *state); +#ifdef ProvideFast576 +static void KeccakAbsorb576bits(unsigned char *state, const unsigned char *data); +#endif +#ifdef ProvideFast832 +static void KeccakAbsorb832bits(unsigned char *state, const unsigned char *data); +#endif +#ifdef ProvideFast1024 +static void KeccakAbsorb1024bits(unsigned char *state, const unsigned char *data); +#endif +#ifdef ProvideFast1088 +static void KeccakAbsorb1088bits(unsigned char *state, const unsigned char *data); +#endif +#ifdef ProvideFast1152 +static void KeccakAbsorb1152bits(unsigned char *state, const unsigned char *data); +#endif +#ifdef ProvideFast1344 +static void KeccakAbsorb1344bits(unsigned char *state, const unsigned char *data); +#endif +static void KeccakAbsorb(unsigned char *state, const unsigned char *data, unsigned int laneCount); +#ifdef ProvideFast1024 +static void KeccakExtract1024bits(const unsigned char *state, unsigned char *data); +#endif +static void KeccakExtract(const unsigned char *state, unsigned char *data, unsigned int laneCount); + +#endif diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt32-settings.h b/Modules/_sha3/keccak/KeccakF-1600-opt32-settings.h new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-opt32-settings.h @@ -0,0 +1,6 @@ +/* +#define Unrolling 2 +#define UseBebigokimisa +#define UseInterleaveTables +#define UseSchedule 3 +*/ diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt32.c b/Modules/_sha3/keccak/KeccakF-1600-opt32.c new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-opt32.c @@ -0,0 +1,524 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +/* #include "brg_endian.h" */ +#include "KeccakF-1600-opt32-settings.h" +#include "KeccakF-1600-interface.h" + +typedef unsigned char UINT8; +typedef unsigned short UINT16; +typedef unsigned int UINT32; +/* typedef unsigned long long int UINT64; */ + +#ifdef UseInterleaveTables +static int interleaveTablesBuilt = 0; +static UINT16 interleaveTable[65536]; +static UINT16 deinterleaveTable[65536]; + +static void buildInterleaveTables() +{ + UINT32 i, j; + UINT16 x; + + if (!interleaveTablesBuilt) { + for(i=0; i<65536; i++) { + x = 0; + for(j=0; j<16; j++) { + if (i & (1 << j)) + x |= (1 << (j/2 + 8*(j%2))); + } + interleaveTable[i] = x; + deinterleaveTable[x] = (UINT16)i; + } + interleaveTablesBuilt = 1; + } +} + +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + +#define xor2bytesIntoInterleavedWords(even, odd, source, j) \ + i##j = interleaveTable[((const UINT16*)source)[j]]; \ + ((UINT8*)even)[j] ^= i##j & 0xFF; \ + ((UINT8*)odd)[j] ^= i##j >> 8; + +#define setInterleavedWordsInto2bytes(dest, even, odd, j) \ + d##j = deinterleaveTable[((even >> (j*8)) & 0xFF) ^ (((odd >> (j*8)) & 0xFF) << 8)]; \ + ((UINT16*)dest)[j] = d##j; + +#else /* (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) */ + +#define xor2bytesIntoInterleavedWords(even, odd, source, j) \ + i##j = interleaveTable[source[2*j] ^ ((UINT16)source[2*j+1] << 8)]; \ + *even ^= (i##j & 0xFF) << (j*8); \ + *odd ^= ((i##j >> 8) & 0xFF) << (j*8); + +#define setInterleavedWordsInto2bytes(dest, even, odd, j) \ + d##j = deinterleaveTable[((even >> (j*8)) & 0xFF) ^ (((odd >> (j*8)) & 0xFF) << 8)]; \ + dest[2*j] = d##j & 0xFF; \ + dest[2*j+1] = d##j >> 8; + +#endif /* Endianness */ + +static void xor8bytesIntoInterleavedWords(UINT32 *even, UINT32 *odd, const UINT8* source) +{ + UINT16 i0, i1, i2, i3; + + xor2bytesIntoInterleavedWords(even, odd, source, 0) + xor2bytesIntoInterleavedWords(even, odd, source, 1) + xor2bytesIntoInterleavedWords(even, odd, source, 2) + xor2bytesIntoInterleavedWords(even, odd, source, 3) +} + +#define xorLanesIntoState(laneCount, state, input) \ + { \ + int i; \ + for(i=0; i<(laneCount); i++) \ + xor8bytesIntoInterleavedWords(state+i*2, state+i*2+1, input+i*8); \ + } + +static void setInterleavedWordsInto8bytes(UINT8* dest, UINT32 even, UINT32 odd) +{ + UINT16 d0, d1, d2, d3; + + setInterleavedWordsInto2bytes(dest, even, odd, 0) + setInterleavedWordsInto2bytes(dest, even, odd, 1) + setInterleavedWordsInto2bytes(dest, even, odd, 2) + setInterleavedWordsInto2bytes(dest, even, odd, 3) +} + +#define extractLanes(laneCount, state, data) \ + { \ + int i; \ + for(i=0; i<(laneCount); i++) \ + setInterleavedWordsInto8bytes(data+i*8, ((UINT32*)state)[i*2], ((UINT32*)state)[i*2+1]); \ + } + +#else /* No interleaving tables */ + +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + +/* Credit: Henry S. Warren, Hacker's Delight, Addison-Wesley, 2002 */ +#define xorInterleavedLE(rateInLanes, state, input) \ + { \ + const UINT32 * pI = (const UINT32 *)input; \ + UINT32 * pS = state; \ + UINT32 t, x0, x1; \ + int i; \ + for (i = (rateInLanes)-1; i >= 0; --i) \ + { \ + x0 = *(pI++); \ + t = (x0 ^ (x0 >> 1)) & 0x22222222UL; x0 = x0 ^ t ^ (t << 1); \ + t = (x0 ^ (x0 >> 2)) & 0x0C0C0C0CUL; x0 = x0 ^ t ^ (t << 2); \ + t = (x0 ^ (x0 >> 4)) & 0x00F000F0UL; x0 = x0 ^ t ^ (t << 4); \ + t = (x0 ^ (x0 >> 8)) & 0x0000FF00UL; x0 = x0 ^ t ^ (t << 8); \ + x1 = *(pI++); \ + t = (x1 ^ (x1 >> 1)) & 0x22222222UL; x1 = x1 ^ t ^ (t << 1); \ + t = (x1 ^ (x1 >> 2)) & 0x0C0C0C0CUL; x1 = x1 ^ t ^ (t << 2); \ + t = (x1 ^ (x1 >> 4)) & 0x00F000F0UL; x1 = x1 ^ t ^ (t << 4); \ + t = (x1 ^ (x1 >> 8)) & 0x0000FF00UL; x1 = x1 ^ t ^ (t << 8); \ + *(pS++) ^= (UINT16)x0 | (x1 << 16); \ + *(pS++) ^= (x0 >> 16) | (x1 & 0xFFFF0000); \ + } \ + } + +#define xorLanesIntoState(laneCount, state, input) \ + xorInterleavedLE(laneCount, state, input) + +#else /* (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) */ + +/* Credit: Henry S. Warren, Hacker's Delight, Addison-Wesley, 2002 */ +UINT64 toInterleaving(UINT64 x) +{ + UINT64 t; + + t = (x ^ (x >> 1)) & 0x2222222222222222ULL; x = x ^ t ^ (t << 1); + t = (x ^ (x >> 2)) & 0x0C0C0C0C0C0C0C0CULL; x = x ^ t ^ (t << 2); + t = (x ^ (x >> 4)) & 0x00F000F000F000F0ULL; x = x ^ t ^ (t << 4); + t = (x ^ (x >> 8)) & 0x0000FF000000FF00ULL; x = x ^ t ^ (t << 8); + t = (x ^ (x >> 16)) & 0x00000000FFFF0000ULL; x = x ^ t ^ (t << 16); + + return x; +} + +static void xor8bytesIntoInterleavedWords(UINT32* evenAndOdd, const UINT8* source) +{ + /* This can be optimized */ + UINT64 sourceWord = + (UINT64)source[0] + ^ (((UINT64)source[1]) << 8) + ^ (((UINT64)source[2]) << 16) + ^ (((UINT64)source[3]) << 24) + ^ (((UINT64)source[4]) << 32) + ^ (((UINT64)source[5]) << 40) + ^ (((UINT64)source[6]) << 48) + ^ (((UINT64)source[7]) << 56); + UINT64 evenAndOddWord = toInterleaving(sourceWord); + evenAndOdd[0] ^= (UINT32)evenAndOddWord; + evenAndOdd[1] ^= (UINT32)(evenAndOddWord >> 32); +} + +#define xorLanesIntoState(laneCount, state, input) \ + { \ + int i; \ + for(i=0; i<(laneCount); i++) \ + xor8bytesIntoInterleavedWords(state+i*2, input+i*8); \ + } + +#endif /* Endianness */ + +/* Credit: Henry S. Warren, Hacker's Delight, Addison-Wesley, 2002 */ +UINT64 fromInterleaving(UINT64 x) +{ + UINT64 t; + + t = (x ^ (x >> 16)) & 0x00000000FFFF0000ULL; x = x ^ t ^ (t << 16); + t = (x ^ (x >> 8)) & 0x0000FF000000FF00ULL; x = x ^ t ^ (t << 8); + t = (x ^ (x >> 4)) & 0x00F000F000F000F0ULL; x = x ^ t ^ (t << 4); + t = (x ^ (x >> 2)) & 0x0C0C0C0C0C0C0C0CULL; x = x ^ t ^ (t << 2); + t = (x ^ (x >> 1)) & 0x2222222222222222ULL; x = x ^ t ^ (t << 1); + + return x; +} + +static void setInterleavedWordsInto8bytes(UINT8* dest, UINT32* evenAndOdd) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + ((UINT64*)dest)[0] = fromInterleaving(*(UINT64*)evenAndOdd); +#else /* (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) */ + /* This can be optimized */ + UINT64 evenAndOddWord = (UINT64)evenAndOdd[0] ^ ((UINT64)evenAndOdd[1] << 32); + UINT64 destWord = fromInterleaving(evenAndOddWord); + dest[0] = destWord & 0xFF; + dest[1] = (destWord >> 8) & 0xFF; + dest[2] = (destWord >> 16) & 0xFF; + dest[3] = (destWord >> 24) & 0xFF; + dest[4] = (destWord >> 32) & 0xFF; + dest[5] = (destWord >> 40) & 0xFF; + dest[6] = (destWord >> 48) & 0xFF; + dest[7] = (destWord >> 56) & 0xFF; +#endif /* Endianness */ +} + +#define extractLanes(laneCount, state, data) \ + { \ + int i; \ + for(i=0; i<(laneCount); i++) \ + setInterleavedWordsInto8bytes(data+i*8, (UINT32*)state+i*2); \ + } + +#endif /* With or without interleaving tables */ + +#if defined(_MSC_VER) +#define ROL32(a, offset) _rotl(a, offset) +#elif (defined (__arm__) && defined(__ARMCC_VERSION)) +#define ROL32(a, offset) __ror(a, 32-(offset)) +#else +#define ROL32(a, offset) ((((UINT32)a) << (offset)) ^ (((UINT32)a) >> (32-(offset)))) +#endif + +#include "KeccakF-1600-unrolling.macros" +#include "KeccakF-1600-32.macros" + +#if (UseSchedule == 3) + +#ifdef UseBebigokimisa +#error "No lane complementing with schedule 3." +#endif + +#if (Unrolling != 2) +#error "Only unrolling 2 is supported by schedule 3." +#endif + +static void KeccakPermutationOnWords(UINT32 *state) +{ + rounds +} + +static void KeccakPermutationOnWordsAfterXoring(UINT32 *state, const UINT8 *input, unsigned int laneCount) +{ + xorLanesIntoState(laneCount, state, input) + rounds +} + +#ifdef ProvideFast576 +static void KeccakPermutationOnWordsAfterXoring576bits(UINT32 *state, const UINT8 *input) +{ + xorLanesIntoState(9, state, input) + rounds +} +#endif + +#ifdef ProvideFast832 +static void KeccakPermutationOnWordsAfterXoring832bits(UINT32 *state, const UINT8 *input) +{ + xorLanesIntoState(13, state, input) + rounds +} +#endif + +#ifdef ProvideFast1024 +static void KeccakPermutationOnWordsAfterXoring1024bits(UINT32 *state, const UINT8 *input) +{ + xorLanesIntoState(16, state, input) + rounds +} +#endif + +#ifdef ProvideFast1088 +static void KeccakPermutationOnWordsAfterXoring1088bits(UINT32 *state, const UINT8 *input) +{ + xorLanesIntoState(17, state, input) + rounds +} +#endif + +#ifdef ProvideFast1152 +static void KeccakPermutationOnWordsAfterXoring1152bits(UINT32 *state, const UINT8 *input) +{ + xorLanesIntoState(18, state, input) + rounds +} +#endif + +#ifdef ProvideFast1344 +static void KeccakPermutationOnWordsAfterXoring1344bits(UINT32 *state, const UINT8 *input) +{ + xorLanesIntoState(21, state, input) + rounds +} +#endif + +#else /* (Schedule != 3) */ + +static void KeccakPermutationOnWords(UINT32 *state) +{ + declareABCDE +#if (Unrolling != 24) + unsigned int i; +#endif + + copyFromState(A, state) + rounds +} + +static void KeccakPermutationOnWordsAfterXoring(UINT32 *state, const UINT8 *input, unsigned int laneCount) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(laneCount, state, input) + copyFromState(A, state) + rounds +} + +#ifdef ProvideFast576 +static void KeccakPermutationOnWordsAfterXoring576bits(UINT32 *state, const UINT8 *input) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(9, state, input) + copyFromState(A, state) + rounds +} +#endif + +#ifdef ProvideFast832 +static void KeccakPermutationOnWordsAfterXoring832bits(UINT32 *state, const UINT8 *input) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(13, state, input) + copyFromState(A, state) + rounds +} +#endif + +#ifdef ProvideFast1024 +static void KeccakPermutationOnWordsAfterXoring1024bits(UINT32 *state, const UINT8 *input) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(16, state, input) + copyFromState(A, state) + rounds +} +#endif + +#ifdef ProvideFast1088 +static void KeccakPermutationOnWordsAfterXoring1088bits(UINT32 *state, const UINT8 *input) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(17, state, input) + copyFromState(A, state) + rounds +} +#endif + +#ifdef ProvideFast1152 +static void KeccakPermutationOnWordsAfterXoring1152bits(UINT32 *state, const UINT8 *input) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(18, state, input) + copyFromState(A, state) + rounds +} +#endif + +#ifdef ProvideFast1344 +static void KeccakPermutationOnWordsAfterXoring1344bits(UINT32 *state, const UINT8 *input) +{ + declareABCDE + unsigned int i; + + xorLanesIntoState(21, state, input) + copyFromState(A, state) + rounds +} +#endif + +#endif + +static void KeccakInitialize() +{ +#ifdef UseInterleaveTables + buildInterleaveTables(); +#endif +} + +static void KeccakInitializeState(unsigned char *state) +{ + memset(state, 0, 200); +#ifdef UseBebigokimisa + ((UINT32*)state)[ 2] = ~(UINT32)0; + ((UINT32*)state)[ 3] = ~(UINT32)0; + ((UINT32*)state)[ 4] = ~(UINT32)0; + ((UINT32*)state)[ 5] = ~(UINT32)0; + ((UINT32*)state)[16] = ~(UINT32)0; + ((UINT32*)state)[17] = ~(UINT32)0; + ((UINT32*)state)[24] = ~(UINT32)0; + ((UINT32*)state)[25] = ~(UINT32)0; + ((UINT32*)state)[34] = ~(UINT32)0; + ((UINT32*)state)[35] = ~(UINT32)0; + ((UINT32*)state)[40] = ~(UINT32)0; + ((UINT32*)state)[41] = ~(UINT32)0; +#endif +} + +static void KeccakPermutation(unsigned char *state) +{ + /* We assume the state is always stored as interleaved 32-bit words */ + KeccakPermutationOnWords((UINT32*)state); +} + +#ifdef ProvideFast576 +static void KeccakAbsorb576bits(unsigned char *state, const unsigned char *data) +{ + KeccakPermutationOnWordsAfterXoring576bits((UINT32*)state, data); +} +#endif + +#ifdef ProvideFast832 +static void KeccakAbsorb832bits(unsigned char *state, const unsigned char *data) +{ + KeccakPermutationOnWordsAfterXoring832bits((UINT32*)state, data); +} +#endif + +#ifdef ProvideFast1024 +static void KeccakAbsorb1024bits(unsigned char *state, const unsigned char *data) +{ + KeccakPermutationOnWordsAfterXoring1024bits((UINT32*)state, data); +} +#endif + +#ifdef ProvideFast1088 +static void KeccakAbsorb1088bits(unsigned char *state, const unsigned char *data) +{ + KeccakPermutationOnWordsAfterXoring1088bits((UINT32*)state, data); +} +#endif + +#ifdef ProvideFast1152 +static void KeccakAbsorb1152bits(unsigned char *state, const unsigned char *data) +{ + KeccakPermutationOnWordsAfterXoring1152bits((UINT32*)state, data); +} +#endif + +#ifdef ProvideFast1344 +static void KeccakAbsorb1344bits(unsigned char *state, const unsigned char *data) +{ + KeccakPermutationOnWordsAfterXoring1344bits((UINT32*)state, data); +} +#endif + +static void KeccakAbsorb(unsigned char *state, const unsigned char *data, unsigned int laneCount) +{ + KeccakPermutationOnWordsAfterXoring((UINT32*)state, data, laneCount); +} + +#ifdef ProvideFast1024 +static void KeccakExtract1024bits(const unsigned char *state, unsigned char *data) +{ + extractLanes(16, state, data) +#ifdef UseBebigokimisa + ((UINT32*)data)[ 2] = ~((UINT32*)data)[ 2]; + ((UINT32*)data)[ 3] = ~((UINT32*)data)[ 3]; + ((UINT32*)data)[ 4] = ~((UINT32*)data)[ 4]; + ((UINT32*)data)[ 5] = ~((UINT32*)data)[ 5]; + ((UINT32*)data)[16] = ~((UINT32*)data)[16]; + ((UINT32*)data)[17] = ~((UINT32*)data)[17]; + ((UINT32*)data)[24] = ~((UINT32*)data)[24]; + ((UINT32*)data)[25] = ~((UINT32*)data)[25]; +#endif +} +#endif + +static void KeccakExtract(const unsigned char *state, unsigned char *data, unsigned int laneCount) +{ + extractLanes(laneCount, state, data) +#ifdef UseBebigokimisa + if (laneCount > 1) { + ((UINT32*)data)[ 2] = ~((UINT32*)data)[ 2]; + ((UINT32*)data)[ 3] = ~((UINT32*)data)[ 3]; + if (laneCount > 2) { + ((UINT32*)data)[ 4] = ~((UINT32*)data)[ 4]; + ((UINT32*)data)[ 5] = ~((UINT32*)data)[ 5]; + if (laneCount > 8) { + ((UINT32*)data)[16] = ~((UINT32*)data)[16]; + ((UINT32*)data)[17] = ~((UINT32*)data)[17]; + if (laneCount > 12) { + ((UINT32*)data)[24] = ~((UINT32*)data)[24]; + ((UINT32*)data)[25] = ~((UINT32*)data)[25]; + if (laneCount > 17) { + ((UINT32*)data)[34] = ~((UINT32*)data)[34]; + ((UINT32*)data)[35] = ~((UINT32*)data)[35]; + if (laneCount > 20) { + ((UINT32*)data)[40] = ~((UINT32*)data)[40]; + ((UINT32*)data)[41] = ~((UINT32*)data)[41]; + } + } + } + } + } + } +#endif +} diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64-settings.h b/Modules/_sha3/keccak/KeccakF-1600-opt64-settings.h new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-opt64-settings.h @@ -0,0 +1,9 @@ +/* +#define Unrolling 24 +#define UseBebigokimisa +#define UseSSE +#define UseOnlySIMD64 +#define UseMMX +#define UseSHLD +#define UseXOP +*/ diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64.c b/Modules/_sha3/keccak/KeccakF-1600-opt64.c new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-opt64.c @@ -0,0 +1,508 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +/* #include "brg_endian.h" */ +#include "KeccakF-1600-opt64-settings.h" +#include "KeccakF-1600-interface.h" + +typedef unsigned char UINT8; +/* typedef unsigned long long int UINT64; */ + +#if defined(__GNUC__) +#define ALIGN __attribute__ ((aligned(32))) +#elif defined(_MSC_VER) +#define ALIGN __declspec(align(32)) +#else +#define ALIGN +#endif + +#if defined(UseSSE) + #include + typedef __m128i V64; + typedef __m128i V128; + typedef union { + V128 v128; + UINT64 v64[2]; + } V6464; + + #define ANDnu64(a, b) _mm_andnot_si128(a, b) + #define LOAD64(a) _mm_loadl_epi64((const V64 *)&(a)) + #define CONST64(a) _mm_loadl_epi64((const V64 *)&(a)) + #define ROL64(a, o) _mm_or_si128(_mm_slli_epi64(a, o), _mm_srli_epi64(a, 64-(o))) + #define STORE64(a, b) _mm_storel_epi64((V64 *)&(a), b) + #define XOR64(a, b) _mm_xor_si128(a, b) + #define XOReq64(a, b) a = _mm_xor_si128(a, b) + #define SHUFFLEBYTES128(a, b) _mm_shuffle_epi8(a, b) + + #define ANDnu128(a, b) _mm_andnot_si128(a, b) + #define LOAD6464(a, b) _mm_set_epi64((__m64)(a), (__m64)(b)) + #define CONST128(a) _mm_load_si128((const V128 *)&(a)) + #define LOAD128(a) _mm_load_si128((const V128 *)&(a)) + #define LOAD128u(a) _mm_loadu_si128((const V128 *)&(a)) + #define ROL64in128(a, o) _mm_or_si128(_mm_slli_epi64(a, o), _mm_srli_epi64(a, 64-(o))) + #define STORE128(a, b) _mm_store_si128((V128 *)&(a), b) + #define XOR128(a, b) _mm_xor_si128(a, b) + #define XOReq128(a, b) a = _mm_xor_si128(a, b) + #define GET64LOLO(a, b) _mm_unpacklo_epi64(a, b) + #define GET64HIHI(a, b) _mm_unpackhi_epi64(a, b) + #define COPY64HI2LO(a) _mm_shuffle_epi32(a, 0xEE) + #define COPY64LO2HI(a) _mm_shuffle_epi32(a, 0x44) + #define ZERO128() _mm_setzero_si128() + + #ifdef UseOnlySIMD64 + #include "KeccakF-1600-simd64.macros" + #else +ALIGN const UINT64 rho8_56[2] = {0x0605040302010007, 0x080F0E0D0C0B0A09}; + #include "KeccakF-1600-simd128.macros" + #endif + + #ifdef UseBebigokimisa + #error "UseBebigokimisa cannot be used in combination with UseSSE" + #endif +#elif defined(UseXOP) + #include + typedef __m128i V64; + typedef __m128i V128; + + #define LOAD64(a) _mm_loadl_epi64((const V64 *)&(a)) + #define CONST64(a) _mm_loadl_epi64((const V64 *)&(a)) + #define STORE64(a, b) _mm_storel_epi64((V64 *)&(a), b) + #define XOR64(a, b) _mm_xor_si128(a, b) + #define XOReq64(a, b) a = _mm_xor_si128(a, b) + + #define ANDnu128(a, b) _mm_andnot_si128(a, b) + #define LOAD6464(a, b) _mm_set_epi64((__m64)(a), (__m64)(b)) + #define CONST128(a) _mm_load_si128((const V128 *)&(a)) + #define LOAD128(a) _mm_load_si128((const V128 *)&(a)) + #define LOAD128u(a) _mm_loadu_si128((const V128 *)&(a)) + #define STORE128(a, b) _mm_store_si128((V128 *)&(a), b) + #define XOR128(a, b) _mm_xor_si128(a, b) + #define XOReq128(a, b) a = _mm_xor_si128(a, b) + #define ZERO128() _mm_setzero_si128() + + #define SWAP64(a) _mm_shuffle_epi32(a, 0x4E) + #define GET64LOLO(a, b) _mm_unpacklo_epi64(a, b) + #define GET64HIHI(a, b) _mm_unpackhi_epi64(a, b) + #define GET64LOHI(a, b) ((__m128i)_mm_blend_pd((__m128d)a, (__m128d)b, 2)) + #define GET64HILO(a, b) SWAP64(GET64LOHI(b, a)) + #define COPY64HI2LO(a) _mm_shuffle_epi32(a, 0xEE) + #define COPY64LO2HI(a) _mm_shuffle_epi32(a, 0x44) + + #define ROL6464same(a, o) _mm_roti_epi64(a, o) + #define ROL6464(a, r1, r2) _mm_rot_epi64(a, CONST128( rot_##r1##_##r2 )) +ALIGN const UINT64 rot_0_20[2] = { 0, 20}; +ALIGN const UINT64 rot_44_3[2] = {44, 3}; +ALIGN const UINT64 rot_43_45[2] = {43, 45}; +ALIGN const UINT64 rot_21_61[2] = {21, 61}; +ALIGN const UINT64 rot_14_28[2] = {14, 28}; +ALIGN const UINT64 rot_1_36[2] = { 1, 36}; +ALIGN const UINT64 rot_6_10[2] = { 6, 10}; +ALIGN const UINT64 rot_25_15[2] = {25, 15}; +ALIGN const UINT64 rot_8_56[2] = { 8, 56}; +ALIGN const UINT64 rot_18_27[2] = {18, 27}; +ALIGN const UINT64 rot_62_55[2] = {62, 55}; +ALIGN const UINT64 rot_39_41[2] = {39, 41}; + +#if defined(UseSimulatedXOP) + /* For debugging purposes, when XOP is not available */ + #undef ROL6464 + #undef ROL6464same + #define ROL6464same(a, o) _mm_or_si128(_mm_slli_epi64(a, o), _mm_srli_epi64(a, 64-(o))) + V128 ROL6464(V128 a, int r0, int r1) + { + V128 a0 = ROL64(a, r0); + V128 a1 = COPY64HI2LO(ROL64(a, r1)); + return GET64LOLO(a0, a1); + } +#endif + + #include "KeccakF-1600-xop.macros" + + #ifdef UseBebigokimisa + #error "UseBebigokimisa cannot be used in combination with UseXOP" + #endif +#elif defined(UseMMX) + #include + typedef __m64 V64; + #define ANDnu64(a, b) _mm_andnot_si64(a, b) + + #if (defined(_MSC_VER) || defined (__INTEL_COMPILER)) + #define LOAD64(a) *(V64*)&(a) + #define CONST64(a) *(V64*)&(a) + #define STORE64(a, b) *(V64*)&(a) = b + #else + #define LOAD64(a) (V64)a + #define CONST64(a) (V64)a + #define STORE64(a, b) a = (UINT64)b + #endif + #define ROL64(a, o) _mm_or_si64(_mm_slli_si64(a, o), _mm_srli_si64(a, 64-(o))) + #define XOR64(a, b) _mm_xor_si64(a, b) + #define XOReq64(a, b) a = _mm_xor_si64(a, b) + + #include "KeccakF-1600-simd64.macros" + + #ifdef UseBebigokimisa + #error "UseBebigokimisa cannot be used in combination with UseMMX" + #endif +#else + #if defined(_MSC_VER) + #define ROL64(a, offset) _rotl64(a, offset) + #elif defined(UseSHLD) + #define ROL64(x,N) ({ \ + register UINT64 __out; \ + register UINT64 __in = x; \ + __asm__ ("shld %2,%0,%0" : "=r"(__out) : "0"(__in), "i"(N)); \ + __out; \ + }) + #else + #define ROL64(a, offset) ((((UINT64)a) << offset) ^ (((UINT64)a) >> (64-offset))) + #endif + + #include "KeccakF-1600-64.macros" +#endif + +#include "KeccakF-1600-unrolling.macros" + +static void KeccakPermutationOnWords(UINT64 *state) +{ + declareABCDE +#if (Unrolling != 24) + unsigned int i; +#endif + + copyFromState(A, state) + rounds +#if defined(UseMMX) + _mm_empty(); +#endif +} + +static void KeccakPermutationOnWordsAfterXoring(UINT64 *state, const UINT64 *input, unsigned int laneCount) +{ + declareABCDE +#if (Unrolling != 24) + unsigned int i; +#endif + unsigned int j; + + for(j=0; j> (8*i)) & 0xFF; +} +*/ + +#ifdef ProvideFast1024 +static void KeccakExtract1024bits(const unsigned char *state, unsigned char *data) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + memcpy(data, state, 128); +#else + unsigned int i; + + for(i=0; i<16; i++) + fromWordToBytes(data+(i*8), ((const UINT64*)state)[i]); +#endif +#ifdef UseBebigokimisa + ((UINT64*)data)[ 1] = ~((UINT64*)data)[ 1]; + ((UINT64*)data)[ 2] = ~((UINT64*)data)[ 2]; + ((UINT64*)data)[ 8] = ~((UINT64*)data)[ 8]; + ((UINT64*)data)[12] = ~((UINT64*)data)[12]; +#endif +} +#endif + +static void KeccakExtract(const unsigned char *state, unsigned char *data, unsigned int laneCount) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + memcpy(data, state, laneCount*8); +#else + unsigned int i; + + for(i=0; i 1) { + ((UINT64*)data)[ 1] = ~((UINT64*)data)[ 1]; + if (laneCount > 2) { + ((UINT64*)data)[ 2] = ~((UINT64*)data)[ 2]; + if (laneCount > 8) { + ((UINT64*)data)[ 8] = ~((UINT64*)data)[ 8]; + if (laneCount > 12) { + ((UINT64*)data)[12] = ~((UINT64*)data)[12]; + if (laneCount > 17) { + ((UINT64*)data)[17] = ~((UINT64*)data)[17]; + if (laneCount > 20) { + ((UINT64*)data)[20] = ~((UINT64*)data)[20]; + } + } + } + } + } + } +#endif +} diff --git a/Modules/_sha3/keccak/KeccakF-1600-simd128.macros b/Modules/_sha3/keccak/KeccakF-1600-simd128.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-simd128.macros @@ -0,0 +1,651 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + V6464 Abage, Abegi, Abigo, Abogu, Abuga; \ + V6464 Akame, Akemi, Akimo, Akomu, Akuma; \ + V6464 Abae, Abio, Agae, Agio, Akae, Akio, Amae, Amio, Asae, Asio; \ + V64 Aba, Abe, Abi, Abo, Abu; \ + V64 Aga, Age, Agi, Ago, Agu; \ + V64 Aka, Ake, Aki, Ako, Aku; \ + V64 Ama, Ame, Ami, Amo, Amu; \ + V64 Asa, Ase, Asi, Aso, Asu; \ + V128 Bbage, Bbegi, Bbigo, Bbogu, Bbuga; \ + V128 Bkame, Bkemi, Bkimo, Bkomu, Bkuma; \ + V64 Bba, Bbe, Bbi, Bbo, Bbu; \ + V64 Bga, Bge, Bgi, Bgo, Bgu; \ + V64 Bka, Bke, Bki, Bko, Bku; \ + V64 Bma, Bme, Bmi, Bmo, Bmu; \ + V64 Bsa, Bse, Bsi, Bso, Bsu; \ + V128 Cae, Cei, Cio, Cou, Cua, Dei, Dou; \ + V64 Ca, Ce, Ci, Co, Cu; \ + V64 Da, De, Di, Do, Du; \ + V6464 Ebage, Ebegi, Ebigo, Ebogu, Ebuga; \ + V6464 Ekame, Ekemi, Ekimo, Ekomu, Ekuma; \ + V64 Eba, Ebe, Ebi, Ebo, Ebu; \ + V64 Ega, Ege, Egi, Ego, Egu; \ + V64 Eka, Eke, Eki, Eko, Eku; \ + V64 Ema, Eme, Emi, Emo, Emu; \ + V64 Esa, Ese, Esi, Eso, Esu; \ + V128 Zero; + +#define prepareTheta + +#define computeD \ + Cua = GET64LOLO(Cu, Cae); \ + Dei = XOR128(Cae, ROL64in128(Cio, 1)); \ + Dou = XOR128(Cio, ROL64in128(Cua, 1)); \ + Da = XOR64(Cu, ROL64in128(COPY64HI2LO(Cae), 1)); \ + De = Dei; \ + Di = COPY64HI2LO(Dei); \ + Do = Dou; \ + Du = COPY64HI2LO(Dou); + +/* --- Theta Rho Pi Chi Iota Prepare-theta */ +/* --- 64-bit lanes mapped to 64-bit and 128-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + computeD \ + \ + A##ba = LOAD64(A##bage.v64[0]); \ + XOReq64(A##ba, Da); \ + Bba = A##ba; \ + XOReq64(A##gu, Du); \ + Bge = ROL64(A##gu, 20); \ + Bbage = GET64LOLO(Bba, Bge); \ + A##ge = LOAD64(A##bage.v64[1]); \ + XOReq64(A##ge, De); \ + Bbe = ROL64(A##ge, 44); \ + A##ka = LOAD64(A##kame.v64[0]); \ + XOReq64(A##ka, Da); \ + Bgi = ROL64(A##ka, 3); \ + Bbegi = GET64LOLO(Bbe, Bgi); \ + XOReq64(A##ki, Di); \ + Bbi = ROL64(A##ki, 43); \ + A##me = LOAD64(A##kame.v64[1]); \ + XOReq64(A##me, De); \ + Bgo = ROL64(A##me, 45); \ + Bbigo = GET64LOLO(Bbi, Bgo); \ + E##bage.v128 = XOR128(Bbage, ANDnu128(Bbegi, Bbigo)); \ + XOReq128(E##bage.v128, CONST64(KeccakF1600RoundConstants[i])); \ + Cae = E##bage.v128; \ + XOReq64(A##mo, Do); \ + Bbo = ROL64(A##mo, 21); \ + XOReq64(A##si, Di); \ + Bgu = ROL64(A##si, 61); \ + Bbogu = GET64LOLO(Bbo, Bgu); \ + E##begi.v128 = XOR128(Bbegi, ANDnu128(Bbigo, Bbogu)); \ + Cei = E##begi.v128; \ + XOReq64(A##su, Du); \ + Bbu = ROL64(A##su, 14); \ + XOReq64(A##bo, Do); \ + Bga = ROL64(A##bo, 28); \ + Bbuga = GET64LOLO(Bbu, Bga); \ + E##bigo.v128 = XOR128(Bbigo, ANDnu128(Bbogu, Bbuga)); \ + E##bi = E##bigo.v128; \ + E##go = GET64HIHI(E##bigo.v128, E##bigo.v128); \ + Cio = E##bigo.v128; \ + E##bogu.v128 = XOR128(Bbogu, ANDnu128(Bbuga, Bbage)); \ + E##bo = E##bogu.v128; \ + E##gu = GET64HIHI(E##bogu.v128, E##bogu.v128); \ + Cou = E##bogu.v128; \ + E##buga.v128 = XOR128(Bbuga, ANDnu128(Bbage, Bbegi)); \ + E##bu = E##buga.v128; \ + E##ga = GET64HIHI(E##buga.v128, E##buga.v128); \ + Cua = E##buga.v128; \ +\ + A##be = LOAD64(A##begi.v64[0]); \ + XOReq64(A##be, De); \ + Bka = ROL64(A##be, 1); \ + XOReq64(A##ga, Da); \ + Bme = ROL64(A##ga, 36); \ + Bkame = GET64LOLO(Bka, Bme); \ + A##gi = LOAD64(A##begi.v64[1]); \ + XOReq64(A##gi, Di); \ + Bke = ROL64(A##gi, 6); \ + A##ke = LOAD64(A##kemi.v64[0]); \ + XOReq64(A##ke, De); \ + Bmi = ROL64(A##ke, 10); \ + Bkemi = GET64LOLO(Bke, Bmi); \ + XOReq64(A##ko, Do); \ + Bki = ROL64(A##ko, 25); \ + A##mi = LOAD64(A##kemi.v64[1]); \ + XOReq64(A##mi, Di); \ + Bmo = ROL64(A##mi, 15); \ + Bkimo = GET64LOLO(Bki, Bmo); \ + E##kame.v128 = XOR128(Bkame, ANDnu128(Bkemi, Bkimo)); \ + XOReq128(Cae, E##kame.v128); \ + Bkomu = GET64LOLO(XOR64(A##mu, Du), XOR64(A##so, Do)); \ + Bkomu = SHUFFLEBYTES128(Bkomu, CONST128(rho8_56)); \ + E##kemi.v128 = XOR128(Bkemi, ANDnu128(Bkimo, Bkomu)); \ + XOReq128(Cei, E##kemi.v128); \ + XOReq64(A##sa, Da); \ + Bku = ROL64(A##sa, 18); \ + XOReq64(A##bu, Du); \ + Bma = ROL64(A##bu, 27); \ + Bkuma = GET64LOLO(Bku, Bma); \ + E##kimo.v128 = XOR128(Bkimo, ANDnu128(Bkomu, Bkuma)); \ + E##ki = E##kimo.v128; \ + E##mo = GET64HIHI(E##kimo.v128, E##kimo.v128); \ + XOReq128(Cio, E##kimo.v128); \ + E##komu.v128 = XOR128(Bkomu, ANDnu128(Bkuma, Bkame)); \ + E##ko = E##komu.v128; \ + E##mu = GET64HIHI(E##komu.v128, E##komu.v128); \ + XOReq128(Cou, E##komu.v128); \ + E##kuma.v128 = XOR128(Bkuma, ANDnu128(Bkame, Bkemi)); \ + E##ku = E##kuma.v128; \ + E##ma = GET64HIHI(E##kuma.v128, E##kuma.v128); \ + XOReq128(Cua, E##kuma.v128); \ +\ + XOReq64(A##bi, Di); \ + Bsa = ROL64(A##bi, 62); \ + XOReq64(A##go, Do); \ + Bse = ROL64(A##go, 55); \ + XOReq64(A##ku, Du); \ + Bsi = ROL64(A##ku, 39); \ + E##sa = XOR64(Bsa, ANDnu64(Bse, Bsi)); \ + Ca = E##sa; \ + XOReq64(A##ma, Da); \ + Bso = ROL64(A##ma, 41); \ + E##se = XOR64(Bse, ANDnu64(Bsi, Bso)); \ + Ce = E##se; \ + XOReq128(Cae, GET64LOLO(Ca, Ce)); \ + XOReq64(A##se, De); \ + Bsu = ROL64(A##se, 2); \ + E##si = XOR64(Bsi, ANDnu64(Bso, Bsu)); \ + Ci = E##si; \ + E##so = XOR64(Bso, ANDnu64(Bsu, Bsa)); \ + Co = E##so; \ + XOReq128(Cio, GET64LOLO(Ci, Co)); \ + E##su = XOR64(Bsu, ANDnu64(Bsa, Bse)); \ + Cu = E##su; \ +\ + Zero = ZERO128(); \ + XOReq128(Cae, GET64HIHI(Cua, Zero)); \ + XOReq128(Cae, GET64LOLO(Zero, Cei)); \ + XOReq128(Cio, GET64HIHI(Cei, Zero)); \ + XOReq128(Cio, GET64LOLO(Zero, Cou)); \ + XOReq128(Cua, GET64HIHI(Cou, Zero)); \ + XOReq64(Cu, Cua); \ + +/* --- Theta Rho Pi Chi Iota */ +/* --- 64-bit lanes mapped to 64-bit and 128-bit words */ +#define thetaRhoPiChiIota(i, A, E) thetaRhoPiChiIotaPrepareTheta(i, A, E) + +static const UINT64 KeccakF1600RoundConstants[24] = { + 0x0000000000000001ULL, + 0x0000000000008082ULL, + 0x800000000000808aULL, + 0x8000000080008000ULL, + 0x000000000000808bULL, + 0x0000000080000001ULL, + 0x8000000080008081ULL, + 0x8000000000008009ULL, + 0x000000000000008aULL, + 0x0000000000000088ULL, + 0x0000000080008009ULL, + 0x000000008000000aULL, + 0x000000008000808bULL, + 0x800000000000008bULL, + 0x8000000000008089ULL, + 0x8000000000008003ULL, + 0x8000000000008002ULL, + 0x8000000000000080ULL, + 0x000000000000800aULL, + 0x800000008000000aULL, + 0x8000000080008081ULL, + 0x8000000000008080ULL, + 0x0000000080000001ULL, + 0x8000000080008008ULL }; + +#define copyFromStateAndXor576bits(X, state, input) \ + X##bae.v128 = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cu = X##bu; \ + X##gae.v128 = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = LOAD64(state[ 9]); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = LOAD128(state[10]); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = LOAD128(state[12]); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = LOAD64(state[14]); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = LOAD128u(state[15]); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = LOAD128u(state[17]); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = LOAD64(state[19]); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = LOAD128(state[20]); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyFromStateAndXor832bits(X, state, input) \ + X##bae.v128 = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cu = X##bu; \ + X##gae.v128 = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = XOR128(LOAD128(state[12]), LOAD64(input[12])); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = LOAD64(state[14]); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = LOAD128u(state[15]); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = LOAD128u(state[17]); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = LOAD64(state[19]); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = LOAD128(state[20]); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyFromStateAndXor1024bits(X, state, input) \ + X##bae.v128 = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cu = X##bu; \ + X##gae.v128 = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = XOR128(LOAD128u(state[15]), LOAD64(input[15])); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = LOAD128u(state[17]); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = LOAD64(state[19]); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = LOAD128(state[20]); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyFromStateAndXor1088bits(X, state, input) \ + X##bae.v128 = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cu = X##bu; \ + X##gae.v128 = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = XOR128(LOAD128u(state[15]), LOAD128u(input[15])); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = LOAD128u(state[17]); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = LOAD64(state[19]); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = LOAD128(state[20]); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyFromStateAndXor1152bits(X, state, input) \ + X##bae.v128 = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cu = X##bu; \ + X##gae.v128 = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = XOR128(LOAD128u(state[15]), LOAD128u(input[15])); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = XOR128(LOAD128u(state[17]), LOAD64(input[17])); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = LOAD64(state[19]); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = LOAD128(state[20]); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyFromStateAndXor1344bits(X, state, input) \ + X##bae.v128 = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cu = X##bu; \ + X##gae.v128 = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = XOR128(LOAD128u(state[15]), LOAD128u(input[15])); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = XOR128(LOAD128u(state[17]), LOAD128u(input[17])); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = XOR64(LOAD64(state[19]), LOAD64(input[19])); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = XOR128(LOAD128(state[20]), LOAD64(input[20])); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyFromState(X, state) \ + X##bae.v128 = LOAD128(state[ 0]); \ + X##ba = X##bae.v128; \ + X##be = GET64HIHI(X##bae.v128, X##bae.v128); \ + Cae = X##bae.v128; \ + X##bio.v128 = LOAD128(state[ 2]); \ + X##bi = X##bio.v128; \ + X##bo = GET64HIHI(X##bio.v128, X##bio.v128); \ + Cio = X##bio.v128; \ + X##bu = LOAD64(state[ 4]); \ + Cu = X##bu; \ + X##gae.v128 = LOAD128u(state[ 5]); \ + X##ga = X##gae.v128; \ + X##ge = GET64HIHI(X##gae.v128, X##gae.v128); \ + X##bage.v128 = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae.v128); \ + X##gio.v128 = LOAD128u(state[ 7]); \ + X##gi = X##gio.v128; \ + X##begi.v128 = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio.v128, X##gio.v128); \ + XOReq128(Cio, X##gio.v128); \ + X##gu = LOAD64(state[ 9]); \ + XOReq64(Cu, X##gu); \ + X##kae.v128 = LOAD128(state[10]); \ + X##ka = X##kae.v128; \ + X##ke = GET64HIHI(X##kae.v128, X##kae.v128); \ + XOReq128(Cae, X##kae.v128); \ + X##kio.v128 = LOAD128(state[12]); \ + X##ki = X##kio.v128; \ + X##ko = GET64HIHI(X##kio.v128, X##kio.v128); \ + XOReq128(Cio, X##kio.v128); \ + X##ku = LOAD64(state[14]); \ + XOReq64(Cu, X##ku); \ + X##mae.v128 = LOAD128u(state[15]); \ + X##ma = X##mae.v128; \ + X##me = GET64HIHI(X##mae.v128, X##mae.v128); \ + X##kame.v128 = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, X##mae.v128); \ + X##mio.v128 = LOAD128u(state[17]); \ + X##mi = X##mio.v128; \ + X##kemi.v128 = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio.v128, X##mio.v128); \ + XOReq128(Cio, X##mio.v128); \ + X##mu = LOAD64(state[19]); \ + XOReq64(Cu, X##mu); \ + X##sae.v128 = LOAD128(state[20]); \ + X##sa = X##sae.v128; \ + X##se = GET64HIHI(X##sae.v128, X##sae.v128); \ + XOReq128(Cae, X##sae.v128); \ + X##sio.v128 = LOAD128(state[22]); \ + X##si = X##sio.v128; \ + X##so = GET64HIHI(X##sio.v128, X##sio.v128); \ + XOReq128(Cio, X##sio.v128); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cu, X##su); \ + +#define copyToState(state, X) \ + state[ 0] = A##bage.v64[0]; \ + state[ 1] = A##begi.v64[0]; \ + STORE64(state[ 2], X##bi); \ + STORE64(state[ 3], X##bo); \ + STORE64(state[ 4], X##bu); \ + STORE64(state[ 5], X##ga); \ + state[ 6] = A##bage.v64[1]; \ + state[ 7] = A##begi.v64[1]; \ + STORE64(state[ 8], X##go); \ + STORE64(state[ 9], X##gu); \ + state[10] = X##kame.v64[0]; \ + state[11] = X##kemi.v64[0]; \ + STORE64(state[12], X##ki); \ + STORE64(state[13], X##ko); \ + STORE64(state[14], X##ku); \ + STORE64(state[15], X##ma); \ + state[16] = X##kame.v64[1]; \ + state[17] = X##kemi.v64[1]; \ + STORE64(state[18], X##mo); \ + STORE64(state[19], X##mu); \ + STORE64(state[20], X##sa); \ + STORE64(state[21], X##se); \ + STORE64(state[22], X##si); \ + STORE64(state[23], X##so); \ + STORE64(state[24], X##su); \ + +#define copyStateVariables(X, Y) \ + X##bage = Y##bage; \ + X##begi = Y##begi; \ + X##bi = Y##bi; \ + X##bo = Y##bo; \ + X##bu = Y##bu; \ + X##ga = Y##ga; \ + X##go = Y##go; \ + X##gu = Y##gu; \ + X##kame = Y##kame; \ + X##kemi = Y##kemi; \ + X##ki = Y##ki; \ + X##ko = Y##ko; \ + X##ku = Y##ku; \ + X##ma = Y##ma; \ + X##mo = Y##mo; \ + X##mu = Y##mu; \ + X##sa = Y##sa; \ + X##se = Y##se; \ + X##si = Y##si; \ + X##so = Y##so; \ + X##su = Y##su; \ + diff --git a/Modules/_sha3/keccak/KeccakF-1600-simd64.macros b/Modules/_sha3/keccak/KeccakF-1600-simd64.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-simd64.macros @@ -0,0 +1,517 @@ +/* +Code automatically generated by KeccakTools! + +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + V64 Aba, Abe, Abi, Abo, Abu; \ + V64 Aga, Age, Agi, Ago, Agu; \ + V64 Aka, Ake, Aki, Ako, Aku; \ + V64 Ama, Ame, Ami, Amo, Amu; \ + V64 Asa, Ase, Asi, Aso, Asu; \ + V64 Bba, Bbe, Bbi, Bbo, Bbu; \ + V64 Bga, Bge, Bgi, Bgo, Bgu; \ + V64 Bka, Bke, Bki, Bko, Bku; \ + V64 Bma, Bme, Bmi, Bmo, Bmu; \ + V64 Bsa, Bse, Bsi, Bso, Bsu; \ + V64 Ca, Ce, Ci, Co, Cu; \ + V64 Da, De, Di, Do, Du; \ + V64 Eba, Ebe, Ebi, Ebo, Ebu; \ + V64 Ega, Ege, Egi, Ego, Egu; \ + V64 Eka, Eke, Eki, Eko, Eku; \ + V64 Ema, Eme, Emi, Emo, Emu; \ + V64 Esa, Ese, Esi, Eso, Esu; \ + +#define prepareTheta \ + Ca = XOR64(Aba, XOR64(Aga, XOR64(Aka, XOR64(Ama, Asa)))); \ + Ce = XOR64(Abe, XOR64(Age, XOR64(Ake, XOR64(Ame, Ase)))); \ + Ci = XOR64(Abi, XOR64(Agi, XOR64(Aki, XOR64(Ami, Asi)))); \ + Co = XOR64(Abo, XOR64(Ago, XOR64(Ako, XOR64(Amo, Aso)))); \ + Cu = XOR64(Abu, XOR64(Agu, XOR64(Aku, XOR64(Amu, Asu)))); \ + +/* --- Code for round, with prepare-theta */ +/* --- 64-bit lanes mapped to 64-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da = XOR64(Cu, ROL64(Ce, 1)); \ + De = XOR64(Ca, ROL64(Ci, 1)); \ + Di = XOR64(Ce, ROL64(Co, 1)); \ + Do = XOR64(Ci, ROL64(Cu, 1)); \ + Du = XOR64(Co, ROL64(Ca, 1)); \ +\ + XOReq64(A##ba, Da); \ + Bba = A##ba; \ + XOReq64(A##ge, De); \ + Bbe = ROL64(A##ge, 44); \ + XOReq64(A##ki, Di); \ + Bbi = ROL64(A##ki, 43); \ + E##ba = XOR64(Bba, ANDnu64(Bbe, Bbi)); \ + XOReq64(E##ba, CONST64(KeccakF1600RoundConstants[i])); \ + Ca = E##ba; \ + XOReq64(A##mo, Do); \ + Bbo = ROL64(A##mo, 21); \ + E##be = XOR64(Bbe, ANDnu64(Bbi, Bbo)); \ + Ce = E##be; \ + XOReq64(A##su, Du); \ + Bbu = ROL64(A##su, 14); \ + E##bi = XOR64(Bbi, ANDnu64(Bbo, Bbu)); \ + Ci = E##bi; \ + E##bo = XOR64(Bbo, ANDnu64(Bbu, Bba)); \ + Co = E##bo; \ + E##bu = XOR64(Bbu, ANDnu64(Bba, Bbe)); \ + Cu = E##bu; \ +\ + XOReq64(A##bo, Do); \ + Bga = ROL64(A##bo, 28); \ + XOReq64(A##gu, Du); \ + Bge = ROL64(A##gu, 20); \ + XOReq64(A##ka, Da); \ + Bgi = ROL64(A##ka, 3); \ + E##ga = XOR64(Bga, ANDnu64(Bge, Bgi)); \ + XOReq64(Ca, E##ga); \ + XOReq64(A##me, De); \ + Bgo = ROL64(A##me, 45); \ + E##ge = XOR64(Bge, ANDnu64(Bgi, Bgo)); \ + XOReq64(Ce, E##ge); \ + XOReq64(A##si, Di); \ + Bgu = ROL64(A##si, 61); \ + E##gi = XOR64(Bgi, ANDnu64(Bgo, Bgu)); \ + XOReq64(Ci, E##gi); \ + E##go = XOR64(Bgo, ANDnu64(Bgu, Bga)); \ + XOReq64(Co, E##go); \ + E##gu = XOR64(Bgu, ANDnu64(Bga, Bge)); \ + XOReq64(Cu, E##gu); \ +\ + XOReq64(A##be, De); \ + Bka = ROL64(A##be, 1); \ + XOReq64(A##gi, Di); \ + Bke = ROL64(A##gi, 6); \ + XOReq64(A##ko, Do); \ + Bki = ROL64(A##ko, 25); \ + E##ka = XOR64(Bka, ANDnu64(Bke, Bki)); \ + XOReq64(Ca, E##ka); \ + XOReq64(A##mu, Du); \ + Bko = ROL64(A##mu, 8); \ + E##ke = XOR64(Bke, ANDnu64(Bki, Bko)); \ + XOReq64(Ce, E##ke); \ + XOReq64(A##sa, Da); \ + Bku = ROL64(A##sa, 18); \ + E##ki = XOR64(Bki, ANDnu64(Bko, Bku)); \ + XOReq64(Ci, E##ki); \ + E##ko = XOR64(Bko, ANDnu64(Bku, Bka)); \ + XOReq64(Co, E##ko); \ + E##ku = XOR64(Bku, ANDnu64(Bka, Bke)); \ + XOReq64(Cu, E##ku); \ +\ + XOReq64(A##bu, Du); \ + Bma = ROL64(A##bu, 27); \ + XOReq64(A##ga, Da); \ + Bme = ROL64(A##ga, 36); \ + XOReq64(A##ke, De); \ + Bmi = ROL64(A##ke, 10); \ + E##ma = XOR64(Bma, ANDnu64(Bme, Bmi)); \ + XOReq64(Ca, E##ma); \ + XOReq64(A##mi, Di); \ + Bmo = ROL64(A##mi, 15); \ + E##me = XOR64(Bme, ANDnu64(Bmi, Bmo)); \ + XOReq64(Ce, E##me); \ + XOReq64(A##so, Do); \ + Bmu = ROL64(A##so, 56); \ + E##mi = XOR64(Bmi, ANDnu64(Bmo, Bmu)); \ + XOReq64(Ci, E##mi); \ + E##mo = XOR64(Bmo, ANDnu64(Bmu, Bma)); \ + XOReq64(Co, E##mo); \ + E##mu = XOR64(Bmu, ANDnu64(Bma, Bme)); \ + XOReq64(Cu, E##mu); \ +\ + XOReq64(A##bi, Di); \ + Bsa = ROL64(A##bi, 62); \ + XOReq64(A##go, Do); \ + Bse = ROL64(A##go, 55); \ + XOReq64(A##ku, Du); \ + Bsi = ROL64(A##ku, 39); \ + E##sa = XOR64(Bsa, ANDnu64(Bse, Bsi)); \ + XOReq64(Ca, E##sa); \ + XOReq64(A##ma, Da); \ + Bso = ROL64(A##ma, 41); \ + E##se = XOR64(Bse, ANDnu64(Bsi, Bso)); \ + XOReq64(Ce, E##se); \ + XOReq64(A##se, De); \ + Bsu = ROL64(A##se, 2); \ + E##si = XOR64(Bsi, ANDnu64(Bso, Bsu)); \ + XOReq64(Ci, E##si); \ + E##so = XOR64(Bso, ANDnu64(Bsu, Bsa)); \ + XOReq64(Co, E##so); \ + E##su = XOR64(Bsu, ANDnu64(Bsa, Bse)); \ + XOReq64(Cu, E##su); \ +\ + +/* --- Code for round */ +/* --- 64-bit lanes mapped to 64-bit words */ +#define thetaRhoPiChiIota(i, A, E) \ + Da = XOR64(Cu, ROL64(Ce, 1)); \ + De = XOR64(Ca, ROL64(Ci, 1)); \ + Di = XOR64(Ce, ROL64(Co, 1)); \ + Do = XOR64(Ci, ROL64(Cu, 1)); \ + Du = XOR64(Co, ROL64(Ca, 1)); \ +\ + XOReq64(A##ba, Da); \ + Bba = A##ba; \ + XOReq64(A##ge, De); \ + Bbe = ROL64(A##ge, 44); \ + XOReq64(A##ki, Di); \ + Bbi = ROL64(A##ki, 43); \ + E##ba = XOR64(Bba, ANDnu64(Bbe, Bbi)); \ + XOReq64(E##ba, CONST64(KeccakF1600RoundConstants[i])); \ + XOReq64(A##mo, Do); \ + Bbo = ROL64(A##mo, 21); \ + E##be = XOR64(Bbe, ANDnu64(Bbi, Bbo)); \ + XOReq64(A##su, Du); \ + Bbu = ROL64(A##su, 14); \ + E##bi = XOR64(Bbi, ANDnu64(Bbo, Bbu)); \ + E##bo = XOR64(Bbo, ANDnu64(Bbu, Bba)); \ + E##bu = XOR64(Bbu, ANDnu64(Bba, Bbe)); \ +\ + XOReq64(A##bo, Do); \ + Bga = ROL64(A##bo, 28); \ + XOReq64(A##gu, Du); \ + Bge = ROL64(A##gu, 20); \ + XOReq64(A##ka, Da); \ + Bgi = ROL64(A##ka, 3); \ + E##ga = XOR64(Bga, ANDnu64(Bge, Bgi)); \ + XOReq64(A##me, De); \ + Bgo = ROL64(A##me, 45); \ + E##ge = XOR64(Bge, ANDnu64(Bgi, Bgo)); \ + XOReq64(A##si, Di); \ + Bgu = ROL64(A##si, 61); \ + E##gi = XOR64(Bgi, ANDnu64(Bgo, Bgu)); \ + E##go = XOR64(Bgo, ANDnu64(Bgu, Bga)); \ + E##gu = XOR64(Bgu, ANDnu64(Bga, Bge)); \ +\ + XOReq64(A##be, De); \ + Bka = ROL64(A##be, 1); \ + XOReq64(A##gi, Di); \ + Bke = ROL64(A##gi, 6); \ + XOReq64(A##ko, Do); \ + Bki = ROL64(A##ko, 25); \ + E##ka = XOR64(Bka, ANDnu64(Bke, Bki)); \ + XOReq64(A##mu, Du); \ + Bko = ROL64(A##mu, 8); \ + E##ke = XOR64(Bke, ANDnu64(Bki, Bko)); \ + XOReq64(A##sa, Da); \ + Bku = ROL64(A##sa, 18); \ + E##ki = XOR64(Bki, ANDnu64(Bko, Bku)); \ + E##ko = XOR64(Bko, ANDnu64(Bku, Bka)); \ + E##ku = XOR64(Bku, ANDnu64(Bka, Bke)); \ +\ + XOReq64(A##bu, Du); \ + Bma = ROL64(A##bu, 27); \ + XOReq64(A##ga, Da); \ + Bme = ROL64(A##ga, 36); \ + XOReq64(A##ke, De); \ + Bmi = ROL64(A##ke, 10); \ + E##ma = XOR64(Bma, ANDnu64(Bme, Bmi)); \ + XOReq64(A##mi, Di); \ + Bmo = ROL64(A##mi, 15); \ + E##me = XOR64(Bme, ANDnu64(Bmi, Bmo)); \ + XOReq64(A##so, Do); \ + Bmu = ROL64(A##so, 56); \ + E##mi = XOR64(Bmi, ANDnu64(Bmo, Bmu)); \ + E##mo = XOR64(Bmo, ANDnu64(Bmu, Bma)); \ + E##mu = XOR64(Bmu, ANDnu64(Bma, Bme)); \ +\ + XOReq64(A##bi, Di); \ + Bsa = ROL64(A##bi, 62); \ + XOReq64(A##go, Do); \ + Bse = ROL64(A##go, 55); \ + XOReq64(A##ku, Du); \ + Bsi = ROL64(A##ku, 39); \ + E##sa = XOR64(Bsa, ANDnu64(Bse, Bsi)); \ + XOReq64(A##ma, Da); \ + Bso = ROL64(A##ma, 41); \ + E##se = XOR64(Bse, ANDnu64(Bsi, Bso)); \ + XOReq64(A##se, De); \ + Bsu = ROL64(A##se, 2); \ + E##si = XOR64(Bsi, ANDnu64(Bso, Bsu)); \ + E##so = XOR64(Bso, ANDnu64(Bsu, Bsa)); \ + E##su = XOR64(Bsu, ANDnu64(Bsa, Bse)); \ +\ + +static const UINT64 KeccakF1600RoundConstants[24] = { + 0x0000000000000001ULL, + 0x0000000000008082ULL, + 0x800000000000808aULL, + 0x8000000080008000ULL, + 0x000000000000808bULL, + 0x0000000080000001ULL, + 0x8000000080008081ULL, + 0x8000000000008009ULL, + 0x000000000000008aULL, + 0x0000000000000088ULL, + 0x0000000080008009ULL, + 0x000000008000000aULL, + 0x000000008000808bULL, + 0x800000000000008bULL, + 0x8000000000008089ULL, + 0x8000000000008003ULL, + 0x8000000000008002ULL, + 0x8000000000000080ULL, + 0x000000000000800aULL, + 0x800000008000000aULL, + 0x8000000080008081ULL, + 0x8000000000008080ULL, + 0x0000000080000001ULL, + 0x8000000080008008ULL }; + +#define copyFromStateAndXor576bits(X, state, input) \ + X##ba = XOR64(LOAD64(state[ 0]), LOAD64(input[ 0])); \ + X##be = XOR64(LOAD64(state[ 1]), LOAD64(input[ 1])); \ + X##bi = XOR64(LOAD64(state[ 2]), LOAD64(input[ 2])); \ + X##bo = XOR64(LOAD64(state[ 3]), LOAD64(input[ 3])); \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + X##ga = XOR64(LOAD64(state[ 5]), LOAD64(input[ 5])); \ + X##ge = XOR64(LOAD64(state[ 6]), LOAD64(input[ 6])); \ + X##gi = XOR64(LOAD64(state[ 7]), LOAD64(input[ 7])); \ + X##go = XOR64(LOAD64(state[ 8]), LOAD64(input[ 8])); \ + X##gu = LOAD64(state[ 9]); \ + X##ka = LOAD64(state[10]); \ + X##ke = LOAD64(state[11]); \ + X##ki = LOAD64(state[12]); \ + X##ko = LOAD64(state[13]); \ + X##ku = LOAD64(state[14]); \ + X##ma = LOAD64(state[15]); \ + X##me = LOAD64(state[16]); \ + X##mi = LOAD64(state[17]); \ + X##mo = LOAD64(state[18]); \ + X##mu = LOAD64(state[19]); \ + X##sa = LOAD64(state[20]); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyFromStateAndXor832bits(X, state, input) \ + X##ba = XOR64(LOAD64(state[ 0]), LOAD64(input[ 0])); \ + X##be = XOR64(LOAD64(state[ 1]), LOAD64(input[ 1])); \ + X##bi = XOR64(LOAD64(state[ 2]), LOAD64(input[ 2])); \ + X##bo = XOR64(LOAD64(state[ 3]), LOAD64(input[ 3])); \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + X##ga = XOR64(LOAD64(state[ 5]), LOAD64(input[ 5])); \ + X##ge = XOR64(LOAD64(state[ 6]), LOAD64(input[ 6])); \ + X##gi = XOR64(LOAD64(state[ 7]), LOAD64(input[ 7])); \ + X##go = XOR64(LOAD64(state[ 8]), LOAD64(input[ 8])); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##ka = XOR64(LOAD64(state[10]), LOAD64(input[10])); \ + X##ke = XOR64(LOAD64(state[11]), LOAD64(input[11])); \ + X##ki = XOR64(LOAD64(state[12]), LOAD64(input[12])); \ + X##ko = LOAD64(state[13]); \ + X##ku = LOAD64(state[14]); \ + X##ma = LOAD64(state[15]); \ + X##me = LOAD64(state[16]); \ + X##mi = LOAD64(state[17]); \ + X##mo = LOAD64(state[18]); \ + X##mu = LOAD64(state[19]); \ + X##sa = LOAD64(state[20]); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyFromStateAndXor1024bits(X, state, input) \ + X##ba = XOR64(LOAD64(state[ 0]), LOAD64(input[ 0])); \ + X##be = XOR64(LOAD64(state[ 1]), LOAD64(input[ 1])); \ + X##bi = XOR64(LOAD64(state[ 2]), LOAD64(input[ 2])); \ + X##bo = XOR64(LOAD64(state[ 3]), LOAD64(input[ 3])); \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + X##ga = XOR64(LOAD64(state[ 5]), LOAD64(input[ 5])); \ + X##ge = XOR64(LOAD64(state[ 6]), LOAD64(input[ 6])); \ + X##gi = XOR64(LOAD64(state[ 7]), LOAD64(input[ 7])); \ + X##go = XOR64(LOAD64(state[ 8]), LOAD64(input[ 8])); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##ka = XOR64(LOAD64(state[10]), LOAD64(input[10])); \ + X##ke = XOR64(LOAD64(state[11]), LOAD64(input[11])); \ + X##ki = XOR64(LOAD64(state[12]), LOAD64(input[12])); \ + X##ko = XOR64(LOAD64(state[13]), LOAD64(input[13])); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + X##ma = XOR64(LOAD64(state[15]), LOAD64(input[15])); \ + X##me = LOAD64(state[16]); \ + X##mi = LOAD64(state[17]); \ + X##mo = LOAD64(state[18]); \ + X##mu = LOAD64(state[19]); \ + X##sa = LOAD64(state[20]); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyFromStateAndXor1088bits(X, state, input) \ + X##ba = XOR64(LOAD64(state[ 0]), LOAD64(input[ 0])); \ + X##be = XOR64(LOAD64(state[ 1]), LOAD64(input[ 1])); \ + X##bi = XOR64(LOAD64(state[ 2]), LOAD64(input[ 2])); \ + X##bo = XOR64(LOAD64(state[ 3]), LOAD64(input[ 3])); \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + X##ga = XOR64(LOAD64(state[ 5]), LOAD64(input[ 5])); \ + X##ge = XOR64(LOAD64(state[ 6]), LOAD64(input[ 6])); \ + X##gi = XOR64(LOAD64(state[ 7]), LOAD64(input[ 7])); \ + X##go = XOR64(LOAD64(state[ 8]), LOAD64(input[ 8])); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##ka = XOR64(LOAD64(state[10]), LOAD64(input[10])); \ + X##ke = XOR64(LOAD64(state[11]), LOAD64(input[11])); \ + X##ki = XOR64(LOAD64(state[12]), LOAD64(input[12])); \ + X##ko = XOR64(LOAD64(state[13]), LOAD64(input[13])); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + X##ma = XOR64(LOAD64(state[15]), LOAD64(input[15])); \ + X##me = XOR64(LOAD64(state[16]), LOAD64(input[16])); \ + X##mi = LOAD64(state[17]); \ + X##mo = LOAD64(state[18]); \ + X##mu = LOAD64(state[19]); \ + X##sa = LOAD64(state[20]); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyFromStateAndXor1152bits(X, state, input) \ + X##ba = XOR64(LOAD64(state[ 0]), LOAD64(input[ 0])); \ + X##be = XOR64(LOAD64(state[ 1]), LOAD64(input[ 1])); \ + X##bi = XOR64(LOAD64(state[ 2]), LOAD64(input[ 2])); \ + X##bo = XOR64(LOAD64(state[ 3]), LOAD64(input[ 3])); \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + X##ga = XOR64(LOAD64(state[ 5]), LOAD64(input[ 5])); \ + X##ge = XOR64(LOAD64(state[ 6]), LOAD64(input[ 6])); \ + X##gi = XOR64(LOAD64(state[ 7]), LOAD64(input[ 7])); \ + X##go = XOR64(LOAD64(state[ 8]), LOAD64(input[ 8])); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##ka = XOR64(LOAD64(state[10]), LOAD64(input[10])); \ + X##ke = XOR64(LOAD64(state[11]), LOAD64(input[11])); \ + X##ki = XOR64(LOAD64(state[12]), LOAD64(input[12])); \ + X##ko = XOR64(LOAD64(state[13]), LOAD64(input[13])); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + X##ma = XOR64(LOAD64(state[15]), LOAD64(input[15])); \ + X##me = XOR64(LOAD64(state[16]), LOAD64(input[16])); \ + X##mi = XOR64(LOAD64(state[17]), LOAD64(input[17])); \ + X##mo = LOAD64(state[18]); \ + X##mu = LOAD64(state[19]); \ + X##sa = LOAD64(state[20]); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyFromStateAndXor1344bits(X, state, input) \ + X##ba = XOR64(LOAD64(state[ 0]), LOAD64(input[ 0])); \ + X##be = XOR64(LOAD64(state[ 1]), LOAD64(input[ 1])); \ + X##bi = XOR64(LOAD64(state[ 2]), LOAD64(input[ 2])); \ + X##bo = XOR64(LOAD64(state[ 3]), LOAD64(input[ 3])); \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + X##ga = XOR64(LOAD64(state[ 5]), LOAD64(input[ 5])); \ + X##ge = XOR64(LOAD64(state[ 6]), LOAD64(input[ 6])); \ + X##gi = XOR64(LOAD64(state[ 7]), LOAD64(input[ 7])); \ + X##go = XOR64(LOAD64(state[ 8]), LOAD64(input[ 8])); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##ka = XOR64(LOAD64(state[10]), LOAD64(input[10])); \ + X##ke = XOR64(LOAD64(state[11]), LOAD64(input[11])); \ + X##ki = XOR64(LOAD64(state[12]), LOAD64(input[12])); \ + X##ko = XOR64(LOAD64(state[13]), LOAD64(input[13])); \ + X##ku = XOR64(LOAD64(state[14]), LOAD64(input[14])); \ + X##ma = XOR64(LOAD64(state[15]), LOAD64(input[15])); \ + X##me = XOR64(LOAD64(state[16]), LOAD64(input[16])); \ + X##mi = XOR64(LOAD64(state[17]), LOAD64(input[17])); \ + X##mo = XOR64(LOAD64(state[18]), LOAD64(input[18])); \ + X##mu = XOR64(LOAD64(state[19]), LOAD64(input[19])); \ + X##sa = XOR64(LOAD64(state[20]), LOAD64(input[20])); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyFromState(X, state) \ + X##ba = LOAD64(state[ 0]); \ + X##be = LOAD64(state[ 1]); \ + X##bi = LOAD64(state[ 2]); \ + X##bo = LOAD64(state[ 3]); \ + X##bu = LOAD64(state[ 4]); \ + X##ga = LOAD64(state[ 5]); \ + X##ge = LOAD64(state[ 6]); \ + X##gi = LOAD64(state[ 7]); \ + X##go = LOAD64(state[ 8]); \ + X##gu = LOAD64(state[ 9]); \ + X##ka = LOAD64(state[10]); \ + X##ke = LOAD64(state[11]); \ + X##ki = LOAD64(state[12]); \ + X##ko = LOAD64(state[13]); \ + X##ku = LOAD64(state[14]); \ + X##ma = LOAD64(state[15]); \ + X##me = LOAD64(state[16]); \ + X##mi = LOAD64(state[17]); \ + X##mo = LOAD64(state[18]); \ + X##mu = LOAD64(state[19]); \ + X##sa = LOAD64(state[20]); \ + X##se = LOAD64(state[21]); \ + X##si = LOAD64(state[22]); \ + X##so = LOAD64(state[23]); \ + X##su = LOAD64(state[24]); \ + +#define copyToState(state, X) \ + STORE64(state[ 0], X##ba); \ + STORE64(state[ 1], X##be); \ + STORE64(state[ 2], X##bi); \ + STORE64(state[ 3], X##bo); \ + STORE64(state[ 4], X##bu); \ + STORE64(state[ 5], X##ga); \ + STORE64(state[ 6], X##ge); \ + STORE64(state[ 7], X##gi); \ + STORE64(state[ 8], X##go); \ + STORE64(state[ 9], X##gu); \ + STORE64(state[10], X##ka); \ + STORE64(state[11], X##ke); \ + STORE64(state[12], X##ki); \ + STORE64(state[13], X##ko); \ + STORE64(state[14], X##ku); \ + STORE64(state[15], X##ma); \ + STORE64(state[16], X##me); \ + STORE64(state[17], X##mi); \ + STORE64(state[18], X##mo); \ + STORE64(state[19], X##mu); \ + STORE64(state[20], X##sa); \ + STORE64(state[21], X##se); \ + STORE64(state[22], X##si); \ + STORE64(state[23], X##so); \ + STORE64(state[24], X##su); \ + +#define copyStateVariables(X, Y) \ + X##ba = Y##ba; \ + X##be = Y##be; \ + X##bi = Y##bi; \ + X##bo = Y##bo; \ + X##bu = Y##bu; \ + X##ga = Y##ga; \ + X##ge = Y##ge; \ + X##gi = Y##gi; \ + X##go = Y##go; \ + X##gu = Y##gu; \ + X##ka = Y##ka; \ + X##ke = Y##ke; \ + X##ki = Y##ki; \ + X##ko = Y##ko; \ + X##ku = Y##ku; \ + X##ma = Y##ma; \ + X##me = Y##me; \ + X##mi = Y##mi; \ + X##mo = Y##mo; \ + X##mu = Y##mu; \ + X##sa = Y##sa; \ + X##se = Y##se; \ + X##si = Y##si; \ + X##so = Y##so; \ + X##su = Y##su; \ + diff --git a/Modules/_sha3/keccak/KeccakF-1600-unrolling.macros b/Modules/_sha3/keccak/KeccakF-1600-unrolling.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-unrolling.macros @@ -0,0 +1,124 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#if (Unrolling == 24) +#define rounds \ + prepareTheta \ + thetaRhoPiChiIotaPrepareTheta( 0, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 1, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 2, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 3, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 4, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 5, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 6, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 7, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 8, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 9, E, A) \ + thetaRhoPiChiIotaPrepareTheta(10, A, E) \ + thetaRhoPiChiIotaPrepareTheta(11, E, A) \ + thetaRhoPiChiIotaPrepareTheta(12, A, E) \ + thetaRhoPiChiIotaPrepareTheta(13, E, A) \ + thetaRhoPiChiIotaPrepareTheta(14, A, E) \ + thetaRhoPiChiIotaPrepareTheta(15, E, A) \ + thetaRhoPiChiIotaPrepareTheta(16, A, E) \ + thetaRhoPiChiIotaPrepareTheta(17, E, A) \ + thetaRhoPiChiIotaPrepareTheta(18, A, E) \ + thetaRhoPiChiIotaPrepareTheta(19, E, A) \ + thetaRhoPiChiIotaPrepareTheta(20, A, E) \ + thetaRhoPiChiIotaPrepareTheta(21, E, A) \ + thetaRhoPiChiIotaPrepareTheta(22, A, E) \ + thetaRhoPiChiIota(23, E, A) \ + copyToState(state, A) +#elif (Unrolling == 12) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i+=12) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 3, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 4, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 5, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 6, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 7, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 8, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 9, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+10, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+11, E, A) \ + } \ + copyToState(state, A) +#elif (Unrolling == 8) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i+=8) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+4, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+5, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+6, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+7, E, A) \ + } \ + copyToState(state, A) +#elif (Unrolling == 6) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i+=6) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+4, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+5, E, A) \ + } \ + copyToState(state, A) +#elif (Unrolling == 4) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i+=4) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + } \ + copyToState(state, A) +#elif (Unrolling == 3) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i+=3) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + copyStateVariables(A, E) \ + } \ + copyToState(state, A) +#elif (Unrolling == 2) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i+=2) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + } \ + copyToState(state, A) +#elif (Unrolling == 1) +#define rounds \ + prepareTheta \ + for(i=0; i<24; i++) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + copyStateVariables(A, E) \ + } \ + copyToState(state, A) +#else +#error "Unrolling is not correctly specified!" +#endif diff --git a/Modules/_sha3/keccak/KeccakF-1600-xop.macros b/Modules/_sha3/keccak/KeccakF-1600-xop.macros new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakF-1600-xop.macros @@ -0,0 +1,573 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + V128 Abage, Abegi, Abigo, Abogu, Abuga; \ + V128 Akame, Akemi, Akimo, Akomu, Akuma; \ + V128 Abae, Abio, Agae, Agio, Akae, Akio, Amae, Amio; \ + V64 Aba, Abe, Abi, Abo, Abu; \ + V64 Aga, Age, Agi, Ago, Agu; \ + V64 Aka, Ake, Aki, Ako, Aku; \ + V64 Ama, Ame, Ami, Amo, Amu; \ + V128 Asase, Asiso; \ + V64 Asu; \ + V128 Bbage, Bbegi, Bbigo, Bbogu, Bbuga; \ + V128 Bkame, Bkemi, Bkimo, Bkomu, Bkuma; \ + V128 Bsase, Bsesi, Bsiso, Bsosu, Bsusa; \ + V128 Cae, Cei, Cio, Cou, Cua; \ + V128 Dau, Dea, Die, Doi, Duo; \ + V128 Dua, Dae, Dei, Dio, Dou; \ + V128 Ebage, Ebegi, Ebigo, Ebogu, Ebuga; \ + V128 Ekame, Ekemi, Ekimo, Ekomu, Ekuma; \ + V128 Esase, Esiso; \ + V64 Esu; \ + V128 Zero; + +#define prepareTheta + +#define computeD \ + Cua = GET64LOLO(Cua, Cae); \ + Dei = XOR128(Cae, ROL6464same(Cio, 1)); \ + Dou = XOR128(Cio, ROL6464same(Cua, 1)); \ + Cei = GET64HILO(Cae, Cio); \ + Dae = XOR128(Cua, ROL6464same(Cei, 1)); \ + Dau = GET64LOHI(Dae, Dou); \ + Dea = SWAP64(Dae); \ + Die = SWAP64(Dei); \ + Doi = GET64LOLO(Dou, Die); \ + Duo = SWAP64(Dou); + +/* --- Theta Rho Pi Chi Iota Prepare-theta */ +/* --- 64-bit lanes mapped to 64-bit and 128-bit words */ +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + computeD \ + \ + Bbage = XOR128(GET64LOHI(A##bage, A##bogu), Dau); \ + Bbage = ROL6464(Bbage, 0, 20); \ + Bbegi = XOR128(GET64HILO(A##bage, A##kame), Dea); \ + Bbegi = ROL6464(Bbegi, 44, 3); \ + Bbigo = XOR128(GET64LOHI(A##kimo, A##kame), Die); \ + Bbigo = ROL6464(Bbigo, 43, 45); \ + E##bage = XOR128(Bbage, ANDnu128(Bbegi, Bbigo)); \ + XOReq128(E##bage, CONST64(KeccakF1600RoundConstants[i])); \ + Cae = E##bage; \ + Bbogu = XOR128(GET64HILO(A##kimo, A##siso), Doi); \ + Bbogu = ROL6464(Bbogu, 21, 61); \ + E##begi = XOR128(Bbegi, ANDnu128(Bbigo, Bbogu)); \ + Cei = E##begi; \ + Bbuga = XOR128(GET64LOLO(A##su, A##bogu), Duo); \ + Bbuga = ROL6464(Bbuga, 14, 28); \ + E##bigo = XOR128(Bbigo, ANDnu128(Bbogu, Bbuga)); \ + Cio = E##bigo; \ + E##bogu = XOR128(Bbogu, ANDnu128(Bbuga, Bbage)); \ + Cou = E##bogu; \ + E##buga = XOR128(Bbuga, ANDnu128(Bbage, Bbegi)); \ + Cua = E##buga; \ +\ + Bkame = XOR128(GET64LOHI(A##begi, A##buga), Dea); \ + Bkame = ROL6464(Bkame, 1, 36); \ + Bkemi = XOR128(GET64HILO(A##begi, A##kemi), Die); \ + Bkemi = ROL6464(Bkemi, 6, 10); \ + Bkimo = XOR128(GET64LOHI(A##komu, A##kemi), Doi); \ + Bkimo = ROL6464(Bkimo, 25, 15); \ + E##kame = XOR128(Bkame, ANDnu128(Bkemi, Bkimo)); \ + XOReq128(Cae, E##kame); \ + Bkomu = XOR128(GET64HIHI(A##komu, A##siso), Duo); \ + Bkomu = ROL6464(Bkomu, 8, 56); \ + E##kemi = XOR128(Bkemi, ANDnu128(Bkimo, Bkomu)); \ + XOReq128(Cei, E##kemi); \ + Bkuma = XOR128(GET64LOLO(A##sase, A##buga), Dau); \ + Bkuma = ROL6464(Bkuma, 18, 27); \ + E##kimo = XOR128(Bkimo, ANDnu128(Bkomu, Bkuma)); \ + XOReq128(Cio, E##kimo); \ + E##komu = XOR128(Bkomu, ANDnu128(Bkuma, Bkame)); \ + XOReq128(Cou, E##komu); \ + E##kuma = XOR128(Bkuma, ANDnu128(Bkame, Bkemi)); \ + XOReq128(Cua, E##kuma); \ +\ + Bsase = XOR128(A##bigo, SWAP64(Doi)); \ + Bsase = ROL6464(Bsase, 62, 55); \ + Bsiso = XOR128(A##kuma, SWAP64(Dau)); \ + Bsiso = ROL6464(Bsiso, 39, 41); \ + Bsusa = XOR64(COPY64HI2LO(A##sase), Dei); \ + Bsusa = ROL6464same(Bsusa, 2); \ + Bsusa = GET64LOLO(Bsusa, Bsase); \ + Bsesi = GET64HILO(Bsase, Bsiso); \ + Bsosu = GET64HILO(Bsiso, Bsusa); \ + E##sase = XOR128(Bsase, ANDnu128(Bsesi, Bsiso)); \ + XOReq128(Cae, E##sase); \ + E##siso = XOR128(Bsiso, ANDnu128(Bsosu, Bsusa)); \ + XOReq128(Cio, E##siso); \ + E##su = GET64LOLO(XOR128(Bsusa, ANDnu128(Bsase, Bsesi)), Zero); \ + XOReq128(Cua, E##su); \ +\ + Zero = ZERO128(); \ + XOReq128(Cae, GET64HIHI(Cua, Zero)); \ + XOReq128(Cae, GET64LOLO(Zero, Cei)); \ + XOReq128(Cio, GET64HIHI(Cei, Zero)); \ + XOReq128(Cio, GET64LOLO(Zero, Cou)); \ + XOReq128(Cua, GET64HIHI(Cou, Zero)); \ + +/* --- Theta Rho Pi Chi Iota */ +/* --- 64-bit lanes mapped to 64-bit and 128-bit words */ +#define thetaRhoPiChiIota(i, A, E) thetaRhoPiChiIotaPrepareTheta(i, A, E) + +static const UINT64 KeccakF1600RoundConstants[24] = { + 0x0000000000000001ULL, + 0x0000000000008082ULL, + 0x800000000000808aULL, + 0x8000000080008000ULL, + 0x000000000000808bULL, + 0x0000000080000001ULL, + 0x8000000080008081ULL, + 0x8000000000008009ULL, + 0x000000000000008aULL, + 0x0000000000000088ULL, + 0x0000000080008009ULL, + 0x000000008000000aULL, + 0x000000008000808bULL, + 0x800000000000008bULL, + 0x8000000000008089ULL, + 0x8000000000008003ULL, + 0x8000000000008002ULL, + 0x8000000000000080ULL, + 0x000000000000800aULL, + 0x800000008000000aULL, + 0x8000000080008081ULL, + 0x8000000000008080ULL, + 0x0000000080000001ULL, + 0x8000000080008008ULL }; + +#define copyFromStateAndXor576bits(X, state, input) \ + X##bae = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cua = X##bu; \ + X##gae = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = LOAD64(state[ 9]); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = LOAD128(state[10]); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = LOAD128(state[12]); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = LOAD128(state[14]); \ + XOReq64(Cua, X##kuma); \ + X##me = LOAD64(state[16]); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = LOAD128u(state[17]); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = LOAD64(state[19]); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = LOAD128(state[20]); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyFromStateAndXor832bits(X, state, input) \ + X##bae = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cua = X##bu; \ + X##gae = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = XOR128(LOAD128(state[12]), LOAD64(input[12])); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = LOAD128(state[14]); \ + XOReq64(Cua, X##kuma); \ + X##me = LOAD64(state[16]); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = LOAD128u(state[17]); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = LOAD64(state[19]); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = LOAD128(state[20]); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyFromStateAndXor1024bits(X, state, input) \ + X##bae = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cua = X##bu; \ + X##gae = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = XOR128(LOAD128(state[14]), LOAD128(input[14])); \ + XOReq64(Cua, X##kuma); \ + X##me = LOAD64(state[16]); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = LOAD128u(state[17]); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = LOAD64(state[19]); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = LOAD128(state[20]); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyFromStateAndXor1088bits(X, state, input) \ + X##bae = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cua = X##bu; \ + X##gae = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = XOR128(LOAD128(state[14]), LOAD128(input[14])); \ + XOReq64(Cua, X##kuma); \ + X##me = XOR64(LOAD64(state[16]), LOAD64(input[16])); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = LOAD128u(state[17]); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = LOAD64(state[19]); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = LOAD128(state[20]); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyFromStateAndXor1152bits(X, state, input) \ + X##bae = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cua = X##bu; \ + X##gae = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = XOR128(LOAD128(state[14]), LOAD128(input[14])); \ + XOReq64(Cua, X##kuma); \ + X##me = XOR64(LOAD64(state[16]), LOAD64(input[16])); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = XOR128(LOAD128u(state[17]), LOAD64(input[17])); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = LOAD64(state[19]); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = LOAD128(state[20]); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyFromStateAndXor1344bits(X, state, input) \ + X##bae = XOR128(LOAD128(state[ 0]), LOAD128u(input[ 0])); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = XOR128(LOAD128(state[ 2]), LOAD128u(input[ 2])); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = XOR64(LOAD64(state[ 4]), LOAD64(input[ 4])); \ + Cua = X##bu; \ + X##gae = XOR128(LOAD128u(state[ 5]), LOAD128u(input[ 5])); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = XOR128(LOAD128u(state[ 7]), LOAD128u(input[ 7])); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = XOR64(LOAD64(state[ 9]), LOAD64(input[ 9])); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = XOR128(LOAD128(state[10]), LOAD128u(input[10])); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = XOR128(LOAD128(state[12]), LOAD128u(input[12])); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = XOR128(LOAD128(state[14]), LOAD128(input[14])); \ + XOReq64(Cua, X##kuma); \ + X##me = XOR64(LOAD64(state[16]), LOAD64(input[16])); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = XOR128(LOAD128u(state[17]), LOAD128u(input[17])); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = XOR64(LOAD64(state[19]), LOAD64(input[19])); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = XOR128(LOAD128(state[20]), LOAD64(input[20])); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyFromState(X, state) \ + X##bae = LOAD128(state[ 0]); \ + X##ba = X##bae; \ + X##be = GET64HIHI(X##bae, X##bae); \ + Cae = X##bae; \ + X##bio = LOAD128(state[ 2]); \ + X##bi = X##bio; \ + X##bo = GET64HIHI(X##bio, X##bio); \ + Cio = X##bio; \ + X##bu = LOAD64(state[ 4]); \ + Cua = X##bu; \ + X##gae = LOAD128u(state[ 5]); \ + X##ga = X##gae; \ + X##buga = GET64LOLO(X##bu, X##ga); \ + X##ge = GET64HIHI(X##gae, X##gae); \ + X##bage = GET64LOLO(X##ba, X##ge); \ + XOReq128(Cae, X##gae); \ + X##gio = LOAD128u(state[ 7]); \ + X##gi = X##gio; \ + X##begi = GET64LOLO(X##be, X##gi); \ + X##go = GET64HIHI(X##gio, X##gio); \ + X##bigo = GET64LOLO(X##bi, X##go); \ + XOReq128(Cio, X##gio); \ + X##gu = LOAD64(state[ 9]); \ + X##bogu = GET64LOLO(X##bo, X##gu); \ + XOReq64(Cua, X##gu); \ + X##kae = LOAD128(state[10]); \ + X##ka = X##kae; \ + X##ke = GET64HIHI(X##kae, X##kae); \ + XOReq128(Cae, X##kae); \ + X##kio = LOAD128(state[12]); \ + X##ki = X##kio; \ + X##ko = GET64HIHI(X##kio, X##kio); \ + XOReq128(Cio, X##kio); \ + X##kuma = LOAD128(state[14]); \ + XOReq64(Cua, X##kuma); \ + X##me = LOAD64(state[16]); \ + X##kame = GET64LOLO(X##ka, X##me); \ + XOReq128(Cae, GET64HIHI(X##kuma, X##kame)); \ + X##mio = LOAD128u(state[17]); \ + X##mi = X##mio; \ + X##kemi = GET64LOLO(X##ke, X##mi); \ + X##mo = GET64HIHI(X##mio, X##mio); \ + X##kimo = GET64LOLO(X##ki, X##mo); \ + XOReq128(Cio, X##mio); \ + X##mu = LOAD64(state[19]); \ + X##komu = GET64LOLO(X##ko, X##mu); \ + XOReq64(Cua, X##mu); \ + X##sase = LOAD128(state[20]); \ + XOReq128(Cae, X##sase); \ + X##siso = LOAD128(state[22]); \ + XOReq128(Cio, X##siso); \ + X##su = LOAD64(state[24]); \ + XOReq64(Cua, X##su); \ + +#define copyToState(state, X) \ + STORE64(state[ 0], X##bage); \ + STORE64(state[ 1], X##begi); \ + STORE64(state[ 2], X##bigo); \ + STORE64(state[ 3], X##bogu); \ + STORE128(state[ 4], X##buga); \ + STORE64(state[ 6], COPY64HI2LO(X##bage)); \ + STORE64(state[ 7], COPY64HI2LO(X##begi)); \ + STORE64(state[ 8], COPY64HI2LO(X##bigo)); \ + STORE64(state[ 9], COPY64HI2LO(X##bogu)); \ + STORE64(state[10], X##kame); \ + STORE64(state[11], X##kemi); \ + STORE64(state[12], X##kimo); \ + STORE64(state[13], X##komu); \ + STORE128(state[14], X##kuma); \ + STORE64(state[16], COPY64HI2LO(X##kame)); \ + STORE64(state[17], COPY64HI2LO(X##kemi)); \ + STORE64(state[18], COPY64HI2LO(X##kimo)); \ + STORE64(state[19], COPY64HI2LO(X##komu)); \ + STORE128(state[20], X##sase); \ + STORE128(state[22], X##siso); \ + STORE64(state[24], X##su); \ + +#define copyStateVariables(X, Y) \ + X##bage = Y##bage; \ + X##begi = Y##begi; \ + X##bigo = Y##bigo; \ + X##bogu = Y##bogu; \ + X##buga = Y##buga; \ + X##kame = Y##kame; \ + X##kemi = Y##kemi; \ + X##kimo = Y##kimo; \ + X##komu = Y##komu; \ + X##kuma = Y##kuma; \ + X##sase = Y##sase; \ + X##siso = Y##siso; \ + X##su = Y##su; \ + diff --git a/Modules/_sha3/keccak/KeccakNISTInterface.c b/Modules/_sha3/keccak/KeccakNISTInterface.c new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakNISTInterface.c @@ -0,0 +1,83 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +#include "KeccakNISTInterface.h" +#include "KeccakF-1600-interface.h" + +static HashReturn Init(hashState *state, int hashbitlen) +{ + switch(hashbitlen) { + case 0: /* Default parameters, arbitrary length output */ + InitSponge((spongeState*)state, 1024, 576); + break; + case 224: + InitSponge((spongeState*)state, 1152, 448); + break; + case 256: + InitSponge((spongeState*)state, 1088, 512); + break; + case 384: + InitSponge((spongeState*)state, 832, 768); + break; + case 512: + InitSponge((spongeState*)state, 576, 1024); + break; + default: + return BAD_HASHLEN; + } + state->fixedOutputLength = hashbitlen; + return SUCCESS; +} + +static HashReturn Update(hashState *state, const BitSequence *data, DataLength databitlen) +{ + if ((databitlen % 8) == 0) + return Absorb((spongeState*)state, data, databitlen); + else { + HashReturn ret = Absorb((spongeState*)state, data, databitlen - (databitlen % 8)); + if (ret == SUCCESS) { + unsigned char lastByte; + /* Align the last partial byte to the least significant bits */ + lastByte = data[databitlen/8] >> (8 - (databitlen % 8)); + return Absorb((spongeState*)state, &lastByte, databitlen % 8); + } + else + return ret; + } +} + +static HashReturn Final(hashState *state, BitSequence *hashval) +{ + return Squeeze(state, hashval, state->fixedOutputLength); +} + +/* +static HashReturn Hash(int hashbitlen, const BitSequence *data, DataLength databitlen, BitSequence *hashval) +{ + hashState state; + HashReturn result; + + if ((hashbitlen != 224) && (hashbitlen != 256) && (hashbitlen != 384) && (hashbitlen != 512)) + return BAD_HASHLEN; * Only the four fixed output lengths available through this API * + result = Init(&state, hashbitlen); + if (result != SUCCESS) + return result; + result = Update(&state, data, databitlen); + if (result != SUCCESS) + return result; + result = Final(&state, hashval); + return result; +} +*/ + diff --git a/Modules/_sha3/keccak/KeccakNISTInterface.h b/Modules/_sha3/keccak/KeccakNISTInterface.h new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakNISTInterface.h @@ -0,0 +1,72 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakNISTInterface_h_ +#define _KeccakNISTInterface_h_ + +#include "KeccakSponge.h" + +typedef unsigned char BitSequence; +typedef unsigned long long DataLength; +typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn; + +typedef spongeState hashState; + +/** + * Function to initialize the state of the Keccak[r, c] sponge function. + * The rate r and capacity c values are determined from @a hashbitlen. + * @param state Pointer to the state of the sponge function to be initialized. + * @param hashbitlen The desired number of output bits, + * or 0 for Keccak[] with default parameters + * and arbitrarily-long output. + * @pre The value of hashbitlen must be one of 0, 224, 256, 384 and 512. + * @return SUCCESS if successful, BAD_HASHLEN if the value of hashbitlen is incorrect. + */ +static HashReturn Init(hashState *state, int hashbitlen); +/** + * Function to give input data for the sponge function to absorb. + * @param state Pointer to the state of the sponge function initialized by Init(). + * @param data Pointer to the input data. + * When @a databitLen is not a multiple of 8, the last bits of data must be + * in the most significant bits of the last byte. + * @param databitLen The number of input bits provided in the input data. + * @pre In the previous call to Absorb(), databitLen was a multiple of 8. + * @return SUCCESS if successful, FAIL otherwise. + */ +static HashReturn Update(hashState *state, const BitSequence *data, DataLength databitlen); +/** + * Function to squeeze output data from the sponge function. + * If @a hashbitlen was not 0 in the call to Init(), the number of output bits is equal to @a hashbitlen. + * If @a hashbitlen was 0 in the call to Init(), the output bits must be extracted using the Squeeze() function. + * @param state Pointer to the state of the sponge function initialized by Init(). + * @param hashval Pointer to the buffer where to store the output data. + * @return SUCCESS if successful, FAIL otherwise. + */ +static HashReturn Final(hashState *state, BitSequence *hashval); +/** + * Function to compute a hash using the Keccak[r, c] sponge function. + * The rate r and capacity c values are determined from @a hashbitlen. + * @param hashbitlen The desired number of output bits. + * @param data Pointer to the input data. + * When @a databitLen is not a multiple of 8, the last bits of data must be + * in the most significant bits of the last byte. + * @param databitLen The number of input bits provided in the input data. + * @param hashval Pointer to the buffer where to store the output data. + * @pre The value of hashbitlen must be one of 224, 256, 384 and 512. + * @return SUCCESS if successful, BAD_HASHLEN if the value of hashbitlen is incorrect. + */ +/* +static HashReturn Hash(int hashbitlen, const BitSequence *data, DataLength databitlen, BitSequence *hashval); +*/ + +#endif diff --git a/Modules/_sha3/keccak/KeccakSponge.c b/Modules/_sha3/keccak/KeccakSponge.c new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakSponge.c @@ -0,0 +1,266 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +#include "KeccakSponge.h" +#include "KeccakF-1600-interface.h" +#ifdef KeccakReference +#include "displayIntermediateValues.h" +#endif + +static int InitSponge(spongeState *state, unsigned int rate, unsigned int capacity) +{ + if (rate+capacity != 1600) + return 1; + if ((rate <= 0) || (rate >= 1600) || ((rate % 64) != 0)) + return 1; + KeccakInitialize(); + state->rate = rate; + state->capacity = capacity; + state->fixedOutputLength = 0; + KeccakInitializeState(state->state); + memset(state->dataQueue, 0, KeccakMaximumRateInBytes); + state->bitsInQueue = 0; + state->squeezing = 0; + state->bitsAvailableForSqueezing = 0; + + return 0; +} + +static void AbsorbQueue(spongeState *state) +{ + /* state->bitsInQueue is assumed to be equal to state->rate */ + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed", state->dataQueue, state->rate/8); + #endif +#ifdef ProvideFast576 + if (state->rate == 576) + KeccakAbsorb576bits(state->state, state->dataQueue); + else +#endif +#ifdef ProvideFast832 + if (state->rate == 832) + KeccakAbsorb832bits(state->state, state->dataQueue); + else +#endif +#ifdef ProvideFast1024 + if (state->rate == 1024) + KeccakAbsorb1024bits(state->state, state->dataQueue); + else +#endif +#ifdef ProvideFast1088 + if (state->rate == 1088) + KeccakAbsorb1088bits(state->state, state->dataQueue); + else +#endif +#ifdef ProvideFast1152 + if (state->rate == 1152) + KeccakAbsorb1152bits(state->state, state->dataQueue); + else +#endif +#ifdef ProvideFast1344 + if (state->rate == 1344) + KeccakAbsorb1344bits(state->state, state->dataQueue); + else +#endif + KeccakAbsorb(state->state, state->dataQueue, state->rate/64); + state->bitsInQueue = 0; +} + +static int Absorb(spongeState *state, const unsigned char *data, unsigned long long databitlen) +{ + unsigned long long i, j, wholeBlocks; + unsigned int partialBlock, partialByte; + const unsigned char *curData; + + if ((state->bitsInQueue % 8) != 0) + return 1; /* Only the last call may contain a partial byte */ + if (state->squeezing) + return 1; /* Too late for additional input */ + + i = 0; + while(i < databitlen) { + if ((state->bitsInQueue == 0) && (databitlen >= state->rate) && (i <= (databitlen-state->rate))) { + wholeBlocks = (databitlen-i)/state->rate; + curData = data+i/8; +#ifdef ProvideFast576 + if (state->rate == 576) { + for(j=0; jrate/8); + #endif + KeccakAbsorb576bits(state->state, curData); + } + } + else +#endif +#ifdef ProvideFast832 + if (state->rate == 832) { + for(j=0; jrate/8); + #endif + KeccakAbsorb832bits(state->state, curData); + } + } + else +#endif +#ifdef ProvideFast1024 + if (state->rate == 1024) { + for(j=0; jrate/8); + #endif + KeccakAbsorb1024bits(state->state, curData); + } + } + else +#endif +#ifdef ProvideFast1088 + if (state->rate == 1088) { + for(j=0; jrate/8); + #endif + KeccakAbsorb1088bits(state->state, curData); + } + } + else +#endif +#ifdef ProvideFast1152 + if (state->rate == 1152) { + for(j=0; jrate/8); + #endif + KeccakAbsorb1152bits(state->state, curData); + } + } + else +#endif +#ifdef ProvideFast1344 + if (state->rate == 1344) { + for(j=0; jrate/8); + #endif + KeccakAbsorb1344bits(state->state, curData); + } + } + else +#endif + { + for(j=0; jrate/8) { + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed", curData, state->rate/8); + #endif + KeccakAbsorb(state->state, curData, state->rate/64); + } + } + i += wholeBlocks*state->rate; + } + else { + partialBlock = (unsigned int)(databitlen - i); + if (partialBlock+state->bitsInQueue > state->rate) + partialBlock = state->rate-state->bitsInQueue; + partialByte = partialBlock % 8; + partialBlock -= partialByte; + memcpy(state->dataQueue+state->bitsInQueue/8, data+i/8, partialBlock/8); + state->bitsInQueue += partialBlock; + i += partialBlock; + if (state->bitsInQueue == state->rate) + AbsorbQueue(state); + if (partialByte > 0) { + unsigned char mask = (1 << partialByte)-1; + state->dataQueue[state->bitsInQueue/8] = data[i/8] & mask; + state->bitsInQueue += partialByte; + i += partialByte; + } + } + } + return 0; +} + +static void PadAndSwitchToSqueezingPhase(spongeState *state) +{ + /* Note: the bits are numbered from 0=LSB to 7=MSB */ + if (state->bitsInQueue + 1 == state->rate) { + state->dataQueue[state->bitsInQueue/8 ] |= 1 << (state->bitsInQueue % 8); + AbsorbQueue(state); + memset(state->dataQueue, 0, state->rate/8); + } + else { + memset(state->dataQueue + (state->bitsInQueue+7)/8, 0, state->rate/8 - (state->bitsInQueue+7)/8); + state->dataQueue[state->bitsInQueue/8 ] |= 1 << (state->bitsInQueue % 8); + } + state->dataQueue[(state->rate-1)/8] |= 1 << ((state->rate-1) % 8); + AbsorbQueue(state); + + #ifdef KeccakReference + displayText(1, "--- Switching to squeezing phase ---"); + #endif +#ifdef ProvideFast1024 + if (state->rate == 1024) { + KeccakExtract1024bits(state->state, state->dataQueue); + state->bitsAvailableForSqueezing = 1024; + } + else +#endif + { + KeccakExtract(state->state, state->dataQueue, state->rate/64); + state->bitsAvailableForSqueezing = state->rate; + } + #ifdef KeccakReference + displayBytes(1, "Block available for squeezing", state->dataQueue, state->bitsAvailableForSqueezing/8); + #endif + state->squeezing = 1; +} + +static int Squeeze(spongeState *state, unsigned char *output, unsigned long long outputLength) +{ + unsigned long long i; + unsigned int partialBlock; + + if (!state->squeezing) + PadAndSwitchToSqueezingPhase(state); + if ((outputLength % 8) != 0) + return 1; /* Only multiple of 8 bits are allowed, truncation can be done at user level */ + + i = 0; + while(i < outputLength) { + if (state->bitsAvailableForSqueezing == 0) { + KeccakPermutation(state->state); +#ifdef ProvideFast1024 + if (state->rate == 1024) { + KeccakExtract1024bits(state->state, state->dataQueue); + state->bitsAvailableForSqueezing = 1024; + } + else +#endif + { + KeccakExtract(state->state, state->dataQueue, state->rate/64); + state->bitsAvailableForSqueezing = state->rate; + } + #ifdef KeccakReference + displayBytes(1, "Block available for squeezing", state->dataQueue, state->bitsAvailableForSqueezing/8); + #endif + } + partialBlock = state->bitsAvailableForSqueezing; + if ((unsigned long long)partialBlock > outputLength - i) + partialBlock = (unsigned int)(outputLength - i); + memcpy(output+i/8, state->dataQueue+(state->rate-state->bitsAvailableForSqueezing)/8, partialBlock/8); + state->bitsAvailableForSqueezing -= partialBlock; + i += partialBlock; + } + return 0; +} diff --git a/Modules/_sha3/keccak/KeccakSponge.h b/Modules/_sha3/keccak/KeccakSponge.h new file mode 100644 --- /dev/null +++ b/Modules/_sha3/keccak/KeccakSponge.h @@ -0,0 +1,76 @@ +/* +The Keccak sponge function, designed by Guido Bertoni, Joan Daemen, +Micha?l Peeters and Gilles Van Assche. For more information, feedback or +questions, please refer to our website: http://keccak.noekeon.org/ + +Implementation by the designers, +hereby denoted as "the implementer". + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakSponge_h_ +#define _KeccakSponge_h_ + +#define KeccakPermutationSize 1600 +#define KeccakPermutationSizeInBytes (KeccakPermutationSize/8) +#define KeccakMaximumRate 1536 +#define KeccakMaximumRateInBytes (KeccakMaximumRate/8) + +#if defined(__GNUC__) +#define ALIGN __attribute__ ((aligned(32))) +#elif defined(_MSC_VER) +#define ALIGN __declspec(align(32)) +#else +#define ALIGN +#endif + +ALIGN typedef struct spongeStateStruct { + ALIGN unsigned char state[KeccakPermutationSizeInBytes]; + ALIGN unsigned char dataQueue[KeccakMaximumRateInBytes]; + unsigned int rate; + unsigned int capacity; + unsigned int bitsInQueue; + unsigned int fixedOutputLength; + int squeezing; + unsigned int bitsAvailableForSqueezing; +} spongeState; + +/** + * Function to initialize the state of the Keccak[r, c] sponge function. + * The sponge function is set to the absorbing phase. + * @param state Pointer to the state of the sponge function to be initialized. + * @param rate The value of the rate r. + * @param capacity The value of the capacity c. + * @pre One must have r+c=1600 and the rate a multiple of 64 bits in this implementation. + * @return Zero if successful, 1 otherwise. + */ +static int InitSponge(spongeState *state, unsigned int rate, unsigned int capacity); +/** + * Function to give input data for the sponge function to absorb. + * @param state Pointer to the state of the sponge function initialized by InitSponge(). + * @param data Pointer to the input data. + * When @a databitLen is not a multiple of 8, the last bits of data must be + * in the least significant bits of the last byte. + * @param databitLen The number of input bits provided in the input data. + * @pre In the previous call to Absorb(), databitLen was a multiple of 8. + * @pre The sponge function must be in the absorbing phase, + * i.e., Squeeze() must not have been called before. + * @return Zero if successful, 1 otherwise. + */ +static int Absorb(spongeState *state, const unsigned char *data, unsigned long long databitlen); +/** + * Function to squeeze output data from the sponge function. + * If the sponge function was in the absorbing phase, this function + * switches it to the squeezing phase. + * @param state Pointer to the state of the sponge function initialized by InitSponge(). + * @param output Pointer to the buffer where to store the output data. + * @param outputLength The number of output bits desired. + * It must be a multiple of 8. + * @return Zero if successful, 1 otherwise. + */ +static int Squeeze(spongeState *state, unsigned char *output, unsigned long long outputLength); + +#endif diff --git a/Modules/_sha3/keccak/crypto_hash.h b/Modules/_sha3/keccak/crypto_hash.h new file mode 100644 diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c new file mode 100644 --- /dev/null +++ b/Modules/_sha3/sha3module.c @@ -0,0 +1,569 @@ +/* SHA3 module + * + * This module provides an interface to the SHA3 algorithm + * + * See below for information about the original code this module was + * based upon. Additional work performed by: + * + * Andrew Kuchling (amk at amk.ca) + * Greg Stein (gstein at lyra.org) + * Trevor Perrin (trevp at trevp.net) + * Gregory P. Smith (greg at krypto.org) + * + * Copyright (C) 2012 Christian Heimes (christian at python.org) + * Licensed to PSF under a Contributor Agreement. + * + */ + +#include "Python.h" +#include "../hashlib.h" + +/* ************************************************************************** + * SHA-3 (Keccak) + * + * The code is based on KeccakReferenceAndOptimized-3.2.zip from 29 May 2012. + * + * The reference implementation is altered in this points: + * - C++ comments are converted to ANSI C comments. + * - All functions and globals are declared static. + * - The typedef for UINT64 is commented out. + * - brg_endian.h is removed. + * - KeccakF-1600-opt[32|64]-settings.h are commented out + * - Some unused functions are commented out to silence compiler warnings. + * + * In order to avoid name clashes with other software I have to declare all + * Keccak functions and global data as static. The C code is directly + * included into this file in order to access the static functions. + * + * Keccak can be tuned with several paramenters. I try to explain all options + * as far as I understand them. The reference implementation also contains + * assembler code for ARM platforms (NEON instructions). + * + * Common + * ====== + * + * Options: + * UseBebigokimisa, Unrolling + * + * - Unrolling: loop unrolling (24, 12, 8, 6, 4, 3, 2, 1) + * - UseBebigokimisa: lane complementing + * + * 64bit platforms + * =============== + * + * Additional options: + * UseSSE, UseOnlySIMD64, UseMMX, UseXOP, UseSHLD + * + * Optimized instructions (disabled by default): + * - UseSSE: use Stream SIMD extensions + * o UseOnlySIMD64: limit to 64bit instructions, otherwise 128bit + * o w/o UseOnlySIMD64: requires compiler agument -mssse3 or -mtune + * - UseMMX: use 64bit MMX instructions + * - UseXOP: use AMD's eXtended Operations (128bit SSE extension) + * + * Other: + * - Unrolling: default 24 + * - UseBebigokimisa: default 1 + * + * When neither UseSSE, UseMMX nor UseXOP is configured, ROL64 (rotate left + * 64) is implemented as: + * - Windows: _rotl64() + * - UseSHLD: use shld (shift left) asm optimization + * - otherwise: shift and xor + * + * UseBebigokimisa can't be used in combination with UseSSE, UseMMX or + * UseXOP. UseOnlySIMD64 has no effect unless UseSSE is specified. + * + * Tests have shown that UseSSE + UseOnlySIMD64 is about three to four + * times SLOWER than UseBebigokimisa. UseSSE and UseMMX are about two times + * slower. (tested by CH and AP) + * + * 32bit platforms + * =============== + * + * Additional options: + * UseInterleaveTables, UseSchedule + * + * - Unrolling: default 2 + * - UseBebigokimisa: default n/a + * - UseSchedule: ???, (1, 2, 3; default 3) + * - UseInterleaveTables: use two 64k lookup tables for (de)interleaving + * default: n/a + * + * schedules: + * - 3: no UseBebigokimisa, Unrolling must be 2 + * - 2 + 1: ??? + * + * *************************************************************************/ + +#if SIZEOF_VOID_P == 8 && defined(PY_UINT64_T) + /* 64bit platforms with unsigned int64 */ + #define KeccakImplementation 64 + #define Unrolling 24 + #define UseBebigokimisa + typedef PY_UINT64_T UINT64; +#elif SIZEOF_VOID_P == 4 && defined(PY_UINT64_T) + /* 32bit platforms with unsigned int64 */ + #define KeccakImplementation 32 + #define Unrolling 2 + #define UseSchedule 3 + typedef PY_UINT64_T UINT64; +#else + /* 32 or 64bit platforms without unsigned int64 */ + #warning no uint64_t available, force Keccak opt32 with interleave tables + #define KeccakImplementation 32 + #define Unrolling 2 + #define UseSchedule 3 + #define UseInterleaveTables +#endif + +/* replacement for brg_endian.h */ +#define IS_BIG_ENDIAN BIG_ENDIAN +#define IS_LITTLE_ENDIAN LITTLE_ENDIAN +#define PLATFORM_BYTE_ORDER BYTE_ORDER + +/* inline all Keccak dependencies */ +#include "keccak/KeccakNISTInterface.h" +#include "keccak/KeccakNISTInterface.c" +#include "keccak/KeccakSponge.c" +#if KeccakImplementation == 64 + #include "keccak/KeccakF-1600-opt64.c" +#elif KeccakImplementation == 32 + #include "keccak/KeccakF-1600-opt32.c" +#endif + +#define SHA3_BLOCKSIZE 200 /* 1600 bits */ +#define SHA3_MAX_DIGESTSIZE 64 /* 512 bits */ +#define SHA3_state hashState +#define SHA3_init Init +#define SHA3_process Update +#define SHA3_done Final +#define SHA3_copystate(dest, src) memcpy(&(dest), &(src), sizeof(SHA3_state)) +#define SHA3_clearstate(state) memset(&(state), 0, sizeof(SHA3_state)) + +/* The structure for storing SHA3 info */ + +typedef struct { + PyObject_HEAD + int hashbitlen; + SHA3_state hash_state; +#ifdef WITH_THREAD + PyThread_type_lock lock; +#endif + +} SHA3object; + +static PyTypeObject SHA3type; + + +static SHA3object * +newSHA3object(int hashbitlen) +{ + SHA3object *newobj; + + /* check hashbitlen */ + switch(hashbitlen) { + /* supported hash length */ + case 224: + break; + case 256: + break; + case 384: + break; + case 512: + break; + case 0: + /* arbitrarily-long output isn't supported by this module */ + default: + /* everything else is an error */ + PyErr_SetString(PyExc_ValueError, + "hashbitlen must be one of 224, 256, 384 or 512."); + return NULL; + } + newobj = (SHA3object *)PyObject_New(SHA3object, &SHA3type); + if (newobj == NULL) { + return NULL; + } + newobj->hashbitlen = hashbitlen; +#ifdef WITH_THREAD + newobj->lock = NULL; +#endif + return newobj; +} + + +/* Internal methods for a hash object */ + +static void +SHA3_dealloc(SHA3object *self) +{ + SHA3_clearstate(self->hash_state); +#ifdef WITH_THREAD + if (self->lock) { + PyThread_free_lock(self->lock); + } +#endif + PyObject_Del(self); +} + + +/* External methods for a hash object */ + +PyDoc_STRVAR(SHA3_copy__doc__, "Return a copy of the hash object."); + +static PyObject * +SHA3_copy(SHA3object *self, PyObject *unused) +{ + SHA3object *newobj; + + if ((newobj = newSHA3object(self->hashbitlen)) == NULL) { + return NULL; + } + ENTER_HASHLIB(self); + SHA3_copystate(newobj->hash_state, self->hash_state); + LEAVE_HASHLIB(self); + return (PyObject *)newobj; +} + + +PyDoc_STRVAR(SHA3_digest__doc__, +"Return the digest value as a string of binary data."); + +static PyObject * +SHA3_digest(SHA3object *self, PyObject *unused) +{ + unsigned char digest[SHA3_MAX_DIGESTSIZE]; + SHA3_state temp; + HashReturn res; + + ENTER_HASHLIB(self); + SHA3_copystate(temp, self->hash_state); + LEAVE_HASHLIB(self); + res = SHA3_done(&temp, digest); + SHA3_clearstate(temp); + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, "internal error in SHA3 Final()"); + return NULL; + } + return PyBytes_FromStringAndSize((const char *)digest, + self->hashbitlen / 8); +} + + +PyDoc_STRVAR(SHA3_hexdigest__doc__, +"Return the digest value as a string of hexadecimal digits."); + +static PyObject * +SHA3_hexdigest(SHA3object *self, PyObject *unused) +{ + unsigned char digest[SHA3_MAX_DIGESTSIZE]; + SHA3_state temp; + HashReturn res; + PyObject *retval; + Py_UCS1 *hex_digest; + int digestlen, i, j; + + /* Get the raw (binary) digest value */ + ENTER_HASHLIB(self); + SHA3_copystate(temp, self->hash_state); + LEAVE_HASHLIB(self); + res = SHA3_done(&temp, digest); + SHA3_clearstate(temp); + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, "internal error in SHA3 Final()"); + return NULL; + } + + /* Create a new string */ + digestlen = self->hashbitlen / 8; + retval = PyUnicode_New(digestlen * 2, 127); + if (!retval) + return NULL; + hex_digest = PyUnicode_1BYTE_DATA(retval); + + /* Make hex version of the digest */ + for(i=j=0; i < digestlen; i++) { + unsigned char c; + c = (digest[i] >> 4) & 0xf; + hex_digest[j++] = Py_hexdigits[c]; + c = (digest[i] & 0xf); + hex_digest[j++] = Py_hexdigits[c]; + } + assert(_PyUnicode_CheckConsistency(retval, 1)); + return retval; +} + +PyDoc_STRVAR(SHA3_update__doc__, +"Update this hash object's state with the provided string."); + +static PyObject * +SHA3_update(SHA3object *self, PyObject *args) +{ + PyObject *obj; + Py_buffer buf; + HashReturn res; + + if (!PyArg_ParseTuple(args, "O:update", &obj)) + return NULL; + + GET_BUFFER_VIEW_OR_ERROUT(obj, &buf); + + /* add new data, the function takes the length in bits not bytes */ +#ifdef WITH_THREADS + if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE) { + self->lock = PyThread_allocate_lock(); + } + /* Once a lock exists all code paths must be synchronized. We have to + * release the GIL even for small buffers as acquiring the lock may take + * an unlimited amount of time when another thread updates this object + * with lots of data. */ + if (self->lock) { + Py_BEGIN_ALLOW_THREADS + PyThread_acquire_lock(self->lock, 1); + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); + PyThread_release_lock(self->lock); + Py_END_ALLOW_THREADS + } + else { + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); + } +#else + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); +#endif + LEAVE_HASHLIB(self); + + if (res != SUCCESS) { + PyBuffer_Release(&buf); + PyErr_SetString(PyExc_RuntimeError, + "internal error in SHA3 Update()"); + return NULL; + } + + PyBuffer_Release(&buf); + Py_INCREF(Py_None); + return Py_None; +} + +static PyMethodDef SHA3_methods[] = { + {"copy", (PyCFunction)SHA3_copy, METH_NOARGS, + SHA3_copy__doc__}, + {"digest", (PyCFunction)SHA3_digest, METH_NOARGS, + SHA3_digest__doc__}, + {"hexdigest", (PyCFunction)SHA3_hexdigest, METH_NOARGS, + SHA3_hexdigest__doc__}, + {"update", (PyCFunction)SHA3_update, METH_VARARGS, + SHA3_update__doc__}, + {NULL, NULL} /* sentinel */ +}; + +static PyObject * +SHA3_get_block_size(SHA3object *self, void *closure) +{ + return PyLong_FromLong(SHA3_BLOCKSIZE); +} + +static PyObject * +SHA3_get_name(SHA3object *self, void *closure) +{ + return PyUnicode_FromFormat("sha3_%i", self->hashbitlen); +} + +static PyObject * +SHA3_get_digest_size(SHA3object *self, void *closure) +{ + return PyLong_FromLong(self->hashbitlen / 8); +} + + +static PyGetSetDef SHA3_getseters[] = { + {"block_size", (getter)SHA3_get_block_size, NULL, NULL, NULL}, + {"name", (getter)SHA3_get_name, NULL, NULL, NULL}, + {"digest_size", (getter)SHA3_get_digest_size, NULL, NULL, NULL}, + {NULL} /* Sentinel */ +}; + +static PyTypeObject SHA3type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_sha3.SHA3", /* tp_name */ + sizeof(SHA3object), /* tp_size */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)SHA3_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + SHA3_methods, /* tp_methods */ + NULL, /* tp_members */ + SHA3_getseters, /* tp_getset */ +}; + + +/* constructor helper */ +static PyObject * +SHA3_factory(PyObject *args, PyObject *kwdict, const char *fmt, + int hashbitlen) +{ + SHA3object *newobj = NULL; + static char *kwlist[] = {"string", NULL}; + PyObject *data_obj = NULL; + Py_buffer buf; + HashReturn res; + + if (!PyArg_ParseTupleAndKeywords(args, kwdict, fmt, kwlist, + &data_obj)) { + return NULL; + } + + if (data_obj) + GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf); + + if ((newobj = newSHA3object(hashbitlen)) == NULL) { + goto error; + } + + if (SHA3_init(&newobj->hash_state, hashbitlen) != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, + "internal error in SHA3 Update()"); + goto error; + } + + if (data_obj) { +#ifdef WITH_THREADS + if (buf.len >= HASHLIB_GIL_MINSIZE) { + /* invariant: New objects can't be accessed by other code yet, + * thus it's safe to release the GIL without locking the object. + */ + Py_BEGIN_ALLOW_THREADS + res = SHA3_process(&newobj->hash_state, buf.buf, buf.len * 8); + Py_END_ALLOW_THREADS + } + else { + res = SHA3_process(&newobj->hash_state, buf.buf, buf.len * 8); + } +#else + res = SHA3_process(&newobj->hash_state, buf.buf, buf.len * 8); +#endif + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, + "internal error in SHA3 Update()"); + goto error; + } + PyBuffer_Release(&buf); + } + + return (PyObject *)newobj; + + error: + if (newobj) { + SHA3_clearstate(newobj->hash_state); + /* self->lock is always NULL */ + } + if (data_obj) { + PyBuffer_Release(&buf); + } + return NULL; + +} + +PyDoc_STRVAR(sha3_224__doc__, +"sha3_224([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 28 bytes."); + +static PyObject * +sha3_224(PyObject *self, PyObject *args, PyObject *kwdict) +{ + return SHA3_factory(args, kwdict, "|O:sha3_224", 224); +} + + +PyDoc_STRVAR(sha3_256__doc__, +"sha3_256([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 32 bytes."); + +static PyObject * +sha3_256(PyObject *self, PyObject *args, PyObject *kwdict) +{ + return SHA3_factory(args, kwdict, "|O:sha3_256", 256); +} + +PyDoc_STRVAR(sha3_384__doc__, +"sha3_384([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 48 bytes."); + +static PyObject * +sha3_384(PyObject *self, PyObject *args, PyObject *kwdict) +{ + return SHA3_factory(args, kwdict, "|O:sha3_384", 384); +} + +PyDoc_STRVAR(sha3_512__doc__, +"sha3_512([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 64 bytes."); + +static PyObject * +sha3_512(PyObject *self, PyObject *args, PyObject *kwdict) +{ + return SHA3_factory(args, kwdict, "|O:sha3_512", 512); +} + + +/* List of functions exported by this module */ +static struct PyMethodDef SHA3_functions[] = { + {"sha3_224", (PyCFunction)sha3_224, METH_VARARGS|METH_KEYWORDS, + sha3_224__doc__}, + {"sha3_256", (PyCFunction)sha3_256, METH_VARARGS|METH_KEYWORDS, + sha3_256__doc__}, + {"sha3_384", (PyCFunction)sha3_384, METH_VARARGS|METH_KEYWORDS, + sha3_384__doc__}, + {"sha3_512", (PyCFunction)sha3_512, METH_VARARGS|METH_KEYWORDS, + sha3_512__doc__}, + {NULL, NULL} /* Sentinel */ +}; + + +/* Initialize this module. */ +static struct PyModuleDef _SHA3module = { + PyModuleDef_HEAD_INIT, + "_sha3", + NULL, + -1, + SHA3_functions, + NULL, + NULL, + NULL, + NULL +}; + +PyMODINIT_FUNC +PyInit__sha3(void) +{ + Py_TYPE(&SHA3type) = &PyType_Type; + if (PyType_Ready(&SHA3type) < 0) { + return NULL; + } + + return PyModule_Create(&_SHA3module); +} diff --git a/Modules/hashlib.h b/Modules/hashlib.h --- a/Modules/hashlib.h +++ b/Modules/hashlib.h @@ -26,3 +26,36 @@ return NULL; \ } \ } while(0); + +/* + * Helper code to synchronize access to the hash object when the GIL is + * released around a CPU consuming hashlib operation. All code paths that + * access a mutable part of obj must be enclosed in a ENTER_HASHLIB / + * LEAVE_HASHLIB block or explicitly acquire and release the lock inside + * a PY_BEGIN / END_ALLOW_THREADS block if they wish to release the GIL for + * an operation. + */ + +#ifdef WITH_THREAD +#include "pythread.h" + #define ENTER_HASHLIB(obj) \ + if ((obj)->lock) { \ + if (!PyThread_acquire_lock((obj)->lock, 0)) { \ + Py_BEGIN_ALLOW_THREADS \ + PyThread_acquire_lock((obj)->lock, 1); \ + Py_END_ALLOW_THREADS \ + } \ + } + #define LEAVE_HASHLIB(obj) \ + if ((obj)->lock) { \ + PyThread_release_lock((obj)->lock); \ + } +#else + #define ENTER_HASHLIB(obj) + #define LEAVE_HASHLIB(obj) +#endif + +/* TODO(gps): We should probably make this a module or EVPobject attribute + * to allow the user to optimize based on the platform they're using. */ +#define HASHLIB_GIL_MINSIZE 2048 + diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -838,6 +838,15 @@ exts.append( Extension('_sha1', ['sha1module.c'], depends=['hashlib.h']) ) + # SHA-3 (Keccak) module + sha3_depends = ['hashlib.h'] + keccak = os.path.join(os.getcwd(), srcdir, 'Modules', '_sha3', + 'keccak') + for pattern in ('*.c', '*.h', '*.macros'): + sha3_depends.extend(glob(os.path.join(keccak, pattern))) + exts.append(Extension("_sha3", ["_sha3/sha3module.c"], + depends=sha3_depends)) + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 02:36:22 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 02:36:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_add_note_to_Misc/NEWS?= Message-ID: <3XYTRB5LZyzP2T@mail.python.org> http://hg.python.org/cpython/rev/75343f8d8e74 changeset: 79503:75343f8d8e74 user: Christian Heimes date: Sat Oct 06 02:27:57 2012 +0200 summary: add note to Misc/NEWS files: Misc/NEWS | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -107,6 +107,11 @@ Extension Modules ----------------- +- Issue #16113: Added sha3 module based on the Keccak reference implementation + 3.2. The `hashlib` module has four additional hash algorithms: `sha3_224`, + `sha3_256`, `sha3_384` and `sha3_512`. As part of the patch some common + code was moved from _hashopenssl.c to hashlib.h. + Tests ----- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 03:16:24 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 03:16:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316133=3A_add_Wind?= =?utf-8?q?ows_project_file_for_=5Fsha3_module=2E_I_choose_to_build?= Message-ID: <3XYVKN0yqyzNkN@mail.python.org> http://hg.python.org/cpython/rev/6a1d8e78b23d changeset: 79504:6a1d8e78b23d user: Christian Heimes date: Sat Oct 06 03:16:12 2012 +0200 summary: Issue #16133: add Windows project file for _sha3 module. I choose to build _sha3 as a sparat module as it's rather large (190k for AMD64). files: PCbuild/_sha3.vcxproj | 206 ++++++++++++++++++++++++++++++ PCbuild/pcbuild.sln | 17 ++ 2 files changed, 223 insertions(+), 0 deletions(-) diff --git a/PCbuild/_sha3.vcxproj b/PCbuild/_sha3.vcxproj new file mode 100644 --- /dev/null +++ b/PCbuild/_sha3.vcxproj @@ -0,0 +1,206 @@ +? + + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {254A0C05-6696-4B08-8CB2-EF7D533AEE01} + xxlimited + Win32Proj + + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + NDEBUG;_WIN32;_WINDLL;Py_LIMITED_API + + + %(AdditionalDependencies) + + + + + + + + + X64 + + + %(AdditionalDependencies) + + + + + + + + + Py_LIMITED_API;%(PreprocessorDefinitions) + + + %(AdditionalDependencies) + + + + + + + + + X64 + + + %(AdditionalDependencies) + + + + + MachineX64 + + + + + Py_LIMITED_API;%(PreprocessorDefinitions) + + + %(AdditionalDependencies) + + + + + + + + + X64 + + + %(AdditionalDependencies) + + + + + MachineX64 + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -74,6 +74,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_freeze_importlib", "_freeze_importlib.vcxproj", "{19C0C13F-47CA-4432-AFF3-799A296A4DDC}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sha3", "_sha3.vcxproj", "{254A0C05-6696-4B08-8CB2-EF7D533AEE01}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -611,6 +613,21 @@ {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg = Release|Win32 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|Win32.ActiveCfg = Release|Win32 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|x64.ActiveCfg = Release|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|Win32.ActiveCfg = Release|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|x64.ActiveCfg = Release|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|x64.Build.0 = Release|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Release|Win32.ActiveCfg = Release|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Release|Win32.Build.0 = Release|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Release|x64.ActiveCfg = Release|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 03:40:20 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 03:40:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_fixed_=5Fsha3_VS_project_f?= =?utf-8?q?ile?= Message-ID: <3XYVs00dgRzP5g@mail.python.org> http://hg.python.org/cpython/rev/84c8127453cf changeset: 79505:84c8127453cf user: Christian Heimes date: Sat Oct 06 03:40:10 2012 +0200 summary: fixed _sha3 VS project file files: PCbuild/_sha3.vcxproj | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/PCbuild/_sha3.vcxproj b/PCbuild/_sha3.vcxproj --- a/PCbuild/_sha3.vcxproj +++ b/PCbuild/_sha3.vcxproj @@ -28,7 +28,7 @@ {254A0C05-6696-4B08-8CB2-EF7D533AEE01} - xxlimited + _sha3 Win32Proj @@ -119,9 +119,6 @@ - - NDEBUG;_WIN32;_WINDLL;Py_LIMITED_API - %(AdditionalDependencies) @@ -143,9 +140,6 @@ - - Py_LIMITED_API;%(PreprocessorDefinitions) - %(AdditionalDependencies) @@ -168,9 +162,6 @@ - - Py_LIMITED_API;%(PreprocessorDefinitions) - %(AdditionalDependencies) @@ -203,4 +194,4 @@ - \ No newline at end of file + -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Sat Oct 6 05:55:20 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sat, 06 Oct 2012 05:55:20 +0200 Subject: [Python-checkins] Daily reference leaks (6a1d8e78b23d): sum=0 Message-ID: results for 6a1d8e78b23d on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogA5Azgf', '-x'] From python-checkins at python.org Sat Oct 6 06:52:48 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 6 Oct 2012 06:52:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Fix_typo=2E?= Message-ID: <3XYb742pyLzNBf@mail.python.org> http://hg.python.org/peps/rev/4ac931d06741 changeset: 4541:4ac931d06741 user: Ezio Melotti date: Sat Oct 06 07:52:39 2012 +0300 summary: Fix typo. files: pep-0348.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0348.txt b/pep-0348.txt --- a/pep-0348.txt +++ b/pep-0348.txt @@ -11,7 +11,7 @@ .. |2.x| replace:: 2.5 -.. note:: This PEP as been rejected [#rejected]_. +.. note:: This PEP has been rejected [#rejected]_. Abstract @@ -46,7 +46,7 @@ While their importance is great, there is a lack of structure to them. This stems from the fact that any object can be raised as an exception. Because of this you have no guarantee in terms of what -kind of object will be raised, destroying any possible hierarchy +kind of object will be raised, destroying any possible hierarchy raised objects might adhere to. But exceptions do have a hierarchy, showing the severity of the -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 12:21:47 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 12:21:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Fix_markup=2E?= Message-ID: <3XYkQg10GTzNCJ@mail.python.org> http://hg.python.org/peps/rev/da12103963ce changeset: 4542:da12103963ce user: Georg Brandl date: Sat Oct 06 12:22:48 2012 +0200 summary: Fix markup. files: pep-0424.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -28,7 +28,7 @@ interpreters and non-standard-library Python modules to implement. ``__length_hint__`` must return an integer (else a TypeError is raised) or -``NotImplemented, and is not required to be accurate. It may return a value +``NotImplemented``, and is not required to be accurate. It may return a value that is either larger or smaller than the actual size of the container. A return value of ``NotImplemented`` indicates that there is no finite length estimate. It may not return a negative value (else a ValueError is raised). -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 12:22:19 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 12:22:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Fix_the_local_variables_list?= =?utf-8?q?=2E?= Message-ID: <3XYkRH6ZKHzMhf@mail.python.org> http://hg.python.org/peps/rev/862db33471a6 changeset: 4543:862db33471a6 user: Georg Brandl date: Sat Oct 06 12:23:21 2012 +0200 summary: Fix the local variables list. files: pep-0424.txt | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -85,10 +85,13 @@ This document has been placed into the public domain. + + .. - Local Variables: - mode: indented-text - indent-tabs-mode: nil - sentence-end-double-space: t - fill-column: 70 - coding: utf-8 + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + coding: utf-8 + End: -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 12:44:23 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 12:44:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Update_NEWS_for_adding_mis?= =?utf-8?q?sed_changes=2E?= Message-ID: <3XYkwl2nMxzMBZ@mail.python.org> http://hg.python.org/cpython/rev/31f8c2df89d8 changeset: 79506:31f8c2df89d8 user: Andrew Svetlov date: Sat Oct 06 13:44:12 2012 +0300 summary: Update NEWS for adding missed changes. files: Misc/NEWS | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,11 @@ Library ------- +- Issue #15417: Add support for csh and fish in venv activation scripts. + +- Issue #16123: IDLE - deprecate running without a subprocess. + Patch by Roger Serwy. + - Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element element_factory (fixes a regression in SimpleTAL). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 12:52:38 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 12:52:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2313896=3A_Make_she?= =?utf-8?q?lf_instances_work_with_=27with=27_as_context_managers=2E?= Message-ID: <3XYl6G1vRWzM87@mail.python.org> http://hg.python.org/cpython/rev/3c1df1ede882 changeset: 79507:3c1df1ede882 user: Andrew Svetlov date: Sat Oct 06 13:52:19 2012 +0300 summary: Issue #13896: Make shelf instances work with 'with' as context managers. Original patch by Filip Gruszczy?ski. files: Lib/shelve.py | 7 +++++++ Lib/test/test_shelve.py | 13 +++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/Lib/shelve.py b/Lib/shelve.py --- a/Lib/shelve.py +++ b/Lib/shelve.py @@ -131,6 +131,12 @@ except KeyError: pass + def __enter__(self): + return self + + def __exit__(self, type, value, traceback): + self.close() + def close(self): self.sync() try: @@ -147,6 +153,7 @@ def __del__(self): if not hasattr(self, 'writeback'): # __init__ didn't succeed, so don't bother closing + # see http://bugs.python.org/issue1339007 for details return self.close() diff --git a/Lib/test/test_shelve.py b/Lib/test/test_shelve.py --- a/Lib/test/test_shelve.py +++ b/Lib/test/test_shelve.py @@ -148,6 +148,19 @@ p2 = d[encodedkey] self.assertNotEqual(p1, p2) # Write creates new object in store + def test_with(self): + d1 = {} + with shelve.Shelf(d1, protocol=2, writeback=False) as s: + s['key1'] = [1,2,3,4] + self.assertEqual(s['key1'], [1,2,3,4]) + self.assertEqual(len(s), 1) + self.assertRaises(ValueError, len, s) + try: + s['key1'] + except ValueError: + pass + else: + self.fail('Closed shelf should not find a key') from test import mapping_tests diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,9 @@ Library ------- +- Issue #13896: Make shelf instances work with 'with' as context managers. + Original patch by Filip Gruszczy?ski. + - Issue #15417: Add support for csh and fish in venv activation scripts. - Issue #16123: IDLE - deprecate running without a subprocess. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 13:00:10 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 13:00:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_424=3A_update_from_Alex?= =?utf-8?q?=2E?= Message-ID: <3XYlGy2y3FzM3t@mail.python.org> http://hg.python.org/peps/rev/aba3d25cbcaa changeset: 4544:aba3d25cbcaa user: Georg Brandl date: Sat Oct 06 13:01:10 2012 +0200 summary: PEP 424: update from Alex. files: pep-0424.txt | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -27,7 +27,7 @@ This PEP formally documents ``__length_hint__`` for other interpreters and non-standard-library Python modules to implement. -``__length_hint__`` must return an integer (else a TypeError is raised) or +``__length_hint__`` must return an integer (else a ``TypeError`` is raised) or ``NotImplemented``, and is not required to be accurate. It may return a value that is either larger or smaller than the actual size of the container. A return value of ``NotImplemented`` indicates that there is no finite length @@ -47,29 +47,25 @@ exact. Otherwise, it may over- or under-estimate by an arbitrary amount. The result will be an integer >= 0. """ - if : + try: return len(obj) - else: + except TypeError: try: - get_hint = obj.__length_hint__ + get_hint = type(obj).__length_hint__ except AttributeError: return default - hint = get_hint() + try: + hint = get_hint(obj) + except TypeError: + return default if hint is NotImplemented: return default if not isinstance(hint, int): raise TypeError("Length hint must be an integer, not %r" % type(hint)) - return max(hint, 0) - -Note: there is no good way to spell "obj has a __len__ method" in pure -Python. In CPython, this comes down to checking for a ``sq_length`` -slot. Other implementations presumably have their own way of -checking. Calling ``len(obj)`` and catching TypeError is not quite -correct (as it would assume no __len__ method exists when in fact one -exists but calling it raises TypeError); checking ``hasattr(obj, -'__len__')`` likewise is incorrect if obj is a class defining a -``__len__`` method for its instances. + if hint < 0: + raise ValueError("__length_hint__() should return >= 0") + return hint Rationale -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 13:03:05 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 13:03:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Rewrap_to_70-characters=2E?= Message-ID: <3XYlLK4TzszM2Q@mail.python.org> http://hg.python.org/peps/rev/7e0fb50b0eeb changeset: 4545:7e0fb50b0eeb user: Georg Brandl date: Sat Oct 06 13:04:01 2012 +0200 summary: Rewrap to 70-characters. files: pep-0424.txt | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -14,9 +14,9 @@ ======== CPython currently defines a ``__length_hint__`` method on several -types, such as various iterators. This method is then used by various +types, such as various iterators. This method is then used by various other functions (such as ``list``) to presize lists based on the -estimate returned by ``__length_hint__``. Types which are not sized, +estimate returned by ``__length_hint__``. Types which are not sized, and thus should not define ``__len__``, can then define ``__length_hint__``, to allow estimating or computing a size (such as many iterators). @@ -24,18 +24,19 @@ Specification ============= -This PEP formally documents ``__length_hint__`` for other -interpreters and non-standard-library Python modules to implement. +This PEP formally documents ``__length_hint__`` for other interpreters +and non-standard-library Python modules to implement. -``__length_hint__`` must return an integer (else a ``TypeError`` is raised) or -``NotImplemented``, and is not required to be accurate. It may return a value -that is either larger or smaller than the actual size of the container. A -return value of ``NotImplemented`` indicates that there is no finite length -estimate. It may not return a negative value (else a ValueError is raised). +``__length_hint__`` must return an integer (else a ``TypeError`` is +raised) or ``NotImplemented``, and is not required to be accurate. It +may return a value that is either larger or smaller than the actual +size of the container. A return value of ``NotImplemented`` indicates +that there is no finite length estimate. It may not return a negative +value (else a ValueError is raised). In addition, a new function ``operator.length_hint`` hint is added, -with the following semantics (which define how ``__length_hint__`` should -be used):: +with the following semantics (which define how ``__length_hint__`` +should be used):: def length_hint(obj, default=0): """Return an estimate of the number of items in obj. @@ -71,10 +72,10 @@ Rationale ========= -Being able to pre-allocate lists based on the expected size, as estimated by -``__length_hint__``, can be a significant optimization. CPython has been -observed to run some code faster than PyPy, purely because of this optimization -being present. +Being able to pre-allocate lists based on the expected size, as +estimated by ``__length_hint__``, can be a significant optimization. +CPython has been observed to run some code faster than PyPy, purely +because of this optimization being present. Copyright ========= -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 13:49:29 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 13:49:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogQ2xvc2VzICMxNjE0?= =?utf-8?q?9=3A_remove_now-false_statement_about_the_inability_to_compare?= Message-ID: <3XYmMs6TwMzM88@mail.python.org> http://hg.python.org/cpython/rev/ee71d8023f1b changeset: 79508:ee71d8023f1b branch: 3.3 parent: 79499:0df5aeab229f user: Georg Brandl date: Sat Oct 06 13:48:39 2012 +0200 summary: Closes #16149: remove now-false statement about the inability to compare Decimal and float objects. files: Doc/reference/expressions.rst | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1094,16 +1094,10 @@ another one is made arbitrarily but consistently within one execution of a program. -Comparison of objects of the differing types depends on whether either -of the types provide explicit support for the comparison. Most numeric types -can be compared with one another, but comparisons of :class:`float` and -:class:`Decimal` are not supported to avoid the inevitable confusion arising -from representation issues such as ``float('1.1')`` being inexactly represented -and therefore not exactly equal to ``Decimal('1.1')`` which is. When -cross-type comparison is not supported, the comparison method returns -``NotImplemented``. This can create the illusion of non-transitivity between -supported cross-type comparisons and unsupported comparisons. For example, -``Decimal(2) == 2`` and ``2 == float(2)`` but ``Decimal(2) != float(2)``. +Comparison of objects of the differing types depends on whether either of the +types provide explicit support for the comparison. Most numeric types can be +compared with one another. When cross-type comparison is not supported, the +comparison method returns ``NotImplemented``. .. _membership-test-details: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 13:49:31 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 13:49:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogQ2xvc2VzICMxMTcx?= =?utf-8?q?0=3A_create_=22landing_pages=22_=28/library/package=2Ehtml=29_f?= =?utf-8?q?or_those?= Message-ID: <3XYmMv2wHJzNp2@mail.python.org> http://hg.python.org/cpython/rev/1141648fa655 changeset: 79509:1141648fa655 branch: 3.3 user: Georg Brandl date: Sat Oct 06 13:49:34 2012 +0200 summary: Closes #11710: create "landing pages" (/library/package.html) for those packages that have no documented content themselves, e.g. "urllib" or "http". files: Doc/library/concurrency.rst | 1 + Doc/library/concurrent.rst | 6 +++++ Doc/library/html.rst | 7 ++++++ Doc/library/http.rst | 11 +++++++++ Doc/library/internet.rst | 3 ++ Doc/library/markup.rst | 9 +------ Doc/library/urllib.rst | 9 +++++++ Doc/library/xml.rst | 29 +++++++++++++++++++++++++ Doc/library/xmlrpc.rst | 12 ++++++++++ 9 files changed, 79 insertions(+), 8 deletions(-) diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst --- a/Doc/library/concurrency.rst +++ b/Doc/library/concurrency.rst @@ -15,6 +15,7 @@ threading.rst multiprocessing.rst + concurrent.rst concurrent.futures.rst subprocess.rst sched.rst diff --git a/Doc/library/concurrent.rst b/Doc/library/concurrent.rst new file mode 100644 --- /dev/null +++ b/Doc/library/concurrent.rst @@ -0,0 +1,6 @@ +The :mod:`concurrent` package +============================= + +Currently, there is only one module in this package: + +* :mod:`concurrent.futures` -- Launching parallel tasks diff --git a/Doc/library/html.rst b/Doc/library/html.rst --- a/Doc/library/html.rst +++ b/Doc/library/html.rst @@ -19,3 +19,10 @@ attribute value delimited by quotes, as in ````. .. versionadded:: 3.2 + +-------------- + +Submodules in the ``html`` package are: + +* :mod:`html.parser` -- HTML/XHTML parser with lenient parsing mode +* :mod:`html.entities` -- HTML entity definitions diff --git a/Doc/library/http.rst b/Doc/library/http.rst new file mode 100644 --- /dev/null +++ b/Doc/library/http.rst @@ -0,0 +1,11 @@ +:mod:`http` --- HTTP modules +============================ + +``http`` is a package that collects several modules for working with the +HyperText Transfer Protocol: + +* :mod:`http.client` is a low-level HTTP protocol client; for high-level URL + opening use :mod:`urllib.request` +* :mod:`http.server` contains basic HTTP server classes based on :mod:`socketserver` +* :mod:`http.cookies` has utilities for implementing state management with cookies +* :mod:`http.cookiejar` provides persistence of cookies diff --git a/Doc/library/internet.rst b/Doc/library/internet.rst --- a/Doc/library/internet.rst +++ b/Doc/library/internet.rst @@ -23,10 +23,12 @@ cgi.rst cgitb.rst wsgiref.rst + urllib.rst urllib.request.rst urllib.parse.rst urllib.error.rst urllib.robotparser.rst + http.rst http.client.rst ftplib.rst poplib.rst @@ -40,6 +42,7 @@ http.server.rst http.cookies.rst http.cookiejar.rst + xmlrpc.rst xmlrpc.client.rst xmlrpc.server.rst ipaddress.rst diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst --- a/Doc/library/markup.rst +++ b/Doc/library/markup.rst @@ -9,20 +9,13 @@ Language (SGML) and the Hypertext Markup Language (HTML), and several interfaces for working with the Extensible Markup Language (XML). -It is important to note that modules in the :mod:`xml` package require that -there be at least one SAX-compliant XML parser available. The Expat parser is -included with Python, so the :mod:`xml.parsers.expat` module will always be -available. - -The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the -definition of the Python bindings for the DOM and SAX interfaces. - .. toctree:: html.rst html.parser.rst html.entities.rst + xml.rst xml.etree.elementtree.rst xml.dom.rst xml.dom.minidom.rst diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst new file mode 100644 --- /dev/null +++ b/Doc/library/urllib.rst @@ -0,0 +1,9 @@ +:mod:`urllib` --- URL handling modules +====================================== + +``urllib`` is a package that collects several modules for working with URLs: + +* :mod:`urllib.request` for opening and reading URLs +* :mod:`urllib.error` containing the exceptions raised by :mod:`urllib.request` +* :mod:`urllib.parse` for parsing URLs +* :mod:`urllib.robotparser` for parsing ``robots.txt`` files diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xml.rst @@ -0,0 +1,29 @@ +.. _xml: + +XML Processing Modules +====================== + +Python's interfaces for processing XML are grouped in the ``xml`` package. + +It is important to note that modules in the :mod:`xml` package require that +there be at least one SAX-compliant XML parser available. The Expat parser is +included with Python, so the :mod:`xml.parsers.expat` module will always be +available. + +The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the +definition of the Python bindings for the DOM and SAX interfaces. + +The XML handling submodules are: + +* :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + +.. + +* :mod:`xml.dom`: the DOM API definition +* :mod:`xml.dom.minidom`: a lightweight DOM implementation +* :mod:`xml.dom.pulldom`: support for building partial DOM trees + +.. + +* :mod:`xml.sax`: SAX2 base classes and convenience functions +* :mod:`xml.parsers.expat`: the Expat parser binding diff --git a/Doc/library/xmlrpc.rst b/Doc/library/xmlrpc.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xmlrpc.rst @@ -0,0 +1,12 @@ +:mod:`xmlrpc` --- XMLRPC server and client modules +================================================== + +XML-RPC is a Remote Procedure Call method that uses XML passed via HTTP as a +transport. With it, a client can call methods with parameters on a remote +server (the server is named by a URI) and get back structured data. + +``xmlrpc`` is a package that collects server and client modules implementing +XML-RPC. The modules are: + +* :mod:`xmlrpc.client` +* :mod:`xmlrpc.server` -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 13:49:32 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 13:49:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_with_3=2E3?= Message-ID: <3XYmMw6P7zzNvB@mail.python.org> http://hg.python.org/cpython/rev/226574cf9ec8 changeset: 79510:226574cf9ec8 parent: 79507:3c1df1ede882 parent: 79509:1141648fa655 user: Georg Brandl date: Sat Oct 06 13:50:27 2012 +0200 summary: merge with 3.3 files: Doc/library/concurrency.rst | 1 + Doc/library/concurrent.rst | 6 ++++ Doc/library/html.rst | 7 +++++ Doc/library/http.rst | 11 ++++++++ Doc/library/internet.rst | 3 ++ Doc/library/markup.rst | 9 +------ Doc/library/urllib.rst | 9 +++++++ Doc/library/xml.rst | 29 +++++++++++++++++++++++ Doc/library/xmlrpc.rst | 12 +++++++++ Doc/reference/expressions.rst | 14 +++------- 10 files changed, 83 insertions(+), 18 deletions(-) diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst --- a/Doc/library/concurrency.rst +++ b/Doc/library/concurrency.rst @@ -15,6 +15,7 @@ threading.rst multiprocessing.rst + concurrent.rst concurrent.futures.rst subprocess.rst sched.rst diff --git a/Doc/library/concurrent.rst b/Doc/library/concurrent.rst new file mode 100644 --- /dev/null +++ b/Doc/library/concurrent.rst @@ -0,0 +1,6 @@ +The :mod:`concurrent` package +============================= + +Currently, there is only one module in this package: + +* :mod:`concurrent.futures` -- Launching parallel tasks diff --git a/Doc/library/html.rst b/Doc/library/html.rst --- a/Doc/library/html.rst +++ b/Doc/library/html.rst @@ -19,3 +19,10 @@ attribute value delimited by quotes, as in ````. .. versionadded:: 3.2 + +-------------- + +Submodules in the ``html`` package are: + +* :mod:`html.parser` -- HTML/XHTML parser with lenient parsing mode +* :mod:`html.entities` -- HTML entity definitions diff --git a/Doc/library/http.rst b/Doc/library/http.rst new file mode 100644 --- /dev/null +++ b/Doc/library/http.rst @@ -0,0 +1,11 @@ +:mod:`http` --- HTTP modules +============================ + +``http`` is a package that collects several modules for working with the +HyperText Transfer Protocol: + +* :mod:`http.client` is a low-level HTTP protocol client; for high-level URL + opening use :mod:`urllib.request` +* :mod:`http.server` contains basic HTTP server classes based on :mod:`socketserver` +* :mod:`http.cookies` has utilities for implementing state management with cookies +* :mod:`http.cookiejar` provides persistence of cookies diff --git a/Doc/library/internet.rst b/Doc/library/internet.rst --- a/Doc/library/internet.rst +++ b/Doc/library/internet.rst @@ -23,10 +23,12 @@ cgi.rst cgitb.rst wsgiref.rst + urllib.rst urllib.request.rst urllib.parse.rst urllib.error.rst urllib.robotparser.rst + http.rst http.client.rst ftplib.rst poplib.rst @@ -40,6 +42,7 @@ http.server.rst http.cookies.rst http.cookiejar.rst + xmlrpc.rst xmlrpc.client.rst xmlrpc.server.rst ipaddress.rst diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst --- a/Doc/library/markup.rst +++ b/Doc/library/markup.rst @@ -9,20 +9,13 @@ Language (SGML) and the Hypertext Markup Language (HTML), and several interfaces for working with the Extensible Markup Language (XML). -It is important to note that modules in the :mod:`xml` package require that -there be at least one SAX-compliant XML parser available. The Expat parser is -included with Python, so the :mod:`xml.parsers.expat` module will always be -available. - -The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the -definition of the Python bindings for the DOM and SAX interfaces. - .. toctree:: html.rst html.parser.rst html.entities.rst + xml.rst xml.etree.elementtree.rst xml.dom.rst xml.dom.minidom.rst diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst new file mode 100644 --- /dev/null +++ b/Doc/library/urllib.rst @@ -0,0 +1,9 @@ +:mod:`urllib` --- URL handling modules +====================================== + +``urllib`` is a package that collects several modules for working with URLs: + +* :mod:`urllib.request` for opening and reading URLs +* :mod:`urllib.error` containing the exceptions raised by :mod:`urllib.request` +* :mod:`urllib.parse` for parsing URLs +* :mod:`urllib.robotparser` for parsing ``robots.txt`` files diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xml.rst @@ -0,0 +1,29 @@ +.. _xml: + +XML Processing Modules +====================== + +Python's interfaces for processing XML are grouped in the ``xml`` package. + +It is important to note that modules in the :mod:`xml` package require that +there be at least one SAX-compliant XML parser available. The Expat parser is +included with Python, so the :mod:`xml.parsers.expat` module will always be +available. + +The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the +definition of the Python bindings for the DOM and SAX interfaces. + +The XML handling submodules are: + +* :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + +.. + +* :mod:`xml.dom`: the DOM API definition +* :mod:`xml.dom.minidom`: a lightweight DOM implementation +* :mod:`xml.dom.pulldom`: support for building partial DOM trees + +.. + +* :mod:`xml.sax`: SAX2 base classes and convenience functions +* :mod:`xml.parsers.expat`: the Expat parser binding diff --git a/Doc/library/xmlrpc.rst b/Doc/library/xmlrpc.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xmlrpc.rst @@ -0,0 +1,12 @@ +:mod:`xmlrpc` --- XMLRPC server and client modules +================================================== + +XML-RPC is a Remote Procedure Call method that uses XML passed via HTTP as a +transport. With it, a client can call methods with parameters on a remote +server (the server is named by a URI) and get back structured data. + +``xmlrpc`` is a package that collects server and client modules implementing +XML-RPC. The modules are: + +* :mod:`xmlrpc.client` +* :mod:`xmlrpc.server` diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1094,16 +1094,10 @@ another one is made arbitrarily but consistently within one execution of a program. -Comparison of objects of the differing types depends on whether either -of the types provide explicit support for the comparison. Most numeric types -can be compared with one another, but comparisons of :class:`float` and -:class:`Decimal` are not supported to avoid the inevitable confusion arising -from representation issues such as ``float('1.1')`` being inexactly represented -and therefore not exactly equal to ``Decimal('1.1')`` which is. When -cross-type comparison is not supported, the comparison method returns -``NotImplemented``. This can create the illusion of non-transitivity between -supported cross-type comparisons and unsupported comparisons. For example, -``Decimal(2) == 2`` and ``2 == float(2)`` but ``Decimal(2) != float(2)``. +Comparison of objects of the differing types depends on whether either of the +types provide explicit support for the comparison. Most numeric types can be +compared with one another. When cross-type comparison is not supported, the +comparison method returns ``NotImplemented``. .. _membership-test-details: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 14:12:36 2012 From: python-checkins at python.org (armin.ronacher) Date: Sat, 6 Oct 2012 14:12:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316148=3A_implemen?= =?utf-8?q?ted_PEP_424?= Message-ID: <3XYmtX50syzM7Q@mail.python.org> http://hg.python.org/cpython/rev/a7ec0a1b0f7c changeset: 79511:a7ec0a1b0f7c parent: 79507:3c1df1ede882 user: Armin Ronacher date: Sat Oct 06 14:03:24 2012 +0200 summary: Issue #16148: implemented PEP 424 files: Doc/c-api/object.rst | 7 ++ Doc/library/operator.rst | 6 + Include/abstract.h | 5 +- Lib/test/test_enumerate.py | 9 +- Lib/test/test_iterlen.py | 62 +++++++++---------- Lib/test/test_itertools.py | 5 +- Lib/test/test_operator.py | 25 ++++++++ Lib/test/test_set.py | 2 - Modules/operator.c | 27 ++++++++ Objects/abstract.c | 80 +++++++++++++++---------- Objects/bytearrayobject.c | 2 +- Objects/bytesobject.c | 2 +- Objects/iterobject.c | 11 ++- Objects/listobject.c | 2 +- 14 files changed, 162 insertions(+), 83 deletions(-) diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -342,6 +342,13 @@ returned. This is the equivalent to the Python expression ``len(o)``. +.. c:function:: Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t default) + + Return an estimated length for the object *o*. First trying to return its + actual length, then an estimate using ``__length_hint__``, and finally + returning the default value. On error ``-1`` is returned. This is the + equivalent to the Python expression ``operator.length_hint(o, default)``. + .. c:function:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key) Return element of *o* corresponding to the object *key* or *NULL* on failure. diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst --- a/Doc/library/operator.rst +++ b/Doc/library/operator.rst @@ -235,6 +235,12 @@ .. XXX: find a better, readable, example +.. function:: length_hint(obj, default=0) + + Return an estimated length for the object *o*. First trying to return its + actual length, then an estimate using ``__length_hint__``, and finally + returning the default value. + The :mod:`operator` module also defines tools for generalized attribute and item lookups. These are useful for making fast field extractors as arguments for :func:`map`, :func:`sorted`, :meth:`itertools.groupby`, or other functions that diff --git a/Include/abstract.h b/Include/abstract.h --- a/Include/abstract.h +++ b/Include/abstract.h @@ -403,9 +403,8 @@ PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); #define PyObject_Length PyObject_Size -#ifndef Py_LIMITED_API - PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t); -#endif +PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); +PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t); /* Guess the size of object o using len(o) or o.__length_hint__(). diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py --- a/Lib/test/test_enumerate.py +++ b/Lib/test/test_enumerate.py @@ -1,4 +1,5 @@ import unittest +import operator import sys import pickle @@ -168,15 +169,13 @@ x = range(1) self.assertEqual(type(reversed(x)), type(iter(x))) - @support.cpython_only def test_len(self): # This is an implementation detail, not an interface requirement - from test.test_iterlen import len for s in ('hello', tuple('hello'), list('hello'), range(5)): - self.assertEqual(len(reversed(s)), len(s)) + self.assertEqual(operator.length_hint(reversed(s)), len(s)) r = reversed(s) list(r) - self.assertEqual(len(r), 0) + self.assertEqual(operator.length_hint(r), 0) class SeqWithWeirdLen: called = False def __len__(self): @@ -187,7 +186,7 @@ def __getitem__(self, index): return index r = reversed(SeqWithWeirdLen()) - self.assertRaises(ZeroDivisionError, len, r) + self.assertRaises(ZeroDivisionError, operator.length_hint, r) def test_gc(self): diff --git a/Lib/test/test_iterlen.py b/Lib/test/test_iterlen.py --- a/Lib/test/test_iterlen.py +++ b/Lib/test/test_iterlen.py @@ -45,31 +45,21 @@ from test import support from itertools import repeat from collections import deque -from builtins import len as _len +from operator import length_hint n = 10 -def len(obj): - try: - return _len(obj) - except TypeError: - try: - # note: this is an internal undocumented API, - # don't rely on it in your own programs - return obj.__length_hint__() - except AttributeError: - raise TypeError class TestInvariantWithoutMutations(unittest.TestCase): def test_invariant(self): it = self.it for i in reversed(range(1, n+1)): - self.assertEqual(len(it), i) + self.assertEqual(length_hint(it), i) next(it) - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) self.assertRaises(StopIteration, next, it) - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) class TestTemporarilyImmutable(TestInvariantWithoutMutations): @@ -78,12 +68,12 @@ # length immutability during iteration it = self.it - self.assertEqual(len(it), n) + self.assertEqual(length_hint(it), n) next(it) - self.assertEqual(len(it), n-1) + self.assertEqual(length_hint(it), n-1) self.mutate() self.assertRaises(RuntimeError, next, it) - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) ## ------- Concrete Type Tests ------- @@ -92,10 +82,6 @@ def setUp(self): self.it = repeat(None, n) - def test_no_len_for_infinite_repeat(self): - # The repeat() object can also be infinite - self.assertRaises(TypeError, len, repeat(None)) - class TestXrange(TestInvariantWithoutMutations): def setUp(self): @@ -167,14 +153,15 @@ it = iter(d) next(it) next(it) - self.assertEqual(len(it), n-2) + self.assertEqual(length_hint(it), n - 2) d.append(n) - self.assertEqual(len(it), n-1) # grow with append + self.assertEqual(length_hint(it), n - 1) # grow with append d[1:] = [] - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) self.assertEqual(list(it), []) d.extend(range(20)) - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) + class TestListReversed(TestInvariantWithoutMutations): @@ -186,32 +173,41 @@ it = reversed(d) next(it) next(it) - self.assertEqual(len(it), n-2) + self.assertEqual(length_hint(it), n - 2) d.append(n) - self.assertEqual(len(it), n-2) # ignore append + self.assertEqual(length_hint(it), n - 2) # ignore append d[1:] = [] - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) self.assertEqual(list(it), []) # confirm invariant d.extend(range(20)) - self.assertEqual(len(it), 0) + self.assertEqual(length_hint(it), 0) ## -- Check to make sure exceptions are not suppressed by __length_hint__() class BadLen(object): - def __iter__(self): return iter(range(10)) + def __iter__(self): + return iter(range(10)) + def __len__(self): raise RuntimeError('hello') + class BadLengthHint(object): - def __iter__(self): return iter(range(10)) + def __iter__(self): + return iter(range(10)) + def __length_hint__(self): raise RuntimeError('hello') + class NoneLengthHint(object): - def __iter__(self): return iter(range(10)) + def __iter__(self): + return iter(range(10)) + def __length_hint__(self): - return None + return NotImplemented + class TestLengthHintExceptions(unittest.TestCase): diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -1723,9 +1723,8 @@ class LengthTransparency(unittest.TestCase): def test_repeat(self): - from test.test_iterlen import len - self.assertEqual(len(repeat(None, 50)), 50) - self.assertRaises(TypeError, len, repeat(None)) + self.assertEqual(operator.length_hint(repeat(None, 50)), 50) + self.assertEqual(operator.length_hint(repeat(None), 12), 12) class RegressionTests(unittest.TestCase): diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py --- a/Lib/test/test_operator.py +++ b/Lib/test/test_operator.py @@ -410,6 +410,31 @@ self.assertEqual(operator.__ixor__ (c, 5), "ixor") self.assertEqual(operator.__iconcat__ (c, c), "iadd") + def test_length_hint(self): + class X(object): + def __init__(self, value): + self.value = value + + def __length_hint__(self): + if type(self.value) is type: + raise self.value + else: + return self.value + + self.assertEqual(operator.length_hint([], 2), 0) + self.assertEqual(operator.length_hint(iter([1, 2, 3])), 3) + + self.assertEqual(operator.length_hint(X(2)), 2) + self.assertEqual(operator.length_hint(X(NotImplemented), 4), 4) + self.assertEqual(operator.length_hint(X(TypeError), 12), 12) + with self.assertRaises(TypeError): + operator.length_hint(X("abc")) + with self.assertRaises(ValueError): + operator.length_hint(X(-2)) + with self.assertRaises(LookupError): + operator.length_hint(X(LookupError)) + + def test_main(verbose=None): import sys test_classes = ( diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -848,8 +848,6 @@ for v in self.set: self.assertIn(v, self.values) setiter = iter(self.set) - # note: __length_hint__ is an internal undocumented API, - # don't rely on it in your own programs self.assertEqual(setiter.__length_hint__(), len(self.set)) def test_pickling(self): diff --git a/Modules/operator.c b/Modules/operator.c --- a/Modules/operator.c +++ b/Modules/operator.c @@ -208,6 +208,31 @@ return (result == 0); } +PyDoc_STRVAR(length_hint__doc__, +"length_hint(obj, default=0) -> int\n" +"Return an estimate of the number of items in obj.\n" +"This is useful for presizing containers when building from an\n" +"iterable.\n" +"\n" +"If the object supports len(), the result will be\n" +"exact. Otherwise, it may over- or under-estimate by an\n" +"arbitrary amount. The result will be an integer >= 0."); + +static PyObject *length_hint(PyObject *self, PyObject *args) +{ + PyObject *obj; + Py_ssize_t defaultvalue = 0, res; + if (!PyArg_ParseTuple(args, "O|n:length_hint", &obj, &defaultvalue)) { + return NULL; + } + res = PyObject_LengthHint(obj, defaultvalue); + if (res == -1 && PyErr_Occurred()) { + return NULL; + } + return PyLong_FromSsize_t(res); +} + + PyDoc_STRVAR(compare_digest__doc__, "compare_digest(a, b) -> bool\n" "\n" @@ -366,6 +391,8 @@ {"_compare_digest", (PyCFunction)compare_digest, METH_VARARGS, compare_digest__doc__}, + {"length_hint", (PyCFunction)length_hint, METH_VARARGS, + length_hint__doc__}, {NULL, NULL} /* sentinel */ }; diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -64,49 +64,67 @@ } #define PyObject_Length PyObject_Size +int +_PyObject_HasLen(PyObject *o) { + return (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_length) || + (Py_TYPE(o)->tp_as_mapping && Py_TYPE(o)->tp_as_mapping->mp_length); +} /* The length hint function returns a non-negative value from o.__len__() - or o.__length_hint__(). If those methods aren't found or return a negative - value, then the defaultvalue is returned. If one of the calls fails, - this function returns -1. + or o.__length_hint__(). If those methods aren't found. If one of the calls + fails this function returns -1. */ Py_ssize_t -_PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) +PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) { _Py_IDENTIFIER(__length_hint__); - PyObject *ro, *hintmeth; - Py_ssize_t rv; - - /* try o.__len__() */ - rv = PyObject_Size(o); - if (rv >= 0) - return rv; - if (PyErr_Occurred()) { - if (!PyErr_ExceptionMatches(PyExc_TypeError)) + Py_ssize_t res = PyObject_Length(o); + if (res < 0 && PyErr_Occurred()) { + if (!PyErr_ExceptionMatches(PyExc_TypeError)) { return -1; + } PyErr_Clear(); } - - /* try o.__length_hint__() */ - hintmeth = _PyObject_LookupSpecial(o, &PyId___length_hint__); - if (hintmeth == NULL) { - if (PyErr_Occurred()) + else { + return res; + } + PyObject *hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); + if (hint == NULL) { + if (PyErr_Occurred()) { return -1; - else - return defaultvalue; - } - ro = PyObject_CallFunctionObjArgs(hintmeth, NULL); - Py_DECREF(hintmeth); - if (ro == NULL) { - if (!PyErr_ExceptionMatches(PyExc_TypeError)) - return -1; - PyErr_Clear(); + } return defaultvalue; } - rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue; - Py_DECREF(ro); - return rv; + PyObject *result = PyObject_CallFunctionObjArgs(hint, NULL); + Py_DECREF(hint); + if (result == NULL) { + if (PyErr_ExceptionMatches(PyExc_TypeError)) { + PyErr_Clear(); + return defaultvalue; + } + return -1; + } + else if (result == Py_NotImplemented) { + Py_DECREF(result); + return defaultvalue; + } + if (!PyLong_Check(result)) { + PyErr_Format(PyExc_TypeError, "Length hint must be an integer, not %s", + Py_TYPE(result)->tp_name); + Py_DECREF(result); + return -1; + } + defaultvalue = PyLong_AsSsize_t(result); + Py_DECREF(result); + if (defaultvalue < 0 && PyErr_Occurred()) { + return -1; + } + if (defaultvalue < 0) { + PyErr_Format(PyExc_ValueError, "__length_hint__() should return >= 0"); + return -1; + } + return defaultvalue; } PyObject * @@ -1687,7 +1705,7 @@ return NULL; /* Guess result size and allocate space. */ - n = _PyObject_LengthHint(v, 10); + n = PyObject_LengthHint(v, 10); if (n == -1) goto Fail; result = PyTuple_New(n); diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2282,7 +2282,7 @@ return NULL; /* Try to determine the length of the argument. 32 is arbitrary. */ - buf_size = _PyObject_LengthHint(arg, 32); + buf_size = PyObject_LengthHint(arg, 32); if (buf_size == -1) { Py_DECREF(it); return NULL; diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2651,7 +2651,7 @@ } /* For iterator version, create a string object and resize as needed */ - size = _PyObject_LengthHint(x, 64); + size = PyObject_LengthHint(x, 64); if (size == -1 && PyErr_Occurred()) return NULL; /* Allocate an extra byte to prevent PyBytes_FromStringAndSize() from diff --git a/Objects/iterobject.c b/Objects/iterobject.c --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -76,9 +76,14 @@ Py_ssize_t seqsize, len; if (it->it_seq) { - seqsize = PySequence_Size(it->it_seq); - if (seqsize == -1) - return NULL; + if (_PyObject_HasLen(it->it_seq)) { + seqsize = PySequence_Size(it->it_seq); + if (seqsize == -1) + return NULL; + } + else { + return Py_NotImplemented; + } len = seqsize - it->it_index; if (len >= 0) return PyLong_FromSsize_t(len); diff --git a/Objects/listobject.c b/Objects/listobject.c --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -826,7 +826,7 @@ iternext = *it->ob_type->tp_iternext; /* Guess a result list size. */ - n = _PyObject_LengthHint(b, 8); + n = PyObject_LengthHint(b, 8); if (n == -1) { Py_DECREF(it); return NULL; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 14:12:38 2012 From: python-checkins at python.org (armin.ronacher) Date: Sat, 6 Oct 2012 14:12:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge_default?= Message-ID: <3XYmtZ1ndwzNFr@mail.python.org> http://hg.python.org/cpython/rev/490ef1e57c52 changeset: 79512:490ef1e57c52 parent: 79511:a7ec0a1b0f7c parent: 79510:226574cf9ec8 user: Armin Ronacher date: Sat Oct 06 14:12:21 2012 +0200 summary: merge default files: Doc/library/concurrency.rst | 1 + Doc/library/concurrent.rst | 6 ++++ Doc/library/html.rst | 7 +++++ Doc/library/http.rst | 11 ++++++++ Doc/library/internet.rst | 3 ++ Doc/library/markup.rst | 9 +------ Doc/library/urllib.rst | 9 +++++++ Doc/library/xml.rst | 29 +++++++++++++++++++++++ Doc/library/xmlrpc.rst | 12 +++++++++ Doc/reference/expressions.rst | 14 +++------- 10 files changed, 83 insertions(+), 18 deletions(-) diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst --- a/Doc/library/concurrency.rst +++ b/Doc/library/concurrency.rst @@ -15,6 +15,7 @@ threading.rst multiprocessing.rst + concurrent.rst concurrent.futures.rst subprocess.rst sched.rst diff --git a/Doc/library/concurrent.rst b/Doc/library/concurrent.rst new file mode 100644 --- /dev/null +++ b/Doc/library/concurrent.rst @@ -0,0 +1,6 @@ +The :mod:`concurrent` package +============================= + +Currently, there is only one module in this package: + +* :mod:`concurrent.futures` -- Launching parallel tasks diff --git a/Doc/library/html.rst b/Doc/library/html.rst --- a/Doc/library/html.rst +++ b/Doc/library/html.rst @@ -19,3 +19,10 @@ attribute value delimited by quotes, as in ````. .. versionadded:: 3.2 + +-------------- + +Submodules in the ``html`` package are: + +* :mod:`html.parser` -- HTML/XHTML parser with lenient parsing mode +* :mod:`html.entities` -- HTML entity definitions diff --git a/Doc/library/http.rst b/Doc/library/http.rst new file mode 100644 --- /dev/null +++ b/Doc/library/http.rst @@ -0,0 +1,11 @@ +:mod:`http` --- HTTP modules +============================ + +``http`` is a package that collects several modules for working with the +HyperText Transfer Protocol: + +* :mod:`http.client` is a low-level HTTP protocol client; for high-level URL + opening use :mod:`urllib.request` +* :mod:`http.server` contains basic HTTP server classes based on :mod:`socketserver` +* :mod:`http.cookies` has utilities for implementing state management with cookies +* :mod:`http.cookiejar` provides persistence of cookies diff --git a/Doc/library/internet.rst b/Doc/library/internet.rst --- a/Doc/library/internet.rst +++ b/Doc/library/internet.rst @@ -23,10 +23,12 @@ cgi.rst cgitb.rst wsgiref.rst + urllib.rst urllib.request.rst urllib.parse.rst urllib.error.rst urllib.robotparser.rst + http.rst http.client.rst ftplib.rst poplib.rst @@ -40,6 +42,7 @@ http.server.rst http.cookies.rst http.cookiejar.rst + xmlrpc.rst xmlrpc.client.rst xmlrpc.server.rst ipaddress.rst diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst --- a/Doc/library/markup.rst +++ b/Doc/library/markup.rst @@ -9,20 +9,13 @@ Language (SGML) and the Hypertext Markup Language (HTML), and several interfaces for working with the Extensible Markup Language (XML). -It is important to note that modules in the :mod:`xml` package require that -there be at least one SAX-compliant XML parser available. The Expat parser is -included with Python, so the :mod:`xml.parsers.expat` module will always be -available. - -The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the -definition of the Python bindings for the DOM and SAX interfaces. - .. toctree:: html.rst html.parser.rst html.entities.rst + xml.rst xml.etree.elementtree.rst xml.dom.rst xml.dom.minidom.rst diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst new file mode 100644 --- /dev/null +++ b/Doc/library/urllib.rst @@ -0,0 +1,9 @@ +:mod:`urllib` --- URL handling modules +====================================== + +``urllib`` is a package that collects several modules for working with URLs: + +* :mod:`urllib.request` for opening and reading URLs +* :mod:`urllib.error` containing the exceptions raised by :mod:`urllib.request` +* :mod:`urllib.parse` for parsing URLs +* :mod:`urllib.robotparser` for parsing ``robots.txt`` files diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xml.rst @@ -0,0 +1,29 @@ +.. _xml: + +XML Processing Modules +====================== + +Python's interfaces for processing XML are grouped in the ``xml`` package. + +It is important to note that modules in the :mod:`xml` package require that +there be at least one SAX-compliant XML parser available. The Expat parser is +included with Python, so the :mod:`xml.parsers.expat` module will always be +available. + +The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the +definition of the Python bindings for the DOM and SAX interfaces. + +The XML handling submodules are: + +* :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + +.. + +* :mod:`xml.dom`: the DOM API definition +* :mod:`xml.dom.minidom`: a lightweight DOM implementation +* :mod:`xml.dom.pulldom`: support for building partial DOM trees + +.. + +* :mod:`xml.sax`: SAX2 base classes and convenience functions +* :mod:`xml.parsers.expat`: the Expat parser binding diff --git a/Doc/library/xmlrpc.rst b/Doc/library/xmlrpc.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xmlrpc.rst @@ -0,0 +1,12 @@ +:mod:`xmlrpc` --- XMLRPC server and client modules +================================================== + +XML-RPC is a Remote Procedure Call method that uses XML passed via HTTP as a +transport. With it, a client can call methods with parameters on a remote +server (the server is named by a URI) and get back structured data. + +``xmlrpc`` is a package that collects server and client modules implementing +XML-RPC. The modules are: + +* :mod:`xmlrpc.client` +* :mod:`xmlrpc.server` diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1094,16 +1094,10 @@ another one is made arbitrarily but consistently within one execution of a program. -Comparison of objects of the differing types depends on whether either -of the types provide explicit support for the comparison. Most numeric types -can be compared with one another, but comparisons of :class:`float` and -:class:`Decimal` are not supported to avoid the inevitable confusion arising -from representation issues such as ``float('1.1')`` being inexactly represented -and therefore not exactly equal to ``Decimal('1.1')`` which is. When -cross-type comparison is not supported, the comparison method returns -``NotImplemented``. This can create the illusion of non-transitivity between -supported cross-type comparisons and unsupported comparisons. For example, -``Decimal(2) == 2`` and ``2 == float(2)`` but ``Decimal(2) != float(2)``. +Comparison of objects of the differing types depends on whether either of the +types provide explicit support for the comparison. Most numeric types can be +compared with one another. When cross-type comparison is not supported, the +comparison method returns ``NotImplemented``. .. _membership-test-details: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 14:18:40 2012 From: python-checkins at python.org (armin.ronacher) Date: Sat, 6 Oct 2012 14:18:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_424=3A_marked_as_final=2E?= Message-ID: <3XYn1X1gcQzM2Q@mail.python.org> http://hg.python.org/peps/rev/6c2cdec6c145 changeset: 4546:6c2cdec6c145 user: Armin Ronacher date: Sat Oct 06 14:18:33 2012 +0200 summary: PEP 424: marked as final. files: pep-0424.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -1,9 +1,9 @@ PEP: 424 Title: A method for exposing a length hint Version: $Revision$ -Last-Modified: $Date +Last-Modified: $Date$ Author: Alex Gaynor -Status: Accepted +Status: Final Type: Standards Track Content-Type: text/x-rst Created: 14-July-2012 -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 6 14:30:39 2012 From: python-checkins at python.org (armin.ronacher) Date: Sat, 6 Oct 2012 14:30:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Added_notimplemented=5Fdea?= =?utf-8?q?lloc_for_better_error_reporting?= Message-ID: <3XYnHM57BczM7Q@mail.python.org> http://hg.python.org/cpython/rev/75d3a783d728 changeset: 79513:75d3a783d728 user: Armin Ronacher date: Sat Oct 06 14:28:58 2012 +0200 summary: Added notimplemented_dealloc for better error reporting files: Objects/object.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1524,12 +1524,21 @@ Py_RETURN_NOTIMPLEMENTED; } +static void +notimplemented_dealloc(PyObject* ignore) +{ + /* This should never get called, but we also don't want to SEGV if + * we accidentally decref NotImplemented out of existence. + */ + Py_FatalError("deallocating NotImplemented"); +} + static PyTypeObject PyNotImplemented_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) "NotImplementedType", 0, 0, - none_dealloc, /*tp_dealloc*/ /*never called*/ + notimplemented_dealloc, /*tp_dealloc*/ /*never called*/ 0, /*tp_print*/ 0, /*tp_getattr*/ 0, /*tp_setattr*/ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 14:30:41 2012 From: python-checkins at python.org (armin.ronacher) Date: Sat, 6 Oct 2012 14:30:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_a_missing_incref_int?= =?utf-8?q?roduced_by_a7ec0a1b0f7c?= Message-ID: <3XYnHP0W2fzM88@mail.python.org> http://hg.python.org/cpython/rev/66f1cd22368c changeset: 79514:66f1cd22368c user: Armin Ronacher date: Sat Oct 06 14:30:32 2012 +0200 summary: Fixed a missing incref introduced by a7ec0a1b0f7c files: Objects/iterobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/iterobject.c b/Objects/iterobject.c --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -82,7 +82,7 @@ return NULL; } else { - return Py_NotImplemented; + Py_RETURN_NOTIMPLEMENTED; } len = seqsize - it->it_index; if (len >= 0) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 15:09:14 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 15:09:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_fix_possible_memory_leak?= =?utf-8?q?=2C_dealloc_newobj?= Message-ID: <3XYp7t5YdlzNqK@mail.python.org> http://hg.python.org/cpython/rev/8b2546165960 changeset: 79515:8b2546165960 user: Christian Heimes date: Sat Oct 06 15:09:06 2012 +0200 summary: fix possible memory leak, dealloc newobj files: Modules/_sha3/sha3module.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -474,8 +474,7 @@ error: if (newobj) { - SHA3_clearstate(newobj->hash_state); - /* self->lock is always NULL */ + SHA3_dealloc(newobj); } if (data_obj) { PyBuffer_Release(&buf); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 16:11:57 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 16:11:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316120=3A_Use_=7Cy?= =?utf-8?q?ield_from=7C_in_stdlib=2E?= Message-ID: <3XYqXF1qwTzNZF@mail.python.org> http://hg.python.org/cpython/rev/7d8868c13b95 changeset: 79516:7d8868c13b95 user: Andrew Svetlov date: Sat Oct 06 17:11:45 2012 +0300 summary: Issue #16120: Use |yield from| in stdlib. Patch by Berker Peksag. files: Lib/lib2to3/btm_utils.py | 6 ++---- Lib/lib2to3/pytree.py | 9 +++------ Lib/unittest/loader.py | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Lib/lib2to3/btm_utils.py b/Lib/lib2to3/btm_utils.py --- a/Lib/lib2to3/btm_utils.py +++ b/Lib/lib2to3/btm_utils.py @@ -96,8 +96,7 @@ def leaves(self): "Generator that returns the leaves of the tree" for child in self.children: - for x in child.leaves(): - yield x + yield from child.leaves() if not self.children: yield self @@ -277,7 +276,6 @@ sub-iterables""" for x in sequence: if isinstance(x, (list, tuple)): - for y in rec_test(x, test_func): - yield y + yield from rec_test(x, test_func) else: yield test_func(x) diff --git a/Lib/lib2to3/pytree.py b/Lib/lib2to3/pytree.py --- a/Lib/lib2to3/pytree.py +++ b/Lib/lib2to3/pytree.py @@ -194,8 +194,7 @@ def leaves(self): for child in self.children: - for x in child.leaves(): - yield x + yield from child.leaves() def depth(self): if self.parent is None: @@ -274,16 +273,14 @@ def post_order(self): """Return a post-order iterator for the tree.""" for child in self.children: - for node in child.post_order(): - yield node + yield from child.post_order() yield self def pre_order(self): """Return a pre-order iterator for the tree.""" yield self for child in self.children: - for node in child.pre_order(): - yield node + yield from child.pre_order() def _prefix_getter(self): """ diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py --- a/Lib/unittest/loader.py +++ b/Lib/unittest/loader.py @@ -291,8 +291,7 @@ # tests loaded from package file yield tests # recurse into the package - for test in self._find_tests(full_path, pattern): - yield test + yield from self._find_tests(full_path, pattern) else: try: yield load_tests(self, tests, pattern) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:11:13 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:11:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MDI1?= =?utf-8?q?=3A_Minor_corrections_to_the_zipfile_documentation=2E?= Message-ID: <3XYrrd1dkhzP2T@mail.python.org> http://hg.python.org/cpython/rev/2c398a78dba8 changeset: 79517:2c398a78dba8 branch: 2.7 parent: 79487:19d37c8d1882 user: Andrew Svetlov date: Sat Oct 06 18:01:05 2012 +0300 summary: Issue #16025: Minor corrections to the zipfile documentation. Patch by Serhiy Storchaka. files: Doc/library/zipfile.rst | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -53,7 +53,7 @@ .. class:: ZipInfo([filename[, date_time]]) Class used to represent information about a member of an archive. Instances - of this class are returned by the :meth:`getinfo` and :meth:`infolist` + of this class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Most users of the :mod:`zipfile` module will not need to create these, but only use those created by this module. *filename* should be the full name of the archive member, and @@ -78,7 +78,7 @@ .. data:: ZIP_DEFLATED The numeric constant for the usual ZIP compression method. This requires the - zlib module. No other compression methods are currently supported. + :mod:`zlib` module. No other compression methods are currently supported. .. seealso:: @@ -125,7 +125,7 @@ .. versionchanged:: 2.7.1 If the file is created with mode ``'a'`` or ``'w'`` and then - :meth:`close`\ d without adding any files to the archive, the appropriate + :meth:`closed ` without adding any files to the archive, the appropriate ZIP structures for an empty archive will be written to the file. ZipFile is also a context manager and therefore supports the @@ -175,7 +175,7 @@ ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable :term:`universal newline ` support in the read-only object. *pwd* is the password used for encrypted files. - Calling :meth:`open` on a closed ZipFile will raise a :exc:`RuntimeError`. + Calling :meth:`.open` on a closed ZipFile will raise a :exc:`RuntimeError`. .. note:: @@ -196,7 +196,7 @@ .. note:: - The :meth:`open`, :meth:`read` and :meth:`extract` methods can take a filename + The :meth:`.open`, :meth:`read` and :meth:`extract` methods can take a filename or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. @@ -313,7 +313,7 @@ :class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`. .. versionchanged:: 2.7 - The *compression_type* argument. + The *compress_type* argument. The following data attributes are also available: @@ -329,7 +329,7 @@ The comment text associated with the ZIP file. If assigning a comment to a :class:`ZipFile` instance created with mode 'a' or 'w', this should be a string no longer than 65535 bytes. Comments longer than this will be - truncated in the written archive when :meth:`ZipFile.close` is called. + truncated in the written archive when :meth:`.close` is called. .. _pyzipfile-objects: @@ -369,8 +369,8 @@ ZipInfo Objects --------------- -Instances of the :class:`ZipInfo` class are returned by the :meth:`getinfo` and -:meth:`infolist` methods of :class:`ZipFile` objects. Each object stores +Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and +:meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. Instances have the following attributes: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:11:14 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:11:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MDI1?= =?utf-8?q?=3A_Minor_corrections_to_the_zipfile_documentation=2E?= Message-ID: <3XYrrf5kW4zNqX@mail.python.org> http://hg.python.org/cpython/rev/3d54d17a637b changeset: 79518:3d54d17a637b branch: 3.2 parent: 79494:40bd8afa6b29 user: Andrew Svetlov date: Sat Oct 06 18:02:05 2012 +0300 summary: Issue #16025: Minor corrections to the zipfile documentation. Patch by Serhiy Storchaka. files: Doc/library/zipfile.rst | 18 +++++++++--------- Lib/test/test_subprocess.py | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -61,7 +61,7 @@ .. class:: ZipInfo(filename='NoName', date_time=(1980,1,1,0,0,0)) Class used to represent information about a member of an archive. Instances - of this class are returned by the :meth:`getinfo` and :meth:`infolist` + of this class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Most users of the :mod:`zipfile` module will not need to create these, but only use those created by this module. *filename* should be the full name of the archive member, and @@ -87,7 +87,7 @@ .. data:: ZIP_DEFLATED The numeric constant for the usual ZIP compression method. This requires the - zlib module. No other compression methods are currently supported. + :mod:`zlib` module. No other compression methods are currently supported. .. seealso:: @@ -130,7 +130,7 @@ these extensions. If the file is created with mode ``'a'`` or ``'w'`` and then - :meth:`close`\ d without adding any files to the archive, the appropriate + :meth:`closed ` without adding any files to the archive, the appropriate ZIP structures for an empty archive will be written to the file. ZipFile is also a context manager and therefore supports the @@ -179,7 +179,7 @@ *mode* parameter, if included, must be one of the following: ``'r'`` (the default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable :term:`universal newlines` support in the read-only object. *pwd* is the - password used for encrypted files. Calling :meth:`open` on a closed + password used for encrypted files. Calling :meth:`.open` on a closed ZipFile will raise a :exc:`RuntimeError`. .. note:: @@ -201,7 +201,7 @@ .. note:: - The :meth:`open`, :meth:`read` and :meth:`extract` methods can take a filename + The :meth:`.open`, :meth:`read` and :meth:`extract` methods can take a filename or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. @@ -307,7 +307,7 @@ :class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`. .. versionchanged:: 3.2 - The *compression_type* argument. + The *compress_type* argument. The following data attributes are also available: @@ -323,7 +323,7 @@ The comment text associated with the ZIP file. If assigning a comment to a :class:`ZipFile` instance created with mode 'a' or 'w', this should be a string no longer than 65535 bytes. Comments longer than this will be - truncated in the written archive when :meth:`ZipFile.close` is called. + truncated in the written archive when :meth:`close` is called. .. _pyzipfile-objects: @@ -379,8 +379,8 @@ ZipInfo Objects --------------- -Instances of the :class:`ZipInfo` class are returned by the :meth:`getinfo` and -:meth:`infolist` methods of :class:`ZipFile` objects. Each object stores +Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and +:meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. Instances have the following attributes: diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -165,6 +165,28 @@ p.wait() self.assertEqual(p.stderr, None) + @unittest.skipIf(mswindows, "path not included in Windows message") + def test_path_in_arg_not_found_message(self): + # Check that the error message displays the path not found when + # args[0] is not found. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, ["notfound_blahblah"]) + + @unittest.skipIf(mswindows, "path not displayed in Windows message") + def test_path_in_executable_not_found_message(self): + # Check that the error message displays the executable argument (and + # not args[0]) when the executable argument is not found + # (issue #16114). + # We call sys.exit() inside the code to prevent the test runner + # from hanging if the test fails and finds python. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, [sys.executable, "-c", + "import sys; sys.exit(47)"], + executable="notfound_blahblah") + self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", + subprocess.Popen, ["argnotfound_blahblah"], + executable="exenotfound_blahblah") + # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:11:16 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:11:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316025=3A_Minor_corrections_to_the_zipfile_documentati?= =?utf-8?b?b24u?= Message-ID: <3XYrrh25xpzP68@mail.python.org> http://hg.python.org/cpython/rev/2e7a57cdd961 changeset: 79519:2e7a57cdd961 branch: 3.3 parent: 79509:1141648fa655 parent: 79518:3d54d17a637b user: Andrew Svetlov date: Sat Oct 06 18:10:01 2012 +0300 summary: Issue #16025: Minor corrections to the zipfile documentation. Patch by Serhiy Storchaka. files: Doc/library/zipfile.rst | 24 ++++++++++++------------ Lib/test/test_subprocess.py | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -61,7 +61,7 @@ .. class:: ZipInfo(filename='NoName', date_time=(1980,1,1,0,0,0)) Class used to represent information about a member of an archive. Instances - of this class are returned by the :meth:`getinfo` and :meth:`infolist` + of this class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Most users of the :mod:`zipfile` module will not need to create these, but only use those created by this module. *filename* should be the full name of the archive member, and @@ -87,20 +87,20 @@ .. data:: ZIP_DEFLATED The numeric constant for the usual ZIP compression method. This requires the - zlib module. + :mod:`zlib` module. .. data:: ZIP_BZIP2 The numeric constant for the BZIP2 compression method. This requires the - bz2 module. + :mod:`bz2` module. .. versionadded:: 3.3 .. data:: ZIP_LZMA The numeric constant for the LZMA compression method. This requires the - lzma module. + :mod:`lzma` module. .. versionadded:: 3.3 @@ -155,7 +155,7 @@ these extensions. If the file is created with mode ``'a'`` or ``'w'`` and then - :meth:`close`\ d without adding any files to the archive, the appropriate + :meth:`closed ` without adding any files to the archive, the appropriate ZIP structures for an empty archive will be written to the file. ZipFile is also a context manager and therefore supports the @@ -169,7 +169,7 @@ Added the ability to use :class:`ZipFile` as a context manager. .. versionchanged:: 3.3 - Added support for :mod:`bzip2` and :mod:`lzma` compression. + Added support for :mod:`bzip2 ` and :mod:`lzma` compression. .. method:: ZipFile.close() @@ -207,7 +207,7 @@ *mode* parameter, if included, must be one of the following: ``'r'`` (the default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable :term:`universal newlines` support in the read-only object. *pwd* is the - password used for encrypted files. Calling :meth:`open` on a closed + password used for encrypted files. Calling :meth:`.open` on a closed ZipFile will raise a :exc:`RuntimeError`. .. note:: @@ -229,7 +229,7 @@ .. note:: - The :meth:`open`, :meth:`read` and :meth:`extract` methods can take a filename + The :meth:`.open`, :meth:`read` and :meth:`extract` methods can take a filename or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. @@ -335,7 +335,7 @@ :class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`. .. versionchanged:: 3.2 - The *compression_type* argument. + The *compress_type* argument. The following data attributes are also available: @@ -351,7 +351,7 @@ The comment text associated with the ZIP file. If assigning a comment to a :class:`ZipFile` instance created with mode 'a' or 'w', this should be a string no longer than 65535 bytes. Comments longer than this will be - truncated in the written archive when :meth:`ZipFile.close` is called. + truncated in the written archive when :meth:`close` is called. .. _pyzipfile-objects: @@ -407,8 +407,8 @@ ZipInfo Objects --------------- -Instances of the :class:`ZipInfo` class are returned by the :meth:`getinfo` and -:meth:`infolist` methods of :class:`ZipFile` objects. Each object stores +Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and +:meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. Instances have the following attributes: diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,6 +192,28 @@ p.wait() self.assertEqual(p.stderr, None) + @unittest.skipIf(mswindows, "path not included in Windows message") + def test_path_in_arg_not_found_message(self): + # Check that the error message displays the path not found when + # args[0] is not found. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, ["notfound_blahblah"]) + + @unittest.skipIf(mswindows, "path not displayed in Windows message") + def test_path_in_executable_not_found_message(self): + # Check that the error message displays the executable argument (and + # not args[0]) when the executable argument is not found + # (issue #16114). + # We call sys.exit() inside the code to prevent the test runner + # from hanging if the test fails and finds python. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, [sys.executable, "-c", + "import sys; sys.exit(47)"], + executable="notfound_blahblah") + self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", + subprocess.Popen, ["argnotfound_blahblah"], + executable="exenotfound_blahblah") + # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:11:17 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:11:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316025=3A_Minor_corrections_to_the_zipfile_docum?= =?utf-8?q?entation=2E?= Message-ID: <3XYrrj5mtKzP5g@mail.python.org> http://hg.python.org/cpython/rev/7fd068d4ded8 changeset: 79520:7fd068d4ded8 parent: 79516:7d8868c13b95 parent: 79519:2e7a57cdd961 user: Andrew Svetlov date: Sat Oct 06 18:10:52 2012 +0300 summary: Issue #16025: Minor corrections to the zipfile documentation. Patch by Serhiy Storchaka. files: Doc/library/zipfile.rst | 24 ++++++++++++------------ Lib/test/test_subprocess.py | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -61,7 +61,7 @@ .. class:: ZipInfo(filename='NoName', date_time=(1980,1,1,0,0,0)) Class used to represent information about a member of an archive. Instances - of this class are returned by the :meth:`getinfo` and :meth:`infolist` + of this class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Most users of the :mod:`zipfile` module will not need to create these, but only use those created by this module. *filename* should be the full name of the archive member, and @@ -87,20 +87,20 @@ .. data:: ZIP_DEFLATED The numeric constant for the usual ZIP compression method. This requires the - zlib module. + :mod:`zlib` module. .. data:: ZIP_BZIP2 The numeric constant for the BZIP2 compression method. This requires the - bz2 module. + :mod:`bz2` module. .. versionadded:: 3.3 .. data:: ZIP_LZMA The numeric constant for the LZMA compression method. This requires the - lzma module. + :mod:`lzma` module. .. versionadded:: 3.3 @@ -155,7 +155,7 @@ these extensions. If the file is created with mode ``'a'`` or ``'w'`` and then - :meth:`close`\ d without adding any files to the archive, the appropriate + :meth:`closed ` without adding any files to the archive, the appropriate ZIP structures for an empty archive will be written to the file. ZipFile is also a context manager and therefore supports the @@ -169,7 +169,7 @@ Added the ability to use :class:`ZipFile` as a context manager. .. versionchanged:: 3.3 - Added support for :mod:`bzip2` and :mod:`lzma` compression. + Added support for :mod:`bzip2 ` and :mod:`lzma` compression. .. method:: ZipFile.close() @@ -207,7 +207,7 @@ *mode* parameter, if included, must be one of the following: ``'r'`` (the default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable :term:`universal newlines` support in the read-only object. *pwd* is the - password used for encrypted files. Calling :meth:`open` on a closed + password used for encrypted files. Calling :meth:`.open` on a closed ZipFile will raise a :exc:`RuntimeError`. .. note:: @@ -229,7 +229,7 @@ .. note:: - The :meth:`open`, :meth:`read` and :meth:`extract` methods can take a filename + The :meth:`.open`, :meth:`read` and :meth:`extract` methods can take a filename or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. @@ -335,7 +335,7 @@ :class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`. .. versionchanged:: 3.2 - The *compression_type* argument. + The *compress_type* argument. The following data attributes are also available: @@ -351,7 +351,7 @@ The comment text associated with the ZIP file. If assigning a comment to a :class:`ZipFile` instance created with mode 'a' or 'w', this should be a string no longer than 65535 bytes. Comments longer than this will be - truncated in the written archive when :meth:`ZipFile.close` is called. + truncated in the written archive when :meth:`close` is called. .. _pyzipfile-objects: @@ -407,8 +407,8 @@ ZipInfo Objects --------------- -Instances of the :class:`ZipInfo` class are returned by the :meth:`getinfo` and -:meth:`infolist` methods of :class:`ZipFile` objects. Each object stores +Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and +:meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. Instances have the following attributes: diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,6 +192,28 @@ p.wait() self.assertEqual(p.stderr, None) + @unittest.skipIf(mswindows, "path not included in Windows message") + def test_path_in_arg_not_found_message(self): + # Check that the error message displays the path not found when + # args[0] is not found. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, ["notfound_blahblah"]) + + @unittest.skipIf(mswindows, "path not displayed in Windows message") + def test_path_in_executable_not_found_message(self): + # Check that the error message displays the executable argument (and + # not args[0]) when the executable argument is not found + # (issue #16114). + # We call sys.exit() inside the code to prevent the test runner + # from hanging if the test fails and finds python. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, [sys.executable, "-c", + "import sys; sys.exit(47)"], + executable="notfound_blahblah") + self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", + subprocess.Popen, ["argnotfound_blahblah"], + executable="exenotfound_blahblah") + # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:14:15 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 17:14:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_remove_=23warning_from_sha?= =?utf-8?q?3module=2Ec?= Message-ID: <3XYrw74CvNzP4Q@mail.python.org> http://hg.python.org/cpython/rev/db90a1d87188 changeset: 79521:db90a1d87188 parent: 79515:8b2546165960 user: Christian Heimes date: Sat Oct 06 15:44:29 2012 +0200 summary: remove #warning from sha3module.c files: Modules/_sha3/sha3module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -110,7 +110,6 @@ typedef PY_UINT64_T UINT64; #else /* 32 or 64bit platforms without unsigned int64 */ - #warning no uint64_t available, force Keccak opt32 with interleave tables #define KeccakImplementation 32 #define Unrolling 2 #define UseSchedule 3 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:14:16 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 17:14:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_move_var_declaration_to_to?= =?utf-8?q?p_of_block_to_fix_compilation_on_Windows=2C_fixes?= Message-ID: <3XYrw86wwDzP4H@mail.python.org> http://hg.python.org/cpython/rev/f56a49e74178 changeset: 79522:f56a49e74178 user: Christian Heimes date: Sat Oct 06 17:13:29 2012 +0200 summary: move var declaration to top of block to fix compilation on Windows, fixes a7ec0a1b0f7c files: Objects/abstract.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -78,8 +78,10 @@ Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) { + PyObject *hint; + Py_ssize_t res; _Py_IDENTIFIER(__length_hint__); - Py_ssize_t res = PyObject_Length(o); + res = PyObject_Length(o); if (res < 0 && PyErr_Occurred()) { if (!PyErr_ExceptionMatches(PyExc_TypeError)) { return -1; @@ -89,7 +91,7 @@ else { return res; } - PyObject *hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); + hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); if (hint == NULL) { if (PyErr_Occurred()) { return -1; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:14:18 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 17:14:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge?= Message-ID: <3XYrwB39xmzP4Q@mail.python.org> http://hg.python.org/cpython/rev/654eb8c3a82e changeset: 79523:654eb8c3a82e parent: 79522:f56a49e74178 parent: 79520:7fd068d4ded8 user: Christian Heimes date: Sat Oct 06 17:14:02 2012 +0200 summary: merge files: Doc/library/zipfile.rst | 24 ++++++++++++------------ Lib/lib2to3/btm_utils.py | 6 ++---- Lib/lib2to3/pytree.py | 9 +++------ Lib/test/test_subprocess.py | 22 ++++++++++++++++++++++ Lib/unittest/loader.py | 3 +-- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -61,7 +61,7 @@ .. class:: ZipInfo(filename='NoName', date_time=(1980,1,1,0,0,0)) Class used to represent information about a member of an archive. Instances - of this class are returned by the :meth:`getinfo` and :meth:`infolist` + of this class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Most users of the :mod:`zipfile` module will not need to create these, but only use those created by this module. *filename* should be the full name of the archive member, and @@ -87,20 +87,20 @@ .. data:: ZIP_DEFLATED The numeric constant for the usual ZIP compression method. This requires the - zlib module. + :mod:`zlib` module. .. data:: ZIP_BZIP2 The numeric constant for the BZIP2 compression method. This requires the - bz2 module. + :mod:`bz2` module. .. versionadded:: 3.3 .. data:: ZIP_LZMA The numeric constant for the LZMA compression method. This requires the - lzma module. + :mod:`lzma` module. .. versionadded:: 3.3 @@ -155,7 +155,7 @@ these extensions. If the file is created with mode ``'a'`` or ``'w'`` and then - :meth:`close`\ d without adding any files to the archive, the appropriate + :meth:`closed ` without adding any files to the archive, the appropriate ZIP structures for an empty archive will be written to the file. ZipFile is also a context manager and therefore supports the @@ -169,7 +169,7 @@ Added the ability to use :class:`ZipFile` as a context manager. .. versionchanged:: 3.3 - Added support for :mod:`bzip2` and :mod:`lzma` compression. + Added support for :mod:`bzip2 ` and :mod:`lzma` compression. .. method:: ZipFile.close() @@ -207,7 +207,7 @@ *mode* parameter, if included, must be one of the following: ``'r'`` (the default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable :term:`universal newlines` support in the read-only object. *pwd* is the - password used for encrypted files. Calling :meth:`open` on a closed + password used for encrypted files. Calling :meth:`.open` on a closed ZipFile will raise a :exc:`RuntimeError`. .. note:: @@ -229,7 +229,7 @@ .. note:: - The :meth:`open`, :meth:`read` and :meth:`extract` methods can take a filename + The :meth:`.open`, :meth:`read` and :meth:`extract` methods can take a filename or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. @@ -335,7 +335,7 @@ :class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`. .. versionchanged:: 3.2 - The *compression_type* argument. + The *compress_type* argument. The following data attributes are also available: @@ -351,7 +351,7 @@ The comment text associated with the ZIP file. If assigning a comment to a :class:`ZipFile` instance created with mode 'a' or 'w', this should be a string no longer than 65535 bytes. Comments longer than this will be - truncated in the written archive when :meth:`ZipFile.close` is called. + truncated in the written archive when :meth:`close` is called. .. _pyzipfile-objects: @@ -407,8 +407,8 @@ ZipInfo Objects --------------- -Instances of the :class:`ZipInfo` class are returned by the :meth:`getinfo` and -:meth:`infolist` methods of :class:`ZipFile` objects. Each object stores +Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and +:meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. Instances have the following attributes: diff --git a/Lib/lib2to3/btm_utils.py b/Lib/lib2to3/btm_utils.py --- a/Lib/lib2to3/btm_utils.py +++ b/Lib/lib2to3/btm_utils.py @@ -96,8 +96,7 @@ def leaves(self): "Generator that returns the leaves of the tree" for child in self.children: - for x in child.leaves(): - yield x + yield from child.leaves() if not self.children: yield self @@ -277,7 +276,6 @@ sub-iterables""" for x in sequence: if isinstance(x, (list, tuple)): - for y in rec_test(x, test_func): - yield y + yield from rec_test(x, test_func) else: yield test_func(x) diff --git a/Lib/lib2to3/pytree.py b/Lib/lib2to3/pytree.py --- a/Lib/lib2to3/pytree.py +++ b/Lib/lib2to3/pytree.py @@ -194,8 +194,7 @@ def leaves(self): for child in self.children: - for x in child.leaves(): - yield x + yield from child.leaves() def depth(self): if self.parent is None: @@ -274,16 +273,14 @@ def post_order(self): """Return a post-order iterator for the tree.""" for child in self.children: - for node in child.post_order(): - yield node + yield from child.post_order() yield self def pre_order(self): """Return a pre-order iterator for the tree.""" yield self for child in self.children: - for node in child.pre_order(): - yield node + yield from child.pre_order() def _prefix_getter(self): """ diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,6 +192,28 @@ p.wait() self.assertEqual(p.stderr, None) + @unittest.skipIf(mswindows, "path not included in Windows message") + def test_path_in_arg_not_found_message(self): + # Check that the error message displays the path not found when + # args[0] is not found. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, ["notfound_blahblah"]) + + @unittest.skipIf(mswindows, "path not displayed in Windows message") + def test_path_in_executable_not_found_message(self): + # Check that the error message displays the executable argument (and + # not args[0]) when the executable argument is not found + # (issue #16114). + # We call sys.exit() inside the code to prevent the test runner + # from hanging if the test fails and finds python. + self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", + subprocess.Popen, [sys.executable, "-c", + "import sys; sys.exit(47)"], + executable="notfound_blahblah") + self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", + subprocess.Popen, ["argnotfound_blahblah"], + executable="exenotfound_blahblah") + # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py --- a/Lib/unittest/loader.py +++ b/Lib/unittest/loader.py @@ -291,8 +291,7 @@ # tests loaded from package file yield tests # recurse into the package - for test in self._find_tests(full_path, pattern): - yield test + yield from self._find_tests(full_path, pattern) else: try: yield load_tests(self, tests, pattern) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:16:48 2012 From: python-checkins at python.org (christian.heimes) Date: Sat, 6 Oct 2012 17:16:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_and_another_one?= Message-ID: <3XYrz40TP7zLqy@mail.python.org> http://hg.python.org/cpython/rev/895f9fddb8e3 changeset: 79524:895f9fddb8e3 user: Christian Heimes date: Sat Oct 06 17:16:39 2012 +0200 summary: and another one files: Objects/abstract.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -78,7 +78,7 @@ Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) { - PyObject *hint; + PyObject *hint, *result; Py_ssize_t res; _Py_IDENTIFIER(__length_hint__); res = PyObject_Length(o); @@ -98,7 +98,7 @@ } return defaultvalue; } - PyObject *result = PyObject_CallFunctionObjArgs(hint, NULL); + result = PyObject_CallFunctionObjArgs(hint, NULL); Py_DECREF(hint); if (result == NULL) { if (PyErr_ExceptionMatches(PyExc_TypeError)) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:38:39 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:38:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_spaces_to_follow_PEP8?= =?utf-8?q?=2E?= Message-ID: <3XYsSH5lh3zNXK@mail.python.org> http://hg.python.org/cpython/rev/6ae0e2fb1bcb changeset: 79525:6ae0e2fb1bcb user: Andrew Svetlov date: Sat Oct 06 18:38:30 2012 +0300 summary: Add spaces to follow PEP8. files: Lib/shelve.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/shelve.py b/Lib/shelve.py --- a/Lib/shelve.py +++ b/Lib/shelve.py @@ -61,7 +61,7 @@ import collections -__all__ = ["Shelf","BsdDbShelf","DbfilenameShelf","open"] +__all__ = ["Shelf", "BsdDbShelf", "DbfilenameShelf", "open"] class _ClosedDict(collections.MutableMapping): 'Marker for a closed dict. Access attempts raise a ValueError.' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:46:55 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:46:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_revert_acciden?= =?utf-8?q?tal_inclusion_of_subprocess_tests?= Message-ID: <3XYsdq5XNMzNvB@mail.python.org> http://hg.python.org/cpython/rev/c9695a0b0923 changeset: 79526:c9695a0b0923 branch: 3.2 parent: 79518:3d54d17a637b user: Andrew Svetlov date: Sat Oct 06 18:45:24 2012 +0300 summary: revert accidental inclusion of subprocess tests files: Lib/test/test_subprocess.py | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -165,28 +165,6 @@ p.wait() self.assertEqual(p.stderr, None) - @unittest.skipIf(mswindows, "path not included in Windows message") - def test_path_in_arg_not_found_message(self): - # Check that the error message displays the path not found when - # args[0] is not found. - self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", - subprocess.Popen, ["notfound_blahblah"]) - - @unittest.skipIf(mswindows, "path not displayed in Windows message") - def test_path_in_executable_not_found_message(self): - # Check that the error message displays the executable argument (and - # not args[0]) when the executable argument is not found - # (issue #16114). - # We call sys.exit() inside the code to prevent the test runner - # from hanging if the test fails and finds python. - self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", - subprocess.Popen, [sys.executable, "-c", - "import sys; sys.exit(47)"], - executable="notfound_blahblah") - self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", - subprocess.Popen, ["argnotfound_blahblah"], - executable="exenotfound_blahblah") - # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:46:57 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:46:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_revert_accidental_inclusion_of_subprocess_tests?= Message-ID: <3XYsds151pzP37@mail.python.org> http://hg.python.org/cpython/rev/5665806908c4 changeset: 79527:5665806908c4 branch: 3.3 parent: 79519:2e7a57cdd961 parent: 79526:c9695a0b0923 user: Andrew Svetlov date: Sat Oct 06 18:45:47 2012 +0300 summary: revert accidental inclusion of subprocess tests files: Lib/test/test_subprocess.py | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,28 +192,6 @@ p.wait() self.assertEqual(p.stderr, None) - @unittest.skipIf(mswindows, "path not included in Windows message") - def test_path_in_arg_not_found_message(self): - # Check that the error message displays the path not found when - # args[0] is not found. - self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", - subprocess.Popen, ["notfound_blahblah"]) - - @unittest.skipIf(mswindows, "path not displayed in Windows message") - def test_path_in_executable_not_found_message(self): - # Check that the error message displays the executable argument (and - # not args[0]) when the executable argument is not found - # (issue #16114). - # We call sys.exit() inside the code to prevent the test runner - # from hanging if the test fails and finds python. - self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", - subprocess.Popen, [sys.executable, "-c", - "import sys; sys.exit(47)"], - executable="notfound_blahblah") - self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", - subprocess.Popen, ["argnotfound_blahblah"], - executable="exenotfound_blahblah") - # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 17:46:58 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sat, 6 Oct 2012 17:46:58 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_revert_accidental_inclusion_of_subprocess_tests?= Message-ID: <3XYsdt3JP1zP2p@mail.python.org> http://hg.python.org/cpython/rev/674fa8d211f2 changeset: 79528:674fa8d211f2 parent: 79525:6ae0e2fb1bcb parent: 79527:5665806908c4 user: Andrew Svetlov date: Sat Oct 06 18:46:09 2012 +0300 summary: revert accidental inclusion of subprocess tests files: Lib/test/test_subprocess.py | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,28 +192,6 @@ p.wait() self.assertEqual(p.stderr, None) - @unittest.skipIf(mswindows, "path not included in Windows message") - def test_path_in_arg_not_found_message(self): - # Check that the error message displays the path not found when - # args[0] is not found. - self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", - subprocess.Popen, ["notfound_blahblah"]) - - @unittest.skipIf(mswindows, "path not displayed in Windows message") - def test_path_in_executable_not_found_message(self): - # Check that the error message displays the executable argument (and - # not args[0]) when the executable argument is not found - # (issue #16114). - # We call sys.exit() inside the code to prevent the test runner - # from hanging if the test fails and finds python. - self.assertRaisesRegex(FileNotFoundError, "notfound_blahblah", - subprocess.Popen, [sys.executable, "-c", - "import sys; sys.exit(47)"], - executable="notfound_blahblah") - self.assertRaisesRegex(FileNotFoundError, "exenotfound_blahblah", - subprocess.Popen, ["argnotfound_blahblah"], - executable="exenotfound_blahblah") - # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 19:05:31 2012 From: python-checkins at python.org (mark.dickinson) Date: Sat, 6 Oct 2012 19:05:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MDk2?= =?utf-8?q?=3A_Fix_several_occurrences_of_potential_signed_integer_overflo?= =?utf-8?q?w=2E?= Message-ID: <3XYvNW63tGzLy3@mail.python.org> http://hg.python.org/cpython/rev/152d85b2da3a changeset: 79529:152d85b2da3a branch: 3.3 parent: 79527:5665806908c4 user: Mark Dickinson date: Sat Oct 06 18:04:49 2012 +0100 summary: Issue #16096: Fix several occurrences of potential signed integer overflow. Thanks Serhiy Storchaka. files: Modules/_codecsmodule.c | 4 ++-- Modules/_datetimemodule.c | 7 +++---- Modules/_randommodule.c | 3 ++- Modules/arraymodule.c | 12 ++++++++---- Modules/audioop.c | 4 ++-- Objects/tupleobject.c | 12 ++++-------- Objects/unicodeobject.c | 23 +++++++++-------------- 7 files changed, 30 insertions(+), 35 deletions(-) diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -177,12 +177,12 @@ return NULL; size = PyBytes_GET_SIZE(str); - newsize = 4*size; - if (newsize > PY_SSIZE_T_MAX || newsize / 4 != size) { + if (size > PY_SSIZE_T_MAX / 4) { PyErr_SetString(PyExc_OverflowError, "string is too large to encode"); return NULL; } + newsize = 4*size; v = PyBytes_FromStringAndSize(NULL, newsize); if (v == NULL) { diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1265,14 +1265,13 @@ assert(ptoappend != NULL); assert(ntoappend > 0); while (usednew + ntoappend > totalnew) { - size_t bigger = totalnew << 1; - if ((bigger >> 1) != totalnew) { /* overflow */ + if (totalnew > (PY_SSIZE_T_MAX >> 1)) { /* overflow */ PyErr_NoMemory(); goto Done; } - if (_PyBytes_Resize(&newfmt, bigger) < 0) + totalnew <<= 1; + if (_PyBytes_Resize(&newfmt, totalnew) < 0) goto Done; - totalnew = bigger; pnew = PyBytes_AsString(newfmt) + usednew; } memcpy(pnew, ptoappend, ntoappend); diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -284,7 +284,8 @@ n = newn; if (keyused >= keymax) { unsigned long bigger = keymax << 1; - if ((bigger >> 1) != keymax) { + if ((bigger >> 1) != keymax || + bigger > PY_SSIZE_T_MAX / sizeof(*key)) { PyErr_NoMemory(); goto Done; } diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -483,11 +483,11 @@ return NULL; } - nbytes = size * descr->itemsize; /* Check for overflow */ - if (nbytes / descr->itemsize != (size_t)size) { + if (size > PY_SSIZE_T_MAX / descr->itemsize) { return PyErr_NoMemory(); } + nbytes = size * descr->itemsize; op = (arrayobject *) type->tp_alloc(type, 0); if (op == NULL) { return NULL; @@ -1251,11 +1251,15 @@ if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n)) return NULL; - nbytes = n * itemsize; - if (nbytes < 0 || nbytes/itemsize != n) { + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return NULL; + } + if (n > PY_SSIZE_T_MAX / itemsize) { PyErr_NoMemory(); return NULL; } + nbytes = n * itemsize; b = _PyObject_CallMethodId(f, &PyId_read, "n", nbytes); if (b == NULL) diff --git a/Modules/audioop.c b/Modules/audioop.c --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1108,8 +1108,7 @@ PyErr_SetString(AudioopError, "# of channels should be >= 1"); return NULL; } - bytes_per_frame = size * nchannels; - if (bytes_per_frame / nchannels != size) { + if (size > INT_MAX / nchannels) { /* This overflow test is rigorously correct because both multiplicands are >= 1. Use the argument names from the docs for the error msg. */ @@ -1117,6 +1116,7 @@ "width * nchannels too big for a C int"); return NULL; } + bytes_per_frame = size * nchannels; if (weightA < 1 || weightB < 0) { PyErr_SetString(AudioopError, "weightA should be >= 1, weightB should be >= 0"); diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -96,15 +96,11 @@ else #endif { - Py_ssize_t nbytes = size * sizeof(PyObject *); /* Check for overflow */ - if (nbytes / sizeof(PyObject *) != (size_t)size || - (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *))) - { + if (size > (PY_SSIZE_T_MAX - sizeof(PyTupleObject) - + sizeof(PyObject *)) / sizeof(PyObject *)) { return PyErr_NoMemory(); } - /* nbytes += sizeof(PyTupleObject) - sizeof(PyObject *); */ - op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size); if (op == NULL) return NULL; @@ -481,9 +477,9 @@ if (Py_SIZE(a) == 0) return PyTuple_New(0); } + if (n > PY_SSIZE_T_MAX / Py_SIZE(a)) + return PyErr_NoMemory(); size = Py_SIZE(a) * n; - if (size/Py_SIZE(a) != n) - return PyErr_NoMemory(); np = (PyTupleObject *) PyTuple_New(size); if (np == NULL) return NULL; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4492,7 +4492,6 @@ void *data; Py_ssize_t len; PyObject *v; - Py_ssize_t allocated; int inShift = 0; Py_ssize_t i; unsigned int base64bits = 0; @@ -4510,11 +4509,9 @@ return PyBytes_FromStringAndSize(NULL, 0); /* It might be possible to tighten this worst case */ - allocated = 8 * len; - if (allocated / 8 != len) + if (len > PY_SSIZE_T_MAX / 8) return PyErr_NoMemory(); - - v = PyBytes_FromStringAndSize(NULL, allocated); + v = PyBytes_FromStringAndSize(NULL, len * 8); if (v == NULL) return NULL; @@ -5092,7 +5089,7 @@ Py_ssize_t len; PyObject *v; unsigned char *p; - Py_ssize_t nsize, bytesize, i; + Py_ssize_t nsize, i; /* Offsets from p for storing byte pairs in the right order. */ #ifdef BYTEORDER_IS_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; @@ -5120,10 +5117,9 @@ len = PyUnicode_GET_LENGTH(str); nsize = len + (byteorder == 0); - bytesize = nsize * 4; - if (bytesize / 4 != nsize) + if (nsize > PY_SSIZE_T_MAX / 4) return PyErr_NoMemory(); - v = PyBytes_FromStringAndSize(NULL, bytesize); + v = PyBytes_FromStringAndSize(NULL, nsize * 4); if (v == NULL) return NULL; @@ -10159,7 +10155,7 @@ } else { Py_ssize_t n, i, j, ires; - Py_ssize_t product, new_size; + Py_ssize_t new_size; int rkind = skind; char *res; @@ -10191,19 +10187,18 @@ } /* new_size = PyUnicode_GET_LENGTH(self) + n * (PyUnicode_GET_LENGTH(str2) - PyUnicode_GET_LENGTH(str1))); */ - product = n * (len2-len1); - if ((product / (len2-len1)) != n) { + if (len2 > len1 && len2 - len1 > (PY_SSIZE_T_MAX - slen) / n) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; } - new_size = slen + product; + new_size = slen + n * (len2 - len1); if (new_size == 0) { Py_INCREF(unicode_empty); u = unicode_empty; goto done; } - if (new_size < 0 || new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { + if (new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 19:05:33 2012 From: python-checkins at python.org (mark.dickinson) Date: Sat, 6 Oct 2012 19:05:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316096=3A_Merge_fixes_from_3=2E3=2E?= Message-ID: <3XYvNY2qBTzNkN@mail.python.org> http://hg.python.org/cpython/rev/faae99459b43 changeset: 79530:faae99459b43 parent: 79528:674fa8d211f2 parent: 79529:152d85b2da3a user: Mark Dickinson date: Sat Oct 06 18:05:14 2012 +0100 summary: Issue #16096: Merge fixes from 3.3. files: Modules/_codecsmodule.c | 4 ++-- Modules/_datetimemodule.c | 7 +++---- Modules/_randommodule.c | 3 ++- Modules/arraymodule.c | 12 ++++++++---- Modules/audioop.c | 4 ++-- Objects/tupleobject.c | 12 ++++-------- Objects/unicodeobject.c | 23 +++++++++-------------- 7 files changed, 30 insertions(+), 35 deletions(-) diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -177,12 +177,12 @@ return NULL; size = PyBytes_GET_SIZE(str); - newsize = 4*size; - if (newsize > PY_SSIZE_T_MAX || newsize / 4 != size) { + if (size > PY_SSIZE_T_MAX / 4) { PyErr_SetString(PyExc_OverflowError, "string is too large to encode"); return NULL; } + newsize = 4*size; v = PyBytes_FromStringAndSize(NULL, newsize); if (v == NULL) { diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1265,14 +1265,13 @@ assert(ptoappend != NULL); assert(ntoappend > 0); while (usednew + ntoappend > totalnew) { - size_t bigger = totalnew << 1; - if ((bigger >> 1) != totalnew) { /* overflow */ + if (totalnew > (PY_SSIZE_T_MAX >> 1)) { /* overflow */ PyErr_NoMemory(); goto Done; } - if (_PyBytes_Resize(&newfmt, bigger) < 0) + totalnew <<= 1; + if (_PyBytes_Resize(&newfmt, totalnew) < 0) goto Done; - totalnew = bigger; pnew = PyBytes_AsString(newfmt) + usednew; } memcpy(pnew, ptoappend, ntoappend); diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -284,7 +284,8 @@ n = newn; if (keyused >= keymax) { unsigned long bigger = keymax << 1; - if ((bigger >> 1) != keymax) { + if ((bigger >> 1) != keymax || + bigger > PY_SSIZE_T_MAX / sizeof(*key)) { PyErr_NoMemory(); goto Done; } diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -483,11 +483,11 @@ return NULL; } - nbytes = size * descr->itemsize; /* Check for overflow */ - if (nbytes / descr->itemsize != (size_t)size) { + if (size > PY_SSIZE_T_MAX / descr->itemsize) { return PyErr_NoMemory(); } + nbytes = size * descr->itemsize; op = (arrayobject *) type->tp_alloc(type, 0); if (op == NULL) { return NULL; @@ -1251,11 +1251,15 @@ if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n)) return NULL; - nbytes = n * itemsize; - if (nbytes < 0 || nbytes/itemsize != n) { + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return NULL; + } + if (n > PY_SSIZE_T_MAX / itemsize) { PyErr_NoMemory(); return NULL; } + nbytes = n * itemsize; b = _PyObject_CallMethodId(f, &PyId_read, "n", nbytes); if (b == NULL) diff --git a/Modules/audioop.c b/Modules/audioop.c --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1108,8 +1108,7 @@ PyErr_SetString(AudioopError, "# of channels should be >= 1"); return NULL; } - bytes_per_frame = size * nchannels; - if (bytes_per_frame / nchannels != size) { + if (size > INT_MAX / nchannels) { /* This overflow test is rigorously correct because both multiplicands are >= 1. Use the argument names from the docs for the error msg. */ @@ -1117,6 +1116,7 @@ "width * nchannels too big for a C int"); return NULL; } + bytes_per_frame = size * nchannels; if (weightA < 1 || weightB < 0) { PyErr_SetString(AudioopError, "weightA should be >= 1, weightB should be >= 0"); diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -96,15 +96,11 @@ else #endif { - Py_ssize_t nbytes = size * sizeof(PyObject *); /* Check for overflow */ - if (nbytes / sizeof(PyObject *) != (size_t)size || - (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *))) - { + if (size > (PY_SSIZE_T_MAX - sizeof(PyTupleObject) - + sizeof(PyObject *)) / sizeof(PyObject *)) { return PyErr_NoMemory(); } - /* nbytes += sizeof(PyTupleObject) - sizeof(PyObject *); */ - op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size); if (op == NULL) return NULL; @@ -481,9 +477,9 @@ if (Py_SIZE(a) == 0) return PyTuple_New(0); } + if (n > PY_SSIZE_T_MAX / Py_SIZE(a)) + return PyErr_NoMemory(); size = Py_SIZE(a) * n; - if (size/Py_SIZE(a) != n) - return PyErr_NoMemory(); np = (PyTupleObject *) PyTuple_New(size); if (np == NULL) return NULL; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4528,7 +4528,6 @@ void *data; Py_ssize_t len; PyObject *v; - Py_ssize_t allocated; int inShift = 0; Py_ssize_t i; unsigned int base64bits = 0; @@ -4546,11 +4545,9 @@ return PyBytes_FromStringAndSize(NULL, 0); /* It might be possible to tighten this worst case */ - allocated = 8 * len; - if (allocated / 8 != len) + if (len > PY_SSIZE_T_MAX / 8) return PyErr_NoMemory(); - - v = PyBytes_FromStringAndSize(NULL, allocated); + v = PyBytes_FromStringAndSize(NULL, len * 8); if (v == NULL) return NULL; @@ -5128,7 +5125,7 @@ Py_ssize_t len; PyObject *v; unsigned char *p; - Py_ssize_t nsize, bytesize, i; + Py_ssize_t nsize, i; /* Offsets from p for storing byte pairs in the right order. */ #ifdef BYTEORDER_IS_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; @@ -5156,10 +5153,9 @@ len = PyUnicode_GET_LENGTH(str); nsize = len + (byteorder == 0); - bytesize = nsize * 4; - if (bytesize / 4 != nsize) + if (nsize > PY_SSIZE_T_MAX / 4) return PyErr_NoMemory(); - v = PyBytes_FromStringAndSize(NULL, bytesize); + v = PyBytes_FromStringAndSize(NULL, nsize * 4); if (v == NULL) return NULL; @@ -10195,7 +10191,7 @@ } else { Py_ssize_t n, i, j, ires; - Py_ssize_t product, new_size; + Py_ssize_t new_size; int rkind = skind; char *res; @@ -10227,19 +10223,18 @@ } /* new_size = PyUnicode_GET_LENGTH(self) + n * (PyUnicode_GET_LENGTH(str2) - PyUnicode_GET_LENGTH(str1))); */ - product = n * (len2-len1); - if ((product / (len2-len1)) != n) { + if (len2 > len1 && len2 - len1 > (PY_SSIZE_T_MAX - slen) / n) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; } - new_size = slen + product; + new_size = slen + n * (len2 - len1); if (new_size == 0) { Py_INCREF(unicode_empty); u = unicode_empty; goto done; } - if (new_size < 0 || new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { + if (new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 19:21:50 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 19:21:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNjE0?= =?utf-8?q?9=3A_remove_now-false_statement_about_the_inability_to_compare?= Message-ID: <3XYvlL5zCnzLyL@mail.python.org> http://hg.python.org/cpython/rev/1dc66e654806 changeset: 79531:1dc66e654806 branch: 3.2 parent: 79526:c9695a0b0923 user: Georg Brandl date: Sat Oct 06 13:48:39 2012 +0200 summary: Closes #16149: remove now-false statement about the inability to compare Decimal and float objects. files: Doc/reference/expressions.rst | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1067,16 +1067,10 @@ another one is made arbitrarily but consistently within one execution of a program. -Comparison of objects of the differing types depends on whether either -of the types provide explicit support for the comparison. Most numeric types -can be compared with one another, but comparisons of :class:`float` and -:class:`Decimal` are not supported to avoid the inevitable confusion arising -from representation issues such as ``float('1.1')`` being inexactly represented -and therefore not exactly equal to ``Decimal('1.1')`` which is. When -cross-type comparison is not supported, the comparison method returns -``NotImplemented``. This can create the illusion of non-transitivity between -supported cross-type comparisons and unsupported comparisons. For example, -``Decimal(2) == 2`` and ``2 == float(2)`` but ``Decimal(2) != float(2)``. +Comparison of objects of the differing types depends on whether either of the +types provide explicit support for the comparison. Most numeric types can be +compared with one another. When cross-type comparison is not supported, the +comparison method returns ``NotImplemented``. .. _membership-test-details: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 19:50:34 2012 From: python-checkins at python.org (mark.dickinson) Date: Sat, 6 Oct 2012 19:50:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MDk2?= =?utf-8?q?=3A_Fix_signed_overflow_in_Objects/longobject=2Ec=2E__Thanks_Se?= =?utf-8?q?rhiy?= Message-ID: <3XYwNV466mzNvl@mail.python.org> http://hg.python.org/cpython/rev/906ae6485cb8 changeset: 79532:906ae6485cb8 branch: 3.3 parent: 79529:152d85b2da3a user: Mark Dickinson date: Sat Oct 06 18:50:02 2012 +0100 summary: Issue #16096: Fix signed overflow in Objects/longobject.c. Thanks Serhiy Storchaka. files: Objects/longobject.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -668,10 +668,9 @@ assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0); if (ndigits > 0) { digit msd = v->ob_digit[ndigits - 1]; - - result = (ndigits - 1) * PyLong_SHIFT; - if (result / PyLong_SHIFT != (size_t)(ndigits - 1)) + if ((size_t)(ndigits - 1) > PY_SIZE_MAX / (size_t)PyLong_SHIFT) goto Overflow; + result = (size_t)(ndigits - 1) * (size_t)PyLong_SHIFT; do { ++result; if (result == 0) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 19:50:36 2012 From: python-checkins at python.org (mark.dickinson) Date: Sat, 6 Oct 2012 19:50:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316096=3A_port_fix_from_3=2E3?= Message-ID: <3XYwNX01xczP08@mail.python.org> http://hg.python.org/cpython/rev/b728aac3bdb3 changeset: 79533:b728aac3bdb3 parent: 79530:faae99459b43 parent: 79532:906ae6485cb8 user: Mark Dickinson date: Sat Oct 06 18:50:19 2012 +0100 summary: Issue #16096: port fix from 3.3 files: Objects/longobject.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -668,10 +668,9 @@ assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0); if (ndigits > 0) { digit msd = v->ob_digit[ndigits - 1]; - - result = (ndigits - 1) * PyLong_SHIFT; - if (result / PyLong_SHIFT != (size_t)(ndigits - 1)) + if ((size_t)(ndigits - 1) > PY_SIZE_MAX / (size_t)PyLong_SHIFT) goto Overflow; + result = (size_t)(ndigits - 1) * (size_t)PyLong_SHIFT; do { ++result; if (result == 0) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 20:38:30 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 6 Oct 2012 20:38:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzEwOTY4OiBjb21t?= =?utf-8?q?it_threading_doc_changes_and_corresponding_whatsnew_entry=2E?= Message-ID: <3XYxRp4YcmzNFr@mail.python.org> http://hg.python.org/cpython/rev/98499371ca53 changeset: 79534:98499371ca53 branch: 3.3 parent: 79532:906ae6485cb8 user: R David Murray date: Sat Oct 06 14:35:35 2012 -0400 summary: #10968: commit threading doc changes and corresponding whatsnew entry. It is unfortunate that the '_' names were not kept as aliases, and that RLock was not also converted to a class, but it is now too late to change either of those things for 3.3. files: Doc/library/multiprocessing.rst | 2 +- Doc/library/threading.rst | 313 +++++++++---------- Doc/whatsnew/3.3.rst | 10 + Misc/NEWS | 8 +- 4 files changed, 162 insertions(+), 171 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -916,7 +916,7 @@ .. class:: Condition([lock]) - A condition variable: a clone of :class:`threading.Condition`. + A condition variable: an alias for :class:`threading.Condition`. If *lock* is specified then it should be a :class:`Lock` or :class:`RLock` object from :mod:`multiprocessing`. diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -21,7 +21,7 @@ supported by this module. -This module defines the following functions and objects: +This module defines the following functions: .. function:: active_count() @@ -30,16 +30,6 @@ count is equal to the length of the list returned by :func:`.enumerate`. -.. function:: Condition() - :noindex: - - A factory function that returns a new condition variable object. A condition - variable allows one or more threads to wait until they are notified by another - thread. - - See :ref:`condition-objects`. - - .. function:: current_thread() Return the current :class:`Thread` object, corresponding to the caller's thread @@ -67,88 +57,6 @@ and threads that have not yet been started. -.. function:: Event() - :noindex: - - A factory function that returns a new event object. An event manages a flag - that can be set to true with the :meth:`~Event.set` method and reset to false - with the :meth:`clear` method. The :meth:`wait` method blocks until the flag - is true. - - See :ref:`event-objects`. - - -.. class:: local - - A class that represents thread-local data. Thread-local data are data whose - values are thread specific. To manage thread-local data, just create an - instance of :class:`local` (or a subclass) and store attributes on it:: - - mydata = threading.local() - mydata.x = 1 - - The instance's values will be different for separate threads. - - For more details and extensive examples, see the documentation string of the - :mod:`_threading_local` module. - - -.. function:: Lock() - - A factory function that returns a new primitive lock object. Once a thread has - acquired it, subsequent attempts to acquire it block, until it is released; any - thread may release it. - - See :ref:`lock-objects`. - - -.. function:: RLock() - - A factory function that returns a new reentrant lock object. A reentrant lock - must be released by the thread that acquired it. Once a thread has acquired a - reentrant lock, the same thread may acquire it again without blocking; the - thread must release it once for each time it has acquired it. - - See :ref:`rlock-objects`. - - -.. function:: Semaphore(value=1) - :noindex: - - A factory function that returns a new semaphore object. A semaphore manages a - counter representing the number of :meth:`release` calls minus the number of - :meth:`acquire` calls, plus an initial value. The :meth:`acquire` method blocks - if necessary until it can return without making the counter negative. If not - given, *value* defaults to 1. - - See :ref:`semaphore-objects`. - - -.. function:: BoundedSemaphore(value=1) - - A factory function that returns a new bounded semaphore object. A bounded - semaphore checks to make sure its current value doesn't exceed its initial - value. If it does, :exc:`ValueError` is raised. In most situations semaphores - are used to guard resources with limited capacity. If the semaphore is released - too many times it's a sign of a bug. If not given, *value* defaults to 1. - - -.. class:: Thread - - A class that represents a thread of control. This class can be safely - subclassed in a limited fashion. - - See :ref:`thread-objects`. - - -.. class:: Timer - :noindex: - - A thread that executes a function after a specified interval has passed. - - See :ref:`timer-objects`. - - .. function:: settrace(func) .. index:: single: trace function @@ -197,7 +105,8 @@ .. versionadded:: 3.2 -Detailed interfaces for the objects are documented below. +This module defines a number of classes, which are detailed in the sections +below. The design of this module is loosely based on Java's threading model. However, where Java makes locks and condition variables basic behavior of every object, @@ -210,17 +119,38 @@ All of the methods described below are executed atomically. +Thread-Local Data +----------------- + +Thread-local data is data whose values are thread specific. To manage +thread-local data, just create an instance of :class:`local` (or a +subclass) and store attributes on it:: + + mydata = threading.local() + mydata.x = 1 + +The instance's values will be different for separate threads. + + +.. class:: local() + + A class that represents thread-local data. + + For more details and extensive examples, see the documentation string of the + :mod:`_threading_local` module. + + .. _thread-objects: Thread Objects -------------- -This class represents an activity that is run in a separate thread of control. -There are two ways to specify the activity: by passing a callable object to the -constructor, or by overriding the :meth:`~Thread.run` method in a subclass. -No other methods (except for the constructor) should be overridden in a -subclass. In other words, *only* override the :meth:`~Thread.__init__` -and :meth:`~Thread.run` methods of this class. +The :class:`Thread` class represents an activity that is run in a separate +thread of control. There are two ways to specify the activity: by passing a +callable object to the constructor, or by overriding the :meth:`~Thread.run` +method in a subclass. No other methods (except for the constructor) should be +overridden in a subclass. In other words, *only* override the +:meth:`~Thread.__init__` and :meth:`~Thread.run` methods of this class. Once a thread object is created, its activity must be started by calling the thread's :meth:`~Thread.start` method. This invokes the :meth:`~Thread.run` @@ -419,45 +349,55 @@ All methods are executed atomically. -.. method:: Lock.acquire(blocking=True, timeout=-1) +.. class:: Lock() - Acquire a lock, blocking or non-blocking. + The class implementing primitive lock objects. Once a thread has acquired a + lock, subsequent attempts to acquire it block, until it is released; any + thread may release it. - When invoked with the *blocking* argument set to ``True`` (the default), - block until the lock is unlocked, then set it to locked and return ``True``. + .. versionchanged:: 3.3 + Changed from a factory function to a class. - When invoked with the *blocking* argument set to ``False``, do not block. - If a call with *blocking* set to ``True`` would block, return ``False`` - immediately; otherwise, set the lock to locked and return ``True``. - When invoked with the floating-point *timeout* argument set to a positive - value, block for at most the number of seconds specified by *timeout* - and as long as the lock cannot be acquired. A negative *timeout* argument - specifies an unbounded wait. It is forbidden to specify a *timeout* - when *blocking* is false. + .. method:: acquire(blocking=True, timeout=-1) - The return value is ``True`` if the lock is acquired successfully, - ``False`` if not (for example if the *timeout* expired). + Acquire a lock, blocking or non-blocking. - .. versionchanged:: 3.2 - The *timeout* parameter is new. + When invoked with the *blocking* argument set to ``True`` (the default), + block until the lock is unlocked, then set it to locked and return ``True``. - .. versionchanged:: 3.2 - Lock acquires can now be interrupted by signals on POSIX. + When invoked with the *blocking* argument set to ``False``, do not block. + If a call with *blocking* set to ``True`` would block, return ``False`` + immediately; otherwise, set the lock to locked and return ``True``. + When invoked with the floating-point *timeout* argument set to a positive + value, block for at most the number of seconds specified by *timeout* + and as long as the lock cannot be acquired. A negative *timeout* argument + specifies an unbounded wait. It is forbidden to specify a *timeout* + when *blocking* is false. -.. method:: Lock.release() + The return value is ``True`` if the lock is acquired successfully, + ``False`` if not (for example if the *timeout* expired). - Release a lock. This can be called from any thread, not only the thread - which has acquired the lock. + .. versionchanged:: 3.2 + The *timeout* parameter is new. - When the lock is locked, reset it to unlocked, and return. If any other threads - are blocked waiting for the lock to become unlocked, allow exactly one of them - to proceed. + .. versionchanged:: 3.2 + Lock acquires can now be interrupted by signals on POSIX. - When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. - There is no return value. + .. method:: release() + + Release a lock. This can be called from any thread, not only the thread + which has acquired the lock. + + When the lock is locked, reset it to unlocked, and return. If any other threads + are blocked waiting for the lock to become unlocked, allow exactly one of them + to proceed. + + When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. + + There is no return value. .. _rlock-objects: @@ -481,47 +421,59 @@ Reentrant locks also support the :ref:`context manager protocol `. -.. method:: RLock.acquire(blocking=True, timeout=-1) +.. class:: RLock() - Acquire a lock, blocking or non-blocking. + This class implements reentrant lock objects. A reentrant lock must be + released by the thread that acquired it. Once a thread has acquired a + reentrant lock, the same thread may acquire it again without blocking; the + thread must release it once for each time it has acquired it. - When invoked without arguments: if this thread already owns the lock, increment - the recursion level by one, and return immediately. Otherwise, if another - thread owns the lock, block until the lock is unlocked. Once the lock is - unlocked (not owned by any thread), then grab ownership, set the recursion level - to one, and return. If more than one thread is blocked waiting until the lock - is unlocked, only one at a time will be able to grab ownership of the lock. - There is no return value in this case. + Note that ``RLock`` is actually a factory function which returns an instance + of the most efficient version of the concrete RLock class that is supported + by the platform. - When invoked with the *blocking* argument set to true, do the same thing as when - called without arguments, and return true. - When invoked with the *blocking* argument set to false, do not block. If a call - without an argument would block, return false immediately; otherwise, do the - same thing as when called without arguments, and return true. + .. method:: acquire(blocking=True, timeout=-1) - When invoked with the floating-point *timeout* argument set to a positive - value, block for at most the number of seconds specified by *timeout* - and as long as the lock cannot be acquired. Return true if the lock has - been acquired, false if the timeout has elapsed. + Acquire a lock, blocking or non-blocking. - .. versionchanged:: 3.2 - The *timeout* parameter is new. + When invoked without arguments: if this thread already owns the lock, increment + the recursion level by one, and return immediately. Otherwise, if another + thread owns the lock, block until the lock is unlocked. Once the lock is + unlocked (not owned by any thread), then grab ownership, set the recursion level + to one, and return. If more than one thread is blocked waiting until the lock + is unlocked, only one at a time will be able to grab ownership of the lock. + There is no return value in this case. + When invoked with the *blocking* argument set to true, do the same thing as when + called without arguments, and return true. -.. method:: RLock.release() + When invoked with the *blocking* argument set to false, do not block. If a call + without an argument would block, return false immediately; otherwise, do the + same thing as when called without arguments, and return true. - Release a lock, decrementing the recursion level. If after the decrement it is - zero, reset the lock to unlocked (not owned by any thread), and if any other - threads are blocked waiting for the lock to become unlocked, allow exactly one - of them to proceed. If after the decrement the recursion level is still - nonzero, the lock remains locked and owned by the calling thread. + When invoked with the floating-point *timeout* argument set to a positive + value, block for at most the number of seconds specified by *timeout* + and as long as the lock cannot be acquired. Return true if the lock has + been acquired, false if the timeout has elapsed. - Only call this method when the calling thread owns the lock. A - :exc:`RuntimeError` is raised if this method is called when the lock is - unlocked. + .. versionchanged:: 3.2 + The *timeout* parameter is new. - There is no return value. + + .. method:: release() + + Release a lock, decrementing the recursion level. If after the decrement it is + zero, reset the lock to unlocked (not owned by any thread), and if any other + threads are blocked waiting for the lock to become unlocked, allow exactly one + of them to proceed. If after the decrement the recursion level is still + nonzero, the lock remains locked and owned by the calling thread. + + Only call this method when the calling thread owns the lock. A + :exc:`RuntimeError` is raised if this method is called when the lock is + unlocked. + + There is no return value. .. _condition-objects: @@ -556,10 +508,6 @@ the thread that called :meth:`~Condition.notify` or :meth:`~Condition.notify_all` finally relinquishes ownership of the lock. - -Usage -^^^^^ - The typical programming style using condition variables uses the lock to synchronize access to some shared state; threads that are interested in a particular change of state call :meth:`~Condition.wait` repeatedly until they @@ -598,15 +546,18 @@ item to the buffer only needs to wake up one consumer thread. -Interface -^^^^^^^^^ +.. class:: Condition(lock=None) -.. class:: Condition(lock=None) + This class implements condition variable objects. A condition variable + allows one or more threads to wait until they are notified by another thread. If the *lock* argument is given and not ``None``, it must be a :class:`Lock` or :class:`RLock` object, and it is used as the underlying lock. Otherwise, a new :class:`RLock` object is created and used as the underlying lock. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: acquire(*args) Acquire the underlying lock. This method calls the corresponding method on @@ -716,10 +667,19 @@ .. class:: Semaphore(value=1) + This class implements semaphore objects. A semaphore manages a counter + representing the number of :meth:`release` calls minus the number of + :meth:`acquire` calls, plus an initial value. The :meth:`acquire` method + blocks if necessary until it can return without making the counter negative. + If not given, *value* defaults to 1. + The optional argument gives the initial *value* for the internal counter; it defaults to ``1``. If the *value* given is less than 0, :exc:`ValueError` is raised. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: acquire(blocking=True, timeout=None) Acquire a semaphore. @@ -752,6 +712,18 @@ than zero again, wake up that thread. +.. class:: BoundedSemaphore(value=1) + + Class implementing bounded semaphore objects. A bounded semaphore checks to + make sure its current value doesn't exceed its initial value. If it does, + :exc:`ValueError` is raised. In most situations semaphores are used to guard + resources with limited capacity. If the semaphore is released too many times + it's a sign of a bug. If not given, *value* defaults to 1. + + .. versionchanged:: 3.3 + changed from a factory function to a class. + + .. _semaphore-examples: :class:`Semaphore` Example @@ -763,7 +735,7 @@ main thread would initialize the semaphore:: maxconnections = 5 - ... + # ... pool_sema = BoundedSemaphore(value=maxconnections) Once spawned, worker threads call the semaphore's acquire and release methods @@ -772,7 +744,7 @@ with pool_sema: conn = connectdb() try: - ... use connection ... + # ... use connection ... finally: conn.close() @@ -795,7 +767,13 @@ .. class:: Event() - The internal flag is initially false. + Class implementing event objects. An event manages a flag that can be set to + true with the :meth:`~Event.set` method and reset to false with the + :meth:`clear` method. The :meth:`wait` method blocks until the flag is true. + The flag is initially false. + + .. versionchanged:: 3.3 + changed from a factory function to a class. .. method:: is_set() @@ -860,6 +838,9 @@ Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: cancel() Stop the timer, and cancel the execution of the timer's action. This will diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1945,6 +1945,12 @@ threading --------- +:class:`threading.Condition`, :class:`threading.Semaphore`, +:class:`threading.BoundedSempaphore`, :class:`threading.Event`, and +:class:`threading.Timer`, all of which used to be factory functions returning a +class instance, are now classes and may be subclassed. (Contributed by ?ric +Araujo in :issue:`109681`). + The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword argument to override the default behavior of inheriting the ``deamon`` flag value from the parent thread (:issue:`6064`). @@ -2331,6 +2337,10 @@ make decisions affected by the AST version, use :attr:`sys.version_info` to make the decision. +* Code that used to work around the fact that the :mod:`threading` module used + factory functions by subclassing the private classes will need to change to + subclass the now-public classes. + Porting C code -------------- diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3031,11 +3031,11 @@ - Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') in Python code) now finds the doc of the method. -- Issue #10968: Remove indirection in threading. The public names (Thread, +- Issue #10968: Remove indirection in threading. The public names (Event, Condition, etc.) used to be factory functions returning instances of hidden - classes (_Thread, _Condition, etc.), because (if Guido recalls correctly) this - code pre-dates the ability to subclass extension types. It is now possible to - inherit from Thread and other classes, without having to import the private + classes (_Event, _Condition, etc.), because (if Guido recalls correctly) this + code pre-dates the ability to subclass extension types. It is now possible + to inherit from these classes, without having to import the private underscored names like multiprocessing did. - Issue #9723: Add shlex.quote functions, to escape filenames and command -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 20:38:32 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 6 Oct 2012 20:38:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_=2310968=3A_commit_threading_doc_changes_and_corre?= =?utf-8?q?sponding_whatsnew_entry=2E?= Message-ID: <3XYxRr3GZGzNxF@mail.python.org> http://hg.python.org/cpython/rev/ad435964fc9c changeset: 79535:ad435964fc9c parent: 79533:b728aac3bdb3 parent: 79534:98499371ca53 user: R David Murray date: Sat Oct 06 14:38:17 2012 -0400 summary: merge #10968: commit threading doc changes and corresponding whatsnew entry. It is unfortunate that the '_' names were not kept as aliases, and that RLock was not also converted to a class, but it is now too late to change either of those things for 3.3. files: Doc/library/multiprocessing.rst | 2 +- Doc/library/threading.rst | 313 +++++++++---------- Doc/whatsnew/3.3.rst | 10 + Misc/HISTORY | 8 +- 4 files changed, 162 insertions(+), 171 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -916,7 +916,7 @@ .. class:: Condition([lock]) - A condition variable: a clone of :class:`threading.Condition`. + A condition variable: an alias for :class:`threading.Condition`. If *lock* is specified then it should be a :class:`Lock` or :class:`RLock` object from :mod:`multiprocessing`. diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -21,7 +21,7 @@ supported by this module. -This module defines the following functions and objects: +This module defines the following functions: .. function:: active_count() @@ -30,16 +30,6 @@ count is equal to the length of the list returned by :func:`.enumerate`. -.. function:: Condition() - :noindex: - - A factory function that returns a new condition variable object. A condition - variable allows one or more threads to wait until they are notified by another - thread. - - See :ref:`condition-objects`. - - .. function:: current_thread() Return the current :class:`Thread` object, corresponding to the caller's thread @@ -67,88 +57,6 @@ and threads that have not yet been started. -.. function:: Event() - :noindex: - - A factory function that returns a new event object. An event manages a flag - that can be set to true with the :meth:`~Event.set` method and reset to false - with the :meth:`clear` method. The :meth:`wait` method blocks until the flag - is true. - - See :ref:`event-objects`. - - -.. class:: local - - A class that represents thread-local data. Thread-local data are data whose - values are thread specific. To manage thread-local data, just create an - instance of :class:`local` (or a subclass) and store attributes on it:: - - mydata = threading.local() - mydata.x = 1 - - The instance's values will be different for separate threads. - - For more details and extensive examples, see the documentation string of the - :mod:`_threading_local` module. - - -.. function:: Lock() - - A factory function that returns a new primitive lock object. Once a thread has - acquired it, subsequent attempts to acquire it block, until it is released; any - thread may release it. - - See :ref:`lock-objects`. - - -.. function:: RLock() - - A factory function that returns a new reentrant lock object. A reentrant lock - must be released by the thread that acquired it. Once a thread has acquired a - reentrant lock, the same thread may acquire it again without blocking; the - thread must release it once for each time it has acquired it. - - See :ref:`rlock-objects`. - - -.. function:: Semaphore(value=1) - :noindex: - - A factory function that returns a new semaphore object. A semaphore manages a - counter representing the number of :meth:`release` calls minus the number of - :meth:`acquire` calls, plus an initial value. The :meth:`acquire` method blocks - if necessary until it can return without making the counter negative. If not - given, *value* defaults to 1. - - See :ref:`semaphore-objects`. - - -.. function:: BoundedSemaphore(value=1) - - A factory function that returns a new bounded semaphore object. A bounded - semaphore checks to make sure its current value doesn't exceed its initial - value. If it does, :exc:`ValueError` is raised. In most situations semaphores - are used to guard resources with limited capacity. If the semaphore is released - too many times it's a sign of a bug. If not given, *value* defaults to 1. - - -.. class:: Thread - - A class that represents a thread of control. This class can be safely - subclassed in a limited fashion. - - See :ref:`thread-objects`. - - -.. class:: Timer - :noindex: - - A thread that executes a function after a specified interval has passed. - - See :ref:`timer-objects`. - - .. function:: settrace(func) .. index:: single: trace function @@ -197,7 +105,8 @@ .. versionadded:: 3.2 -Detailed interfaces for the objects are documented below. +This module defines a number of classes, which are detailed in the sections +below. The design of this module is loosely based on Java's threading model. However, where Java makes locks and condition variables basic behavior of every object, @@ -210,17 +119,38 @@ All of the methods described below are executed atomically. +Thread-Local Data +----------------- + +Thread-local data is data whose values are thread specific. To manage +thread-local data, just create an instance of :class:`local` (or a +subclass) and store attributes on it:: + + mydata = threading.local() + mydata.x = 1 + +The instance's values will be different for separate threads. + + +.. class:: local() + + A class that represents thread-local data. + + For more details and extensive examples, see the documentation string of the + :mod:`_threading_local` module. + + .. _thread-objects: Thread Objects -------------- -This class represents an activity that is run in a separate thread of control. -There are two ways to specify the activity: by passing a callable object to the -constructor, or by overriding the :meth:`~Thread.run` method in a subclass. -No other methods (except for the constructor) should be overridden in a -subclass. In other words, *only* override the :meth:`~Thread.__init__` -and :meth:`~Thread.run` methods of this class. +The :class:`Thread` class represents an activity that is run in a separate +thread of control. There are two ways to specify the activity: by passing a +callable object to the constructor, or by overriding the :meth:`~Thread.run` +method in a subclass. No other methods (except for the constructor) should be +overridden in a subclass. In other words, *only* override the +:meth:`~Thread.__init__` and :meth:`~Thread.run` methods of this class. Once a thread object is created, its activity must be started by calling the thread's :meth:`~Thread.start` method. This invokes the :meth:`~Thread.run` @@ -419,45 +349,55 @@ All methods are executed atomically. -.. method:: Lock.acquire(blocking=True, timeout=-1) +.. class:: Lock() - Acquire a lock, blocking or non-blocking. + The class implementing primitive lock objects. Once a thread has acquired a + lock, subsequent attempts to acquire it block, until it is released; any + thread may release it. - When invoked with the *blocking* argument set to ``True`` (the default), - block until the lock is unlocked, then set it to locked and return ``True``. + .. versionchanged:: 3.3 + Changed from a factory function to a class. - When invoked with the *blocking* argument set to ``False``, do not block. - If a call with *blocking* set to ``True`` would block, return ``False`` - immediately; otherwise, set the lock to locked and return ``True``. - When invoked with the floating-point *timeout* argument set to a positive - value, block for at most the number of seconds specified by *timeout* - and as long as the lock cannot be acquired. A negative *timeout* argument - specifies an unbounded wait. It is forbidden to specify a *timeout* - when *blocking* is false. + .. method:: acquire(blocking=True, timeout=-1) - The return value is ``True`` if the lock is acquired successfully, - ``False`` if not (for example if the *timeout* expired). + Acquire a lock, blocking or non-blocking. - .. versionchanged:: 3.2 - The *timeout* parameter is new. + When invoked with the *blocking* argument set to ``True`` (the default), + block until the lock is unlocked, then set it to locked and return ``True``. - .. versionchanged:: 3.2 - Lock acquires can now be interrupted by signals on POSIX. + When invoked with the *blocking* argument set to ``False``, do not block. + If a call with *blocking* set to ``True`` would block, return ``False`` + immediately; otherwise, set the lock to locked and return ``True``. + When invoked with the floating-point *timeout* argument set to a positive + value, block for at most the number of seconds specified by *timeout* + and as long as the lock cannot be acquired. A negative *timeout* argument + specifies an unbounded wait. It is forbidden to specify a *timeout* + when *blocking* is false. -.. method:: Lock.release() + The return value is ``True`` if the lock is acquired successfully, + ``False`` if not (for example if the *timeout* expired). - Release a lock. This can be called from any thread, not only the thread - which has acquired the lock. + .. versionchanged:: 3.2 + The *timeout* parameter is new. - When the lock is locked, reset it to unlocked, and return. If any other threads - are blocked waiting for the lock to become unlocked, allow exactly one of them - to proceed. + .. versionchanged:: 3.2 + Lock acquires can now be interrupted by signals on POSIX. - When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. - There is no return value. + .. method:: release() + + Release a lock. This can be called from any thread, not only the thread + which has acquired the lock. + + When the lock is locked, reset it to unlocked, and return. If any other threads + are blocked waiting for the lock to become unlocked, allow exactly one of them + to proceed. + + When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. + + There is no return value. .. _rlock-objects: @@ -481,47 +421,59 @@ Reentrant locks also support the :ref:`context manager protocol `. -.. method:: RLock.acquire(blocking=True, timeout=-1) +.. class:: RLock() - Acquire a lock, blocking or non-blocking. + This class implements reentrant lock objects. A reentrant lock must be + released by the thread that acquired it. Once a thread has acquired a + reentrant lock, the same thread may acquire it again without blocking; the + thread must release it once for each time it has acquired it. - When invoked without arguments: if this thread already owns the lock, increment - the recursion level by one, and return immediately. Otherwise, if another - thread owns the lock, block until the lock is unlocked. Once the lock is - unlocked (not owned by any thread), then grab ownership, set the recursion level - to one, and return. If more than one thread is blocked waiting until the lock - is unlocked, only one at a time will be able to grab ownership of the lock. - There is no return value in this case. + Note that ``RLock`` is actually a factory function which returns an instance + of the most efficient version of the concrete RLock class that is supported + by the platform. - When invoked with the *blocking* argument set to true, do the same thing as when - called without arguments, and return true. - When invoked with the *blocking* argument set to false, do not block. If a call - without an argument would block, return false immediately; otherwise, do the - same thing as when called without arguments, and return true. + .. method:: acquire(blocking=True, timeout=-1) - When invoked with the floating-point *timeout* argument set to a positive - value, block for at most the number of seconds specified by *timeout* - and as long as the lock cannot be acquired. Return true if the lock has - been acquired, false if the timeout has elapsed. + Acquire a lock, blocking or non-blocking. - .. versionchanged:: 3.2 - The *timeout* parameter is new. + When invoked without arguments: if this thread already owns the lock, increment + the recursion level by one, and return immediately. Otherwise, if another + thread owns the lock, block until the lock is unlocked. Once the lock is + unlocked (not owned by any thread), then grab ownership, set the recursion level + to one, and return. If more than one thread is blocked waiting until the lock + is unlocked, only one at a time will be able to grab ownership of the lock. + There is no return value in this case. + When invoked with the *blocking* argument set to true, do the same thing as when + called without arguments, and return true. -.. method:: RLock.release() + When invoked with the *blocking* argument set to false, do not block. If a call + without an argument would block, return false immediately; otherwise, do the + same thing as when called without arguments, and return true. - Release a lock, decrementing the recursion level. If after the decrement it is - zero, reset the lock to unlocked (not owned by any thread), and if any other - threads are blocked waiting for the lock to become unlocked, allow exactly one - of them to proceed. If after the decrement the recursion level is still - nonzero, the lock remains locked and owned by the calling thread. + When invoked with the floating-point *timeout* argument set to a positive + value, block for at most the number of seconds specified by *timeout* + and as long as the lock cannot be acquired. Return true if the lock has + been acquired, false if the timeout has elapsed. - Only call this method when the calling thread owns the lock. A - :exc:`RuntimeError` is raised if this method is called when the lock is - unlocked. + .. versionchanged:: 3.2 + The *timeout* parameter is new. - There is no return value. + + .. method:: release() + + Release a lock, decrementing the recursion level. If after the decrement it is + zero, reset the lock to unlocked (not owned by any thread), and if any other + threads are blocked waiting for the lock to become unlocked, allow exactly one + of them to proceed. If after the decrement the recursion level is still + nonzero, the lock remains locked and owned by the calling thread. + + Only call this method when the calling thread owns the lock. A + :exc:`RuntimeError` is raised if this method is called when the lock is + unlocked. + + There is no return value. .. _condition-objects: @@ -556,10 +508,6 @@ the thread that called :meth:`~Condition.notify` or :meth:`~Condition.notify_all` finally relinquishes ownership of the lock. - -Usage -^^^^^ - The typical programming style using condition variables uses the lock to synchronize access to some shared state; threads that are interested in a particular change of state call :meth:`~Condition.wait` repeatedly until they @@ -598,15 +546,18 @@ item to the buffer only needs to wake up one consumer thread. -Interface -^^^^^^^^^ +.. class:: Condition(lock=None) -.. class:: Condition(lock=None) + This class implements condition variable objects. A condition variable + allows one or more threads to wait until they are notified by another thread. If the *lock* argument is given and not ``None``, it must be a :class:`Lock` or :class:`RLock` object, and it is used as the underlying lock. Otherwise, a new :class:`RLock` object is created and used as the underlying lock. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: acquire(*args) Acquire the underlying lock. This method calls the corresponding method on @@ -716,10 +667,19 @@ .. class:: Semaphore(value=1) + This class implements semaphore objects. A semaphore manages a counter + representing the number of :meth:`release` calls minus the number of + :meth:`acquire` calls, plus an initial value. The :meth:`acquire` method + blocks if necessary until it can return without making the counter negative. + If not given, *value* defaults to 1. + The optional argument gives the initial *value* for the internal counter; it defaults to ``1``. If the *value* given is less than 0, :exc:`ValueError` is raised. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: acquire(blocking=True, timeout=None) Acquire a semaphore. @@ -752,6 +712,18 @@ than zero again, wake up that thread. +.. class:: BoundedSemaphore(value=1) + + Class implementing bounded semaphore objects. A bounded semaphore checks to + make sure its current value doesn't exceed its initial value. If it does, + :exc:`ValueError` is raised. In most situations semaphores are used to guard + resources with limited capacity. If the semaphore is released too many times + it's a sign of a bug. If not given, *value* defaults to 1. + + .. versionchanged:: 3.3 + changed from a factory function to a class. + + .. _semaphore-examples: :class:`Semaphore` Example @@ -763,7 +735,7 @@ main thread would initialize the semaphore:: maxconnections = 5 - ... + # ... pool_sema = BoundedSemaphore(value=maxconnections) Once spawned, worker threads call the semaphore's acquire and release methods @@ -772,7 +744,7 @@ with pool_sema: conn = connectdb() try: - ... use connection ... + # ... use connection ... finally: conn.close() @@ -795,7 +767,13 @@ .. class:: Event() - The internal flag is initially false. + Class implementing event objects. An event manages a flag that can be set to + true with the :meth:`~Event.set` method and reset to false with the + :meth:`clear` method. The :meth:`wait` method blocks until the flag is true. + The flag is initially false. + + .. versionchanged:: 3.3 + changed from a factory function to a class. .. method:: is_set() @@ -860,6 +838,9 @@ Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: cancel() Stop the timer, and cancel the execution of the timer's action. This will diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1945,6 +1945,12 @@ threading --------- +:class:`threading.Condition`, :class:`threading.Semaphore`, +:class:`threading.BoundedSempaphore`, :class:`threading.Event`, and +:class:`threading.Timer`, all of which used to be factory functions returning a +class instance, are now classes and may be subclassed. (Contributed by ?ric +Araujo in :issue:`109681`). + The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword argument to override the default behavior of inheriting the ``deamon`` flag value from the parent thread (:issue:`6064`). @@ -2331,6 +2337,10 @@ make decisions affected by the AST version, use :attr:`sys.version_info` to make the decision. +* Code that used to work around the fact that the :mod:`threading` module used + factory functions by subclassing the private classes will need to change to + subclass the now-public classes. + Porting C code -------------- diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -2907,11 +2907,11 @@ - Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') in Python code) now finds the doc of the method. -- Issue #10968: Remove indirection in threading. The public names (Thread, +- Issue #10968: Remove indirection in threading. The public names (Event, Condition, etc.) used to be factory functions returning instances of hidden - classes (_Thread, _Condition, etc.), because (if Guido recalls correctly) this - code pre-dates the ability to subclass extension types. It is now possible to - inherit from Thread and other classes, without having to import the private + classes (_Event, _Condition, etc.), because (if Guido recalls correctly) this + code pre-dates the ability to subclass extension types. It is now possible + to inherit from these classes without having to import the private underscored names like multiprocessing did. - Issue #9723: Add shlex.quote functions, to escape filenames and command -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 22:07:00 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 6 Oct 2012 22:07:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typos=2E?= Message-ID: <3XYzPw55QVzLy3@mail.python.org> http://hg.python.org/cpython/rev/98070a6a7dba changeset: 79536:98070a6a7dba branch: 3.3 parent: 79534:98499371ca53 user: R David Murray date: Sat Oct 06 16:06:16 2012 -0400 summary: Fix typos. files: Doc/whatsnew/3.3.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1946,10 +1946,10 @@ --------- :class:`threading.Condition`, :class:`threading.Semaphore`, -:class:`threading.BoundedSempaphore`, :class:`threading.Event`, and +:class:`threading.BoundedSemaphore`, :class:`threading.Event`, and :class:`threading.Timer`, all of which used to be factory functions returning a class instance, are now classes and may be subclassed. (Contributed by ?ric -Araujo in :issue:`109681`). +Araujo in :issue:`10968`). The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword argument to override the default behavior of inheriting the ``deamon`` flag -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 22:07:02 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 6 Oct 2012 22:07:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Fix_typos=2E?= Message-ID: <3XYzPy0K4TzLy3@mail.python.org> http://hg.python.org/cpython/rev/ef699ca4f821 changeset: 79537:ef699ca4f821 parent: 79535:ad435964fc9c parent: 79536:98070a6a7dba user: R David Murray date: Sat Oct 06 16:06:41 2012 -0400 summary: Merge: Fix typos. files: Doc/whatsnew/3.3.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1946,10 +1946,10 @@ --------- :class:`threading.Condition`, :class:`threading.Semaphore`, -:class:`threading.BoundedSempaphore`, :class:`threading.Event`, and +:class:`threading.BoundedSemaphore`, :class:`threading.Event`, and :class:`threading.Timer`, all of which used to be factory functions returning a class instance, are now classes and may be subclassed. (Contributed by ?ric -Araujo in :issue:`109681`). +Araujo in :issue:`10968`). The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword argument to override the default behavior of inheriting the ``deamon`` flag -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 22:31:00 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 6 Oct 2012 22:31:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_whatsnew_updat?= =?utf-8?q?es_for_smtplib_and_collections=2ECounter=2E?= Message-ID: <3XYzxc4V6LzM5D@mail.python.org> http://hg.python.org/cpython/rev/a6706d12e6b5 changeset: 79538:a6706d12e6b5 branch: 3.3 parent: 79536:98070a6a7dba user: R David Murray date: Sat Oct 06 16:29:14 2012 -0400 summary: whatsnew updates for smtplib and collections.Counter. files: Doc/whatsnew/3.3.rst | 20 +++++++++++++------- Misc/NEWS | 5 +++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1005,20 +1005,20 @@ ----------- Addition of a new :class:`~collections.ChainMap` class to allow treating a -number of mappings as a single unit. - -(Written by Raymond Hettinger for :issue:`11089`, made public in -:issue:`11297`) +number of mappings as a single unit. (Written by Raymond Hettinger for +:issue:`11089`, made public in :issue:`11297`) The abstract base classes have been moved in a new :mod:`collections.abc` module, to better differentiate between the abstract and the concrete collections classes. Aliases for ABCs are still present in the -:mod:`collections` module to preserve existing imports. - -(:issue:`11085`) +:mod:`collections` module to preserve existing imports. (:issue:`11085`) .. XXX addition of __slots__ to ABCs not recorded here: internal detail +The :class:`~collections.Counter` class now supports the unary ``+`` and ``-`` +operators, as well as the in-place operators ``+=``, ``-=``, ``|=``, and +``&=``. (Contributed by Raymond Hettinger in :issue:`13121`.) + contextlib ---------- @@ -1806,6 +1806,12 @@ smtplib ------- +The :class:`~smtplib.SMTP`, :class:`~smtplib.SMTP_SSL`, and +:class:`~smtplib.LMTP` classes now accept a ``source_address`` keyword argument +to specify the ``(host, port)`` to use as the source address in the bind call +when creating the outgoing socket. (Contributed by Paulo Scardine in +:issue:`11281`.) + :class:`~smtplib.SMTP` now supports the context manager protocol, allowing an ``SMTP`` instance to be used in a ``with`` statement. (Contributed by Giampaolo Rodol? in :issue:`11289`.) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3005,8 +3005,9 @@ - Issue #12540: Prevent zombie IDLE processes on Windows due to changes in os.kill(). -- Add support for unary plus and unary minus to collections.Counter(). - Issue #13121: Also add support for inplace math operators. +- Issue #13121: add support for inplace math operators to collections.Counter. + +- Add support for unary plus and unary minus to collections.Counter. - Issue #12683: urlparse updated to include svn as schemes that uses relative paths. (svn from 1.5 onwards support relative path). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 22:31:02 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 6 Oct 2012 22:31:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_whatsnew_updates_for_smtplib_and_collections=2E?= =?utf-8?q?Counter=2E?= Message-ID: <3XYzxf0Y48zMhf@mail.python.org> http://hg.python.org/cpython/rev/600803d88d65 changeset: 79539:600803d88d65 parent: 79537:ef699ca4f821 parent: 79538:a6706d12e6b5 user: R David Murray date: Sat Oct 06 16:30:46 2012 -0400 summary: Merge: whatsnew updates for smtplib and collections.Counter. files: Doc/whatsnew/3.3.rst | 20 +++++++++++++------- Misc/HISTORY | 5 +++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1005,20 +1005,20 @@ ----------- Addition of a new :class:`~collections.ChainMap` class to allow treating a -number of mappings as a single unit. - -(Written by Raymond Hettinger for :issue:`11089`, made public in -:issue:`11297`) +number of mappings as a single unit. (Written by Raymond Hettinger for +:issue:`11089`, made public in :issue:`11297`) The abstract base classes have been moved in a new :mod:`collections.abc` module, to better differentiate between the abstract and the concrete collections classes. Aliases for ABCs are still present in the -:mod:`collections` module to preserve existing imports. - -(:issue:`11085`) +:mod:`collections` module to preserve existing imports. (:issue:`11085`) .. XXX addition of __slots__ to ABCs not recorded here: internal detail +The :class:`~collections.Counter` class now supports the unary ``+`` and ``-`` +operators, as well as the in-place operators ``+=``, ``-=``, ``|=``, and +``&=``. (Contributed by Raymond Hettinger in :issue:`13121`.) + contextlib ---------- @@ -1806,6 +1806,12 @@ smtplib ------- +The :class:`~smtplib.SMTP`, :class:`~smtplib.SMTP_SSL`, and +:class:`~smtplib.LMTP` classes now accept a ``source_address`` keyword argument +to specify the ``(host, port)`` to use as the source address in the bind call +when creating the outgoing socket. (Contributed by Paulo Scardine in +:issue:`11281`.) + :class:`~smtplib.SMTP` now supports the context manager protocol, allowing an ``SMTP`` instance to be used in a ``with`` statement. (Contributed by Giampaolo Rodol? in :issue:`11289`.) diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -2881,8 +2881,9 @@ - Issue #12540: Prevent zombie IDLE processes on Windows due to changes in os.kill(). -- Add support for unary plus and unary minus to collections.Counter(). - Issue #13121: Also add support for inplace math operators. +- Issue #13121: add support for inplace math operators to collections.Counter. + +- Add support for unary plus and unary minus to collections.Counter. - Issue #12683: urlparse updated to include svn as schemes that uses relative paths. (svn from 1.5 onwards support relative path). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 22:38:16 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 22:38:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_markup_in_?= =?utf-8?q?Counter_note=2E?= Message-ID: <3XZ0603Xl0zNHq@mail.python.org> http://hg.python.org/cpython/rev/8b34515ee53d changeset: 79540:8b34515ee53d branch: 3.3 parent: 79538:a6706d12e6b5 user: Georg Brandl date: Sat Oct 06 22:38:20 2012 +0200 summary: Fix markup in Counter note. files: Doc/library/collections.rst | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -347,24 +347,24 @@ this section documents the minimum range and type restrictions. * The :class:`Counter` class itself is a dictionary subclass with no - restrictions on its keys and values. The values are intended to be numbers - representing counts, but you *could* store anything in the value field. + restrictions on its keys and values. The values are intended to be numbers + representing counts, but you *could* store anything in the value field. * The :meth:`most_common` method requires only that the values be orderable. * For in-place operations such as ``c[key] += 1``, the value type need only - support addition and subtraction. So fractions, floats, and decimals would - work and negative values are supported. The same is also true for - :meth:`update` and :meth:`subtract` which allow negative and zero values - for both inputs and outputs. + support addition and subtraction. So fractions, floats, and decimals would + work and negative values are supported. The same is also true for + :meth:`update` and :meth:`subtract` which allow negative and zero values + for both inputs and outputs. * The multiset methods are designed only for use cases with positive values. - The inputs may be negative or zero, but only outputs with positive values - are created. There are no type restrictions, but the value type needs to - support addition, subtraction, and comparison. + The inputs may be negative or zero, but only outputs with positive values + are created. There are no type restrictions, but the value type needs to + support addition, subtraction, and comparison. * The :meth:`elements` method requires integer counts. It ignores zero and - negative counts. + negative counts. .. seealso:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 22:38:17 2012 From: python-checkins at python.org (georg.brandl) Date: Sat, 6 Oct 2012 22:38:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2Ugd2l0aCAzLjMu?= Message-ID: <3XZ06169f8zNYF@mail.python.org> http://hg.python.org/cpython/rev/83d74c30655d changeset: 79541:83d74c30655d parent: 79539:600803d88d65 parent: 79540:8b34515ee53d user: Georg Brandl date: Sat Oct 06 22:39:16 2012 +0200 summary: merge with 3.3. files: Doc/library/collections.rst | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -347,24 +347,24 @@ this section documents the minimum range and type restrictions. * The :class:`Counter` class itself is a dictionary subclass with no - restrictions on its keys and values. The values are intended to be numbers - representing counts, but you *could* store anything in the value field. + restrictions on its keys and values. The values are intended to be numbers + representing counts, but you *could* store anything in the value field. * The :meth:`most_common` method requires only that the values be orderable. * For in-place operations such as ``c[key] += 1``, the value type need only - support addition and subtraction. So fractions, floats, and decimals would - work and negative values are supported. The same is also true for - :meth:`update` and :meth:`subtract` which allow negative and zero values - for both inputs and outputs. + support addition and subtraction. So fractions, floats, and decimals would + work and negative values are supported. The same is also true for + :meth:`update` and :meth:`subtract` which allow negative and zero values + for both inputs and outputs. * The multiset methods are designed only for use cases with positive values. - The inputs may be negative or zero, but only outputs with positive values - are created. There are no type restrictions, but the value type needs to - support addition, subtraction, and comparison. + The inputs may be negative or zero, but only outputs with positive values + are created. There are no type restrictions, but the value type needs to + support addition, subtraction, and comparison. * The :meth:`elements` method requires integer counts. It ignores zero and - negative counts. + negative counts. .. seealso:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 23:18:30 2012 From: python-checkins at python.org (victor.stinner) Date: Sat, 6 Oct 2012 23:18:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316147=3A_Rewrite_?= =?utf-8?q?PyUnicode=5FFromFormatV=28=29_to_use_=5FPyUnicodeWriter_API?= Message-ID: <3XZ10Q53MmzNYF@mail.python.org> http://hg.python.org/cpython/rev/b4bee17625e1 changeset: 79542:b4bee17625e1 user: Victor Stinner date: Sat Oct 06 23:03:36 2012 +0200 summary: Issue #16147: Rewrite PyUnicode_FromFormatV() to use _PyUnicodeWriter API * Simplify the code: replace 4 steps with one unique step using the _PyUnicodeWriter API. PyUnicode_Format() has the same design. It avoids to store intermediate results which require to allocate an array of pointers on the heap. * Use the _PyUnicodeWriter API for speed (and its convinient API): overallocate the buffer to reduce the number of "realloc()" * Implement "width" and "precision" in Python, don't rely on sprintf(). It avoids to need of a temporary buffer allocated on the heap: only use a small buffer allocated in the stack. * Add _PyUnicodeWriter_WriteCstr() function * Split PyUnicode_FromFormatV() into two functions: add unicode_fromformat_arg(). * Inline parse_format_flags(): the format of an argument is now only parsed once, it's no more needed to have a subfunction. * Optimize PyUnicode_FromFormatV() for characters between two "%" arguments: search the next "%" and copy the substring in one chunk, instead of copying character per character. files: Include/unicodeobject.h | 20 +- Lib/test/test_unicode.py | 16 + Objects/unicodeobject.c | 924 +++++++++++--------------- 3 files changed, 420 insertions(+), 540 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -933,12 +933,28 @@ _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer, Py_ssize_t length, Py_UCS4 maxchar); +/* Append a Unicode string. + Return 0 on success, raise an exception and return -1 on error. */ PyAPI_FUNC(int) -_PyUnicodeWriter_WriteStr(_PyUnicodeWriter *writer, PyObject *str); - +_PyUnicodeWriter_WriteStr(_PyUnicodeWriter *writer, + PyObject *str /* Unicode string */ + ); + +/* Append a latin1-encoded byte string. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_WriteCstr(_PyUnicodeWriter *writer, + const char *str, /* latin1-encoded byte string */ + Py_ssize_t len /* length in bytes */ + ); + +/* Get the value of the write as an Unicode string. Clear the + buffer of the writer. Raise an exception and return NULL + on error. */ PyAPI_FUNC(PyObject *) _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer); +/* Deallocate memory of a writer (clear its internal buffer). */ PyAPI_FUNC(void) _PyUnicodeWriter_Dealloc(_PyUnicodeWriter *writer); #endif diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1769,6 +1769,22 @@ self.assertEqual(PyUnicode_FromFormat(b'%llu', c_ulonglong(123)), '123') self.assertEqual(PyUnicode_FromFormat(b'%zu', c_size_t(123)), '123') + # test padding (width and/or precision) + self.assertEqual(PyUnicode_FromFormat(b'%010i', c_int(123)), '123'.rjust(10, '0')) + self.assertEqual(PyUnicode_FromFormat(b'%100i', c_int(123)), '123'.rjust(100)) + self.assertEqual(PyUnicode_FromFormat(b'%.100i', c_int(123)), '123'.rjust(100, '0')) + self.assertEqual(PyUnicode_FromFormat(b'%100.80i', c_int(123)), '123'.rjust(80, '0').rjust(100)) + + self.assertEqual(PyUnicode_FromFormat(b'%010u', c_uint(123)), '123'.rjust(10, '0')) + self.assertEqual(PyUnicode_FromFormat(b'%100u', c_uint(123)), '123'.rjust(100)) + self.assertEqual(PyUnicode_FromFormat(b'%.100u', c_uint(123)), '123'.rjust(100, '0')) + self.assertEqual(PyUnicode_FromFormat(b'%100.80u', c_uint(123)), '123'.rjust(80, '0').rjust(100)) + + self.assertEqual(PyUnicode_FromFormat(b'%010x', c_int(0x123)), '123'.rjust(10, '0')) + self.assertEqual(PyUnicode_FromFormat(b'%100x', c_int(0x123)), '123'.rjust(100)) + self.assertEqual(PyUnicode_FromFormat(b'%.100x', c_int(0x123)), '123'.rjust(100, '0')) + self.assertEqual(PyUnicode_FromFormat(b'%100.80x', c_int(0x123)), '123'.rjust(80, '0').rjust(100)) + # test %A text = PyUnicode_FromFormat(b'%%A:%A', 'abc\xe9\uabcd\U0010ffff') self.assertEqual(text, r"%A:'abc\xe9\uabcd\U0010ffff'") diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2301,16 +2301,9 @@ static void makefmt(char *fmt, int longflag, int longlongflag, int size_tflag, - int zeropad, int width, int precision, char c) + char c) { *fmt++ = '%'; - if (width) { - if (zeropad) - *fmt++ = '0'; - fmt += sprintf(fmt, "%d", width); - } - if (precision) - fmt += sprintf(fmt, ".%d", precision); if (longflag) *fmt++ = 'l'; else if (longlongflag) { @@ -2335,71 +2328,6 @@ *fmt = '\0'; } -/* helper for PyUnicode_FromFormatV() */ - -static const char* -parse_format_flags(const char *f, - int *p_width, int *p_precision, - int *p_longflag, int *p_longlongflag, int *p_size_tflag) -{ - int width, precision, longflag, longlongflag, size_tflag; - - /* parse the width.precision part, e.g. "%2.5s" => width=2, precision=5 */ - f++; - width = 0; - while (Py_ISDIGIT((unsigned)*f)) - width = (width*10) + *f++ - '0'; - precision = 0; - if (*f == '.') { - f++; - while (Py_ISDIGIT((unsigned)*f)) - precision = (precision*10) + *f++ - '0'; - if (*f == '%') { - /* "%.3%s" => f points to "3" */ - f--; - } - } - if (*f == '\0') { - /* bogus format "%.1" => go backward, f points to "1" */ - f--; - } - if (p_width != NULL) - *p_width = width; - if (p_precision != NULL) - *p_precision = precision; - - /* Handle %ld, %lu, %lld and %llu. */ - longflag = 0; - longlongflag = 0; - size_tflag = 0; - - if (*f == 'l') { - if (f[1] == 'd' || f[1] == 'u' || f[1] == 'i') { - longflag = 1; - ++f; - } -#ifdef HAVE_LONG_LONG - else if (f[1] == 'l' && - (f[2] == 'd' || f[2] == 'u' || f[2] == 'i')) { - longlongflag = 1; - f += 2; - } -#endif - } - /* handle the size_t flag. */ - else if (*f == 'z' && (f[1] == 'd' || f[1] == 'u' || f[1] == 'i')) { - size_tflag = 1; - ++f; - } - if (p_longflag != NULL) - *p_longflag = longflag; - if (p_longlongflag != NULL) - *p_longlongflag = longlongflag; - if (p_size_tflag != NULL) - *p_size_tflag = size_tflag; - return f; -} - /* maximum number of characters required for output of %ld. 21 characters allows for 64-bit integers (in decimal) and an optional sign. */ #define MAX_LONG_CHARS 21 @@ -2408,477 +2336,384 @@ plus 1 for the sign. 53/22 is an upper bound for log10(256). */ #define MAX_LONG_LONG_CHARS (2 + (SIZEOF_LONG_LONG*53-1) / 22) +static const char* +unicode_fromformat_arg(_PyUnicodeWriter *writer, + const char *f, va_list *vargs) +{ + const char *p; + Py_ssize_t len; + int zeropad; + int width; + int precision; + int longflag; + int longlongflag; + int size_tflag; + int fill; + + p = f; + f++; + zeropad = (*f == '0'); + + /* parse the width.precision part, e.g. "%2.5s" => width=2, precision=5 */ + width = 0; + while (Py_ISDIGIT((unsigned)*f)) { + width = (width*10) + (*f - '0'); + f++; + } + precision = 0; + if (*f == '.') { + f++; + while (Py_ISDIGIT((unsigned)*f)) { + precision = (precision*10) + (*f - '0'); + f++; + } + if (*f == '%') { + /* "%.3%s" => f points to "3" */ + f--; + } + } + if (*f == '\0') { + /* bogus format "%.123" => go backward, f points to "3" */ + f--; + } + + /* Handle %ld, %lu, %lld and %llu. */ + longflag = 0; + longlongflag = 0; + size_tflag = 0; + if (*f == 'l') { + if (f[1] == 'd' || f[1] == 'u' || f[1] == 'i') { + longflag = 1; + ++f; + } +#ifdef HAVE_LONG_LONG + else if (f[1] == 'l' && + (f[2] == 'd' || f[2] == 'u' || f[2] == 'i')) { + longlongflag = 1; + f += 2; + } +#endif + } + /* handle the size_t flag. */ + else if (*f == 'z' && (f[1] == 'd' || f[1] == 'u' || f[1] == 'i')) { + size_tflag = 1; + ++f; + } + + if (f[1] == '\0') + writer->overallocate = 0; + + switch (*f) { + case 'c': + { + int ordinal = va_arg(*vargs, int); + if (_PyUnicodeWriter_Prepare(writer, 1, ordinal) == -1) + return NULL; + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, ordinal); + writer->pos++; + break; + } + + case 'i': + case 'd': + case 'u': + case 'x': + { + /* used by sprintf */ + char fmt[10]; /* should be enough for "%0lld\0" */ + char small_buffer[MAX_LONG_CHARS]; + char *buffer; + int err; + + if (sizeof(small_buffer) - 1 < precision) { + buffer = PyMem_Malloc(precision + 1); + if (buffer == NULL) { + PyErr_NoMemory(); + return NULL; + } + } + else + buffer = small_buffer; + + if (*f == 'u') { + makefmt(fmt, longflag, longlongflag, size_tflag, *f); + + if (longflag) + len = sprintf(buffer, fmt, + va_arg(*vargs, unsigned long)); +#ifdef HAVE_LONG_LONG + else if (longlongflag) + len = sprintf(buffer, fmt, + va_arg(*vargs, unsigned PY_LONG_LONG)); +#endif + else if (size_tflag) + len = sprintf(buffer, fmt, + va_arg(*vargs, size_t)); + else + len = sprintf(buffer, fmt, + va_arg(*vargs, unsigned int)); + } + else if (*f == 'x') { + makefmt(fmt, 0, 0, 0, 'x'); + len = sprintf(buffer, fmt, va_arg(*vargs, int)); + } + else { + makefmt(fmt, longflag, longlongflag, size_tflag, *f); + + if (longflag) + len = sprintf(buffer, fmt, + va_arg(*vargs, long)); +#ifdef HAVE_LONG_LONG + else if (longlongflag) + len = sprintf(buffer, fmt, + va_arg(*vargs, PY_LONG_LONG)); +#endif + else if (size_tflag) + len = sprintf(buffer, fmt, + va_arg(*vargs, Py_ssize_t)); + else + len = sprintf(buffer, fmt, + va_arg(*vargs, int)); + } + assert(len >= 0); + + err = 0; + if (precision < len) + precision = len; + if (width > precision) { + Py_UCS4 fillchar; + fill = width - precision; + fillchar = zeropad?'0':' '; + if (_PyUnicodeWriter_Prepare(writer, fill, fillchar) != -1) { + if (PyUnicode_Fill(writer->buffer, writer->pos, fill, fillchar) == -1) + err = 1; + } + else + err = 1; + if (!err) + writer->pos += fill; + } + if (!err && precision > len) { + fill = precision - len; + if (_PyUnicodeWriter_Prepare(writer, fill, '0') != -1) { + if (PyUnicode_Fill(writer->buffer, writer->pos, fill, '0') == -1) + err = 1; + } + else + err = 1; + if (!err) + writer->pos += fill; + } + if (!err) { + if (_PyUnicodeWriter_WriteCstr(writer, buffer, len) == -1) + err = 1; + } + + if (buffer != small_buffer) { + PyMem_Free(buffer); + buffer = small_buffer; + } + if (err) + return NULL; + + break; + } + + case 'p': + { + char number[MAX_LONG_LONG_CHARS]; + + len = sprintf(number, "%p", va_arg(*vargs, void*)); + assert(len >= 0); + + /* %p is ill-defined: ensure leading 0x. */ + if (number[1] == 'X') + number[1] = 'x'; + else if (number[1] != 'x') { + memmove(number + 2, number, + strlen(number) + 1); + number[0] = '0'; + number[1] = 'x'; + len += 2; + } + + if (_PyUnicodeWriter_WriteCstr(writer, number, len) == -1) + return NULL; + break; + } + + case 's': + { + /* UTF-8 */ + const char *s = va_arg(*vargs, const char*); + PyObject *str = PyUnicode_DecodeUTF8Stateful(s, strlen(s), "replace", NULL); + if (!str) + return NULL; + if (_PyUnicodeWriter_WriteStr(writer, str) == -1) { + Py_DECREF(str); + return NULL; + } + Py_DECREF(str); + break; + } + + case 'U': + { + PyObject *obj = va_arg(*vargs, PyObject *); + assert(obj && _PyUnicode_CHECK(obj)); + + if (_PyUnicodeWriter_WriteStr(writer, obj) == -1) + return NULL; + break; + } + + case 'V': + { + PyObject *obj = va_arg(*vargs, PyObject *); + const char *str = va_arg(*vargs, const char *); + PyObject *str_obj; + assert(obj || str); + if (obj) { + assert(_PyUnicode_CHECK(obj)); + if (_PyUnicodeWriter_WriteStr(writer, obj) == -1) + return NULL; + } + else { + str_obj = PyUnicode_DecodeUTF8Stateful(str, strlen(str), "replace", NULL); + if (!str_obj) + return NULL; + if (_PyUnicodeWriter_WriteStr(writer, str_obj) == -1) { + Py_DECREF(str_obj); + return NULL; + } + Py_DECREF(str_obj); + } + break; + } + + case 'S': + { + PyObject *obj = va_arg(*vargs, PyObject *); + PyObject *str; + assert(obj); + str = PyObject_Str(obj); + if (!str) + return NULL; + if (_PyUnicodeWriter_WriteStr(writer, str) == -1) { + Py_DECREF(str); + return NULL; + } + Py_DECREF(str); + break; + } + + case 'R': + { + PyObject *obj = va_arg(*vargs, PyObject *); + PyObject *repr; + assert(obj); + repr = PyObject_Repr(obj); + if (!repr) + return NULL; + if (_PyUnicodeWriter_WriteStr(writer, repr) == -1) { + Py_DECREF(repr); + return NULL; + } + Py_DECREF(repr); + break; + } + + case 'A': + { + PyObject *obj = va_arg(*vargs, PyObject *); + PyObject *ascii; + assert(obj); + ascii = PyObject_ASCII(obj); + if (!ascii) + return NULL; + if (_PyUnicodeWriter_WriteStr(writer, ascii) == -1) { + Py_DECREF(ascii); + return NULL; + } + Py_DECREF(ascii); + break; + } + + case '%': + if (_PyUnicodeWriter_Prepare(writer, 1, '%') == 1) + return NULL; + PyUnicode_WRITE(writer->kind, writer->data, writer->pos, '%'); + writer->pos++; + break; + + default: + /* if we stumble upon an unknown formatting code, copy the rest + of the format string to the output string. (we cannot just + skip the code, since there's no way to know what's in the + argument list) */ + len = strlen(p); + if (_PyUnicodeWriter_WriteCstr(writer, p, len) == -1) + return NULL; + f = p+len; + return f; + } + + f++; + return f; +} + PyObject * PyUnicode_FromFormatV(const char *format, va_list vargs) { - va_list count; - Py_ssize_t callcount = 0; - PyObject **callresults = NULL; - PyObject **callresult = NULL; - Py_ssize_t n = 0; - int width = 0; - int precision = 0; - int zeropad; - const char* f; - PyObject *string; - /* used by sprintf */ - char fmt[61]; /* should be enough for %0width.precisionlld */ - Py_UCS4 maxchar = 127; /* result is ASCII by default */ - Py_UCS4 argmaxchar; - Py_ssize_t numbersize = 0; - char *numberresults = NULL; - char *numberresult = NULL; - Py_ssize_t i; - int kind; - void *data; - - Py_VA_COPY(count, vargs); - /* step 1: count the number of %S/%R/%A/%s format specifications - * (we call PyObject_Str()/PyObject_Repr()/PyObject_ASCII()/ - * PyUnicode_DecodeUTF8() for these objects once during step 3 and put the - * result in an array) - * also estimate a upper bound for all the number formats in the string, - * numbers will be formatted in step 3 and be kept in a '\0'-separated - * buffer before putting everything together. */ - for (f = format; *f; f++) { + va_list vargs2; + const char *f; + _PyUnicodeWriter writer; + + _PyUnicodeWriter_Init(&writer, strlen(format) + 100); + + /* va_list may be an array (of 1 item) on some platforms (ex: AMD64). + Copy it to be able to pass a reference to a subfunction. */ + Py_VA_COPY(vargs2, vargs); + + for (f = format; *f; ) { if (*f == '%') { - int longlongflag; - /* skip width or width.precision (eg. "1.2" of "%1.2f") */ - f = parse_format_flags(f, &width, NULL, NULL, &longlongflag, NULL); - if (*f == 's' || *f=='S' || *f=='R' || *f=='A' || *f=='V') - ++callcount; - - else if (*f == 'd' || *f=='u' || *f=='i' || *f=='x' || *f=='p') { -#ifdef HAVE_LONG_LONG - if (longlongflag) { - if (width < MAX_LONG_LONG_CHARS) - width = MAX_LONG_LONG_CHARS; + f = unicode_fromformat_arg(&writer, f, &vargs2); + if (f == NULL) + goto fail; + } + else { + const char *p; + Py_ssize_t len; + + p = f; + do + { + if ((unsigned char)*p > 127) { + PyErr_Format(PyExc_ValueError, + "PyUnicode_FromFormatV() expects an ASCII-encoded format " + "string, got a non-ASCII byte: 0x%02x", + (unsigned char)*p); + return NULL; } - else -#endif - /* MAX_LONG_CHARS is enough to hold a 64-bit integer, - including sign. Decimal takes the most space. This - isn't enough for octal. If a width is specified we - need more (which we allocate later). */ - if (width < MAX_LONG_CHARS) - width = MAX_LONG_CHARS; - - /* account for the size + '\0' to separate numbers - inside of the numberresults buffer */ - numbersize += (width + 1); - } - } - else if ((unsigned char)*f > 127) { - PyErr_Format(PyExc_ValueError, - "PyUnicode_FromFormatV() expects an ASCII-encoded format " - "string, got a non-ASCII byte: 0x%02x", - (unsigned char)*f); - return NULL; - } - } - /* step 2: allocate memory for the results of - * PyObject_Str()/PyObject_Repr()/PyUnicode_DecodeUTF8() calls */ - if (callcount) { - callresults = PyObject_Malloc(sizeof(PyObject *) * callcount); - if (!callresults) { - PyErr_NoMemory(); - return NULL; - } - callresult = callresults; - } - /* step 2.5: allocate memory for the results of formating numbers */ - if (numbersize) { - numberresults = PyObject_Malloc(numbersize); - if (!numberresults) { - PyErr_NoMemory(); - goto fail; - } - numberresult = numberresults; - } - - /* step 3: format numbers and figure out how large a buffer we need */ - for (f = format; *f; f++) { - if (*f == '%') { - const char* p; - int longflag; - int longlongflag; - int size_tflag; - int numprinted; - - p = f; - zeropad = (f[1] == '0'); - f = parse_format_flags(f, &width, &precision, - &longflag, &longlongflag, &size_tflag); - switch (*f) { - case 'c': - { - Py_UCS4 ordinal = va_arg(count, int); - maxchar = MAX_MAXCHAR(maxchar, ordinal); - n++; - break; - } - case '%': - n++; - break; - case 'i': - case 'd': - makefmt(fmt, longflag, longlongflag, size_tflag, zeropad, - width, precision, *f); - if (longflag) - numprinted = sprintf(numberresult, fmt, - va_arg(count, long)); -#ifdef HAVE_LONG_LONG - else if (longlongflag) - numprinted = sprintf(numberresult, fmt, - va_arg(count, PY_LONG_LONG)); -#endif - else if (size_tflag) - numprinted = sprintf(numberresult, fmt, - va_arg(count, Py_ssize_t)); - else - numprinted = sprintf(numberresult, fmt, - va_arg(count, int)); - n += numprinted; - /* advance by +1 to skip over the '\0' */ - numberresult += (numprinted + 1); - assert(*(numberresult - 1) == '\0'); - assert(*(numberresult - 2) != '\0'); - assert(numprinted >= 0); - assert(numberresult <= numberresults + numbersize); - break; - case 'u': - makefmt(fmt, longflag, longlongflag, size_tflag, zeropad, - width, precision, 'u'); - if (longflag) - numprinted = sprintf(numberresult, fmt, - va_arg(count, unsigned long)); -#ifdef HAVE_LONG_LONG - else if (longlongflag) - numprinted = sprintf(numberresult, fmt, - va_arg(count, unsigned PY_LONG_LONG)); -#endif - else if (size_tflag) - numprinted = sprintf(numberresult, fmt, - va_arg(count, size_t)); - else - numprinted = sprintf(numberresult, fmt, - va_arg(count, unsigned int)); - n += numprinted; - numberresult += (numprinted + 1); - assert(*(numberresult - 1) == '\0'); - assert(*(numberresult - 2) != '\0'); - assert(numprinted >= 0); - assert(numberresult <= numberresults + numbersize); - break; - case 'x': - makefmt(fmt, 0, 0, 0, zeropad, width, precision, 'x'); - numprinted = sprintf(numberresult, fmt, va_arg(count, int)); - n += numprinted; - numberresult += (numprinted + 1); - assert(*(numberresult - 1) == '\0'); - assert(*(numberresult - 2) != '\0'); - assert(numprinted >= 0); - assert(numberresult <= numberresults + numbersize); - break; - case 'p': - numprinted = sprintf(numberresult, "%p", va_arg(count, void*)); - /* %p is ill-defined: ensure leading 0x. */ - if (numberresult[1] == 'X') - numberresult[1] = 'x'; - else if (numberresult[1] != 'x') { - memmove(numberresult + 2, numberresult, - strlen(numberresult) + 1); - numberresult[0] = '0'; - numberresult[1] = 'x'; - numprinted += 2; - } - n += numprinted; - numberresult += (numprinted + 1); - assert(*(numberresult - 1) == '\0'); - assert(*(numberresult - 2) != '\0'); - assert(numprinted >= 0); - assert(numberresult <= numberresults + numbersize); - break; - case 's': - { - /* UTF-8 */ - const char *s = va_arg(count, const char*); - PyObject *str = PyUnicode_DecodeUTF8Stateful(s, strlen(s), "replace", NULL); - if (!str) - goto fail; - /* since PyUnicode_DecodeUTF8 returns already flexible - unicode objects, there is no need to call ready on them */ - argmaxchar = PyUnicode_MAX_CHAR_VALUE(str); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(str); - /* Remember the str and switch to the next slot */ - *callresult++ = str; - break; - } - case 'U': - { - PyObject *obj = va_arg(count, PyObject *); - assert(obj && _PyUnicode_CHECK(obj)); - if (PyUnicode_READY(obj) == -1) - goto fail; - argmaxchar = PyUnicode_MAX_CHAR_VALUE(obj); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(obj); - break; - } - case 'V': - { - PyObject *obj = va_arg(count, PyObject *); - const char *str = va_arg(count, const char *); - PyObject *str_obj; - assert(obj || str); - assert(!obj || _PyUnicode_CHECK(obj)); - if (obj) { - if (PyUnicode_READY(obj) == -1) - goto fail; - argmaxchar = PyUnicode_MAX_CHAR_VALUE(obj); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(obj); - *callresult++ = NULL; - } - else { - str_obj = PyUnicode_DecodeUTF8Stateful(str, strlen(str), "replace", NULL); - if (!str_obj) - goto fail; - if (PyUnicode_READY(str_obj) == -1) { - Py_DECREF(str_obj); - goto fail; - } - argmaxchar = PyUnicode_MAX_CHAR_VALUE(str_obj); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(str_obj); - *callresult++ = str_obj; - } - break; - } - case 'S': - { - PyObject *obj = va_arg(count, PyObject *); - PyObject *str; - assert(obj); - str = PyObject_Str(obj); - if (!str) - goto fail; - if (PyUnicode_READY(str) == -1) { - Py_DECREF(str); - goto fail; - } - argmaxchar = PyUnicode_MAX_CHAR_VALUE(str); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(str); - /* Remember the str and switch to the next slot */ - *callresult++ = str; - break; - } - case 'R': - { - PyObject *obj = va_arg(count, PyObject *); - PyObject *repr; - assert(obj); - repr = PyObject_Repr(obj); - if (!repr) - goto fail; - if (PyUnicode_READY(repr) == -1) { - Py_DECREF(repr); - goto fail; - } - argmaxchar = PyUnicode_MAX_CHAR_VALUE(repr); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(repr); - /* Remember the repr and switch to the next slot */ - *callresult++ = repr; - break; - } - case 'A': - { - PyObject *obj = va_arg(count, PyObject *); - PyObject *ascii; - assert(obj); - ascii = PyObject_ASCII(obj); - if (!ascii) - goto fail; - if (PyUnicode_READY(ascii) == -1) { - Py_DECREF(ascii); - goto fail; - } - argmaxchar = PyUnicode_MAX_CHAR_VALUE(ascii); - maxchar = MAX_MAXCHAR(maxchar, argmaxchar); - n += PyUnicode_GET_LENGTH(ascii); - /* Remember the repr and switch to the next slot */ - *callresult++ = ascii; - break; - } - default: - /* if we stumble upon an unknown - formatting code, copy the rest of - the format string to the output - string. (we cannot just skip the - code, since there's no way to know - what's in the argument list) */ - n += strlen(p); - goto expand; - } - } else - n++; - } - expand: - /* step 4: fill the buffer */ - /* Since we've analyzed how much space we need, - we don't have to resize the string. - There can be no errors beyond this point. */ - string = PyUnicode_New(n, maxchar); - if (!string) - goto fail; - kind = PyUnicode_KIND(string); - data = PyUnicode_DATA(string); - callresult = callresults; - numberresult = numberresults; - - for (i = 0, f = format; *f; f++) { - if (*f == '%') { - const char* p; - - p = f; - f = parse_format_flags(f, NULL, NULL, NULL, NULL, NULL); - /* checking for == because the last argument could be a empty - string, which causes i to point to end, the assert at the end of - the loop */ - assert(i <= PyUnicode_GET_LENGTH(string)); - - switch (*f) { - case 'c': - { - const int ordinal = va_arg(vargs, int); - PyUnicode_WRITE(kind, data, i++, ordinal); - break; - } - case 'i': - case 'd': - case 'u': - case 'x': - case 'p': - { - Py_ssize_t len; - /* unused, since we already have the result */ - if (*f == 'p') - (void) va_arg(vargs, void *); - else - (void) va_arg(vargs, int); - /* extract the result from numberresults and append. */ - len = strlen(numberresult); - unicode_write_cstr(string, i, numberresult, len); - /* skip over the separating '\0' */ - i += len; - numberresult += len; - assert(*numberresult == '\0'); - numberresult++; - assert(numberresult <= numberresults + numbersize); - break; - } - case 's': - { - /* unused, since we already have the result */ - Py_ssize_t size; - (void) va_arg(vargs, char *); - size = PyUnicode_GET_LENGTH(*callresult); - assert(PyUnicode_KIND(*callresult) <= PyUnicode_KIND(string)); - _PyUnicode_FastCopyCharacters(string, i, *callresult, 0, size); - i += size; - /* We're done with the unicode()/repr() => forget it */ - Py_DECREF(*callresult); - /* switch to next unicode()/repr() result */ - ++callresult; - break; - } - case 'U': - { - PyObject *obj = va_arg(vargs, PyObject *); - Py_ssize_t size; - assert(PyUnicode_KIND(obj) <= PyUnicode_KIND(string)); - size = PyUnicode_GET_LENGTH(obj); - _PyUnicode_FastCopyCharacters(string, i, obj, 0, size); - i += size; - break; - } - case 'V': - { - Py_ssize_t size; - PyObject *obj = va_arg(vargs, PyObject *); - va_arg(vargs, const char *); - if (obj) { - size = PyUnicode_GET_LENGTH(obj); - assert(PyUnicode_KIND(obj) <= PyUnicode_KIND(string)); - _PyUnicode_FastCopyCharacters(string, i, obj, 0, size); - i += size; - } else { - size = PyUnicode_GET_LENGTH(*callresult); - assert(PyUnicode_KIND(*callresult) <= - PyUnicode_KIND(string)); - _PyUnicode_FastCopyCharacters(string, i, *callresult, 0, size); - i += size; - Py_DECREF(*callresult); - } - ++callresult; - break; - } - case 'S': - case 'R': - case 'A': - { - Py_ssize_t size = PyUnicode_GET_LENGTH(*callresult); - /* unused, since we already have the result */ - (void) va_arg(vargs, PyObject *); - assert(PyUnicode_KIND(*callresult) <= PyUnicode_KIND(string)); - _PyUnicode_FastCopyCharacters(string, i, *callresult, 0, size); - i += size; - /* We're done with the unicode()/repr() => forget it */ - Py_DECREF(*callresult); - /* switch to next unicode()/repr() result */ - ++callresult; - break; - } - case '%': - PyUnicode_WRITE(kind, data, i++, '%'); - break; - default: - { - Py_ssize_t len = strlen(p); - unicode_write_cstr(string, i, p, len); - i += len; - assert(i == PyUnicode_GET_LENGTH(string)); - goto end; - } - } - } - else { - assert(i < PyUnicode_GET_LENGTH(string)); - PyUnicode_WRITE(kind, data, i++, *f); - } - } - assert(i == PyUnicode_GET_LENGTH(string)); - - end: - if (callresults) - PyObject_Free(callresults); - if (numberresults) - PyObject_Free(numberresults); - return unicode_result(string); + p++; + } + while (*p != '\0' && *p != '%'); + len = p - f; + + if (*p == '\0') + writer.overallocate = 0; + if (_PyUnicodeWriter_Prepare(&writer, len, 127) == -1) + goto fail; + unicode_write_cstr(writer.buffer, writer.pos, f, len); + writer.pos += len; + + f = p; + } + } + return _PyUnicodeWriter_Finish(&writer); + fail: - if (callresults) { - PyObject **callresult2 = callresults; - while (callresult2 < callresult) { - Py_XDECREF(*callresult2); - ++callresult2; - } - PyObject_Free(callresults); - } - if (numberresults) - PyObject_Free(numberresults); + _PyUnicodeWriter_Dealloc(&writer); return NULL; } @@ -12962,6 +12797,19 @@ return 0; } +int +_PyUnicodeWriter_WriteCstr(_PyUnicodeWriter *writer, const char *str, Py_ssize_t len) +{ + Py_UCS4 maxchar; + + maxchar = ucs1lib_find_max_char((Py_UCS1*)str, (Py_UCS1*)str + len); + if (_PyUnicodeWriter_Prepare(writer, len, maxchar) == -1) + return -1; + unicode_write_cstr(writer->buffer, writer->pos, str, len); + writer->pos += len; + return 0; +} + PyObject * _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 23:18:32 2012 From: python-checkins at python.org (victor.stinner) Date: Sat, 6 Oct 2012 23:18:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316147=3A_PyUnicod?= =?utf-8?q?e=5FFromFormatV=28=29_now_detects_integer_overflow_when_parsing?= Message-ID: <3XZ10S0JQRzNmb@mail.python.org> http://hg.python.org/cpython/rev/d1369daeb9ec changeset: 79543:d1369daeb9ec user: Victor Stinner date: Sat Oct 06 23:05:00 2012 +0200 summary: Issue #16147: PyUnicode_FromFormatV() now detects integer overflow when parsing width and precision files: Objects/unicodeobject.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2357,6 +2357,11 @@ /* parse the width.precision part, e.g. "%2.5s" => width=2, precision=5 */ width = 0; while (Py_ISDIGIT((unsigned)*f)) { + if (width > (INT_MAX - ((int)*f - '0')) / 10) { + PyErr_SetString(PyExc_ValueError, + "width too big"); + return NULL; + } width = (width*10) + (*f - '0'); f++; } @@ -2364,6 +2369,11 @@ if (*f == '.') { f++; while (Py_ISDIGIT((unsigned)*f)) { + if (precision > (INT_MAX - ((int)*f - '0')) / 10) { + PyErr_SetString(PyExc_ValueError, + "precision too big"); + return NULL; + } precision = (precision*10) + (*f - '0'); f++; } @@ -13589,7 +13599,7 @@ break; if (arg->prec > (INT_MAX - ((int)arg->ch - '0')) / 10) { PyErr_SetString(PyExc_ValueError, - "prec too big"); + "precision too big"); return -1; } arg->prec = arg->prec*10 + (arg->ch - '0'); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 23:18:33 2012 From: python-checkins at python.org (victor.stinner) Date: Sat, 6 Oct 2012 23:18:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316147=3A_PyUnicod?= =?utf-8?q?e=5FFromFormatV=28=29_now_raises_an_error_if_the_argument_of?= Message-ID: <3XZ10T3KdWzP37@mail.python.org> http://hg.python.org/cpython/rev/5e319fdab563 changeset: 79544:5e319fdab563 user: Victor Stinner date: Sat Oct 06 23:05:45 2012 +0200 summary: Issue #16147: PyUnicode_FromFormatV() now raises an error if the argument of '%c' is not in the range(0x110000). files: Objects/unicodeobject.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2417,6 +2417,11 @@ case 'c': { int ordinal = va_arg(*vargs, int); + if (ordinal < 0 || ordinal > MAX_UNICODE) { + PyErr_SetString(PyExc_ValueError, + "character argument not in range(0x110000)"); + return NULL; + } if (_PyUnicodeWriter_Prepare(writer, 1, ordinal) == -1) return NULL; PyUnicode_WRITE(writer->kind, writer->data, writer->pos, ordinal); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 23:59:35 2012 From: python-checkins at python.org (victor.stinner) Date: Sat, 6 Oct 2012 23:59:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316147=3A_PyUnicod?= =?utf-8?q?e=5FFromFormatV=28=29_doesn=27t_need_anymore_to_allocate_a_buff?= =?utf-8?q?er?= Message-ID: <3XZ1vq5ZgczNYF@mail.python.org> http://hg.python.org/cpython/rev/e16ec3b468d1 changeset: 79545:e16ec3b468d1 user: Victor Stinner date: Sat Oct 06 23:48:20 2012 +0200 summary: Issue #16147: PyUnicode_FromFormatV() doesn't need anymore to allocate a buffer on the heap to format numbers. files: Lib/test/test_unicode.py | 14 +++++- Objects/unicodeobject.c | 64 +++++++--------------------- 2 files changed, 28 insertions(+), 50 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1716,9 +1716,10 @@ # Test PyUnicode_FromFormat() def test_from_format(self): support.import_module('ctypes') - from ctypes import (pythonapi, py_object, + from ctypes import ( + pythonapi, py_object, sizeof, c_int, c_long, c_longlong, c_ssize_t, - c_uint, c_ulong, c_ulonglong, c_size_t) + c_uint, c_ulong, c_ulonglong, c_size_t, c_void_p) name = "PyUnicode_FromFormat" _PyUnicode_FromFormat = getattr(pythonapi, name) _PyUnicode_FromFormat.restype = py_object @@ -1769,6 +1770,15 @@ self.assertEqual(PyUnicode_FromFormat(b'%llu', c_ulonglong(123)), '123') self.assertEqual(PyUnicode_FromFormat(b'%zu', c_size_t(123)), '123') + # test long output + min_longlong = -(2 ** (8 * sizeof(c_longlong) - 1)) + max_longlong = -min_longlong - 1 + self.assertEqual(PyUnicode_FromFormat(b'%lld', c_longlong(min_longlong)), str(min_longlong)) + self.assertEqual(PyUnicode_FromFormat(b'%lld', c_longlong(max_longlong)), str(max_longlong)) + max_ulonglong = 2 ** (8 * sizeof(c_ulonglong)) - 1 + self.assertEqual(PyUnicode_FromFormat(b'%llu', c_ulonglong(max_ulonglong)), str(max_ulonglong)) + PyUnicode_FromFormat(b'%p', c_void_p(-1)) + # test padding (width and/or precision) self.assertEqual(PyUnicode_FromFormat(b'%010i', c_int(123)), '123'.rjust(10, '0')) self.assertEqual(PyUnicode_FromFormat(b'%100i', c_int(123)), '123'.rjust(100)) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2328,10 +2328,7 @@ *fmt = '\0'; } -/* maximum number of characters required for output of %ld. 21 characters - allows for 64-bit integers (in decimal) and an optional sign. */ -#define MAX_LONG_CHARS 21 -/* maximum number of characters required for output of %lld. +/* maximum number of characters required for output of %lld or %p. We need at most ceil(log10(256)*SIZEOF_LONG_LONG) digits, plus 1 for the sign. 53/22 is an upper bound for log10(256). */ #define MAX_LONG_LONG_CHARS (2 + (SIZEOF_LONG_LONG*53-1) / 22) @@ -2436,19 +2433,7 @@ { /* used by sprintf */ char fmt[10]; /* should be enough for "%0lld\0" */ - char small_buffer[MAX_LONG_CHARS]; - char *buffer; - int err; - - if (sizeof(small_buffer) - 1 < precision) { - buffer = PyMem_Malloc(precision + 1); - if (buffer == NULL) { - PyErr_NoMemory(); - return NULL; - } - } - else - buffer = small_buffer; + char buffer[MAX_LONG_LONG_CHARS]; if (*f == 'u') { makefmt(fmt, longflag, longlongflag, size_tflag, *f); @@ -2492,45 +2477,28 @@ } assert(len >= 0); - err = 0; if (precision < len) precision = len; if (width > precision) { Py_UCS4 fillchar; fill = width - precision; fillchar = zeropad?'0':' '; - if (_PyUnicodeWriter_Prepare(writer, fill, fillchar) != -1) { - if (PyUnicode_Fill(writer->buffer, writer->pos, fill, fillchar) == -1) - err = 1; - } - else - err = 1; - if (!err) - writer->pos += fill; - } - if (!err && precision > len) { + if (_PyUnicodeWriter_Prepare(writer, fill, fillchar) == -1) + return NULL; + if (PyUnicode_Fill(writer->buffer, writer->pos, fill, fillchar) == -1) + return NULL; + writer->pos += fill; + } + if (precision > len) { fill = precision - len; - if (_PyUnicodeWriter_Prepare(writer, fill, '0') != -1) { - if (PyUnicode_Fill(writer->buffer, writer->pos, fill, '0') == -1) - err = 1; - } - else - err = 1; - if (!err) - writer->pos += fill; - } - if (!err) { - if (_PyUnicodeWriter_WriteCstr(writer, buffer, len) == -1) - err = 1; - } - - if (buffer != small_buffer) { - PyMem_Free(buffer); - buffer = small_buffer; - } - if (err) + if (_PyUnicodeWriter_Prepare(writer, fill, '0') == -1) + return NULL; + if (PyUnicode_Fill(writer->buffer, writer->pos, fill, '0') == -1) + return NULL; + writer->pos += fill; + } + if (_PyUnicodeWriter_WriteCstr(writer, buffer, len) == -1) return NULL; - break; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 6 23:59:37 2012 From: python-checkins at python.org (victor.stinner) Date: Sat, 6 Oct 2012 23:59:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Cleanup_PyUnicode=5FFromFo?= =?utf-8?q?rmatV=28=29_for_zero_padding?= Message-ID: <3XZ1vs0tZhzNYF@mail.python.org> http://hg.python.org/cpython/rev/dc721353b2e2 changeset: 79546:dc721353b2e2 user: Victor Stinner date: Sat Oct 06 23:55:33 2012 +0200 summary: Cleanup PyUnicode_FromFormatV() for zero padding Skip the "0" instead of parsing it twice: detect zero padding and then parsed as a digit of the width. files: Objects/unicodeobject.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2349,7 +2349,11 @@ p = f; f++; - zeropad = (*f == '0'); + zeropad = 0; + if (*f == '0') { + zeropad = 1; + f++; + } /* parse the width.precision part, e.g. "%2.5s" => width=2, precision=5 */ width = 0; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:20:22 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:20:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_More_whatsnew_?= =?utf-8?q?updates=2E?= Message-ID: <3XZ2Mp1520zP4Q@mail.python.org> http://hg.python.org/cpython/rev/5f9998206c55 changeset: 79547:5f9998206c55 branch: 3.3 parent: 79540:8b34515ee53d user: R David Murray date: Sat Oct 06 18:18:55 2012 -0400 summary: More whatsnew updates. files: Doc/whatsnew/3.3.rst | 83 +++++++++++++++++++++++-------- Misc/NEWS | 8 +- 2 files changed, 65 insertions(+), 26 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1366,6 +1366,16 @@ listing format and deprecates :meth:`ftplib.FTP.nlst` and :meth:`ftplib.FTP.dir`. (Contributed by Giampaolo Rodol? in :issue:`11072`) + +functools +--------- + +The :func:`functools.lru_cache` decorator now accepts a ``typed`` keyword +argument (that defaults to ``False`` to ensure that it caches values of +different types that compare equal in separate cache slots. (Contributed +by Raymond Hettinger in :issue:`13227`.) + + gc -- @@ -1376,21 +1386,9 @@ hmac ---- -A new :func:`~hmac.compare_digest` function has been added to prevent -side channel attacks on digests through timing analysis. - -(Contributed by Nick Coghlan and Christian Heimes in issue:`15061`) - - -html.entities -------------- - -A new :data:`~html.entities.html5` dictionary that maps HTML5 named character -references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``) -has been added to the :mod:`html.entities` module. The dictionary is now also -used by :class:`~html.parser.HTMLParser`. - -(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`) +A new :func:`~hmac.compare_digest` function has been added to prevent side +channel attacks on digests through timing analysis. (Contributed by Nick +Coghlan and Christian Heimes in :issue:`15061`) http @@ -1402,21 +1400,29 @@ can be used to directly manage when the accumlated headers are sent. (Contributed by Andrew Schaaf in :issue:`3709`.) - -html.parser ------------ - -:class:`~html.parser.HTMLParser` is now able to parse broken markup without +:class:`http.server` now produces valid ``HTML 4.01 strict`` output. +(Contributed by Ezio Melotti in :issue:`13295`.) + + +html +---- + +:class:`html.parser.HTMLParser` is now able to parse broken markup without raising errors, therefore the *strict* argument of the constructor and the :exc:`~html.parser.HTMLParseError` exception are now deprecated. The ability to parse broken markup is the result of a number of bug fixes that are also available on the latest bug fix releases of Python 2.7/3.2. - (Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`, :issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`, :issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`, :issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`) +A new :data:`~html.entities.html5` dictionary that maps HTML5 named character +references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == +'>'``) has been added to the :mod:`html.entities` module. The dictionary is +now also used by :class:`~html.parser.HTMLParser`. (Contributed by Ezio +Melotti in :issue:`11113` and :issue:`15156`) + imaplib ------- @@ -1655,6 +1661,14 @@ * Some platforms now support additional constants for the :func:`~os.lseek` function, such as ``os.SEEK_HOLE`` and ``os.SEEK_DATA``. +* New constants :data:`~os.RTLD_LAZY`, :data:`~os.RTLD_NOW`, + :data:`~os.RTLD_GLOBAL`, :data:`~os.RTLD_LOCAL`, :data:`~os.RTLD_NODELETE`, + :data:`~os.RTLD_NOLOAD`, and :data:`~os.RTLD_DEEPBIND` are available on + platforms that support them. These are for use with the + :func:`sys.setdlopenflags` function, and supersede the similar constants + defined in :mod:`ctypes` and :mod:`DLFCN`. (Contributed by Victor Stinner + in :issue:`13226`.) + * :func:`os.symlink` now accepts (and ignores) the ``target_is_directory`` keyword argument on non-Windows platforms, to ease cross-platform support. @@ -1727,6 +1741,7 @@ Solaris and derivatives platforms have a new class :class:`select.devpoll` for high performance asynchronous sockets via :file:`/dev/poll`. +(Contributed by Jes?s Cea Avi?n in :issue:`6397`.) shlex @@ -1922,6 +1937,14 @@ (Contributed by Giampaolo Rodol? in :issue:`14807`) +struct +------ + +The :mod:`struct` module now supports ``ssize_t`` and ``size_t`` via the +new codes ``n`` and ``N``, respectively. (Contributed by Antoine Pitrou +in :issue:`3163`.) + + subprocess ---------- @@ -1940,6 +1963,7 @@ sequence` holding informations about the thread implementation (:issue:`11223`). + textwrap -------- @@ -2014,6 +2038,7 @@ :meth:`unittest.TestCase.run` now returns the :class:`~unittest.TestResult` object. + urllib ------ @@ -2050,6 +2075,18 @@ and a more detailed reference. +zlib +---- + +New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish +between a properly-formed compressed stream and an incomplete or truncated one. +(Contributed by Nadeem Vawda in :issue:`12646`.) + +New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of +the underlying ``zlib`` library that is loaded at runtime. (Contributed by +Torsten Landschoff in :issue:`12306`.) + + Optimizations ============= @@ -2332,6 +2369,10 @@ * The deprecated variable ``time.accept2dyear`` has been removed. +* The deprecated ``Context._clamp`` attribute has been removed from the + :mod:`decimal` module. It was previously replaced by the public attribute + :attr:`~decimal.Context.clamp`. (See :issue:`8540`.) + * The undocumented internal helper class ``SSLFakeFile`` has been removed from :mod:`smtplib`, since its functionality has long been provided directly by :meth:`socket.socket.makefile`. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2827,7 +2827,7 @@ - Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. -- Issue #13235: Added PendingDeprecationWarning to warn() method and function. +- Issue #13235: Added DeprecationWarning to logging.warn() method and function. - Issue #9168: now smtpd is able to bind privileged port. @@ -2848,12 +2848,12 @@ in order to display the prompt correctly. - Issue #12454: The mailbox module is now using ASCII, instead of the locale - encoding, to read and write MH mailboxes (.mh_sequences files). + encoding, to read and write .mh_sequences files. - Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are now available on Windows. -- issue #1673007: urllib2 to support HEAD request via new method argument. +- Issue #1673007: urllib.request now supports HEAD request via new method argument. Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. - Issue #12386: packaging does not fail anymore when writing the RESOURCES @@ -2894,8 +2894,6 @@ metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig Citro. -- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes. - - Issue #13034: When decoding some SSL certificates, the subjectAltName extension could be unreported. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:20:23 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:20:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_More_whatsnew_updates=2E?= Message-ID: <3XZ2Mq5B5HzP0f@mail.python.org> http://hg.python.org/cpython/rev/33d4e02b012c changeset: 79548:33d4e02b012c parent: 79546:dc721353b2e2 parent: 79547:5f9998206c55 user: R David Murray date: Sat Oct 06 18:20:08 2012 -0400 summary: More whatsnew updates. files: Doc/whatsnew/3.3.rst | 83 +++++++++++++++++++++++-------- Misc/HISTORY | 8 +- 2 files changed, 65 insertions(+), 26 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1366,6 +1366,16 @@ listing format and deprecates :meth:`ftplib.FTP.nlst` and :meth:`ftplib.FTP.dir`. (Contributed by Giampaolo Rodol? in :issue:`11072`) + +functools +--------- + +The :func:`functools.lru_cache` decorator now accepts a ``typed`` keyword +argument (that defaults to ``False`` to ensure that it caches values of +different types that compare equal in separate cache slots. (Contributed +by Raymond Hettinger in :issue:`13227`.) + + gc -- @@ -1376,21 +1386,9 @@ hmac ---- -A new :func:`~hmac.compare_digest` function has been added to prevent -side channel attacks on digests through timing analysis. - -(Contributed by Nick Coghlan and Christian Heimes in issue:`15061`) - - -html.entities -------------- - -A new :data:`~html.entities.html5` dictionary that maps HTML5 named character -references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``) -has been added to the :mod:`html.entities` module. The dictionary is now also -used by :class:`~html.parser.HTMLParser`. - -(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`) +A new :func:`~hmac.compare_digest` function has been added to prevent side +channel attacks on digests through timing analysis. (Contributed by Nick +Coghlan and Christian Heimes in :issue:`15061`) http @@ -1402,21 +1400,29 @@ can be used to directly manage when the accumlated headers are sent. (Contributed by Andrew Schaaf in :issue:`3709`.) - -html.parser ------------ - -:class:`~html.parser.HTMLParser` is now able to parse broken markup without +:class:`http.server` now produces valid ``HTML 4.01 strict`` output. +(Contributed by Ezio Melotti in :issue:`13295`.) + + +html +---- + +:class:`html.parser.HTMLParser` is now able to parse broken markup without raising errors, therefore the *strict* argument of the constructor and the :exc:`~html.parser.HTMLParseError` exception are now deprecated. The ability to parse broken markup is the result of a number of bug fixes that are also available on the latest bug fix releases of Python 2.7/3.2. - (Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`, :issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`, :issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`, :issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`) +A new :data:`~html.entities.html5` dictionary that maps HTML5 named character +references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == +'>'``) has been added to the :mod:`html.entities` module. The dictionary is +now also used by :class:`~html.parser.HTMLParser`. (Contributed by Ezio +Melotti in :issue:`11113` and :issue:`15156`) + imaplib ------- @@ -1655,6 +1661,14 @@ * Some platforms now support additional constants for the :func:`~os.lseek` function, such as ``os.SEEK_HOLE`` and ``os.SEEK_DATA``. +* New constants :data:`~os.RTLD_LAZY`, :data:`~os.RTLD_NOW`, + :data:`~os.RTLD_GLOBAL`, :data:`~os.RTLD_LOCAL`, :data:`~os.RTLD_NODELETE`, + :data:`~os.RTLD_NOLOAD`, and :data:`~os.RTLD_DEEPBIND` are available on + platforms that support them. These are for use with the + :func:`sys.setdlopenflags` function, and supersede the similar constants + defined in :mod:`ctypes` and :mod:`DLFCN`. (Contributed by Victor Stinner + in :issue:`13226`.) + * :func:`os.symlink` now accepts (and ignores) the ``target_is_directory`` keyword argument on non-Windows platforms, to ease cross-platform support. @@ -1727,6 +1741,7 @@ Solaris and derivatives platforms have a new class :class:`select.devpoll` for high performance asynchronous sockets via :file:`/dev/poll`. +(Contributed by Jes?s Cea Avi?n in :issue:`6397`.) shlex @@ -1922,6 +1937,14 @@ (Contributed by Giampaolo Rodol? in :issue:`14807`) +struct +------ + +The :mod:`struct` module now supports ``ssize_t`` and ``size_t`` via the +new codes ``n`` and ``N``, respectively. (Contributed by Antoine Pitrou +in :issue:`3163`.) + + subprocess ---------- @@ -1940,6 +1963,7 @@ sequence` holding informations about the thread implementation (:issue:`11223`). + textwrap -------- @@ -2014,6 +2038,7 @@ :meth:`unittest.TestCase.run` now returns the :class:`~unittest.TestResult` object. + urllib ------ @@ -2050,6 +2075,18 @@ and a more detailed reference. +zlib +---- + +New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish +between a properly-formed compressed stream and an incomplete or truncated one. +(Contributed by Nadeem Vawda in :issue:`12646`.) + +New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of +the underlying ``zlib`` library that is loaded at runtime. (Contributed by +Torsten Landschoff in :issue:`12306`.) + + Optimizations ============= @@ -2332,6 +2369,10 @@ * The deprecated variable ``time.accept2dyear`` has been removed. +* The deprecated ``Context._clamp`` attribute has been removed from the + :mod:`decimal` module. It was previously replaced by the public attribute + :attr:`~decimal.Context.clamp`. (See :issue:`8540`.) + * The undocumented internal helper class ``SSLFakeFile`` has been removed from :mod:`smtplib`, since its functionality has long been provided directly by :meth:`socket.socket.makefile`. diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -2703,7 +2703,7 @@ - Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. -- Issue #13235: Added PendingDeprecationWarning to warn() method and function. +- Issue #13235: Added DeprecationWarning to logging.warn() method and function. - Issue #9168: now smtpd is able to bind privileged port. @@ -2724,12 +2724,12 @@ in order to display the prompt correctly. - Issue #12454: The mailbox module is now using ASCII, instead of the locale - encoding, to read and write MH mailboxes (.mh_sequences files). + encoding, to read and write .mh_sequences files. - Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are now available on Windows. -- issue #1673007: urllib2 to support HEAD request via new method argument. +- Issue #1673007: urllib.request now supports HEAD request via new method argument. Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. - Issue #12386: packaging does not fail anymore when writing the RESOURCES @@ -2770,8 +2770,6 @@ metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig Citro. -- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes. - - Issue #13034: When decoding some SSL certificates, the subjectAltName extension could be unreported. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:22:47 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:22:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Null_merge=2E?= Message-ID: <3XZ2Qb6nFFzNmb@mail.python.org> http://hg.python.org/cpython/rev/ca6e5aec922b changeset: 79549:ca6e5aec922b branch: 3.3 parent: 79547:5f9998206c55 parent: 79531:1dc66e654806 user: R David Murray date: Sat Oct 06 18:22:09 2012 -0400 summary: Null merge. files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:22:49 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:22:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Null_merge?= Message-ID: <3XZ2Qd20yhzNmb@mail.python.org> http://hg.python.org/cpython/rev/3dfdec9794b3 changeset: 79550:3dfdec9794b3 parent: 79548:33d4e02b012c parent: 79549:ca6e5aec922b user: R David Murray date: Sat Oct 06 18:22:31 2012 -0400 summary: Null merge files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:33:28 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:33:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzk5NTc6IGRvY3Vt?= =?utf-8?q?ent_that_SpooledTemporaryFile=2Etruncate_does_not_take_size_arg?= Message-ID: <3XZ2fw4x93zNvG@mail.python.org> http://hg.python.org/cpython/rev/63c3a3f28b42 changeset: 79551:63c3a3f28b42 branch: 2.7 parent: 79517:2c398a78dba8 user: R David Murray date: Sat Oct 06 18:26:40 2012 -0400 summary: #9957: document that SpooledTemporaryFile.truncate does not take size arg files: Doc/library/tempfile.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst --- a/Doc/library/tempfile.rst +++ b/Doc/library/tempfile.rst @@ -86,7 +86,8 @@ data is spooled in memory until the file size exceeds *max_size*, or until the file's :func:`fileno` method is called, at which point the contents are written to disk and operation proceeds as with - :func:`TemporaryFile`. + :func:`TemporaryFile`. Also, it's ``truncate`` method does not + accept a ``size`` argument. The resulting file has one additional method, :func:`rollover`, which causes the file to roll over to an on-disk file regardless of its size. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:33:30 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:33:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzk5NTc6IGRvY3Vt?= =?utf-8?q?ent_that_SpooledTemporaryFile=2Etruncate_does_not_take_size_arg?= Message-ID: <3XZ2fy076qzNvG@mail.python.org> http://hg.python.org/cpython/rev/145480af0d78 changeset: 79552:145480af0d78 branch: 3.2 parent: 79531:1dc66e654806 user: R David Murray date: Sat Oct 06 18:26:56 2012 -0400 summary: #9957: document that SpooledTemporaryFile.truncate does not take size arg files: Doc/library/tempfile.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst --- a/Doc/library/tempfile.rst +++ b/Doc/library/tempfile.rst @@ -76,7 +76,8 @@ data is spooled in memory until the file size exceeds *max_size*, or until the file's :func:`fileno` method is called, at which point the contents are written to disk and operation proceeds as with - :func:`TemporaryFile`. + :func:`TemporaryFile`. Also, it's ``truncate`` method does not + accept a ``size`` argument. The resulting file has one additional method, :func:`rollover`, which causes the file to roll over to an on-disk file regardless of its size. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:33:31 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:33:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_=239957=3A_document_that_SpooledTemporaryFile=2Etruncate_now_a?= =?utf-8?q?ccepts_a_size_arg?= Message-ID: <3XZ2fz2tfpzP0f@mail.python.org> http://hg.python.org/cpython/rev/76feae02f48f changeset: 79553:76feae02f48f branch: 3.3 parent: 79549:ca6e5aec922b parent: 79552:145480af0d78 user: R David Murray date: Sat Oct 06 18:32:39 2012 -0400 summary: #9957: document that SpooledTemporaryFile.truncate now accepts a size arg files: Doc/library/tempfile.rst | 3 +++ Doc/whatsnew/3.3.rst | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst --- a/Doc/library/tempfile.rst +++ b/Doc/library/tempfile.rst @@ -86,6 +86,9 @@ whether :func:`rollover` has been called. This file-like object can be used in a :keyword:`with` statement, just like a normal file. + .. versionchanged:: 3.3 + the truncate method now accepts a ``size`` argument. + .. function:: TemporaryDirectory(suffix='', prefix='tmp', dir=None) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1964,6 +1964,14 @@ (:issue:`11223`). +tempfile +-------- + +:class:`tempfile.SpooledTemporaryFile`\'s +:meth:`~tempfile.SpooledTemporaryFile.trucate` method now accepts +a ``size`` parameter. (Contributed by Ryan Kelly in :issue:`9957`.) + + textwrap -------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 00:33:32 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 00:33:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_=239957=3A_document_that_SpooledTemporaryFile=2Etr?= =?utf-8?q?uncate_now_accepts_a_size_arg?= Message-ID: <3XZ2g05KMYzP68@mail.python.org> http://hg.python.org/cpython/rev/c7840999b65d changeset: 79554:c7840999b65d parent: 79550:3dfdec9794b3 parent: 79553:76feae02f48f user: R David Murray date: Sat Oct 06 18:33:08 2012 -0400 summary: merge #9957: document that SpooledTemporaryFile.truncate now accepts a size arg files: Doc/library/tempfile.rst | 3 +++ Doc/whatsnew/3.3.rst | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst --- a/Doc/library/tempfile.rst +++ b/Doc/library/tempfile.rst @@ -86,6 +86,9 @@ whether :func:`rollover` has been called. This file-like object can be used in a :keyword:`with` statement, just like a normal file. + .. versionchanged:: 3.3 + the truncate method now accepts a ``size`` argument. + .. function:: TemporaryDirectory(suffix='', prefix='tmp', dir=None) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1964,6 +1964,14 @@ (:issue:`11223`). +tempfile +-------- + +:class:`tempfile.SpooledTemporaryFile`\'s +:meth:`~tempfile.SpooledTemporaryFile.trucate` method now accepts +a ``size`` parameter. (Contributed by Ryan Kelly in :issue:`9957`.) + + textwrap -------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 04:11:34 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 04:11:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_More_whatsnew_?= =?utf-8?q?updates=2E__Also_move_a_C-API_NEWS_item_out_of_library_section?= =?utf-8?q?=2E?= Message-ID: <3XZ7VZ6P9tzP7v@mail.python.org> http://hg.python.org/cpython/rev/b5a502b6a294 changeset: 79555:b5a502b6a294 branch: 3.3 parent: 79553:76feae02f48f user: R David Murray date: Sat Oct 06 22:08:08 2012 -0400 summary: More whatsnew updates. Also move a C-API NEWS item out of library section. files: Doc/whatsnew/3.3.rst | 27 ++++++++++++++++++++++++++- Misc/NEWS | 8 ++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -940,6 +940,14 @@ modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``. +binascii +-------- + +In addition to the binary objects they normally accept, the ``a2b_`` functions +now all also accept ASCII-only strings as input. (Contributed by Antoine +Pitrou in :issue:`13637`.) + + bz2 --- @@ -1403,6 +1411,11 @@ :class:`http.server` now produces valid ``HTML 4.01 strict`` output. (Contributed by Ezio Melotti in :issue:`13295`.) +:class:`http.client.HTTPResponse` now has a +:meth:`~http.client.HTTPResponse.readinto` method, which means it can be used +as a :class:`io.RawIOBase` class. (Contributed by John Kuhn in +:issue:`13464`.) + html ---- @@ -1912,7 +1925,8 @@ SCRAM-SHA-1-PLUS. (Contributed by Jacek Konieczny in :issue:`12551`) * You can query the SSL compression algorithm used by an SSL socket, thanks - to its new :meth:`~ssl.SSLSocket.compression` method. + to its new :meth:`~ssl.SSLSocket.compression` method. The new attribute + :attr:`~ssl.OP_NO_COMPRESSION` can be used to disable compression. (Contributed by Antoine Pitrou in :issue:`13634`) * Support has been added for the Next Procotol Negotiation extension using @@ -1926,6 +1940,10 @@ * The :func:`~ssl.get_server_certificate` function now supports IPv6. (Contributed by Charles-Fran?ois Natali in :issue:`11811`.) +* New attribute :attr:`~ssl.OP_CIPHER_SERVER_PREFERENCE` allows setting + SSLv3 server sockets to use the server's cipher ordering preference rather + than the client's (:issue:`13635`). + stat ---- @@ -1964,6 +1982,13 @@ (:issue:`11223`). +tarfile +------- + +:mod:`tarfile` now supports ``lzma`` encoding via the :mod:`lzma` module. +(Contributed by Lars Gust?bel in :issue:`5689`.) + + tempfile -------- diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2066,6 +2066,10 @@ - PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() + and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to + the current locale encoding. + - Add internal API for static strings (_Py_identifier et al.). - Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described @@ -2639,10 +2643,6 @@ - Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8. -- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() - and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to - the current locale encoding. - - Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem encoding and the surrogateescape error handler, rather than UTF-8. Patch by David Watson. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 04:11:36 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 04:11:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_More_whatsnew_updates=2E__Also_move_a_C-API_NEW?= =?utf-8?q?S_item_out_of_library?= Message-ID: <3XZ7Vc2P5fzPBN@mail.python.org> http://hg.python.org/cpython/rev/1d2b0ff97a62 changeset: 79556:1d2b0ff97a62 parent: 79554:c7840999b65d parent: 79555:b5a502b6a294 user: R David Murray date: Sat Oct 06 22:10:42 2012 -0400 summary: Merge: More whatsnew updates. Also move a C-API NEWS item out of library section. files: Doc/whatsnew/3.3.rst | 27 ++++++++++++++++++++++++++- Misc/HISTORY | 8 ++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -940,6 +940,14 @@ modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``. +binascii +-------- + +In addition to the binary objects they normally accept, the ``a2b_`` functions +now all also accept ASCII-only strings as input. (Contributed by Antoine +Pitrou in :issue:`13637`.) + + bz2 --- @@ -1403,6 +1411,11 @@ :class:`http.server` now produces valid ``HTML 4.01 strict`` output. (Contributed by Ezio Melotti in :issue:`13295`.) +:class:`http.client.HTTPResponse` now has a +:meth:`~http.client.HTTPResponse.readinto` method, which means it can be used +as a :class:`io.RawIOBase` class. (Contributed by John Kuhn in +:issue:`13464`.) + html ---- @@ -1912,7 +1925,8 @@ SCRAM-SHA-1-PLUS. (Contributed by Jacek Konieczny in :issue:`12551`) * You can query the SSL compression algorithm used by an SSL socket, thanks - to its new :meth:`~ssl.SSLSocket.compression` method. + to its new :meth:`~ssl.SSLSocket.compression` method. The new attribute + :attr:`~ssl.OP_NO_COMPRESSION` can be used to disable compression. (Contributed by Antoine Pitrou in :issue:`13634`) * Support has been added for the Next Procotol Negotiation extension using @@ -1926,6 +1940,10 @@ * The :func:`~ssl.get_server_certificate` function now supports IPv6. (Contributed by Charles-Fran?ois Natali in :issue:`11811`.) +* New attribute :attr:`~ssl.OP_CIPHER_SERVER_PREFERENCE` allows setting + SSLv3 server sockets to use the server's cipher ordering preference rather + than the client's (:issue:`13635`). + stat ---- @@ -1964,6 +1982,13 @@ (:issue:`11223`). +tarfile +------- + +:mod:`tarfile` now supports ``lzma`` encoding via the :mod:`lzma` module. +(Contributed by Lars Gust?bel in :issue:`5689`.) + + tempfile -------- diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1942,6 +1942,10 @@ - PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() + and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to + the current locale encoding. + - Add internal API for static strings (_Py_identifier et al.). - Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described @@ -2515,10 +2519,6 @@ - Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8. -- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() - and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to - the current locale encoding. - - Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem encoding and the surrogateescape error handler, rather than UTF-8. Patch by David Watson. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 04:27:43 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 04:27:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_starmap/starma?= =?utf-8?q?p=5Fasync_for_whatsnew=2C_and_fix_multiprocessing_Pool_markup?= =?utf-8?q?=2E?= Message-ID: <3XZ7sC6llDzP7v@mail.python.org> http://hg.python.org/cpython/rev/69e7a085fa99 changeset: 79557:69e7a085fa99 branch: 3.3 parent: 79555:b5a502b6a294 user: R David Murray date: Sat Oct 06 22:26:52 2012 -0400 summary: starmap/starmap_async for whatsnew, and fix multiprocessing Pool markup. files: Doc/library/multiprocessing.rst | 4 ++-- Doc/whatsnew/3.3.rst | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -29,7 +29,7 @@ Functionality within this package requires that the ``__main__`` module be importable by the children. This is covered in :ref:`multiprocessing-programming` however it is worth pointing out here. This means that some examples, such - as the :class:`multiprocessing.Pool` examples will not work in the + as the :class:`multiprocessing.pool.Pool` examples will not work in the interactive interpreter. For example:: >>> from multiprocessing import Pool @@ -1638,7 +1638,7 @@ One can create a pool of processes which will carry out tasks submitted to it with the :class:`Pool` class. -.. class:: multiprocessing.Pool([processes[, initializer[, initargs[, maxtasksperchild]]]]) +.. class:: Pool([processes[, initializer[, initargs[, maxtasksperchild]]]]) A process pool object which controls a pool of worker processes to which jobs can be submitted. It supports asynchronous results with timeouts and diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1537,6 +1537,13 @@ time using the appropriate OS primitives (for example, :mod:`select` on posix systems). +New methods :meth:`multiprocessing.pool.Pool.starmap` and +:meth:`~multiprocessing.pool.Pool.starmap_async` provide +:func:`itertools.starmap` equivalents to the existing +:meth:`multiprocessing.pool.Pool.map` and +:meth:`~multiprocessing.pool.Pool.map_async` functions. (Contributed by Hynek +Schlawack in :issue:`12708`.) + nntplib ------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 04:27:45 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 04:27:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_starmap/starmap=5Fasync_for_whatsnew=2C_and_fix?= =?utf-8?q?_multiprocessing_Pool_markup=2E?= Message-ID: <3XZ7sF2YKLzPF1@mail.python.org> http://hg.python.org/cpython/rev/ff8aa3d9fefd changeset: 79558:ff8aa3d9fefd parent: 79556:1d2b0ff97a62 parent: 79557:69e7a085fa99 user: R David Murray date: Sat Oct 06 22:27:31 2012 -0400 summary: Merge: starmap/starmap_async for whatsnew, and fix multiprocessing Pool markup. files: Doc/library/multiprocessing.rst | 4 ++-- Doc/whatsnew/3.3.rst | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -29,7 +29,7 @@ Functionality within this package requires that the ``__main__`` module be importable by the children. This is covered in :ref:`multiprocessing-programming` however it is worth pointing out here. This means that some examples, such - as the :class:`multiprocessing.Pool` examples will not work in the + as the :class:`multiprocessing.pool.Pool` examples will not work in the interactive interpreter. For example:: >>> from multiprocessing import Pool @@ -1638,7 +1638,7 @@ One can create a pool of processes which will carry out tasks submitted to it with the :class:`Pool` class. -.. class:: multiprocessing.Pool([processes[, initializer[, initargs[, maxtasksperchild]]]]) +.. class:: Pool([processes[, initializer[, initargs[, maxtasksperchild]]]]) A process pool object which controls a pool of worker processes to which jobs can be submitted. It supports asynchronous results with timeouts and diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1537,6 +1537,13 @@ time using the appropriate OS primitives (for example, :mod:`select` on posix systems). +New methods :meth:`multiprocessing.pool.Pool.starmap` and +:meth:`~multiprocessing.pool.Pool.starmap_async` provide +:func:`itertools.starmap` equivalents to the existing +:meth:`multiprocessing.pool.Pool.map` and +:meth:`~multiprocessing.pool.Pool.map_async` functions. (Contributed by Hynek +Schlawack in :issue:`12708`.) + nntplib ------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 05:21:09 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 05:21:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_More_whatsnew_?= =?utf-8?q?updates=2C_move_some_doc_NEWS_items_into_the_doc_section=2E?= Message-ID: <3XZ92s4jsJzP7v@mail.python.org> http://hg.python.org/cpython/rev/c9bfb297ae29 changeset: 79559:c9bfb297ae29 branch: 3.3 parent: 79557:69e7a085fa99 user: R David Murray date: Sat Oct 06 23:19:17 2012 -0400 summary: More whatsnew updates, move some doc NEWS items into the doc section. files: Doc/whatsnew/3.3.rst | 28 +++++++++++++++++++--------- Misc/NEWS | 14 +++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -933,11 +933,12 @@ (Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`) -base64, binascii ----------------- +base64 +------ ASCII-only Unicode strings are now accepted by the decoding functions of the -modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``. +:mod:`base64` modern interface. For example, ``base64.b64decode('YWJj')`` +returns ``b'abc'``. (Contributed by Catalin Iacob in :issue:`13641`.) binascii @@ -1797,6 +1798,12 @@ acts on the symlink itself (or creates one, if relevant). (Contributed by Hynek Schlawack in :issue:`12715`.) +* When copying files to a different file system, :func:`~shutil.move` now + handles symlinks the way the posix ``mv`` command does, recreating the + symlink rather than copying the target file contents. (Contributed by + Jonathan Niehof in :issue:`9993`.) :func:`~shutil.move` now also returns + the ``dst`` argument as its result. + * :func:`~shutil.rmtree` is now resistant to symlink attacks on platforms which support the new ``dir_fd`` parameter in :func:`os.open` and :func:`os.unlink`. (Contributed by Martin von L?wis and Hynek Schlawack @@ -1879,6 +1886,9 @@ (http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and http://oss.oracle.com/projects/rds/). +* The :class:`~socket.socket` class now supports the ``PF_SYSTEM`` protocol + family on OS X. (Contributed by Michael Goderbauer in :issue:`13777`.) + * New function :func:`~socket.sethostname` allows the hostname to be set on unix systems if the calling process has sufficient privileges. (Contributed by Ross Lagerwall in :issue:`10866`.) @@ -2094,13 +2104,13 @@ webbrowser ---------- -The :mod:`webbrowser` module supports more browsers: Google Chrome (named +The :mod:`webbrowser` module supports more "browsers": Google Chrome (named :program:`chrome`, :program:`chromium`, :program:`chrome-browser` or -:program:`chromium-browser` depending on the version and operating system) as -well as the the generic launchers :program:`xdg-open` from the FreeDesktop.org -project and :program:`gvfs-open` which is the default URI handler for GNOME 3. - -(:issue:`13620` and :issue:`14493`) +:program:`chromium-browser` depending on the version and operating system), +and the generic launchers :program:`xdg-open`, from the FreeDesktop.org +project, and :program:`gvfs-open`, which is the default URI handler for GNOME +3. (The former contributed by Arnaud Calmettes in :issue:`13620`, the latter +by Matthias Klose in :issue:`14493`) xml.etree.ElementTree diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2484,11 +2484,6 @@ make sure two listeners can't bind to the same socket/pipe (or any existing socket/pipe). -- Issue #9021: Add an introduction to the copy module documentation. - -- Issue #6005: Examples in the socket library documentation use sendall, where - relevant, instead send method. - - Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. @@ -2597,8 +2592,6 @@ - Add a flags parameter to select.epoll. -- Issue #12798: Updated the mimetypes documentation. - - Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. @@ -4217,6 +4210,13 @@ - Issue #13883: PYTHONCASEOK also works on OS X. +- Issue #9021: Add an introduction to the copy module documentation. + +- Issue #6005: Examples in the socket library documentation use sendall, where + relevant, instead send method. + +- Issue #12798: Updated the mimetypes documentation. + - Issue #12949: Document the kwonlyargcount argument for the PyCode_New C API function. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 05:21:11 2012 From: python-checkins at python.org (r.david.murray) Date: Sun, 7 Oct 2012 05:21:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_More_whatsnew_updates=2C_move_some_doc_NEWS_ite?= =?utf-8?q?ms_into_the_doc_section=2E?= Message-ID: <3XZ92v1sjrzPGS@mail.python.org> http://hg.python.org/cpython/rev/bf5da9433000 changeset: 79560:bf5da9433000 parent: 79558:ff8aa3d9fefd parent: 79559:c9bfb297ae29 user: R David Murray date: Sat Oct 06 23:21:01 2012 -0400 summary: Merge: More whatsnew updates, move some doc NEWS items into the doc section. files: Doc/whatsnew/3.3.rst | 28 +++++++++++++++++++--------- Misc/HISTORY | 14 +++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -933,11 +933,12 @@ (Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`) -base64, binascii ----------------- +base64 +------ ASCII-only Unicode strings are now accepted by the decoding functions of the -modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``. +:mod:`base64` modern interface. For example, ``base64.b64decode('YWJj')`` +returns ``b'abc'``. (Contributed by Catalin Iacob in :issue:`13641`.) binascii @@ -1797,6 +1798,12 @@ acts on the symlink itself (or creates one, if relevant). (Contributed by Hynek Schlawack in :issue:`12715`.) +* When copying files to a different file system, :func:`~shutil.move` now + handles symlinks the way the posix ``mv`` command does, recreating the + symlink rather than copying the target file contents. (Contributed by + Jonathan Niehof in :issue:`9993`.) :func:`~shutil.move` now also returns + the ``dst`` argument as its result. + * :func:`~shutil.rmtree` is now resistant to symlink attacks on platforms which support the new ``dir_fd`` parameter in :func:`os.open` and :func:`os.unlink`. (Contributed by Martin von L?wis and Hynek Schlawack @@ -1879,6 +1886,9 @@ (http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and http://oss.oracle.com/projects/rds/). +* The :class:`~socket.socket` class now supports the ``PF_SYSTEM`` protocol + family on OS X. (Contributed by Michael Goderbauer in :issue:`13777`.) + * New function :func:`~socket.sethostname` allows the hostname to be set on unix systems if the calling process has sufficient privileges. (Contributed by Ross Lagerwall in :issue:`10866`.) @@ -2094,13 +2104,13 @@ webbrowser ---------- -The :mod:`webbrowser` module supports more browsers: Google Chrome (named +The :mod:`webbrowser` module supports more "browsers": Google Chrome (named :program:`chrome`, :program:`chromium`, :program:`chrome-browser` or -:program:`chromium-browser` depending on the version and operating system) as -well as the the generic launchers :program:`xdg-open` from the FreeDesktop.org -project and :program:`gvfs-open` which is the default URI handler for GNOME 3. - -(:issue:`13620` and :issue:`14493`) +:program:`chromium-browser` depending on the version and operating system), +and the generic launchers :program:`xdg-open`, from the FreeDesktop.org +project, and :program:`gvfs-open`, which is the default URI handler for GNOME +3. (The former contributed by Arnaud Calmettes in :issue:`13620`, the latter +by Matthias Klose in :issue:`14493`) xml.etree.ElementTree diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -2360,11 +2360,6 @@ make sure two listeners can't bind to the same socket/pipe (or any existing socket/pipe). -- Issue #9021: Add an introduction to the copy module documentation. - -- Issue #6005: Examples in the socket library documentation use sendall, where - relevant, instead send method. - - Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. @@ -2473,8 +2468,6 @@ - Add a flags parameter to select.epoll. -- Issue #12798: Updated the mimetypes documentation. - - Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. @@ -4093,6 +4086,13 @@ - Issue #13883: PYTHONCASEOK also works on OS X. +- Issue #9021: Add an introduction to the copy module documentation. + +- Issue #6005: Examples in the socket library documentation use sendall, where + relevant, instead send method. + +- Issue #12798: Updated the mimetypes documentation. + - Issue #12949: Document the kwonlyargcount argument for the PyCode_New C API function. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Sun Oct 7 05:59:24 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sun, 07 Oct 2012 05:59:24 +0200 Subject: [Python-checkins] Daily reference leaks (c7840999b65d): sum=0 Message-ID: results for c7840999b65d on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog2eoGu9', '-x'] From python-checkins at python.org Sun Oct 7 10:29:41 2012 From: python-checkins at python.org (armin.ronacher) Date: Sun, 7 Oct 2012 10:29:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316148=3A_Small_im?= =?utf-8?q?provements_and_cleanup=2E__Added_version_information?= Message-ID: <3XZHts4PHwzPHq@mail.python.org> http://hg.python.org/cpython/rev/b9dedf845a0f changeset: 79561:b9dedf845a0f user: Armin Ronacher date: Sun Oct 07 10:29:32 2012 +0200 summary: Issue #16148: Small improvements and cleanup. Added version information to docs. files: Doc/c-api/object.rst | 2 ++ Doc/library/operator.rst | 2 ++ Doc/reference/datamodel.rst | 9 +++++++++ Include/abstract.h | 4 +++- Lib/test/test_enumerate.py | 1 - Objects/abstract.c | 15 ++++++++------- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -349,6 +349,8 @@ returning the default value. On error ``-1`` is returned. This is the equivalent to the Python expression ``operator.length_hint(o, default)``. + .. versionadded:: 3.4 + .. c:function:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key) Return element of *o* corresponding to the object *key* or *NULL* on failure. diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst --- a/Doc/library/operator.rst +++ b/Doc/library/operator.rst @@ -241,6 +241,8 @@ actual length, then an estimate using ``__length_hint__``, and finally returning the default value. + .. versionadded:: 3.4 + The :mod:`operator` module also defines tools for generalized attribute and item lookups. These are useful for making fast field extractors as arguments for :func:`map`, :func:`sorted`, :meth:`itertools.groupby`, or other functions that diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1805,6 +1805,15 @@ considered to be false in a Boolean context. +.. method:: object.__length_hint__(self) + + Called to implement ``operator.length_hint``. Should return an estimated + length for the object (which may be greater or less than the actual length). + The length must be an integer ``>=`` 0. This method is purely an + optimization and is never required for correctness. + + .. versionadded:: 3.4 + .. note:: Slicing is done exclusively with the following three methods. A call like :: diff --git a/Include/abstract.h b/Include/abstract.h --- a/Include/abstract.h +++ b/Include/abstract.h @@ -403,7 +403,9 @@ PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); #define PyObject_Length PyObject_Size -PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); +#ifndef Py_LIMITED_API + PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); +#endif PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t); /* diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py --- a/Lib/test/test_enumerate.py +++ b/Lib/test/test_enumerate.py @@ -170,7 +170,6 @@ self.assertEqual(type(reversed(x)), type(iter(x))) def test_len(self): - # This is an implementation detail, not an interface requirement for s in ('hello', tuple('hello'), list('hello'), range(5)): self.assertEqual(operator.length_hint(reversed(s)), len(s)) r = reversed(s) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -71,8 +71,9 @@ } /* The length hint function returns a non-negative value from o.__len__() - or o.__length_hint__(). If those methods aren't found. If one of the calls - fails this function returns -1. + or o.__length_hint__(). If those methods aren't found the defaultvalue is + returned. If one of the calls fails with an exception other than TypeError + this function returns -1. */ Py_ssize_t @@ -112,21 +113,21 @@ return defaultvalue; } if (!PyLong_Check(result)) { - PyErr_Format(PyExc_TypeError, "Length hint must be an integer, not %s", + PyErr_Format(PyExc_TypeError, "__length_hint__ must be an integer, not %.100s", Py_TYPE(result)->tp_name); Py_DECREF(result); return -1; } - defaultvalue = PyLong_AsSsize_t(result); + res = PyLong_AsSsize_t(result); Py_DECREF(result); - if (defaultvalue < 0 && PyErr_Occurred()) { + if (res < 0 && PyErr_Occurred()) { return -1; } - if (defaultvalue < 0) { + if (res < 0) { PyErr_Format(PyExc_ValueError, "__length_hint__() should return >= 0"); return -1; } - return defaultvalue; + return res; } PyObject * -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 11:08:48 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 11:08:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Utilize_Py=5FRETURN=5FNONE?= =?utf-8?q?_in_=5Ftkinter_module=2E?= Message-ID: <3XZJm04b3gzP6L@mail.python.org> http://hg.python.org/cpython/rev/c4e39d4584f2 changeset: 79562:c4e39d4584f2 user: Andrew Svetlov date: Sun Oct 07 12:08:38 2012 +0300 summary: Utilize Py_RETURN_NONE in _tkinter module. files: Modules/_tkinter.c | 39 +++++++++++---------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -336,8 +336,7 @@ PyObject *v; if (list == NULL) { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) { @@ -1308,8 +1307,7 @@ Tcl_AddErrorInfo(Tkapp_Interp(self), msg); LEAVE_TCL - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } @@ -1976,8 +1974,7 @@ return NULL; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } @@ -2018,8 +2015,7 @@ PyErr_SetString(Tkinter_TclError, "can't delete Tcl command"); return NULL; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } @@ -2123,8 +2119,7 @@ ENTER_TCL Tcl_CreateFileHandler(tfile, mask, FileHandler, (ClientData) data); LEAVE_TCL - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * @@ -2148,8 +2143,7 @@ ENTER_TCL Tcl_DeleteFileHandler(tfile); LEAVE_TCL - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } #endif /* HAVE_CREATEFILEHANDLER */ @@ -2181,8 +2175,7 @@ Py_DECREF(func); Py_DECREF(v); /* See Tktt_New() */ } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyMethodDef Tktt_methods[] = @@ -2382,8 +2375,7 @@ excInCmd = valInCmd = trbInCmd = NULL; return NULL; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * @@ -2409,8 +2401,7 @@ return NULL; quitMainLoop = 1; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * @@ -2467,8 +2458,7 @@ return NULL; } } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * @@ -2482,8 +2472,7 @@ return PyBool_FromLong(((TkappObject*)self)->wantobjects); ((TkappObject*)self)->wantobjects = wantobjects; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * @@ -2492,8 +2481,7 @@ ((TkappObject*)self)->dispatching = 1; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } @@ -2738,8 +2726,7 @@ return NULL; } Tkinter_busywaitinterval = new_val; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static char setbusywaitinterval_doc[] = -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 11:09:46 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 7 Oct 2012 11:09:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_markup=2E?= Message-ID: <3XZJn662RDzP6L@mail.python.org> http://hg.python.org/cpython/rev/94205f8a6ded changeset: 79563:94205f8a6ded user: Ezio Melotti date: Sun Oct 07 12:09:36 2012 +0300 summary: Fix markup. files: Doc/library/operator.rst | 4 ++-- Doc/reference/datamodel.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst --- a/Doc/library/operator.rst +++ b/Doc/library/operator.rst @@ -238,8 +238,8 @@ .. function:: length_hint(obj, default=0) Return an estimated length for the object *o*. First trying to return its - actual length, then an estimate using ``__length_hint__``, and finally - returning the default value. + actual length, then an estimate using :meth:`object.__length_hint__`, and + finally returning the default value. .. versionadded:: 3.4 diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1807,7 +1807,7 @@ .. method:: object.__length_hint__(self) - Called to implement ``operator.length_hint``. Should return an estimated + Called to implement :func:`operator.length_hint`. Should return an estimated length for the object (which may be greater or less than the actual length). The length must be an integer ``>=`` 0. This method is purely an optimization and is never required for correctness. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 11:31:00 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 11:31:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Utilize_PyModule=5FAdd=7BI?= =?utf-8?q?ntConstant=2CStringConstant=2CObject=7D_in_=5Ftkinter=2E?= Message-ID: <3XZKFc5bpSzP7W@mail.python.org> http://hg.python.org/cpython/rev/43029349da17 changeset: 79564:43029349da17 user: Andrew Svetlov date: Sun Oct 07 12:30:51 2012 +0300 summary: Utilize PyModule_Add{IntConstant,StringConstant,Object} in _tkinter. files: Modules/_tkinter.c | 38 +++++++++++++++++----------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -2895,7 +2895,7 @@ PyMODINIT_FUNC PyInit__tkinter(void) { - PyObject *m, *d, *uexe, *cexe; + PyObject *m, *uexe, *cexe; if (PyType_Ready(&Tkapp_Type) < 0) return NULL; @@ -2908,32 +2908,32 @@ if (m == NULL) return NULL; - d = PyModule_GetDict(m); Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL); - PyDict_SetItemString(d, "TclError", Tkinter_TclError); - - ins_long(d, "READABLE", TCL_READABLE); - ins_long(d, "WRITABLE", TCL_WRITABLE); - ins_long(d, "EXCEPTION", TCL_EXCEPTION); - ins_long(d, "WINDOW_EVENTS", TCL_WINDOW_EVENTS); - ins_long(d, "FILE_EVENTS", TCL_FILE_EVENTS); - ins_long(d, "TIMER_EVENTS", TCL_TIMER_EVENTS); - ins_long(d, "IDLE_EVENTS", TCL_IDLE_EVENTS); - ins_long(d, "ALL_EVENTS", TCL_ALL_EVENTS); - ins_long(d, "DONT_WAIT", TCL_DONT_WAIT); - ins_string(d, "TK_VERSION", TK_VERSION); - ins_string(d, "TCL_VERSION", TCL_VERSION); - - PyDict_SetItemString(d, "TkappType", (PyObject *)&Tkapp_Type); + Py_INCREF(Tkinter_TclError); + PyModule_AddObject(m, "TclError", Tkinter_TclError); + + PyModule_AddIntConstant(m, "READABLE", TCL_READABLE); + PyModule_AddIntConstant(m, "WRITABLE", TCL_WRITABLE); + PyModule_AddIntConstant(m, "EXCEPTION", TCL_EXCEPTION); + PyModule_AddIntConstant(m, "WINDOW_EVENTS", TCL_WINDOW_EVENTS); + PyModule_AddIntConstant(m, "FILE_EVENTS", TCL_FILE_EVENTS); + PyModule_AddIntConstant(m, "TIMER_EVENTS", TCL_TIMER_EVENTS); + PyModule_AddIntConstant(m, "IDLE_EVENTS", TCL_IDLE_EVENTS); + PyModule_AddIntConstant(m, "ALL_EVENTS", TCL_ALL_EVENTS); + PyModule_AddIntConstant(m, "DONT_WAIT", TCL_DONT_WAIT); + PyModule_AddStringConstant(m, "TK_VERSION", TK_VERSION); + PyModule_AddStringConstant(m, "TCL_VERSION", TCL_VERSION); + + PyModule_AddObject(m, "TkappType", (PyObject *)&Tkapp_Type); if (PyType_Ready(&Tktt_Type) < 0) { Py_DECREF(m); return NULL; } - PyDict_SetItemString(d, "TkttType", (PyObject *)&Tktt_Type); + PyModule_AddObject(m, "TkttType", (PyObject *)&Tktt_Type); Py_TYPE(&PyTclObject_Type) = &PyType_Type; - PyDict_SetItemString(d, "Tcl_Obj", (PyObject *)&PyTclObject_Type); + PyModule_AddObject(m, "Tcl_Obj", (PyObject *)&PyTclObject_Type); #ifdef TK_AQUA /* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 12:39:14 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 12:39:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_unused_functions_fr?= =?utf-8?q?om_=5Ftkinter=2E?= Message-ID: <3XZLmL4LWFzPHq@mail.python.org> http://hg.python.org/cpython/rev/21a33257c744 changeset: 79565:21a33257c744 user: Andrew Svetlov date: Sun Oct 07 13:39:00 2012 +0300 summary: Remove unused functions from _tkinter. files: Modules/_tkinter.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -2859,27 +2859,6 @@ } -/* all errors will be checked in one fell swoop in init_tkinter() */ -static void -ins_long(PyObject *d, char *name, long val) -{ - PyObject *v = PyLong_FromLong(val); - if (v) { - PyDict_SetItemString(d, name, v); - Py_DECREF(v); - } -} -static void -ins_string(PyObject *d, char *name, char *val) -{ - PyObject *v = PyUnicode_FromString(val); - if (v) { - PyDict_SetItemString(d, name, v); - Py_DECREF(v); - } -} - - static struct PyModuleDef _tkintermodule = { PyModuleDef_HEAD_INIT, "_tkinter", -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 12:53:27 2012 From: python-checkins at python.org (hynek.schlawack) Date: Sun, 7 Oct 2012 12:53:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=231492704=3A_Make_?= =?utf-8?q?shutil=2Ecopyfile=28=29_raise_a_distinct_SameFileError?= Message-ID: <3XZM4l5h0WzPHP@mail.python.org> http://hg.python.org/cpython/rev/e11642068f85 changeset: 79566:e11642068f85 user: Hynek Schlawack date: Sun Oct 07 12:49:58 2012 +0200 summary: Closes #1492704: Make shutil.copyfile() raise a distinct SameFileError Patch by Atsuo Ishimoto. files: Doc/library/shutil.rst | 14 +++++++++++++- Lib/shutil.py | 8 +++++++- Lib/test/test_shutil.py | 15 ++++++++++++--- Misc/NEWS | 3 +++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -53,7 +53,7 @@ *dst* and return *dst*. *src* and *dst* are path names given as strings. *dst* must be the complete target file name; look at :func:`shutil.copy` for a copy that accepts a target directory path. If *src* and *dst* - specify the same file, :exc:`Error` is raised. + specify the same file, :exc:`SameFileError` is raised. The destination location must be writable; otherwise, an :exc:`OSError` exception will be raised. If *dst* already exists, it will be replaced. @@ -69,6 +69,18 @@ Added *follow_symlinks* argument. Now returns *dst*. + .. versionchanged:: 3.4 + Raise :exc:`SameFileError` instead of :exc:`Error`. + + +.. exception:: SameFileError + + This exception is raised if source and destination in :func:`copyfile` + are the same file. + + .. versionadded:: 3.4 + + .. function:: copymode(src, dst, *, follow_symlinks=True) Copy the permission bits from *src* to *dst*. The file contents, owner, and diff --git a/Lib/shutil.py b/Lib/shutil.py --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -42,6 +42,9 @@ class Error(EnvironmentError): pass +class SameFileError(Error): + """Raised when source and destination are the same file.""" + class SpecialFileError(EnvironmentError): """Raised when trying to do a kind of operation (e.g. copying) which is not supported on a special file (e.g. a named pipe)""" @@ -90,7 +93,7 @@ """ if _samefile(src, dst): - raise Error("`%s` and `%s` are the same file" % (src, dst)) + raise SameFileError("{!r} and {!r} are the same file".format(src, dst)) for fn in [src, dst]: try: @@ -215,6 +218,9 @@ If follow_symlinks is false, symlinks won't be followed. This resembles GNU's "cp -P src dst". + If source and destination are the same file, a SameFileError will be + raised. + """ if os.path.isdir(dst): dst = os.path.join(dst, os.path.basename(src)) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -18,7 +18,8 @@ register_archive_format, unregister_archive_format, get_archive_formats, Error, unpack_archive, register_unpack_format, RegistryError, - unregister_unpack_format, get_unpack_formats) + unregister_unpack_format, get_unpack_formats, + SameFileError) import tarfile import warnings @@ -688,7 +689,7 @@ with open(src, 'w') as f: f.write('cheddar') os.link(src, dst) - self.assertRaises(shutil.Error, shutil.copyfile, src, dst) + self.assertRaises(shutil.SameFileError, shutil.copyfile, src, dst) with open(src, 'r') as f: self.assertEqual(f.read(), 'cheddar') os.remove(dst) @@ -708,7 +709,7 @@ # to TESTFN/TESTFN/cheese, while it should point at # TESTFN/cheese. os.symlink('cheese', dst) - self.assertRaises(shutil.Error, shutil.copyfile, src, dst) + self.assertRaises(shutil.SameFileError, shutil.copyfile, src, dst) with open(src, 'r') as f: self.assertEqual(f.read(), 'cheddar') os.remove(dst) @@ -1215,6 +1216,14 @@ self.assertTrue(os.path.exists(rv)) self.assertEqual(read_file(src_file), read_file(dst_file)) + def test_copyfile_same_file(self): + # copyfile() should raise SameFileError if the source and destination + # are the same. + src_dir = self.mkdtemp() + src_file = os.path.join(src_dir, 'foo') + write_file(src_file, 'foo') + self.assertRaises(SameFileError, shutil.copyfile, src_file, src_file) + def test_copytree_return_value(self): # copytree returns its destination path. src_dir = self.mkdtemp() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,9 @@ Library ------- +- Issue #1492704: shutil.copyfile() raises a distinct SameFileError now if + source and destination are the same file. Patch by Atsuo Ishimoto. + - Issue #13896: Make shelf instances work with 'with' as context managers. Original patch by Filip Gruszczy?ski. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 16:24:33 2012 From: python-checkins at python.org (eli.bendersky) Date: Sun, 7 Oct 2012 16:24:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1ODg4?= =?utf-8?q?=3A_fixing_problems_in_ipaddress_doctests=2E_Patch_by_Chris_Jer?= =?utf-8?q?donek?= Message-ID: <3XZRmK6509zQlJ@mail.python.org> http://hg.python.org/cpython/rev/81ad910d75a9 changeset: 79567:81ad910d75a9 branch: 3.3 parent: 79559:c9bfb297ae29 user: Eli Bendersky date: Sun Oct 07 07:23:50 2012 -0700 summary: Issue #15888: fixing problems in ipaddress doctests. Patch by Chris Jerdonek files: Doc/howto/ipaddress.rst | 27 ++++++++++++++++----------- Doc/library/ipaddress.rst | 21 ++++++++++++++------- Lib/ipaddress.py | 7 ++++--- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Doc/howto/ipaddress.rst b/Doc/howto/ipaddress.rst --- a/Doc/howto/ipaddress.rst +++ b/Doc/howto/ipaddress.rst @@ -1,7 +1,7 @@ .. _ipaddress-howto: *************************************** -An Introduction to the ipaddress module +An introduction to the ipaddress module *************************************** :author: Peter Moody @@ -47,7 +47,12 @@ when working with IP addressing. The simplest way to create addresses is to use the :func:`ipaddress.ip_address` factory function, which automatically determines whether to create an IPv4 or IPv6 address based on the passed in -value:: +value: + +.. testsetup:: + >>> import ipaddress + +:: >>> ipaddress.ip_address('192.0.2.1') IPv4Address('192.0.2.1') @@ -142,7 +147,7 @@ >>> ipaddress.ip_interface('192.0.2.1/24') IPv4Interface('192.0.2.1/24') - >>> ipaddress.ip_network('2001:db8::1/96') + >>> ipaddress.ip_interface('2001:db8::1/96') IPv6Interface('2001:db8::1/96') Integer inputs are accepted (as with networks), and use of a particular IP @@ -177,22 +182,22 @@ Finding out how many individual addresses are in a network:: >>> net4 = ipaddress.ip_network('192.0.2.0/24') - >>> net4.numhosts + >>> net4.num_addresses 256 >>> net6 = ipaddress.ip_network('2001:db8::0/96') - >>> net6.numhosts + >>> net6.num_addresses 4294967296 Iterating through the "usable" addresses on a network:: >>> net4 = ipaddress.ip_network('192.0.2.0/24') >>> for x in net4.hosts(): - print(x) + ... print(x) # doctest: +ELLIPSIS 192.0.2.1 192.0.2.2 192.0.2.3 192.0.2.4 - + ... 192.0.2.252 192.0.2.253 192.0.2.254 @@ -216,9 +221,9 @@ Exploding or compressing the address:: >>> addr6.exploded - '2001:0db8:0000:0000:0000:0000:0000:0000' + '2001:0db8:0000:0000:0000:0000:0000:0001' >>> addr6.compressed - '2001:db8::' + '2001:db8::1' >>> net6.exploded '2001:0db8:0000:0000:0000:0000:0000:0000/96' >>> net6.compressed @@ -241,9 +246,9 @@ >>> net4[-1] IPv4Address('192.0.2.255') >>> net6[1] - IPv6Address('2001::1') + IPv6Address('2001:db8::1') >>> net6[-1] - IPv6Address('2001::ffff:ffff') + IPv6Address('2001:db8::ffff:ffff') It also means that network objects lend themselves to using the list diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -42,8 +42,15 @@ Return an :class:`IPv4Address` or :class:`IPv6Address` object depending on the IP address passed as argument. Either IPv4 or IPv6 addresses may be supplied; integers less than 2**32 will be considered to be IPv4 by default. - A :exc:`ValueError` is raised if *address* does not represent a valid IPv4 or - IPv6 address. + A :exc:`ValueError` is raised if *address* does not represent a valid IPv4 + or IPv6 address. + +.. testsetup:: + >>> import ipaddress + >>> from ipaddress import (ip_network, IPv4Address, IPv4Interface, + ... IPv4Network) + +:: >>> ipaddress.ip_address('192.168.0.1') IPv4Address('192.168.0.1') @@ -111,7 +118,7 @@ >>> ipaddress.IPv4Address('192.168.0.1') IPv4Address('192.168.0.1') - >>> ipaddress.IPv4Address(3221225985) + >>> ipaddress.IPv4Address(3232235521) IPv4Address('192.168.0.1') >>> ipaddress.IPv4Address(b'\xC0\xA8\x00\x01') IPv4Address('192.168.0.1') @@ -437,7 +444,7 @@ hosts are all the IP addresses that belong to the network, except the network address itself and the network broadcast address. - >>> list(ip_network('192.0.2.0/29').hosts()) + >>> list(ip_network('192.0.2.0/29').hosts()) #doctest: +NORMALIZE_WHITESPACE [IPv4Address('192.0.2.1'), IPv4Address('192.0.2.2'), IPv4Address('192.0.2.3'), IPv4Address('192.0.2.4'), IPv4Address('192.0.2.5'), IPv4Address('192.0.2.6')] @@ -456,7 +463,7 @@ >>> n1 = ip_network('192.0.2.0/28') >>> n2 = ip_network('192.0.2.1/32') - >>> list(n1.address_exclude(n2)) + >>> list(n1.address_exclude(n2)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.8/29'), IPv4Network('192.0.2.4/30'), IPv4Network('192.0.2.2/31'), IPv4Network('192.0.2.0/32')] @@ -471,10 +478,10 @@ >>> list(ip_network('192.0.2.0/24').subnets()) [IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/25')] - >>> list(ip_network('192.0.2.0/24').subnets(prefixlen_diff=2)) + >>> list(ip_network('192.0.2.0/24').subnets(prefixlen_diff=2)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/26'), IPv4Network('192.0.2.64/26'), IPv4Network('192.0.2.128/26'), IPv4Network('192.0.2.192/26')] - >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=26)) + >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=26)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/26'), IPv4Network('192.0.2.64/26'), IPv4Network('192.0.2.128/26'), IPv4Network('192.0.2.192/26')] >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=23)) diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -206,10 +206,11 @@ """Summarize a network range given the first and last IP addresses. Example: - >>> summarize_address_range(IPv4Address('192.0.2.0'), - IPv4Address('192.0.2.130')) + >>> list(summarize_address_range(IPv4Address('192.0.2.0'), + ... IPv4Address('192.0.2.130'))) + ... #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/31'), - IPv4Network('192.0.2.130/32')] + IPv4Network('192.0.2.130/32')] Args: first: the first IPv4Address or IPv6Address in the range. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 16:24:35 2012 From: python-checkins at python.org (eli.bendersky) Date: Sun, 7 Oct 2012 16:24:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3XZRmM2tJxzQn3@mail.python.org> http://hg.python.org/cpython/rev/73a9a8080594 changeset: 79568:73a9a8080594 parent: 79566:e11642068f85 parent: 79567:81ad910d75a9 user: Eli Bendersky date: Sun Oct 07 07:24:24 2012 -0700 summary: merge 3.3 files: Doc/howto/ipaddress.rst | 27 ++++++++++++++++----------- Doc/library/ipaddress.rst | 21 ++++++++++++++------- Lib/ipaddress.py | 7 ++++--- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Doc/howto/ipaddress.rst b/Doc/howto/ipaddress.rst --- a/Doc/howto/ipaddress.rst +++ b/Doc/howto/ipaddress.rst @@ -1,7 +1,7 @@ .. _ipaddress-howto: *************************************** -An Introduction to the ipaddress module +An introduction to the ipaddress module *************************************** :author: Peter Moody @@ -47,7 +47,12 @@ when working with IP addressing. The simplest way to create addresses is to use the :func:`ipaddress.ip_address` factory function, which automatically determines whether to create an IPv4 or IPv6 address based on the passed in -value:: +value: + +.. testsetup:: + >>> import ipaddress + +:: >>> ipaddress.ip_address('192.0.2.1') IPv4Address('192.0.2.1') @@ -142,7 +147,7 @@ >>> ipaddress.ip_interface('192.0.2.1/24') IPv4Interface('192.0.2.1/24') - >>> ipaddress.ip_network('2001:db8::1/96') + >>> ipaddress.ip_interface('2001:db8::1/96') IPv6Interface('2001:db8::1/96') Integer inputs are accepted (as with networks), and use of a particular IP @@ -177,22 +182,22 @@ Finding out how many individual addresses are in a network:: >>> net4 = ipaddress.ip_network('192.0.2.0/24') - >>> net4.numhosts + >>> net4.num_addresses 256 >>> net6 = ipaddress.ip_network('2001:db8::0/96') - >>> net6.numhosts + >>> net6.num_addresses 4294967296 Iterating through the "usable" addresses on a network:: >>> net4 = ipaddress.ip_network('192.0.2.0/24') >>> for x in net4.hosts(): - print(x) + ... print(x) # doctest: +ELLIPSIS 192.0.2.1 192.0.2.2 192.0.2.3 192.0.2.4 - + ... 192.0.2.252 192.0.2.253 192.0.2.254 @@ -216,9 +221,9 @@ Exploding or compressing the address:: >>> addr6.exploded - '2001:0db8:0000:0000:0000:0000:0000:0000' + '2001:0db8:0000:0000:0000:0000:0000:0001' >>> addr6.compressed - '2001:db8::' + '2001:db8::1' >>> net6.exploded '2001:0db8:0000:0000:0000:0000:0000:0000/96' >>> net6.compressed @@ -241,9 +246,9 @@ >>> net4[-1] IPv4Address('192.0.2.255') >>> net6[1] - IPv6Address('2001::1') + IPv6Address('2001:db8::1') >>> net6[-1] - IPv6Address('2001::ffff:ffff') + IPv6Address('2001:db8::ffff:ffff') It also means that network objects lend themselves to using the list diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -42,8 +42,15 @@ Return an :class:`IPv4Address` or :class:`IPv6Address` object depending on the IP address passed as argument. Either IPv4 or IPv6 addresses may be supplied; integers less than 2**32 will be considered to be IPv4 by default. - A :exc:`ValueError` is raised if *address* does not represent a valid IPv4 or - IPv6 address. + A :exc:`ValueError` is raised if *address* does not represent a valid IPv4 + or IPv6 address. + +.. testsetup:: + >>> import ipaddress + >>> from ipaddress import (ip_network, IPv4Address, IPv4Interface, + ... IPv4Network) + +:: >>> ipaddress.ip_address('192.168.0.1') IPv4Address('192.168.0.1') @@ -111,7 +118,7 @@ >>> ipaddress.IPv4Address('192.168.0.1') IPv4Address('192.168.0.1') - >>> ipaddress.IPv4Address(3221225985) + >>> ipaddress.IPv4Address(3232235521) IPv4Address('192.168.0.1') >>> ipaddress.IPv4Address(b'\xC0\xA8\x00\x01') IPv4Address('192.168.0.1') @@ -437,7 +444,7 @@ hosts are all the IP addresses that belong to the network, except the network address itself and the network broadcast address. - >>> list(ip_network('192.0.2.0/29').hosts()) + >>> list(ip_network('192.0.2.0/29').hosts()) #doctest: +NORMALIZE_WHITESPACE [IPv4Address('192.0.2.1'), IPv4Address('192.0.2.2'), IPv4Address('192.0.2.3'), IPv4Address('192.0.2.4'), IPv4Address('192.0.2.5'), IPv4Address('192.0.2.6')] @@ -456,7 +463,7 @@ >>> n1 = ip_network('192.0.2.0/28') >>> n2 = ip_network('192.0.2.1/32') - >>> list(n1.address_exclude(n2)) + >>> list(n1.address_exclude(n2)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.8/29'), IPv4Network('192.0.2.4/30'), IPv4Network('192.0.2.2/31'), IPv4Network('192.0.2.0/32')] @@ -471,10 +478,10 @@ >>> list(ip_network('192.0.2.0/24').subnets()) [IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/25')] - >>> list(ip_network('192.0.2.0/24').subnets(prefixlen_diff=2)) + >>> list(ip_network('192.0.2.0/24').subnets(prefixlen_diff=2)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/26'), IPv4Network('192.0.2.64/26'), IPv4Network('192.0.2.128/26'), IPv4Network('192.0.2.192/26')] - >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=26)) + >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=26)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/26'), IPv4Network('192.0.2.64/26'), IPv4Network('192.0.2.128/26'), IPv4Network('192.0.2.192/26')] >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=23)) diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -206,10 +206,11 @@ """Summarize a network range given the first and last IP addresses. Example: - >>> summarize_address_range(IPv4Address('192.0.2.0'), - IPv4Address('192.0.2.130')) + >>> list(summarize_address_range(IPv4Address('192.0.2.0'), + ... IPv4Address('192.0.2.130'))) + ... #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/31'), - IPv4Network('192.0.2.130/32')] + IPv4Network('192.0.2.130/32')] Args: first: the first IPv4Address or IPv6Address in the range. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 16:42:06 2012 From: python-checkins at python.org (mark.dickinson) Date: Sun, 7 Oct 2012 16:42:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Clean_up_a_tes?= =?utf-8?q?t_turd=2E?= Message-ID: <3XZS8Z37P9zQld@mail.python.org> http://hg.python.org/cpython/rev/715b3cbcb438 changeset: 79569:715b3cbcb438 branch: 2.7 parent: 79551:63c3a3f28b42 user: Mark Dickinson date: Sun Oct 07 15:41:38 2012 +0100 summary: Clean up a test turd. files: Lib/test/test_subprocess.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -526,6 +526,7 @@ finally: for h in handles: os.close(h) + test_support.unlink(test_support.TESTFN) def test_list2cmdline(self): self.assertEqual(subprocess.list2cmdline(['a b c', 'd', 'e']), -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 17:59:39 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 17:59:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0OTAw?= =?utf-8?q?=3A_Distuguish_call_count_and_primitive_call_count_in_pstat_out?= =?utf-8?q?put=2E?= Message-ID: <3XZTt375bmzNtj@mail.python.org> http://hg.python.org/cpython/rev/cc3e27b7da41 changeset: 79570:cc3e27b7da41 branch: 2.7 user: Andrew Svetlov date: Sun Oct 07 18:57:21 2012 +0300 summary: Issue #14900: Distuguish call count and primitive call count in pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 2 +- Misc/ACKS | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -178,7 +178,7 @@ "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), "nfl" : (((6, 1),(4, 1),(5, 1),), "name/file/line"), - "pcalls" : (((0,-1), ), "call count"), + "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), } diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1,3 +1,4 @@ + Acknowledgements ---------------- @@ -40,6 +41,7 @@ John Aycock Jan-Hein B?hrman Donovan Baarda +Arne Babenhauserheide Attila Babo Alfonso Baciero Marcin Bachry -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 17:59:41 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 17:59:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0OTAw?= =?utf-8?q?=3A_Distuguish_call_count_and_primitive_call_count_in_pstat_out?= =?utf-8?q?put=2E?= Message-ID: <3XZTt52f6zzPC4@mail.python.org> http://hg.python.org/cpython/rev/410e92589164 changeset: 79571:410e92589164 branch: 3.2 parent: 79552:145480af0d78 user: Andrew Svetlov date: Sun Oct 07 18:58:42 2012 +0300 summary: Issue #14900: Distuguish call count and primitive call count in pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 2 +- Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -165,7 +165,7 @@ "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), "nfl" : (((6, 1),(4, 1),(5, 1),), "name/file/line"), - "pcalls" : (((0,-1), ), "call count"), + "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), } diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -47,6 +47,7 @@ John Aycock Jan-Hein B?hrman Donovan Baarda +Arne Babenhauserheide Attila Babo Alfonso Baciero Marcin Bachry -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 17:59:42 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 17:59:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2314900=3A_Distuguish_call_count_and_primitive_ca?= =?utf-8?q?ll_count_in_pstat?= Message-ID: <3XZTt65LzjzPHP@mail.python.org> http://hg.python.org/cpython/rev/fb216fee32db changeset: 79572:fb216fee32db branch: 3.3 parent: 79567:81ad910d75a9 parent: 79571:410e92589164 user: Andrew Svetlov date: Sun Oct 07 18:59:11 2012 +0300 summary: Merge issue #14900: Distuguish call count and primitive call count in pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 2 +- Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -165,7 +165,7 @@ "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), "nfl" : (((6, 1),(4, 1),(5, 1),), "name/file/line"), - "pcalls" : (((0,-1), ), "call count"), + "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), } diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -51,6 +51,7 @@ Aymeric Augustin John Aycock Donovan Baarda +Arne Babenhauserheide Attila Babo Marcin Bachry Alfonso Baciero -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 17:59:44 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 17:59:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2314900=3A_Distuguish_call_count_and_primitive_ca?= =?utf-8?q?ll_count_in_pstat_output=2E?= Message-ID: <3XZTt80XJQzPHq@mail.python.org> http://hg.python.org/cpython/rev/bc658b6a1d4e changeset: 79573:bc658b6a1d4e parent: 79568:73a9a8080594 parent: 79572:fb216fee32db user: Andrew Svetlov date: Sun Oct 07 18:59:27 2012 +0300 summary: Issue #14900: Distuguish call count and primitive call count in pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 2 +- Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -165,7 +165,7 @@ "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), "nfl" : (((6, 1),(4, 1),(5, 1),), "name/file/line"), - "pcalls" : (((0,-1), ), "call count"), + "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), } diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -51,6 +51,7 @@ Aymeric Augustin John Aycock Donovan Baarda +Arne Babenhauserheide Attila Babo Marcin Bachry Alfonso Baciero -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:09:47 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 7 Oct 2012 18:09:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=5Fsha3_was_missing_debug_?= =?utf-8?q?build_targets=2E_I_used_xxlimited=2Evcxproj_as_template=2E?= Message-ID: <3XZV5l01CXzNqX@mail.python.org> http://hg.python.org/cpython/rev/6cf6b8265e57 changeset: 79574:6cf6b8265e57 user: Christian Heimes date: Sun Oct 07 18:09:39 2012 +0200 summary: _sha3 was missing debug build targets. I used xxlimited.vcxproj as template. The project is now a copy of _multiprocessing.vcxproj with new GUID and without BaseAddress and ws2_32.lib files: PCbuild/_sha3.vcxproj | 71 ++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/PCbuild/_sha3.vcxproj b/PCbuild/_sha3.vcxproj --- a/PCbuild/_sha3.vcxproj +++ b/PCbuild/_sha3.vcxproj @@ -1,6 +1,14 @@ ? + + Debug + Win32 + + + Debug + x64 + PGInstrument Win32 @@ -47,6 +55,10 @@ NotSet true + + DynamicLibrary + NotSet + DynamicLibrary NotSet @@ -62,6 +74,10 @@ NotSet true + + DynamicLibrary + NotSet + @@ -79,6 +95,10 @@ + + + + @@ -96,9 +116,20 @@ + + + + + <_ProjectFileVersion>10.0.30319.1 + AllRules.ruleset + + + AllRules.ruleset + + AllRules.ruleset @@ -118,13 +149,22 @@ + + + %(AdditionalDependencies) + + + + + X64 + + + %(AdditionalDependencies) + + %(AdditionalDependencies) - - - - @@ -133,19 +173,11 @@ %(AdditionalDependencies) - - - - %(AdditionalDependencies) - - - - @@ -154,20 +186,12 @@ %(AdditionalDependencies) - - - - MachineX64 %(AdditionalDependencies) - - - - @@ -176,16 +200,13 @@ %(AdditionalDependencies) - - - - MachineX64 {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false @@ -194,4 +215,4 @@ - + \ No newline at end of file -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:20:19 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 7 Oct 2012 18:20:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_correct_build_configuratio?= =?utf-8?q?n_of_sha3_project_for_debug_builds?= Message-ID: <3XZVKv0ZJ2zP87@mail.python.org> http://hg.python.org/cpython/rev/8172cc8bfa6d changeset: 79575:8172cc8bfa6d user: Christian Heimes date: Sun Oct 07 18:20:07 2012 +0200 summary: correct build configuration of sha3 project for debug builds files: PCbuild/pcbuild.sln | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -613,9 +613,10 @@ {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg = Release|Win32 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|Win32.ActiveCfg = Release|Win32 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|x64.ActiveCfg = Release|x64 - {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|Win32.ActiveCfg = Release|x64 - {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|x64.ActiveCfg = Release|x64 - {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|x64.Build.0 = Release|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|Win32.ActiveCfg = Debug|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|Win32.Build.0 = Debug|Win32 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|x64.ActiveCfg = Debug|x64 + {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.Debug|x64.Build.0 = Debug|x64 {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 {254A0C05-6696-4B08-8CB2-EF7D533AEE01}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:23:04 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 18:23:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0OTAw?= =?utf-8?q?=3A_Add_aliases_for_sorting_params_for_pstat_to_follow_column_n?= =?utf-8?q?ames?= Message-ID: <3XZVP4212pzP7v@mail.python.org> http://hg.python.org/cpython/rev/69b310f7acfa changeset: 79576:69b310f7acfa branch: 2.7 parent: 79570:cc3e27b7da41 user: Andrew Svetlov date: Sun Oct 07 19:17:15 2012 +0300 summary: Issue #14900: Add aliases for sorting params for pstat to follow column names from pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -172,8 +172,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -181,6 +184,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:23:05 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 18:23:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0OTAw?= =?utf-8?q?=3A_Add_aliases_for_sorting_params_for_pstat_to_follow_column_n?= =?utf-8?q?ames?= Message-ID: <3XZVP54P9dzPKJ@mail.python.org> http://hg.python.org/cpython/rev/511a3c51731e changeset: 79577:511a3c51731e branch: 3.2 parent: 79571:410e92589164 user: Andrew Svetlov date: Sun Oct 07 19:18:39 2012 +0300 summary: Issue #14900: Add aliases for sorting params for pstat to follow column names from pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,8 +159,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -168,6 +171,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:23:06 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 18:23:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2314900=3A_Add_aliases_for_sorting_params_for_pst?= =?utf-8?q?at_to_follow_column?= Message-ID: <3XZVP66h6rzPFQ@mail.python.org> http://hg.python.org/cpython/rev/29d4ac311627 changeset: 79578:29d4ac311627 branch: 3.3 parent: 79572:fb216fee32db parent: 79577:511a3c51731e user: Andrew Svetlov date: Sun Oct 07 19:19:17 2012 +0300 summary: Merge issue #14900: Add aliases for sorting params for pstat to follow column names from pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,8 +159,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -168,6 +171,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:23:08 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 18:23:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2314900=3A_Add_aliases_for_sorting_params_f?= =?utf-8?q?or_pstat_to_follow_column?= Message-ID: <3XZVP822H0zPHq@mail.python.org> http://hg.python.org/cpython/rev/7b8b1b30e5f8 changeset: 79579:7b8b1b30e5f8 parent: 79573:bc658b6a1d4e parent: 79578:29d4ac311627 user: Andrew Svetlov date: Sun Oct 07 19:19:34 2012 +0300 summary: Merge issue #14900: Add aliases for sorting params for pstat to follow column names from pstat output. Patch by Arne Babenhauserheide. files: Lib/pstats.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,8 +159,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -168,6 +171,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:23:09 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 18:23:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge_heads?= Message-ID: <3XZVP94J3QzQSF@mail.python.org> http://hg.python.org/cpython/rev/c7c4fc4f227e changeset: 79580:c7c4fc4f227e parent: 79574:6cf6b8265e57 parent: 79579:7b8b1b30e5f8 user: Andrew Svetlov date: Sun Oct 07 19:21:24 2012 +0300 summary: merge heads files: Lib/pstats.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,8 +159,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -168,6 +171,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 18:23:10 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 18:23:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge_heads?= Message-ID: <3XZVPB721YzPFk@mail.python.org> http://hg.python.org/cpython/rev/b42457c5da14 changeset: 79581:b42457c5da14 parent: 79575:8172cc8bfa6d parent: 79580:c7c4fc4f227e user: Andrew Svetlov date: Sun Oct 07 19:22:50 2012 +0300 summary: merge heads files: Lib/pstats.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,8 +159,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -168,6 +171,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 19:31:12 2012 From: python-checkins at python.org (richard.oudkerk) Date: Sun, 7 Oct 2012 19:31:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Get_rid_of_circular_import?= =?utf-8?q?_and_eliminate_unprefixed_exported_symbols?= Message-ID: <3XZWvh4kdPzP6L@mail.python.org> http://hg.python.org/cpython/rev/fc011f1ef59e changeset: 79582:fc011f1ef59e user: Richard Oudkerk date: Sun Oct 07 18:08:47 2012 +0100 summary: Get rid of circular import and eliminate unprefixed exported symbols from _multiprocessing. files: Modules/_multiprocessing/multiprocessing.c | 21 ++------- Modules/_multiprocessing/multiprocessing.h | 6 +- Modules/_multiprocessing/semaphore.c | 14 +++--- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -10,14 +10,12 @@ #include "multiprocessing.h" -PyObject *ProcessError, *BufferTooShort; - /* * Function which raises exceptions based on error codes */ PyObject * -mp_SetError(PyObject *Type, int num) +_PyMp_SetError(PyObject *Type, int num) { switch (num) { #ifdef MS_WINDOWS @@ -159,19 +157,12 @@ if (!module) return NULL; - /* Get copy of BufferTooShort */ - temp = PyImport_ImportModule("multiprocessing"); - if (!temp) - return NULL; - BufferTooShort = PyObject_GetAttrString(temp, "BufferTooShort"); - Py_XDECREF(temp); - #if defined(MS_WINDOWS) || \ (defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)) - /* Add SemLock type to module */ - if (PyType_Ready(&SemLockType) < 0) + /* Add _PyMp_SemLock type to module */ + if (PyType_Ready(&_PyMp_SemLockType) < 0) return NULL; - Py_INCREF(&SemLockType); + Py_INCREF(&_PyMp_SemLockType); { PyObject *py_sem_value_max; /* Some systems define SEM_VALUE_MAX as an unsigned value that @@ -182,10 +173,10 @@ py_sem_value_max = PyLong_FromLong(SEM_VALUE_MAX); if (py_sem_value_max == NULL) return NULL; - PyDict_SetItemString(SemLockType.tp_dict, "SEM_VALUE_MAX", + PyDict_SetItemString(_PyMp_SemLockType.tp_dict, "SEM_VALUE_MAX", py_sem_value_max); } - PyModule_AddObject(module, "SemLock", (PyObject*)&SemLockType); + PyModule_AddObject(module, "SemLock", (PyObject*)&_PyMp_SemLockType); #endif /* Add configuration macros */ diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h --- a/Modules/_multiprocessing/multiprocessing.h +++ b/Modules/_multiprocessing/multiprocessing.h @@ -91,15 +91,13 @@ #define MP_SOCKET_ERROR (-1002) #define MP_EXCEPTION_HAS_BEEN_SET (-1003) -PyObject *mp_SetError(PyObject *Type, int num); +PyObject *_PyMp_SetError(PyObject *Type, int num); /* * Externs - not all will really exist on all platforms */ -extern PyObject *BufferTooShort; -extern PyTypeObject SemLockType; -extern PyTypeObject PipeConnectionType; +extern PyTypeObject _PyMp_SemLockType; /* * Miscellaneous diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c --- a/Modules/_multiprocessing/semaphore.c +++ b/Modules/_multiprocessing/semaphore.c @@ -193,7 +193,7 @@ #ifndef HAVE_SEM_TIMEDWAIT # define sem_timedwait(sem,deadline) sem_timedwait_save(sem,deadline,_save) -int +static int sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) { int res; @@ -444,7 +444,7 @@ failure: if (handle != SEM_FAILED) SEM_CLOSE(handle); - mp_SetError(NULL, MP_STANDARD_ERROR); + _PyMp_SetError(NULL, MP_STANDARD_ERROR); return NULL; } @@ -491,7 +491,7 @@ #else int sval; if (SEM_GETVALUE(self->handle, &sval) < 0) - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); /* some posix implementations use negative numbers to indicate the number of waiting threads */ if (sval < 0) @@ -507,16 +507,16 @@ if (sem_trywait(self->handle) < 0) { if (errno == EAGAIN) Py_RETURN_TRUE; - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); } else { if (sem_post(self->handle) < 0) - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); Py_RETURN_FALSE; } #else int sval; if (SEM_GETVALUE(self->handle, &sval) < 0) - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); return PyBool_FromLong((long)sval == 0); #endif } @@ -574,7 +574,7 @@ * Semaphore type */ -PyTypeObject SemLockType = { +PyTypeObject _PyMp_SemLockType = { PyVarObject_HEAD_INIT(NULL, 0) /* tp_name */ "_multiprocessing.SemLock", /* tp_basicsize */ sizeof(SemLockObject), -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 22:21:26 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 7 Oct 2012 22:21:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316120=3A_Use_=7Cy?= =?utf-8?q?ield_from=7C_in_stdlib=2E?= Message-ID: <3XZbh60mKgzP39@mail.python.org> http://hg.python.org/cpython/rev/70d49694786c changeset: 79583:70d49694786c user: Andrew Svetlov date: Sun Oct 07 23:21:15 2012 +0300 summary: Issue #16120: Use |yield from| in stdlib. Patch by Berker Peksag. files: Lib/pkgutil.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -455,8 +455,7 @@ if path is None: return else: - for importer in sys.meta_path: - yield importer + yield from sys.meta_path path = sys.path for item in path: yield get_importer(item) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 22:45:23 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 7 Oct 2012 22:45:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_re-add_brg=5Fendian=2Eh_to?= =?utf-8?q?_debug_issue_in_big_endian_SPARC_machine?= Message-ID: <3XZcCl3qbWzQpP@mail.python.org> http://hg.python.org/cpython/rev/aca29cde398b changeset: 79584:aca29cde398b parent: 79575:8172cc8bfa6d user: Christian Heimes date: Sun Oct 07 22:44:41 2012 +0200 summary: re-add brg_endian.h to debug issue in big endian SPARC machine files: Modules/_sha3/cleanup.py | 8 +- Modules/_sha3/keccak/KeccakF-1600-opt32.c | 2 +- Modules/_sha3/keccak/KeccakF-1600-opt64.c | 2 +- Modules/_sha3/keccak/brg_endian.h | 142 ++++++++++ Modules/_sha3/sha3module.c | 3 +- 5 files changed, 150 insertions(+), 7 deletions(-) diff --git a/Modules/_sha3/cleanup.py b/Modules/_sha3/cleanup.py --- a/Modules/_sha3/cleanup.py +++ b/Modules/_sha3/cleanup.py @@ -32,10 +32,10 @@ if line.startswith("typedef unsigned long long int"): buf.append("/* %s */\n" % line.strip()) continue - # remove #include "brg_endian.h" - if "brg_endian.h" in line: - buf.append("/* %s */\n" % line.strip()) - continue + ## remove #include "brg_endian.h" + #if "brg_endian.h" in line: + # buf.append("/* %s */\n" % line.strip()) + # continue # transform C++ comments into ANSI C comments line = CPP1.sub(r"/* \1 */", line) line = CPP2.sub(r" /* \1 */", line) diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt32.c b/Modules/_sha3/keccak/KeccakF-1600-opt32.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt32.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt32.c @@ -12,7 +12,7 @@ */ #include -/* #include "brg_endian.h" */ +#include "brg_endian.h" #include "KeccakF-1600-opt32-settings.h" #include "KeccakF-1600-interface.h" diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64.c b/Modules/_sha3/keccak/KeccakF-1600-opt64.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt64.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt64.c @@ -12,7 +12,7 @@ */ #include -/* #include "brg_endian.h" */ +#include "brg_endian.h" #include "KeccakF-1600-opt64-settings.h" #include "KeccakF-1600-interface.h" diff --git a/Modules/_sha3/keccak/brg_endian.h b/Modules/_sha3/keccak/brg_endian.h new file mode 100755 --- /dev/null +++ b/Modules/_sha3/keccak/brg_endian.h @@ -0,0 +1,142 @@ +/* + --------------------------------------------------------------------------- + Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved. + + LICENSE TERMS + + The redistribution and use of this software (with or without changes) + is allowed without the payment of fees or royalties provided that: + + 1. source code distributions include the above copyright notice, this + list of conditions and the following disclaimer; + + 2. binary distributions include the above copyright notice, this list + of conditions and the following disclaimer in their documentation; + + 3. the name of the copyright holder is not used to endorse products + built using this software without specific written permission. + + DISCLAIMER + + This software is provided 'as is' with no explicit or implied warranties + in respect of its properties, including, but not limited to, correctness + and/or fitness for purpose. + --------------------------------------------------------------------------- + Issue Date: 20/12/2007 + Changes for ARM 9/9/2010 +*/ + +#ifndef _BRG_ENDIAN_H +#define _BRG_ENDIAN_H + +#define IS_BIG_ENDIAN 4321 /* byte 0 is most significant (mc68k) */ +#define IS_LITTLE_ENDIAN 1234 /* byte 0 is least significant (i386) */ + +#if 0 +/* Include files where endian defines and byteswap functions may reside */ +#if defined( __sun ) +# include +#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) +# include +#elif defined( BSD ) && ( BSD >= 199103 ) || defined( __APPLE__ ) || \ + defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ ) +# include +#elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ ) +# if !defined( __MINGW32__ ) && !defined( _AIX ) +# include +# if !defined( __BEOS__ ) +# include +# endif +# endif +#endif +#endif + +/* Now attempt to set the define for platform byte order using any */ +/* of the four forms SYMBOL, _SYMBOL, __SYMBOL & __SYMBOL__, which */ +/* seem to encompass most endian symbol definitions */ + +#if defined( BIG_ENDIAN ) && defined( LITTLE_ENDIAN ) +# if defined( BYTE_ORDER ) && BYTE_ORDER == BIG_ENDIAN +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +# elif defined( BYTE_ORDER ) && BYTE_ORDER == LITTLE_ENDIAN +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +# endif +#elif defined( BIG_ENDIAN ) +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#elif defined( LITTLE_ENDIAN ) +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif + +#if defined( _BIG_ENDIAN ) && defined( _LITTLE_ENDIAN ) +# if defined( _BYTE_ORDER ) && _BYTE_ORDER == _BIG_ENDIAN +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +# elif defined( _BYTE_ORDER ) && _BYTE_ORDER == _LITTLE_ENDIAN +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +# endif +#elif defined( _BIG_ENDIAN ) +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#elif defined( _LITTLE_ENDIAN ) +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif + +#if defined( __BIG_ENDIAN ) && defined( __LITTLE_ENDIAN ) +# if defined( __BYTE_ORDER ) && __BYTE_ORDER == __BIG_ENDIAN +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +# elif defined( __BYTE_ORDER ) && __BYTE_ORDER == __LITTLE_ENDIAN +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +# endif +#elif defined( __BIG_ENDIAN ) +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#elif defined( __LITTLE_ENDIAN ) +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif + +#if defined( __BIG_ENDIAN__ ) && defined( __LITTLE_ENDIAN__ ) +# if defined( __BYTE_ORDER__ ) && __BYTE_ORDER__ == __BIG_ENDIAN__ +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +# elif defined( __BYTE_ORDER__ ) && __BYTE_ORDER__ == __LITTLE_ENDIAN__ +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +# endif +#elif defined( __BIG_ENDIAN__ ) +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#elif defined( __LITTLE_ENDIAN__ ) +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif + +/* if the platform byte order could not be determined, then try to */ +/* set this define using common machine defines */ +#if !defined(PLATFORM_BYTE_ORDER) + +#if defined( __alpha__ ) || defined( __alpha ) || defined( i386 ) || \ + defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \ + defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \ + defined( vax ) || defined( vms ) || defined( VMS ) || \ + defined( __VMS ) || defined( _M_X64 ) +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN + +#elif defined( AMIGA ) || defined( applec ) || defined( __AS400__ ) || \ + defined( _CRAY ) || defined( __hppa ) || defined( __hp9000 ) || \ + defined( ibm370 ) || defined( mc68000 ) || defined( m68k ) || \ + defined( __MRC__ ) || defined( __MVS__ ) || defined( __MWERKS__ ) || \ + defined( sparc ) || defined( __sparc) || defined( SYMANTEC_C ) || \ + defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM ) || \ + defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN + +#elif defined(__arm__) +# ifdef __BIG_ENDIAN +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +# else +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +# endif +#elif 1 /* **** EDIT HERE IF NECESSARY **** */ +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#elif 0 /* **** EDIT HERE IF NECESSARY **** */ +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#else +# error Please edit lines 132 or 134 in brg_endian.h to set the platform byte order +#endif + +#endif + +#endif diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -116,10 +116,11 @@ #define UseInterleaveTables #endif -/* replacement for brg_endian.h */ +/* replacement for brg_endian.h #define IS_BIG_ENDIAN BIG_ENDIAN #define IS_LITTLE_ENDIAN LITTLE_ENDIAN #define PLATFORM_BYTE_ORDER BYTE_ORDER +*/ /* inline all Keccak dependencies */ #include "keccak/KeccakNISTInterface.h" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 22:45:25 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 7 Oct 2012 22:45:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge?= Message-ID: <3XZcCn09M3zQpP@mail.python.org> http://hg.python.org/cpython/rev/8033e82e2640 changeset: 79585:8033e82e2640 parent: 79584:aca29cde398b parent: 79583:70d49694786c user: Christian Heimes date: Sun Oct 07 22:45:14 2012 +0200 summary: merge files: Lib/pkgutil.py | 3 +- Lib/pstats.py | 4 + Modules/_multiprocessing/multiprocessing.c | 21 ++------- Modules/_multiprocessing/multiprocessing.h | 6 +- Modules/_multiprocessing/semaphore.c | 14 +++--- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -455,8 +455,7 @@ if path is None: return else: - for importer in sys.meta_path: - yield importer + yield from sys.meta_path path = sys.path for item in path: yield get_importer(item) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,8 +159,11 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), @@ -168,6 +171,7 @@ "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -10,14 +10,12 @@ #include "multiprocessing.h" -PyObject *ProcessError, *BufferTooShort; - /* * Function which raises exceptions based on error codes */ PyObject * -mp_SetError(PyObject *Type, int num) +_PyMp_SetError(PyObject *Type, int num) { switch (num) { #ifdef MS_WINDOWS @@ -159,19 +157,12 @@ if (!module) return NULL; - /* Get copy of BufferTooShort */ - temp = PyImport_ImportModule("multiprocessing"); - if (!temp) - return NULL; - BufferTooShort = PyObject_GetAttrString(temp, "BufferTooShort"); - Py_XDECREF(temp); - #if defined(MS_WINDOWS) || \ (defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)) - /* Add SemLock type to module */ - if (PyType_Ready(&SemLockType) < 0) + /* Add _PyMp_SemLock type to module */ + if (PyType_Ready(&_PyMp_SemLockType) < 0) return NULL; - Py_INCREF(&SemLockType); + Py_INCREF(&_PyMp_SemLockType); { PyObject *py_sem_value_max; /* Some systems define SEM_VALUE_MAX as an unsigned value that @@ -182,10 +173,10 @@ py_sem_value_max = PyLong_FromLong(SEM_VALUE_MAX); if (py_sem_value_max == NULL) return NULL; - PyDict_SetItemString(SemLockType.tp_dict, "SEM_VALUE_MAX", + PyDict_SetItemString(_PyMp_SemLockType.tp_dict, "SEM_VALUE_MAX", py_sem_value_max); } - PyModule_AddObject(module, "SemLock", (PyObject*)&SemLockType); + PyModule_AddObject(module, "SemLock", (PyObject*)&_PyMp_SemLockType); #endif /* Add configuration macros */ diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h --- a/Modules/_multiprocessing/multiprocessing.h +++ b/Modules/_multiprocessing/multiprocessing.h @@ -91,15 +91,13 @@ #define MP_SOCKET_ERROR (-1002) #define MP_EXCEPTION_HAS_BEEN_SET (-1003) -PyObject *mp_SetError(PyObject *Type, int num); +PyObject *_PyMp_SetError(PyObject *Type, int num); /* * Externs - not all will really exist on all platforms */ -extern PyObject *BufferTooShort; -extern PyTypeObject SemLockType; -extern PyTypeObject PipeConnectionType; +extern PyTypeObject _PyMp_SemLockType; /* * Miscellaneous diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c --- a/Modules/_multiprocessing/semaphore.c +++ b/Modules/_multiprocessing/semaphore.c @@ -193,7 +193,7 @@ #ifndef HAVE_SEM_TIMEDWAIT # define sem_timedwait(sem,deadline) sem_timedwait_save(sem,deadline,_save) -int +static int sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) { int res; @@ -444,7 +444,7 @@ failure: if (handle != SEM_FAILED) SEM_CLOSE(handle); - mp_SetError(NULL, MP_STANDARD_ERROR); + _PyMp_SetError(NULL, MP_STANDARD_ERROR); return NULL; } @@ -491,7 +491,7 @@ #else int sval; if (SEM_GETVALUE(self->handle, &sval) < 0) - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); /* some posix implementations use negative numbers to indicate the number of waiting threads */ if (sval < 0) @@ -507,16 +507,16 @@ if (sem_trywait(self->handle) < 0) { if (errno == EAGAIN) Py_RETURN_TRUE; - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); } else { if (sem_post(self->handle) < 0) - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); Py_RETURN_FALSE; } #else int sval; if (SEM_GETVALUE(self->handle, &sval) < 0) - return mp_SetError(NULL, MP_STANDARD_ERROR); + return _PyMp_SetError(NULL, MP_STANDARD_ERROR); return PyBool_FromLong((long)sval == 0); #endif } @@ -574,7 +574,7 @@ * Semaphore type */ -PyTypeObject SemLockType = { +PyTypeObject _PyMp_SemLockType = { PyVarObject_HEAD_INIT(NULL, 0) /* tp_name */ "_multiprocessing.SemLock", /* tp_basicsize */ sizeof(SemLockObject), -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 7 23:40:44 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 7 Oct 2012 23:40:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_brg=5Fendian=2Eh_is_back_a?= =?utf-8?q?gain?= Message-ID: <3XZdRc6lCmzNtj@mail.python.org> http://hg.python.org/cpython/rev/d82a978dbb46 changeset: 79586:d82a978dbb46 user: Christian Heimes date: Sun Oct 07 23:38:44 2012 +0200 summary: brg_endian.h is back again files: Modules/_sha3/sha3module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -27,7 +27,6 @@ * - C++ comments are converted to ANSI C comments. * - All functions and globals are declared static. * - The typedef for UINT64 is commented out. - * - brg_endian.h is removed. * - KeccakF-1600-opt[32|64]-settings.h are commented out * - Some unused functions are commented out to silence compiler warnings. * -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 00:05:31 2012 From: python-checkins at python.org (chris.jerdonek) Date: Mon, 8 Oct 2012 00:05:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0Nzgz?= =?utf-8?q?=3A_Improve_int=28=29_docstring_and_also_str=28=29=2C_range=28?= =?utf-8?b?KSwgYW5kIHNsaWNlKCku?= Message-ID: <3XZf0C4DQWzQnp@mail.python.org> http://hg.python.org/cpython/rev/e4598364ea29 changeset: 79587:e4598364ea29 branch: 3.2 parent: 79577:511a3c51731e user: Chris Jerdonek date: Sun Oct 07 14:48:36 2012 -0700 summary: Issue #14783: Improve int() docstring and also str(), range(), and slice(). This commit rewrites the docstring for int() to incorporate the documentation changes made in issue #16036. It also switches the docstrings for int(), str(), range(), and slice() to use multi-line signatures. files: Doc/library/functions.rst | 3 ++- Misc/NEWS | 3 +++ Objects/longobject.c | 19 +++++++++++++------ Objects/rangeobject.c | 3 ++- Objects/sliceobject.c | 3 ++- Objects/unicodeobject.c | 3 ++- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1236,7 +1236,8 @@ standard type hierarchy in :ref:`types`. -.. function:: str([object[, encoding[, errors]]]) +.. function:: str(object='') + str(object[, encoding[, errors]]) Return a string version of an object, using one of the following modes: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14783: Improve int() docstring and switch docstrings for str(), + range(), and slice() to use multi-line signatures. + - Issue #15379: Fix passing of non-BMP characters as integers for the charmap decoder (already working as unicode strings). Patch by Serhiy Storchaka. diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -4703,13 +4703,20 @@ }; PyDoc_STRVAR(long_doc, -"int(x[, base]) -> integer\n\ +"int(x=0) -> integer\n\ +int(x, base=10) -> integer\n\ \n\ -Convert a string or number to an integer, if possible. A floating\n\ -point argument will be truncated towards zero (this does not include a\n\ -string representation of a floating point number!) When converting a\n\ -string, use the optional base. It is an error to supply a base when\n\ -converting a non-string."); +Convert a number or string to an integer, or return 0 if no arguments\n\ +are given. If x is a number, return x.__int__(). For floating point\n\ +numbers, this truncates towards zero.\n\ +\n\ +If x is not a number or if base is given, then x must be a string,\n\ +bytes, or bytearray instance representing an integer literal in the\n\ +given base. The literal can be preceded by '+' or '-' and be surrounded\n\ +by whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\n\ +Base 0 means to interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4"); static PyNumberMethods long_as_number = { (binaryfunc)long_add, /*nb_add*/ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -135,7 +135,8 @@ } PyDoc_STRVAR(range_doc, -"range([start,] stop[, step]) -> range object\n\ +"range(stop) -> range object\n\ +range(start, stop[, step]) -> range object\n\ \n\ Returns a virtual sequence of numbers from start to stop by step."); diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -221,7 +221,8 @@ } PyDoc_STRVAR(slice_doc, -"slice([start,] stop[, step])\n\ +"slice(stop)\n\ +slice(start, stop[, step])\n\ \n\ Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9986,7 +9986,8 @@ } PyDoc_STRVAR(unicode_doc, - "str(object[, encoding[, errors]]) -> str\n\ +"str(object='') -> str\n\ +str(bytes_or_buffer[, encoding[, errors]]) -> str\n\ \n\ Create a new string object from the given object. If encoding or\n\ errors is specified, then the object must expose a data buffer\n\ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 00:05:33 2012 From: python-checkins at python.org (chris.jerdonek) Date: Mon, 8 Oct 2012 00:05:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2314783=3A_Merge_changes_from_3=2E2=2E?= Message-ID: <3XZf0F1RQFzQr9@mail.python.org> http://hg.python.org/cpython/rev/365da47a6dc1 changeset: 79588:365da47a6dc1 branch: 3.3 parent: 79578:29d4ac311627 parent: 79587:e4598364ea29 user: Chris Jerdonek date: Sun Oct 07 14:56:27 2012 -0700 summary: Issue #14783: Merge changes from 3.2. files: Doc/library/functions.rst | 3 ++- Misc/NEWS | 3 +++ Objects/longobject.c | 19 +++++++++++++------ Objects/rangeobject.c | 5 +++-- Objects/sliceobject.c | 3 ++- Objects/unicodeobject.c | 3 ++- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1203,7 +1203,8 @@ .. _func-str: -.. function:: str([object[, encoding[, errors]]]) +.. function:: str(object='') + str(object[, encoding[, errors]]) Return a string version of an object, using one of the following modes: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #14783: Improve int() docstring and switch docstrings for str(), + range(), and slice() to use multi-line signatures. + - Issue #15379: Fix passing of non-BMP characters as integers for the charmap decoder (already working as unicode strings). Patch by Serhiy Storchaka. diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -4848,13 +4848,20 @@ }; PyDoc_STRVAR(long_doc, -"int(x[, base]) -> integer\n\ +"int(x=0) -> integer\n\ +int(x, base=10) -> integer\n\ \n\ -Convert a string or number to an integer, if possible. A floating\n\ -point argument will be truncated towards zero (this does not include a\n\ -string representation of a floating point number!) When converting a\n\ -string, use the optional base. It is an error to supply a base when\n\ -converting a non-string."); +Convert a number or string to an integer, or return 0 if no arguments\n\ +are given. If x is a number, return x.__int__(). For floating point\n\ +numbers, this truncates towards zero.\n\ +\n\ +If x is not a number or if base is given, then x must be a string,\n\ +bytes, or bytearray instance representing an integer literal in the\n\ +given base. The literal can be preceded by '+' or '-' and be surrounded\n\ +by whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\n\ +Base 0 means to interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4"); static PyNumberMethods long_as_number = { (binaryfunc)long_add, /*nb_add*/ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -136,7 +136,8 @@ } PyDoc_STRVAR(range_doc, -"range([start,] stop[, step]) -> range object\n\ +"range(stop) -> range object\n\ +range(start, stop[, step]) -> range object\n\ \n\ Returns a virtual sequence of numbers from start to stop by step."); @@ -969,7 +970,7 @@ { PyObject *start=NULL, *stop=NULL, *step=NULL; PyObject *range; - + /* create a range object for pickling */ start = PyLong_FromLong(r->start); if (start == NULL) diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -269,7 +269,8 @@ } PyDoc_STRVAR(slice_doc, -"slice([start,] stop[, step])\n\ +"slice(stop)\n\ +slice(start, stop[, step])\n\ \n\ Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14074,7 +14074,8 @@ } PyDoc_STRVAR(unicode_doc, - "str(object[, encoding[, errors]]) -> str\n\ +"str(object='') -> str\n\ +str(bytes_or_buffer[, encoding[, errors]]) -> str\n\ \n\ Create a new string object from the given object. If encoding or\n\ errors is specified, then the object must expose a data buffer\n\ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 00:05:34 2012 From: python-checkins at python.org (chris.jerdonek) Date: Mon, 8 Oct 2012 00:05:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2314783=3A_Merge_changes_from_3=2E3=2E?= Message-ID: <3XZf0G5mFWzQrX@mail.python.org> http://hg.python.org/cpython/rev/3773c98d9da8 changeset: 79589:3773c98d9da8 parent: 79586:d82a978dbb46 parent: 79588:365da47a6dc1 user: Chris Jerdonek date: Sun Oct 07 15:02:16 2012 -0700 summary: Issue #14783: Merge changes from 3.3. files: Doc/library/functions.rst | 3 ++- Misc/NEWS | 3 +++ Objects/longobject.c | 19 +++++++++++++------ Objects/rangeobject.c | 5 +++-- Objects/sliceobject.c | 3 ++- Objects/unicodeobject.c | 3 ++- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1203,7 +1203,8 @@ .. _func-str: -.. function:: str([object[, encoding[, errors]]]) +.. function:: str(object='') + str(object[, encoding[, errors]]) Return a string version of an object, using one of the following modes: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14783: Improve int() docstring and switch docstrings for str(), + range(), and slice() to use multi-line signatures. + - Upgrade Unicode data (UCD) to version 6.2. - Issue #15379: Fix passing of non-BMP characters as integers for the charmap diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -4847,13 +4847,20 @@ }; PyDoc_STRVAR(long_doc, -"int(x[, base]) -> integer\n\ +"int(x=0) -> integer\n\ +int(x, base=10) -> integer\n\ \n\ -Convert a string or number to an integer, if possible. A floating\n\ -point argument will be truncated towards zero (this does not include a\n\ -string representation of a floating point number!) When converting a\n\ -string, use the optional base. It is an error to supply a base when\n\ -converting a non-string."); +Convert a number or string to an integer, or return 0 if no arguments\n\ +are given. If x is a number, return x.__int__(). For floating point\n\ +numbers, this truncates towards zero.\n\ +\n\ +If x is not a number or if base is given, then x must be a string,\n\ +bytes, or bytearray instance representing an integer literal in the\n\ +given base. The literal can be preceded by '+' or '-' and be surrounded\n\ +by whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\n\ +Base 0 means to interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4"); static PyNumberMethods long_as_number = { (binaryfunc)long_add, /*nb_add*/ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -136,7 +136,8 @@ } PyDoc_STRVAR(range_doc, -"range([start,] stop[, step]) -> range object\n\ +"range(stop) -> range object\n\ +range(start, stop[, step]) -> range object\n\ \n\ Returns a virtual sequence of numbers from start to stop by step."); @@ -969,7 +970,7 @@ { PyObject *start=NULL, *stop=NULL, *step=NULL; PyObject *range; - + /* create a range object for pickling */ start = PyLong_FromLong(r->start); if (start == NULL) diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -269,7 +269,8 @@ } PyDoc_STRVAR(slice_doc, -"slice([start,] stop[, step])\n\ +"slice(stop)\n\ +slice(start, stop[, step])\n\ \n\ Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14133,7 +14133,8 @@ } PyDoc_STRVAR(unicode_doc, - "str(object[, encoding[, errors]]) -> str\n\ +"str(object='') -> str\n\ +str(bytes_or_buffer[, encoding[, errors]]) -> str\n\ \n\ Create a new string object from the given object. If encoding or\n\ errors is specified, then the object must expose a data buffer\n\ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 05:40:40 2012 From: python-checkins at python.org (chris.jerdonek) Date: Mon, 8 Oct 2012 05:40:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0Nzgz?= =?utf-8?q?=3A_Backport_changes_from_3=2E2=2E?= Message-ID: <3XZnQw627zzP87@mail.python.org> http://hg.python.org/cpython/rev/3b484f53f91b changeset: 79590:3b484f53f91b branch: 2.7 parent: 79576:69b310f7acfa user: Chris Jerdonek date: Sun Oct 07 20:37:54 2012 -0700 summary: Issue #14783: Backport changes from 3.2. files: Doc/library/functions.rst | 8 +++++--- Misc/NEWS | 3 +++ Objects/intobject.c | 21 +++++++++++++-------- Objects/longobject.c | 18 ++++++++++++------ Objects/rangeobject.c | 3 ++- Objects/sliceobject.c | 3 ++- Objects/stringobject.c | 2 +- Objects/unicodeobject.c | 7 ++++--- Python/bltinmodule.c | 3 ++- 9 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -733,7 +733,8 @@ affect the values of local and free variables used by the interpreter. -.. function:: long([x[, base]]) +.. function:: long(x=0) + long(x, base=10) Convert a string or number to a long integer. If the argument is a string, it must contain a possibly signed number of arbitrary size, possibly embedded in @@ -1318,7 +1319,7 @@ Function decorator syntax added. -.. function:: str([object]) +.. function:: str(object='') Return a string containing a nicely printable representation of an object. For strings, this returns the string itself. The difference with ``repr(object)`` @@ -1463,7 +1464,8 @@ .. versionadded:: 2.0 -.. function:: unicode([object[, encoding [, errors]]]) +.. function:: unicode(object='') + unicode(object[, encoding [, errors]]) Return the Unicode string version of *object* using one of the following modes: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #14783: Improve int() and long() docstrings and switch docstrings for + unicode(), slice(), range(), and xrange() to use multi-line signatures. + - Issue #16030: Fix overflow bug in computing the `repr` of an xrange object with large start, step or length. diff --git a/Objects/intobject.c b/Objects/intobject.c --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -1334,15 +1334,20 @@ }; PyDoc_STRVAR(int_doc, -"int(x[, base]) -> integer\n\ +"int(x=0) -> int or long\n\ +int(x, base=10) -> int or long\n\ \n\ -Convert a string or number to an integer, if possible. A floating point\n\ -argument will be truncated towards zero (this does not include a string\n\ -representation of a floating point number!) When converting a string, use\n\ -the optional base. It is an error to supply a base when converting a\n\ -non-string. If base is zero, the proper base is guessed based on the\n\ -string content. If the argument is outside the integer range a\n\ -long object will be returned instead."); +Convert a number or string to an integer, or return 0 if no arguments\n\ +are given. If x is floating point, the conversion truncates towards zero.\n\ +If x is outside the integer range, the function returns a long instead.\n\ +\n\ +If x is not a number or if base is given, then x must be a string or\n\ +Unicode object representing an integer literal in the given base. The\n\ +literal can be preceded by '+' or '-' and be surrounded by whitespace.\n\ +The base defaults to 10. Valid bases are 0 and 2-36. Base 0 means to\n\ +interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4"); static PyNumberMethods int_as_number = { (binaryfunc)int_add, /*nb_add*/ diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -4221,13 +4221,19 @@ }; PyDoc_STRVAR(long_doc, -"long(x[, base]) -> integer\n\ +"long(x=0) -> long\n\ +long(x, base=10) -> long\n\ \n\ -Convert a string or number to a long integer, if possible. A floating\n\ -point argument will be truncated towards zero (this does not include a\n\ -string representation of a floating point number!) When converting a\n\ -string, use the optional base. It is an error to supply a base when\n\ -converting a non-string."); +Convert a number or string to a long integer, or return 0L if no arguments\n\ +are given. If x is floating point, the conversion truncates towards zero.\n\ +\n\ +If x is not a number or if base is given, then x must be a string or\n\ +Unicode object representing an integer literal in the given base. The\n\ +literal can be preceded by '+' or '-' and be surrounded by whitespace.\n\ +The base defaults to 10. Valid bases are 0 and 2-36. Base 0 means to\n\ +interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4L"); static PyNumberMethods long_as_number = { (binaryfunc)long_add, /*nb_add*/ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -104,7 +104,8 @@ } PyDoc_STRVAR(range_doc, -"xrange([start,] stop[, step]) -> xrange object\n\ +"xrange(stop) -> xrange object\n\ +xrange(start, stop[, step]) -> xrange object\n\ \n\ Like range(), but instead of returning a list, returns an object that\n\ generates the numbers in the range on demand. For looping, this is \n\ diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -211,7 +211,8 @@ } PyDoc_STRVAR(slice_doc, -"slice([start,] stop[, step])\n\ +"slice(stop)\n\ +slice(start, stop[, step])\n\ \n\ Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); diff --git a/Objects/stringobject.c b/Objects/stringobject.c --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -3799,7 +3799,7 @@ }; PyDoc_STRVAR(string_doc, -"str(object) -> string\n\ +"str(object='') -> string\n\ \n\ Return a nice string representation of the object.\n\ If the argument is a string, the return value is the same object."); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1861,7 +1861,7 @@ illegal prefix. See RFC 3629 for details */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00-0F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -2217,7 +2217,7 @@ #endif PyObject *errorHandler = NULL; PyObject *exc = NULL; - + q = (unsigned char *)s; e = q + size; @@ -8759,7 +8759,8 @@ } PyDoc_STRVAR(unicode_doc, - "unicode(string [, encoding[, errors]]) -> object\n\ + "unicode(object='') -> unicode object\n\ +unicode(string[, encoding[, errors]]) -> unicode object\n\ \n\ Create a new Unicode object from the given encoded string.\n\ encoding defaults to the current default string encoding.\n\ diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2004,7 +2004,8 @@ } PyDoc_STRVAR(range_doc, -"range([start,] stop[, step]) -> list of integers\n\ +"range(stop) -> list of integers\n\ +range(start, stop[, step]) -> list of integers\n\ \n\ Return a list containing an arithmetic progression of integers.\n\ range(i, j) returns [i, i+1, i+2, ..., j-1]; start (!) defaults to 0.\n\ -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Mon Oct 8 05:59:50 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Mon, 08 Oct 2012 05:59:50 +0200 Subject: [Python-checkins] Daily reference leaks (3773c98d9da8): sum=2 Message-ID: results for 3773c98d9da8 on branch "default" -------------------------------------------- test_dbm leaked [2, 0, 0] references, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogTRMdSG', '-x'] From python-checkins at python.org Mon Oct 8 07:48:39 2012 From: python-checkins at python.org (hynek.schlawack) Date: Mon, 8 Oct 2012 07:48:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzEzNDk4OiBDbGFy?= =?utf-8?q?ify_docs_of_os=2Emakedirs=28=29=27s_exist=5Fok_argument=2E?= Message-ID: <3XZrGb5dF7zQj5@mail.python.org> http://hg.python.org/cpython/rev/88a7b9c3b6c0 changeset: 79591:88a7b9c3b6c0 branch: 3.2 parent: 79587:e4598364ea29 user: Hynek Schlawack date: Sun Oct 07 18:04:38 2012 +0200 summary: #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with great native-speaker help from R. David Murray. files: Doc/library/os.rst | 19 +++++++++++-------- Misc/NEWS | 3 +++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1183,18 +1183,21 @@ single: UNC paths; and os.makedirs() Recursive directory creation function. Like :func:`mkdir`, but makes all - intermediate-level directories needed to contain the leaf directory. If - the target directory with the same mode as specified already exists, - raises an :exc:`OSError` exception if *exist_ok* is False, otherwise no - exception is raised. If the directory cannot be created in other cases, - raises an :exc:`OSError` exception. The default *mode* is ``0o777`` (octal). - On some systems, *mode* is ignored. Where it is used, the current umask - value is first masked out. + intermediate-level directories needed to contain the leaf directory. + + The default *mode* is ``0o777`` (octal). On some systems, *mode* is + ignored. Where it is used, the current umask value is first masked out. + + If *exists_ok* is ``False`` (the default), an :exc:`OSError` is raised if + the target directory already exists. If *exists_ok* is ``True`` an + :exc:`OSError` is still raised if the umask-masked *mode* is different from + the existing mode, on systems where the mode is used. :exc:`OSError` will + also be raised if the directory creation fails. .. note:: :func:`makedirs` will become confused if the path elements to create - include :data:`pardir`. + include :data:`pardir` (eg. ".." on UNIX systems). This function handles UNC paths correctly. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -609,6 +609,9 @@ Documentation ------------- +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + - Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd argument. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 07:48:41 2012 From: python-checkins at python.org (hynek.schlawack) Date: Mon, 8 Oct 2012 07:48:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_3=2E2?= Message-ID: <3XZrGd1D4PzQkc@mail.python.org> http://hg.python.org/cpython/rev/ef183e71268a changeset: 79592:ef183e71268a branch: 3.3 parent: 79588:365da47a6dc1 parent: 79591:88a7b9c3b6c0 user: Hynek Schlawack date: Mon Oct 08 07:44:54 2012 +0200 summary: Merge 3.2 files: Doc/library/os.rst | 19 +++++++++++-------- Misc/NEWS | 3 +++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1555,18 +1555,21 @@ single: UNC paths; and os.makedirs() Recursive directory creation function. Like :func:`mkdir`, but makes all - intermediate-level directories needed to contain the leaf directory. If - the target directory with the same mode as specified already exists, - raises an :exc:`OSError` exception if *exist_ok* is False, otherwise no - exception is raised. If the directory cannot be created in other cases, - raises an :exc:`OSError` exception. The default *mode* is ``0o777`` (octal). - On some systems, *mode* is ignored. Where it is used, the current umask - value is first masked out. + intermediate-level directories needed to contain the leaf directory. + + The default *mode* is ``0o777`` (octal). On some systems, *mode* is + ignored. Where it is used, the current umask value is first masked out. + + If *exists_ok* is ``False`` (the default), an :exc:`OSError` is raised if + the target directory already exists. If *exists_ok* is ``True`` an + :exc:`OSError` is still raised if the umask-masked *mode* is different from + the existing mode, on systems where the mode is used. :exc:`OSError` will + also be raised if the directory creation fails. .. note:: :func:`makedirs` will become confused if the path elements to create - include :data:`pardir`. + include :data:`pardir` (eg. ".." on UNIX systems). This function handles UNC paths correctly. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4206,6 +4206,9 @@ Documentation ------------- +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + - Issues #13491 and #13995: Fix many errors in sqlite3 documentation. Initial patch for #13491 by Johannes Vogel. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 07:48:42 2012 From: python-checkins at python.org (hynek.schlawack) Date: Mon, 8 Oct 2012 07:48:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4z?= Message-ID: <3XZrGf3lf5zQnp@mail.python.org> http://hg.python.org/cpython/rev/0d41a1b4c4fe changeset: 79593:0d41a1b4c4fe parent: 79589:3773c98d9da8 parent: 79592:ef183e71268a user: Hynek Schlawack date: Mon Oct 08 07:46:11 2012 +0200 summary: Merge 3.3 files: Doc/library/os.rst | 19 +++++++++++-------- Misc/NEWS | 3 +++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1555,18 +1555,21 @@ single: UNC paths; and os.makedirs() Recursive directory creation function. Like :func:`mkdir`, but makes all - intermediate-level directories needed to contain the leaf directory. If - the target directory with the same mode as specified already exists, - raises an :exc:`OSError` exception if *exist_ok* is False, otherwise no - exception is raised. If the directory cannot be created in other cases, - raises an :exc:`OSError` exception. The default *mode* is ``0o777`` (octal). - On some systems, *mode* is ignored. Where it is used, the current umask - value is first masked out. + intermediate-level directories needed to contain the leaf directory. + + The default *mode* is ``0o777`` (octal). On some systems, *mode* is + ignored. Where it is used, the current umask value is first masked out. + + If *exists_ok* is ``False`` (the default), an :exc:`OSError` is raised if + the target directory already exists. If *exists_ok* is ``True`` an + :exc:`OSError` is still raised if the umask-masked *mode* is different from + the existing mode, on systems where the mode is used. :exc:`OSError` will + also be raised if the directory creation fails. .. note:: :func:`makedirs` will become confused if the path elements to create - include :data:`pardir`. + include :data:`pardir` (eg. ".." on UNIX systems). This function handles UNC paths correctly. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -152,6 +152,9 @@ Documentation ------------- +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + - Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd argument. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 14:23:37 2012 From: python-checkins at python.org (richard.oudkerk) Date: Mon, 8 Oct 2012 14:23:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbjogTWFrZSBfX21wX21haW5fXyBh?= =?utf-8?q?n_alias_for_=5F=5Fmain=5F=5F_in_all_processes_to_simplify?= Message-ID: <3Xb12K0YckzQXD@mail.python.org> http://hg.python.org/cpython/rev/22417bcd57f3 changeset: 79594:22417bcd57f3 user: Richard Oudkerk date: Mon Oct 08 13:07:00 2012 +0100 summary: Make __mp_main__ an alias for __main__ in all processes to simplify pickling of classes defined in main module. files: Lib/multiprocessing/__init__.py | 7 ++++++ Lib/multiprocessing/forking.py | 22 +++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py --- a/Lib/multiprocessing/__init__.py +++ b/Lib/multiprocessing/__init__.py @@ -40,6 +40,13 @@ from multiprocessing.util import SUBDEBUG, SUBWARNING # +# Alias for main module -- will be reset by bootstrapping child processes +# + +if '__main__' in sys.modules: + sys.modules['__mp_main__'] = sys.modules['__main__'] + +# # Exceptions # diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py --- a/Lib/multiprocessing/forking.py +++ b/Lib/multiprocessing/forking.py @@ -441,27 +441,17 @@ dirs = [os.path.dirname(main_path)] assert main_name not in sys.modules, main_name + sys.modules.pop('__mp_main__', None) file, path_name, etc = imp.find_module(main_name, dirs) try: - # We would like to do "imp.load_module('__main__', ...)" - # here. However, that would cause 'if __name__ == - # "__main__"' clauses to be executed. + # We should not do 'imp.load_module("__main__", ...)' + # since that would execute 'if __name__ == "__main__"' + # clauses, potentially causing a psuedo fork bomb. main_module = imp.load_module( - '__parents_main__', file, path_name, etc + '__mp_main__', file, path_name, etc ) finally: if file: file.close() - sys.modules['__main__'] = main_module - main_module.__name__ = '__main__' - - # Try to make the potentially picklable objects in - # sys.modules['__main__'] realize they are in the main - # module -- somewhat ugly. - for obj in list(main_module.__dict__.values()): - try: - if obj.__module__ == '__parents_main__': - obj.__module__ = '__main__' - except Exception: - pass + sys.modules['__main__'] = sys.modules['__mp_main__'] = main_module -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 15:59:17 2012 From: python-checkins at python.org (richard.oudkerk) Date: Mon, 8 Oct 2012 15:59:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_setUpClass=28=29_and_t?= =?utf-8?q?earDownClass=28=29_in_test=5Fmultiprocessing=2E?= Message-ID: <3Xb38j2kx4zQqP@mail.python.org> http://hg.python.org/cpython/rev/dd5e98ddcd39 changeset: 79595:dd5e98ddcd39 user: Richard Oudkerk date: Mon Oct 08 14:56:24 2012 +0100 summary: Use setUpClass() and tearDownClass() in test_multiprocessing. Each manager test class now uses a separate manager. Also, process pools are no longer created before starting any tests. Note that warnings are written if the manager for a test case still has live objects when it is shutdown. This is true for a few test cases which fail to wait for all child processes to end. files: Lib/test/test_multiprocessing.py | 172 +++++++++--------- 1 files changed, 87 insertions(+), 85 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -19,6 +19,7 @@ import random import logging import struct +import operator import test.support import test.script_helper @@ -1617,6 +1618,18 @@ class _TestPool(BaseTestCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.pool = cls.Pool(4) + + @classmethod + def tearDownClass(cls): + cls.pool.terminate() + cls.pool.join() + cls.pool = None + super().tearDownClass() + def test_apply(self): papply = self.pool.apply self.assertEqual(papply(sqr, (5,)), sqr(5)) @@ -1691,15 +1704,6 @@ p.join() def test_terminate(self): - if self.TYPE == 'manager': - # On Unix a forked process increfs each shared object to - # which its parent process held a reference. If the - # forked process gets terminated then there is likely to - # be a reference leak. So to prevent - # _TestZZZNumberOfObjects from failing we skip this test - # when using a manager. - return - result = self.pool.map_async( time.sleep, [0.1 for i in range(10000)], chunksize=1 ) @@ -1821,35 +1825,6 @@ for (j, res) in enumerate(results): self.assertEqual(res.get(), sqr(j)) - -# -# Test that manager has expected number of shared objects left -# - -class _TestZZZNumberOfObjects(BaseTestCase): - # Because test cases are sorted alphabetically, this one will get - # run after all the other tests for the manager. It tests that - # there have been no "reference leaks" for the manager's shared - # objects. Note the comment in _TestPool.test_terminate(). - - # If some other test using ManagerMixin.manager fails, then the - # raised exception may keep alive a frame which holds a reference - # to a managed object. This will cause test_number_of_objects to - # also fail. - ALLOWED_TYPES = ('manager',) - - def test_number_of_objects(self): - EXPECTED_NUMBER = 1 # the pool object is still alive - multiprocessing.active_children() # discard dead process objs - gc.collect() # do garbage collection - refs = self.manager._number_of_objects() - debug_info = self.manager._debug_info() - if refs != EXPECTED_NUMBER: - print(self.manager._debug_info()) - print(debug_info) - - self.assertEqual(refs, EXPECTED_NUMBER) - # # Test of creating a customized manager class # @@ -2886,15 +2861,6 @@ # Functions used to create test cases from the base ones in this module # -def get_attributes(Source, names): - d = {} - for name in names: - obj = getattr(Source, name) - if type(obj) == type(get_attributes): - obj = staticmethod(obj) - d[name] = obj - return d - def create_test_cases(Mixin, type): result = {} glob = globals() @@ -2907,10 +2873,10 @@ assert set(base.ALLOWED_TYPES) <= ALL_TYPES, set(base.ALLOWED_TYPES) if type in base.ALLOWED_TYPES: newname = 'With' + Type + name[1:] - class Temp(base, unittest.TestCase, Mixin): + class Temp(base, Mixin, unittest.TestCase): pass result[newname] = Temp - Temp.__name__ = newname + Temp.__name__ = Temp.__qualname__ = newname Temp.__module__ = Mixin.__module__ return result @@ -2921,12 +2887,24 @@ class ProcessesMixin(object): TYPE = 'processes' Process = multiprocessing.Process - locals().update(get_attributes(multiprocessing, ( - 'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', - 'Condition', 'Event', 'Barrier', 'Value', 'Array', 'RawValue', - 'RawArray', 'current_process', 'active_children', 'Pipe', - 'connection', 'JoinableQueue', 'Pool' - ))) + connection = multiprocessing.connection + current_process = staticmethod(multiprocessing.current_process) + active_children = staticmethod(multiprocessing.active_children) + Pool = staticmethod(multiprocessing.Pool) + Pipe = staticmethod(multiprocessing.Pipe) + Queue = staticmethod(multiprocessing.Queue) + JoinableQueue = staticmethod(multiprocessing.JoinableQueue) + Lock = staticmethod(multiprocessing.Lock) + RLock = staticmethod(multiprocessing.RLock) + Semaphore = staticmethod(multiprocessing.Semaphore) + BoundedSemaphore = staticmethod(multiprocessing.BoundedSemaphore) + Condition = staticmethod(multiprocessing.Condition) + Event = staticmethod(multiprocessing.Event) + Barrier = staticmethod(multiprocessing.Barrier) + Value = staticmethod(multiprocessing.Value) + Array = staticmethod(multiprocessing.Array) + RawValue = staticmethod(multiprocessing.RawValue) + RawArray = staticmethod(multiprocessing.RawArray) testcases_processes = create_test_cases(ProcessesMixin, type='processes') globals().update(testcases_processes) @@ -2935,12 +2913,42 @@ class ManagerMixin(object): TYPE = 'manager' Process = multiprocessing.Process - manager = object.__new__(multiprocessing.managers.SyncManager) - locals().update(get_attributes(manager, ( - 'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', - 'Condition', 'Event', 'Barrier', 'Value', 'Array', 'list', 'dict', - 'Namespace', 'JoinableQueue', 'Pool' - ))) + Queue = property(operator.attrgetter('manager.Queue')) + JoinableQueue = property(operator.attrgetter('manager.JoinableQueue')) + Lock = property(operator.attrgetter('manager.Lock')) + RLock = property(operator.attrgetter('manager.RLock')) + Semaphore = property(operator.attrgetter('manager.Semaphore')) + BoundedSemaphore = property(operator.attrgetter('manager.BoundedSemaphore')) + Condition = property(operator.attrgetter('manager.Condition')) + Event = property(operator.attrgetter('manager.Event')) + Barrier = property(operator.attrgetter('manager.Barrier')) + Value = property(operator.attrgetter('manager.Value')) + Array = property(operator.attrgetter('manager.Array')) + list = property(operator.attrgetter('manager.list')) + dict = property(operator.attrgetter('manager.dict')) + Namespace = property(operator.attrgetter('manager.Namespace')) + + @classmethod + def Pool(cls, *args, **kwds): + return cls.manager.Pool(*args, **kwds) + + @classmethod + def setUpClass(cls): + cls.manager = multiprocessing.Manager() + + @classmethod + def tearDownClass(cls): + multiprocessing.active_children() # discard dead process objs + gc.collect() # do garbage collection + if cls.manager._number_of_objects() != 0: + # This is not really an error since some tests do not + # ensure that all processes which hold a reference to a + # managed object have been joined. + print('Shared objects which still exist at manager shutdown:') + print(cls.manager._debug_info()) + cls.manager.shutdown() + cls.manager.join() + cls.manager = None testcases_manager = create_test_cases(ManagerMixin, type='manager') globals().update(testcases_manager) @@ -2949,16 +2957,27 @@ class ThreadsMixin(object): TYPE = 'threads' Process = multiprocessing.dummy.Process - locals().update(get_attributes(multiprocessing.dummy, ( - 'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', - 'Condition', 'Event', 'Barrier', 'Value', 'Array', 'current_process', - 'active_children', 'Pipe', 'connection', 'dict', 'list', - 'Namespace', 'JoinableQueue', 'Pool' - ))) + connection = multiprocessing.dummy.connection + current_process = staticmethod(multiprocessing.dummy.current_process) + active_children = staticmethod(multiprocessing.dummy.active_children) + Pool = staticmethod(multiprocessing.Pool) + Pipe = staticmethod(multiprocessing.dummy.Pipe) + Queue = staticmethod(multiprocessing.dummy.Queue) + JoinableQueue = staticmethod(multiprocessing.dummy.JoinableQueue) + Lock = staticmethod(multiprocessing.dummy.Lock) + RLock = staticmethod(multiprocessing.dummy.RLock) + Semaphore = staticmethod(multiprocessing.dummy.Semaphore) + BoundedSemaphore = staticmethod(multiprocessing.dummy.BoundedSemaphore) + Condition = staticmethod(multiprocessing.dummy.Condition) + Event = staticmethod(multiprocessing.dummy.Event) + Barrier = staticmethod(multiprocessing.dummy.Barrier) + Value = staticmethod(multiprocessing.dummy.Value) + Array = staticmethod(multiprocessing.dummy.Array) testcases_threads = create_test_cases(ThreadsMixin, type='threads') globals().update(testcases_threads) + class OtherTest(unittest.TestCase): # TODO: add more tests for deliver/answer challenge. def test_deliver_challenge_auth_failure(self): @@ -3390,12 +3409,6 @@ multiprocessing.get_logger().setLevel(LOG_LEVEL) - ProcessesMixin.pool = multiprocessing.Pool(4) - ThreadsMixin.pool = multiprocessing.dummy.Pool(4) - ManagerMixin.manager.__init__() - ManagerMixin.manager.start() - ManagerMixin.pool = ManagerMixin.manager.Pool(4) - testcases = ( sorted(testcases_processes.values(), key=lambda tc:tc.__name__) + sorted(testcases_threads.values(), key=lambda tc:tc.__name__) + @@ -3405,18 +3418,7 @@ loadTestsFromTestCase = unittest.defaultTestLoader.loadTestsFromTestCase suite = unittest.TestSuite(loadTestsFromTestCase(tc) for tc in testcases) - try: - run(suite) - finally: - ThreadsMixin.pool.terminate() - ProcessesMixin.pool.terminate() - ManagerMixin.pool.terminate() - ManagerMixin.pool.join() - ManagerMixin.manager.shutdown() - ManagerMixin.manager.join() - ThreadsMixin.pool.join() - ProcessesMixin.pool.join() - del ProcessesMixin.pool, ThreadsMixin.pool, ManagerMixin.pool + run(suite) def main(): test_main(unittest.TextTestRunner(verbosity=2).run) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 19:21:09 2012 From: python-checkins at python.org (nadeem.vawda) Date: Mon, 8 Oct 2012 19:21:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Stylistic_tweaks_to_the_bz?= =?utf-8?q?2_module_to_make_it_easier_to_transplant_changes_from?= Message-ID: <3Xb7dd5xk1zPDc@mail.python.org> http://hg.python.org/cpython/rev/8f048c8c855e changeset: 79596:8f048c8c855e user: Nadeem Vawda date: Mon Oct 08 19:20:49 2012 +0200 summary: Stylistic tweaks to the bz2 module to make it easier to transplant changes from it to http://pypi.python.org/pypi/bz2file. files: Lib/bz2.py | 13 +- Lib/test/test_bz2.py | 136 +++++++++++++++--------------- 2 files changed, 75 insertions(+), 74 deletions(-) diff --git a/Lib/bz2.py b/Lib/bz2.py --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -9,7 +9,6 @@ __author__ = "Nadeem Vawda " -import builtins import io import warnings @@ -28,6 +27,8 @@ _BUFFER_SIZE = 8192 +_builtin_open = open + class BZ2File(io.BufferedIOBase): @@ -90,10 +91,10 @@ mode_code = _MODE_WRITE self._compressor = BZ2Compressor(compresslevel) else: - raise ValueError("Invalid mode: {!r}".format(mode)) + raise ValueError("Invalid mode: %r" % (mode,)) if isinstance(filename, (str, bytes)): - self._fp = builtins.open(filename, mode) + self._fp = _builtin_open(filename, mode) self._closefp = True self._mode = mode_code elif hasattr(filename, "read") or hasattr(filename, "write"): @@ -189,15 +190,17 @@ if not rawblock: if self._decompressor.eof: + # End-of-stream marker and end of file. We're good. self._mode = _MODE_READ_EOF self._size = self._pos return False else: + # Problem - we were expecting more compressed data. raise EOFError("Compressed file ended before the " "end-of-stream marker was reached") - # Continue to next stream. if self._decompressor.eof: + # Continue to next stream. self._decompressor = BZ2Decompressor() self._buffer = self._decompressor.decompress(rawblock) @@ -412,7 +415,7 @@ self._read_all(return_data=False) offset = self._size + offset else: - raise ValueError("Invalid value for whence: {}".format(whence)) + raise ValueError("Invalid value for whence: %s" % (whence,)) # Make it so that offset is the number of bytes to skip forward. if offset < self._pos: diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 from test import support -from test.support import TESTFN, bigmemtest, _4G +from test.support import bigmemtest, _4G import unittest from io import BytesIO @@ -18,10 +18,10 @@ bz2 = support.import_module('bz2') from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor -has_cmdline_bunzip2 = (sys.platform != "win32") class BaseTest(unittest.TestCase): "Base for other testcases." + TEXT_LINES = [ b'root:x:0:0:root:/root:/bin/bash\n', b'bin:x:1:1:bin:/bin:\n', @@ -49,13 +49,17 @@ DATA = b'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`' def setUp(self): - self.filename = TESTFN + self.filename = support.TESTFN def tearDown(self): if os.path.isfile(self.filename): os.unlink(self.filename) - if has_cmdline_bunzip2: + if sys.platform == "win32": + # bunzip2 isn't available to run on Windows. + def decompress(self, data): + return bz2.decompress(data) + else: def decompress(self, data): pop = subprocess.Popen("bunzip2", shell=True, stdin=subprocess.PIPE, @@ -69,31 +73,21 @@ ret = bz2.decompress(data) return ret - else: - # bunzip2 isn't available to run on Windows. - def decompress(self, data): - return bz2.decompress(data) class BZ2FileTest(BaseTest): - "Test BZ2File type miscellaneous methods." + "Test the BZ2File class." def createTempFile(self, streams=1): with open(self.filename, "wb") as f: f.write(self.DATA * streams) def testBadArgs(self): - with self.assertRaises(TypeError): - BZ2File(123.456) - with self.assertRaises(ValueError): - BZ2File("/dev/null", "z") - with self.assertRaises(ValueError): - BZ2File("/dev/null", "rx") - with self.assertRaises(ValueError): - BZ2File("/dev/null", "rbt") - with self.assertRaises(ValueError): - BZ2File("/dev/null", compresslevel=0) - with self.assertRaises(ValueError): - BZ2File("/dev/null", compresslevel=10) + self.assertRaises(TypeError, BZ2File, 123.456) + self.assertRaises(ValueError, BZ2File, "/dev/null", "z") + self.assertRaises(ValueError, BZ2File, "/dev/null", "rx") + self.assertRaises(ValueError, BZ2File, "/dev/null", "rbt") + self.assertRaises(ValueError, BZ2File, "/dev/null", compresslevel=0) + self.assertRaises(ValueError, BZ2File, "/dev/null", compresslevel=10) def testRead(self): self.createTempFile() @@ -214,9 +208,8 @@ self.createTempFile() bz2f = BZ2File(self.filename) bz2f.close() - self.assertRaises(ValueError, bz2f.__next__) - # This call will deadlock if the above .__next__ call failed to - # release the lock. + self.assertRaises(ValueError, next, bz2f) + # This call will deadlock if the above call failed to release the lock. self.assertRaises(ValueError, bz2f.readlines) def testWrite(self): @@ -379,7 +372,7 @@ bz2f.close() self.assertRaises(ValueError, bz2f.seekable) - bz2f = BZ2File(BytesIO(), mode="w") + bz2f = BZ2File(BytesIO(), "w") try: self.assertFalse(bz2f.seekable()) finally: @@ -405,7 +398,7 @@ bz2f.close() self.assertRaises(ValueError, bz2f.readable) - bz2f = BZ2File(BytesIO(), mode="w") + bz2f = BZ2File(BytesIO(), "w") try: self.assertFalse(bz2f.readable()) finally: @@ -422,7 +415,7 @@ bz2f.close() self.assertRaises(ValueError, bz2f.writable) - bz2f = BZ2File(BytesIO(), mode="w") + bz2f = BZ2File(BytesIO(), "w") try: self.assertTrue(bz2f.writable()) finally: @@ -476,7 +469,7 @@ # Issue #7205: Using a BZ2File from several threads shouldn't deadlock. data = b"1" * 2**20 nthreads = 10 - with bz2.BZ2File(self.filename, 'wb') as f: + with BZ2File(self.filename, 'wb') as f: def comp(): for i in range(5): f.write(data) @@ -487,28 +480,27 @@ t.join() def testWithoutThreading(self): - bz2 = support.import_fresh_module("bz2", blocked=("threading",)) - with bz2.BZ2File(self.filename, "wb") as f: + module = support.import_fresh_module("bz2", blocked=("threading",)) + with module.BZ2File(self.filename, "wb") as f: f.write(b"abc") - with bz2.BZ2File(self.filename, "rb") as f: + with module.BZ2File(self.filename, "rb") as f: self.assertEqual(f.read(), b"abc") def testMixedIterationAndReads(self): self.createTempFile() linelen = len(self.TEXT_LINES[0]) halflen = linelen // 2 - with bz2.BZ2File(self.filename) as bz2f: + with BZ2File(self.filename) as bz2f: bz2f.read(halflen) self.assertEqual(next(bz2f), self.TEXT_LINES[0][halflen:]) self.assertEqual(bz2f.read(), self.TEXT[linelen:]) - with bz2.BZ2File(self.filename) as bz2f: + with BZ2File(self.filename) as bz2f: bz2f.readline() self.assertEqual(next(bz2f), self.TEXT_LINES[1]) self.assertEqual(bz2f.readline(), self.TEXT_LINES[2]) - with bz2.BZ2File(self.filename) as bz2f: + with BZ2File(self.filename) as bz2f: bz2f.readlines() - with self.assertRaises(StopIteration): - next(bz2f) + self.assertRaises(StopIteration, next, bz2f) self.assertEqual(bz2f.readlines(), []) def testMultiStreamOrdering(self): @@ -576,6 +568,7 @@ bz2f.seek(-150, 1) self.assertEqual(bz2f.read(), self.TEXT[500-150:]) + class BZ2CompressorTest(BaseTest): def testCompress(self): bz2c = BZ2Compressor() @@ -687,97 +680,102 @@ class OpenTest(BaseTest): + "Test the open function." + + def open(self, *args, **kwargs): + return bz2.open(*args, **kwargs) + def test_binary_modes(self): - with bz2.open(self.filename, "wb") as f: + with self.open(self.filename, "wb") as f: f.write(self.TEXT) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()) + file_data = self.decompress(f.read()) self.assertEqual(file_data, self.TEXT) - with bz2.open(self.filename, "rb") as f: + with self.open(self.filename, "rb") as f: self.assertEqual(f.read(), self.TEXT) - with bz2.open(self.filename, "ab") as f: + with self.open(self.filename, "ab") as f: f.write(self.TEXT) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()) + file_data = self.decompress(f.read()) self.assertEqual(file_data, self.TEXT * 2) def test_implicit_binary_modes(self): # Test implicit binary modes (no "b" or "t" in mode string). - with bz2.open(self.filename, "w") as f: + with self.open(self.filename, "w") as f: f.write(self.TEXT) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()) + file_data = self.decompress(f.read()) self.assertEqual(file_data, self.TEXT) - with bz2.open(self.filename, "r") as f: + with self.open(self.filename, "r") as f: self.assertEqual(f.read(), self.TEXT) - with bz2.open(self.filename, "a") as f: + with self.open(self.filename, "a") as f: f.write(self.TEXT) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()) + file_data = self.decompress(f.read()) self.assertEqual(file_data, self.TEXT * 2) def test_text_modes(self): text = self.TEXT.decode("ascii") text_native_eol = text.replace("\n", os.linesep) - with bz2.open(self.filename, "wt") as f: + with self.open(self.filename, "wt") as f: f.write(text) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()).decode("ascii") + file_data = self.decompress(f.read()).decode("ascii") self.assertEqual(file_data, text_native_eol) - with bz2.open(self.filename, "rt") as f: + with self.open(self.filename, "rt") as f: self.assertEqual(f.read(), text) - with bz2.open(self.filename, "at") as f: + with self.open(self.filename, "at") as f: f.write(text) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()).decode("ascii") + file_data = self.decompress(f.read()).decode("ascii") self.assertEqual(file_data, text_native_eol * 2) def test_fileobj(self): - with bz2.open(BytesIO(self.DATA), "r") as f: + with self.open(BytesIO(self.DATA), "r") as f: self.assertEqual(f.read(), self.TEXT) - with bz2.open(BytesIO(self.DATA), "rb") as f: + with self.open(BytesIO(self.DATA), "rb") as f: self.assertEqual(f.read(), self.TEXT) text = self.TEXT.decode("ascii") - with bz2.open(BytesIO(self.DATA), "rt") as f: + with self.open(BytesIO(self.DATA), "rt") as f: self.assertEqual(f.read(), text) def test_bad_params(self): # Test invalid parameter combinations. - with self.assertRaises(ValueError): - bz2.open(self.filename, "wbt") - with self.assertRaises(ValueError): - bz2.open(self.filename, "rb", encoding="utf-8") - with self.assertRaises(ValueError): - bz2.open(self.filename, "rb", errors="ignore") - with self.assertRaises(ValueError): - bz2.open(self.filename, "rb", newline="\n") + self.assertRaises(ValueError, + self.open, self.filename, "wbt") + self.assertRaises(ValueError, + self.open, self.filename, "rb", encoding="utf-8") + self.assertRaises(ValueError, + self.open, self.filename, "rb", errors="ignore") + self.assertRaises(ValueError, + self.open, self.filename, "rb", newline="\n") def test_encoding(self): # Test non-default encoding. text = self.TEXT.decode("ascii") text_native_eol = text.replace("\n", os.linesep) - with bz2.open(self.filename, "wt", encoding="utf-16-le") as f: + with self.open(self.filename, "wt", encoding="utf-16-le") as f: f.write(text) with open(self.filename, "rb") as f: - file_data = bz2.decompress(f.read()).decode("utf-16-le") + file_data = self.decompress(f.read()).decode("utf-16-le") self.assertEqual(file_data, text_native_eol) - with bz2.open(self.filename, "rt", encoding="utf-16-le") as f: + with self.open(self.filename, "rt", encoding="utf-16-le") as f: self.assertEqual(f.read(), text) def test_encoding_error_handler(self): # Test with non-default encoding error handler. - with bz2.open(self.filename, "wb") as f: + with self.open(self.filename, "wb") as f: f.write(b"foo\xffbar") - with bz2.open(self.filename, "rt", encoding="ascii", errors="ignore") \ + with self.open(self.filename, "rt", encoding="ascii", errors="ignore") \ as f: self.assertEqual(f.read(), "foobar") def test_newline(self): # Test with explicit newline (universal newline mode disabled). text = self.TEXT.decode("ascii") - with bz2.open(self.filename, "wt", newline="\n") as f: + with self.open(self.filename, "wt", newline="\n") as f: f.write(text) - with bz2.open(self.filename, "rt", newline="\r") as f: + with self.open(self.filename, "rt", newline="\r") as f: self.assertEqual(f.readlines(), [text]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 8 20:40:25 2012 From: python-checkins at python.org (nadeem.vawda) Date: Mon, 8 Oct 2012 20:40:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_bz2_module=3A_Rewrap_docst?= =?utf-8?q?rings_at_72_columns=2C_as_per_PEP_8=2E?= Message-ID: <3Xb9P526XlzQy3@mail.python.org> http://hg.python.org/cpython/rev/a61b3faa1c61 changeset: 79597:a61b3faa1c61 user: Nadeem Vawda date: Mon Oct 08 20:31:34 2012 +0200 summary: bz2 module: Rewrap docstrings at 72 columns, as per PEP 8. files: Lib/bz2.py | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Lib/bz2.py b/Lib/bz2.py --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -44,12 +44,13 @@ def __init__(self, filename, mode="r", buffering=None, compresslevel=9): """Open a bzip2-compressed file. - If filename is a str or bytes object, is gives the name of the file to - be opened. Otherwise, it should be a file object, which will be used to - read or write the compressed data. + If filename is a str or bytes object, it gives the name + of the file to be opened. Otherwise, it should be a file object, + which will be used to read or write the compressed data. - mode can be 'r' for reading (default), 'w' for (over)writing, or 'a' for - appending. These can equivalently be given as 'rb', 'wb', and 'ab'. + mode can be 'r' for reading (default), 'w' for (over)writing, + or 'a' for appending. These can equivalently be given as 'rb', + 'wb', and 'ab'. buffering is ignored. Its use is deprecated. @@ -439,20 +440,20 @@ encoding=None, errors=None, newline=None): """Open a bzip2-compressed file in binary or text mode. - The filename argument can be an actual filename (a str or bytes object), or - an existing file object to read from or write to. + The filename argument can be an actual filename (a str or bytes + object), or an existing file object to read from or write to. - The mode argument can be "r", "rb", "w", "wb", "a" or "ab" for binary mode, - or "rt", "wt" or "at" for text mode. The default mode is "rb", and the - default compresslevel is 9. + The mode argument can be "r", "rb", "w", "wb", "a" or "ab" for + binary mode, or "rt", "wt" or "at" for text mode. The default mode + is "rb", and the default compresslevel is 9. - For binary mode, this function is equivalent to the BZ2File constructor: - BZ2File(filename, mode, compresslevel). In this case, the encoding, errors - and newline arguments must not be provided. + For binary mode, this function is equivalent to the BZ2File + constructor: BZ2File(filename, mode, compresslevel). In this case, + the encoding, errors and newline arguments must not be provided. For text mode, a BZ2File object is created, and wrapped in an - io.TextIOWrapper instance with the specified encoding, error handling - behavior, and line ending(s). + io.TextIOWrapper instance with the specified encoding, error + handling behavior, and line ending(s). """ if "t" in mode: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 01:02:17 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 01:02:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Improve_testing_of_the_executable_argument_to_subprocess=2E?= =?utf-8?b?UG9wZW4oKS4=?= Message-ID: <3XbHCF4FBrzQqD@mail.python.org> http://hg.python.org/cpython/rev/862430c68fec changeset: 79598:862430c68fec branch: 3.3 parent: 79592:ef183e71268a user: Chris Jerdonek date: Mon Oct 08 15:56:43 2012 -0700 summary: Issue #16115: Improve testing of the executable argument to subprocess.Popen(). files: Lib/test/test_subprocess.py | 37 ++++++++++++++++++------ Misc/NEWS | 3 ++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,6 +192,33 @@ p.wait() self.assertEqual(p.stderr, None) + def _assert_python(self, pre_args, **kwargs): + # We include sys.exit() to prevent the test runner from hanging + # whenever python is found. + args = pre_args + ["import sys; sys.exit(47)"] + p = subprocess.Popen(args, **kwargs) + p.wait() + self.assertEqual(47, p.returncode) + + def test_executable(self): + # Check that the executable argument works. + self._assert_python(["doesnotexist", "-c"], executable=sys.executable) + + def test_executable_takes_precedence(self): + # Check that the executable argument takes precedence over args[0]. + # + # Verify first that the call succeeds without the executable arg. + pre_args = [sys.executable, "-c"] + self._assert_python(pre_args) + self.assertRaises(FileNotFoundError, self._assert_python, pre_args, + executable="doesnotexist") + + @unittest.skipIf(mswindows, "executable argument replaces shell") + def test_executable_replaces_shell(self): + # Check that the executable argument replaces the default shell + # when shell=True. + self._assert_python([], executable=sys.executable, shell=True) + # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). @@ -299,16 +326,6 @@ # argument. For test runs in the build directory, see #7774. self._assert_cwd('', "somethingyoudonthave", executable=sys.executable) - def test_executable_precedence(self): - # To the precedence of executable argument over args[0] - # For a normal installation, it should work without 'cwd' - # argument. For test runs in the build directory, see #7774. - python_dir = os.path.dirname(os.path.realpath(sys.executable)) - p = subprocess.Popen(["nonexistent","-c",'import sys; sys.exit(42)'], - executable=sys.executable, cwd=python_dir) - p.wait() - self.assertEqual(p.returncode, 42) - def test_stdin_pipe(self): # stdin redirection p = subprocess.Popen([sys.executable, "-c", diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -100,6 +100,9 @@ Tests ----- +- Issue #16115: Add some tests for the executable argument to + subprocess.Popen(). Initial patch by Kushal Das. + - Issue #15304: Fix warning message when `os.chdir()` fails inside `test.support.temp_cwd()`. Patch by Chris Jerdonek. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 01:02:18 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 01:02:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316115=3A_Merge_test_improvements_from_3=2E3=2E?= Message-ID: <3XbHCG6vWbzQy0@mail.python.org> http://hg.python.org/cpython/rev/1b37fc50dc1b changeset: 79599:1b37fc50dc1b parent: 79597:a61b3faa1c61 parent: 79598:862430c68fec user: Chris Jerdonek date: Mon Oct 08 16:01:00 2012 -0700 summary: Issue #16115: Merge test improvements from 3.3. files: Lib/test/test_subprocess.py | 37 ++++++++++++++++++------ Misc/NEWS | 3 ++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -192,6 +192,33 @@ p.wait() self.assertEqual(p.stderr, None) + def _assert_python(self, pre_args, **kwargs): + # We include sys.exit() to prevent the test runner from hanging + # whenever python is found. + args = pre_args + ["import sys; sys.exit(47)"] + p = subprocess.Popen(args, **kwargs) + p.wait() + self.assertEqual(47, p.returncode) + + def test_executable(self): + # Check that the executable argument works. + self._assert_python(["doesnotexist", "-c"], executable=sys.executable) + + def test_executable_takes_precedence(self): + # Check that the executable argument takes precedence over args[0]. + # + # Verify first that the call succeeds without the executable arg. + pre_args = [sys.executable, "-c"] + self._assert_python(pre_args) + self.assertRaises(FileNotFoundError, self._assert_python, pre_args, + executable="doesnotexist") + + @unittest.skipIf(mswindows, "executable argument replaces shell") + def test_executable_replaces_shell(self): + # Check that the executable argument replaces the default shell + # when shell=True. + self._assert_python([], executable=sys.executable, shell=True) + # For use in the test_cwd* tests below. def _normalize_cwd(self, cwd): # Normalize an expected cwd (for Tru64 support). @@ -299,16 +326,6 @@ # argument. For test runs in the build directory, see #7774. self._assert_cwd('', "somethingyoudonthave", executable=sys.executable) - def test_executable_precedence(self): - # To the precedence of executable argument over args[0] - # For a normal installation, it should work without 'cwd' - # argument. For test runs in the build directory, see #7774. - python_dir = os.path.dirname(os.path.realpath(sys.executable)) - p = subprocess.Popen(["nonexistent","-c",'import sys; sys.exit(42)'], - executable=sys.executable, cwd=python_dir) - p.wait() - self.assertEqual(p.returncode, 42) - def test_stdin_pipe(self): # stdin redirection p = subprocess.Popen([sys.executable, "-c", diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -129,6 +129,9 @@ Tests ----- +- Issue #16115: Add some tests for the executable argument to + subprocess.Popen(). Initial patch by Kushal Das. + - Issue #15304: Fix warning message when `os.chdir()` fails inside `test.support.temp_cwd()`. Patch by Chris Jerdonek. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 02:55:13 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 02:55:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Skip_a_newly_added_subprocess=2EPopen=28=29_test_on_Linux?= =?utf-8?q?=2E?= Message-ID: <3XbKjY2NBLzQtn@mail.python.org> http://hg.python.org/cpython/rev/ef90c5e482f4 changeset: 79600:ef90c5e482f4 branch: 3.3 parent: 79598:862430c68fec user: Chris Jerdonek date: Mon Oct 08 17:53:46 2012 -0700 summary: Issue #16115: Skip a newly added subprocess.Popen() test on Linux. files: Lib/test/test_subprocess.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -200,6 +200,10 @@ p.wait() self.assertEqual(47, p.returncode) + # TODO: make this test work on Linux. + # This may be failing on Linux because of issue #7774. + @unittest.skipIf(sys.platform not in ('win32', 'darwin'), + "possible bug using executable argument on Linux") def test_executable(self): # Check that the executable argument works. self._assert_python(["doesnotexist", "-c"], executable=sys.executable) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 02:55:14 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 02:55:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316115=3A_Merge_test_skip_from_3=2E3=2E?= Message-ID: <3XbKjZ50v5zQwj@mail.python.org> http://hg.python.org/cpython/rev/96b8eb3d3208 changeset: 79601:96b8eb3d3208 parent: 79599:1b37fc50dc1b parent: 79600:ef90c5e482f4 user: Chris Jerdonek date: Mon Oct 08 17:54:45 2012 -0700 summary: Issue #16115: Merge test skip from 3.3. files: Lib/test/test_subprocess.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -200,6 +200,10 @@ p.wait() self.assertEqual(47, p.returncode) + # TODO: make this test work on Linux. + # This may be failing on Linux because of issue #7774. + @unittest.skipIf(sys.platform not in ('win32', 'darwin'), + "possible bug using executable argument on Linux") def test_executable(self): # Check that the executable argument works. self._assert_python(["doesnotexist", "-c"], executable=sys.executable) -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Tue Oct 9 06:00:12 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Tue, 09 Oct 2012 06:00:12 +0200 Subject: [Python-checkins] Daily reference leaks (96b8eb3d3208): sum=-1 Message-ID: results for 96b8eb3d3208 on branch "default" -------------------------------------------- test_support leaked [0, 0, -1] references, sum=-1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogV91F_z', '-x'] From python-checkins at python.org Tue Oct 9 08:19:49 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 08:19:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Improve_subprocess=2EPopen=28=29_documentation_around_args?= =?utf-8?q?=2C_shell=2C_and?= Message-ID: <3XbSw504RwzQtf@mail.python.org> http://hg.python.org/cpython/rev/3dd012397b11 changeset: 79602:3dd012397b11 branch: 3.2 parent: 79591:88a7b9c3b6c0 user: Chris Jerdonek date: Mon Oct 08 23:06:57 2012 -0700 summary: Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. files: Doc/library/subprocess.rst | 63 ++++++++++++++----------- Misc/NEWS | 3 + 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -290,20 +290,15 @@ Arguments are: - *args* should be a string, or a sequence of program arguments. The program - to execute is normally the first item in the args sequence or the string if - a string is given, but can be explicitly set by using the *executable* - argument. When *executable* is given, the first item in the args sequence - is still treated by most programs as the command name, which can then be - different from the actual executable name. On Unix, it becomes the display - name for the executing program in utilities such as :program:`ps`. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence and the string itself if *args* is a string. However, see the + *shell* and *executable* arguments for differences from this behavior. - On Unix, with *shell=False* (default): In this case, the Popen class uses - :meth:`os.execvp` like behavior to execute the child program. - *args* should normally be a - sequence. If a string is specified for *args*, it will be used as the name - or path of the program to execute; this will only work if the program is - being given no arguments. + On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to + execute the child program. If *args* is a string, the string is + interpreted as the name or path of the program to execute; this only works + if the program is being given no arguments. .. note:: @@ -324,13 +319,23 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Unix, with *shell=True*: If args is a string, it specifies the command - string to execute through the shell. This means that the string must be + On Windows, the :class:`Popen` class uses ``CreateProcess()`` to + execute the child program, which operates on strings. If *args* is a + sequence, it will be converted to a string in a manner described in + :ref:`converting-argument-sequence`. + + The *shell* argument (which defaults to *False*) specifies whether to use + the shell as the program to execute. It is recommended to pass *args* as a + sequence if *shell* is *False* and as a string if *shell* is *True*. + + On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If + *args* is a string, the string specifies the command + to execute through the shell. This means that the string must be formatted exactly as it would be when typed at the shell prompt. This includes, for example, quoting or backslash escaping filenames with spaces in them. If *args* is a sequence, the first item specifies the command string, and any additional items will be treated as additional arguments to the shell - itself. That is to say, *Popen* does the equivalent of:: + itself. That is to say, :class:`Popen` does the equivalent of:: Popen(['/bin/sh', '-c', args[0], args[1], ...]) @@ -340,10 +345,11 @@ input. See the warning under :ref:`frequently-used-arguments` for details. - On Windows: the :class:`Popen` class uses CreateProcess() to execute the - child program, which operates on strings. If *args* is a sequence, it will - be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable + specifies the default shell. The only time you need to specify + ``shell=True`` on Windows is when the command you wish to execute is built + into the shell (e.g. :command:`dir` or :command:`copy`). You do not need + ``shell=True`` to run a batch file or console-based executable. *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line @@ -357,15 +363,14 @@ enable buffering by setting *bufsize* to either -1 or a large enough positive value (such as 4096). - The *executable* argument specifies the program to execute. It is very seldom - needed: Usually, the program to execute is defined by the *args* argument. If - ``shell=True``, the *executable* argument specifies which shell to use. On Unix, - the default shell is :file:`/bin/sh`. On Windows, the default shell is - specified by the :envvar:`COMSPEC` environment variable. The only reason you - would need to specify ``shell=True`` on Windows is where the command you - wish to execute is actually built in to the shell, eg ``dir``, ``copy``. - You don't need ``shell=True`` to run a batch file, nor to run a console-based - executable. + The *executable* argument specifies a replacement program to execute. It + is very seldom needed. When ``shell=False``, *executable* replaces the + program to execute specified by *args*. However, the *args* program is + still treated by most programs as the command name, which can then be + different from the program actually executed. On Unix, the *args* name + becomes the display name for the executable in utilities such as + :program:`ps`. If ``shell=True``, on Unix the *executable* argument + specifies a replacement shell for the default :file:`/bin/sh`. *stdin*, *stdout* and *stderr* specify the executed program's standard input, standard output and standard error file handles, respectively. Valid values diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -609,6 +609,9 @@ Documentation ------------- +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + - Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with great native-speaker help from R. David Murray. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 08:19:50 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 08:19:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316115=3A_Merge_subprocess=2EPopen=28=29_documentation?= =?utf-8?q?_improvements_from_3=2E2=2E?= Message-ID: <3XbSw63w7gzQxH@mail.python.org> http://hg.python.org/cpython/rev/0ef3b801ccbc changeset: 79603:0ef3b801ccbc branch: 3.3 parent: 79600:ef90c5e482f4 parent: 79602:3dd012397b11 user: Chris Jerdonek date: Mon Oct 08 23:12:21 2012 -0700 summary: Issue #16115: Merge subprocess.Popen() documentation improvements from 3.2. files: Doc/library/subprocess.rst | 63 ++++++++++++++----------- Misc/NEWS | 3 + 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -358,20 +358,15 @@ Arguments are: - *args* should be a string, or a sequence of program arguments. The program - to execute is normally the first item in the args sequence or the string if - a string is given, but can be explicitly set by using the *executable* - argument. When *executable* is given, the first item in the args sequence - is still treated by most programs as the command name, which can then be - different from the actual executable name. On Unix, it becomes the display - name for the executing program in utilities such as :program:`ps`. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence and the string itself if *args* is a string. However, see the + *shell* and *executable* arguments for differences from this behavior. - On Unix, with *shell=False* (default): In this case, the Popen class uses - :meth:`os.execvp` like behavior to execute the child program. - *args* should normally be a - sequence. If a string is specified for *args*, it will be used as the name - or path of the program to execute; this will only work if the program is - being given no arguments. + On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to + execute the child program. If *args* is a string, the string is + interpreted as the name or path of the program to execute; this only works + if the program is being given no arguments. .. note:: @@ -392,13 +387,23 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Unix, with *shell=True*: If args is a string, it specifies the command - string to execute through the shell. This means that the string must be + On Windows, the :class:`Popen` class uses ``CreateProcess()`` to + execute the child program, which operates on strings. If *args* is a + sequence, it will be converted to a string in a manner described in + :ref:`converting-argument-sequence`. + + The *shell* argument (which defaults to *False*) specifies whether to use + the shell as the program to execute. It is recommended to pass *args* as a + sequence if *shell* is *False* and as a string if *shell* is *True*. + + On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If + *args* is a string, the string specifies the command + to execute through the shell. This means that the string must be formatted exactly as it would be when typed at the shell prompt. This includes, for example, quoting or backslash escaping filenames with spaces in them. If *args* is a sequence, the first item specifies the command string, and any additional items will be treated as additional arguments to the shell - itself. That is to say, *Popen* does the equivalent of:: + itself. That is to say, :class:`Popen` does the equivalent of:: Popen(['/bin/sh', '-c', args[0], args[1], ...]) @@ -408,10 +413,11 @@ input. See the warning under :ref:`frequently-used-arguments` for details. - On Windows: the :class:`Popen` class uses CreateProcess() to execute the - child program, which operates on strings. If *args* is a sequence, it will - be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable + specifies the default shell. The only time you need to specify + ``shell=True`` on Windows is when the command you wish to execute is built + into the shell (e.g. :command:`dir` or :command:`copy`). You do not need + ``shell=True`` to run a batch file or console-based executable. *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line @@ -425,15 +431,14 @@ enable buffering by setting *bufsize* to either -1 or a large enough positive value (such as 4096). - The *executable* argument specifies the program to execute. It is very seldom - needed: Usually, the program to execute is defined by the *args* argument. If - ``shell=True``, the *executable* argument specifies which shell to use. On Unix, - the default shell is :file:`/bin/sh`. On Windows, the default shell is - specified by the :envvar:`COMSPEC` environment variable. The only reason you - would need to specify ``shell=True`` on Windows is where the command you - wish to execute is actually built in to the shell, eg ``dir``, ``copy``. - You don't need ``shell=True`` to run a batch file, nor to run a console-based - executable. + The *executable* argument specifies a replacement program to execute. It + is very seldom needed. When ``shell=False``, *executable* replaces the + program to execute specified by *args*. However, the *args* program is + still treated by most programs as the command name, which can then be + different from the program actually executed. On Unix, the *args* name + becomes the display name for the executable in utilities such as + :program:`ps`. If ``shell=True``, on Unix the *executable* argument + specifies a replacement shell for the default :file:`/bin/sh`. *stdin*, *stdout* and *stderr* specify the executed program's standard input, standard output and standard error file handles, respectively. Valid values diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -124,6 +124,9 @@ Documentation ------------- +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + - Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd argument. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 08:19:52 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 08:19:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316115=3A_Merge_subprocess=2EPopen=28=29_documen?= =?utf-8?q?tation_improvements_from_3=2E3=2E?= Message-ID: <3XbSw80ZQszQty@mail.python.org> http://hg.python.org/cpython/rev/91d4593ac974 changeset: 79604:91d4593ac974 parent: 79601:96b8eb3d3208 parent: 79603:0ef3b801ccbc user: Chris Jerdonek date: Mon Oct 08 23:14:46 2012 -0700 summary: Issue #16115: Merge subprocess.Popen() documentation improvements from 3.3. files: Doc/library/subprocess.rst | 63 ++++++++++++++----------- Misc/NEWS | 3 + 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -358,20 +358,15 @@ Arguments are: - *args* should be a string, or a sequence of program arguments. The program - to execute is normally the first item in the args sequence or the string if - a string is given, but can be explicitly set by using the *executable* - argument. When *executable* is given, the first item in the args sequence - is still treated by most programs as the command name, which can then be - different from the actual executable name. On Unix, it becomes the display - name for the executing program in utilities such as :program:`ps`. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence and the string itself if *args* is a string. However, see the + *shell* and *executable* arguments for differences from this behavior. - On Unix, with *shell=False* (default): In this case, the Popen class uses - :meth:`os.execvp` like behavior to execute the child program. - *args* should normally be a - sequence. If a string is specified for *args*, it will be used as the name - or path of the program to execute; this will only work if the program is - being given no arguments. + On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to + execute the child program. If *args* is a string, the string is + interpreted as the name or path of the program to execute; this only works + if the program is being given no arguments. .. note:: @@ -392,13 +387,23 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Unix, with *shell=True*: If args is a string, it specifies the command - string to execute through the shell. This means that the string must be + On Windows, the :class:`Popen` class uses ``CreateProcess()`` to + execute the child program, which operates on strings. If *args* is a + sequence, it will be converted to a string in a manner described in + :ref:`converting-argument-sequence`. + + The *shell* argument (which defaults to *False*) specifies whether to use + the shell as the program to execute. It is recommended to pass *args* as a + sequence if *shell* is *False* and as a string if *shell* is *True*. + + On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If + *args* is a string, the string specifies the command + to execute through the shell. This means that the string must be formatted exactly as it would be when typed at the shell prompt. This includes, for example, quoting or backslash escaping filenames with spaces in them. If *args* is a sequence, the first item specifies the command string, and any additional items will be treated as additional arguments to the shell - itself. That is to say, *Popen* does the equivalent of:: + itself. That is to say, :class:`Popen` does the equivalent of:: Popen(['/bin/sh', '-c', args[0], args[1], ...]) @@ -408,10 +413,11 @@ input. See the warning under :ref:`frequently-used-arguments` for details. - On Windows: the :class:`Popen` class uses CreateProcess() to execute the - child program, which operates on strings. If *args* is a sequence, it will - be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable + specifies the default shell. The only time you need to specify + ``shell=True`` on Windows is when the command you wish to execute is built + into the shell (e.g. :command:`dir` or :command:`copy`). You do not need + ``shell=True`` to run a batch file or console-based executable. *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line @@ -425,15 +431,14 @@ enable buffering by setting *bufsize* to either -1 or a large enough positive value (such as 4096). - The *executable* argument specifies the program to execute. It is very seldom - needed: Usually, the program to execute is defined by the *args* argument. If - ``shell=True``, the *executable* argument specifies which shell to use. On Unix, - the default shell is :file:`/bin/sh`. On Windows, the default shell is - specified by the :envvar:`COMSPEC` environment variable. The only reason you - would need to specify ``shell=True`` on Windows is where the command you - wish to execute is actually built in to the shell, eg ``dir``, ``copy``. - You don't need ``shell=True`` to run a batch file, nor to run a console-based - executable. + The *executable* argument specifies a replacement program to execute. It + is very seldom needed. When ``shell=False``, *executable* replaces the + program to execute specified by *args*. However, the *args* program is + still treated by most programs as the command name, which can then be + different from the program actually executed. On Unix, the *args* name + becomes the display name for the executable in utilities such as + :program:`ps`. If ``shell=True``, on Unix the *executable* argument + specifies a replacement shell for the default :file:`/bin/sh`. *stdin*, *stdout* and *stderr* specify the executed program's standard input, standard output and standard error file handles, respectively. Valid values diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -155,6 +155,9 @@ Documentation ------------- +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + - Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with great native-speaker help from R. David Murray. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 08:19:53 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 08:19:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Backport_subprocess=2EPopen=28=29_documentation_improvement?= =?utf-8?q?s_from_3=2E2=2E?= Message-ID: <3XbSw949f5zQx0@mail.python.org> http://hg.python.org/cpython/rev/11171bf6a6bd changeset: 79605:11171bf6a6bd branch: 2.7 parent: 79590:3b484f53f91b user: Chris Jerdonek date: Mon Oct 08 23:18:17 2012 -0700 summary: Issue #16115: Backport subprocess.Popen() documentation improvements from 3.2. files: Doc/library/subprocess.rst | 62 ++++++++++++++----------- Misc/NEWS | 3 + 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -273,19 +273,15 @@ Arguments are: - *args* should be a string, or a sequence of program arguments. The program - to execute is normally the first item in the args sequence or the string if - a string is given, but can be explicitly set by using the *executable* - argument. When *executable* is given, the first item in the args sequence - is still treated by most programs as the command name, which can then be - different from the actual executable name. On Unix, it becomes the display - name for the executing program in utilities such as :program:`ps`. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence and the string itself if *args* is a string. However, see the + *shell* and *executable* arguments for differences from this behavior. - On Unix, with *shell=False* (default): In this case, the Popen class uses - :meth:`os.execvp` to execute the child program. *args* should normally be a - sequence. If a string is specified for *args*, it will be used as the name - or path of the program to execute; this will only work if the program is - being given no arguments. + On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to + execute the child program. If *args* is a string, the string is + interpreted as the name or path of the program to execute; this only works + if the program is being given no arguments. .. note:: @@ -306,20 +302,31 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Unix, with *shell=True*: If args is a string, it specifies the command - string to execute through the shell. This means that the string must be + On Windows, the :class:`Popen` class uses ``CreateProcess()`` to + execute the child program, which operates on strings. If *args* is a + sequence, it will be converted to a string in a manner described in + :ref:`converting-argument-sequence`. + + The *shell* argument (which defaults to *False*) specifies whether to use + the shell as the program to execute. It is recommended to pass *args* as a + sequence if *shell* is *False* and as a string if *shell* is *True*. + + On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If + *args* is a string, the string specifies the command + to execute through the shell. This means that the string must be formatted exactly as it would be when typed at the shell prompt. This includes, for example, quoting or backslash escaping filenames with spaces in them. If *args* is a sequence, the first item specifies the command string, and any additional items will be treated as additional arguments to the shell - itself. That is to say, *Popen* does the equivalent of:: + itself. That is to say, :class:`Popen` does the equivalent of:: Popen(['/bin/sh', '-c', args[0], args[1], ...]) - On Windows: the :class:`Popen` class uses CreateProcess() to execute the - child program, which operates on strings. If *args* is a sequence, it will - be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable + specifies the default shell. The only time you need to specify + ``shell=True`` on Windows is when the command you wish to execute is built + into the shell (e.g. :command:`dir` or :command:`copy`). You do not need + ``shell=True`` to run a batch file or console-based executable. *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line @@ -333,15 +340,14 @@ enable buffering by setting *bufsize* to either -1 or a large enough positive value (such as 4096). - The *executable* argument specifies the program to execute. It is very seldom - needed: Usually, the program to execute is defined by the *args* argument. If - ``shell=True``, the *executable* argument specifies which shell to use. On Unix, - the default shell is :file:`/bin/sh`. On Windows, the default shell is - specified by the :envvar:`COMSPEC` environment variable. The only reason you - would need to specify ``shell=True`` on Windows is where the command you - wish to execute is actually built in to the shell, eg ``dir``, ``copy``. - You don't need ``shell=True`` to run a batch file, nor to run a console-based - executable. + The *executable* argument specifies a replacement program to execute. It + is very seldom needed. When ``shell=False``, *executable* replaces the + program to execute specified by *args*. However, the *args* program is + still treated by most programs as the command name, which can then be + different from the program actually executed. On Unix, the *args* name + becomes the display name for the executable in utilities such as + :program:`ps`. If ``shell=True``, on Unix the *executable* argument + specifies a replacement shell for the default :file:`/bin/sh`. *stdin*, *stdout* and *stderr* specify the executed program's standard input, standard output and standard error file handles, respectively. Valid values diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -468,6 +468,9 @@ Documentation ------------- +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + - Issue #15979: Improve timeit documentation. - Issue #16036: Improve documentation of built-in int()'s signature and -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:06:26 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 9 Oct 2012 09:06:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316141=3A_replaced?= =?utf-8?q?_old-style_exception_handling_code_in_logging_with_the?= Message-ID: <3XbTxt6bBmzQtn@mail.python.org> http://hg.python.org/cpython/rev/46889b772442 changeset: 79606:46889b772442 parent: 79604:91d4593ac974 user: Vinay Sajip date: Tue Oct 09 08:06:13 2012 +0100 summary: Issue #16141: replaced old-style exception handling code in logging with the modern idiom. files: Lib/logging/__init__.py | 8 +++----- Lib/logging/config.py | 6 ++---- Lib/logging/handlers.py | 28 +++++++--------------------- 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -67,7 +67,7 @@ """Return the frame object for the caller's stack frame.""" try: raise Exception - except: + except Exception: return sys.exc_info()[2].tb_frame.f_back # _srcfile is only used in conjunction with sys._getframe(). @@ -938,9 +938,7 @@ stream.write(msg) stream.write(self.terminator) self.flush() - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) class FileHandler(StreamHandler): @@ -1837,7 +1835,7 @@ pass finally: h.release() - except: + except: # ignore everything, as we're shutting down if raiseExceptions: raise #else, swallow diff --git a/Lib/logging/config.py b/Lib/logging/config.py --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -827,15 +827,13 @@ d =json.loads(chunk) assert isinstance(d, dict) dictConfig(d) - except: + except Exception: #Apply new configuration. file = io.StringIO(chunk) try: fileConfig(file) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: traceback.print_exc() if self.server.ready: self.server.ready.set() diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -72,9 +72,7 @@ if self.shouldRollover(record): self.doRollover() logging.FileHandler.emit(self, record) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) def rotation_filename(self, default_name): @@ -609,9 +607,7 @@ try: s = self.makePickle(record) self.send(s) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) def close(self): @@ -877,9 +873,7 @@ self.socket.sendto(msg, self.address) else: self.socket.sendall(msg) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) class SMTPHandler(logging.Handler): @@ -957,9 +951,7 @@ smtp.login(self.username, self.password) smtp.sendmail(self.fromaddr, self.toaddrs, msg) smtp.quit() - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) class NTEventLogHandler(logging.Handler): @@ -1044,9 +1036,7 @@ type = self.getEventType(record) msg = self.format(record) self._welu.ReportEvent(self.appname, id, cat, type, [msg]) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) def close(self): @@ -1131,9 +1121,7 @@ if self.method == "POST": h.send(data.encode('utf-8')) h.getresponse() #can't do anything with the result - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) class BufferingHandler(logging.Handler): @@ -1313,9 +1301,7 @@ """ try: self.enqueue(self.prepare(record)) - except (KeyboardInterrupt, SystemExit): #pragma: no cover - raise - except: + except Exception: self.handleError(record) if threading: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:06:42 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 09:06:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?devguide=3A_Issue_=2316161=3A_Update_?= =?utf-8?q?link_for_downloading_Microsoft_Visual_Studio_2008=2E?= Message-ID: <3XbTyB6PflzQxX@mail.python.org> http://hg.python.org/devguide/rev/6f3e48838a2d changeset: 556:6f3e48838a2d user: Chris Jerdonek date: Tue Oct 09 00:05:40 2012 -0700 summary: Issue #16161: Update link for downloading Microsoft Visual Studio 2008. files: setup.rst | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.rst b/setup.rst --- a/setup.rst +++ b/setup.rst @@ -183,11 +183,14 @@ Windows ''''''' -**Python 3.3** uses Microsoft Visual Studio 2010, which is available at -http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express. +**Python 3.3** and later use Microsoft Visual Studio 2010. You can +download Microsoft Visual C++ 2010 Express `here +`_. -Most versions previous to 3.3 use Microsoft Visual Studio 2008, available at -https://www.microsoft.com/visualstudio/en-us/products/2008-editions/express. +Most Python versions prior to 3.3 use Microsoft Visual Studio 2008. You can +download Microsoft Visual C++ 2008 Express Edition with SP1 +`here `_. +You may need to select the file named ``vcsetup.exe``. Regardless of Visual Studio version, the ``PCbuild`` directory of a source checkout contains the build files for the Python version you are building. -- Repository URL: http://hg.python.org/devguide From python-checkins at python.org Tue Oct 9 09:23:22 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 9 Oct 2012 09:23:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MTY4?= =?utf-8?q?=3A_Use_specified_socket_type_for_domain_sockets_in_SysLogHandl?= =?utf-8?b?ZXIu?= Message-ID: <3XbVKQ59kpzLyL@mail.python.org> http://hg.python.org/cpython/rev/6e31832f8275 changeset: 79607:6e31832f8275 branch: 2.7 parent: 79605:11171bf6a6bd user: Vinay Sajip date: Tue Oct 09 08:17:41 2012 +0100 summary: Issue #16168: Use specified socket type for domain sockets in SysLogHandler. files: Lib/logging/handlers.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -764,18 +764,12 @@ self.formatter = None def _connect_unixsocket(self, address): - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # syslog may require either DGRAM or STREAM sockets + self.socket = socket.socket(socket.AF_UNIX, self.socktype) try: self.socket.connect(address) except socket.error: self.socket.close() - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - try: - self.socket.connect(address) - except socket.error: - self.socket.close() - raise + raise # curious: when talking to the unix-domain '/dev/log' socket, a # zero-terminator seems to be required. this string is placed -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:23:24 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 9 Oct 2012 09:23:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MTY4?= =?utf-8?q?=3A_Use_specified_socket_type_for_domain_sockets_in_SysLogHandl?= =?utf-8?b?ZXIu?= Message-ID: <3XbVKS0wQFzQth@mail.python.org> http://hg.python.org/cpython/rev/f41e6ef3392a changeset: 79608:f41e6ef3392a branch: 3.2 parent: 79602:3dd012397b11 user: Vinay Sajip date: Tue Oct 09 08:19:25 2012 +0100 summary: Issue #16168: Use specified socket type for domain sockets in SysLogHandler. files: Lib/logging/handlers.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -754,18 +754,12 @@ self.formatter = None def _connect_unixsocket(self, address): - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # syslog may require either DGRAM or STREAM sockets + self.socket = socket.socket(socket.AF_UNIX, self.socktype) try: self.socket.connect(address) except socket.error: self.socket.close() - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - try: - self.socket.connect(address) - except socket.error: - self.socket.close() - raise + raise def encodePriority(self, facility, priority): """ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:23:25 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 9 Oct 2012 09:23:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316168=3A_Merged_SysLogHandler_update_from_3=2E2=2E?= Message-ID: <3XbVKT3LC5zQvw@mail.python.org> http://hg.python.org/cpython/rev/e4212f81d633 changeset: 79609:e4212f81d633 branch: 3.3 parent: 79603:0ef3b801ccbc parent: 79608:f41e6ef3392a user: Vinay Sajip date: Tue Oct 09 08:22:01 2012 +0100 summary: Issue #16168: Merged SysLogHandler update from 3.2. files: Lib/logging/handlers.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -794,18 +794,12 @@ self.formatter = None def _connect_unixsocket(self, address): - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # syslog may require either DGRAM or STREAM sockets + self.socket = socket.socket(socket.AF_UNIX, self.socktype) try: self.socket.connect(address) except socket.error: self.socket.close() - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - try: - self.socket.connect(address) - except socket.error: - self.socket.close() - raise + raise def encodePriority(self, facility, priority): """ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:23:26 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 9 Oct 2012 09:23:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Closes_=2316168=3A_Merged_SysLogHandler_update_from_3=2E?= =?utf-8?q?3=2E?= Message-ID: <3XbVKV5yQYzPF4@mail.python.org> http://hg.python.org/cpython/rev/d7d3e1a03fe0 changeset: 79610:d7d3e1a03fe0 parent: 79606:46889b772442 parent: 79609:e4212f81d633 user: Vinay Sajip date: Tue Oct 09 08:23:06 2012 +0100 summary: Closes #16168: Merged SysLogHandler update from 3.3. files: Lib/logging/handlers.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -790,18 +790,12 @@ self.formatter = None def _connect_unixsocket(self, address): - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # syslog may require either DGRAM or STREAM sockets + self.socket = socket.socket(socket.AF_UNIX, self.socktype) try: self.socket.connect(address) except socket.error: self.socket.close() - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - try: - self.socket.connect(address) - except socket.error: - self.socket.close() - raise + raise def encodePriority(self, facility, priority): """ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:41:05 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 9 Oct 2012 09:41:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_Issue_1592?= =?utf-8?q?2=3A_make_howto/urllib2=2Erst_doctests_pass=2E?= Message-ID: <3XbVjs70PWzQxM@mail.python.org> http://hg.python.org/cpython/rev/a6f37d503878 changeset: 79611:a6f37d503878 branch: 3.2 parent: 79608:f41e6ef3392a user: Senthil Kumaran date: Tue Oct 09 00:37:09 2012 -0700 summary: Fix Issue 15922: make howto/urllib2.rst doctests pass. Patch by Chris Jerdonek. Address Ezio's review comment. files: Doc/howto/urllib2.rst | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -137,7 +137,7 @@ >>> data['location'] = 'Northampton' >>> data['language'] = 'Python' >>> url_values = urllib.parse.urlencode(data) - >>> print(url_values) + >>> print(url_values) # The order may differ from below. #doctest: +SKIP name=Somebody+Here&language=Python&location=Northampton >>> url = 'http://www.example.com/example.cgi' >>> full_url = url + '?' + url_values @@ -207,9 +207,9 @@ >>> req = urllib.request.Request('http://www.pretend_server.org') >>> try: urllib.request.urlopen(req) - >>> except urllib.error.URLError as e: - >>> print(e.reason) - >>> + ... except urllib.error.URLError as e: + ... print(e.reason) #doctest: +SKIP + ... (4, 'getaddrinfo failed') @@ -315,18 +315,17 @@ >>> req = urllib.request.Request('http://www.python.org/fish.html') >>> try: - >>> urllib.request.urlopen(req) - >>> except urllib.error.HTTPError as e: - >>> print(e.code) - >>> print(e.read()) - >>> + ... urllib.request.urlopen(req) + ... except urllib.error.HTTPError as e: + ... print(e.code) + ... print(e.read()) #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 404 - - - Error 404: File Not Found - ...... etc... + b'\n\n\nPage Not Found\n + ... Wrapping it Up -------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:41:07 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 9 Oct 2012 09:41:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_Issue_1592?= =?utf-8?q?2=3A_make_howto/urllib2=2Erst_doctests_pass=2E?= Message-ID: <3XbVjv247SzQx6@mail.python.org> http://hg.python.org/cpython/rev/a24d3e2124b6 changeset: 79612:a24d3e2124b6 branch: 3.3 parent: 79609:e4212f81d633 user: Senthil Kumaran date: Tue Oct 09 00:38:17 2012 -0700 summary: Fix Issue 15922: make howto/urllib2.rst doctests pass. Patch by Chris Jerdonek. Address Ezio's review comment. files: Doc/howto/urllib2.rst | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -144,7 +144,7 @@ >>> data['location'] = 'Northampton' >>> data['language'] = 'Python' >>> url_values = urllib.parse.urlencode(data) - >>> print(url_values) + >>> print(url_values) # The order may differ from below. #doctest: +SKIP name=Somebody+Here&language=Python&location=Northampton >>> url = 'http://www.example.com/example.cgi' >>> full_url = url + '?' + url_values @@ -214,9 +214,9 @@ >>> req = urllib.request.Request('http://www.pretend_server.org') >>> try: urllib.request.urlopen(req) - >>> except urllib.error.URLError as e: - >>> print(e.reason) - >>> + ... except urllib.error.URLError as e: + ... print(e.reason) #doctest: +SKIP + ... (4, 'getaddrinfo failed') @@ -322,18 +322,17 @@ >>> req = urllib.request.Request('http://www.python.org/fish.html') >>> try: - >>> urllib.request.urlopen(req) - >>> except urllib.error.HTTPError as e: - >>> print(e.code) - >>> print(e.read()) - >>> + ... urllib.request.urlopen(req) + ... except urllib.error.HTTPError as e: + ... print(e.code) + ... print(e.read()) #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 404 - - - Error 404: File Not Found - ...... etc... + b'\n\n\nPage Not Found\n + ... Wrapping it Up -------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 09:41:08 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 9 Oct 2012 09:41:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Fix_Issue_15922=3A_make_howto/urllib2=2Erst_doctests_pas?= =?utf-8?q?s=2E?= Message-ID: <3XbVjw4XmSzQxn@mail.python.org> http://hg.python.org/cpython/rev/8f699eac0908 changeset: 79613:8f699eac0908 parent: 79610:d7d3e1a03fe0 parent: 79612:a24d3e2124b6 user: Senthil Kumaran date: Tue Oct 09 00:40:55 2012 -0700 summary: Fix Issue 15922: make howto/urllib2.rst doctests pass. Patch by Chris Jerdonek. Address Ezio's review comment. files: Doc/howto/urllib2.rst | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -144,7 +144,7 @@ >>> data['location'] = 'Northampton' >>> data['language'] = 'Python' >>> url_values = urllib.parse.urlencode(data) - >>> print(url_values) + >>> print(url_values) # The order may differ from below. #doctest: +SKIP name=Somebody+Here&language=Python&location=Northampton >>> url = 'http://www.example.com/example.cgi' >>> full_url = url + '?' + url_values @@ -214,9 +214,9 @@ >>> req = urllib.request.Request('http://www.pretend_server.org') >>> try: urllib.request.urlopen(req) - >>> except urllib.error.URLError as e: - >>> print(e.reason) - >>> + ... except urllib.error.URLError as e: + ... print(e.reason) #doctest: +SKIP + ... (4, 'getaddrinfo failed') @@ -322,18 +322,17 @@ >>> req = urllib.request.Request('http://www.python.org/fish.html') >>> try: - >>> urllib.request.urlopen(req) - >>> except urllib.error.HTTPError as e: - >>> print(e.code) - >>> print(e.read()) - >>> + ... urllib.request.urlopen(req) + ... except urllib.error.HTTPError as e: + ... print(e.code) + ... print(e.read()) #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 404 - - - Error 404: File Not Found - ...... etc... + b'\n\n\nPage Not Found\n + ... Wrapping it Up -------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 10:03:53 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 9 Oct 2012 10:03:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_Issue_1592?= =?utf-8?q?2=3A_make_howto/urllib2=2Erst_doctests_pass=2E?= Message-ID: <3XbWD91ltXzQts@mail.python.org> http://hg.python.org/cpython/rev/b2f282991973 changeset: 79614:b2f282991973 branch: 2.7 parent: 79607:6e31832f8275 user: Senthil Kumaran date: Tue Oct 09 01:03:35 2012 -0700 summary: Fix Issue 15922: make howto/urllib2.rst doctests pass. Patch by Chris Jerdonek. Address Ezio's review comment. files: Doc/howto/urllib2.rst | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -134,7 +134,7 @@ >>> data['location'] = 'Northampton' >>> data['language'] = 'Python' >>> url_values = urllib.urlencode(data) - >>> print url_values + >>> print url_values # The order may differ. #doctest: +SKIP name=Somebody+Here&language=Python&location=Northampton >>> url = 'http://www.example.com/example.cgi' >>> full_url = url + '?' + url_values @@ -201,9 +201,9 @@ >>> req = urllib2.Request('http://www.pretend_server.org') >>> try: urllib2.urlopen(req) - >>> except URLError, e: - >>> print e.reason - >>> + ... except URLError, e: + ... print e.reason #doctest: +SKIP + ... (4, 'getaddrinfo failed') @@ -309,18 +309,18 @@ >>> req = urllib2.Request('http://www.python.org/fish.html') >>> try: - >>> urllib2.urlopen(req) - >>> except HTTPError, e: - >>> print e.code - >>> print e.read() - >>> + ... urllib2.urlopen(req) + ... except urllib2.HTTPError, e: + ... print e.code + ... print e.read() #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 404 - - - Error 404: File Not Found - ...... etc... + + ... + Page Not Found + ... + Wrapping it Up -------------- -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 10:06:44 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 9 Oct 2012 10:06:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316110=3A_fileCon?= =?utf-8?q?fig_now_accepts_a_pre-initialised_ConfigParser_instance=2E?= Message-ID: <3XbWHS6931zQsy@mail.python.org> http://hg.python.org/cpython/rev/ce0d0d052494 changeset: 79615:ce0d0d052494 parent: 79613:8f699eac0908 user: Vinay Sajip date: Tue Oct 09 09:06:03 2012 +0100 summary: Closes #16110: fileConfig now accepts a pre-initialised ConfigParser instance. files: Doc/library/logging.config.rst | 31 ++++++++++++++++++--- Lib/logging/config.py | 11 ++++-- Lib/test/test_logging.py | 19 +++++++++++++ 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst --- a/Doc/library/logging.config.rst +++ b/Doc/library/logging.config.rst @@ -76,11 +76,23 @@ .. function:: fileConfig(fname, defaults=None, disable_existing_loggers=True) - Reads the logging configuration from a :mod:`configparser`\-format file - named *fname*. This function can be called several times from an - application, allowing an end user to select from various pre-canned - configurations (if the developer provides a mechanism to present the choices - and load the chosen configuration). + Reads the logging configuration from a :mod:`configparser`\-format file. + This function can be called several times from an application, allowing an + end user to select from various pre-canned configurations (if the developer + provides a mechanism to present the choices and load the chosen + configuration). + + :param fname: A filename, or a file-like object, or an instance derived + from :class:`~configparser.RawConfigParser`. If a + ``RawConfigParser``-derived instance is passed, it is used as + is. Otherwise, a :class:`~configparser.Configparser` is + instantiated, and the configuration read by it from the + object passed in ``fname``. If that has a :meth:`readline` + method, it is assumed to be a file-like object and read using + :meth:`~configparser.ConfigParser.read_file`; otherwise, + it is assumed to be a filename and passed to + :meth:`~configparser.ConfigParser.read`. + :param defaults: Defaults to be passed to the ConfigParser can be specified in this argument. @@ -94,6 +106,15 @@ their ancestors are explicitly named in the logging configuration. + .. versionchanged:: 3.4 + An instance of a subclass of :class:`~configparser.RawConfigParser` is + now accepted as a value for ``fname``. This facilitates: + + * Use of a configuration file where logging configuration is just part + of the overall application configuration. + * Use of a configuration read from a file, and then modified by the using + application (e.g. based on command-line parameters or other aspects + of the runtime environment) before being passed to ``fileConfig``. .. function:: listen(port=DEFAULT_LOGGING_CONFIG_PORT, verify=None) diff --git a/Lib/logging/config.py b/Lib/logging/config.py --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -61,11 +61,14 @@ """ import configparser - cp = configparser.ConfigParser(defaults) - if hasattr(fname, 'readline'): - cp.read_file(fname) + if isinstance(fname, configparser.RawConfigParser): + cp = fname else: - cp.read(fname) + cp = configparser.ConfigParser(defaults) + if hasattr(fname, 'readline'): + cp.read_file(fname) + else: + cp.read(fname) formatters = _create_formatters(cp) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -26,6 +26,7 @@ import logging.config import codecs +import configparser import datetime import pickle import io @@ -1279,6 +1280,24 @@ # Original logger output is empty. self.assert_log_lines([]) + def test_config0_using_cp_ok(self): + # A simple config file which overrides the default settings. + with captured_stdout() as output: + file = io.StringIO(textwrap.dedent(self.config0)) + cp = configparser.ConfigParser() + cp.read_file(file) + logging.config.fileConfig(cp) + logger = logging.getLogger() + # Won't output anything + logger.info(self.next_message()) + # Outputs a message + logger.error(self.next_message()) + self.assert_log_lines([ + ('ERROR', '2'), + ], stream=output) + # Original logger output is empty. + self.assert_log_lines([]) + def test_config1_ok(self, config=config1): # A config file defining a sub-parser as well. with captured_stdout() as output: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 12:45:21 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 9 Oct 2012 12:45:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MTc0?= =?utf-8?q?=3A_Fix_suggested_usage_of_dummy=5Fthreading_module=2E?= Message-ID: <3XbZpT5QwxzNxJ@mail.python.org> http://hg.python.org/cpython/rev/7de9c620716e changeset: 79616:7de9c620716e branch: 3.2 parent: 79611:a6f37d503878 user: Andrew Svetlov date: Tue Oct 09 13:44:16 2012 +0300 summary: Issue #16174: Fix suggested usage of dummy_threading module. Patch by Berker Peksag. files: Doc/library/dummy_threading.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/dummy_threading.rst b/Doc/library/dummy_threading.rst --- a/Doc/library/dummy_threading.rst +++ b/Doc/library/dummy_threading.rst @@ -17,7 +17,7 @@ try: import threading except ImportError: - import dummy_threading + import dummy_threading as threading Be careful to not use this module where deadlock might occur from a thread being created that blocks waiting for another thread to be created. This often occurs -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 12:45:23 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 9 Oct 2012 12:45:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2316174=3A_Fix_suggested_usage_of_dummy=5Fthreadi?= =?utf-8?q?ng_module=2E?= Message-ID: <3XbZpW16zlzQtp@mail.python.org> http://hg.python.org/cpython/rev/f02974773a71 changeset: 79617:f02974773a71 branch: 3.3 parent: 79612:a24d3e2124b6 parent: 79616:7de9c620716e user: Andrew Svetlov date: Tue Oct 09 13:44:48 2012 +0300 summary: Merge issue #16174: Fix suggested usage of dummy_threading module. Patch by Berker Peksag. files: Doc/library/dummy_threading.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/dummy_threading.rst b/Doc/library/dummy_threading.rst --- a/Doc/library/dummy_threading.rst +++ b/Doc/library/dummy_threading.rst @@ -17,7 +17,7 @@ try: import threading except ImportError: - import dummy_threading + import dummy_threading as threading Be careful to not use this module where deadlock might occur from a thread being created that blocks waiting for another thread to be created. This often occurs -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 12:45:24 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 9 Oct 2012 12:45:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316174=3A_Fix_suggested_usage_of_dummy=5Ft?= =?utf-8?q?hreading_module=2E?= Message-ID: <3XbZpX4H7lzQy2@mail.python.org> http://hg.python.org/cpython/rev/a93efd445982 changeset: 79618:a93efd445982 parent: 79615:ce0d0d052494 parent: 79617:f02974773a71 user: Andrew Svetlov date: Tue Oct 09 13:45:10 2012 +0300 summary: Merge issue #16174: Fix suggested usage of dummy_threading module. Patch by Berker Peksag. files: Doc/library/dummy_threading.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/dummy_threading.rst b/Doc/library/dummy_threading.rst --- a/Doc/library/dummy_threading.rst +++ b/Doc/library/dummy_threading.rst @@ -17,7 +17,7 @@ try: import threading except ImportError: - import dummy_threading + import dummy_threading as threading Be careful to not use this module where deadlock might occur from a thread being created that blocks waiting for another thread to be created. This often occurs -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 14:55:28 2012 From: python-checkins at python.org (richard.oudkerk) Date: Tue, 9 Oct 2012 14:55:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTY5?= =?utf-8?q?=3A_Fix_ctypes=2EWinError=28=29=27s_confusion_between_errno_and?= =?utf-8?q?_winerror?= Message-ID: <3Xbdhc0vJ9zQxp@mail.python.org> http://hg.python.org/cpython/rev/a3d65edc3b04 changeset: 79619:a3d65edc3b04 branch: 3.3 parent: 79617:f02974773a71 user: Richard Oudkerk date: Tue Oct 09 13:28:10 2012 +0100 summary: Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror files: Lib/ctypes/__init__.py | 2 +- Lib/ctypes/test/test_win32.py | 22 ++++++++++++++++++++++ Misc/NEWS | 2 ++ 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -456,7 +456,7 @@ code = GetLastError() if descr is None: descr = FormatError(code).strip() - return WindowsError(code, descr) + return WindowsError(None, descr, None, code) if sizeof(c_uint) == sizeof(c_void_p): c_size_t = c_uint diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py --- a/Lib/ctypes/test/test_win32.py +++ b/Lib/ctypes/test/test_win32.py @@ -67,6 +67,28 @@ self.assertEqual(ex.text, "text") self.assertEqual(ex.details, ("details",)) + class TestWinError(unittest.TestCase): + def test_winerror(self): + # see Issue 16169 + import errno + ERROR_INVALID_PARAMETER = 87 + msg = FormatError(ERROR_INVALID_PARAMETER).strip() + args = (errno.EINVAL, msg, None, ERROR_INVALID_PARAMETER) + + e = WinError(ERROR_INVALID_PARAMETER) + self.assertEqual(e.args, args) + self.assertEqual(e.errno, errno.EINVAL) + self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER) + + windll.kernel32.SetLastError(ERROR_INVALID_PARAMETER) + try: + raise WinError() + except OSError as exc: + e = exc + self.assertEqual(e.args, args) + self.assertEqual(e.errno, errno.EINVAL) + self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER) + class Structures(unittest.TestCase): def test_struct_by_value(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,8 @@ Library ------- +- Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. + - Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element element_factory (fixes a regression in SimpleTAL). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 14:55:29 2012 From: python-checkins at python.org (richard.oudkerk) Date: Tue, 9 Oct 2012 14:55:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316169=3A_Merge?= Message-ID: <3Xbdhd3R4wzQxd@mail.python.org> http://hg.python.org/cpython/rev/d3c4dcd9a048 changeset: 79620:d3c4dcd9a048 parent: 79618:a93efd445982 parent: 79619:a3d65edc3b04 user: Richard Oudkerk date: Tue Oct 09 13:54:02 2012 +0100 summary: Issue #16169: Merge files: Lib/ctypes/__init__.py | 2 +- Lib/ctypes/test/test_win32.py | 22 ++++++++++++++++++++++ Misc/NEWS | 2 ++ 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -456,7 +456,7 @@ code = GetLastError() if descr is None: descr = FormatError(code).strip() - return WindowsError(code, descr) + return WindowsError(None, descr, None, code) if sizeof(c_uint) == sizeof(c_void_p): c_size_t = c_uint diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py --- a/Lib/ctypes/test/test_win32.py +++ b/Lib/ctypes/test/test_win32.py @@ -67,6 +67,28 @@ self.assertEqual(ex.text, "text") self.assertEqual(ex.details, ("details",)) + class TestWinError(unittest.TestCase): + def test_winerror(self): + # see Issue 16169 + import errno + ERROR_INVALID_PARAMETER = 87 + msg = FormatError(ERROR_INVALID_PARAMETER).strip() + args = (errno.EINVAL, msg, None, ERROR_INVALID_PARAMETER) + + e = WinError(ERROR_INVALID_PARAMETER) + self.assertEqual(e.args, args) + self.assertEqual(e.errno, errno.EINVAL) + self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER) + + windll.kernel32.SetLastError(ERROR_INVALID_PARAMETER) + try: + raise WinError() + except OSError as exc: + e = exc + self.assertEqual(e.args, args) + self.assertEqual(e.errno, errno.EINVAL) + self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER) + class Structures(unittest.TestCase): def test_struct_by_value(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -42,6 +42,8 @@ Library ------- +- Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. + - Issue #1492704: shutil.copyfile() raises a distinct SameFileError now if source and destination are the same file. Patch by Atsuo Ishimoto. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 15:47:31 2012 From: python-checkins at python.org (eli.bendersky) Date: Tue, 9 Oct 2012 15:47:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEyMzIy?= =?utf-8?q?=3A_clarify_xpath_reference_for_cases_where_the_path_reaches?= Message-ID: <3Xbfrg3g82zQxX@mail.python.org> http://hg.python.org/cpython/rev/79231a12567a changeset: 79621:79231a12567a branch: 3.3 parent: 79619:a3d65edc3b04 user: Eli Bendersky date: Tue Oct 09 06:46:33 2012 -0700 summary: Issue #12322: clarify xpath reference for cases where the path reaches ancestors of the start element. Also add missing markup for a None. Thanks to patrick vrijlandt and Mike Hoy for the report and initial patches. files: Doc/library/xml.etree.elementtree.rst | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -291,7 +291,9 @@ | | current element. For example, ``.//egg`` selects | | | all ``egg`` elements in the entire tree. | +-----------------------+------------------------------------------------------+ -| ``..`` | Selects the parent element. | +| ``..`` | Selects the parent element. Returns ``None`` if the | +| | path attempts to reach the ancestors of the start | +| | element (the element ``find`` was called on). | +-----------------------+------------------------------------------------------+ | ``[@attrib]`` | Selects all elements that have the given attribute. | +-----------------------+------------------------------------------------------+ @@ -521,7 +523,7 @@ .. method:: clear() Resets an element. This function removes all subelements, clears all - attributes, and sets the text and tail attributes to None. + attributes, and sets the text and tail attributes to ``None``. .. method:: get(key, default=None) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 15:47:32 2012 From: python-checkins at python.org (eli.bendersky) Date: Tue, 9 Oct 2012 15:47:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4z?= Message-ID: <3Xbfrh6F06zQwj@mail.python.org> http://hg.python.org/cpython/rev/5cb3c08997e6 changeset: 79622:5cb3c08997e6 parent: 79620:d3c4dcd9a048 parent: 79621:79231a12567a user: Eli Bendersky date: Tue Oct 09 06:47:23 2012 -0700 summary: Merge 3.3 Issue #12322: clarify xpath reference for cases where the path reaches ancestors of the start element. Also add missing markup for a None. Thanks to patrick vrijlandt and Mike Hoy for the report and initial patches. files: Doc/library/xml.etree.elementtree.rst | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -291,7 +291,9 @@ | | current element. For example, ``.//egg`` selects | | | all ``egg`` elements in the entire tree. | +-----------------------+------------------------------------------------------+ -| ``..`` | Selects the parent element. | +| ``..`` | Selects the parent element. Returns ``None`` if the | +| | path attempts to reach the ancestors of the start | +| | element (the element ``find`` was called on). | +-----------------------+------------------------------------------------------+ | ``[@attrib]`` | Selects all elements that have the given attribute. | +-----------------------+------------------------------------------------------+ @@ -521,7 +523,7 @@ .. method:: clear() Resets an element. This function removes all subelements, clears all - attributes, and sets the text and tail attributes to None. + attributes, and sets the text and tail attributes to ``None``. .. method:: get(key, default=None) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 16:19:22 2012 From: python-checkins at python.org (eli.bendersky) Date: Tue, 9 Oct 2012 16:19:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MDgy?= =?utf-8?q?=3A_clarify_the_documentation_of_tostring=5Blist=5D_saying_that?= =?utf-8?q?_it_may?= Message-ID: <3XbgYQ37dpzR17@mail.python.org> http://hg.python.org/cpython/rev/ff925e135e60 changeset: 79623:ff925e135e60 branch: 3.3 parent: 79621:79231a12567a user: Eli Bendersky date: Tue Oct 09 07:18:16 2012 -0700 summary: Issue #16082: clarify the documentation of tostring[list] saying that it may generate a bytestring, depending on the given encoding. files: Doc/library/xml.etree.elementtree.rst | 16 +++++++------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -433,9 +433,9 @@ Generates a string representation of an XML element, including all subelements. *element* is an :class:`Element` instance. *encoding* [1]_ is the output encoding (default is US-ASCII). Use ``encoding="unicode"`` to - generate a Unicode string. *method* is either ``"xml"``, - ``"html"`` or ``"text"`` (default is ``"xml"``). Returns an (optionally) - encoded string containing the XML data. + generate a Unicode string (otherwise, a bytestring is generated). *method* + is either ``"xml"``, ``"html"`` or ``"text"`` (default is ``"xml"``). + Returns an (optionally) encoded string containing the XML data. .. function:: tostringlist(element, encoding="us-ascii", method="xml") @@ -443,11 +443,11 @@ Generates a string representation of an XML element, including all subelements. *element* is an :class:`Element` instance. *encoding* [1]_ is the output encoding (default is US-ASCII). Use ``encoding="unicode"`` to - generate a Unicode string. *method* is either ``"xml"``, - ``"html"`` or ``"text"`` (default is ``"xml"``). Returns a list of - (optionally) encoded strings containing the XML data. It does not guarantee - any specific sequence, except that ``"".join(tostringlist(element)) == - tostring(element)``. + generate a Unicode string (otherwise, a bytestring is generated). *method* + is either ``"xml"``, ``"html"`` or ``"text"`` (default is ``"xml"``). + Returns a list of (optionally) encoded strings containing the XML data. + It does not guarantee any specific sequence, except that + ``"".join(tostringlist(element)) == tostring(element)``. .. versionadded:: 3.2 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 16:19:23 2012 From: python-checkins at python.org (eli.bendersky) Date: Tue, 9 Oct 2012 16:19:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4z?= Message-ID: <3XbgYR6cyBzQy5@mail.python.org> http://hg.python.org/cpython/rev/6e407fcf7380 changeset: 79624:6e407fcf7380 parent: 79622:5cb3c08997e6 parent: 79623:ff925e135e60 user: Eli Bendersky date: Tue Oct 09 07:19:13 2012 -0700 summary: Merge 3.3 Closes #16082: clarify the documentation of tostring[list] saying that it may generate a bytestring, depending on the given encoding. files: Doc/library/xml.etree.elementtree.rst | 16 +++++++------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -433,9 +433,9 @@ Generates a string representation of an XML element, including all subelements. *element* is an :class:`Element` instance. *encoding* [1]_ is the output encoding (default is US-ASCII). Use ``encoding="unicode"`` to - generate a Unicode string. *method* is either ``"xml"``, - ``"html"`` or ``"text"`` (default is ``"xml"``). Returns an (optionally) - encoded string containing the XML data. + generate a Unicode string (otherwise, a bytestring is generated). *method* + is either ``"xml"``, ``"html"`` or ``"text"`` (default is ``"xml"``). + Returns an (optionally) encoded string containing the XML data. .. function:: tostringlist(element, encoding="us-ascii", method="xml") @@ -443,11 +443,11 @@ Generates a string representation of an XML element, including all subelements. *element* is an :class:`Element` instance. *encoding* [1]_ is the output encoding (default is US-ASCII). Use ``encoding="unicode"`` to - generate a Unicode string. *method* is either ``"xml"``, - ``"html"`` or ``"text"`` (default is ``"xml"``). Returns a list of - (optionally) encoded strings containing the XML data. It does not guarantee - any specific sequence, except that ``"".join(tostringlist(element)) == - tostring(element)``. + generate a Unicode string (otherwise, a bytestring is generated). *method* + is either ``"xml"``, ``"html"`` or ``"text"`` (default is ``"xml"``). + Returns a list of (optionally) encoded strings containing the XML data. + It does not guarantee any specific sequence, except that + ``"".join(tostringlist(element)) == tostring(element)``. .. versionadded:: 3.2 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 17:16:42 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 9 Oct 2012 17:16:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_compare_with_e?= =?utf-8?q?quality_not_identity_=28issue_=2316172=29?= Message-ID: <3XbhqZ604CzR2s@mail.python.org> http://hg.python.org/cpython/rev/842276ae4a3f changeset: 79625:842276ae4a3f branch: 3.3 parent: 79257:83496b5e1916 user: Benjamin Peterson date: Tue Oct 09 11:14:59 2012 -0400 summary: compare with equality not identity (issue #16172) Patch from Serhiy Storchaka. files: Lib/test/test_winsound.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -16,16 +16,12 @@ try: # Ask the mixer API for the number of devices it knows about. # When there are no devices, PlaySound will fail. - if ctypes.windll.winmm.mixerGetNumDevs() is 0: + if ctypes.windll.winmm.mixerGetNumDevs() == 0: return False key = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, "AppEvents\Schemes\Apps\.Default\{0}\.Default".format(sound)) - value = winreg.EnumValue(key, 0)[1] - if value is not "": - return True - else: - return False + return winreg.EnumValue(key, 0)[1] != "" except WindowsError: return False -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 17:16:44 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 9 Oct 2012 17:16:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_compare_single?= =?utf-8?q?tons_by_identity_not_equality_=28closes_=2316712=29?= Message-ID: <3Xbhqc3PtWzQwx@mail.python.org> http://hg.python.org/cpython/rev/332b93ce7bf9 changeset: 79626:332b93ce7bf9 branch: 3.3 user: Benjamin Peterson date: Tue Oct 09 11:16:03 2012 -0400 summary: compare singletons by identity not equality (closes #16712) Patch from Serhiy Storchaka. files: Lib/os.py | 2 +- Lib/pydoc.py | 4 ++-- Lib/test/support.py | 2 +- Lib/test/test_ftplib.py | 2 +- Lib/test/test_posix.py | 4 ++-- Lib/test/test_sys.py | 2 +- Lib/unittest/case.py | 2 +- Tools/gdb/libpython.py | 2 +- Tools/scripts/texi2html.py | 10 +++++----- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Lib/os.py b/Lib/os.py --- a/Lib/os.py +++ b/Lib/os.py @@ -985,7 +985,7 @@ raise TypeError("invalid cmd type (%s, expected string)" % type(cmd)) if mode not in ("r", "w"): raise ValueError("invalid mode %r" % mode) - if buffering == 0 or buffering == None: + if buffering == 0 or buffering is None: raise ValueError("popen() does not support unbuffered streams") import subprocess, io if mode == "r": diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -2551,8 +2551,8 @@ if opt == '-w': writing = True - if start_server == True: - if port == None: + if start_server: + if port is None: port = 0 browse(port, open_browser=open_browser) return diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -1232,7 +1232,7 @@ try: return func(*args, **kwds) finally: - if orig_tz == None: + if orig_tz is None: del os.environ['TZ'] else: os.environ['TZ'] = orig_tz diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -342,7 +342,7 @@ # http://www.mail-archive.com/openssl-users at openssl.org/msg60710.html pass self._ssl_closing = False - if getattr(self, '_ccc', False) == False: + if getattr(self, '_ccc', False) is False: super(SSLConnection, self).close() else: pass diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -651,7 +651,7 @@ groups = idg.read().strip() ret = idg.close() - if ret != None or not groups: + if ret is not None or not groups: raise unittest.SkipTest("need working 'id -G'") self.assertEqual( @@ -665,7 +665,7 @@ groups = idg.read().strip() ret = idg.close() - if ret != None or not groups: + if ret is not None or not groups: raise unittest.SkipTest("need working 'id -G'") # 'id -G' and 'os.getgroups()' should return the same diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -897,7 +897,7 @@ except TypeError: tb = sys.exc_info()[2] # traceback - if tb != None: + if tb is not None: check(tb, size('2P2i')) # symtable entry # XXX diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -736,7 +736,7 @@ msg: Optional message to use on failure instead of a list of differences. """ - if seq_type != None: + if seq_type is not None: seq_type_name = seq_type.__name__ if not isinstance(seq1, seq_type): raise self.failureException('First sequence is not a %s: %s' diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -1332,7 +1332,7 @@ /usr/lib/debug/usr/lib/libpython2.6.so.1.0.debug-gdb.py """ def register (obj): - if obj == None: + if obj is None: obj = gdb # Wire up the pretty-printer diff --git a/Tools/scripts/texi2html.py b/Tools/scripts/texi2html.py --- a/Tools/scripts/texi2html.py +++ b/Tools/scripts/texi2html.py @@ -319,7 +319,7 @@ # Start saving text in a buffer instead of writing it to a file def startsaving(self): - if self.savetext != None: + if self.savetext is not None: self.savestack.append(self.savetext) # print '*** Recursively saving text, expect trouble' self.savetext = '' @@ -341,7 +341,7 @@ except: print(args) raise TypeError - if self.savetext != None: + if self.savetext is not None: self.savetext = self.savetext + text elif self.nodefp: self.nodefp.write(text) @@ -350,7 +350,7 @@ # Complete the current node -- write footnotes and close file def endnode(self): - if self.savetext != None: + if self.savetext is not None: print('*** Still saving text at end of node') dummy = self.collectsavings() if self.footnotes: @@ -804,7 +804,7 @@ def close_i(self): self.write('') def open_footnote(self): - # if self.savetext <> None: + # if self.savetext is not None: # print '*** Recursive footnote -- expect weirdness' id = len(self.footnotes) + 1 self.write(self.FN_SOURCE_PATTERN % {'id': repr(id)}) @@ -1442,7 +1442,7 @@ else: # some other character, e.g. '-' args = self.itemarg + ' ' + args - if self.itemnumber != None: + if self.itemnumber is not None: args = self.itemnumber + '. ' + args self.itemnumber = increment(self.itemnumber) if self.stack and self.stack[-1] == 'table': -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 17:16:46 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 9 Oct 2012 17:16:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3Xbhqf155hzQwx@mail.python.org> http://hg.python.org/cpython/rev/49e57a0e4a2d changeset: 79627:49e57a0e4a2d parent: 79624:6e407fcf7380 parent: 79626:332b93ce7bf9 user: Benjamin Peterson date: Tue Oct 09 11:16:13 2012 -0400 summary: merge 3.3 files: Lib/os.py | 2 +- Lib/pydoc.py | 4 ++-- Lib/test/support.py | 2 +- Lib/test/test_ftplib.py | 2 +- Lib/test/test_posix.py | 4 ++-- Lib/test/test_sys.py | 2 +- Lib/test/test_winsound.py | 8 ++------ Lib/unittest/case.py | 2 +- Tools/gdb/libpython.py | 2 +- Tools/scripts/texi2html.py | 10 +++++----- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Lib/os.py b/Lib/os.py --- a/Lib/os.py +++ b/Lib/os.py @@ -961,7 +961,7 @@ raise TypeError("invalid cmd type (%s, expected string)" % type(cmd)) if mode not in ("r", "w"): raise ValueError("invalid mode %r" % mode) - if buffering == 0 or buffering == None: + if buffering == 0 or buffering is None: raise ValueError("popen() does not support unbuffered streams") import subprocess, io if mode == "r": diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -2551,8 +2551,8 @@ if opt == '-w': writing = True - if start_server == True: - if port == None: + if start_server: + if port is None: port = 0 browse(port, open_browser=open_browser) return diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -1232,7 +1232,7 @@ try: return func(*args, **kwds) finally: - if orig_tz == None: + if orig_tz is None: del os.environ['TZ'] else: os.environ['TZ'] = orig_tz diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -342,7 +342,7 @@ # http://www.mail-archive.com/openssl-users at openssl.org/msg60710.html pass self._ssl_closing = False - if getattr(self, '_ccc', False) == False: + if getattr(self, '_ccc', False) is False: super(SSLConnection, self).close() else: pass diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -651,7 +651,7 @@ groups = idg.read().strip() ret = idg.close() - if ret != None or not groups: + if ret is not None or not groups: raise unittest.SkipTest("need working 'id -G'") self.assertEqual( @@ -665,7 +665,7 @@ groups = idg.read().strip() ret = idg.close() - if ret != None or not groups: + if ret is not None or not groups: raise unittest.SkipTest("need working 'id -G'") # 'id -G' and 'os.getgroups()' should return the same diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -897,7 +897,7 @@ except TypeError: tb = sys.exc_info()[2] # traceback - if tb != None: + if tb is not None: check(tb, size('2P2i')) # symtable entry # XXX diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -16,16 +16,12 @@ try: # Ask the mixer API for the number of devices it knows about. # When there are no devices, PlaySound will fail. - if ctypes.windll.winmm.mixerGetNumDevs() is 0: + if ctypes.windll.winmm.mixerGetNumDevs() == 0: return False key = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, "AppEvents\Schemes\Apps\.Default\{0}\.Default".format(sound)) - value = winreg.EnumValue(key, 0)[1] - if value is not "": - return True - else: - return False + return winreg.EnumValue(key, 0)[1] != "" except WindowsError: return False diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -736,7 +736,7 @@ msg: Optional message to use on failure instead of a list of differences. """ - if seq_type != None: + if seq_type is not None: seq_type_name = seq_type.__name__ if not isinstance(seq1, seq_type): raise self.failureException('First sequence is not a %s: %s' diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -1332,7 +1332,7 @@ /usr/lib/debug/usr/lib/libpython2.6.so.1.0.debug-gdb.py """ def register (obj): - if obj == None: + if obj is None: obj = gdb # Wire up the pretty-printer diff --git a/Tools/scripts/texi2html.py b/Tools/scripts/texi2html.py --- a/Tools/scripts/texi2html.py +++ b/Tools/scripts/texi2html.py @@ -319,7 +319,7 @@ # Start saving text in a buffer instead of writing it to a file def startsaving(self): - if self.savetext != None: + if self.savetext is not None: self.savestack.append(self.savetext) # print '*** Recursively saving text, expect trouble' self.savetext = '' @@ -341,7 +341,7 @@ except: print(args) raise TypeError - if self.savetext != None: + if self.savetext is not None: self.savetext = self.savetext + text elif self.nodefp: self.nodefp.write(text) @@ -350,7 +350,7 @@ # Complete the current node -- write footnotes and close file def endnode(self): - if self.savetext != None: + if self.savetext is not None: print('*** Still saving text at end of node') dummy = self.collectsavings() if self.footnotes: @@ -804,7 +804,7 @@ def close_i(self): self.write('') def open_footnote(self): - # if self.savetext <> None: + # if self.savetext is not None: # print '*** Recursive footnote -- expect weirdness' id = len(self.footnotes) + 1 self.write(self.FN_SOURCE_PATTERN % {'id': repr(id)}) @@ -1442,7 +1442,7 @@ else: # some other character, e.g. '-' args = self.itemarg + ' ' + args - if self.itemnumber != None: + if self.itemnumber is not None: args = self.itemnumber + '. ' + args self.itemnumber = increment(self.itemnumber) if self.stack and self.stack[-1] == 'table': -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 17:16:51 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 9 Oct 2012 17:16:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_merge_heads?= Message-ID: <3Xbhql1K1DzR2l@mail.python.org> http://hg.python.org/cpython/rev/4d5cb87230f4 changeset: 79628:4d5cb87230f4 branch: 3.3 parent: 79626:332b93ce7bf9 parent: 79623:ff925e135e60 user: Benjamin Peterson date: Tue Oct 09 11:16:26 2012 -0400 summary: merge heads files: Doc/Makefile | 2 +- Doc/c-api/unicode.rst | 2 - Doc/glossary.rst | 2 +- Doc/howto/ipaddress.rst | 27 +- Doc/howto/urllib2.rst | 29 +- Doc/library/collections.rst | 22 +- Doc/library/concurrency.rst | 1 + Doc/library/concurrent.rst | 6 + Doc/library/configparser.rst | 14 +- Doc/library/doctest.rst | 28 +- Doc/library/dummy_threading.rst | 2 +- Doc/library/ftplib.rst | 18 +- Doc/library/functions.rst | 3 +- Doc/library/gc.rst | 6 +- Doc/library/html.rst | 7 + Doc/library/http.rst | 11 + Doc/library/internet.rst | 3 + Doc/library/ipaddress.rst | 21 +- Doc/library/markup.rst | 9 +- Doc/library/multiprocessing.rst | 6 +- Doc/library/os.rst | 19 +- Doc/library/socketserver.rst | 18 +- Doc/library/sqlite3.rst | 448 +- Doc/library/subprocess.rst | 71 +- Doc/library/tempfile.rst | 3 + Doc/library/threading.rst | 313 +- Doc/library/time.rst | 2 +- Doc/library/timeit.rst | 269 +- Doc/library/urllib.rst | 9 + Doc/library/xml.etree.elementtree.rst | 22 +- Doc/library/xml.rst | 29 + Doc/library/xmlrpc.rst | 12 + Doc/library/zipfile.rst | 24 +- Doc/make.bat | 2 +- Doc/reference/datamodel.rst | 2 +- Doc/reference/expressions.rst | 14 +- Doc/reference/lexical_analysis.rst | 4 +- Doc/tools/sphinxext/indexsidebar.html | 2 +- Doc/tools/sphinxext/layout.html | 59 +- Doc/tools/sphinxext/pyspecific.py | 42 + Doc/tools/sphinxext/susp-ignored.csv | 12 + Doc/using/windows.rst | 2 + Doc/whatsnew/3.3.rst | 1545 +- Doc/whatsnew/changelog.rst | 6 + Doc/whatsnew/index.rst | 8 + Include/unicodeobject.h | 3 +- Lib/bz2.py | 105 +- Lib/codecs.py | 2 +- Lib/ctypes/__init__.py | 2 +- Lib/ctypes/test/test_win32.py | 22 + Lib/idlelib/config-extensions.def | 2 + Lib/ipaddress.py | 7 +- Lib/logging/handlers.py | 10 +- Lib/platform.py | 12 +- Lib/pstats.py | 6 +- Lib/socketserver.py | 2 +- Lib/subprocess.py | 9 +- Lib/test/subprocessdata/sigchild_ignore.py | 11 +- Lib/test/test_capi.py | 11 + Lib/test/test_httpservers.py | 1 + Lib/test/test_subprocess.py | 156 +- Lib/test/test_threaded_import.py | 4 +- Lib/test/test_xml_etree.py | 44 +- Lib/xml/etree/ElementTree.py | 4 +- Misc/ACKS | 6 +- Misc/HISTORY | 5397 +++++++++ Misc/NEWS | 5965 +--------- Modules/_codecsmodule.c | 4 +- Modules/_datetimemodule.c | 7 +- Modules/_decimal/libmpdec/typearith.h | 32 +- Modules/_decimal/libmpdec/umodarith.h | 156 +- Modules/_decimal/tests/bench.py | 9 +- Modules/_elementtree.c | 279 +- Modules/_randommodule.c | 3 +- Modules/_testcapimodule.c | 2 +- Modules/arraymodule.c | 12 +- Modules/audioop.c | 4 +- Modules/zipimport.c | 43 +- Objects/longobject.c | 24 +- Objects/rangeobject.c | 5 +- Objects/sliceobject.c | 3 +- Objects/tupleobject.c | 12 +- Objects/unicodeobject.c | 44 +- Parser/asdl_c.py | 2 +- setup.py | 1 + 85 files changed, 8328 insertions(+), 7251 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -53,7 +53,7 @@ fi @if [ ! -d tools/pygments ]; then \ echo "Checking out Pygments..."; \ - svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \ + svn checkout $(SVNROOT)/external/Pygments-1.5dev-20120930/pygments tools/pygments; \ fi update: clean checkout diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -1083,8 +1083,6 @@ After completion, *\*byteorder* is set to the current byte order at the end of input data. - In a narrow build codepoints outside the BMP will be decoded as surrogate pairs. - If *byteorder* is *NULL*, the codec starts in native order mode. Return *NULL* if an exception was raised by the codec. diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -660,7 +660,7 @@ sequence An :term:`iterable` which supports efficient element access using integer indices via the :meth:`__getitem__` special method and defines a - :meth:`len` method that returns the length of the sequence. + :meth:`__len__` method that returns the length of the sequence. Some built-in sequence types are :class:`list`, :class:`str`, :class:`tuple`, and :class:`bytes`. Note that :class:`dict` also supports :meth:`__getitem__` and :meth:`__len__`, but is considered a diff --git a/Doc/howto/ipaddress.rst b/Doc/howto/ipaddress.rst --- a/Doc/howto/ipaddress.rst +++ b/Doc/howto/ipaddress.rst @@ -1,7 +1,7 @@ .. _ipaddress-howto: *************************************** -An Introduction to the ipaddress module +An introduction to the ipaddress module *************************************** :author: Peter Moody @@ -47,7 +47,12 @@ when working with IP addressing. The simplest way to create addresses is to use the :func:`ipaddress.ip_address` factory function, which automatically determines whether to create an IPv4 or IPv6 address based on the passed in -value:: +value: + +.. testsetup:: + >>> import ipaddress + +:: >>> ipaddress.ip_address('192.0.2.1') IPv4Address('192.0.2.1') @@ -142,7 +147,7 @@ >>> ipaddress.ip_interface('192.0.2.1/24') IPv4Interface('192.0.2.1/24') - >>> ipaddress.ip_network('2001:db8::1/96') + >>> ipaddress.ip_interface('2001:db8::1/96') IPv6Interface('2001:db8::1/96') Integer inputs are accepted (as with networks), and use of a particular IP @@ -177,22 +182,22 @@ Finding out how many individual addresses are in a network:: >>> net4 = ipaddress.ip_network('192.0.2.0/24') - >>> net4.numhosts + >>> net4.num_addresses 256 >>> net6 = ipaddress.ip_network('2001:db8::0/96') - >>> net6.numhosts + >>> net6.num_addresses 4294967296 Iterating through the "usable" addresses on a network:: >>> net4 = ipaddress.ip_network('192.0.2.0/24') >>> for x in net4.hosts(): - print(x) + ... print(x) # doctest: +ELLIPSIS 192.0.2.1 192.0.2.2 192.0.2.3 192.0.2.4 - + ... 192.0.2.252 192.0.2.253 192.0.2.254 @@ -216,9 +221,9 @@ Exploding or compressing the address:: >>> addr6.exploded - '2001:0db8:0000:0000:0000:0000:0000:0000' + '2001:0db8:0000:0000:0000:0000:0000:0001' >>> addr6.compressed - '2001:db8::' + '2001:db8::1' >>> net6.exploded '2001:0db8:0000:0000:0000:0000:0000:0000/96' >>> net6.compressed @@ -241,9 +246,9 @@ >>> net4[-1] IPv4Address('192.0.2.255') >>> net6[1] - IPv6Address('2001::1') + IPv6Address('2001:db8::1') >>> net6[-1] - IPv6Address('2001::ffff:ffff') + IPv6Address('2001:db8::ffff:ffff') It also means that network objects lend themselves to using the list diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -144,7 +144,7 @@ >>> data['location'] = 'Northampton' >>> data['language'] = 'Python' >>> url_values = urllib.parse.urlencode(data) - >>> print(url_values) + >>> print(url_values) # The order may differ from below. #doctest: +SKIP name=Somebody+Here&language=Python&location=Northampton >>> url = 'http://www.example.com/example.cgi' >>> full_url = url + '?' + url_values @@ -214,9 +214,9 @@ >>> req = urllib.request.Request('http://www.pretend_server.org') >>> try: urllib.request.urlopen(req) - >>> except urllib.error.URLError as e: - >>> print(e.reason) - >>> + ... except urllib.error.URLError as e: + ... print(e.reason) #doctest: +SKIP + ... (4, 'getaddrinfo failed') @@ -322,18 +322,17 @@ >>> req = urllib.request.Request('http://www.python.org/fish.html') >>> try: - >>> urllib.request.urlopen(req) - >>> except urllib.error.HTTPError as e: - >>> print(e.code) - >>> print(e.read()) - >>> + ... urllib.request.urlopen(req) + ... except urllib.error.HTTPError as e: + ... print(e.code) + ... print(e.read()) #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 404 - - - Error 404: File Not Found - ...... etc... + b'\n\n\nPage Not Found\n + ... Wrapping it Up -------------- diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -159,7 +159,7 @@ d['x'] # Get first key in the chain of contexts d['x'] = 1 # Set value in current context - del['x'] # Delete from current context + del d['x'] # Delete from current context list(d) # All nested values k in d # Check all nested values len(d) # Number of nested values @@ -347,24 +347,24 @@ this section documents the minimum range and type restrictions. * The :class:`Counter` class itself is a dictionary subclass with no - restrictions on its keys and values. The values are intended to be numbers - representing counts, but you *could* store anything in the value field. + restrictions on its keys and values. The values are intended to be numbers + representing counts, but you *could* store anything in the value field. * The :meth:`most_common` method requires only that the values be orderable. * For in-place operations such as ``c[key] += 1``, the value type need only - support addition and subtraction. So fractions, floats, and decimals would - work and negative values are supported. The same is also true for - :meth:`update` and :meth:`subtract` which allow negative and zero values - for both inputs and outputs. + support addition and subtraction. So fractions, floats, and decimals would + work and negative values are supported. The same is also true for + :meth:`update` and :meth:`subtract` which allow negative and zero values + for both inputs and outputs. * The multiset methods are designed only for use cases with positive values. - The inputs may be negative or zero, but only outputs with positive values - are created. There are no type restrictions, but the value type needs to - support addition, subtraction, and comparison. + The inputs may be negative or zero, but only outputs with positive values + are created. There are no type restrictions, but the value type needs to + support addition, subtraction, and comparison. * The :meth:`elements` method requires integer counts. It ignores zero and - negative counts. + negative counts. .. seealso:: diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst --- a/Doc/library/concurrency.rst +++ b/Doc/library/concurrency.rst @@ -15,6 +15,7 @@ threading.rst multiprocessing.rst + concurrent.rst concurrent.futures.rst subprocess.rst sched.rst diff --git a/Doc/library/concurrent.rst b/Doc/library/concurrent.rst new file mode 100644 --- /dev/null +++ b/Doc/library/concurrent.rst @@ -0,0 +1,6 @@ +The :mod:`concurrent` package +============================= + +Currently, there is only one module in this package: + +* :mod:`concurrent.futures` -- Launching parallel tasks diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -770,9 +770,9 @@ # values using the mapping protocol or ConfigParser's set() does not allow # such assignments to take place. config.add_section('Section1') - config.set('Section1', 'int', '15') - config.set('Section1', 'bool', 'true') - config.set('Section1', 'float', '3.1415') + config.set('Section1', 'an_int', '15') + config.set('Section1', 'a_bool', 'true') + config.set('Section1', 'a_float', '3.1415') config.set('Section1', 'baz', 'fun') config.set('Section1', 'bar', 'Python') config.set('Section1', 'foo', '%(bar)s is %(baz)s!') @@ -790,13 +790,13 @@ # getfloat() raises an exception if the value is not a float # getint() and getboolean() also do this for their respective types - float = config.getfloat('Section1', 'float') - int = config.getint('Section1', 'int') - print(float + int) + a_float = config.getfloat('Section1', 'a_float') + an_int = config.getint('Section1', 'an_int') + print(a_float + an_int) # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'. # This is because we are using a RawConfigParser(). - if config.getboolean('Section1', 'bool'): + if config.getboolean('Section1', 'a_bool'): print(config.get('Section1', 'foo')) To get interpolation, use :class:`ConfigParser`:: diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -650,7 +650,16 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. -For example, this test passes:: +.. note:: + Due to an `unfortunate limitation`_ of our current documentation + publishing process, syntax highlighting has been disabled in the examples + below in order to ensure the doctest directives are correctly displayed. + + .. _unfortunate limitation: http://bugs.python.org/issue12947 + +For example, this test passes: + +.. code-block:: text >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -659,18 +668,25 @@ Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so:: +so: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] -Multiple directives can be used on a single physical line, separated by commas:: +Multiple directives can be used on a single physical line, separated by +commas: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined:: +combined: + +.. code-block:: text >>> print(list(range(20))) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -678,7 +694,9 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line:: +a directive to comfortably fit on the same line: + +.. code-block:: text >>> print(list(range(5)) + list(range(10, 20)) + list(range(30, 40))) ... # doctest: +ELLIPSIS diff --git a/Doc/library/dummy_threading.rst b/Doc/library/dummy_threading.rst --- a/Doc/library/dummy_threading.rst +++ b/Doc/library/dummy_threading.rst @@ -17,7 +17,7 @@ try: import threading except ImportError: - import dummy_threading + import dummy_threading as threading Be careful to not use this module where deadlock might occur from a thread being created that blocks waiting for another thread to be created. This often occurs diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -270,12 +270,12 @@ .. method:: FTP.storbinary(cmd, file, blocksize=8192, callback=None, rest=None) Store a file in binary transfer mode. *cmd* should be an appropriate - ``STOR`` command: ``"STOR filename"``. *file* is an open :term:`file object` - which is read until EOF using its :meth:`read` method in blocks of size - *blocksize* to provide the data to be stored. The *blocksize* argument - defaults to 8192. *callback* is an optional single parameter callable that - is called on each block of data after it is sent. *rest* means the same thing - as in the :meth:`transfercmd` method. + ``STOR`` command: ``"STOR filename"``. *file* is a :term:`file object` + (opened in binary mode) which is read until EOF using its :meth:`read` + method in blocks of size *blocksize* to provide the data to be stored. + The *blocksize* argument defaults to 8192. *callback* is an optional single + parameter callable that is called on each block of data after it is sent. + *rest* means the same thing as in the :meth:`transfercmd` method. .. versionchanged:: 3.2 *rest* parameter added. @@ -285,9 +285,9 @@ Store a file in ASCII transfer mode. *cmd* should be an appropriate ``STOR`` command (see :meth:`storbinary`). Lines are read until EOF from the - open :term:`file object` *file* using its :meth:`readline` method to provide - the data to be stored. *callback* is an optional single parameter callable - that is called on each line after it is sent. + :term:`file object` *file* (opened in binary mode) using its :meth:`readline` + method to provide the data to be stored. *callback* is an optional single + parameter callable that is called on each line after it is sent. .. method:: FTP.transfercmd(cmd, rest=None) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1203,7 +1203,8 @@ .. _func-str: -.. function:: str([object[, encoding[, errors]]]) +.. function:: str(object='') + str(object[, encoding[, errors]]) Return a string version of an object, using one of the following modes: diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst --- a/Doc/library/gc.rst +++ b/Doc/library/gc.rst @@ -189,13 +189,13 @@ after collection. The callbacks will be called with two arguments, *phase* and *info*. - *phase* can one of two values: + *phase* can be one of two values: "start": The garbage collection is about to start. "stop": The garbage collection has finished. - *info* provides more information for the callback. The following + *info* is a dict providing more information for the callback. The following keys are currently defined: "generation": The oldest generation being collected. @@ -203,7 +203,7 @@ "collected": When *phase* is "stop", the number of objects successfully collected. - "uncollectable": when *phase* is "stop", the number of objects + "uncollectable": When *phase* is "stop", the number of objects that could not be collected and were put in :data:`garbage`. Applications can add their own callbacks to this list. The primary diff --git a/Doc/library/html.rst b/Doc/library/html.rst --- a/Doc/library/html.rst +++ b/Doc/library/html.rst @@ -19,3 +19,10 @@ attribute value delimited by quotes, as in ````. .. versionadded:: 3.2 + +-------------- + +Submodules in the ``html`` package are: + +* :mod:`html.parser` -- HTML/XHTML parser with lenient parsing mode +* :mod:`html.entities` -- HTML entity definitions diff --git a/Doc/library/http.rst b/Doc/library/http.rst new file mode 100644 --- /dev/null +++ b/Doc/library/http.rst @@ -0,0 +1,11 @@ +:mod:`http` --- HTTP modules +============================ + +``http`` is a package that collects several modules for working with the +HyperText Transfer Protocol: + +* :mod:`http.client` is a low-level HTTP protocol client; for high-level URL + opening use :mod:`urllib.request` +* :mod:`http.server` contains basic HTTP server classes based on :mod:`socketserver` +* :mod:`http.cookies` has utilities for implementing state management with cookies +* :mod:`http.cookiejar` provides persistence of cookies diff --git a/Doc/library/internet.rst b/Doc/library/internet.rst --- a/Doc/library/internet.rst +++ b/Doc/library/internet.rst @@ -23,10 +23,12 @@ cgi.rst cgitb.rst wsgiref.rst + urllib.rst urllib.request.rst urllib.parse.rst urllib.error.rst urllib.robotparser.rst + http.rst http.client.rst ftplib.rst poplib.rst @@ -40,6 +42,7 @@ http.server.rst http.cookies.rst http.cookiejar.rst + xmlrpc.rst xmlrpc.client.rst xmlrpc.server.rst ipaddress.rst diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -42,8 +42,15 @@ Return an :class:`IPv4Address` or :class:`IPv6Address` object depending on the IP address passed as argument. Either IPv4 or IPv6 addresses may be supplied; integers less than 2**32 will be considered to be IPv4 by default. - A :exc:`ValueError` is raised if *address* does not represent a valid IPv4 or - IPv6 address. + A :exc:`ValueError` is raised if *address* does not represent a valid IPv4 + or IPv6 address. + +.. testsetup:: + >>> import ipaddress + >>> from ipaddress import (ip_network, IPv4Address, IPv4Interface, + ... IPv4Network) + +:: >>> ipaddress.ip_address('192.168.0.1') IPv4Address('192.168.0.1') @@ -111,7 +118,7 @@ >>> ipaddress.IPv4Address('192.168.0.1') IPv4Address('192.168.0.1') - >>> ipaddress.IPv4Address(3221225985) + >>> ipaddress.IPv4Address(3232235521) IPv4Address('192.168.0.1') >>> ipaddress.IPv4Address(b'\xC0\xA8\x00\x01') IPv4Address('192.168.0.1') @@ -437,7 +444,7 @@ hosts are all the IP addresses that belong to the network, except the network address itself and the network broadcast address. - >>> list(ip_network('192.0.2.0/29').hosts()) + >>> list(ip_network('192.0.2.0/29').hosts()) #doctest: +NORMALIZE_WHITESPACE [IPv4Address('192.0.2.1'), IPv4Address('192.0.2.2'), IPv4Address('192.0.2.3'), IPv4Address('192.0.2.4'), IPv4Address('192.0.2.5'), IPv4Address('192.0.2.6')] @@ -456,7 +463,7 @@ >>> n1 = ip_network('192.0.2.0/28') >>> n2 = ip_network('192.0.2.1/32') - >>> list(n1.address_exclude(n2)) + >>> list(n1.address_exclude(n2)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.8/29'), IPv4Network('192.0.2.4/30'), IPv4Network('192.0.2.2/31'), IPv4Network('192.0.2.0/32')] @@ -471,10 +478,10 @@ >>> list(ip_network('192.0.2.0/24').subnets()) [IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/25')] - >>> list(ip_network('192.0.2.0/24').subnets(prefixlen_diff=2)) + >>> list(ip_network('192.0.2.0/24').subnets(prefixlen_diff=2)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/26'), IPv4Network('192.0.2.64/26'), IPv4Network('192.0.2.128/26'), IPv4Network('192.0.2.192/26')] - >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=26)) + >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=26)) #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/26'), IPv4Network('192.0.2.64/26'), IPv4Network('192.0.2.128/26'), IPv4Network('192.0.2.192/26')] >>> list(ip_network('192.0.2.0/24').subnets(new_prefix=23)) diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst --- a/Doc/library/markup.rst +++ b/Doc/library/markup.rst @@ -9,20 +9,13 @@ Language (SGML) and the Hypertext Markup Language (HTML), and several interfaces for working with the Extensible Markup Language (XML). -It is important to note that modules in the :mod:`xml` package require that -there be at least one SAX-compliant XML parser available. The Expat parser is -included with Python, so the :mod:`xml.parsers.expat` module will always be -available. - -The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the -definition of the Python bindings for the DOM and SAX interfaces. - .. toctree:: html.rst html.parser.rst html.entities.rst + xml.rst xml.etree.elementtree.rst xml.dom.rst xml.dom.minidom.rst diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -29,7 +29,7 @@ Functionality within this package requires that the ``__main__`` module be importable by the children. This is covered in :ref:`multiprocessing-programming` however it is worth pointing out here. This means that some examples, such - as the :class:`multiprocessing.Pool` examples will not work in the + as the :class:`multiprocessing.pool.Pool` examples will not work in the interactive interpreter. For example:: >>> from multiprocessing import Pool @@ -916,7 +916,7 @@ .. class:: Condition([lock]) - A condition variable: a clone of :class:`threading.Condition`. + A condition variable: an alias for :class:`threading.Condition`. If *lock* is specified then it should be a :class:`Lock` or :class:`RLock` object from :mod:`multiprocessing`. @@ -1638,7 +1638,7 @@ One can create a pool of processes which will carry out tasks submitted to it with the :class:`Pool` class. -.. class:: multiprocessing.Pool([processes[, initializer[, initargs[, maxtasksperchild]]]]) +.. class:: Pool([processes[, initializer[, initargs[, maxtasksperchild]]]]) A process pool object which controls a pool of worker processes to which jobs can be submitted. It supports asynchronous results with timeouts and diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1555,18 +1555,21 @@ single: UNC paths; and os.makedirs() Recursive directory creation function. Like :func:`mkdir`, but makes all - intermediate-level directories needed to contain the leaf directory. If - the target directory with the same mode as specified already exists, - raises an :exc:`OSError` exception if *exist_ok* is False, otherwise no - exception is raised. If the directory cannot be created in other cases, - raises an :exc:`OSError` exception. The default *mode* is ``0o777`` (octal). - On some systems, *mode* is ignored. Where it is used, the current umask - value is first masked out. + intermediate-level directories needed to contain the leaf directory. + + The default *mode* is ``0o777`` (octal). On some systems, *mode* is + ignored. Where it is used, the current umask value is first masked out. + + If *exists_ok* is ``False`` (the default), an :exc:`OSError` is raised if + the target directory already exists. If *exists_ok* is ``True`` an + :exc:`OSError` is still raised if the umask-masked *mode* is different from + the existing mode, on systems where the mode is used. :exc:`OSError` will + also be raised if the directory creation fails. .. note:: :func:`makedirs` will become confused if the path elements to create - include :data:`pardir`. + include :data:`pardir` (eg. ".." on UNIX systems). This function handles UNC paths correctly. diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -153,20 +153,22 @@ .. method:: BaseServer.serve_forever(poll_interval=0.5) - Handle requests until an explicit :meth:`shutdown` request. - Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It also calls - :meth:`service_actions` which may be used by a subclass or Mixin to provide - various cleanup actions. For e.g. ForkingMixin class uses - :meth:`service_actions` to cleanup the zombie child processes. + Handle requests until an explicit :meth:`shutdown` request. Poll for + shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It + also calls :meth:`service_actions`, which may be used by a subclass or mixin + to provide actions specific to a given service. For example, the + :class:`ForkingMixIn` class uses :meth:`service_actions` to clean up zombie + child processes. .. versionchanged:: 3.3 - Added service_actions call to the serve_forever method. + Added ``service_actions`` call to the ``serve_forever`` method. .. method:: BaseServer.service_actions() - This is called by the serve_forever loop. This method is can be overridden - by Mixin's to add cleanup or service specific actions. + This is called in the :meth:`serve_forever` loop. This method is can be + overridden by subclasses or mixin classes to perform actions specific to + a given service, such as cleanup actions. .. versionadded:: 3.3 diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -222,250 +222,254 @@ A SQLite database connection has the following attributes and methods: -.. attribute:: Connection.isolation_level + .. attribute:: isolation_level - Get or set the current isolation level. :const:`None` for autocommit mode or - one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section - :ref:`sqlite3-controlling-transactions` for a more detailed explanation. + Get or set the current isolation level. :const:`None` for autocommit mode or + one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section + :ref:`sqlite3-controlling-transactions` for a more detailed explanation. -.. attribute:: Connection.in_transaction + .. attribute:: in_transaction - :const:`True` if a transaction is active (there are uncommitted changes), - :const:`False` otherwise. Read-only attribute. + :const:`True` if a transaction is active (there are uncommitted changes), + :const:`False` otherwise. Read-only attribute. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. method:: Connection.cursor([cursorClass]) + .. method:: cursor([cursorClass]) - The cursor method accepts a single optional parameter *cursorClass*. If - supplied, this must be a custom cursor class that extends - :class:`sqlite3.Cursor`. + The cursor method accepts a single optional parameter *cursorClass*. If + supplied, this must be a custom cursor class that extends + :class:`sqlite3.Cursor`. -.. method:: Connection.commit() + .. method:: commit() - This method commits the current transaction. If you don't call this method, - anything you did since the last call to ``commit()`` is not visible from - other database connections. If you wonder why you don't see the data you've - written to the database, please check you didn't forget to call this method. + This method commits the current transaction. If you don't call this method, + anything you did since the last call to ``commit()`` is not visible from + other database connections. If you wonder why you don't see the data you've + written to the database, please check you didn't forget to call this method. -.. method:: Connection.rollback() + .. method:: rollback() - This method rolls back any changes to the database since the last call to - :meth:`commit`. + This method rolls back any changes to the database since the last call to + :meth:`commit`. -.. method:: Connection.close() + .. method:: close() - This closes the database connection. Note that this does not automatically - call :meth:`commit`. If you just close your database connection without - calling :meth:`commit` first, your changes will be lost! + This closes the database connection. Note that this does not automatically + call :meth:`commit`. If you just close your database connection without + calling :meth:`commit` first, your changes will be lost! -.. method:: Connection.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`execute - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`execute + ` method with the parameters given. -.. method:: Connection.executemany(sql, [parameters]) + .. method:: executemany(sql, [parameters]) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executemany - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executemany + ` method with the parameters given. -.. method:: Connection.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard shortcut that creates an intermediate cursor object by - calling the cursor method, then calls the cursor's :meth:`executescript - ` method with the parameters given. + This is a nonstandard shortcut that creates an intermediate cursor object by + calling the cursor method, then calls the cursor's :meth:`executescript + ` method with the parameters given. -.. method:: Connection.create_function(name, num_params, func) + .. method:: create_function(name, num_params, func) - Creates a user-defined function that you can later use from within SQL - statements under the function name *name*. *num_params* is the number of - parameters the function accepts, and *func* is a Python callable that is called - as the SQL function. + Creates a user-defined function that you can later use from within SQL + statements under the function name *name*. *num_params* is the number of + parameters the function accepts, and *func* is a Python callable that is called + as the SQL function. - The function can return any of the types supported by SQLite: bytes, str, int, - float and None. + The function can return any of the types supported by SQLite: bytes, str, int, + float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/md5func.py + .. literalinclude:: ../includes/sqlite3/md5func.py -.. method:: Connection.create_aggregate(name, num_params, aggregate_class) + .. method:: create_aggregate(name, num_params, aggregate_class) - Creates a user-defined aggregate function. + Creates a user-defined aggregate function. - The aggregate class must implement a ``step`` method, which accepts the number - of parameters *num_params*, and a ``finalize`` method which will return the - final result of the aggregate. + The aggregate class must implement a ``step`` method, which accepts the number + of parameters *num_params*, and a ``finalize`` method which will return the + final result of the aggregate. - The ``finalize`` method can return any of the types supported by SQLite: - bytes, str, int, float and None. + The ``finalize`` method can return any of the types supported by SQLite: + bytes, str, int, float and None. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/mysumaggr.py + .. literalinclude:: ../includes/sqlite3/mysumaggr.py -.. method:: Connection.create_collation(name, callable) + .. method:: create_collation(name, callable) - Creates a collation with the specified *name* and *callable*. The callable will - be passed two string arguments. It should return -1 if the first is ordered - lower than the second, 0 if they are ordered equal and 1 if the first is ordered - higher than the second. Note that this controls sorting (ORDER BY in SQL) so - your comparisons don't affect other SQL operations. + Creates a collation with the specified *name* and *callable*. The callable will + be passed two string arguments. It should return -1 if the first is ordered + lower than the second, 0 if they are ordered equal and 1 if the first is ordered + higher than the second. Note that this controls sorting (ORDER BY in SQL) so + your comparisons don't affect other SQL operations. - Note that the callable will get its parameters as Python bytestrings, which will - normally be encoded in UTF-8. + Note that the callable will get its parameters as Python bytestrings, which will + normally be encoded in UTF-8. - The following example shows a custom collation that sorts "the wrong way": + The following example shows a custom collation that sorts "the wrong way": - .. literalinclude:: ../includes/sqlite3/collation_reverse.py + .. literalinclude:: ../includes/sqlite3/collation_reverse.py - To remove a collation, call ``create_collation`` with None as callable:: + To remove a collation, call ``create_collation`` with None as callable:: - con.create_collation("reverse", None) + con.create_collation("reverse", None) -.. method:: Connection.interrupt() + .. method:: interrupt() - You can call this method from a different thread to abort any queries that might - be executing on the connection. The query will then abort and the caller will - get an exception. + You can call this method from a different thread to abort any queries that might + be executing on the connection. The query will then abort and the caller will + get an exception. -.. method:: Connection.set_authorizer(authorizer_callback) + .. method:: set_authorizer(authorizer_callback) - This routine registers a callback. The callback is invoked for each attempt to - access a column of a table in the database. The callback should return - :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL - statement should be aborted with an error and :const:`SQLITE_IGNORE` if the - column should be treated as a NULL value. These constants are available in the - :mod:`sqlite3` module. + This routine registers a callback. The callback is invoked for each attempt to + access a column of a table in the database. The callback should return + :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL + statement should be aborted with an error and :const:`SQLITE_IGNORE` if the + column should be treated as a NULL value. These constants are available in the + :mod:`sqlite3` module. - The first argument to the callback signifies what kind of operation is to be - authorized. The second and third argument will be arguments or :const:`None` - depending on the first argument. The 4th argument is the name of the database - ("main", "temp", etc.) if applicable. The 5th argument is the name of the - inner-most trigger or view that is responsible for the access attempt or - :const:`None` if this access attempt is directly from input SQL code. + The first argument to the callback signifies what kind of operation is to be + authorized. The second and third argument will be arguments or :const:`None` + depending on the first argument. The 4th argument is the name of the database + ("main", "temp", etc.) if applicable. The 5th argument is the name of the + inner-most trigger or view that is responsible for the access attempt or + :const:`None` if this access attempt is directly from input SQL code. - Please consult the SQLite documentation about the possible values for the first - argument and the meaning of the second and third argument depending on the first - one. All necessary constants are available in the :mod:`sqlite3` module. + Please consult the SQLite documentation about the possible values for the first + argument and the meaning of the second and third argument depending on the first + one. All necessary constants are available in the :mod:`sqlite3` module. -.. method:: Connection.set_progress_handler(handler, n) + .. method:: set_progress_handler(handler, n) - This routine registers a callback. The callback is invoked for every *n* - instructions of the SQLite virtual machine. This is useful if you want to - get called from SQLite during long-running operations, for example to update - a GUI. + This routine registers a callback. The callback is invoked for every *n* + instructions of the SQLite virtual machine. This is useful if you want to + get called from SQLite during long-running operations, for example to update + a GUI. - If you want to clear any previously installed progress handler, call the - method with :const:`None` for *handler*. + If you want to clear any previously installed progress handler, call the + method with :const:`None` for *handler*. -.. method:: Connection.set_trace_callback(trace_callback) + .. method:: set_trace_callback(trace_callback) - Registers *trace_callback* to be called for each SQL statement that is - actually executed by the SQLite backend. + Registers *trace_callback* to be called for each SQL statement that is + actually executed by the SQLite backend. - The only argument passed to the callback is the statement (as string) that - is being executed. The return value of the callback is ignored. Note that - the backend does not only run statements passed to the :meth:`Cursor.execute` - methods. Other sources include the transaction management of the Python - module and the execution of triggers defined in the current database. + The only argument passed to the callback is the statement (as string) that + is being executed. The return value of the callback is ignored. Note that + the backend does not only run statements passed to the :meth:`Cursor.execute` + methods. Other sources include the transaction management of the Python + module and the execution of triggers defined in the current database. - Passing :const:`None` as *trace_callback* will disable the trace callback. + Passing :const:`None` as *trace_callback* will disable the trace callback. - .. versionadded:: 3.3 + .. versionadded:: 3.3 -.. method:: Connection.enable_load_extension(enabled) + .. method:: enable_load_extension(enabled) - This routine allows/disallows the SQLite engine to load SQLite extensions - from shared libraries. SQLite extensions can define new functions, - aggregates or whole new virtual table implementations. One well-known - extension is the fulltext-search extension distributed with SQLite. + This routine allows/disallows the SQLite engine to load SQLite extensions + from shared libraries. SQLite extensions can define new functions, + aggregates or whole new virtual table implementations. One well-known + extension is the fulltext-search extension distributed with SQLite. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 - .. literalinclude:: ../includes/sqlite3/load_extension.py + .. literalinclude:: ../includes/sqlite3/load_extension.py -.. method:: Connection.load_extension(path) + .. method:: load_extension(path) - This routine loads a SQLite extension from a shared library. You have to - enable extension loading with :meth:`enable_load_extension` before you can - use this routine. + This routine loads a SQLite extension from a shared library. You have to + enable extension loading with :meth:`enable_load_extension` before you can + use this routine. - Loadable extensions are disabled by default. See [#f1]_. + Loadable extensions are disabled by default. See [#f1]_. - .. versionadded:: 3.2 + .. versionadded:: 3.2 -.. attribute:: Connection.row_factory + .. attribute:: row_factory - You can change this attribute to a callable that accepts the cursor and the - original row as a tuple and will return the real result row. This way, you can - implement more advanced ways of returning results, such as returning an object - that can also access columns by name. + You can change this attribute to a callable that accepts the cursor and the + original row as a tuple and will return the real result row. This way, you can + implement more advanced ways of returning results, such as returning an object + that can also access columns by name. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/row_factory.py + .. literalinclude:: ../includes/sqlite3/row_factory.py - If returning a tuple doesn't suffice and you want name-based access to - columns, you should consider setting :attr:`row_factory` to the - highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both - index-based and case-insensitive name-based access to columns with almost no - memory overhead. It will probably be better than your own custom - dictionary-based approach or even a db_row based solution. + If returning a tuple doesn't suffice and you want name-based access to + columns, you should consider setting :attr:`row_factory` to the + highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both + index-based and case-insensitive name-based access to columns with almost no + memory overhead. It will probably be better than your own custom + dictionary-based approach or even a db_row based solution. - .. XXX what's a db_row-based solution? + .. XXX what's a db_row-based solution? -.. attribute:: Connection.text_factory + .. attribute:: text_factory - Using this attribute you can control what objects are returned for the ``TEXT`` - data type. By default, this attribute is set to :class:`str` and the - :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to - return bytestrings instead, you can set it to :class:`bytes`. + Using this attribute you can control what objects are returned for the ``TEXT`` + data type. By default, this attribute is set to :class:`str` and the + :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to + return bytestrings instead, you can set it to :class:`bytes`. - You can also set it to any other callable that accepts a single bytestring - parameter and returns the resulting object. + For efficiency reasons, there's also a way to return :class:`str` objects + only for non-ASCII data, and :class:`bytes` otherwise. To activate it, set + this attribute to :const:`sqlite3.OptimizedUnicode`. - See the following example code for illustration: + You can also set it to any other callable that accepts a single bytestring + parameter and returns the resulting object. - .. literalinclude:: ../includes/sqlite3/text_factory.py + See the following example code for illustration: + .. literalinclude:: ../includes/sqlite3/text_factory.py -.. attribute:: Connection.total_changes - Returns the total number of database rows that have been modified, inserted, or - deleted since the database connection was opened. + .. attribute:: total_changes + Returns the total number of database rows that have been modified, inserted, or + deleted since the database connection was opened. -.. attribute:: Connection.iterdump - Returns an iterator to dump the database in an SQL text format. Useful when - saving an in-memory database for later restoration. This function provides - the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` - shell. + .. attribute:: iterdump - Example:: + Returns an iterator to dump the database in an SQL text format. Useful when + saving an in-memory database for later restoration. This function provides + the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3` + shell. - # Convert file existing_db.db to SQL dump file dump.sql - import sqlite3, os + Example:: - con = sqlite3.connect('existing_db.db') - with open('dump.sql', 'w') as f: - for line in con.iterdump(): - f.write('%s\n' % line) + # Convert file existing_db.db to SQL dump file dump.sql + import sqlite3, os + + con = sqlite3.connect('existing_db.db') + with open('dump.sql', 'w') as f: + for line in con.iterdump(): + f.write('%s\n' % line) .. _sqlite3-cursor-objects: @@ -477,110 +481,110 @@ A :class:`Cursor` instance has the following attributes and methods. -.. method:: Cursor.execute(sql, [parameters]) + .. method:: execute(sql, [parameters]) - Executes an SQL statement. The SQL statement may be parametrized (i. e. - placeholders instead of SQL literals). The :mod:`sqlite3` module supports two - kinds of placeholders: question marks (qmark style) and named placeholders - (named style). + Executes an SQL statement. The SQL statement may be parametrized (i. e. + placeholders instead of SQL literals). The :mod:`sqlite3` module supports two + kinds of placeholders: question marks (qmark style) and named placeholders + (named style). - Here's an example of both styles: + Here's an example of both styles: - .. literalinclude:: ../includes/sqlite3/execute_1.py + .. literalinclude:: ../includes/sqlite3/execute_1.py - :meth:`execute` will only execute a single SQL statement. If you try to execute - more than one statement with it, it will raise a Warning. Use - :meth:`executescript` if you want to execute multiple SQL statements with one - call. + :meth:`execute` will only execute a single SQL statement. If you try to execute + more than one statement with it, it will raise a Warning. Use + :meth:`executescript` if you want to execute multiple SQL statements with one + call. -.. method:: Cursor.executemany(sql, seq_of_parameters) + .. method:: executemany(sql, seq_of_parameters) - Executes an SQL command against all parameter sequences or mappings found in - the sequence *sql*. The :mod:`sqlite3` module also allows using an - :term:`iterator` yielding parameters instead of a sequence. + Executes an SQL command against all parameter sequences or mappings found in + the sequence *sql*. The :mod:`sqlite3` module also allows using an + :term:`iterator` yielding parameters instead of a sequence. - .. literalinclude:: ../includes/sqlite3/executemany_1.py + .. literalinclude:: ../includes/sqlite3/executemany_1.py - Here's a shorter example using a :term:`generator`: + Here's a shorter example using a :term:`generator`: - .. literalinclude:: ../includes/sqlite3/executemany_2.py + .. literalinclude:: ../includes/sqlite3/executemany_2.py -.. method:: Cursor.executescript(sql_script) + .. method:: executescript(sql_script) - This is a nonstandard convenience method for executing multiple SQL statements - at once. It issues a ``COMMIT`` statement first, then executes the SQL script it - gets as a parameter. + This is a nonstandard convenience method for executing multiple SQL statements + at once. It issues a ``COMMIT`` statement first, then executes the SQL script it + gets as a parameter. - *sql_script* can be an instance of :class:`str` or :class:`bytes`. + *sql_script* can be an instance of :class:`str` or :class:`bytes`. - Example: + Example: - .. literalinclude:: ../includes/sqlite3/executescript.py + .. literalinclude:: ../includes/sqlite3/executescript.py -.. method:: Cursor.fetchone() + .. method:: fetchone() - Fetches the next row of a query result set, returning a single sequence, - or :const:`None` when no more data is available. + Fetches the next row of a query result set, returning a single sequence, + or :const:`None` when no more data is available. -.. method:: Cursor.fetchmany(size=cursor.arraysize) + .. method:: fetchmany(size=cursor.arraysize) - Fetches the next set of rows of a query result, returning a list. An empty - list is returned when no more rows are available. + Fetches the next set of rows of a query result, returning a list. An empty + list is returned when no more rows are available. - The number of rows to fetch per call is specified by the *size* parameter. - If it is not given, the cursor's arraysize determines the number of rows - to be fetched. The method should try to fetch as many rows as indicated by - the size parameter. If this is not possible due to the specified number of - rows not being available, fewer rows may be returned. + The number of rows to fetch per call is specified by the *size* parameter. + If it is not given, the cursor's arraysize determines the number of rows + to be fetched. The method should try to fetch as many rows as indicated by + the size parameter. If this is not possible due to the specified number of + rows not being available, fewer rows may be returned. - Note there are performance considerations involved with the *size* parameter. - For optimal performance, it is usually best to use the arraysize attribute. - If the *size* parameter is used, then it is best for it to retain the same - value from one :meth:`fetchmany` call to the next. + Note there are performance considerations involved with the *size* parameter. + For optimal performance, it is usually best to use the arraysize attribute. + If the *size* parameter is used, then it is best for it to retain the same + value from one :meth:`fetchmany` call to the next. -.. method:: Cursor.fetchall() + .. method:: fetchall() - Fetches all (remaining) rows of a query result, returning a list. Note that - the cursor's arraysize attribute can affect the performance of this operation. - An empty list is returned when no rows are available. + Fetches all (remaining) rows of a query result, returning a list. Note that + the cursor's arraysize attribute can affect the performance of this operation. + An empty list is returned when no rows are available. -.. attribute:: Cursor.rowcount + .. attribute:: rowcount - Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this - attribute, the database engine's own support for the determination of "rows - affected"/"rows selected" is quirky. + Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this + attribute, the database engine's own support for the determination of "rows + affected"/"rows selected" is quirky. - For :meth:`executemany` statements, the number of modifications are summed up - into :attr:`rowcount`. + For :meth:`executemany` statements, the number of modifications are summed up + into :attr:`rowcount`. - As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in - case no ``executeXX()`` has been performed on the cursor or the rowcount of the - last operation is not determinable by the interface". This includes ``SELECT`` - statements because we cannot determine the number of rows a query produced - until all rows were fetched. + As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in + case no ``executeXX()`` has been performed on the cursor or the rowcount of the + last operation is not determinable by the interface". This includes ``SELECT`` + statements because we cannot determine the number of rows a query produced + until all rows were fetched. - With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if - you make a ``DELETE FROM table`` without any condition. + With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if + you make a ``DELETE FROM table`` without any condition. -.. attribute:: Cursor.lastrowid + .. attribute:: lastrowid - This read-only attribute provides the rowid of the last modified row. It is - only set if you issued a ``INSERT`` statement using the :meth:`execute` - method. For operations other than ``INSERT`` or when :meth:`executemany` is - called, :attr:`lastrowid` is set to :const:`None`. + This read-only attribute provides the rowid of the last modified row. It is + only set if you issued a ``INSERT`` statement using the :meth:`execute` + method. For operations other than ``INSERT`` or when :meth:`executemany` is + called, :attr:`lastrowid` is set to :const:`None`. -.. attribute:: Cursor.description + .. attribute:: description - This read-only attribute provides the column names of the last query. To - remain compatible with the Python DB API, it returns a 7-tuple for each - column where the last six items of each tuple are :const:`None`. + This read-only attribute provides the column names of the last query. To + remain compatible with the Python DB API, it returns a 7-tuple for each + column where the last six items of each tuple are :const:`None`. - It is set for ``SELECT`` statements without any matching rows as well. + It is set for ``SELECT`` statements without any matching rows as well. .. _sqlite3-row-objects: diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -358,20 +358,15 @@ Arguments are: - *args* should be a string, or a sequence of program arguments. The program - to execute is normally the first item in the args sequence or the string if - a string is given, but can be explicitly set by using the *executable* - argument. When *executable* is given, the first item in the args sequence - is still treated by most programs as the command name, which can then be - different from the actual executable name. On Unix, it becomes the display - name for the executing program in utilities such as :program:`ps`. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence and the string itself if *args* is a string. However, see the + *shell* and *executable* arguments for differences from this behavior. - On Unix, with *shell=False* (default): In this case, the Popen class uses - :meth:`os.execvp` like behavior to execute the child program. - *args* should normally be a - sequence. If a string is specified for *args*, it will be used as the name - or path of the program to execute; this will only work if the program is - being given no arguments. + On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to + execute the child program. If *args* is a string, the string is + interpreted as the name or path of the program to execute; this only works + if the program is being given no arguments. .. note:: @@ -392,13 +387,23 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Unix, with *shell=True*: If args is a string, it specifies the command - string to execute through the shell. This means that the string must be + On Windows, the :class:`Popen` class uses ``CreateProcess()`` to + execute the child program, which operates on strings. If *args* is a + sequence, it will be converted to a string in a manner described in + :ref:`converting-argument-sequence`. + + The *shell* argument (which defaults to *False*) specifies whether to use + the shell as the program to execute. It is recommended to pass *args* as a + sequence if *shell* is *False* and as a string if *shell* is *True*. + + On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If + *args* is a string, the string specifies the command + to execute through the shell. This means that the string must be formatted exactly as it would be when typed at the shell prompt. This includes, for example, quoting or backslash escaping filenames with spaces in them. If *args* is a sequence, the first item specifies the command string, and any additional items will be treated as additional arguments to the shell - itself. That is to say, *Popen* does the equivalent of:: + itself. That is to say, :class:`Popen` does the equivalent of:: Popen(['/bin/sh', '-c', args[0], args[1], ...]) @@ -408,10 +413,11 @@ input. See the warning under :ref:`frequently-used-arguments` for details. - On Windows: the :class:`Popen` class uses CreateProcess() to execute the - child program, which operates on strings. If *args* is a sequence, it will - be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable + specifies the default shell. The only time you need to specify + ``shell=True`` on Windows is when the command you wish to execute is built + into the shell (e.g. :command:`dir` or :command:`copy`). You do not need + ``shell=True`` to run a batch file or console-based executable. *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line @@ -425,15 +431,14 @@ enable buffering by setting *bufsize* to either -1 or a large enough positive value (such as 4096). - The *executable* argument specifies the program to execute. It is very seldom - needed: Usually, the program to execute is defined by the *args* argument. If - ``shell=True``, the *executable* argument specifies which shell to use. On Unix, - the default shell is :file:`/bin/sh`. On Windows, the default shell is - specified by the :envvar:`COMSPEC` environment variable. The only reason you - would need to specify ``shell=True`` on Windows is where the command you - wish to execute is actually built in to the shell, eg ``dir``, ``copy``. - You don't need ``shell=True`` to run a batch file, nor to run a console-based - executable. + The *executable* argument specifies a replacement program to execute. It + is very seldom needed. When ``shell=False``, *executable* replaces the + program to execute specified by *args*. However, the *args* program is + still treated by most programs as the command name, which can then be + different from the program actually executed. On Unix, the *args* name + becomes the display name for the executable in utilities such as + :program:`ps`. If ``shell=True``, on Unix the *executable* argument + specifies a replacement shell for the default :file:`/bin/sh`. *stdin*, *stdout* and *stderr* specify the executed program's standard input, standard output and standard error file handles, respectively. Valid values @@ -484,10 +489,10 @@ .. versionadded:: 3.2 The *pass_fds* parameter was added. - If *cwd* is not ``None``, the child's current directory will be changed to *cwd* - before it is executed. Note that this directory is not considered when - searching the executable, so you can't specify the program's path relative to - *cwd*. + If *cwd* is not ``None``, the function changes the working directory to + *cwd* before executing the child. In particular, the function looks for + *executable* (or for the first item in *args*) relative to *cwd* if the + executable path is a relative path. If *restore_signals* is True (the default) all signals that Python has set to SIG_IGN are restored to SIG_DFL in the child process before the exec. diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst --- a/Doc/library/tempfile.rst +++ b/Doc/library/tempfile.rst @@ -86,6 +86,9 @@ whether :func:`rollover` has been called. This file-like object can be used in a :keyword:`with` statement, just like a normal file. + .. versionchanged:: 3.3 + the truncate method now accepts a ``size`` argument. + .. function:: TemporaryDirectory(suffix='', prefix='tmp', dir=None) diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -21,7 +21,7 @@ supported by this module. -This module defines the following functions and objects: +This module defines the following functions: .. function:: active_count() @@ -30,16 +30,6 @@ count is equal to the length of the list returned by :func:`.enumerate`. -.. function:: Condition() - :noindex: - - A factory function that returns a new condition variable object. A condition - variable allows one or more threads to wait until they are notified by another - thread. - - See :ref:`condition-objects`. - - .. function:: current_thread() Return the current :class:`Thread` object, corresponding to the caller's thread @@ -67,88 +57,6 @@ and threads that have not yet been started. -.. function:: Event() - :noindex: - - A factory function that returns a new event object. An event manages a flag - that can be set to true with the :meth:`~Event.set` method and reset to false - with the :meth:`clear` method. The :meth:`wait` method blocks until the flag - is true. - - See :ref:`event-objects`. - - -.. class:: local - - A class that represents thread-local data. Thread-local data are data whose - values are thread specific. To manage thread-local data, just create an - instance of :class:`local` (or a subclass) and store attributes on it:: - - mydata = threading.local() - mydata.x = 1 - - The instance's values will be different for separate threads. - - For more details and extensive examples, see the documentation string of the - :mod:`_threading_local` module. - - -.. function:: Lock() - - A factory function that returns a new primitive lock object. Once a thread has - acquired it, subsequent attempts to acquire it block, until it is released; any - thread may release it. - - See :ref:`lock-objects`. - - -.. function:: RLock() - - A factory function that returns a new reentrant lock object. A reentrant lock - must be released by the thread that acquired it. Once a thread has acquired a - reentrant lock, the same thread may acquire it again without blocking; the - thread must release it once for each time it has acquired it. - - See :ref:`rlock-objects`. - - -.. function:: Semaphore(value=1) - :noindex: - - A factory function that returns a new semaphore object. A semaphore manages a - counter representing the number of :meth:`release` calls minus the number of - :meth:`acquire` calls, plus an initial value. The :meth:`acquire` method blocks - if necessary until it can return without making the counter negative. If not - given, *value* defaults to 1. - - See :ref:`semaphore-objects`. - - -.. function:: BoundedSemaphore(value=1) - - A factory function that returns a new bounded semaphore object. A bounded - semaphore checks to make sure its current value doesn't exceed its initial - value. If it does, :exc:`ValueError` is raised. In most situations semaphores - are used to guard resources with limited capacity. If the semaphore is released - too many times it's a sign of a bug. If not given, *value* defaults to 1. - - -.. class:: Thread - - A class that represents a thread of control. This class can be safely - subclassed in a limited fashion. - - See :ref:`thread-objects`. - - -.. class:: Timer - :noindex: - - A thread that executes a function after a specified interval has passed. - - See :ref:`timer-objects`. - - .. function:: settrace(func) .. index:: single: trace function @@ -197,7 +105,8 @@ .. versionadded:: 3.2 -Detailed interfaces for the objects are documented below. +This module defines a number of classes, which are detailed in the sections +below. The design of this module is loosely based on Java's threading model. However, where Java makes locks and condition variables basic behavior of every object, @@ -210,17 +119,38 @@ All of the methods described below are executed atomically. +Thread-Local Data +----------------- + +Thread-local data is data whose values are thread specific. To manage +thread-local data, just create an instance of :class:`local` (or a +subclass) and store attributes on it:: + + mydata = threading.local() + mydata.x = 1 + +The instance's values will be different for separate threads. + + +.. class:: local() + + A class that represents thread-local data. + + For more details and extensive examples, see the documentation string of the + :mod:`_threading_local` module. + + .. _thread-objects: Thread Objects -------------- -This class represents an activity that is run in a separate thread of control. -There are two ways to specify the activity: by passing a callable object to the -constructor, or by overriding the :meth:`~Thread.run` method in a subclass. -No other methods (except for the constructor) should be overridden in a -subclass. In other words, *only* override the :meth:`~Thread.__init__` -and :meth:`~Thread.run` methods of this class. +The :class:`Thread` class represents an activity that is run in a separate +thread of control. There are two ways to specify the activity: by passing a +callable object to the constructor, or by overriding the :meth:`~Thread.run` +method in a subclass. No other methods (except for the constructor) should be +overridden in a subclass. In other words, *only* override the +:meth:`~Thread.__init__` and :meth:`~Thread.run` methods of this class. Once a thread object is created, its activity must be started by calling the thread's :meth:`~Thread.start` method. This invokes the :meth:`~Thread.run` @@ -419,45 +349,55 @@ All methods are executed atomically. -.. method:: Lock.acquire(blocking=True, timeout=-1) +.. class:: Lock() - Acquire a lock, blocking or non-blocking. + The class implementing primitive lock objects. Once a thread has acquired a + lock, subsequent attempts to acquire it block, until it is released; any + thread may release it. - When invoked with the *blocking* argument set to ``True`` (the default), - block until the lock is unlocked, then set it to locked and return ``True``. + .. versionchanged:: 3.3 + Changed from a factory function to a class. - When invoked with the *blocking* argument set to ``False``, do not block. - If a call with *blocking* set to ``True`` would block, return ``False`` - immediately; otherwise, set the lock to locked and return ``True``. - When invoked with the floating-point *timeout* argument set to a positive - value, block for at most the number of seconds specified by *timeout* - and as long as the lock cannot be acquired. A negative *timeout* argument - specifies an unbounded wait. It is forbidden to specify a *timeout* - when *blocking* is false. + .. method:: acquire(blocking=True, timeout=-1) - The return value is ``True`` if the lock is acquired successfully, - ``False`` if not (for example if the *timeout* expired). + Acquire a lock, blocking or non-blocking. - .. versionchanged:: 3.2 - The *timeout* parameter is new. + When invoked with the *blocking* argument set to ``True`` (the default), + block until the lock is unlocked, then set it to locked and return ``True``. - .. versionchanged:: 3.2 - Lock acquires can now be interrupted by signals on POSIX. + When invoked with the *blocking* argument set to ``False``, do not block. + If a call with *blocking* set to ``True`` would block, return ``False`` + immediately; otherwise, set the lock to locked and return ``True``. + When invoked with the floating-point *timeout* argument set to a positive + value, block for at most the number of seconds specified by *timeout* + and as long as the lock cannot be acquired. A negative *timeout* argument + specifies an unbounded wait. It is forbidden to specify a *timeout* + when *blocking* is false. -.. method:: Lock.release() + The return value is ``True`` if the lock is acquired successfully, + ``False`` if not (for example if the *timeout* expired). - Release a lock. This can be called from any thread, not only the thread - which has acquired the lock. + .. versionchanged:: 3.2 + The *timeout* parameter is new. - When the lock is locked, reset it to unlocked, and return. If any other threads - are blocked waiting for the lock to become unlocked, allow exactly one of them - to proceed. + .. versionchanged:: 3.2 + Lock acquires can now be interrupted by signals on POSIX. - When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. - There is no return value. + .. method:: release() + + Release a lock. This can be called from any thread, not only the thread + which has acquired the lock. + + When the lock is locked, reset it to unlocked, and return. If any other threads + are blocked waiting for the lock to become unlocked, allow exactly one of them + to proceed. + + When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. + + There is no return value. .. _rlock-objects: @@ -481,47 +421,59 @@ Reentrant locks also support the :ref:`context manager protocol `. -.. method:: RLock.acquire(blocking=True, timeout=-1) +.. class:: RLock() - Acquire a lock, blocking or non-blocking. + This class implements reentrant lock objects. A reentrant lock must be + released by the thread that acquired it. Once a thread has acquired a + reentrant lock, the same thread may acquire it again without blocking; the + thread must release it once for each time it has acquired it. - When invoked without arguments: if this thread already owns the lock, increment - the recursion level by one, and return immediately. Otherwise, if another - thread owns the lock, block until the lock is unlocked. Once the lock is - unlocked (not owned by any thread), then grab ownership, set the recursion level - to one, and return. If more than one thread is blocked waiting until the lock - is unlocked, only one at a time will be able to grab ownership of the lock. - There is no return value in this case. + Note that ``RLock`` is actually a factory function which returns an instance + of the most efficient version of the concrete RLock class that is supported + by the platform. - When invoked with the *blocking* argument set to true, do the same thing as when - called without arguments, and return true. - When invoked with the *blocking* argument set to false, do not block. If a call - without an argument would block, return false immediately; otherwise, do the - same thing as when called without arguments, and return true. + .. method:: acquire(blocking=True, timeout=-1) - When invoked with the floating-point *timeout* argument set to a positive - value, block for at most the number of seconds specified by *timeout* - and as long as the lock cannot be acquired. Return true if the lock has - been acquired, false if the timeout has elapsed. + Acquire a lock, blocking or non-blocking. - .. versionchanged:: 3.2 - The *timeout* parameter is new. + When invoked without arguments: if this thread already owns the lock, increment + the recursion level by one, and return immediately. Otherwise, if another + thread owns the lock, block until the lock is unlocked. Once the lock is + unlocked (not owned by any thread), then grab ownership, set the recursion level + to one, and return. If more than one thread is blocked waiting until the lock + is unlocked, only one at a time will be able to grab ownership of the lock. + There is no return value in this case. + When invoked with the *blocking* argument set to true, do the same thing as when + called without arguments, and return true. -.. method:: RLock.release() + When invoked with the *blocking* argument set to false, do not block. If a call + without an argument would block, return false immediately; otherwise, do the + same thing as when called without arguments, and return true. - Release a lock, decrementing the recursion level. If after the decrement it is - zero, reset the lock to unlocked (not owned by any thread), and if any other - threads are blocked waiting for the lock to become unlocked, allow exactly one - of them to proceed. If after the decrement the recursion level is still - nonzero, the lock remains locked and owned by the calling thread. + When invoked with the floating-point *timeout* argument set to a positive + value, block for at most the number of seconds specified by *timeout* + and as long as the lock cannot be acquired. Return true if the lock has + been acquired, false if the timeout has elapsed. - Only call this method when the calling thread owns the lock. A - :exc:`RuntimeError` is raised if this method is called when the lock is - unlocked. + .. versionchanged:: 3.2 + The *timeout* parameter is new. - There is no return value. + + .. method:: release() + + Release a lock, decrementing the recursion level. If after the decrement it is + zero, reset the lock to unlocked (not owned by any thread), and if any other + threads are blocked waiting for the lock to become unlocked, allow exactly one + of them to proceed. If after the decrement the recursion level is still + nonzero, the lock remains locked and owned by the calling thread. + + Only call this method when the calling thread owns the lock. A + :exc:`RuntimeError` is raised if this method is called when the lock is + unlocked. + + There is no return value. .. _condition-objects: @@ -556,10 +508,6 @@ the thread that called :meth:`~Condition.notify` or :meth:`~Condition.notify_all` finally relinquishes ownership of the lock. - -Usage -^^^^^ - The typical programming style using condition variables uses the lock to synchronize access to some shared state; threads that are interested in a particular change of state call :meth:`~Condition.wait` repeatedly until they @@ -598,15 +546,18 @@ item to the buffer only needs to wake up one consumer thread. -Interface -^^^^^^^^^ +.. class:: Condition(lock=None) -.. class:: Condition(lock=None) + This class implements condition variable objects. A condition variable + allows one or more threads to wait until they are notified by another thread. If the *lock* argument is given and not ``None``, it must be a :class:`Lock` or :class:`RLock` object, and it is used as the underlying lock. Otherwise, a new :class:`RLock` object is created and used as the underlying lock. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: acquire(*args) Acquire the underlying lock. This method calls the corresponding method on @@ -716,10 +667,19 @@ .. class:: Semaphore(value=1) + This class implements semaphore objects. A semaphore manages a counter + representing the number of :meth:`release` calls minus the number of + :meth:`acquire` calls, plus an initial value. The :meth:`acquire` method + blocks if necessary until it can return without making the counter negative. + If not given, *value* defaults to 1. + The optional argument gives the initial *value* for the internal counter; it defaults to ``1``. If the *value* given is less than 0, :exc:`ValueError` is raised. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: acquire(blocking=True, timeout=None) Acquire a semaphore. @@ -752,6 +712,18 @@ than zero again, wake up that thread. +.. class:: BoundedSemaphore(value=1) + + Class implementing bounded semaphore objects. A bounded semaphore checks to + make sure its current value doesn't exceed its initial value. If it does, + :exc:`ValueError` is raised. In most situations semaphores are used to guard + resources with limited capacity. If the semaphore is released too many times + it's a sign of a bug. If not given, *value* defaults to 1. + + .. versionchanged:: 3.3 + changed from a factory function to a class. + + .. _semaphore-examples: :class:`Semaphore` Example @@ -763,7 +735,7 @@ main thread would initialize the semaphore:: maxconnections = 5 - ... + # ... pool_sema = BoundedSemaphore(value=maxconnections) Once spawned, worker threads call the semaphore's acquire and release methods @@ -772,7 +744,7 @@ with pool_sema: conn = connectdb() try: - ... use connection ... + # ... use connection ... finally: conn.close() @@ -795,7 +767,13 @@ .. class:: Event() - The internal flag is initially false. + Class implementing event objects. An event manages a flag that can be set to + true with the :meth:`~Event.set` method and reset to false with the + :meth:`clear` method. The :meth:`wait` method blocks until the flag is true. + The flag is initially false. + + .. versionchanged:: 3.3 + changed from a factory function to a class. .. method:: is_set() @@ -860,6 +838,9 @@ Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. + .. versionchanged:: 3.3 + changed from a factory function to a class. + .. method:: cancel() Stop the timer, and cancel the execution of the timer's action. This will diff --git a/Doc/library/time.rst b/Doc/library/time.rst --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -557,7 +557,7 @@ :exc:`TypeError` is raised. .. versionchanged:: 3.3 - :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are avaliable on platforms + :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms with C library supporting the corresponding fields in ``struct tm``. .. function:: time() diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -14,113 +14,154 @@ -------------- This module provides a simple way to time small bits of Python code. It has both -command line as well as callable interfaces. It avoids a number of common traps -for measuring execution times. See also Tim Peters' introduction to the -"Algorithms" chapter in the Python Cookbook, published by O'Reilly. +a :ref:`command-line-interface` as well as a :ref:`callable ` +one. It avoids a number of common traps for measuring execution times. +See also Tim Peters' introduction to the "Algorithms" chapter in the *Python +Cookbook*, published by O'Reilly. -The module defines the following public class: + +Basic Examples +-------------- + +The following example shows how the :ref:`command-line-interface` +can be used to compare three different expressions: + +.. code-block:: sh + + $ python -m timeit '"-".join(str(n) for n in range(100))' + 10000 loops, best of 3: 40.3 usec per loop + $ python -m timeit '"-".join([str(n) for n in range(100)])' + 10000 loops, best of 3: 33.4 usec per loop + $ python -m timeit '"-".join(map(str, range(100)))' + 10000 loops, best of 3: 25.2 usec per loop + +This can be achieved from the :ref:`python-interface` with:: + + >>> import timeit + >>> timeit.timeit('"-".join(str(n) for n in range(100))', number=10000) + 0.8187260627746582 + >>> timeit.timeit('"-".join([str(n) for n in range(100)])', number=10000) + 0.7288308143615723 + >>> timeit.timeit('"-".join(map(str, range(100)))', number=10000) + 0.5858950614929199 + +Note however that :mod:`timeit` will automatically determine the number of +repetitions only when the command-line interface is used. In the +:ref:`timeit-examples` section you can find more advanced examples. + + +.. _python-interface: + +Python Interface +---------------- + +The module defines three convenience functions and a public class: + + +.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.timeit` method with *number* executions. + + +.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) + + Create a :class:`Timer` instance with the given statement, *setup* code and + *timer* function and run its :meth:`.repeat` method with the given *repeat* + count and *number* executions. + + +.. function:: default_timer() + + The default timer, which is always :func:`time.perf_counter`. + + .. versionchanged:: 3.3 + :func:`time.perf_counter` is now the default timer. .. class:: Timer(stmt='pass', setup='pass', timer=) Class for timing execution speed of small code snippets. - The constructor takes a statement to be timed, an additional statement used for - setup, and a timer function. Both statements default to ``'pass'``; the timer - function is platform-dependent (see the module doc string). *stmt* and *setup* - may also contain multiple statements separated by ``;`` or newlines, as long as - they don't contain multi-line string literals. + The constructor takes a statement to be timed, an additional statement used + for setup, and a timer function. Both statements default to ``'pass'``; + the timer function is platform-dependent (see the module doc string). + *stmt* and *setup* may also contain multiple statements separated by ``;`` + or newlines, as long as they don't contain multi-line string literals. - To measure the execution time of the first statement, use the :meth:`Timer.timeit` - method. The :meth:`repeat` method is a convenience to call :meth:`.timeit` + To measure the execution time of the first statement, use the :meth:`.timeit` + method. The :meth:`.repeat` method is a convenience to call :meth:`.timeit` multiple times and return a list of results. The *stmt* and *setup* parameters can also take objects that are callable - without arguments. This will embed calls to them in a timer function that + without arguments. This will embed calls to them in a timer function that will then be executed by :meth:`.timeit`. Note that the timing overhead is a little larger in this case because of the extra function calls. -.. method:: Timer.print_exc(file=None) + .. method:: Timer.timeit(number=1000000) - Helper to print a traceback from the timed code. + Time *number* executions of the main statement. This executes the setup + statement once, and then returns the time it takes to execute the main + statement a number of times, measured in seconds as a float. + The argument is the number of times through the loop, defaulting to one + million. The main statement, the setup statement and the timer function + to be used are passed to the constructor. - Typical use:: + .. note:: - t = Timer(...) # outside the try/except - try: - t.timeit(...) # or t.repeat(...) - except: - t.print_exc() + By default, :meth:`.timeit` temporarily turns off :term:`garbage + collection` during the timing. The advantage of this approach is that + it makes independent timings more comparable. This disadvantage is + that GC may be an important component of the performance of the + function being measured. If so, GC can be re-enabled as the first + statement in the *setup* string. For example:: - The advantage over the standard traceback is that source lines in the compiled - template will be displayed. The optional *file* argument directs where the - traceback is sent; it defaults to ``sys.stderr``. + timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() -.. method:: Timer.repeat(repeat=3, number=1000000) + .. method:: Timer.repeat(repeat=3, number=1000000) - Call :meth:`.timeit` a few times. + Call :meth:`.timeit` a few times. - This is a convenience function that calls the :meth:`.timeit` repeatedly, - returning a list of results. The first argument specifies how many times to - call :meth:`.timeit`. The second argument specifies the *number* argument for - :meth:`.timeit`. + This is a convenience function that calls the :meth:`.timeit` repeatedly, + returning a list of results. The first argument specifies how many times + to call :meth:`.timeit`. The second argument specifies the *number* + argument for :meth:`.timeit`. - .. note:: + .. note:: - It's tempting to calculate mean and standard deviation from the result vector - and report these. However, this is not very useful. In a typical case, the - lowest value gives a lower bound for how fast your machine can run the given - code snippet; higher values in the result vector are typically not caused by - variability in Python's speed, but by other processes interfering with your - timing accuracy. So the :func:`min` of the result is probably the only number - you should be interested in. After that, you should look at the entire vector - and apply common sense rather than statistics. + It's tempting to calculate mean and standard deviation from the result + vector and report these. However, this is not very useful. + In a typical case, the lowest value gives a lower bound for how fast + your machine can run the given code snippet; higher values in the + result vector are typically not caused by variability in Python's + speed, but by other processes interfering with your timing accuracy. + So the :func:`min` of the result is probably the only number you + should be interested in. After that, you should look at the entire + vector and apply common sense rather than statistics. -.. method:: Timer.timeit(number=1000000) + .. method:: Timer.print_exc(file=None) - Time *number* executions of the main statement. This executes the setup - statement once, and then returns the time it takes to execute the main statement - a number of times, measured in seconds as a float. The argument is the number - of times through the loop, defaulting to one million. The main statement, the - setup statement and the timer function to be used are passed to the constructor. + Helper to print a traceback from the timed code. - .. note:: + Typical use:: - By default, :meth:`.timeit` temporarily turns off :term:`garbage collection` - during the timing. The advantage of this approach is that it makes - independent timings more comparable. This disadvantage is that GC may be - an important component of the performance of the function being measured. - If so, GC can be re-enabled as the first statement in the *setup* string. - For example:: + t = Timer(...) # outside the try/except + try: + t.timeit(...) # or t.repeat(...) + except: + t.print_exc() - timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() + The advantage over the standard traceback is that source lines in the + compiled template will be displayed. The optional *file* argument directs + where the traceback is sent; it defaults to :data:`sys.stderr`. -The module also defines three convenience functions: +.. _command-line-interface: - -.. function:: default_timer() - - The default timer, which is always :func:`time.perf_counter`. - - -.. function:: repeat(stmt='pass', setup='pass', timer=, repeat=3, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`repeat` method with the given repeat count and - *number* executions. - - -.. function:: timeit(stmt='pass', setup='pass', timer=, number=1000000) - - Create a :class:`Timer` instance with the given statement, setup code and timer - function and run its :meth:`.timeit` method with *number* executions. - - -Command Line Interface +Command-Line Interface ---------------------- When called as a program from the command line, the following form is used:: @@ -184,25 +225,53 @@ There is a certain baseline overhead associated with executing a pass statement. The code here doesn't try to hide it, but you should be aware of it. The - baseline overhead can be measured by invoking the program without arguments. + baseline overhead can be measured by invoking the program without arguments, + and it might differ between Python versions. -The baseline overhead differs between Python versions! Also, to fairly compare -older Python versions to Python 2.3, you may want to use Python's :option:`-O` -option for the older versions to avoid timing ``SET_LINENO`` instructions. +.. _timeit-examples: Examples -------- -Here are two example sessions (one using the command line, one using the module -interface) that compare the cost of using :func:`hasattr` vs. -:keyword:`try`/:keyword:`except` to test for missing and present object -attributes. :: +It is possible to provide a setup statement that is executed only once at the beginning: + +.. code-block:: sh + + $ python -m timeit -s 'text = "sample string"; char = "g"' 'char in text' + 10000000 loops, best of 3: 0.0877 usec per loop + $ python -m timeit -s 'text = "sample string"; char = "g"' 'text.find(char)' + 1000000 loops, best of 3: 0.342 usec per loop + +:: + + >>> import timeit + >>> timeit.timeit('char in text', setup='text = "sample string"; char = "g"') + 0.41440500499993504 + >>> timeit.timeit('text.find(char)', setup='text = "sample string"; char = "g"') + 1.7246671520006203 + +The same can be done using the :class:`Timer` class and its methods:: + + >>> import timeit + >>> t = timeit.Timer('char in text', setup='text = "sample string"; char = "g"') + >>> t.timeit() + 0.3955516149999312 + >>> t.repeat() + [0.40193588800002544, 0.3960157959998014, 0.39594301399984033] + + +The following examples show how to time expressions that contain multiple lines. +Here we compare the cost of using :func:`hasattr` vs. :keyword:`try`/:keyword:`except` +to test for missing and present object attributes: + +.. code-block:: sh $ python -m timeit 'try:' ' str.__bool__' 'except AttributeError:' ' pass' 100000 loops, best of 3: 15.7 usec per loop $ python -m timeit 'if hasattr(str, "__bool__"): pass' 100000 loops, best of 3: 4.26 usec per loop + $ python -m timeit 'try:' ' int.__bool__' 'except AttributeError:' ' pass' 1000000 loops, best of 3: 1.43 usec per loop $ python -m timeit 'if hasattr(int, "__bool__"): pass' @@ -211,36 +280,32 @@ :: >>> import timeit + >>> # attribute is missing >>> s = """\ ... try: ... str.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 17.09 usec/pass - >>> s = """\ - ... if hasattr(str, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 4.85 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.9138244460009446 + >>> s = "if hasattr(str, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.5829014980008651 + >>> + >>> # attribute is present >>> s = """\ ... try: ... int.__bool__ ... except AttributeError: ... pass ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 1.97 usec/pass - >>> s = """\ - ... if hasattr(int, '__bool__'): pass - ... """ - >>> t = timeit.Timer(stmt=s) - >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)) - 3.15 usec/pass + >>> timeit.timeit(stmt=s, number=100000) + 0.04215312199994514 + >>> s = "if hasattr(int, '__bool__'): pass" + >>> timeit.timeit(stmt=s, number=100000) + 0.08588060699912603 + To give the :mod:`timeit` module access to functions you define, you can pass a *setup* parameter which contains an import statement:: @@ -250,7 +315,5 @@ L = [i for i in range(100)] if __name__ == '__main__': - from timeit import Timer - t = Timer("test()", "from __main__ import test") - print(t.timeit()) - + import timeit + print(timeit.timeit("test()", setup="from __main__ import test")) diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst new file mode 100644 --- /dev/null +++ b/Doc/library/urllib.rst @@ -0,0 +1,9 @@ +:mod:`urllib` --- URL handling modules +====================================== + +``urllib`` is a package that collects several modules for working with URLs: + +* :mod:`urllib.request` for opening and reading URLs +* :mod:`urllib.error` containing the exceptions raised by :mod:`urllib.request` +* :mod:`urllib.parse` for parsing URLs +* :mod:`urllib.robotparser` for parsing ``robots.txt`` files diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -291,7 +291,9 @@ | | current element. For example, ``.//egg`` selects | | | all ``egg`` elements in the entire tree. | +-----------------------+------------------------------------------------------+ -| ``..`` | Selects the parent element. | +| ``..`` | Selects the parent element. Returns ``None`` if the | +| | path attempts to reach the ancestors of the start | +| | element (the element ``find`` was called on). | +-----------------------+------------------------------------------------------+ | ``[@attrib]`` | Selects all elements that have the given attribute. | +-----------------------+------------------------------------------------------+ @@ -431,9 +433,9 @@ Generates a string representation of an XML element, including all subelements. *element* is an :class:`Element` instance. *encoding* [1]_ is the output encoding (default is US-ASCII). Use ``encoding="unicode"`` to - generate a Unicode string. *method* is either ``"xml"``, - ``"html"`` or ``"text"`` (default is ``"xml"``). Returns an (optionally) - encoded string containing the XML data. + generate a Unicode string (otherwise, a bytestring is generated). *method* + is either ``"xml"``, ``"html"`` or ``"text"`` (default is ``"xml"``). + Returns an (optionally) encoded string containing the XML data. .. function:: tostringlist(element, encoding="us-ascii", method="xml") @@ -441,11 +443,11 @@ Generates a string representation of an XML element, including all subelements. *element* is an :class:`Element` instance. *encoding* [1]_ is the output encoding (default is US-ASCII). Use ``encoding="unicode"`` to - generate a Unicode string. *method* is either ``"xml"``, - ``"html"`` or ``"text"`` (default is ``"xml"``). Returns a list of - (optionally) encoded strings containing the XML data. It does not guarantee - any specific sequence, except that ``"".join(tostringlist(element)) == - tostring(element)``. + generate a Unicode string (otherwise, a bytestring is generated). *method* + is either ``"xml"``, ``"html"`` or ``"text"`` (default is ``"xml"``). + Returns a list of (optionally) encoded strings containing the XML data. + It does not guarantee any specific sequence, except that + ``"".join(tostringlist(element)) == tostring(element)``. .. versionadded:: 3.2 @@ -521,7 +523,7 @@ .. method:: clear() Resets an element. This function removes all subelements, clears all - attributes, and sets the text and tail attributes to None. + attributes, and sets the text and tail attributes to ``None``. .. method:: get(key, default=None) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xml.rst @@ -0,0 +1,29 @@ +.. _xml: + +XML Processing Modules +====================== + +Python's interfaces for processing XML are grouped in the ``xml`` package. + +It is important to note that modules in the :mod:`xml` package require that +there be at least one SAX-compliant XML parser available. The Expat parser is +included with Python, so the :mod:`xml.parsers.expat` module will always be +available. + +The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the +definition of the Python bindings for the DOM and SAX interfaces. + +The XML handling submodules are: + +* :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + +.. + +* :mod:`xml.dom`: the DOM API definition +* :mod:`xml.dom.minidom`: a lightweight DOM implementation +* :mod:`xml.dom.pulldom`: support for building partial DOM trees + +.. + +* :mod:`xml.sax`: SAX2 base classes and convenience functions +* :mod:`xml.parsers.expat`: the Expat parser binding diff --git a/Doc/library/xmlrpc.rst b/Doc/library/xmlrpc.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xmlrpc.rst @@ -0,0 +1,12 @@ +:mod:`xmlrpc` --- XMLRPC server and client modules +================================================== + +XML-RPC is a Remote Procedure Call method that uses XML passed via HTTP as a +transport. With it, a client can call methods with parameters on a remote +server (the server is named by a URI) and get back structured data. + +``xmlrpc`` is a package that collects server and client modules implementing +XML-RPC. The modules are: + +* :mod:`xmlrpc.client` +* :mod:`xmlrpc.server` diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -61,7 +61,7 @@ .. class:: ZipInfo(filename='NoName', date_time=(1980,1,1,0,0,0)) Class used to represent information about a member of an archive. Instances - of this class are returned by the :meth:`getinfo` and :meth:`infolist` + of this class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Most users of the :mod:`zipfile` module will not need to create these, but only use those created by this module. *filename* should be the full name of the archive member, and @@ -87,20 +87,20 @@ .. data:: ZIP_DEFLATED The numeric constant for the usual ZIP compression method. This requires the - zlib module. + :mod:`zlib` module. .. data:: ZIP_BZIP2 The numeric constant for the BZIP2 compression method. This requires the - bz2 module. + :mod:`bz2` module. .. versionadded:: 3.3 .. data:: ZIP_LZMA The numeric constant for the LZMA compression method. This requires the - lzma module. + :mod:`lzma` module. .. versionadded:: 3.3 @@ -155,7 +155,7 @@ these extensions. If the file is created with mode ``'a'`` or ``'w'`` and then - :meth:`close`\ d without adding any files to the archive, the appropriate + :meth:`closed ` without adding any files to the archive, the appropriate ZIP structures for an empty archive will be written to the file. ZipFile is also a context manager and therefore supports the @@ -169,7 +169,7 @@ Added the ability to use :class:`ZipFile` as a context manager. .. versionchanged:: 3.3 - Added support for :mod:`bzip2` and :mod:`lzma` compression. + Added support for :mod:`bzip2 ` and :mod:`lzma` compression. .. method:: ZipFile.close() @@ -207,7 +207,7 @@ *mode* parameter, if included, must be one of the following: ``'r'`` (the default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable :term:`universal newlines` support in the read-only object. *pwd* is the - password used for encrypted files. Calling :meth:`open` on a closed + password used for encrypted files. Calling :meth:`.open` on a closed ZipFile will raise a :exc:`RuntimeError`. .. note:: @@ -229,7 +229,7 @@ .. note:: - The :meth:`open`, :meth:`read` and :meth:`extract` methods can take a filename + The :meth:`.open`, :meth:`read` and :meth:`extract` methods can take a filename or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. @@ -335,7 +335,7 @@ :class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`. .. versionchanged:: 3.2 - The *compression_type* argument. + The *compress_type* argument. The following data attributes are also available: @@ -351,7 +351,7 @@ The comment text associated with the ZIP file. If assigning a comment to a :class:`ZipFile` instance created with mode 'a' or 'w', this should be a string no longer than 65535 bytes. Comments longer than this will be - truncated in the written archive when :meth:`ZipFile.close` is called. + truncated in the written archive when :meth:`close` is called. .. _pyzipfile-objects: @@ -407,8 +407,8 @@ ZipInfo Objects --------------- -Instances of the :class:`ZipInfo` class are returned by the :meth:`getinfo` and -:meth:`infolist` methods of :class:`ZipFile` objects. Each object stores +Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and +:meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. Instances have the following attributes: diff --git a/Doc/make.bat b/Doc/make.bat --- a/Doc/make.bat +++ b/Doc/make.bat @@ -37,7 +37,7 @@ svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2 -svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments +svn co %SVNROOT%/external/Pygments-1.5dev-20120930/pygments tools/pygments goto end :update diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -312,7 +312,7 @@ A bytes object is an immutable array. The items are 8-bit bytes, represented by integers in the range 0 <= x < 256. Bytes literals - (like ``b'abc'`` and the built-in function :func:`bytes` can be used to + (like ``b'abc'``) and the built-in function :func:`bytes` can be used to construct bytes objects. Also, bytes objects can be decoded to strings via the :meth:`decode` method. diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1094,16 +1094,10 @@ another one is made arbitrarily but consistently within one execution of a program. -Comparison of objects of the differing types depends on whether either -of the types provide explicit support for the comparison. Most numeric types -can be compared with one another, but comparisons of :class:`float` and -:class:`Decimal` are not supported to avoid the inevitable confusion arising -from representation issues such as ``float('1.1')`` being inexactly represented -and therefore not exactly equal to ``Decimal('1.1')`` which is. When -cross-type comparison is not supported, the comparison method returns -``NotImplemented``. This can create the illusion of non-transitivity between -supported cross-type comparisons and unsupported comparisons. For example, -``Decimal(2) == 2`` and ``2 == float(2)`` but ``Decimal(2) != float(2)``. +Comparison of objects of the differing types depends on whether either of the +types provide explicit support for the comparison. Most numeric types can be +compared with one another. When cross-type comparison is not supported, the +comparison method returns ``NotImplemented``. .. _membership-test-details: diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -538,9 +538,7 @@ this escape sequence. Exactly four hex digits are required. (6) - Any Unicode character can be encoded this way, but characters outside the Basic - Multilingual Plane (BMP) will be encoded using a surrogate pair if Python is - compiled to use 16-bit code units (the default). Exactly eight hex digits + Any Unicode character can be encoded this way. Exactly eight hex digits are required. diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/sphinxext/indexsidebar.html --- a/Doc/tools/sphinxext/indexsidebar.html +++ b/Doc/tools/sphinxext/indexsidebar.html @@ -3,7 +3,7 @@

Docs for other versions

 diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -8,13 +8,70 @@ {% block extrahead %} {% if not embedded %}{% endif %} + {% if pagename == 'whatsnew/changelog' %} + + {% endif %} {{ super() }} {% endblock %} {% block footer %}
© Copyright {{ copyright|e }}.
- The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
Last updated on {{ last_updated|e }}. diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -145,6 +145,47 @@ return ret +# Support for including Misc/NEWS + +import re +import codecs + +issue_re = re.compile('([Ii])ssue #([0-9]+)') +whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$") + +class MiscNews(Directive): + has_content = False + required_arguments = 1 + optional_arguments = 0 + final_argument_whitespace = False + option_spec = {} + + def run(self): + fname = self.arguments[0] + source = self.state_machine.input_lines.source( + self.lineno - self.state_machine.input_offset - 1) + source_dir = path.dirname(path.abspath(source)) + fpath = path.join(source_dir, fname) + self.state.document.settings.record_dependencies.add(fpath) + try: + fp = codecs.open(fpath, encoding='utf-8') + try: + content = fp.read() + finally: + fp.close() + except Exception: + text = 'The NEWS file is not available.' + node = nodes.strong(text, text) + return [node] + content = issue_re.sub(r'`\1ssue #\2 `__', + content) + content = whatsnew_re.sub(r'\1', content) + # remove first 3 lines as they are the main heading + lines = ['.. default-role:: obj', ''] + content.splitlines()[3:] + self.state_machine.insert_input(lines, fname) + return [] + + # Support for building "topic help" for pydoc pydoc_topic_labels = [ @@ -276,3 +317,4 @@ app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)') app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction) app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod) + app.add_directive('miscnews', MiscNews) diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -357,3 +357,15 @@ whatsnew/3.2,,:location,zope9-location = ${zope9:location} whatsnew/3.2,,:prefix,... zope-conf = ${custom:prefix}/etc/zope.conf whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf +whatsnew/news,,:platform,:platform: +whatsnew/news,,:password,: Unquote before b64encoding user:password during Basic +whatsnew/news,,:close,Connection:close header. +whatsnew/news,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused" +whatsnew/news,,:close,: Connection:close header is sent by requests using URLOpener +whatsnew/news,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""." +whatsnew/news,,:test,: test_subprocess:test_leaking_fds_on_error no longer gives a +whatsnew/news,,:test,: Fix test_posix:test_getgroups failure under Solaris. Patch +whatsnew/news,,:Olimit,Drop -OPT:Olimit compiler option. +whatsnew/news,,:MAXYEAR,timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. +whatsnew/news,,:bz2,with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or +whatsnew/news,,:db2,: Add configure option --with-dbmliborder=db1:db2:... to specify diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -132,6 +132,8 @@ Setting Environment variables, Louis J. Farrugia +.. _windows-path-mod: + Finding the Python executable ----------------------------- diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,7 +2,6 @@ What's New In Python 3.3 **************************** -:Author: Raymond Hettinger :Release: |release| :Date: |today| @@ -47,7 +46,12 @@ when researching a change. This article explains the new features in Python 3.3, compared to 3.2. -Python 3.3 was released on September 29, 2012. +Python 3.3 was released on September 29, 2012. For full details, +see the :source:`Misc/NEWS` file. + +.. seealso:: + + :pep:`398` - Python 3.3 Release Schedule Summary -- Release highlights @@ -80,6 +84,12 @@ * More compact :ref:`unicode strings `. * More compact :ref:`attribute dictionaries `. +Significantly Improved Library Modules: + +* C Accelerator for the :ref:`decimal ` module. +* Better unicode handling in the :ref:`email ` module + (:term:`provisional `). + Security improvements: * Hash randomization is switched on by default. @@ -92,9 +102,6 @@ PEP 405: Virtual Environments ============================= -:pep:`405` - Python Virtual Environments - PEP written by Carl Meyer, implemented by Carl Meyer and Vinay Sajip. - Virtual environments help create separate Python setups while sharing a system-wide base install, for ease of maintenance. Virtual environments have their own set of private site packages (i.e. locally-installed @@ -105,10 +112,17 @@ This PEP adds the :mod:`venv` module for programmatic access, and the :ref:`pyvenv ` script for command-line access and -administration. The Python interpreter becomes aware of a ``pvenv.cfg`` +administration. The Python interpreter checks for a ``pvenv.cfg``, file whose existence signals the base of a virtual environment's directory tree. +(Implemented by Carl Meyer and Vinay Sajip.) + +.. seealso:: + + :pep:`405` - Python Virtual Environments + PEP written by Carl Meyer + PEP 420: Namespace Packages =========================== @@ -118,14 +132,19 @@ various third party approaches to namespace packages, as described in :pep:`420`) +.. seealso:: + + :pep:`420` - Namespace packages + PEP written by Eric V. Smith; implementation by Eric V. Smith + and Barry Warsaw + .. _pep-3118-update: PEP 3118: New memoryview implementation and buffer protocol documentation ========================================================================= -:issue:`10181` - memoryview bug fixes and features. - Written by Stefan Krah. +The implementation of :pep:`3118` has been significantly improved. The new memoryview implementation comprehensively fixes all ownership and lifetime issues of dynamically allocated fields in the Py_buffer struct @@ -182,6 +201,13 @@ * For further changes see `Build and C API Changes`_ and `Porting C code`_ . +(Contributed by Stefan Krah in :issue:`10181`) + +.. seealso:: + + :pep:`3118` - Revising the Buffer Protocol + + .. _pep-393: PEP 393: Flexible String Representation @@ -256,15 +282,55 @@ bit better than Python 2.7, on a Django benchmark (see the PEP for details). +.. seealso:: + + :pep:`393` - Flexible String Representation + PEP written by Martin von L?wis; implementation by Torsten Becker + and Martin von L?wis. + + +.. _pep-397: + +PEP 397: Python Launcher for Windows +==================================== + +The Python 3.3 Windows installer now includes a ``py`` launcher application +that can be used to launch Python applications in a version independent +fashion. + +This launcher is invoked implicitly when double-clicking ``*.py`` files. +If only a single Python version is installed on the system, that version +will be used to run the file. If multiple versions are installed, the most +recent version is used by default, but this can be overridden by including +a Unix-style "shebang line" in the Python script. + +The launcher can also be used explicitly from the command line as the ``py`` +application. Running ``py`` follows the same version selection rules as +implicitly launching scripts, but a more specific version can be selected +by passing appropriate arguments (such as ``-3`` to request Python 3 when +Python 2 is also installed, or ``-2.6`` to specifclly request an earlier +Python version when a more recent version is installed). + +In addition to the launcher, the Windows installer now includes an +option to add the newly installed Python to the system PATH (contributed +by Brian Curtin in :issue:`3561`). + +.. seealso:: + + :pep:`397` - Python Launcher for Windows + PEP written by Mark Hammond and Martin v. L?wis; implementation by + Vinay Sajip. + + Launcher documentation: :ref:`launcher` + + Installer PATH modification: :ref:`windows-path-mod` + .. _pep-3151: PEP 3151: Reworking the OS and IO exception hierarchy ===================================================== -:pep:`3151` - Reworking the OS and IO exception hierarchy - PEP written and implemented by Antoine Pitrou. - The hierarchy of exceptions raised by operating system errors is now both simplified and finer-grained. @@ -326,15 +392,17 @@ except PermissionError: print("You are not allowed to read document.txt") +.. seealso:: + + :pep:`3151` - Reworking the OS and IO Exception Hierarchy + PEP written and implemented by Antoine Pitrou + .. _pep-380: PEP 380: Syntax for Delegating to a Subgenerator ================================================ -:pep:`380` - Syntax for Delegating to a Subgenerator - PEP written by Greg Ewing. - PEP 380 adds the ``yield from`` expression, allowing a generator to delegate part of its operations to another generator. This allows a section of code containing 'yield' to be factored out and placed in another generator. @@ -390,17 +458,17 @@ multiple subgenerators as easily as a single large function can be split into multiple subfunctions. -(Implementation by Greg Ewing, integrated into 3.3 by Renaud Blanch, Ryan -Kelly and Nick Coghlan, documentation by Zbigniew J?drzejewski-Szmek and -Nick Coghlan) +.. seealso:: + + :pep:`380` - Syntax for Delegating to a Subgenerator + PEP written by Greg Ewing; implementation by Greg Ewing, integrated into + 3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan, documentation by + Zbigniew J?drzejewski-Szmek and Nick Coghlan) PEP 409: Suppressing exception context ====================================== -:pep:`409` - Suppressing exception context - PEP written by Ethan Furman, implemented by Ethan Furman and Nick Coghlan. - PEP 409 introduces new syntax that allows the display of the chained exception context to be disabled. This allows cleaner error messages in applications that convert between exception types:: @@ -455,13 +523,16 @@ ... KeyError('x',) +.. seealso:: + + :pep:`409` - Suppressing exception context + PEP written by Ethan Furman; implemented by Ethan Furman and Nick + Coghlan. + PEP 414: Explicit Unicode literals ====================================== -:pep:`414` - Explicit Unicode literals - PEP written by Armin Ronacher. - To ease the transition from Python 2 for Unicode aware Python applications that make heavy use of Unicode literals, Python 3.3 once again supports the "``u``" prefix for string literals. This prefix has no semantic significance @@ -470,13 +541,15 @@ the more significant semantic changes (such as the stricter default separation of binary and text data). +.. seealso:: + + :pep:`414` - Explicit Unicode literals + PEP written by Armin Ronacher. + PEP 3155: Qualified name for classes and functions ================================================== -:pep:`3155` - Qualified name for classes and functions - PEP written and implemented by Antoine Pitrou. - Functions and class objects have a new ``__qualname__`` attribute representing the "path" from the module top-level to their definition. For global functions and classes, this is the same as ``__name__``. For other functions and classes, @@ -529,28 +602,31 @@ >>> str(C.D.meth) '' +.. seealso:: + + :pep:`3155` - Qualified name for classes and functions + PEP written and implemented by Antoine Pitrou. + .. _pep-412: PEP 412: Key-Sharing Dictionary =============================== -:pep:`412` - Key-Sharing Dictionary - PEP written and implemented by Mark Shannon. - Dictionaries used for the storage of objects' attributes are now able to share part of their internal storage between each other (namely, the part which stores the keys and their respective hashes). This reduces the memory consumption of programs creating many instances of non-builtin types. +.. seealso:: + + :pep:`412` - Key-Sharing Dictionary + PEP written and implemented by Mark Shannon. + PEP 362: Function Signature Object ================================== -:pep:`362`: - Function Signature Object - PEP written by Brett Cannon, Yury Selivanov, Larry Hastings, Jiwon Seo. - Implemented by Yury Selivanov. - A new function :func:`inspect.signature` makes introspection of python callables easy and straightforward. A broad range of callables is supported: python functions, decorated or not, classes, and :func:`functools.partial` @@ -560,13 +636,16 @@ which considerably simplifies writing decorators and any code that validates or amends calling signatures or arguments. +.. seealso:: + + :pep:`362`: - Function Signature Object + PEP written by Brett Cannon, Yury Selivanov, Larry Hastings, Jiwon Seo; + implemented by Yury Selivanov. + PEP 421: Adding sys.implementation ================================== -:pep:`421` - Adding sys.implementation - PEP written and implemented by Eric Snow. - A new attribute on the :mod:`sys` module exposes details specific to the implementation of the currently running interpreter. The initial set of attributes on :attr:`sys.implementation` are ``name``, ``version``, @@ -595,6 +674,11 @@ are writable. This means that you can add, remove, and modify the namespace through normal attribute access. +.. seealso:: + + :pep:`421` - Adding sys.implementation + PEP written and implemented by Eric Snow. + .. _importlib: @@ -605,8 +689,6 @@ :issue:`14605` - Make import machinery explicit :issue:`14646` - Require loaders set __loader__ and __package__ -(Written by Brett Cannon) - The :func:`__import__` function is now powered by :func:`importlib.__import__`. This work leads to the completion of "phase 2" of :pep:`302`. There are multiple benefits to this change. First, it has allowed for more of the @@ -616,11 +698,10 @@ import semantics. And finally it eases the maintenance of import, allowing for future growth to occur. -For the common user, this change should result in no visible change in -semantics. Any possible changes required in one's code to handle this change -should read the `Porting Python code`_ section of this document to see what -needs to be changed, but it will only affect those that currently manipulate -import or try calling it programmatically. +For the common user, there should be no visible change in semantics. For +those whose code currently manipulates import or calls import +programmatically, the code changes that might possibly be required are covered +in the `Porting Python code`_ section of this document. New APIs -------- @@ -659,8 +740,9 @@ Visible Changes --------------- -[For potential required changes to code, see the `Porting Python code`_ -section] + +For potential required changes to code, see the `Porting Python code`_ +section. Beyond the expanse of what :mod:`importlib` now exposes, there are other visible changes to import. The biggest is that :attr:`sys.meta_path` and @@ -688,12 +770,425 @@ consideration when updating code for Python 3.3, and thus should be read about in the `Porting Python code`_ section of this document. - -New Email Package Features -========================== +(Implementation by Brett Cannon) + + +Other Language Changes +====================== + +Some smaller changes made to the core Python language are: + +* Added support for Unicode name aliases and named sequences. + Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases, + and :func:`unicodedata.lookup()` resolves named sequences too. + + (Contributed by Ezio Melotti in :issue:`12753`) + +* Unicode database updated to UCD version 6.1.0 + +* Equality comparisons on :func:`range` objects now return a result reflecting + the equality of the underlying sequences generated by those range objects. + (:issue:`13201`) + +* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()`` + methods of :class:`bytes` and :class:`bytearray` objects now accept an + integer between 0 and 255 as their first argument. + + (Contributed by Petri Lehtinen in :issue:`12170`) + +* New methods have been added to :class:`list` and :class:`bytearray`: + ``copy()`` and ``clear()`` (:issue:`10516`). Consequently, + :class:`~collections.abc.MutableSequence` now also defines a + :meth:`~collections.abc.MutableSequence.clear` method (:issue:`11388`). + +* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``. + + (Contributed by Antoine Pitrou in :issue:`13748`.) + +* :meth:`dict.setdefault` now does only one lookup for the given key, making + it atomic when used with built-in types. + + (Contributed by Filip Gruszczy?ski in :issue:`13521`.) + +* The error messages produced when a function call does not match the function + signature have been significantly improved. + + (Contributed by Benjamin Peterson.) + + +A Finer-Grained Import Lock +=========================== + +Previous versions of CPython have always relied on a global import lock. +This led to unexpected annoyances, such as deadlocks when importing a module +would trigger code execution in a different thread as a side-effect. +Clumsy workarounds were sometimes employed, such as the +:c:func:`PyImport_ImportModuleNoBlock` C API function. + +In Python 3.3, importing a module takes a per-module lock. This correctly +serializes importation of a given module from multiple threads (preventing +the exposure of incompletely initialized modules), while eliminating the +aforementioned annoyances. + +(Contributed by Antoine Pitrou in :issue:`9260`.) + + +Builtin functions and types +=========================== + +* :func:`open` gets a new *opener* parameter: the underlying file descriptor + for the file object is then obtained by calling *opener* with (*file*, + *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for + example. The ``'x'`` mode was added: open for exclusive creation, failing if + the file already exists. +* :func:`print`: added the *flush* keyword argument. If the *flush* keyword + argument is true, the stream is forcibly flushed. +* :func:`hash`: hash randomization is enabled by default, see + :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`. +* The :class:`str` type gets a new :meth:`~str.casefold` method: return a + casefolded copy of the string, casefolded strings may be used for caseless + matching. For example, ``'?'.casefold()`` returns ``'ss'``. +* The sequence documentation has been substantially rewritten to better + explain the binary/text sequence distinction and to provide specific + documentation sections for the individual builtin sequence types + (:issue:`4966`) + + +New Modules +=========== + +faulthandler +------------ + +This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly, +on a fault (a crash like a segmentation fault), after a timeout, or on a user +signal. Call :func:`faulthandler.enable` to install fault handlers for the +:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and +:const:`SIGILL` signals. You can also enable them at startup by setting the +:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X` +``faulthandler`` command line option. + +Example of a segmentation fault on Linux: :: + + $ python -q -X faulthandler + >>> import ctypes + >>> ctypes.string_at(0) + Fatal Python error: Segmentation fault + + Current thread 0x00007fb899f39700: + File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at + File "", line 1 in + Segmentation fault + + +ipaddress +--------- + +The new :mod:`ipaddress` module provides tools for creating and manipulating +objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e. +an IP address associated with a specific IP subnet). + +(Contributed by Google and Peter Moody in :pep:`3144`) + +lzma +---- + +The newly-added :mod:`lzma` module provides data compression and decompression +using the LZMA algorithm, including support for the ``.xz`` and ``.lzma`` +file formats. + +(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`) + + +Improved Modules +================ + +abc +--- + +Improved support for abstract base classes containing descriptors composed with +abstract methods. The recommended approach to declaring abstract descriptors is +now to provide :attr:`__isabstractmethod__` as a dynamically updated +property. The built-in descriptors have been updated accordingly. + + * :class:`abc.abstractproperty` has been deprecated, use :class:`property` + with :func:`abc.abstractmethod` instead. + * :class:`abc.abstractclassmethod` has been deprecated, use + :class:`classmethod` with :func:`abc.abstractmethod` instead. + * :class:`abc.abstractstaticmethod` has been deprecated, use + :class:`staticmethod` with :func:`abc.abstractmethod` instead. + +(Contributed by Darren Dale in :issue:`11610`) + +:meth:`abc.ABCMeta.register` now returns the registered subclass, which means +it can now be used as a class decorator (:issue:`10868`). + + +array +----- + +The :mod:`array` module supports the :c:type:`long long` type using ``q`` and +``Q`` type codes. + +(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`) + + +base64 +------ + +ASCII-only Unicode strings are now accepted by the decoding functions of the +:mod:`base64` modern interface. For example, ``base64.b64decode('YWJj')`` +returns ``b'abc'``. (Contributed by Catalin Iacob in :issue:`13641`.) + + +binascii +-------- + +In addition to the binary objects they normally accept, the ``a2b_`` functions +now all also accept ASCII-only strings as input. (Contributed by Antoine +Pitrou in :issue:`13637`.) + + +bz2 +--- + +The :mod:`bz2` module has been rewritten from scratch. In the process, several +new features have been added: + +* New :func:`bz2.open` function: open a bzip2-compressed file in binary or + text mode. + +* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like + objects, by means of its constructor's *fileobj* argument. + + (Contributed by Nadeem Vawda in :issue:`5863`) + +* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress + multi-stream inputs (such as those produced by the :program:`pbzip2` tool). + :class:`bz2.BZ2File` can now also be used to create this type of file, using + the ``'a'`` (append) mode. + + (Contributed by Nir Aides in :issue:`1625`) + +* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API, + except for the :meth:`detach` and :meth:`truncate` methods. + + +codecs +------ + +The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly +``replace`` and ``ignore`` error handlers on all Windows versions. The +:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only +``replace`` to encode and ``ignore`` to decode. + +A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the +Windows code page 65001 (Windows UTF-8, ``CP_UTF8``). For example, it is used +by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using +``chcp 65001`` command). + +Multibyte CJK decoders now resynchronize faster. They only ignore the first +byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312', +'replace')`` now returns a ``\n`` after the replacement character. + +(:issue:`12016`) + +Incremental CJK codec encoders are no longer reset at each call to their +encode() methods. For example:: + + $ ./python -q + >>> import codecs + >>> encoder = codecs.getincrementalencoder('hz')('strict') + >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.') + b'~{NpJ)l6HK!#~} Bye.' + +This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python +versions. + +(:issue:`12100`) + +The ``unicode_internal`` codec has been deprecated. + + +collections +----------- + +Addition of a new :class:`~collections.ChainMap` class to allow treating a +number of mappings as a single unit. (Written by Raymond Hettinger for +:issue:`11089`, made public in :issue:`11297`) + +The abstract base classes have been moved in a new :mod:`collections.abc` +module, to better differentiate between the abstract and the concrete +collections classes. Aliases for ABCs are still present in the +:mod:`collections` module to preserve existing imports. (:issue:`11085`) + +.. XXX addition of __slots__ to ABCs not recorded here: internal detail + +The :class:`~collections.Counter` class now supports the unary ``+`` and ``-`` +operators, as well as the in-place operators ``+=``, ``-=``, ``|=``, and +``&=``. (Contributed by Raymond Hettinger in :issue:`13121`.) + + +contextlib +---------- + +:class:`~contextlib.ExitStack` now provides a solid foundation for +programmatic manipulation of context managers and similar cleanup +functionality. Unlike the previous ``contextlib.nested`` API (which was +deprecated and removed), the new API is designed to work correctly +regardless of whether context managers acquire their resources in +their ``__init__`` method (for example, file objects) or in their +``__enter__`` method (for example, synchronisation objects from the +:mod:`threading` module). + +(:issue:`13585`) + + +crypt +----- + +Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt` +function to the :mod:`crypt` module. + +(:issue:`10924`) + +curses +------ + + * If the :mod:`curses` module is linked to the ncursesw library, use Unicode + functions when Unicode strings or characters are passed (e.g. + :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`). + * Use the locale encoding instead of ``utf-8`` to encode Unicode strings. + * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute. + * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch` + method to get a wide character + * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to + push a wide character so the next :meth:`~curses.window.get_wch` will return + it + +(Contributed by I?igo Serna in :issue:`6755`) + +datetime +-------- + + * Equality comparisons between naive and aware :class:`~datetime.datetime` + instances now return :const:`False` instead of raising :exc:`TypeError` + (:issue:`15006`). + * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp + corresponding to the :class:`~datetime.datetime` instance. + * The :meth:`datetime.datetime.strftime` method supports formatting years + older than 1000. + * The :meth:`datetime.datetime.astimezone` method can now be + called without arguments to convert datetime instance to the system + timezone. + + +.. _new-decimal: + +decimal +------- + +:issue:`7652` - integrate fast native decimal arithmetic. + C-module and libmpdec written by Stefan Krah. + +The new C version of the decimal module integrates the high speed libmpdec +library for arbitrary precision correctly-rounded decimal floating point +arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification. + +Performance gains range from 10x for database applications to 100x for +numerically intensive applications. These numbers are expected gains +for standard precisions used in decimal floating point arithmetic. Since +the precision is user configurable, the exact figures may vary. For example, +in integer bignum arithmetic the differences can be significantly higher. + +The following table is meant as an illustration. Benchmarks are available +at http://www.bytereef.org/mpdecimal/quickstart.html. + + +---------+-------------+--------------+-------------+ + | | decimal.py | _decimal | speedup | + +=========+=============+==============+=============+ + | pi | 42.02s | 0.345s | 120x | + +---------+-------------+--------------+-------------+ + | telco | 172.19s | 5.68s | 30x | + +---------+-------------+--------------+-------------+ + | psycopg | 3.57s | 0.29s | 12x | + +---------+-------------+--------------+-------------+ + +Features +~~~~~~~~ + +* The :exc:`~decimal.FloatOperation` signal optionally enables stricter + semantics for mixing floats and Decimals. + +* If Python is compiled without threads, the C version automatically + disables the expensive thread local context machinery. In this case, + the variable :data:`~decimal.HAVE_THREADS` is set to False. + +API changes +~~~~~~~~~~~ + +* The C module has the following context limits, depending on the machine + architecture: + + +-------------------+---------------------+------------------------------+ + | | 32-bit | 64-bit | + +===================+=====================+==============================+ + | :const:`MAX_PREC` | :const:`425000000` | :const:`999999999999999999` | + +-------------------+---------------------+------------------------------+ + | :const:`MAX_EMAX` | :const:`425000000` | :const:`999999999999999999` | + +-------------------+---------------------+------------------------------+ + | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` | + +-------------------+---------------------+------------------------------+ + +* In the context templates (:class:`~decimal.DefaultContext`, + :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`) + the magnitude of :attr:`~decimal.Context.Emax` and + :attr:`~decimal.Context.Emin` has changed to :const:`999999`. + +* The :class:`~decimal.Decimal` constructor in decimal.py does not observe + the context limits and converts values with arbitrary exponents or precision + exactly. Since the C version has internal limits, the following scheme is + used: If possible, values are converted exactly, otherwise + :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the + latter case it is always possible to use :meth:`~decimal.Context.create_decimal` + in order to obtain a rounded or inexact value. + + +* The power function in decimal.py is always correctly-rounded. In the + C version, it is defined in terms of the correctly-rounded + :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions, + but the final result is only "almost always correctly rounded". + + +* In the C version, the context dictionary containing the signals is a + :class:`~collections.abc.MutableMapping`. For speed reasons, + :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always + refer to the same :class:`~collections.abc.MutableMapping` that the context + was initialized with. If a new signal dictionary is assigned, + :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` + are updated with the new values, but they do not reference the RHS + dictionary. + + +* Pickling a :class:`~decimal.Context` produces a different output in order + to have a common interchange format for the Python and C versions. + + +* The order of arguments in the :class:`~decimal.Context` constructor has been + changed to match the order displayed by :func:`repr`. + + +* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method + is deprecated. + + +.. _new-email: + +email +----- Policy Framework ----------------- +~~~~~~~~~~~~~~~~ The email package now has a :mod:`~email.policy` framework. A :class:`~email.policy.Policy` is an object with several methods and properties @@ -748,7 +1243,7 @@ Provisional Policy with New Header API --------------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ While the policy framework is worthwhile all by itself, the main motivation for introducing it is to allow the creation of new policies that implement new @@ -839,410 +1334,56 @@ package transparently encodes and decodes the unicode to and from the RFC standard Content Transfer Encodings. - -Other Language Changes -====================== - -Some smaller changes made to the core Python language are: - -* Added support for Unicode name aliases and named sequences. - Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases, - and :func:`unicodedata.lookup()` resolves named sequences too. - - (Contributed by Ezio Melotti in :issue:`12753`) - -* Unicode database updated to UCD version 6.1.0 - -* Equality comparisons on :func:`range` objects now return a result reflecting - the equality of the underlying sequences generated by those range objects. - - (:issue:`13201`) - -* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()`` - methods of :class:`bytes` and :class:`bytearray` objects now accept an - integer between 0 and 255 as their first argument. - - (Contributed by Petri Lehtinen in :issue:`12170`) - -* New methods have been added to :class:`list` and :class:`bytearray`: - ``copy()`` and ``clear()``. - - (:issue:`10516`) - -* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``. - (Contributed by Antoine Pitrou in :issue:`13748`.) - -* :meth:`dict.setdefault` now does only one lookup for the given key, making - it atomic when used with built-in types. - (Contributed by Filip Gruszczy?ski in :issue:`13521`.) - - -.. XXX mention new error messages for passing wrong number of arguments to functions - - -A Finer-Grained Import Lock -=========================== - -Previous versions of CPython have always relied on a global import lock. -This led to unexpected annoyances, such as deadlocks when importing a module -would trigger code execution in a different thread as a side-effect. -Clumsy workarounds were sometimes employed, such as the -:c:func:`PyImport_ImportModuleNoBlock` C API function. - -In Python 3.3, importing a module takes a per-module lock. This correctly -serializes importation of a given module from multiple threads (preventing -the exposure of incompletely initialized modules), while eliminating the -aforementioned annoyances. - -(contributed by Antoine Pitrou in :issue:`9260`.) - - -Builtin functions and types -=========================== - -* :func:`open` gets a new *opener* parameter: the underlying file descriptor - for the file object is then obtained by calling *opener* with (*file*, - *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for - example. The ``'x'`` mode was added: open for exclusive creation, failing if - the file already exists. -* :func:`print`: added the *flush* keyword argument. If the *flush* keyword - argument is true, the stream is forcibly flushed. -* :func:`hash`: hash randomization is enabled by default, see - :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`. -* The :class:`str` type gets a new :meth:`~str.casefold` method: return a - casefolded copy of the string, casefolded strings may be used for caseless - matching. For example, ``'?'.casefold()`` returns ``'ss'``. -* The sequence documentation has been substantially rewritten to better - explain the binary/text sequence distinction and to provide specific - documentation sections for the individual builtin sequence types - (:issue:`4966`) - -New Modules -=========== - -faulthandler ------------- - -This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly, -on a fault (a crash like a segmentation fault), after a timeout, or on a user -signal. Call :func:`faulthandler.enable` to install fault handlers for the -:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and -:const:`SIGILL` signals. You can also enable them at startup by setting the -:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X` -``faulthandler`` command line option. - -Example of a segmentation fault on Linux: :: - - $ python -q -X faulthandler - >>> import ctypes - >>> ctypes.string_at(0) - Fatal Python error: Segmentation fault - - Current thread 0x00007fb899f39700: - File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at - File "", line 1 in - Segmentation fault - - -ipaddress ---------- - -The new :mod:`ipaddress` module provides tools for creating and manipulating -objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e. -an IP address associated with a specific IP subnet). - -(Contributed by Google and Peter Moody in :pep:`3144`) - -lzma ----- - -The newly-added :mod:`lzma` module provides data compression and decompression -using the LZMA algorithm, including support for the ``.xz`` and ``.lzma`` -file formats. - -(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`) - - -Improved Modules -================ - -abc ---- - -Improved support for abstract base classes containing descriptors composed with -abstract methods. The recommended approach to declaring abstract descriptors is -now to provide :attr:`__isabstractmethod__` as a dynamically updated -property. The built-in descriptors have been updated accordingly. - - * :class:`abc.abstractproperty` has been deprecated, use :class:`property` - with :func:`abc.abstractmethod` instead. - * :class:`abc.abstractclassmethod` has been deprecated, use - :class:`classmethod` with :func:`abc.abstractmethod` instead. - * :class:`abc.abstractstaticmethod` has been deprecated, use - :class:`staticmethod` with :func:`abc.abstractmethod` instead. - -(Contributed by Darren Dale in :issue:`11610`) - -array ------ - -The :mod:`array` module supports the :c:type:`long long` type using ``q`` and -``Q`` type codes. - -(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`) - - -base64, binascii ----------------- - -ASCII-only Unicode strings are now accepted by the decoding functions of the -modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``. - - -bz2 ---- - -The :mod:`bz2` module has been rewritten from scratch. In the process, several -new features have been added: - -* New :func:`bz2.open` function: open a bzip2-compressed file in binary or - text mode. - -* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like - objects, by means of its constructor's *fileobj* argument. - - (Contributed by Nadeem Vawda in :issue:`5863`) - -* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress - multi-stream inputs (such as those produced by the :program:`pbzip2` tool). - :class:`bz2.BZ2File` can now also be used to create this type of file, using - the ``'a'`` (append) mode. - - (Contributed by Nir Aides in :issue:`1625`) - -* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API, - except for the :meth:`detach` and :meth:`truncate` methods. - - -codecs ------- - -The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly -``replace`` and ``ignore`` error handlers on all Windows versions. The -:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only -``replace`` to encode and ``ignore`` to decode. - -A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the -Windows code page 65001 (Windows UTF-8, ``CP_UTF8``). For example, it is used -by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using -``chcp 65001`` command). - -Multibyte CJK decoders now resynchronize faster. They only ignore the first -byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312', -'replace')`` now returns a ``\n`` after the replacement character. - -(:issue:`12016`) - -Incremental CJK codec encoders are no longer reset at each call to their -encode() methods. For example:: - - $ ./python -q - >>> import codecs - >>> encoder = codecs.getincrementalencoder('hz')('strict') - >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.') - b'~{NpJ)l6HK!#~} Bye.' - -This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python -versions. - -(:issue:`12100`) - -The ``unicode_internal`` codec has been deprecated. - - -collections ------------ - -Addition of a new :class:`~collections.ChainMap` class to allow treating a -number of mappings as a single unit. - -(Written by Raymond Hettinger for :issue:`11089`, made public in -:issue:`11297`) - -The abstract base classes have been moved in a new :mod:`collections.abc` -module, to better differentiate between the abstract and the concrete -collections classes. Aliases for ABCs are still present in the -:mod:`collections` module to preserve existing imports. - -(:issue:`11085`) - -.. XXX addition of __slots__ to ABCs not recorded here: internal detail - - -contextlib ----------- - -:class:`~contextlib.ExitStack` now provides a solid foundation for -programmatic manipulation of context managers and similar cleanup -functionality. Unlike the previous ``contextlib.nested`` API (which was -deprecated and removed), the new API is designed to work correctly -regardless of whether context managers acquire their resources in -their ``__init__`` method (for example, file objects) or in their -``__enter__`` method (for example, synchronisation objects from the -:mod:`threading` module). - -(:issue:`13585`) - - -crypt ------ - -Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt` -function to the :mod:`crypt` module. - -(:issue:`10924`) - -curses ------- - - * If the :mod:`curses` module is linked to the ncursesw library, use Unicode - functions when Unicode strings or characters are passed (e.g. - :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`). - * Use the locale encoding instead of ``utf-8`` to encode Unicode strings. - * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute. - * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch` - method to get a wide character - * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to - push a wide character so the next :meth:`~curses.window.get_wch` will return - it - -(Contributed by I?igo Serna in :issue:`6755`) - -datetime --------- - - * Equality comparisons between naive and aware :class:`~datetime.datetime` - instances now return :const:`False` instead of raising :exc:`TypeError`. - * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp - corresponding to the :class:`~datetime.datetime` instance. - * The :meth:`datetime.datetime.strftime` method supports formatting years - older than 1000. - * The :meth:`datetime.datetime.astimezone` method can now be - called without arguments to convert datetime instance to the system - timezone. - -decimal -------- - -:issue:`7652` - integrate fast native decimal arithmetic. - C-module and libmpdec written by Stefan Krah. - -The new C version of the decimal module integrates the high speed libmpdec -library for arbitrary precision correctly-rounded decimal floating point -arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification. - -Performance gains range from 10x for database applications to 100x for -numerically intensive applications. These numbers are expected gains -for standard precisions used in decimal floating point arithmetic. Since -the precision is user configurable, the exact figures may vary. For example, -in integer bignum arithmetic the differences can be significantly higher. - -The following table is meant as an illustration. Benchmarks are available -at http://www.bytereef.org/mpdecimal/quickstart.html. - - +---------+-------------+--------------+-------------+ - | | decimal.py | _decimal | speedup | - +=========+=============+==============+=============+ - | pi | 42.02s | 0.345s | 120x | - +---------+-------------+--------------+-------------+ - | telco | 172.19s | 5.68s | 30x | - +---------+-------------+--------------+-------------+ - | psycopg | 3.57s | 0.29s | 12x | - +---------+-------------+--------------+-------------+ - -Features -~~~~~~~~ - -* The :exc:`~decimal.FloatOperation` signal optionally enables stricter - semantics for mixing floats and Decimals. - -* If Python is compiled without threads, the C version automatically - disables the expensive thread local context machinery. In this case, - the variable :data:`~decimal.HAVE_THREADS` is set to False. - -API changes -~~~~~~~~~~~ - -* The C module has the following context limits, depending on the machine - architecture: - - +-------------------+---------------------+------------------------------+ - | | 32-bit | 64-bit | - +===================+=====================+==============================+ - | :const:`MAX_PREC` | :const:`425000000` | :const:`999999999999999999` | - +-------------------+---------------------+------------------------------+ - | :const:`MAX_EMAX` | :const:`425000000` | :const:`999999999999999999` | - +-------------------+---------------------+------------------------------+ - | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` | - +-------------------+---------------------+------------------------------+ - -* In the context templates (:class:`~decimal.DefaultContext`, - :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`) - the magnitude of :attr:`~decimal.Context.Emax` and - :attr:`~decimal.Context.Emin` has changed to :const:`999999`. - -* The :class:`~decimal.Decimal` constructor in decimal.py does not observe - the context limits and converts values with arbitrary exponents or precision - exactly. Since the C version has internal limits, the following scheme is - used: If possible, values are converted exactly, otherwise - :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the - latter case it is always possible to use :meth:`~decimal.Context.create_decimal` - in order to obtain a rounded or inexact value. - - -* The power function in decimal.py is always correctly-rounded. In the - C version, it is defined in terms of the correctly-rounded - :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions, - but the final result is only "almost always correctly rounded". - - -* In the C version, the context dictionary containing the signals is a - :class:`~collections.abc.MutableMapping`. For speed reasons, - :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always - refer to the same :class:`~collections.abc.MutableMapping` that the context - was initialized with. If a new signal dictionary is assigned, - :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` - are updated with the new values, but they do not reference the RHS - dictionary. - - -* Pickling a :class:`~decimal.Context` produces a different output in order - to have a common interchange format for the Python and C versions. - - -* The order of arguments in the :class:`~decimal.Context` constructor has been - changed to match the order displayed by :func:`repr`. - - -* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method - is deprecated. +Other API Changes +~~~~~~~~~~~~~~~~~ + +New :class:`~email.parser.BytesHeaderParser`, added to the :mod:`~email.parser` +module to complement :class:`~email.parser.HeaderParser` and complete the Bytes +API. + +New utility functions: + + * :func:`~email.utils.format_datetime`: given a :class:`~datetime.datetime`, + produce a string formatted for use in an email header. + + * :func:`~email.utils.parsedate_to_datetime`: given a date string from + an email header, convert it into an aware :class:`~datetime.datetime`, + or a naive :class:`~datetime.datetime` if the offset is ``-0000``. + + * :func:`~email.utils.localtime`: With no argument, returns the + current local time as an aware :class:`~datetime.datetime` using the local + :class:`~datetime.timezone`. Given an aware :class:`~datetime.datetime`, + converts it into an aware :class:`~datetime.datetime` using the + local :class:`~datetime.timezone`. ftplib ------ +* :class:`ftplib.FTP` now accepts a ``source_address`` keyword argument to + specify the ``(host, port)`` to use as the source address in the bind call + when creating the outgoing socket. (Contributed by Giampaolo Rodol? + in :issue:`8594`.) + * The :class:`~ftplib.FTP_TLS` class now provides a new :func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to - plaintext. This can be useful to take advantage of firewalls that know how to - handle NAT with non-secure FTP without opening fixed ports. - - (Contributed by Giampaolo Rodol? in :issue:`12139`) + plaintext. This can be useful to take advantage of firewalls that know how + to handle NAT with non-secure FTP without opening fixed ports. (Contributed + by Giampaolo Rodol? in :issue:`12139`) * Added :meth:`ftplib.FTP.mlsd` method which provides a parsable directory listing format and deprecates :meth:`ftplib.FTP.nlst` and - :meth:`ftplib.FTP.dir`. - - (Contributed by Giampaolo Rodol? in :issue:`11072`) + :meth:`ftplib.FTP.dir`. (Contributed by Giampaolo Rodol? in :issue:`11072`) + + +functools +--------- + +The :func:`functools.lru_cache` decorator now accepts a ``typed`` keyword +argument (that defaults to ``False`` to ensure that it caches values of +different types that compare equal in separate cache slots. (Contributed +by Raymond Hettinger in :issue:`13227`.) + gc -- @@ -1254,37 +1395,49 @@ hmac ---- -A new :func:`~hmac.compare_digest` function has been added to prevent -side channel attacks on digests through timing analysis. - -(Contributed by Nick Coghlan and Christian Heimes in issue:`15061`) - - -html.entities -------------- - -A new :data:`~html.entities.html5` dictionary that maps HTML5 named character -references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``) -has been added to the :mod:`html.entities` module. The dictionary is now also -used by :class:`~html.parser.HTMLParser`. - -(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`) - - -html.parser ------------ - -:class:`~html.parser.HTMLParser` is now able to parse broken markup without +A new :func:`~hmac.compare_digest` function has been added to prevent side +channel attacks on digests through timing analysis. (Contributed by Nick +Coghlan and Christian Heimes in :issue:`15061`) + + +http +---- + +:class:`http.server.BaseHTTPRequestHandler` now buffers the headers and writes +them all at once when :meth:`~http.server.BaseHTTPRequestHandler.end_headers` is +called. A new method :meth:`~http.server.BaseHTTPRequestHandler.flush_headers` +can be used to directly manage when the accumlated headers are sent. +(Contributed by Andrew Schaaf in :issue:`3709`.) + +:class:`http.server` now produces valid ``HTML 4.01 strict`` output. +(Contributed by Ezio Melotti in :issue:`13295`.) + +:class:`http.client.HTTPResponse` now has a +:meth:`~http.client.HTTPResponse.readinto` method, which means it can be used +as a :class:`io.RawIOBase` class. (Contributed by John Kuhn in +:issue:`13464`.) + + +html +---- + +:class:`html.parser.HTMLParser` is now able to parse broken markup without raising errors, therefore the *strict* argument of the constructor and the :exc:`~html.parser.HTMLParseError` exception are now deprecated. The ability to parse broken markup is the result of a number of bug fixes that are also available on the latest bug fix releases of Python 2.7/3.2. - (Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`, :issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`, :issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`, :issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`) +A new :data:`~html.entities.html5` dictionary that maps HTML5 named character +references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == +'>'``) has been added to the :mod:`html.entities` module. The dictionary is +now also used by :class:`~html.parser.HTMLParser`. (Contributed by Ezio +Melotti in :issue:`11113` and :issue:`15156`) + + imaplib ------- @@ -1327,13 +1480,42 @@ underlying binary buffer. +itertools +--------- + +:func:`~itertools.accumulate` now takes an optional ``func`` argument for +providing a user-supplied binary function. + + +logging +------- + +The :func:`~logging.basicConfig` function now supports an optional ``handlers`` +argument taking an iterable of handlers to be added to the root logger. + +A class level attribute :attr:`~logging.handlers.SysLogHandler.append_nul` has +been added to :class:`~logging.handlers.SysLogHandler` to allow control of the +appending of the ``NUL`` (``\000``) byte to syslog records, since for some +deamons it is required while for others it is passed through to the log. + + + math ---- -The :mod:`math` module has a new function: - - * :func:`~math.log2`: return the base-2 logarithm of *x* - (Written by Mark Dickinson in :issue:`11888`). +The :mod:`math` module has a new function, :func:`~math.log2`, which returns +the base-2 logarithm of *x*. + +(Written by Mark Dickinson in :issue:`11888`). + + +mmap +---- + +The :meth:`~mmap.mmap.read` method is now more compatible with other file-like +objects: if the argument is omitted or specified as ``None``, it returns the +bytes from the current file position to the end of the mapping. (Contributed +by Petri Lehtinen in :issue:`12021`.) multiprocessing @@ -1347,6 +1529,22 @@ multiprocessing connections. (Contributed by Richard Oudkerk in :issue:`4892`.) +:class:`multiprocessing.Process` now accepts a ``daemon`` keyword argument +to override the default behavior of inheriting the ``daemon`` flag from +the parent process (:issue:`6064`). + +New attribute attribute :data:`multiprocessing.Process.sentinel` allows a +program to wait on multiple :class:`~multiprocessing.Process` objects at one +time using the appropriate OS primitives (for example, :mod:`select` on +posix systems). + +New methods :meth:`multiprocessing.pool.Pool.starmap` and +:meth:`~multiprocessing.pool.Pool.starmap_async` provide +:func:`itertools.starmap` equivalents to the existing +:meth:`multiprocessing.pool.Pool.map` and +:meth:`~multiprocessing.pool.Pool.map_async` functions. (Contributed by Hynek +Schlawack in :issue:`12708`.) + nntplib ------- @@ -1400,12 +1598,20 @@ :func:`~os.link`, :func:`~os.lstat`, :func:`~os.mkdir`, :func:`~os.mkfifo`, :func:`~os.mknod`, :func:`~os.open`, :func:`~os.readlink`, :func:`~os.remove`, :func:`~os.rename`, :func:`~os.replace`, :func:`~os.rmdir`, :func:`~os.stat`, - :func:`~os.symlink`, :func:`~os.unlink`, :func:`~os.utime`. + :func:`~os.symlink`, :func:`~os.unlink`, :func:`~os.utime`. Platform + support for using these parameters can be checked via the sets + :data:`os.supports_dir_fd` and :data:`os.supports_follows_symlinks`. - The following functions now support a file descriptor for their path argument: :func:`~os.chdir`, :func:`~os.chmod`, :func:`~os.chown`, :func:`~os.execve`, :func:`~os.listdir`, :func:`~os.pathconf`, :func:`~os.path.exists`, - :func:`~os.stat`, :func:`~os.statvfs`, :func:`~os.utime`. + :func:`~os.stat`, :func:`~os.statvfs`, :func:`~os.utime`. Platform support + for this can be checked via the :data:`os.supports_fd` set. + +* :func:`~os.access` accepts an ``effective_ids`` keyword argument to turn on + using the effective uid/gid rather than the real uid/gid in the access check. + Platform support for this can be checked via the + :data:`~os.supports_effective_ids` set. * The :mod:`os` module has two new functions: :func:`~os.getpriority` and :func:`~os.setpriority`. They can be used to get or set process @@ -1454,7 +1660,7 @@ for a file. * :func:`~os.sync`: Force write of everything to disk. -* Add some extra posix functions to the os module: +* Additional new posix functions: * :func:`~os.lockf`: Apply, test or remove a POSIX lock on an open file descriptor. * :func:`~os.pread`: Read from a file descriptor at an offset, the file @@ -1473,13 +1679,29 @@ * :func:`~os.times` and :func:`~os.uname`: Return type changed from a tuple to a tuple-like object with named attributes. +* Some platforms now support additional constants for the :func:`~os.lseek` + function, such as ``os.SEEK_HOLE`` and ``os.SEEK_DATA``. + +* New constants :data:`~os.RTLD_LAZY`, :data:`~os.RTLD_NOW`, + :data:`~os.RTLD_GLOBAL`, :data:`~os.RTLD_LOCAL`, :data:`~os.RTLD_NODELETE`, + :data:`~os.RTLD_NOLOAD`, and :data:`~os.RTLD_DEEPBIND` are available on + platforms that support them. These are for use with the + :func:`sys.setdlopenflags` function, and supersede the similar constants + defined in :mod:`ctypes` and :mod:`DLFCN`. (Contributed by Victor Stinner + in :issue:`13226`.) + +* :func:`os.symlink` now accepts (and ignores) the ``target_is_directory`` + keyword argument on non-Windows platforms, to ease cross-platform support. + pdb --- -* Tab-completion is now available not only for command names, but also their - arguments. For example, for the ``break`` command, function and file names - are completed. (Contributed by Georg Brandl in :issue:`14210`) +Tab-completion is now available not only for command names, but also their +arguments. For example, for the ``break`` command, function and file names +are completed. + +(Contributed by Georg Brandl in :issue:`14210`) pickle @@ -1488,6 +1710,7 @@ :class:`pickle.Pickler` objects now have an optional :attr:`~pickle.Pickler.dispatch_table` attribute allowing to set per-pickler reduction functions. + (Contributed by Richard Oudkerk in :issue:`14166`.) @@ -1534,40 +1757,53 @@ :issue:`13245`) +select +------ + +Solaris and derivatives platforms have a new class :class:`select.devpoll` +for high performance asynchronous sockets via :file:`/dev/poll`. +(Contributed by Jes?s Cea Avi?n in :issue:`6397`.) + + shlex ----- -* The previously undocumented helper function ``quote`` from the - :mod:`pipes` modules has been moved to the :mod:`shlex` module and - documented. :func:`~shlex.quote` properly escapes all characters in a string - that might be otherwise given special meaning by the shell. +The previously undocumented helper function ``quote`` from the +:mod:`pipes` modules has been moved to the :mod:`shlex` module and +documented. :func:`~shlex.quote` properly escapes all characters in a string +that might be otherwise given special meaning by the shell. shutil ------ -* The :mod:`shutil` module has these new fuctions: +* New functions: * :func:`~shutil.disk_usage`: provides total, used and free disk space statistics. (Contributed by Giampaolo Rodol? in :issue:`12442`) * :func:`~shutil.chown`: allows one to change user and/or group of the given path also specifying the user/group names and not only their numeric ids. (Contributed by Sandro Tosi in :issue:`12191`) + * :func:`shutil.get_terminal_size`: returns the size of the terminal window + to which the interpreter is attached. (Contributed by Zbigniew + J?drzejewski-Szmek in :issue:`13609`.) * :func:`~shutil.copy2` and :func:`~shutil.copystat` now preserve file timestamps with nanosecond precision on platforms that support it. They also preserve file "extended attributes" on Linux. (Contributed by Larry Hastings in :issue:`14127` and :issue:`15238`.) -* The new :func:`shutil.get_terminal_size` function returns the size of the - terminal window the interpreter is attached to. - (Contributed by Zbigniew J?drzejewski-Szmek in :issue:`13609`.) - * Several functions now take an optional ``symlinks`` argument: when that parameter is true, symlinks aren't dereferenced and the operation instead acts on the symlink itself (or creates one, if relevant). (Contributed by Hynek Schlawack in :issue:`12715`.) +* When copying files to a different file system, :func:`~shutil.move` now + handles symlinks the way the posix ``mv`` command does, recreating the + symlink rather than copying the target file contents. (Contributed by + Jonathan Niehof in :issue:`9993`.) :func:`~shutil.move` now also returns + the ``dst`` argument as its result. + * :func:`~shutil.rmtree` is now resistant to symlink attacks on platforms which support the new ``dir_fd`` parameter in :func:`os.open` and :func:`os.unlink`. (Contributed by Martin von L?wis and Hynek Schlawack @@ -1600,23 +1836,31 @@ smtpd ----- -* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870` - (size extension). Per the standard, these extensions are enabled if and only - if the client initiates the session with an ``EHLO`` command. - - (Initial ``ELHO`` support by Alberto Trevino. Size extension by Juhana - Jauhiainen. Substantial additional work on the patch contributed by Michele - Orr? and Dan Boswell. :issue:`8739`) +The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870` +(size extension). Per the standard, these extensions are enabled if and only +if the client initiates the session with an ``EHLO`` command. + +(Initial ``ELHO`` support by Alberto Trevino. Size extension by Juhana +Jauhiainen. Substantial additional work on the patch contributed by Michele +Orr? and Dan Boswell. :issue:`8739`) smtplib ------- -* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls` - method now accept an SSLContext parameter to control parameters of the secure - channel. - - (Contributed by Kasun Herath in :issue:`8809`) +The :class:`~smtplib.SMTP`, :class:`~smtplib.SMTP_SSL`, and +:class:`~smtplib.LMTP` classes now accept a ``source_address`` keyword argument +to specify the ``(host, port)`` to use as the source address in the bind call +when creating the outgoing socket. (Contributed by Paulo Scardine in +:issue:`11281`.) + +:class:`~smtplib.SMTP` now supports the context manager protocol, allowing an +``SMTP`` instance to be used in a ``with`` statement. (Contributed +by Giampaolo Rodol? in :issue:`11289`.) + +The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls` +method now accept an SSLContext parameter to control parameters of the secure +channel. (Contributed by Kasun Herath in :issue:`8809`) socket @@ -1642,6 +1886,32 @@ (http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and http://oss.oracle.com/projects/rds/). +* The :class:`~socket.socket` class now supports the ``PF_SYSTEM`` protocol + family on OS X. (Contributed by Michael Goderbauer in :issue:`13777`.) + +* New function :func:`~socket.sethostname` allows the hostname to be set + on unix systems if the calling process has sufficient privileges. + (Contributed by Ross Lagerwall in :issue:`10866`.) + + +socketserver +------------ + +:class:`~socketserver.BaseServer` now has an overridable method +:meth:`~socketserver.BaseServer.service_actions` that is called by the +:meth:`~socketserver.BaseServer.serve_forever` method in the service loop. +:class:`~socketserver.ForkingMixIn` now uses this to clean up zombie +child proceses. (Contributed by Justin Warkentin in :issue:`11109`.) + + +sqlite3 +------- + +New :class:`sqlite3.Connection` method +:meth:`~sqlite3.Connection.set_trace_callback` can be used to capture a trace of +all sql commands processed by sqlite. (Contributed by Torsten Landschoff +in :issue:`11688`.) + ssl --- @@ -1656,66 +1926,121 @@ * The :mod:`ssl` module now exposes a finer-grained exception hierarchy in order to make it easier to inspect the various kinds of errors. - (Contributed by Antoine Pitrou in :issue:`11183`) * :meth:`~ssl.SSLContext.load_cert_chain` now accepts a *password* argument to be used if the private key is encrypted. - (Contributed by Adam Simpkins in :issue:`12803`) * Diffie-Hellman key exchange, both regular and Elliptic Curve-based, is now supported through the :meth:`~ssl.SSLContext.load_dh_params` and :meth:`~ssl.SSLContext.set_ecdh_curve` methods. - (Contributed by Antoine Pitrou in :issue:`13626` and :issue:`13627`) * SSL sockets have a new :meth:`~ssl.SSLSocket.get_channel_binding` method allowing the implementation of certain authentication mechanisms such as - SCRAM-SHA-1-PLUS. - - (Contributed by Jacek Konieczny in :issue:`12551`) + SCRAM-SHA-1-PLUS. (Contributed by Jacek Konieczny in :issue:`12551`) * You can query the SSL compression algorithm used by an SSL socket, thanks - to its new :meth:`~ssl.SSLSocket.compression` method. - + to its new :meth:`~ssl.SSLSocket.compression` method. The new attribute + :attr:`~ssl.OP_NO_COMPRESSION` can be used to disable compression. (Contributed by Antoine Pitrou in :issue:`13634`) * Support has been added for the Next Procotol Negotiation extension using the :meth:`ssl.SSLContext.set_npn_protocols` method. - (Contributed by Colin Marc in :issue:`14204`) * SSL errors can now be introspected more easily thanks to :attr:`~ssl.SSLError.library` and :attr:`~ssl.SSLError.reason` attributes. - (Contributed by Antoine Pitrou in :issue:`14837`) +* The :func:`~ssl.get_server_certificate` function now supports IPv6. + (Contributed by Charles-Fran?ois Natali in :issue:`11811`.) + +* New attribute :attr:`~ssl.OP_CIPHER_SERVER_PREFERENCE` allows setting + SSLv3 server sockets to use the server's cipher ordering preference rather + than the client's (:issue:`13635`). + + stat ---- -- The undocumented tarfile.filemode function has been moved to - :func:`stat.filemode`. It can be used to convert a file's mode to a string of - the form '-rwxrwxrwx'. - - (Contributed by Giampaolo Rodol? in :issue:`14807`) +The undocumented tarfile.filemode function has been moved to +:func:`stat.filemode`. It can be used to convert a file's mode to a string of +the form '-rwxrwxrwx'. + +(Contributed by Giampaolo Rodol? in :issue:`14807`) + + +struct +------ + +The :mod:`struct` module now supports ``ssize_t`` and ``size_t`` via the +new codes ``n`` and ``N``, respectively. (Contributed by Antoine Pitrou +in :issue:`3163`.) + + +subprocess +---------- + +Command strings can now be bytes objects on posix platforms. (Contributed by +Victor Stinner in :issue:`8513`.) + +A new constant :data:`~subprocess.DEVNULL` allows suppressing output in a +platform-independent fashion. (Contributed by Ross Lagerwall in +:issue:`5870`.) + sys --- -* The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct - sequence` holding informations about the thread implementation. - - (:issue:`11223`) +The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct +sequence` holding informations about the thread implementation +(:issue:`11223`). + + +tarfile +------- + +:mod:`tarfile` now supports ``lzma`` encoding via the :mod:`lzma` module. +(Contributed by Lars Gust?bel in :issue:`5689`.) + + +tempfile +-------- + +:class:`tempfile.SpooledTemporaryFile`\'s +:meth:`~tempfile.SpooledTemporaryFile.trucate` method now accepts +a ``size`` parameter. (Contributed by Ryan Kelly in :issue:`9957`.) + textwrap -------- -* The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes - it straightforward to add a common prefix to selected lines in a block - of text. - - (:issue:`13857`) +The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes +it straightforward to add a common prefix to selected lines in a block +of text (:issue:`13857`). + + +threading +--------- + +:class:`threading.Condition`, :class:`threading.Semaphore`, +:class:`threading.BoundedSemaphore`, :class:`threading.Event`, and +:class:`threading.Timer`, all of which used to be factory functions returning a +class instance, are now classes and may be subclassed. (Contributed by ?ric +Araujo in :issue:`10968`). + +The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword +argument to override the default behavior of inheriting the ``deamon`` flag +value from the parent thread (:issue:`6064`). + +The formerly private function ``_thread.get_ident`` is now available as the +public function :func:`threading.get_ident`. This eliminates several cases of +direct access to the ``_thread`` module in the stdlib. Third party code that +used ``_thread.get_ident`` should likewise be changed to use the new public +interface. + time ---- @@ -1736,6 +2061,10 @@ :func:`~time.clock_settime` functions with ``CLOCK_xxx`` constants. (Contributed by Victor Stinner in :issue:`10278`) +To improve cross platform consistency, :func:`~time.sleep` now raises a +:exc:`ValueError` when passed a negative sleep value. Previously this was an +error on posix, but produced an infinite sleep on Windows. + types ----- @@ -1753,9 +2082,11 @@ :meth:`.assertRaises`, :meth:`.assertRaisesRegex`, :meth:`.assertWarns`, and :meth:`.assertWarnsRegex` now accept a keyword argument *msg* when used as -context managers. - -(Contributed by Ezio Melotti and Winston Ewert in :issue:`10775`) +context managers. (Contributed by Ezio Melotti and Winston Ewert in +:issue:`10775`) + +:meth:`unittest.TestCase.run` now returns the :class:`~unittest.TestResult` +object. urllib @@ -1773,13 +2104,13 @@ webbrowser ---------- -The :mod:`webbrowser` module supports more browsers: Google Chrome (named +The :mod:`webbrowser` module supports more "browsers": Google Chrome (named :program:`chrome`, :program:`chromium`, :program:`chrome-browser` or -:program:`chromium-browser` depending on the version and operating system) as -well as the the generic launchers :program:`xdg-open` from the FreeDesktop.org -project and :program:`gvfs-open` which is the default URI handler for GNOME 3. - -(:issue:`13620` and :issue:`14493`) +:program:`chromium-browser` depending on the version and operating system), +and the generic launchers :program:`xdg-open`, from the FreeDesktop.org +project, and :program:`gvfs-open`, which is the default URI handler for GNOME +3. (The former contributed by Arnaud Calmettes in :issue:`13620`, the latter +by Matthias Klose in :issue:`14493`) xml.etree.ElementTree @@ -1794,6 +2125,18 @@ and a more detailed reference. +zlib +---- + +New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish +between a properly-formed compressed stream and an incomplete or truncated one. +(Contributed by Nadeem Vawda in :issue:`12646`.) + +New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of +the underlying ``zlib`` library that is loaded at runtime. (Contributed by +Torsten Landschoff in :issue:`12306`.) + + Optimizations ============= @@ -1862,6 +2205,8 @@ Windows 2000 and Windows platforms which set ``COMSPEC`` to ``command.com`` are no longer supported due to maintenance burden. +OSF support, which was deprecated in 3.2, has been completely removed. + Deprecated Python modules, functions and methods ------------------------------------------------ @@ -1872,7 +2217,7 @@ * :meth:`ftplib.FTP.nlst` and :meth:`ftplib.FTP.dir`: use :meth:`ftplib.FTP.mlsd` * :func:`platform.popen`: use the :mod:`subprocess` module. Check especially - the :ref:`subprocess-replacements` section. + the :ref:`subprocess-replacements` section (:issue:`11377`). * :issue:`13374`: The Windows bytes API has been deprecated in the :mod:`os` module. Use Unicode filenames, instead of bytes filenames, to not depend on the ANSI code page anymore and to support any filename. @@ -1911,58 +2256,58 @@ Unicode functions and methods using :c:type:`Py_UNICODE` and :c:type:`Py_UNICODE*` types: - * :c:macro:`PyUnicode_FromUnicode`: use :c:func:`PyUnicode_FromWideChar` or - :c:func:`PyUnicode_FromKindAndData` - * :c:macro:`PyUnicode_AS_UNICODE`, :c:func:`PyUnicode_AsUnicode`, - :c:func:`PyUnicode_AsUnicodeAndSize`: use :c:func:`PyUnicode_AsWideCharString` - * :c:macro:`PyUnicode_AS_DATA`: use :c:macro:`PyUnicode_DATA` with - :c:macro:`PyUnicode_READ` and :c:macro:`PyUnicode_WRITE` - * :c:macro:`PyUnicode_GET_SIZE`, :c:func:`PyUnicode_GetSize`: use - :c:macro:`PyUnicode_GET_LENGTH` or :c:func:`PyUnicode_GetLength` - * :c:macro:`PyUnicode_GET_DATA_SIZE`: use - ``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready - strings) - * :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or - :c:func:`PyUnicode_AsWideCharString` - * :c:func:`PyUnicode_GetMax` +* :c:macro:`PyUnicode_FromUnicode`: use :c:func:`PyUnicode_FromWideChar` or + :c:func:`PyUnicode_FromKindAndData` +* :c:macro:`PyUnicode_AS_UNICODE`, :c:func:`PyUnicode_AsUnicode`, + :c:func:`PyUnicode_AsUnicodeAndSize`: use :c:func:`PyUnicode_AsWideCharString` +* :c:macro:`PyUnicode_AS_DATA`: use :c:macro:`PyUnicode_DATA` with + :c:macro:`PyUnicode_READ` and :c:macro:`PyUnicode_WRITE` +* :c:macro:`PyUnicode_GET_SIZE`, :c:func:`PyUnicode_GetSize`: use + :c:macro:`PyUnicode_GET_LENGTH` or :c:func:`PyUnicode_GetLength` +* :c:macro:`PyUnicode_GET_DATA_SIZE`: use + ``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready + strings) +* :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or + :c:func:`PyUnicode_AsWideCharString` +* :c:func:`PyUnicode_GetMax` Functions and macros manipulating Py_UNICODE* strings: - * :c:macro:`Py_UNICODE_strlen`: use :c:func:`PyUnicode_GetLength` or - :c:macro:`PyUnicode_GET_LENGTH` - * :c:macro:`Py_UNICODE_strcat`: use :c:func:`PyUnicode_CopyCharacters` or - :c:func:`PyUnicode_FromFormat` - * :c:macro:`Py_UNICODE_strcpy`, :c:macro:`Py_UNICODE_strncpy`, - :c:macro:`Py_UNICODE_COPY`: use :c:func:`PyUnicode_CopyCharacters` or - :c:func:`PyUnicode_Substring` - * :c:macro:`Py_UNICODE_strcmp`: use :c:func:`PyUnicode_Compare` - * :c:macro:`Py_UNICODE_strncmp`: use :c:func:`PyUnicode_Tailmatch` - * :c:macro:`Py_UNICODE_strchr`, :c:macro:`Py_UNICODE_strrchr`: use - :c:func:`PyUnicode_FindChar` - * :c:macro:`Py_UNICODE_FILL`: use :c:func:`PyUnicode_Fill` - * :c:macro:`Py_UNICODE_MATCH` +* :c:macro:`Py_UNICODE_strlen`: use :c:func:`PyUnicode_GetLength` or + :c:macro:`PyUnicode_GET_LENGTH` +* :c:macro:`Py_UNICODE_strcat`: use :c:func:`PyUnicode_CopyCharacters` or + :c:func:`PyUnicode_FromFormat` +* :c:macro:`Py_UNICODE_strcpy`, :c:macro:`Py_UNICODE_strncpy`, + :c:macro:`Py_UNICODE_COPY`: use :c:func:`PyUnicode_CopyCharacters` or + :c:func:`PyUnicode_Substring` +* :c:macro:`Py_UNICODE_strcmp`: use :c:func:`PyUnicode_Compare` +* :c:macro:`Py_UNICODE_strncmp`: use :c:func:`PyUnicode_Tailmatch` +* :c:macro:`Py_UNICODE_strchr`, :c:macro:`Py_UNICODE_strrchr`: use + :c:func:`PyUnicode_FindChar` +* :c:macro:`Py_UNICODE_FILL`: use :c:func:`PyUnicode_Fill` +* :c:macro:`Py_UNICODE_MATCH` Encoders: - * :c:func:`PyUnicode_Encode`: use :c:func:`PyUnicode_AsEncodedObject` - * :c:func:`PyUnicode_EncodeUTF7` - * :c:func:`PyUnicode_EncodeUTF8`: use :c:func:`PyUnicode_AsUTF8` or - :c:func:`PyUnicode_AsUTF8String` - * :c:func:`PyUnicode_EncodeUTF32` - * :c:func:`PyUnicode_EncodeUTF16` - * :c:func:`PyUnicode_EncodeUnicodeEscape:` use - :c:func:`PyUnicode_AsUnicodeEscapeString` - * :c:func:`PyUnicode_EncodeRawUnicodeEscape:` use - :c:func:`PyUnicode_AsRawUnicodeEscapeString` - * :c:func:`PyUnicode_EncodeLatin1`: use :c:func:`PyUnicode_AsLatin1String` - * :c:func:`PyUnicode_EncodeASCII`: use :c:func:`PyUnicode_AsASCIIString` - * :c:func:`PyUnicode_EncodeCharmap` - * :c:func:`PyUnicode_TranslateCharmap` - * :c:func:`PyUnicode_EncodeMBCS`: use :c:func:`PyUnicode_AsMBCSString` or - :c:func:`PyUnicode_EncodeCodePage` (with ``CP_ACP`` code_page) - * :c:func:`PyUnicode_EncodeDecimal`, - :c:func:`PyUnicode_TransformDecimalToASCII` +* :c:func:`PyUnicode_Encode`: use :c:func:`PyUnicode_AsEncodedObject` +* :c:func:`PyUnicode_EncodeUTF7` +* :c:func:`PyUnicode_EncodeUTF8`: use :c:func:`PyUnicode_AsUTF8` or + :c:func:`PyUnicode_AsUTF8String` +* :c:func:`PyUnicode_EncodeUTF32` +* :c:func:`PyUnicode_EncodeUTF16` +* :c:func:`PyUnicode_EncodeUnicodeEscape:` use + :c:func:`PyUnicode_AsUnicodeEscapeString` +* :c:func:`PyUnicode_EncodeRawUnicodeEscape:` use + :c:func:`PyUnicode_AsRawUnicodeEscapeString` +* :c:func:`PyUnicode_EncodeLatin1`: use :c:func:`PyUnicode_AsLatin1String` +* :c:func:`PyUnicode_EncodeASCII`: use :c:func:`PyUnicode_AsASCIIString` +* :c:func:`PyUnicode_EncodeCharmap` +* :c:func:`PyUnicode_TranslateCharmap` +* :c:func:`PyUnicode_EncodeMBCS`: use :c:func:`PyUnicode_AsMBCSString` or + :c:func:`PyUnicode_EncodeCodePage` (with ``CP_ACP`` code_page) +* :c:func:`PyUnicode_EncodeDecimal`, + :c:func:`PyUnicode_TransformDecimalToASCII` Deprecated features @@ -2045,6 +2390,54 @@ special case the standard import hooks so they are still supported even though they do not provide the non-standard ``iter_modules()`` method. +* A longstanding RFC-compliance bug (:issue:`1079`) in the parsing done by + :func:`email.header.decode_header` has been fixed. Code that uses the + standard idiom to convert encoded headers into unicode + (``str(make_header(decode_header(h))``) will see no change, but code that + looks at the individual tuples returned by decode_header will see that + whitespace that precedes or follows ``ASCII`` sections is now included in the + ``ASCII`` section. Code that builds headers using ``make_header`` should + also continue to work without change, since ``make_header`` continues to add + whitespace between ``ASCII`` and non-``ASCII`` sections if it is not already + present in the input strings. + +* :func:`email.utils.formataddr` now does the correct content transfer + encoding when passed non-``ASCII`` display names. Any code that depended on + the previous buggy behavior that preserved the non-``ASCII`` unicode in the + formatted output string will need to be changed (:issue:`1690608`). + +* :meth:`poplib.POP3.quit` may now raise protocol errors like all other + ``poplib`` methods. Code that assumes ``quit`` does not raise + :exc:`poplib.error_proto` errors may need to be changed if errors on ``quit`` + are encountered by a particular application (:issue:`11291`). + +* The ``strict`` argument to :class:`email.parser.Parser`, deprecated since + Python 2.4, has finally been removed. + +* The deprecated method ``unittest.TestCase.assertSameElements`` has been + removed. + +* The deprecated variable ``time.accept2dyear`` has been removed. + +* The deprecated ``Context._clamp`` attribute has been removed from the + :mod:`decimal` module. It was previously replaced by the public attribute + :attr:`~decimal.Context.clamp`. (See :issue:`8540`.) + +* The undocumented internal helper class ``SSLFakeFile`` has been removed + from :mod:`smtplib`, since its functionality has long been provided directly + by :meth:`socket.socket.makefile`. + +* Passing a negative value to :func:`time.sleep` on Windows now raises an + error instead of sleeping forever. It has always raised an error on posix. + +* The ``ast.__version__`` constant has been removed. If you need to + make decisions affected by the AST version, use :attr:`sys.version_info` + to make the decision. + +* Code that used to work around the fact that the :mod:`threading` module used + factory functions by subclassing the private classes will need to change to + subclass the now-public classes. + Porting C code -------------- diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst new file mode 100644 --- /dev/null +++ b/Doc/whatsnew/changelog.rst @@ -0,0 +1,6 @@ ++++++++++ +Changelog ++++++++++ + +.. miscnews:: ../../Misc/NEWS + diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst --- a/Doc/whatsnew/index.rst +++ b/Doc/whatsnew/index.rst @@ -23,3 +23,11 @@ 2.2.rst 2.1.rst 2.0.rst + +The "Changelog" is a HTML version of the file :source:`Misc/NEWS` which +contains *all* nontrivial changes to Python for the current version. + +.. toctree:: + :maxdepth: 2 + + changelog.rst diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1022,8 +1022,7 @@ /* Create a Unicode Object from the given Unicode code point ordinal. - The ordinal must be in range(0x10000) on narrow Python builds - (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is + The ordinal must be in range(0x110000). A ValueError is raised in case it is not. */ diff --git a/Lib/bz2.py b/Lib/bz2.py --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -79,7 +79,8 @@ mode = "rb" mode_code = _MODE_READ self._decompressor = BZ2Decompressor() - self._buffer = None + self._buffer = b"" + self._buffer_offset = 0 elif mode in ("w", "wb"): mode = "wb" mode_code = _MODE_WRITE @@ -124,7 +125,8 @@ self._fp = None self._closefp = False self._mode = _MODE_CLOSED - self._buffer = None + self._buffer = b"" + self._buffer_offset = 0 @property def closed(self): @@ -157,15 +159,18 @@ raise ValueError("I/O operation on closed file") def _check_can_read(self): - if not self.readable(): + if self._mode not in (_MODE_READ, _MODE_READ_EOF): + self._check_not_closed() raise io.UnsupportedOperation("File not open for reading") def _check_can_write(self): - if not self.writable(): + if self._mode != _MODE_WRITE: + self._check_not_closed() raise io.UnsupportedOperation("File not open for writing") def _check_can_seek(self): - if not self.readable(): + if self._mode not in (_MODE_READ, _MODE_READ_EOF): + self._check_not_closed() raise io.UnsupportedOperation("Seeking is only supported " "on files open for reading") if not self._fp.seekable(): @@ -174,16 +179,13 @@ # Fill the readahead buffer if it is empty. Returns False on EOF. def _fill_buffer(self): + if self._mode == _MODE_READ_EOF: + return False # Depending on the input data, our call to the decompressor may not # return any data. In this case, try again after reading another block. - while True: - if self._buffer: - return True - - if self._decompressor.unused_data: - rawblock = self._decompressor.unused_data - else: - rawblock = self._fp.read(_BUFFER_SIZE) + while self._buffer_offset == len(self._buffer): + rawblock = (self._decompressor.unused_data or + self._fp.read(_BUFFER_SIZE)) if not rawblock: if self._decompressor.eof: @@ -199,30 +201,48 @@ self._decompressor = BZ2Decompressor() self._buffer = self._decompressor.decompress(rawblock) + self._buffer_offset = 0 + return True # Read data until EOF. # If return_data is false, consume the data without returning it. def _read_all(self, return_data=True): + # The loop assumes that _buffer_offset is 0. Ensure that this is true. + self._buffer = self._buffer[self._buffer_offset:] + self._buffer_offset = 0 + blocks = [] while self._fill_buffer(): if return_data: blocks.append(self._buffer) self._pos += len(self._buffer) - self._buffer = None + self._buffer = b"" if return_data: return b"".join(blocks) # Read a block of up to n bytes. # If return_data is false, consume the data without returning it. def _read_block(self, n, return_data=True): + # If we have enough data buffered, return immediately. + end = self._buffer_offset + n + if end <= len(self._buffer): + data = self._buffer[self._buffer_offset : end] + self._buffer_offset = end + self._pos += len(data) + return data if return_data else None + + # The loop assumes that _buffer_offset is 0. Ensure that this is true. + self._buffer = self._buffer[self._buffer_offset:] + self._buffer_offset = 0 + blocks = [] while n > 0 and self._fill_buffer(): if n < len(self._buffer): data = self._buffer[:n] - self._buffer = self._buffer[n:] + self._buffer_offset = n else: data = self._buffer - self._buffer = None + self._buffer = b"" if return_data: blocks.append(data) self._pos += len(data) @@ -238,9 +258,9 @@ """ with self._lock: self._check_can_read() - if self._mode == _MODE_READ_EOF or not self._fill_buffer(): + if not self._fill_buffer(): return b"" - return self._buffer + return self._buffer[self._buffer_offset:] def read(self, size=-1): """Read up to size uncompressed bytes from the file. @@ -250,7 +270,7 @@ """ with self._lock: self._check_can_read() - if self._mode == _MODE_READ_EOF or size == 0: + if size == 0: return b"" elif size < 0: return self._read_all() @@ -268,15 +288,19 @@ # In this case we make multiple reads, to avoid returning b"". with self._lock: self._check_can_read() - if (size == 0 or self._mode == _MODE_READ_EOF or - not self._fill_buffer()): + if (size == 0 or + # Only call _fill_buffer() if the buffer is actually empty. + # This gives a significant speedup if *size* is small. + (self._buffer_offset == len(self._buffer) and not self._fill_buffer())): return b"" - if 0 < size < len(self._buffer): - data = self._buffer[:size] - self._buffer = self._buffer[size:] + if size > 0: + data = self._buffer[self._buffer_offset : + self._buffer_offset + size] + self._buffer_offset += len(data) else: - data = self._buffer - self._buffer = None + data = self._buffer[self._buffer_offset:] + self._buffer = b"" + self._buffer_offset = 0 self._pos += len(data) return data @@ -295,10 +319,20 @@ non-negative, no more than size bytes will be read (in which case the line may be incomplete). Returns b'' if already at EOF. """ - if not hasattr(size, "__index__"): - raise TypeError("Integer argument expected") - size = size.__index__() + if not isinstance(size, int): + if not hasattr(size, "__index__"): + raise TypeError("Integer argument expected") + size = size.__index__() with self._lock: + self._check_can_read() + # Shortcut for the common case - the whole line is in the buffer. + if size < 0: + end = self._buffer.find(b"\n", self._buffer_offset) + 1 + if end > 0: + line = self._buffer[self._buffer_offset : end] + self._buffer_offset = end + self._pos += len(line) + return line return io.BufferedIOBase.readline(self, size) def readlines(self, size=-1): @@ -308,9 +342,10 @@ further lines will be read once the total size of the lines read so far equals or exceeds size. """ - if not hasattr(size, "__index__"): - raise TypeError("Integer argument expected") - size = size.__index__() + if not isinstance(size, int): + if not hasattr(size, "__index__"): + raise TypeError("Integer argument expected") + size = size.__index__() with self._lock: return io.BufferedIOBase.readlines(self, size) @@ -345,7 +380,8 @@ self._mode = _MODE_READ self._pos = 0 self._decompressor = BZ2Decompressor() - self._buffer = None + self._buffer = b"" + self._buffer_offset = 0 def seek(self, offset, whence=0): """Change the file position. @@ -385,8 +421,7 @@ offset -= self._pos # Read and discard data until we reach the desired position. - if self._mode != _MODE_READ_EOF: - self._read_block(offset, return_data=False) + self._read_block(offset, return_data=False) return self._pos diff --git a/Lib/codecs.py b/Lib/codecs.py --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -461,7 +461,7 @@ # read until we get the required number of characters (if available) while True: - # can the request can be satisfied from the character buffer? + # can the request be satisfied from the character buffer? if chars < 0: if size < 0: if self.charbuffer: diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -456,7 +456,7 @@ code = GetLastError() if descr is None: descr = FormatError(code).strip() - return WindowsError(code, descr) + return WindowsError(None, descr, None, code) if sizeof(c_uint) == sizeof(c_void_p): c_size_t = c_uint diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py --- a/Lib/ctypes/test/test_win32.py +++ b/Lib/ctypes/test/test_win32.py @@ -67,6 +67,28 @@ self.assertEqual(ex.text, "text") self.assertEqual(ex.details, ("details",)) + class TestWinError(unittest.TestCase): + def test_winerror(self): + # see Issue 16169 + import errno + ERROR_INVALID_PARAMETER = 87 + msg = FormatError(ERROR_INVALID_PARAMETER).strip() + args = (errno.EINVAL, msg, None, ERROR_INVALID_PARAMETER) + + e = WinError(ERROR_INVALID_PARAMETER) + self.assertEqual(e.args, args) + self.assertEqual(e.errno, errno.EINVAL) + self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER) + + windll.kernel32.SetLastError(ERROR_INVALID_PARAMETER) + try: + raise WinError() + except OSError as exc: + e = exc + self.assertEqual(e.args, args) + self.assertEqual(e.errno, errno.EINVAL) + self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER) + class Structures(unittest.TestCase): def test_struct_by_value(self): diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def --- a/Lib/idlelib/config-extensions.def +++ b/Lib/idlelib/config-extensions.def @@ -46,6 +46,8 @@ [ScriptBinding] enable=1 +enable_shell=0 +enable_editor=1 [ScriptBinding_cfgBindings] run-module= check-module= diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -206,10 +206,11 @@ """Summarize a network range given the first and last IP addresses. Example: - >>> summarize_address_range(IPv4Address('192.0.2.0'), - IPv4Address('192.0.2.130')) + >>> list(summarize_address_range(IPv4Address('192.0.2.0'), + ... IPv4Address('192.0.2.130'))) + ... #doctest: +NORMALIZE_WHITESPACE [IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/31'), - IPv4Network('192.0.2.130/32')] + IPv4Network('192.0.2.130/32')] Args: first: the first IPv4Address or IPv6Address in the range. diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -794,18 +794,12 @@ self.formatter = None def _connect_unixsocket(self, address): - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # syslog may require either DGRAM or STREAM sockets + self.socket = socket.socket(socket.AF_UNIX, self.socktype) try: self.socket.connect(address) except socket.error: self.socket.close() - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - try: - self.socket.connect(address) - except socket.error: - self.socket.close() - raise + raise def encodePriority(self, facility, priority): """ diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -112,7 +112,7 @@ __version__ = '1.0.7' import collections -import sys, os, re +import sys, os, re, subprocess ### Globals & Constants @@ -922,13 +922,15 @@ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default - target = _follow_symlinks(target).replace('"', '\\"') + target = _follow_symlinks(target) try: - f = os.popen('file -b "%s" 2> %s' % (target, DEV_NULL)) + proc = subprocess.Popen(['file', target], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + except (AttributeError,os.error): return default - output = f.read().strip() - rc = f.close() + output = proc.communicate()[0].decode('latin-1') + rc = proc.wait() if not output or rc: return default else: diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -159,15 +159,19 @@ # along with some printable description sort_arg_dict_default = { "calls" : (((1,-1), ), "call count"), + "ncalls" : (((1,-1), ), "call count"), + "cumtime" : (((3,-1), ), "cumulative time"), "cumulative": (((3,-1), ), "cumulative time"), "file" : (((4, 1), ), "file name"), + "filename" : (((4, 1), ), "file name"), "line" : (((5, 1), ), "line number"), "module" : (((4, 1), ), "file name"), "name" : (((6, 1), ), "function name"), "nfl" : (((6, 1),(4, 1),(5, 1),), "name/file/line"), - "pcalls" : (((0,-1), ), "call count"), + "pcalls" : (((0,-1), ), "primitive call count"), "stdname" : (((7, 1), ), "standard name"), "time" : (((2,-1), ), "internal time"), + "tottime" : (((2,-1), ), "internal time"), } def get_sort_arg_defs(self): diff --git a/Lib/socketserver.py b/Lib/socketserver.py --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -562,7 +562,7 @@ self.collect_children() def service_actions(self): - """Collect the zombie child processes regularly in the ForkingMixin. + """Collect the zombie child processes regularly in the ForkingMixIn. service_actions is called in the BaseServer's serve_forver loop. """ diff --git a/Lib/subprocess.py b/Lib/subprocess.py --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1445,9 +1445,16 @@ pid, sts = _waitpid(self.pid, _WNOHANG) if pid == self.pid: self._handle_exitstatus(sts) - except _os_error: + except _os_error as e: if _deadstate is not None: self.returncode = _deadstate + elif e.errno == errno.ECHILD: + # This happens if SIGCLD is set to be ignored or + # waiting for child processes has otherwise been + # disabled for our process. This child is dead, we + # can't get the status. + # http://bugs.python.org/issue15756 + self.returncode = 0 return self.returncode diff --git a/Lib/test/subprocessdata/sigchild_ignore.py b/Lib/test/subprocessdata/sigchild_ignore.py --- a/Lib/test/subprocessdata/sigchild_ignore.py +++ b/Lib/test/subprocessdata/sigchild_ignore.py @@ -1,6 +1,15 @@ -import signal, subprocess, sys +import signal, subprocess, sys, time # On Linux this causes os.waitpid to fail with OSError as the OS has already # reaped our child process. The wait() passing the OSError on to the caller # and causing us to exit with an error is what we are testing against. signal.signal(signal.SIGCHLD, signal.SIG_IGN) subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait() +# Also ensure poll() handles an errno.ECHILD appropriately. +p = subprocess.Popen([sys.executable, '-c', 'print("albatross")']) +num_polls = 0 +while p.poll() is None: + # Waiting for the process to finish. + time.sleep(0.01) # Avoid being a CPU busy loop. + num_polls += 1 + if num_polls > 3000: + raise RuntimeError('poll should have returned 0 within 30 seconds') diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -316,6 +316,17 @@ c, i, when_skipped, when_not_skipped)) self.assertIs(when_skipped, when_not_skipped, message) + def test_parse_tuple_and_keywords(self): + # parse_tuple_and_keywords error handling tests + self.assertRaises(TypeError, _testcapi.parse_tuple_and_keywords, + (), {}, 42, []) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [''] * 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [42]) + def test_main(): support.run_unittest(CAPITest, TestPendingCalls, Test6012, EmbeddingTest, SkipitemTest) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -62,6 +62,7 @@ def tearDown(self): self.thread.stop() + self.thread = None os.environ.__exit__() support.threading_cleanup(*self._threads) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1,4 +1,5 @@ import unittest +from test import script_helper from test import support import subprocess import sys @@ -191,15 +192,134 @@ p.wait() self.assertEqual(p.stderr, None) + def _assert_python(self, pre_args, **kwargs): + # We include sys.exit() to prevent the test runner from hanging + # whenever python is found. + args = pre_args + ["import sys; sys.exit(47)"] + p = subprocess.Popen(args, **kwargs) + p.wait() + self.assertEqual(47, p.returncode) + + # TODO: make this test work on Linux. + # This may be failing on Linux because of issue #7774. + @unittest.skipIf(sys.platform not in ('win32', 'darwin'), + "possible bug using executable argument on Linux") + def test_executable(self): + # Check that the executable argument works. + self._assert_python(["doesnotexist", "-c"], executable=sys.executable) + + def test_executable_takes_precedence(self): + # Check that the executable argument takes precedence over args[0]. + # + # Verify first that the call succeeds without the executable arg. + pre_args = [sys.executable, "-c"] + self._assert_python(pre_args) + self.assertRaises(FileNotFoundError, self._assert_python, pre_args, + executable="doesnotexist") + + @unittest.skipIf(mswindows, "executable argument replaces shell") + def test_executable_replaces_shell(self): + # Check that the executable argument replaces the default shell + # when shell=True. + self._assert_python([], executable=sys.executable, shell=True) + + # For use in the test_cwd* tests below. + def _normalize_cwd(self, cwd): + # Normalize an expected cwd (for Tru64 support). + # We can't use os.path.realpath since it doesn't expand Tru64 {memb} + # strings. See bug #1063571. + original_cwd = os.getcwd() + os.chdir(cwd) + cwd = os.getcwd() + os.chdir(original_cwd) + return cwd + + # For use in the test_cwd* tests below. + def _split_python_path(self): + # Return normalized (python_dir, python_base). + python_path = os.path.realpath(sys.executable) + return os.path.split(python_path) + + # For use in the test_cwd* tests below. + def _assert_cwd(self, expected_cwd, python_arg, **kwargs): + # Invoke Python via Popen, and assert that (1) the call succeeds, + # and that (2) the current working directory of the child process + # matches *expected_cwd*. + p = subprocess.Popen([python_arg, "-c", + "import os, sys; " + "sys.stdout.write(os.getcwd()); " + "sys.exit(47)"], + stdout=subprocess.PIPE, + **kwargs) + self.addCleanup(p.stdout.close) + p.wait() + self.assertEqual(47, p.returncode) + normcase = os.path.normcase + self.assertEqual(normcase(expected_cwd), + normcase(p.stdout.read().decode("utf-8"))) + + def test_cwd(self): + # Check that cwd changes the cwd for the child process. + temp_dir = tempfile.gettempdir() + temp_dir = self._normalize_cwd(temp_dir) + self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir) + + @unittest.skipIf(mswindows, "pending resolution of issue #15533") + def test_cwd_with_relative_arg(self): + # Check that Popen looks for args[0] relative to cwd if args[0] + # is relative. + python_dir, python_base = self._split_python_path() + rel_python = os.path.join(os.curdir, python_base) + with support.temp_cwd() as wrong_dir: + # Before calling with the correct cwd, confirm that the call fails + # without cwd and with the wrong cwd. + self.assertRaises(FileNotFoundError, subprocess.Popen, + [rel_python]) + self.assertRaises(FileNotFoundError, subprocess.Popen, + [rel_python], cwd=wrong_dir) + python_dir = self._normalize_cwd(python_dir) + self._assert_cwd(python_dir, rel_python, cwd=python_dir) + + @unittest.skipIf(mswindows, "pending resolution of issue #15533") + def test_cwd_with_relative_executable(self): + # Check that Popen looks for executable relative to cwd if executable + # is relative (and that executable takes precedence over args[0]). + python_dir, python_base = self._split_python_path() + rel_python = os.path.join(os.curdir, python_base) + doesntexist = "somethingyoudonthave" + with support.temp_cwd() as wrong_dir: + # Before calling with the correct cwd, confirm that the call fails + # without cwd and with the wrong cwd. + self.assertRaises(FileNotFoundError, subprocess.Popen, + [doesntexist], executable=rel_python) + self.assertRaises(FileNotFoundError, subprocess.Popen, + [doesntexist], executable=rel_python, + cwd=wrong_dir) + python_dir = self._normalize_cwd(python_dir) + self._assert_cwd(python_dir, doesntexist, executable=rel_python, + cwd=python_dir) + + def test_cwd_with_absolute_arg(self): + # Check that Popen can find the executable when the cwd is wrong + # if args[0] is an absolute path. + python_dir, python_base = self._split_python_path() + abs_python = os.path.join(python_dir, python_base) + rel_python = os.path.join(os.curdir, python_base) + with script_helper.temp_dir() as wrong_dir: + # Before calling with an absolute path, confirm that using a + # relative path fails. + self.assertRaises(FileNotFoundError, subprocess.Popen, + [rel_python], cwd=wrong_dir) + wrong_dir = self._normalize_cwd(wrong_dir) + self._assert_cwd(wrong_dir, abs_python, cwd=wrong_dir) + @unittest.skipIf(sys.base_prefix != sys.prefix, 'Test is not venv-compatible') def test_executable_with_cwd(self): - python_dir = os.path.dirname(os.path.realpath(sys.executable)) - p = subprocess.Popen(["somethingyoudonthave", "-c", - "import sys; sys.exit(47)"], - executable=sys.executable, cwd=python_dir) - p.wait() - self.assertEqual(p.returncode, 47) + python_dir, python_base = self._split_python_path() + python_dir = self._normalize_cwd(python_dir) + self._assert_cwd(python_dir, "somethingyoudonthave", + executable=sys.executable, cwd=python_dir) @unittest.skipIf(sys.base_prefix != sys.prefix, 'Test is not venv-compatible') @@ -208,11 +328,7 @@ def test_executable_without_cwd(self): # For a normal installation, it should work without 'cwd' # argument. For test runs in the build directory, see #7774. - p = subprocess.Popen(["somethingyoudonthave", "-c", - "import sys; sys.exit(47)"], - executable=sys.executable) - p.wait() - self.assertEqual(p.returncode, 47) + self._assert_cwd('', "somethingyoudonthave", executable=sys.executable) def test_stdin_pipe(self): # stdin redirection @@ -369,24 +485,6 @@ p.wait() self.assertEqual(p.stdin, None) - def test_cwd(self): - tmpdir = tempfile.gettempdir() - # We cannot use os.path.realpath to canonicalize the path, - # since it doesn't expand Tru64 {memb} strings. See bug 1063571. - cwd = os.getcwd() - os.chdir(tmpdir) - tmpdir = os.getcwd() - os.chdir(cwd) - p = subprocess.Popen([sys.executable, "-c", - 'import sys,os;' - 'sys.stdout.write(os.getcwd())'], - stdout=subprocess.PIPE, - cwd=tmpdir) - self.addCleanup(p.stdout.close) - normcase = os.path.normcase - self.assertEqual(normcase(p.stdout.read().decode("utf-8")), - normcase(tmpdir)) - def test_env(self): newenv = os.environ.copy() newenv["FRUIT"] = "orange" diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -225,11 +225,9 @@ @reap_threads def test_main(): old_switchinterval = None - # Issue #15599: FreeBSD/KVM cannot handle gil_interval == 1. - new_switchinterval = 0.00001 if 'freebsd' in sys.platform else 0.00000001 try: old_switchinterval = sys.getswitchinterval() - sys.setswitchinterval(new_switchinterval) + sys.setswitchinterval(1e-5) except AttributeError: pass try: diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1893,10 +1893,23 @@ sample1 = ('' - 'text') + 'text
subtext
tail') sample2 = '''sometext''' + def _check_sample1_element(self, e): + self.assertEqual(e.tag, 'html') + self.assertEqual(e.text, 'text') + self.assertEqual(e.tail, None) + self.assertEqual(e.attrib, {}) + children = list(e) + self.assertEqual(len(children), 1) + child = children[0] + self.assertEqual(child.tag, 'div') + self.assertEqual(child.text, 'subtext') + self.assertEqual(child.tail, 'tail') + self.assertEqual(child.attrib, {}) + def test_dummy_builder(self): class BaseDummyBuilder: def close(self): @@ -1929,7 +1942,7 @@ parser.feed(self.sample1) e = parser.close() - self.assertEqual(e.tag, 'html') + self._check_sample1_element(e) def test_element_factory(self): lst = [] @@ -1945,6 +1958,33 @@ self.assertEqual(lst, ['toplevel']) + def _check_element_factory_class(self, cls): + tb = ET.TreeBuilder(element_factory=cls) + + parser = ET.XMLParser(target=tb) + parser.feed(self.sample1) + e = parser.close() + self.assertIsInstance(e, cls) + self._check_sample1_element(e) + + def test_element_factory_subclass(self): + class MyElement(ET.Element): + pass + self._check_element_factory_class(MyElement) + + def test_element_factory_pure_python_subclass(self): + # Mimick SimpleTAL's behaviour (issue #16089): both versions of + # TreeBuilder should be able to cope with a subclass of the + # pure Python Element class. + base = ET._Element + # Not from a C extension + self.assertEqual(base.__module__, 'xml.etree.ElementTree') + # Force some multiple inheritance with a C class to make things + # more interesting. + class MyElement(base, ValueError): + pass + self._check_element_factory_class(MyElement) + def test_doctype(self): class DoctypeParser: _doctype = None diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -303,7 +303,9 @@ self._children.insert(index, element) def _assert_is_element(self, e): - if not isinstance(e, Element): + # Need to refer to the actual Python implementation, not the + # shadowing C implementation. + if not isinstance(e, _Element): raise TypeError('expected an Element, not %s' % type(e).__name__) ## diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -49,9 +49,9 @@ David Ascher Chris AtLee Aymeric Augustin -Jes?s Cea Avi?n John Aycock Donovan Baarda +Arne Babenhauserheide Attila Babo Marcin Bachry Alfonso Baciero @@ -94,6 +94,7 @@ Thomas Bellman Alexander ?????? Belopolsky Eli Bendersky +David Benjamin Andrew Bennetts Andy Bensky Bennett Benson @@ -101,6 +102,7 @@ Michel Van den Bergh Julian Berman Brice Berna +Olivier Bernard Eric Beser Steven Bethard Stephen Bevan @@ -183,6 +185,7 @@ Lorenzo M. Catucci Donn Cave Charles Cazabon +Jes?s Cea Avi?n Per Cederqvist Matej Cepl Carl Cerecke @@ -246,6 +249,7 @@ Jeremy Craven Laura Creighton Simon Cross +Felipe Cruz Drew Csillag Joaquin Cuenca Abela John Cugini diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -10,6 +10,5403 @@ ====================================================================== +What's New in Python 3.2? +========================= + +*Release date: 20-Feb-2011* + +Core and Builtins +----------------- + +- Issue #11249: Fix potential crashes when using the limited API. + +Build +----- + +- Issue #11222: Fix non-framework shared library build on Mac OS X. + +- Issue #11184: Fix large-file support on AIX. + +- Issue #941346: Fix broken shared library build on AIX. + +Documentation +------------- + +- Issue #10709: Add updated AIX notes in Misc/README.AIX. + + +What's New in Python 3.2 Release Candidate 3? +============================================= + +*Release date: 13-Feb-2011* + +Core and Builtins +----------------- + +- Issue #11134: Add missing fields to typeslots.h. + +- Issue #11135: Remove redundant doc field from PyType_Spec. + +- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited + ABI. + +- Issue #11118: Fix bogus export of None in python3.dll. + +Library +------- + +- Issue #11116: any error during addition of a message to a mailbox now causes a + rollback, instead of leaving the mailbox partially modified. + +- Issue #11132: Fix passing of "optimize" parameter when recursing in + compileall.compile_dir(). + +- Issue #11110: Fix a potential decref of a NULL in sqlite3. + +- Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch + by Stan Mihai. + +Build +----- + +- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X + installers now includes a link to the installed documentation and no longer + includes an Extras directory. The Tools directory is now installed in the + framework under share/doc. + +- Issue #11121: Fix building with --enable-shared. + +Tests +----- + +- Issue #10971: test_zipimport_support is once again compatible with the refleak + hunter feature of test.regrtest. + + +What's New in Python 3.2 Release Candidate 2? +============================================= + +*Release date: 30-Jan-2011* + +Core and Builtins +----------------- + +- Issue #10451: memoryview objects could allow to mutate a readable buffer. + Initial patch by Ross Lagerwall. + +Library +------- + +- Issue #9124: mailbox now accepts binary input and reads and writes mailbox + files in binary mode, using the email package's binary support to parse + arbitrary email messages. StringIO and text file input is deprecated, + and string input fails early if non-ASCII characters are used, where + previously it would fail when the email was processed in a later step. + +- Issue #10845: Mitigate the incompatibility between the multiprocessing + module on Windows and the use of package, zipfile or directory execution + by special casing main modules that actually *are* called __main__.py. + +- Issue #11045: Protect logging call against None argument. + +- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save + commands. + +- Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, + preventing a confusing hung appearance on OS X with the windows + obscured. + +- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the + menu accelerators for Open Module, Go to Line, and New Indent Width. + The accelerators still work but no longer appear in the menu items. + +- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True). + +- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 + conversion. + +- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message + with a None body. + +- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a + keyword-only argument. The preceding positional argument was deprecated, + so it made no sense to add filter as a positional argument. + +- Issue #11004: Repaired edge case in deque.count(). + +- Issue #10974: IDLE no longer crashes if its recent files list includes files + with non-ASCII characters in their path names. + +- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both + return sets instead of one returning a tuple and the other a frozenset. + +- Issue #10987: Fix the recursion limit handling in the _pickle module. + +- Issue #10983: Fix several bugs making tunnel requests in http.client. + +- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode + filenames, at bootstrap, if the codec registry is not ready yet. It is still + possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding) + for all file entries in the ZIP file. + +- Issue #10949: Improved robustness of rotating file handlers. + +- Issue #10955: Fix a potential crash when trying to mmap() a file past its + length. Initial patch by Ross Lagerwall. + +- Issue #10898: Allow compiling the posix module when the C library defines + a symbol named FSTAT. + +- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1) + encoding. This is the preferred encoding of PEP 3333 and the base encoding + of HTTP 1.1. + +- To match the behaviour of HTTP server, the HTTP client library now also + encodes headers with iso-8859-1 (latin1) encoding. It was already doing + that for incoming headers which makes this behaviour now consistent in + both incoming and outgoing direction. + +- Issue #9509: argparse now properly handles IOErrors raised by + argparse.FileType. + +- Issue #10961: The new pydoc server now better handles exceptions raised + during request handling. + +- Issue #10680: Fix mutually exclusive arguments for argument groups in + argparse. + +Build +----- + +- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with + the system-provided Python. + + +What's New in Python 3.2 Release Candidate 1 +============================================ + +*Release date: 16-Jan-2011* + +Core and Builtins +----------------- + +- Issue #10889: range indexing and slicing now works correctly on ranges with + a length that exceeds sys.maxsize. + +- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a + class. + +- Issue #8020: Avoid a crash where the small objects allocator would read + non-Python managed memory while it is being modified by another thread. Patch + by Matt Bandy. + +- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all + io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser + translates newlines (\r\n => \n). + +- Remove buffer API from stable ABI for now, see #10181. + +- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file + doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int + (length bigger than 2^31-1 bytes). + +- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and + stdprinter.write() clamp the length to INT_MAX on Windows. + +- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() + can now handle dates after 2038. + +- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and + PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the + filesystem encoding instead of UTF-8. + +- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem + encoding instead of UTF-8. + +- Add sys.flags attribute for the new -q command-line option. + +- Issue #11506: Trying to assign to a bytes literal should result in a + SyntaxError. + +Library +------- + +- Issue #10916: mmap should not segfault when a file is mapped using 0 as length + and a non-zero offset, and an attempt to read past the end of file is made + (IndexError is raised instead). Patch by Ross Lagerwall. + +- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead + of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. + +- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather + than the currently problematic Apple-supplied one, when running with the + 64-/32-bit installer variant. + +- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not + as unicode, and accept binary files. Add encoding and errors attributes to + cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn + Linderman). + +- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl(). + +- Issue #10899: No function type annotations in the standard library. Removed + function type annotations from _pyio.py. + +- Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'. + +- Issue #10872: The repr() of TextIOWrapper objects now includes the mode + if available. + +- Issue #10869: Fixed bug where ast.increment_lineno modified the root node + twice. + +- Issue #5871: email.header.Header.encode now raises an error if any + continuation line in the formatted value has no leading white space and looks + like a header. Since Generator uses Header to format all headers, this check + is made for all headers in any serialized message at serialization time. This + provides protection against header injection attacks. + +- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially + private by renaming it to ``_GeneratorContextManager``. + +- Issue #10042: Fixed the total_ordering decorator to handle cross-type + comparisons that could lead to infinite recursion. + +- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with + non-ASCII bytes (parsed by a BytesParser) when doing conversion to 7bit-clean + presentation, instead of replacing them with ?s. + +- email.header.Header was incorrectly encoding folding whitespace when + rfc2047-encoding header values with embedded newlines, leaving them without + folding whitespace. It now uses the continuation_ws, as it does for + continuation lines that it creates itself. + +- Issue #1777412, #10827: Changed the rules for 2-digit years. The + time.asctime(), time.ctime() and time.strftime() functions will now format + any year when ``time.accept2dyear`` is False and will accept years >= 1000 + otherwise. ``time.mktime`` and ``time.strftime`` now accept full range + supported by the OS. With Visual Studio or on Solaris, the year is limited to + the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated. + +- Issue #7858: Raise an error properly when os.utime() fails under Windows + on an existing file. + +- Issue #3839: wsgiref should not override a Content-Length header set by + the application. Initial patch by Clovis Fabricio. + +- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the + compilation (if the input is a string). + +- Issue #7995: When calling accept() on a socket with a timeout, the returned + socket is now always blocking, regardless of the operating system. + +- Issue #10756: atexit normalizes the exception before displaying it. Patch by + Andreas St?hrk. + +- Issue #10790: email.header.Header.append's charset logic now works correctly + for charsets whose output codec is different from its input codec. + +- Issue #10819: SocketIO.name property returns -1 when its closed, instead of + raising a ValueError, to fix repr(). + +- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if + the input buffer length doesn't fit into an unsigned int (length bigger than + 2^32-1 bytes). + +- Issue #6643: Reinitialize locks held within the threading module after fork to + avoid a potential rare deadlock or crash on some platforms. + +- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file + descriptors (0, 1, 2) are closed in the parent process. Initial patch by Ross + Lagerwall. + +- `unittest.TestCase` can be instantiated without a method name; for simpler + exploration from the interactive interpreter. + +- Issue #10798: Reject supporting concurrent.futures if the system has too + few POSIX semaphores. + +- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from + the codec aliases. They are still accessible via codecs.lookup(). + +- Issue #10801: In zipfile, support different encodings for the header and the + filenames. + +- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott + David Daniels. + +- Fix collections.OrderedDict.setdefault() so that it works in subclasses that + define __missing__(). + +- Issue #10786: unittest.TextTestRunner default stream no longer bound at import + time. `sys.stderr` now looked up at instantiation time. Fix contributed by + Mark Roddy. + +- Issue #10753: Characters ';', '=' and ',' in the PATH_INFO environment variable + won't be quoted when the URI is constructed by the wsgiref.util's request_uri + method. According to RFC 3986, these characters can be a part of params in + PATH component of URI and need not be quoted. + +- Issue #10738: Fix webbrowser.Opera.raise_opts. + +- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how + browsers actually parse cookies. + +- Issue #9333: os.symlink now available regardless of user privileges. The + function now raises OSError on Windows >=6.0 when the user is unable to create + symbolic links. XP and 2003 still raise NotImplementedError. + +- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8. + +- Issue #10730: Add SVG mime types to mimetypes module. + +- Issue #10768: Make the Tkinter ScrolledText widget work again. + +- Issue #10777: Fix "dictionary changed size during iteration" bug in + ElementTree register_namespace(). + +- Issue #10626: test_logging now preserves logger disabled states. + +- Issue #10774: test_logging now removes temp files created during tests. + +- Issue #5258/#10642: if site.py encounters a .pth file that generates an error, + it now prints the filename, line number, and traceback to stderr and skips + the rest of that individual file, instead of stopping processing entirely. + +- Issue #10763: subprocess.communicate() closes stdout and stderr if both are + pipes (bug specific to Windows). + +- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better + compliance (no "s around encoded values). + +- Improved the diff message in the unittest module's assertCountEqual(). + +- Issue #1155362: email.utils.parsedate_tz now handles a missing space before + the '-' of a timezone field as well as before a '+'. + +- Issue #4871: The zipfile module now gives a more useful error message if + an attempt is made to use a string to specify the archive password. + +- Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only. + +- Deprecated assertDictContainsSubset() in the unittest module. + +C-API +----- + +- PyObject_CallMethod now passes along any underlying AttributeError from + PyObject_GetAttr, instead of replacing it with something less informative + +- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and + PyEval_ReleaseLock(). The thread-state aware APIs should be used instead. + +- Issue #10333: Remove ancient GC API, which has been deprecated since Python + 2.2. + +Build +----- + +- Issue #10843: Update third-party library versions used in OS X 32-bit + installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4 + and RTREE enabled), and ncursesw 5.5 (wide-char support enabled). + +- Issue #10820: Fix OS X framework installs to support version-specific + scripts (#10679). + +- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in + the configure script but use $GREP instead. Patch by Fabian Groffen. + +- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD + and DragonFly BSD. Patch by Nicolas Joly. + +- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with + a version-specific suffix on "make altinstall". + +- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with + timestamp profiling (--with-tsc): the preprocessor test for the PowerPC + support now looks for "__powerpc__" as well as "__ppc__": the latter seems to + only be present on OS X; the former is the correct one for Linux with GCC. + +- Issue #1099: Fix the build on MacOSX when building a framework with pydebug + using GCC 4.0. + +Tools/Demos +----------- + +- Issue #10843: Install the Tools directory on OS X in the applications Extras + (/Applications/Python 3.n/Extras/) where the Demo directory had previous been + installed. + +- Issue #7962: The Demo directory is gone. Most of the old and unmaintained + demos have been removed, others integrated in documentation or a new + Tools/demo subdirectory. + +- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell. + Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian + Curtin. + +Tests +----- + +- Issue #11910: Fix test_heapq to skip the C tests when _heapq is missing. + +- Fix test_startfile to wait for child process to terminate before finishing. + +- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch + by Ross Lagerwall. + +- Make the --coverage flag work for test.regrtest. + +- Issue #1677694: Refactor and improve test_timeout. Original patch by + Bj?rn Lindqvist. + +- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects. + Patch by Jean-Paul Calderone and Sandro Tosi. + +- Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in + whole runs and enabled selectively using ``--header`` when running an explicit + list of tests. Original patch by Collin Winter. + + +What's New in Python 3.2 Beta 2? +================================ + +*Release date: 19-Dec-2010* + +Core and Builtins +----------------- + +- Issue #8844: Regular and recursive lock acquisitions can now be interrupted + by signals on platforms using pthreads. Patch by Reid Kleckner. + +- Issue #4236: PyModule_Create2 now checks the import machinery directly + rather than the Py_IsInitialized flag, avoiding a Fatal Python + error in certain circumstances when an import is done in __del__. + +- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and + Daniel Urban. + +Library +------- + +- Issue #3243: Support iterable bodies in httplib. Patch Contributions by + Xuanji Li and Chris AtLee. + +- Issue #10611: SystemExit exception will no longer kill a unittest run. + +- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean + up function. + +- Issue #10573: use actual/expected consistently in unittest methods. + The order of the args of assertCountEqual is also changed. + +- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated + words in the local part of email addresses, thereby preserving the input. + +- Issue #6791: Limit header line length (to 65535 bytes) in http.client + and http.server, to avoid denial of services from the other party. + +- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. + +- Issue #9907: Fix tab handling on OSX when using editline by calling + rl_initialize first, then setting our custom defaults, then reading .editrc. + +- Issue #4188: Avoid creating dummy thread objects when logging operations + from the threading module (with the internal verbose flag activated). + +- Issue #10711: Remove HTTP 0.9 support from http.client. The ``strict`` + parameter to HTTPConnection and friends is deprecated. + +- Issue #9721: Fix the behavior of urljoin when the relative url starts with a + ';' character. Patch by Wes Chow. + +- Issue #10714: Limit length of incoming request in http.server to 65536 bytes + for security reasons. Initial patch by Ross Lagerwall. + +- Issue #9558: Fix distutils.command.build_ext with VS 8.0. + +- Issue #10667: Fast path for collections.Counter(). + +- Issue #10695: passing the port as a string value to telnetlib no longer + causes debug mode to fail. + +- Issue #1078919: add_header now automatically RFC2231 encodes parameters + that contain non-ascii values. + +- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits + a warning on sys.stderr rather than throwing a misleading exception + if cleanup fails due to nulling out of modules during shutdown. + Also avoids an AttributeError when mkdtemp call fails and issues + a ResourceWarning on implicit cleanup via __del__. + +- Issue #10107: Warn about unsaved files in IDLE on OSX. + +- Issue #7213: subprocess.Popen's default for close_fds has been changed. + It is now True in most cases other than on Windows when input, output or + error handles are provided. + +- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually + added in 3.2beta1) to allow specifying a specific list of file descriptors + to keep open in the child process. + +- Issue #1731717: Fixed the problem where subprocess.wait() could cause an + OSError exception when The OS had been told to ignore SIGCLD in our process + or otherwise not wait for exiting child processes. + +Tests +----- + +- Issue #775964: test_grp now skips YP/NIS entries instead of failing when + encountering them. + +Tools/Demos +----------- + +- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and + Cocoa AquaTk. + +- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree. + +- Issue #10706: Remove outdated script runtests.sh. Either ``make test`` + or ``python -m test`` should be used instead. + +Build +----- + +- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4. + +- Issue #9234: argparse supports alias names for subparsers. + + +What's New in Python 3.2 Beta 1? +================================ + +*Release date: 05-Dec-2010* + +Core and Builtins +----------------- + +- Issue #10630: Return dict views from the dict proxy keys()/values()/items() + methods. + +- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__ + with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. + +- Issue #1772833: Add the -q command-line option to suppress copyright and + version output in interactive mode. + +- Provide an *optimize* parameter in the built-in compile() function. + +- Fixed several corner case issues on Windows in os.stat/os.lstat related to + reparse points. + +- PEP 384 (Defining a Stable ABI) is implemented. + +- Issue #2690: Range objects support negative indices and slicing. + +- Issue #9915: Speed up sorting with a key. + +- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much + larger than operand ``b``. Patch by Andrew Bennetts. + +- Issue #10518: Bring back the callable() builtin. + +- Issue #7094: Added alternate formatting (specified by '#') to ``__format__`` + method of float, complex, and Decimal. This allows more precise control over + when decimal points are displayed. + +- Issue #10474: range.count() should return integers. + +- Issue #1574217: isinstance now catches only AttributeError, rather than + masking all errors. + +Library +------- + +- logging: added "handler of last resort". See http://bit.ly/last-resort-handler + +- test.support: Added TestHandler and Matcher classes for better support of + assertions about logging. + +- Issue #4391: Use proper plural forms in argparse. + +- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on + UnicodeEncodeError. + +- Add the "display" and "undisplay" pdb commands. + +- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again + after a "continue" command. + +- Add the "interact" pdb command. + +- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf. + +- Issue #1569291: Speed up array.repeat(). + +- Provide an interface to set the optimization level of compilation in + py_compile, compileall and zipfile.PyZipFile. + +- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by + RFC3986. Anything before :// is considered a scheme and is followed by an + authority (or netloc) and by '/' led path, which is optional. + +- Issue #6045: dbm.gnu databases now support get() and setdefault() methods. + +- Issue #10620: `python -m unittest` can accept file paths instead of module + names for running specific tests. + +- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`, + `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_` + and replace them with the correct methods in the Python test suite. + +- Issue #10272: The ssl module now raises socket.timeout instead of a generic + SSLError on socket timeouts. + +- Issue #10528: Allow translators to reorder placeholders in localizable + messages from argparse. + +- Issue #10497: Fix incorrect use of gettext in argparse. + +- Issue #10478: Reentrant calls inside buffered IO objects (for example by + way of a signal handler) now raise a RuntimeError instead of freezing the + current process. + +- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests. + +- Issue #10549: Fix pydoc traceback when text-documenting certain classes. + +- Issue #2001: New HTML server with enhanced Web page features. Patch by Ron + Adam. + +- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership + of non-weakrefable objects. + +- Issue #940286: pydoc.Helper.help() ignores input/output init parameters. + +- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent + DoS attacks. Patch by Savio Sena. + +- Issue #4925: Add filename to error message when executable can't be found in + subprocess. + +- Issue #10391: Don't dereference invalid memory in error messages in the ast + module. + +- Issue #10027: st_nlink was not being set on Windows calls to os.stat or + os.lstat. Patch by Hirokazu Yamamoto. + +- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is + held by the user's account, i.e., when the function can actually be used. + +- Issue #8879: Add os.link support for Windows. + +- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved + failure messages by default. Patch by Mark Roddy. + +- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to + guess at the correct parsing of invalid html. + +- Issue #10554: Add context manager support to subprocess.Popen objects. + +- Issue #8989: email.utils.make_msgid now has a domain parameter that can + override the domain name used in the generated msgid. + +- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File + exists' exception when a target directory already exists with the specified + mode. Patch by Ray Allen. + +- Issue #9573: os.fork() now works correctly when triggered as a side effect of + a module import. + +- Issue #10464: netrc now correctly handles lines with embedded '#' characters. + +- Added itertools.accumulate(). + +- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``. + Original patch by Daniel Urban. + +- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to + `assertRegex` and `assertRaisesRegex`. + +- Issue #10535: Enable silenced warnings in unittest by default. + +- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte + sequences as input in addition to character strings. + +- Issue #10586: The statistics API for the new functools.lru_cache has been + changed to a single cache_info() method returning a named tuple. + +- Issue #10323: itertools.islice() now consumes the minimum number of inputs + before stopping. Formerly, the final state of the underlying iterator was + undefined. + +- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and + __next__. + +- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new + more informative name, unittest.CountEqual. + +- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. + +- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can + be set to False to turn off the previously undocumented 'popularity' + heuristic. Patch by Terry Reedy and Eli Bendersky. + +- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate + undocumented and now redundant isbjunk and isbpopular methods. + +- Issue #9846: zipfile is now correctly closing underlying file objects. + +- Issue #10459: Update CJK character names to Unicode 6.0. + +- Issue #4493: urllib.request adds '/' in front of path components which does not + start with '/. Common behavior exhibited by browsers and other clients. + +- Issue #6378: idle.bat now runs with the appropriate Python version rather than + the system default. Patch by Sridhar Ratnakumar. + +- Issue #10470: 'python -m unittest' will now run test discovery by default, + when no extra arguments have been provided. + +- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to + output stream only when end_headers is invoked. This is a speedup and an + internal optimization. Patch by Andrew Shaaf. + +- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho + Eckhardt. + +- Issue #10453: compileall now uses argparse instead of getopt, and thus + provides clean output when called with '-h'. + +- Issue #8078: Add constants for higher baud rates in the termios module. Patch + by Rodolpho Eckhardt. + +- Issue #10407: Fix two NameErrors in distutils. + +- Issue #10371: Deprecated undocumented functions in the trace module. + +- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the + end of the file. + +- configparser: 100% test coverage. + +- Issue #10499: configparser supports pluggable interpolation handlers. The + default classic interpolation handler is called BasicInterpolation. Another + interpolation handler added (ExtendedInterpolation) which supports the syntax + used by zc.buildout (e.g. interpolation between sections). + +- configparser: the SafeConfigParser class has been renamed to ConfigParser. + The legacy ConfigParser class has been removed but its interpolation mechanism + is still available as LegacyInterpolation. + +- configparser: Usage of RawConfigParser is now discouraged for new projects + in favor of ConfigParser(interpolation=None). + +- Issue #1682942: configparser supports alternative option/value delimiters. + +- Issue #5412: configparser supports mapping protocol access. + +- Issue #9411: configparser supports specifying encoding for read operations. + +- Issue #9421: configparser's getint(), getfloat() and getboolean() methods + accept vars and default arguments just like get() does. + +- Issue #9452: configparser supports reading from strings and dictionaries + (thanks to the mapping protocol API, the latter can be used to copy data + between parsers). + +- configparser: accepted INI file structure is now customizable, including + comment prefixes, name of the DEFAULT section, empty lines in multiline + values, and indentation. + +- Issue #10326: unittest.TestCase instances can be pickled. + +- Issue #9926: Wrapped TestSuite subclass does not get __call__ executed. + +- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex + zeros on systems where the log1p function fails to respect the sign of zero. + This fixes a test failure on AIX. + +- Issue #9732: Addition of getattr_static to the inspect module. + +- Issue #10446: Module documentation generated by pydoc now links to a + version-specific online reference manual. + +- Make the 'No module named' exception message from importlib consistent. + +- Issue #10443: Add the SSLContext.set_default_verify_paths() method. + +- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module. + Patch by Robert Collins. + +- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather + than strings. + +C-API +----- + +- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(), + which transforms non-ASCII decimal digits in a Unicode string to their ASCII + equivalents. + +- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly + zero-initialize all fields, fixing compiler warnings seen when building + extension modules with gcc with "-Wmissing-field-initializers" (implied by + "-W"). + +- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil + Schemenauer. + +- structseq.h is now included in Python.h. + +- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. + +Tests +----- + +- regrtest.py once again ensures the test directory is removed from sys.path + when it is invoked directly as the __main__ module. + +- `python -m test` can be used to run the test suite as well as `python -m + test.regrtest`. + +- Do not fail test_socket when the IP address of the local hostname cannot be + looked up. + +- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric + Carstensen. + +Build +----- + +- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and + PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals. + +Documentation +------------- + +- Issue #10299: List the built-in functions in a table in functions.rst. + + +What's New in Python 3.2 Alpha 4? +================================= + +*Release date: 13-Nov-2010* + +Core and Builtins +----------------- + +- Issue #10372: Import the warnings module only after the IO library is + initialized, so as to avoid bootstrap issues with the '-W' option. + +- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused + undocumented value PyBUF_SHADOW, and strangely-looking code in + PyMemoryView_GetContiguous. + +- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``. + +- If FileIO.__init__ fails, close the file descriptor. + +- Issue #10221: dict.pop(k) now has a key error message that includes the + missing key (same message d[k] returns for missing keys). + +- Issue #5437: A preallocated MemoryError instance should not keep traceback + data (including local variables caught in the stack trace) alive infinitely. + +- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length + of the offending line. + +- Issue #10089: Add support for arbitrary -X options on the command line. They + can be retrieved through a new attribute ``sys._xoptions``. + +- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of + the locale encoding. If the LANG (and LC_ALL and LC_CTYPE) environment + variable is not set, the locale encoding is ISO-8859-1, whereas most programs + (including Python) expect UTF-8. Python already uses UTF-8 for the filesystem + encoding and to encode command line arguments on this OS. + +- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect + filenames encoded to the filesystem encoding with the surrogateescape error + handler (to support undecodable bytes), instead of UTF-8 in strict mode. + +- Issue #9997: Don't let the name "top" have special significance in scope + resolution. + +- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as + the default 512 when compiling on AIX. + +- Use locale encoding instead of UTF-8 to encode and decode filenames if + Py_FileSystemDefaultEncoding is not set. + +- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file + descriptor. + +- Issue #9418: Moved private string methods ``_formatter_parser`` and + ``_formatter_field_name_split`` into a new ``_string`` module. + +- Issue #9992: Remove PYTHONFSENCODING environment variable. + +Library +------- + +- Issue #12943: python -m tokenize support has been added to tokenize. + +- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. + +- Issue #10356: Decimal.__hash__(-1) should return -2. + +- Issue #1553375: logging: Added stack_info kwarg to display stack information. + +- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru. + +- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See also issue + #10356.) + +- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard + IMAP4 connections. Original patch by Lorenzo M. Catucci. + +- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if + there are non-base64 alphabet characters in the input. + +- Issue #10386: Add __all__ to token module; this simplifies importing in + tokenize module and prevents leaking of private names through ``import *``. + +- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by Lorenzo + M. Catucci. + +- Fix IMAP.login() to work properly. + +- Issue #9244: multiprocessing pool worker processes could terminate + unexpectedly if the return value of a task could not be pickled. Only the + ``repr`` of such errors are now sent back, wrapped in an + ``MaybeEncodingError`` exception. + +- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of + ``multiprocessing.Pool`` now accepts a ``error_callback`` argument. This can + be a callback with the signature ``callback(exc)``, which will be called if + the target raises an exception. + +- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL + sockets now has additional items such as ``issuer`` and ``notBefore``. + +- ``usenetrc`` is now false by default for NNTP objects. + +- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS. + Patch by Andrew Vant. + +- Issue #10335: Add tokenize.open(), detect the file encoding using + tokenize.detect_encoding() and open it in read only mode. + +- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new + method send_message to send an email.message.Message object. + +- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error + handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source + code directory name contains a non-ASCII character and the locale encoding is + ASCII. + +- Issue #10329: The trace module writes reports using the input Python script + encoding, instead of the locale encoding. Patch written by Alexander + Belopolsky. + +- Issue #10126: Fix distutils' test_build when Python was built with + --enable-shared. + +- Issue #9281: Prevent race condition with mkdir in distutils. Patch by + Arfrever. + +- Issue #10229: Fix caching error in gettext. + +- Issue #10252: Close file objects in a timely manner in distutils code and + tests. Patch by Brian Brazil, completed by ?ric Araujo. + +- Issue #10180: Pickling file objects is now explicitly forbidden, since + unpickling them produced nonsensical results. + +- Issue #10311: The signal module now restores errno before returning from its + low-level signal handler. Patch by Hallvard B Furuseth. + +- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects. + +- Issue #10283: Add a ``group_pattern`` argument to NNTP.list(). + +- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI + environment better, and to correct unicode environment values for WSGI 1.0.1. + +- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER + response, instead of raising an exception. + +- wsgiref now implements and validates PEP 3333, rather than an experimental + extension of PEP 333. (Note: earlier versions of Python 3.x may have + incorrectly validated some non-compliant applications as WSGI compliant; if + your app validates with Python <3.2b1+, but not on this version, it is likely + the case that your app was not compliant.) + +- Issue #10280: NNTP.nntp_version should reflect the highest version advertised + by the server. + +- Issue #10184: Touch directories only once when extracting a tarfile. + +- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts + that were formerly found under Demo/turtle. + +- Issue #10265: Close file objects explicitly in sunau. Patch by Brian Brazil. + +- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a + filename. Patch by Brian Brazil. + +- Issue #10110: Queue objects didn't recognize full queues when the maxsize + parameter had been reduced. + +- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. + +- logging: Added style option to basicConfig() to allow %, {} or $-formatting. + +- Issue #5729: json.dumps() now supports using a string such as '\t' for + pretty-printing multilevel objects. + +- Issue #10253: FileIO leaks a file descriptor when trying to open a file for + append that isn't seekable. Patch by Brian Brazil. + +- Support context manager protocol for file-like objects returned by mailbox + ``get_file()`` methods. + +- Issue #10246: uu.encode didn't close file objects explicitly when filenames + were given to it. Patch by Brian Brazil. + +- Issue #10198: fix duplicate header written to wave files when writeframes() is + called without data. + +- Close file objects in modulefinder in a timely manner. + +- Close a io.TextIOWrapper object in email.parser in a timely manner. + +- Close a file object in distutils.sysconfig in a timely manner. + +- Close a file object in pkgutil in a timely manner. + +- Issue #10233: Close file objects in a timely manner in the tarfile module and + its test suite. + +- Issue #10093: ResourceWarnings are now issued when files and sockets are + deallocated without explicit closing. These warnings are silenced by default, + except in pydebug mode. + +- tarfile.py: Add support for all missing variants of the GNU sparse extensions + and create files with holes when extracting sparse members. + +- Issue #10218: Return timeout status from ``Condition.wait`` in threading. + +- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and + deprecate the old name ``zipfile.BadZipfile``. + +- Issue #5027: The standard ``xml`` namespace is now understood by + xml.sax.saxutils.XMLGenerator as being bound to + http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell. + +- Issue #5975: Add csv.unix_dialect class. + +- Issue #7761: telnetlib.interact failures on Windows fixed. + +- logging: Added style option to Formatter to allow %, {} or $-formatting. + +- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a + context manager. + +- Issue #1349106: Generator (and BytesGenerator) flatten method and Header + encode method now support a 'linesep' argument. + +- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in + order to support the TLS SNI extension. ``HTTPSConnection`` and ``urlopen()`` + also use this argument, so that HTTPS virtual hosts are now supported. + +- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items. + +- Issue #10163: Skip unreadable registry keys during mimetypes initialization. + +- logging: Made StreamHandler terminator configurable. + +- logging: Allowed filters to be just callables. + +- logging: Added tests for _logRecordClass changes. + +- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. + +- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to + increase flexibility of LogRecord creation. + +- Issue #5117: Case normalization was needed on ntpath.relpath(). Also fixed + root directory issue on posixpath.relpath(). (Ported working fixes from + ntpath.) + +- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option + short_empty_elements to direct it to use self-closing tags when appropriate. + +- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags. Add --abiflags + switch to python-config for command line access. + +- Issue #6098: Don't claim DOM level 3 conformance in minidom. + +- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty + XML namespace attribute is encountered. + +- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic + characters by default. Deprecate ``cgi.escape()``. + +- Issue #9409: Fix the regex to match all kind of filenames, for interactive + debugging in doctests. + +- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the + same instance as ``datetime.timezone.utc``. + +- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where + supported by the system. Patch by Nikita Vetoshkin. + +- Issue #10063: file:// scheme will stop accessing remote hosts via ftp + protocol. file:// urls had fallback to access remote hosts via ftp. This was + not correct, change is made to raise a URLError when a remote host is tried to + access via file:// scheme. + +- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is + created in modes 'a' or 'w' and then closed without adding any files. Raise + BadZipfile (rather than IOError) when opening small non-ZIP files. + +- Issue #10041: The signature of optional arguments in socket.makefile() didn't + match that of io.open(), and they also didn't get forwarded properly to + TextIOWrapper in text mode. Patch by Kai Zhu. + +- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and + urllib.request.urlopen now take optional arguments to allow for server + certificate checking, as recommended in public uses of HTTPS. + +- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the + current directory was deleted. Patch written by W. Trevor King. + +- Issue #3873: Speed up unpickling from file objects that have a peek() method. + +- Issue #10075: Add a session_stats() method to SSLContext objects. + +- Issue #9948: Fixed problem of losing filename case information. + +Extension Modules +----------------- + +- Issue #5109: array.array constructor will now use fast code when + initial data is provided in an array object with correct type. + +- Issue #6317: Now winsound.PlaySound only accepts unicode. + +- Issue #6317: Now winsound.PlaySound can accept non ascii filename. + +- Issue #9377: Use Unicode API for gethostname on Windows. + +- Issue #10143: Update "os.pathconf" values. + +- Issue #6518: Support context manager protcol for ossaudiodev types. + +- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. + +- Issue #9054: Fix a crash occurring when using the pyexpat module with expat + version 2.0.1. + +- Issue #5355: Provide mappings from Expat error numbers to string descriptions + and backwards, in order to actually make it possible to analyze error codes + provided by ExpatError. + +- The Unicode database was updated to 6.0.0. + +C-API +----- + +- Issue #10288: The deprecated family of "char"-handling macros + (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead. + +- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t + type has been introduced. + +Tools/Demos +----------- + +- Issue #10117: Tools/scripts/reindent.py now accepts source files that use + encoding other than ASCII or UTF-8. Source encoding is preserved when + reindented code is written to a file. + +- Issue #7287: Demo/imputil/knee.py was removed. + +Tests +----- + +- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well + as unicode strings. Initial patch by Sandro Tosi. + +- Issue #10294: Remove dead code form test_unicode_file. + +- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new + test specific to unicode (non-ascii name and filename). + +Build +----- + +- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure. + +- Issue #8852: Allow the socket module to build on OpenSolaris. + +- Drop -OPT:Olimit compiler option. + +- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. + +- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. + +- Issue #7473: avoid link errors when building a framework with a different set + of architectures than the one that is currently installed. + + +What's New in Python 3.2 Alpha 3? +================================= + +*Release date: 09-Oct-2010* + +Core and Builtins +----------------- + +- Issue #10068: Global objects which have reference cycles with their module's + dict are now cleared again. This causes issue #7140 to appear again. + +- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename() + encodings. + +- ast.literal_eval() can now handle negative numbers. It is also a little more + liberal in what it accepts without compromising the safety of the evaluation. + For example, 3j+4 and 3+4+5 are both accepted. + +- Issue #10006: type.__abstractmethods__ now raises an AttributeError. As a + result metaclasses can now be ABCs (see #9533). + +- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t. + +- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace + UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and + 32 bits wchar_t (eg. Linux in narrow build). + +- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression + introduced by issue #9324. + +- Issue #9979: Create function PyUnicode_AsWideCharString(). + +- Issue #7397: Mention that importlib.import_module() is probably what someone + really wants to be using in __import__'s docstring. + +- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg + to use named arguments. + +- Issue #9930: Remove bogus subtype check that was causing (e.g.) + float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. + +- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin. + +- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other + threads are still running. Instead, reinitialize the GIL on a second call to + Py_Initialize(). + +- All SyntaxErrors now have a column offset and therefore a caret when the error + is printed. + +- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the + module that was imported, but instead gets the module from sys.modules. + +- Issue #9213: The range type_items now provides index() and count() methods, to + conform to the Sequence ABC. Patch by Daniel Urban and Daniel Stutzbach. + +- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called + with a non-empty format string. This is an effort to future-proof user + code. If a derived class does not currently implement __format__ but later + adds its own __format__, it would most likely break user code that had + supplied a format string. This will be changed to a DeprecationWaring in + Python 3.3 and it will be an error in Python 3.4. + +- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly + re-created on a subsequent call to Py_Initialize(). The problem (a crash) + wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial. + +- Issue #9210: Configure option --with-wctype-functions was removed. Using the + functions from the libc caused the methods .upper() and lower() to become + locale aware and created subtly wrong results. + +- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a + non-ASCII byte in the format string. + +- Issue #4617: Previously it was illegal to delete a name from the local + namespace if it occurs as a free variable in a nested block. This limitation + of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). + +- Issue #9804: ascii() now always represents unicode surrogate pairs as a single + ``\UXXXXXXXX``, regardless of whether the character is printable or not. + Also, the "backslashreplace" error handler now joins surrogate pairs into a + single character on UCS-2 builds. + +- Issue #9757: memoryview objects get a release() method to release the + underlying buffer (previously this was only done when deallocating the + memoryview), and gain support for the context management protocol. + +- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid + thread-local storage key. + +Library +------- + +- Issue #2236: distutils' mkpath ignored the mode parameter. + +- Fix typo in one sdist option (medata-check). + +- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce. + +- Issue #1718574: Fix options that were supposed to accept arguments but did + not in build_clib. + +- Issue #9437: Fix building C extensions with non-default LDFLAGS. + +- Issue #4661: email can now parse bytes input and generate either converted + 7bit output or bytes output. Email version bumped to 5.1.0. + +- Issue #1589: Add ssl.match_hostname(), to help implement server identity + verification for higher-level protocols. + +- Issue #9759: GzipFile now raises ValueError when an operation is attempted + after the file is closed. Patch by Jeffrey Finkelstein. + +- Issue #9042: Fix interaction of custom translation classes and caching in + gettext. + +- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method + returning a (sock, addr) pair which is called when a connection has been + established with a new remote endpoint. This is supposed to be used as a + replacement for old handle_accept() and avoids the user to call accept() + directly. + +- Issue #9065: tarfile no longer uses "root" as the default for the uname and + gname field. + +- Issue #8980: Fixed a failure in distutils.command check that was shadowed by + an environment that does not have docutils. Patch by Arfrever. + +- Issue #1050268: parseaddr now correctly quotes double quote and backslash + characters that appear inside quoted strings in email addresses. + +- Issue #10004: quoprimime no longer generates a traceback when confronted with + invalid characters after '=' in a Q-encoded word. + +- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before + sending a 200 OK for the Expect: 100-continue request header. + +- Issue #9360: Cleanup and improvements to the nntplib module. The API now + conforms to the philosophy of bytes and unicode separation in Python 3. A + test suite has also been added. + +- Issue #9962: GzipFile now has the peek() method. + +- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, + retry the select() loop instead of bailing out. This is because select() can + incorrectly report a socket as ready for reading (for example, if it received + some data with an invalid checksum). + +- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) + +- Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is + received. Now sendall() properly calls signal handlers if necessary, and + retries sending if these returned successfully, including on sockets with a + timeout. + +- Issue #9947: logging: Fixed locking bug in stopListening. + +- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler. + +- Issue #9936: Fixed executable lines' search in the trace module. + +- Issue #9790: Rework imports necessary for samefile and sameopenfile + in ntpath. + +- Issue #9928: Properly initialize the types exported by the bz2 module. + +- Issue #1675951: Allow GzipFile to work with unseekable file objects. Patch by + Florian Festi. + +- Logging: Added QueueListener class to facilitate logging usage for + performance-critical threads. + +- Issue #9916: Add some missing errno symbols. + +- Issue #9877: Expose sysconfig.get_makefile_filename() + +- logging: Added hasHandlers() method to Logger and LoggerAdapter. + +- Issue #9908: Fix os.stat() on bytes paths under Windows 7. + +- Issue #2643: msync() is not called anymore when deallocating an open mmap + object, only munmap(). + +- logging: Changed LoggerAdapter implementation internally, to make it easier to + subclass in a useful way. + +- logging: hasHandlers method was added to Logger, and isEnabledFor, + getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter. + LoggerAdapter was introduced into the unit tests for logging. + +- Issue #1686: Fix string.Template when overriding the pattern attribute. + +- Issue #9854: SocketIO objects now observe the RawIOBase interface in + non-blocking mode: they return None when an operation would block (instead of + raising an exception). + +- Issue #1730136: Fix the comparison between a tk.font.Font and an object of + another kind. + +- Issue #9441: logging has better coverage for rotating file handlers. + +- Issue #9865: collections.OrderedDict now has a __sizeof__ method. + +- Issue #9854: The default read() implementation in io.RawIOBase now handles + non-blocking readinto() returning None correctly. + +- Issue #1552: socket.socketpair() now returns regular socket.socket objects + supporting the whole socket API (rather than the "raw" _socket.socket + objects). + +- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto() + to match the corresponding socket methods. + +- Issue #9840: Added a decorator to reprlib for wrapping __repr__ methods to make + them handle recursive calls within the same thread. + +- logging: Enhanced HTTPHandler with secure and credentials initializers. + +- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X. + +- Issue #9837: The read() method of ZipExtFile objects (as returned by + ZipFile.open()) could return more bytes than requested. + +- Issue #9826: OrderedDict.__repr__ can now handle self-referential values: + d['x'] = d. + +- Issue #9825: Using __del__ in the definition of collections.OrderedDict made + it possible for the user to create self-referencing ordered dictionaries which + become permanently uncollectable GC garbage. Reinstated the Python 3.1 + approach of using weakref proxies so that reference cycles never get created + in the first place. + +- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and + encode the value with filesystem encoding and surrogateescape (instead of + utf-8 in strict mode) . Patch written by David Watson. + +- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING + environment variable to set the filesystem encoding at Python startup. + sys.setfilesystemencoding() creates inconsistencies because it is unable to + reencode all filenames in all objects. + +- Issue #9410: Various optimizations to the pickle module, leading to speedups + up to 4x (depending on the benchmark). Mostly ported from Unladen Swallow; + initial patch by Alexandre Vassalotti. + +- The pprint module now supports printing OrderedDicts in their given order + (formerly, it would sort the keys). + +- Logging: Added QueueHandler class to facilitate logging usage with + multiprocessing. + +- Issue #9707: Rewritten reference implementation of threading.local which is + friendlier towards reference cycles. This change is not normally visible + since an optimized C implementation (_thread._local) is used instead. + +- Issue #6394: os.getppid() is now supported on Windows. Note that it will + still return the id of the parent process after it has exited. This process + id may even have been reused by another unrelated process. + +- Issue #9792: In case of connection failure, socket.create_connection() would + swallow the exception and raise a new one, making it impossible to fetch the + original errno, or to filter timeout errors. Now the original error is + re-raised. + +- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and + the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated + back after the system call. Original patch by Brian Brazil. + +- Updates to the random module: + + * Document which parts of the module are guaranteed to stay the same across + versions and which parts are subject to change. + + * Update the seed() method to use all of the bits in a string instead of just + the hash value. This makes better use of the seed value and assures the + seeding is platform independent. Issue #7889. + + * Improved the random()-->integer algorithm used in choice(), shuffle(), + sample(), randrange(), and randint(). Formerly, it used int(n*random()) + which has a slight bias whenever n is not a power of two. Issue #9025. + + * Improved documentation of arguments to randrange(). Issue #9379. + +- collections.OrderedDict now supports a new method for repositioning keys to + either end. + +- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test + cases now also have assertWarns and assertWarnsRegexp methods to check that a + given warning type was triggered by the code under test. + +- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of + their contents without duplicating them. The view is both readable and + writable. + +- Issue #7566: Implement os.path.sameopenfile for Windows. + +- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an + unsupported operation is attempted (for example, writing to a file open only + for reading). + +- hashlib has two new constant attributes: algorithms_guaranteed and + algorithms_avaiable that respectively list the names of hash algorithms + guaranteed to exist in all Python implementations and the names of hash + algorithms available in the current process. + +- A new package ``concurrent.futures`` as defined by PEP 3148. + +C-API +----- + +- Add PyErr_SyntaxLocationEx, which supports passing a column offset. + +- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or + PySequence_DelSlice when the object doesn't have any mapping operations + defined. + +Tools/Demos +----------- + +- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as + wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb) + and the interpreter under test. + +Tests +----- + +- Issue #9308: Added tests for importing encoded modules that do not + depend on specific stdlib modules being encoded in a certain way. + +- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom + certificate and private key files used by SSL-related certs. + +- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests + in test_os) + +- Issue #7110: regrtest now sends test failure reports and single-failure + tracebacks to stderr rather than stdout. + +- Issue #9628: fix runtests.sh -x option so more than one test can be excluded. + +- Issue #9899: Fix test_tkinter.test_font on various platforms. Patch by Ned + Deily. + +- Issue #9894: Do not hardcode ENOENT in test_subprocess. + +- Issue #9315: Added tests for the trace module. Patch by Eli Bendersky. + +- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the + case when running profile or trace, for example. + +- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. + +Build +----- + +- Issue #10062: Allow building on platforms which do not have sem_timedwait. + +- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by Akira + Kitada. + +- Issue #10055: Make json C89-compliant in UCS4 mode. + +- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows) + +- Issue #1633863: Don't ignore $CC under AIX. + +- Issue #9810: Compile bzip2 source files in Python's project file directly. It + used to be built with bzip2's makefile. + +- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in + module. + +- Issue #9806: python-config now has an ``--extension-suffix`` option that + outputs the suffix for dynamic libraries including the ABI version name + defined by PEP 3149. + +- Issue #941346: Improve the build process under AIX and allow Python to be + built as a shared library. Patch by S?bastien Sabl?. + +- Issue #4026: Make the fcntl extension build under AIX. Patch by S?bastien + Sabl?. + +- Issue #9701: The MacOSX installer can patch the shell profile to ensure that + the "bin" directory inside the framework is on the shell's search path. This + feature now also supports the ZSH shell. + + +What's New in Python 3.2 Alpha 2? +================================= + +*Release date: 05-Sep-2010* + +Core and Builtins +----------------- + +- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by + the new (and simpler) DUP_TOP_TWO. Performance isn't changed, but our + bytecode is a bit simplified. Patch by Demur Rumed. + +- Issue #9766: Rename poorly named variables exposed by _warnings to prevent + confusion with the proper variables names from 'warnings' itself. + +- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to + conform to the Set ABC. Patch by Daniel Urban. + +- Issue #9737: Fix a crash when trying to delete a slice or an item from a + memoryview object. + +- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are + now removed, since their effect was inexistent in 3.x (the default encoding is + hardcoded to utf-8 and cannot be changed). + +- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API + properly. Patch by Stefan Behnel. + +- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most + platforms. Previously, it inlined only when using Microsoft Visual C. + +- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. + +- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. + +- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match + the pyconfig.h generated by configure on other systems. + +- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that + occur during attribute lookup are now propagated to the caller. + +- Issue #8622: Add PYTHONFSENCODING environment variable to override the + filesystem encoding. + +- Issue #5127: The C functions that access the Unicode Database now accept and + return characters from the full Unicode range, even on narrow unicode builds + (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others). A visible difference + in Python is that unicodedata.numeric() now returns the correct value for + large code points, and repr() may consider more characters as printable. + +- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename + as a unicode object, instead of a byte string. Function needed to support + unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new + function. + +- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx(). + +- Issue #9612: The set object is now 64-bit clean under Windows. + +- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for + the module file to be executed with the -m command line option. + +- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to + write a message formatted by PyUnicode_FromFormatV() to sys.stdout and + sys.stderr. + +- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter: + decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str + objects are output as-is. + +- Issue #9203: Computed gotos are now enabled by default on supported compilers + (which are detected by the configure script). They can still be disable + selectively by specifying --without-computed-gotos. + +- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but + use PyUnicode_FromFormatV() to format the warning message. + +- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an + array. + +- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. + +- Issue #9337: The str() of a float or complex number is now identical to its + repr(). + +- Issue #9416: Fix some issues with complex formatting where the output with no + type specifier failed to match the str output: + + - format(complex(-0.0, 2.0), '-') omitted the real part from the output, + - format(complex(0.0, 2.0), '-') included a sign and parentheses. + +Extension Modules +----------------- + +- Issue #8013: time.asctime and time.ctime no longer call system + asctime and ctime functions. The year range for time.asctime is now + 1900 through maxint. The range for time.ctime is the same as for + time.localtime. The string produced by these functions is longer + than 24 characters when year is greater than 9999. + +- Issue #6608: time.asctime is now checking struct tm fields its input + before passing it to the system asctime. Patch by MunSic Jeong. + +- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file + descriptor is provided. Patch by Pascal Chambon. + +- Issue #7736: Release the GIL around calls to opendir() and closedir() in the + posix module. Patch by Marcin Bachry. + +- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the + socket module, and fix the width of socket descriptors to be correctly + detected under 64-bit Windows. + +- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo + and gethostbyaddr. getnameinfo is now restricted to numeric addresses as + input. + +- Issue #9214: Set operations on a KeysView or ItemsView in collections now + correctly return a set. Patch by Eli Bendersky. + +- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by + Matthew Ahrens. + +- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using + the surrogate error handler. + +- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other + than ``TypeError`` raised by the iterator argument. + +- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo. + +- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter + Lock around all system calls. Original patch by Ryan Kelly. + +- Issue #8524: Add a detach() method to socket objects, so as to put the socket + into the closed state without closing the underlying file descriptor. + +- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty. + +- Issue #6869: Fix a refcount problem in the _ctypes extension. + +- Issue #5504: ctypes should now work with systems where mmap can't be + PROT_WRITE and PROT_EXEC. + +- Issue #9507: Named tuple repr will now automatically display the right name in + a tuple subclass. + +- Issue #9324: Add parameter validation to signal.signal on Windows in order to + prevent crashes. + +- Issue #9526: Remove some outdated (int) casts that were preventing the array + module from working correctly with arrays of more than 2**31 elements. + +- Fix memory leak in ssl._ssl._test_decode_cert. + +- Issue #8065: Fix memory leak in readline module (from failure to free the + result of history_get_history_state()). + +- Issue #9450: Fix memory leak in readline.replace_history_item and + readline.remove_history_item for readline version >= 5.0. + +- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. + +- Issue #8046: Add context manager protocol support and .closed property to mmap + objects. + +Library +------- + +- Issue #7451: Improve decoding performance of JSON objects, and reduce the + memory consumption of said decoded objects when they use the same strings as + keys. + +- Issue #1100562: Fix deep-copying of objects derived from the list and dict + types. Patch by Michele Orr? and Bj?rn Lindqvist. + +- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows. + +- Issue #9421: Made the get methods consistently accept the vars and + default arguments on all parser classes. + +- Issue #7005: Fixed output of None values for RawConfigParser.write and + ConfigParser.write. + +- Issue #8990: array.fromstring() and array.tostring() get renamed to + frombytes() and tobytes(), respectively, to avoid confusion. Furthermore, + array.frombytes(), array.extend() as well as the array.array() constructor now + accept bytearray objects. Patch by Thomas Jollans. + +- Issue #808164: Fixed socket.close to avoid references to globals, to avoid + issues when socket.close is called from a __del__ method. + +- Issue #9706: ssl module provides a better error handling in various + circumstances. + +- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting + rid of the cached copy of thread-local attribute dictionary. + +- Issue #1512791: In setframerate() in the wave module, non-integral frame rates + are rounded to the nearest integer. + +- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of + falling into recursion. + +- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four + character years even if the message contains RFC822 two character years. + +- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive + operations on its self, namely x -= x and x ^= x. + +- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error + handling when accepting a new connection. + +- Issue #9601: ftplib now provides a workaround for non-compliant + implementations such as IIS shipped with Windows server 2003 returning invalid + response codes for MKD and PWD commands. + +- Issue #658749: asyncore's connect() method now correctly interprets winsock + errors. + +- Issue #9501: Fixed logging regressions in cleanup code. + +- Fix functools.total_ordering() to skip methods inherited from object. + +- Issue #9572: Importlib should not raise an exception if a directory it thought + it needed to create was done concurrently by another process. + +- Issue #9617: Signals received during a low-level write operation aren't + ignored by the buffered IO layer anymore. + +- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding. + +- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape + error handler, or strict error handler on Windows. + +- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and + ``gzip.decompress``. Original patch by Anand B. Pillai. + +- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a + ssl.SSLContext object allowing bundling SSL configuration options, + certificates and private keys into a single (potentially long-lived) + structure. + +- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as + single keyword arguments. + +- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py + compiler flag values over defining its own. + +- Issue #9147: Added dis.code_info() which is similar to show_code() but returns + formatted code information in a string rather than displaying on screen. + +- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute + pointing to the original callable. + +- Issue #3445: functools.update_wrapper now tolerates missing attributes on + wrapped callables. + +- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod. + +- Issue #9605: posix.getlogin() decodes the username with file filesystem + encoding and surrogateescape error handler. Patch written by David Watson. + +- Issue #9604: posix.initgroups() encodes the username using the fileystem + encoding and surrogateescape error handler. Patch written by David Watson. + +- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name + using the filesystem encoding and surrogateescape error handler. Patch written + by David Watson. + +- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants, + for use with the statvfs() function. Patch by Adam Jackson. + +- Issue #8688: MANIFEST files created by distutils now include a magic comment + indicating they are generated. Manually maintained MANIFESTs without this + marker will not be overwritten or removed. + +- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a + BadZipfile error is raised if it doesn't match (as used to be the case in + Python 2.5 and earlier). + +- Issue #9550: a BufferedReader could issue an additional read when the original + read request had been satisfied, which could block indefinitely when the + underlying raw IO channel was e.g. a socket. Report and original patch by + Jason V. Miller. + +- Issue #3757: thread-local objects now support cyclic garbage collection. + Thread-local objects involved in reference cycles will be deallocated timely + by the cyclic GC, even if the underlying thread is still running. + +- Issue #9452: Add read_file, read_string, and read_dict to the configparser + API; new source attribute to exceptions. + +- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current + node. + +- Issue #8047: Fix the xml.etree serializer to return bytes by default. Use + ``encoding="unicode"`` to generate a Unicode string. + +- Issue #8280: urllib2's Request method will remove fragments in the url. This + is how it is supposed to work, wget and curl do the same. Previous behavior + was wrong. + +- Issue #6683: For SMTP logins we now try all authentication methods advertised + by the server. Many servers are buggy and advertise authentication methods + they do not support in reality. + +- Issue #8814: function annotations (the ``__annotations__`` attribute) are now + included in the set of attributes copied by default by functools.wraps and + functools.update_wrapper. Patch by Terrence Cole. + +- Issue #2944: asyncore doesn't handle connection refused correctly. + +- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate + the private attributes. Add tests for smtpd module. + +- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word + encoded in base64 is lacking padding. + +- Issue #9444: Argparse now uses the first element of prefix_chars as the option + character for the added 'h/help' option if prefix_chars does not contain a + '-', instead of raising an error. + +- Issue #7372: Fix pstats regression when stripping paths from profile data + generated with the profile module. + +- Issue #9428: Fix running scripts with the profile/cProfile modules from the + command line. + +- Issue #7781: Fix restricting stats by entry counts in the pstats interactive + browser. + +- Issue #9209: Do not crash in the pstats interactive browser on invalid regular + expressions. + +- Update collections.OrderedDict to match the implementation in Py2.7 (based on + lists instead of weakly referenced Link objects). + +- Issue #8397: Raise an error when attempting to mix iteration and regular reads + on a BZ2File object, rather than returning incorrect results. + +- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when + re-initializing a buffered IO object by calling its ``__init__`` method. + +- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links + across devices. + +- Issue #8826: Properly load old-style "expires" attribute in http.cookies. + +- Issue #1690103: Fix initial namespace for code run with trace.main(). + +- Issue #7395: Fix tracebacks in pstats interactive browser. + +- Issue #8230: Fix Lib/test/sortperf.py. + +- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final + newline, it no longer truncates the last character of the last command line. + +- Issue #5146: Handle UID THREAD command correctly in imaplib. + +- Issue #5147: Fix the header generated for cookie files written by + http.cookiejar.MozillaCookieJar. + +- Issue #8198: In pydoc, output all help text to the correct stream when + sys.stdout is reassigned. + +- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` + in ntpath.normpath(). + +- Issue #1286: Allow using fileinput.FileInput as a context manager. + +- Add lru_cache() decorator to the functools module. + +Tools/Demos +----------- + +- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147. + +- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing + non-ASCII content. + +Tests +----- + +- Issue #9601: Provide a test case for ftplib.parse257. + +- Issue #8857: Provide a test case for socket.getaddrinfo. + +- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. + +- Issue #8433: Fix test_curses failure with newer versions of ncurses. + +- Issue #9496: Provide a test suite for the rlcompleter module. Patch by + Michele Orr?. + +- Issue #8687: provide a test suite for sched.py module. + +Build +----- + +- Issue #1303434: Generate ZIP file containing all PDBs. + +- Issue #9193: PEP 3149 is accepted. + +- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F() + become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively. + +- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by + S?bastien Sabl?. + +- Don't run pgen twice when using make -j. + + +What's New in Python 3.2 Alpha 1? +================================= + +*Release date: 01-Aug-2010* + +Core and Builtins +----------------- + +- Issue #8991: convertbuffer() rejects discontigious buffers. + +- Issue #7616: Fix copying of overlapping memoryview slices with the Intel + compiler. + +- Issue #8413: structsequence now subclasses tuple. + +- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the + start byte and the continuation byte(s) are now considered invalid, instead of + the number of bytes specified by the start byte. E.g.: + '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces + with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80') + even if '\xf1' is the start byte of a 4-bytes sequence. Previous versions + returned a single u'\ufffd'. + +- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0 + rather than 0.0. So "-7j" is now exactly equivalent to "-(7j)". + +- Be more specific in error messages about positional arguments. + +- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes + objects, as described in the documentation. + +- Issue #6543: Write the traceback in the terminal encoding instead of utf-8. + Fix the encoding of the modules filename. Patch written by Amaury Forgeot + d'Arc. + +- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code + dealing with unary minus applied to a constant. The removed code was mutating + the ST, causing a second compilation to fail. + +- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict + mode raises unicode errors. The encoder only supports "strict" and "replace" + error handlers, the decoder only supports "strict" and "ignore" error + handlers. Patch written by Mark Hammond. + +- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use + "w*" format instead. Add tests for "w*" format. + +- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z" + formats if the string contains a null byte/character. Write unit tests for + string formats. + +- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test + suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module + location of the raised exception. + +- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode + filenames and enable os.fsencode(). + +- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. + +- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the + interpreter with characters outside the Basic Multilingual Plane (higher than + 0x10000). + +- Issue #8950: (See also issue #5080). Py_ArgParse*() functions now raise + TypeError instead of giving a DeprecationWarning when a float is parsed using + the 'L' code (for long long). (All other integer codes already raise + TypeError in this case.) + +- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to + enable shortcuts for upper case encoding name. Add also a shortcut for + "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode(). + +- Issue #8838: Remove codecs.charbuffer_encode() function. The buffer protocol + doesn't support "char buffer" anymore in Python 3. + +- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*" + instead. codecs.charbuffer_encode() now accepts modifiable buffer objects + like bytearray. + +- Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no + used anymore and it was never documented. + +- In str.format(), raise a ValueError when indexes to arguments are too large. + +- Issue #2844: Make int('42', n) consistently raise ValueError for invalid + integers n (including n = -909). + +- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances + of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it + easy to maintain the invariant that hash(x) == hash(y) whenever x and y have + equal value. + +- Issue #8748: Fix two issues with comparisons between complex and integer + objects. (1) The comparison could incorrectly return True in some cases + (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality. + (2) The comparison raised an OverflowError for large integers, leading to + unpredictable exceptions when combining integers and complex objects in sets + or dicts. + +- Issue #8766: Initialize _warnings module before importing the first module. + Fix a crash if an empty directory called "encodings" exists in sys.path. + +- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system + encoding and surrogateescape error handler instead of the locale encoding to + be consistent with os.environ. Add PySys_AddWarnOptionUnicode() function. + +- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead + of strict) error handler to escape surrogates. + +- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode + object to Py_FileSystemDefaultEncoding with the "surrogateescape" error + handler, and return bytes. If Py_FileSystemDefaultEncoding is not set, fall + back to UTF-8. + +- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any + error handler, not only the default error handler (strict). + +- Issue #8610: Load file system codec at startup, and display a fatal error on + failure. Set the file system encoding to utf-8 (instead of None) if getting + the locale encoding failed, or if nl_langinfo(CODESET) function is missing. + +- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of + PyUnicode_FromString() to support surrogates in the filename and use the right + encoding. + +- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells. + +- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler. + +- Issue #8419: Prevent the dict constructor from accepting non-string keyword + arguments. + +- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute + indirectly Python signal handlers anymore because mywrite() ignores exceptions + (KeyboardInterrupt). + +- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing + unicode string (eg. backslashreplace). + +- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects + anymore, you have to convert your bytearray filenames to bytes. + +- Issue #7332: Remove the 16KB stack-based buffer in + PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit + compared to the dynamic memory allocation fallback. Patch by Charles-Fran?ois + Natali. + +- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is + passed to bytes or bytearray. + +- Issue #7301: Add environment variable $PYTHONWARNINGS. + +- Issue #8329: Don't return the same lists from select.select when no fds are + changed. + +- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on + 64-bit machines. The shift count for either left or right shift is permitted + to be up to sys.maxsize. + +- Ensure that tokenization of identifiers is not affected by locale. + +- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever. + +- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. + +- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it + is set. + +- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding + is unknown. + +- Issue #1583863: A str subclass can now override the __str__ method. + +- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with + PyMemberDefs could produce an internal error; raise TypeError instead. + +- Issue #7845: Rich comparison methods on the complex type now return + NotImplemented rather than raising a TypeError when comparing with an + incompatible type; this allows user-defined classes to implement their own + comparisons with complex. + +- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt + (SIGINT). If an error occurs while importing the site module, the error is + printed and Python exits. Initialize the GIL before importing the site module. + +- Issue #7173: Generator finalization could invalidate sys.exc_info(). + +- Issue #7544: Preallocate thread memory before creating the thread to avoid a + fatal error in low memory condition. + +- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM + check fails. + +- Handle errors from looking up __prepare__ correctly. + +- Issue #5939: Add additional runtime checking to ensure a valid capsule in + Modules/_ctypes/callproc.c. + +- Issue #7309: Fix unchecked attribute access when converting + UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings. + +- Issue #6902: Fix problem with built-in types format incorrectly with 0 + padding. + +- Issue #7988: Fix default alignment to be right aligned for complex.__format__. + Now it matches other numeric types. + +- Issue #5988: Remove deprecated functions PyOS_ascii_formatd, + PyOS_ascii_strtod, and PyOS_ascii_atof. Use PyOS_double_to_string and + PyOS_string_to_double instead. See issue #5835 for the original deprecations. + +- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` + fails. Patch by Florent Xicluna. + +- Issue #7788: Fix an interpreter crash produced by deleting a list slice with + very large step value. + +- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and + add the additional members returned in an OSVERSIONINFOEX structure. The new + members are service_pack_major, service_pack_minor, suite_mask, and + product_type. + +- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could + crash in many places because of the PyByteArray_AS_STRING() macro returning + NULL. The macro now returns a statically allocated empty string instead. + +- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`, + where the right hand operand is a set of constants, by turning the set into a + frozenset and pre-building it as a constant. The comparison operation is made + against the constant instead of building a new set each time it is executed (a + similar optimization already existed which turned a list of constants into a + pre-built tuple). Patch and additional tests by Dave Malcolm. + +- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods + of bytes, bytearray and unicode objects by using a common implementation based + on stringlib's fast search. Patch by Florent Xicluna. + +- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2, + including: (1) a serious 'wrong output' bug that could occur for long (> 40 + digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when + parsing certain long numeric strings corresponding to subnormal values, (3) a + memory leak for some values large enough to cause overflow, and (4) a number + of flaws that could lead to incorrectly rounded results. + +- The __complex__ method is now looked up on the class of instances to make it + consistent with other special methods. + +- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, + `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. + +- Issue #7604: Deleting an unset slotted attribute did not raise an + AttributeError. + +- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero) + in ** operator. The behaviour now conforms to that described in C99 Annex F. + +- Issue #1811: improve accuracy and cross-platform consistency for true division + of integers: the result of a/b is now correctly rounded for ints a and b (at + least on IEEE 754 platforms), and in particular does not depend on the + internal representation of an int. + +- Issue #6834: replace the implementation for the 'python' and 'pythonw' + executables on OSX. + + These executables now work properly with the arch(1) command: ``arch -ppc + python`` will start a universal binary version of python in PPC mode (unlike + previous releases). + +- Issue #7466: Segmentation fault when the garbage collector is called in the + middle of populating a tuple. Patch by Florent Xicluna. + +- Issue #7419: setlocale() could crash the interpreter on Windows when called + with invalid values. + +- Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+" + mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z). + +- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX + 10.6. + +- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding. + +- Issue #6970: Remove redundant calls when comparing objects that don't + implement the relevant rich comparison methods. + +- Issue #7298: Fixes for range and reversed(range(...)). Iteration over + range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C + long but the length of the range did not. Also fix several cases where + reversed(range(a, b, c)) gave wrong results, and fix a refleak for + reversed(range(a, b, c)) with large arguments. + +- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised + during the formation of an output tuple. + +- Issue #3297: On wide unicode builds, do not split unicode characters into + surrogates. + +- Remove length limitation when constructing a complex number from a string. + +- Issue #1087418: Boost performance of bitwise operations for longs. + +- Support for AtheOS has been completely removed from the code base. It was + disabled since Python 3.0. + +- Support for several legacy threading libraries has been disabled. These + libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code + will be entirely removed in 3.3. + +- Support for OSF* has been disabled. If nobody stands up, support will be + removed in 3.3. See . + +- Peephole constant folding had missed UNARY_POSITIVE. + +- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which + fixes the problem of some exceptions being thrown at shutdown when the + interpreter is killed. Patch by Adam Olsen. + +- Issue #7147: Remove support for compiling Python without complex number + support. + +- Issue #7120: logging: Removed import of multiprocessing which is causing crash + in GAE. + +- Issue #1754094: Improve the stack depth calculation in the compiler. There + should be no other effect than a small decrease in memory use. Patch by + Christopher Tur Lesniewski-Laas. + +- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using + byte values greater than 127. Patch by Derk Drukker. + +- Issue #1571184: The Unicode database contains properties for more characters. + The tables for code points representing numeric values, white spaces or line + breaks are now generated from the official Unicode Character Database files, + and include information from the Unihan.txt file. + +- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of + producing internally inconsistent Python longs. + +- Issue #6990: Fix threading.local subclasses leaving old state around after a + reference cycle GC which could be recycled by new locals. + +- Issue #5460: Fix an ambiguity in the grammar. + +- Issue #1766304: Improve performance of membership tests on range objects. + +- Issue #6713: Improve performance of integer -> string conversions. + +- Issue #6846: Fix bug where bytearray.pop() returns negative integers. + +- Issue #6750: A text file opened with io.open() could duplicate its output when + writing from multiple threads at the same time. + +- Issue #6707: dir() on an uninitialized module caused a crash. + +- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. + +- Issue #6573: set.union() stopped processing inputs if an instance of self + occurred in the argument chain. + +- Issue #6070: On posix platforms import no longer copies the execute bit from + the .py file to the .pyc file if it is set. + +- Issue #1616979: Added the cp720 (Arabic DOS) encoding. + +- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object, + and not an int. Fix the corresponding error message, and the documentation. + +- The deprecated PyCObject has been removed. + +- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h. This fixes a + build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead + of stdint.h on that platform. + +- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the + 'surrogateescape' error handler, a string which contains unpaired surrogates. + +- Issue #4856: Remove checks for win NT. + +- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument + to construct a null-initialized bytes object. + +- Issue #1023290: Add from_bytes() and to_bytes() methods to integers. These + methods allow the conversion of integers to bytes, and vice-versa. + +- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances + from being copied with copy.copy(), and bytes subclasses from being pickled + properly. + +- Code objects now support weak references. + +- Issue #7072: isspace(0xa0) is true on Mac OS X. + +- Issue #8084: PEP 370 now conforms to system conventions for framework builds + on MacOS X. That is, "python setup.py install --user" will install into + "~/Library/Python/2.7" instead of "~/.local". + +C-API +----- + +- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the + variable argument list. `Py_VA_COPY` is equivalent to C99 + `va_copy`, but available on all python platforms. + +- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX] + instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX]. This makes it safe to do + "step = -step" when reversing a slice. + +- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the + interpreter to set sys.argv without also modifying sys.path. This helps fix + `CVE-2008-5983 + `_. + +- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are + strings in an efficient manner. + +- Issue #8276: PyEval_CallObject() is now only available in macro form. The + function declaration, which was kept for backwards compatibility reasons, is + now removed (the macro was introduced in 1997!). + +- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to + PyLong_AsLongAndOverflow. + +- Make PyUnicode_CompareWithASCIIString return not equal if the Python string + has '\0' at the end. + +- Issue #5080: The argument parsing functions PyArg_ParseTuple, + PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and + PyArg_Parse now raise a DeprecationWarning for float arguments passed with the + 'L' format code. This will become a TypeError in a future version of Python, + to match the behaviour of the other integer format codes. + +- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added. + +- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in + PyArg_ParseTupleAndKeywords. + +- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and + PyErr_Format, on machines with HAVE_LONG_LONG defined. + +- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in + PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for + accessing the d_type and d_name members of structures using PyDescr_COMMON. + +- Issue #6405: Remove duplicate type declarations in descrobject.h. + +- The code flags for old __future__ features are now available again. + +- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of + PyCode_Addr2Line(). + +- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code + object at a specified file, function, and line number. + +- Issue #1419652: Change the first argument to PyImport_AppendInittab() to + ``const char *`` as the string is stored beyond the call. + +- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc + allocator will be automatically disabled when running under Valgrind. This + gives improved memory leak detection when running under Valgrind, while taking + advantage of pymalloc at other times. + +Library +------- + +- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the + old commands are restored. + +- For traceback debugging, the pdb listing now also shows the locations where + the exception was originally (re)raised, if it differs from the last line + executed (e.g. in case of finally clauses). + +- The pdb command "source" has been added. It displays the source code for a + given object, if possible. + +- The pdb command "longlist" has been added. It displays the whole source code + for the current function. + +- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error + output into methods. + +- Issue #809887: Make the output of pdb's breakpoint deletions more consistent; + emit a message when a breakpoint is enabled or disabled. + +- Issue #5294: Fix the behavior of pdb's "continue" command when called in the + top-level debugged frame. + +- Issue #5727: Restore the ability to use readline when calling into pdb in + doctests. + +- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the + source file to be debugged is in a non-builtin encoding. + +- Issue #8048: Prevent doctests from failing when sys.displayhook has been + reassigned. + +- Issue #8015: In pdb, do not crash when an empty line is entered as a + breakpoint command. + +- In pdb, allow giving a line number to the "until" command. + +- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc + files. Also, add a command-line option "-c" that runs a command as if given + in .pdbrc. + +- Issue #4179: In pdb, allow "list ." as a command to return to the currently + debugged line. + +- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *`` + entries, consider the first one. + +- Issue #6630: Allow customizing regex flags when subclassing the + string.Template class. + +- Issue #9411: Allow specifying an encoding for config files in the configparser + module. + +- Issue #1682942: Improvements to configparser: support alternate delimiters, + alternate comment prefixes and empty lines in values. + +- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. + +- Issue #8966: ctypes: Remove implicit bytes-unicode conversion. + +- Issue #9378: python -m pickle will now load and display the + first object in the pickle file. + +- Issue #4770: Restrict binascii module to accept only bytes (as specified). + And fix the email package to encode to ASCII instead of ``raw-unicode-escape`` + before ASCII-to-binary decoding. + +- Issue #9384: ``python -m tkinter`` will now display a simple demo applet. + +- The default size of the re module's compiled regular expression cache has been + increased from 100 to 500 and the cache replacement policy has changed from + simply clearing the entire cache on overflow to forgetting the least recently + used cached compiled regular expressions. This is a performance win for + applications that use a lot of regular expressions and limits the impact of + the performance hit anytime the cache is exceeded. + +- Issue #7113: Speed up loading in configparser. Patch by ?ukasz Langa. + +- Issue #9032: XML-RPC client retries the request on EPIPE error. The EPIPE + error occurs when the server closes the socket and the client sends a big + XML-RPC request. + +- Issue #4629: getopt raises an error if an argument ends with "=", whereas + getopt doesn't accept a value (eg. --help= is rejected if getopt uses + ['help='] long options). + +- Issue #7989: Added pure python implementation of the `datetime` module. The C + module is renamed to `_datetime` and if available, overrides all classes + defined in datetime with fast C impementation. Python implementation is based + on the original python prototype for the datetime module by Tim Peters with + minor modifications by the PyPy project. The test suite now tests `datetime` + module with and without `_datetime` acceleration using the same test cases. + +- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). + +- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the + script being traced. Patch by Eli Bendersky. + +- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for + the patch. + +- Issue #3704: http.cookiejar was not properly handling URLs with a / in the + parameters. + +- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument + which controls printing of opcode descriptions in ``dis()`` output. + +- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo + crosses an 8192 byte boundary. + +- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee. + +- ``ast.literal_eval()`` now allows byte literals. + +- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated + keyword arguments called 'self' or 'other' specially. + +- ``ast.literal_eval()`` now allows set literals. + +- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS. + +- Issue #7646: The fnmatch pattern cache no longer grows without bound. + +- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError + produced when profiling the decimal module. This was due to a dangerous + iteration over 'locals()' in Context.__init__. + +- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10 + and the exponent is tiny (for example, ``Decimal(10) ** + Decimal('1e-999999999')``). + +- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError. + +- Issue #9130: Fix validation of relative imports in parser module. + +- Issue #9128: Fix validation of class decorators in parser module. + +- Issue #9094: python -m pickletools will now disassemble pickle files listed in + the command line arguments. See output of python -m pickletools -h for more + details. + +- Issue #5468: urlencode to handle bytes type and other encodings in its query + parameter. Patch by Dan Mahn. + +- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, + ensure that the input string length is a multiple of the frame size. + +- Issue #6507: Accept source strings in dis.dis(). Original patch by Daniel + Urban. + +- Issue #7829: Clearly document that the dis module is exposing an + implementation detail that is not stable between Python VMs or releases. + +- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor + raises an exception. + +- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs + that act as both context managers and decorators. contextmanager changes to + use ContextDecorator. + +- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader + for removal in Python 3.4. + +- Issue #9064: pdb's "up" and "down" commands now accept an optional argument + giving the number of frames to go. + +- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not + ``str`` or ``bytes``. + +- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an + OpenSSL structure. + +- Issue #8682: The ssl module now temporary increments the reference count of a + socket object got through ``PyWeakref_GetObject``, so as to avoid possible + deallocation while the object is still being used. + +- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong + password instead of presenting an interactive prompt. Older behavior can be + obtained by passing retry=True to http_error_xxx methods of FancyURLOpener. + +- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile + smart enough to find source files in the linecache. + +- Issue #5610: feedparser no longer eats extra characters at the end of a body + part if the body part ends with a ``\r\n``. + +- Issue #8986: math.erfc was incorrectly raising OverflowError for values + between -27.3 and -30.0 on some platforms. + +- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows. + +- Issue #8966: If a ctypes structure field is an array of c_char, convert its + value to bytes instead of str (as done for c_char and c_char_p). + +- Issue #8188: Comparisons between Decimal and Fraction objects are now + permitted, returning a result based on the exact numerical values of the + operands. This builds on issue #2531, which allowed Decimal-to-float + comparisons; all comparisons involving numeric types (bool, int, float, + complex, Decimal, Fraction) should now act as expected. + +- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by + Thomas Jollans. + +- Issue #8899: time.struct_time now has class and attribute docstrings. + +- Issue #6470: Drop UNC prefix in FixTk. + +- Issue #4768: base64 encoded email body parts were incorrectly stored as binary + strings. They are now correctly converted to strings. + +- Issue #8833: tarfile created hard link entries with a size field != 0 by + mistake. + +- Charset.body_encode now correctly handles base64 encoding by encoding with the + output_charset before calling base64mime.encode. Passes the tests from 2.x + issue #1368247. + +- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction + attribute that is True iff there are uncommitted changes. + +- Issue #1289118: datetime.timedelta objects can now be multiplied by float and + divided by float and int objects. Results are rounded to the nearest multiple + of timedelta.resolution with ties resolved using round-half-to-even method. + +- Issue #7150: Raise OverflowError if the result of adding or subtracting + timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. + +- Issue #8806: add SSL contexts support to ftplib. + +- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer + and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes + API. + +- Issue #8770: Now sysconfig displays information when it's called as a script. + Initial idea by Sridhar Ratnakumar. + +- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by + Fredrik H??rd. + +- Issue #8540: Decimal module: rename the Context._clamp attribute to + Context.clamp and make it public. This is useful in creating contexts that + correspond to the decimal interchange formats specified in IEEE 754. + +- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM + twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and + StreamWriter classes. + +- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead + of the C file stderr, to use stderr encoding and error handler. + +- Issue #8782: Add a trailing newline in linecache.updatecache to the last line + of files without one. + +- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when + comparing to a non-mapping. + +- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the + correct encoding. + +- Issue #4870: Add an `options` attribute to SSL contexts, as well as several + ``OP_*`` constants to the `ssl` module. This allows to selectively disable + protocol versions, when used in combination with `PROTOCOL_SSLv23`. + +- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. + +- Issue #8663: distutils.log emulates backslashreplace error handler. Fix + compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if + stdout is not a TTY). + +- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value. + subprocess.Popen() and os._execvpe() support bytes program name. Add + os.supports_bytes_environ flag: True if the native OS type of the environment + is bytes (eg. False on Windows). + +- Issue #8633: tarfile is now able to read and write archives with "raw" binary + pax headers as described in POSIX.1-2008. + +- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes, + unquote, unquote_to_bytes. + +- Issue #8688: Distutils now recalculates MANIFEST everytime. + +- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with + surrogates and bytes for the filename. + +- Issue #8550: Add first class ``SSLContext`` objects to the ssl module. + +- Issue #8681: Make the zlib module's error messages more informative when the + zlib itself doesn't give any detailed explanation. + +- The audioop module now supports sound fragments of length greater than 2**31 + bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN. + +- Issue #4972: Add support for the context manager protocol to the ftplib.FTP + class. + +- Issue #8664: In py_compile, create __pycache__ when the compiled path is + given. + +- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes + for use in the file system, environment variables or the command line. + +- Issue #8571: Fix an internal error when compressing or decompressing a chunk + larger than 1GB with the zlib module's compressor and decompressor objects. + +- Issue #8603: Support bytes environmental variables on Unix: Add os.environb + mapping and os.getenvb() function. os.unsetenv() encodes str argument to the + file system encoding with the surrogateescape error handler (instead of + utf8/strict) and accepts bytes. posix.environ keys and values are now bytes. + +- Issue #8573: asyncore _strerror() function might throw ValueError. + +- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error + messages when accessing undefined class attributes because of the cheap + inheritance with the underlying socket object. The cheap inheritance has been + deprecated. + +- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. + Patch by Tres Seaver. + +- Issue #8390: tarfile uses surrogateescape as the default error handler + (instead of replace in read mode or strict in write mode). + +- Issue #7755: Use an unencumbered audio file for tests. + +- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent + and any children created using ``os.fork`` on MacOS X 10.6. + +- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal + operation raises multiple signals and more than one of those signals is + trapped, the specification determines the order in which the signals should be + handled. In many cases this order wasn't being followed, leading to the wrong + Python exception being raised. + +- Issue #7865: The close() method of ``io`` objects should not swallow + exceptions raised by the implicit flush(). Also qensure that calling close() + several times is supported. Patch by Pascal Chambon. + +- Issue #4687: Fix accuracy of garbage collection runtimes displayed with + gc.DEBUG_STATS. + +- Issue #8354: The siginterrupt setting is now preserved for all signals, not + just SIGCHLD. + +- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does + webbrowser.get("safari"). + +- Issue #8464: tarfile no longer creates files with execute permissions set when + mode="w|" is used. + +- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of + the Linux kernel. Patch by Yaniv Aknin. + +- Issue #8295: Added shutil.unpack_archive. + +- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. + It should correctly return an empty response now. + +- Issue #8546: Reject None given as the buffering argument to _pyio.open. + +- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by + Sridhar Ratnakumar. + +- Issue #6656: fix locale.format_string to handle escaped percents + and mappings. + +- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where + the method could block indefinitely if called just before the event loop + started running. This also fixes the occasional freezes witnessed in + test_httpservers. + +- Issue #8524: When creating an SSL socket, the timeout value of the original + socket wasn't retained (instead, a socket with a positive timeout would be + turned into a non-blocking SSL socket). + +- Issue #5103: SSL handshake would ignore the socket timeout and block + indefinitely if the other end didn't respond. + +- The do_handshake() method of SSL objects now adjusts the blocking mode of the + SSL structure if necessary (as other methods already do). + +- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and + bytes strings for environment keys and values. + +- Issue #8467: Pure Python implementation of subprocess encodes the error + message using surrogatepass error handler to support surrogates in the + message. + +- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames. + +- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the + string "python" as the *ident*. openlog() arguments are all optional and + keywords. + +- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a + non-infinite timeout. Also make that method friendlier with applications + wanting to continue using the socket in clear-text mode, by disabling + OpenSSL's internal readahead. Thanks to Darryl Miles for guidance. + +- Issue #8496: make mailcap.lookup() always return a list, rather than an + iterator. Patch by Gregory Nofi. + +- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the + collation name contains a surrogate character. + +- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl + extension, such that verification of some SSL certificates doesn't fail + because of an "unknown algorithm". + +- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree. + +- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree. + +- Issue #4814: timeout parameter is now applied also for connections resulting + from PORT/EPRT commands. + +- Issue #8463: added missing reference to bztar in shutil's documentation. + +- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as + long as the user didn't specify 'automatic proxy configuration'). + +- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code + as stated in RFC-959 at chapter 5.4. + +- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with + surrogates. + +- Issue #850728: Add a *timeout* parameter to the `acquire()` method of + `threading.Semaphore` objects. Original patch by Torsten Landschoff. + +- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the + available cipher list. Helps fix test_ssl with OpenSSL 1.0.0. + +- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for + the current working directory. + +- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII + using backslashreplace error handler. + +- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. + +- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony + Locke and Hans Ulrich Niedermann. + +- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. + +- Issue #7316: The acquire() method of lock objects in the ``threading`` + module now takes an optional timeout argument in seconds. Timeout support + relies on the system threading library, so as to avoid a semi-busy wait loop. + +- Issue #8383: pickle and pickletools use surrogatepass error handler when + encoding unicode as utf8 to support lone surrogates and stay compatible with + Python 2.x and 3.x. + +- Issue #7585: difflib context and unified diffs now place a tab between + filename and date, conforming to the 'standards' they were originally designed + to follow. This improves compatibility with patch tools. + +- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 + character sets will now consistently use a Content-Transfer-Encoding of 7bit + rather than sometimes being marked as 8bit. + +- Issue #8375: test_distutils now checks if the temporary directory are still + present before it cleans them. + +- Issue #8374: Update the internal alias table in the ``locale`` module to + cover recent locale changes and additions. + +- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module, + using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and + `ssl.OPENSSL_VERSION_NUMBER`. + +- Add functools.total_ordering() and functools.cmp_to_key(). + +- Issue #8257: The Decimal construct now accepts a float instance directly, + converting that float to a Decimal of equal value: + + >>> Decimal(1.1) + Decimal('1.100000000000000088817841970012523233890533447265625') + +- Issue #8294: The Fraction constructor now accepts Decimal and float instances + directly. + +- Issue #7279: Comparisons involving a Decimal signaling NaN now signal + InvalidOperation instead of returning False. (Comparisons involving a quiet + NaN are unchanged.) Also, Decimal quiet NaNs are now hashable; Decimal + signaling NaNs remain unhashable. + +- Issue #2531: Comparison operations between floats and Decimal instances now + return a result based on the numeric values of the operands; previously they + returned an arbitrary result based on the relative ordering of id(float) and + id(Decimal). See also issue #8188, which adds Decimal-to-Fraction + comparisons. + +- Added a subtract() method to collections.Counter(). + +- Issue #8233: When run as a script, py_compile.py optionally takes a single + argument `-` which tells it to read files to compile from stdin. Each line is + read on demand and the named file is compiled immediately. (Original patch by + Piotr O?arowski). + +- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and + form feed (0x0C) are now considered linebreaks, as specified in Unicode + Standard Annex #14. See issue #7643. http://www.unicode.org/reports/tr14/ + +- Comparisons using one of <, <=, >, >= between a complex instance and a + Fractions instance now raise TypeError instead of returning True/False. This + makes Fraction <=> complex comparisons consistent with int <=> complex, float + <=> complex, and complex <=> complex comparisons. + +- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some + methods (such as oss_mixer_device.fileno()) were not available. Initial patch + by Bertrand Janin. + +- Issue #8205: Remove the "Modules" directory from sys.path when Python is + running from the build directory (POSIX only). + +- Issue #7512: shutil.copystat() could raise an OSError when the filesystem + didn't support chflags() (for example ZFS under FreeBSD). The error is now + silenced. + +- Issue #7860: platform.uname now reports the correct 'machine' type when Python + is running in WOW64 mode on 64 bit Windows. + +- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets. + Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking + reads and writes are always retried by OpenSSL itself. + +- Issue #4282: Fix the main function of the profile module for a non-ASCII + script, open the file in binary mode and not in text mode with the default + (utf8) encoding. + +- Issue #8179: Fix macpath.realpath() on a non-existing path. + +- Issue #8024: Update the Unicode database to 5.2. + +- Issue #8168: py_compile now handles files with utf-8 BOMS. + +- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is + detected. + +- Issue #6716/2: Backslash-replace error output in compilall. + +- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox + with Tcl/Tk-8.5. + +- Issue #8140: extend compileall to compile single files. Add -i option. + +- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the + locale. + +- The internals of the subprocess module on POSIX systems have been replaced by + an extension module (_posixsubprocess) so that the fork()+exec() can be done + safely without the possibility of deadlock in multithreaded applications. + +- subprocess.Popen now has restore_signals and start_new_session features. The + default of restore_signals=True is a new behavior compared to earlier Python + versions. This means that signals such as SIGPIPE are not ignored by default + in subprocesses launched by Python (Issue #1652). + +- Issue #6472: The xml.etree package is updated to ElementTree 1.3. The + cElementTree module is updated too. + +- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to + an non existent program name and Python is unable to retrieve the real program + name. + +- Issue #7880: Fix sysconfig when the python executable is a symbolic link. + +- Issue #6509: fix re.sub to work properly when the pattern, the string, and the + replacement were all bytes. Patch by Antoine Pitrou. + +- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure + bugs and allows loading SQLite extensions from shared libraries. + +- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public + Review Issue #29 (http://unicode.org/review/pr-29.html). + +- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, + reset also the pointer to the current pointer context. + +- Issue #7232: Add support for the context manager protocol to the TarFile + class. + +- Issue #7250: Fix info leak of os.environ across multi-run uses of + wsgiref.handlers.CGIHandler. + +- Issue #1729305: Fix doctest to handle encode error with "backslashreplace". + +- Issue #691291: codecs.open() should not convert end of lines on reading and + writing. + +- Issue #7869: logging: improved diagnostic for format-time errors. + +- Issue #7868: logging: added loggerClass attribute to Manager. + +- logging: Implemented PEP 391. + +- Issue #1537721: Add a writeheader() method to csv.DictWriter. + +- Issue #7959: ctypes callback functions are now registered correctly with the + cycle garbage collector. + +- Issue #5801: removed spurious empty lines in wsgiref. + +- Issue #6666: fix bug in trace.py that applied the list of directories to be + ignored only to the first file. Noted by Bogdan Opanchuk. + +- Issue #7597: curses.use_env() can now be called before initscr(). Noted by + Kan-Ru Chen. + +- Issue #7310: fix the __repr__ of os.environ to show the environment variables. + +- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822 + messages parsed by email.Parser.HeaderParser. + +- Issue #7361: Importlib was not properly checking the number of bytes in + bytecode file when it was less then 8 bytes. + +- Issue #7633: In the decimal module, Context class methods (with the exception + of canonical and is_canonical) now accept instances of int and long wherever a + Decimal instance is accepted, and implicitly convert that argument to Decimal. + Previously only some arguments were converted. + +- Issue #7835: shelve should no longer produce mysterious warnings during + interpreter shutdown. + +- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML + processing instructions and comments. These raw characters are allowed by the + XML specification, and are necessary when outputting e.g. PHP code in a + processing instruction. Patch by Neil Muller. + +- Issue #6233: ElementTree failed converting unicode characters to XML entities + when they could't be represented in the requested output encoding. Patch by + Jerry Chen. + +- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the + compression type. + +- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is + specified, rather than fall through to AF_PACKET (in the `socket` module). + Also, raise ValueError rather than TypeError when an unknown TIPC address type + is specified. Patch by Brian Curtin. + +- Issue #6939: Fix file I/O objects in the `io` module to keep the original file + position when calling `truncate()`. It would previously change the file + position to the given argument, which goes against the tradition of + ftruncate() and other truncation APIs. Patch by Pascal Chambon. + +- Issue #7610: Reworked implementation of the internal + ``zipfile.ZipExtFile`` class used to represent files stored inside an + archive. The new implementation is significantly faster and can be wrapped in + a ``io.BufferedReader`` object for more speedups. It also solves an + issue where interleaved calls to `read()` and `readline()` give wrong results. + Patch by Nir Aides. + +- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, + allowing for a maximum number of tasks within the pool to be completed by the + worker before that worker is terminated, and a new one created to replace it. + +- Issue #7792: Registering non-classes to ABCs raised an obscure error. + +- Issue #7785: Don't accept bytes in FileIO.write(). + +- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. + +- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when + the release file is empty. + +- Issue #7561: Fix crashes when using bytearray objects with the posix + module. + +- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in + multipart/signed MIME parts, which fixes one of the sources of invalid + modifications to such parts by Generator. + +- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`. Patch + by Florent Xicluna, along with some additional tests. + +- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte + argument. Patch by Victor Stinner. + +- Issue #3299: Fix possible crash in the _sre module when given bad argument + values in debug mode. Patch by Victor Stinner. + +- Issue #2846: Add support for gzip.GzipFile reading zero-padded files. Patch + by Brian Curtin. + +- Issue #7681: Use floor division in appropiate places in the wave module. + +- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since + Extension extra options may change the output without changing the .c + file). Initial patch by Collin Winter. + +- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc + when it has a fully qualified configuration prefix. Initial patch by Arfrever. + +- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the + destruction of weakref'ed objects while iterating. + +- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor + Stinner. + +- Issue #1628205: Socket file objects returned by socket.socket.makefile() now + properly handles EINTR within the read, readline, write & flush methods. The + socket.sendall() method now properly handles interrupted system calls. + +- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and + make it implement the `io.BufferedIOBase` ABC to allow for further speedups by + wrapping it in an `io.BufferedReader`. Patch by Nir Aides. + +- Issue #3972: http.client.HTTPConnection now accepts an optional source_address + parameter to allow specifying where your connections come from. + +- socket.create_connection now accepts an optional source_address parameter. + +- Issue #5511: now zipfile.ZipFile can be used as a context manager. Initial + patch by Brian Curtin. + +- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML + Manifest file in text mode so string patterns can be used in regular + expressions. + +- Issue #7552: Removed line feed in the base64 Authorization header in the + Distutils upload command to avoid an error when PyPI reads it. This occurs on + long passwords. Initial patch by JP St. Pierre. + +- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by + Tatsuhiro Tsujikawa. + +- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a + TypeError when given an `str` object (rather than a `bytes`-like object). + Patch by Victor Stinner and Florent Xicluna. + +- Issue #7349: Make methods of file objects in the io module accept None as an + argument where file-like objects (ie StringIO and BytesIO) accept them to mean + the same as passing no argument. + +- Issue #7357: tarfile no longer suppresses fatal extraction errors by default. + +- Issue #5949: added check for correct lineends in input from IMAP server in + imaplib. + +- Add count() and reverse() methods to collections.deque(). + +- Fix variations of extending deques: d.extend(d) d.extendleft(d) d+=d + +- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong + parameter types. Patch by Victor Stinner. + +- Issue #7457: added a read_pkg_file method to + distutils.dist.DistributionMetadata. + +- logging: Added optional `secure` parameter to SMTPHandler, to enable use of + TLS with authentication credentials. + +- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated + in Distutils. Patch by Stephen Emslie. + +- Issue #4120: Drop reference to CRT from manifest when building extensions with + msvc9compiler. + +- Issue #7333: The `posix` module gains an `initgroups()` function providing + access to the initgroups(3) C library call on Unix systems which implement it. + Patch by Jean-Paul Calderone. + +- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group + ownership when the group is not forced, because the group may be different + from the user's group and inherit from its container when the test is run. + +- Issue #4486: When an exception has an explicit cause, do not print its + implicit context too. This affects the `traceback` module as well as built-in + exception printing. + +- Issue #1515: Enable use of deepcopy() with instance methods. Patch by Robert + Collins. + +- Issue #7403: logging: Fixed possible race condition in lock creation. + +- Issue #6845: Add restart support for binary upload in ftplib. The + `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` + argument. Patch by Pablo Mouzo. + +- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method + returning the total number of seconds in the duration. Patch by Brian + Quinlan. + +- Issue #7133: SSL objects now support the new buffer API. + +- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters. + +- Issue #6123: tarfile now opens empty archives correctly and consistently + raises ReadError on empty files. + +- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2. + +- Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead + of __str__. + +- Issue #7341: Close the internal file object in the TarFile constructor in case + of an error. + +- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh + Windows box. Help provided by David Bolen. + +- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS + or SSL. Patch by Giampaolo Rodola'. + +- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch. + +- Issue #4969: The mimetypes module now reads the MIME database from the + registry under Windows. Patch by Gabriel Genellina. + +- Issue #6816: runpy now provides a run_path function that allows Python code to + execute file paths that refer to source or compiled Python files as well as + zipfiles, directories and other valid sys.path entries that contain a + __main__.py file. This allows applications that run other Python scripts to + support the same flexibility as the CPython command line itself. + +- Issue #7318: multiprocessing now uses a timeout when it fails to establish a + connection with another process, rather than looping endlessly. The default + timeout is 20 seconds, which should be amply sufficient for local connections. + +- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and + unpickled. This fixes crashes under Windows when trying to run + test_multiprocessing in verbose mode. + +- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass`` + argument added to the TextTestRunner constructor allowing a different result + class to be used without having to subclass. + +- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test + name in failure reports even if the test has a docstring. + +- Issue #3001: Add a C implementation of recursive locks which is used by + default when instantiating a `threading.RLock` object. This makes recursive + locks as fast as regular non-recursive locks (previously, they were slower by + 10x to 15x). + +- Issue #7282: Fix a memory leak when an RLock was used in a thread other than + those started through `threading.Thread` (for example, using + `_thread.start_new_thread()`). + +- Issue #7187: Importlib would not silence the IOError raised when trying to + write new bytecode when it was made read-only. + +- Issue #7264: Fix a possible deadlock when deallocating thread-local objects + which are part of a reference cycle. + +- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent + objects on 64-bit systems. Patch by Michael Broghton. + +- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a + modification is done through it. This fixes inconsistencies and test failures + on systems with slightly bogus mtime behaviour. + +- Issue #7246 & Issue #7208: getpass now properly flushes input before reading + from stdin so that existing input does not confuse it and lead to incorrect + entry or an IOError. It also properly flushes it afterwards to avoid the + terminal echoing the input afterwards on OSes such as Solaris. + +- Issue #7233: Fix a number of two-argument Decimal methods to make sure that + they accept an int or long as the second argument. Also fix buggy handling of + large arguments (those with coefficient longer than the current precision) in + shift and rotate. + +- Issue #4750: Store the basename of the original filename in the gzip FNAME + header as required by RFC 1952. + +- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in + Distutils. + +- Issue #7218: Fix test_site for win32, the directory comparison was done with + an uppercase. + +- Issue #7205: Fix a possible deadlock when using a BZ2File object from + several threads at once. + +- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424. + +- Issue #7099: Decimal.is_normal now returns True for numbers with exponent + larger than emax. + +- Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows + platforms, and assorted locale fixes by Derk Drukker. + +- Issue #5833: Fix extra space character in readline completion with the GNU + readline library version 6.0. + +- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment. + +- Issue #7086: Added TCP support to SysLogHandler, and tidied up some + anachronisms in the code which were a relic of 1.5.2 compatibility. + +- Issue #7082: When falling back to the MIME 'name' parameter, the correct place + to look for it is the Content-Type header. + +- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the + builtin tokenizer. + +- Issue #7048: Force Decimal.logb to round its result when that result is too + large to fit in the current precision. + +- Issue #6236, #6348: Fix various failures in the I/O library under AIX and + other platforms, when using a non-gcc compiler. Patch by Derk Drukker. + +- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now + always result in NULL. + +- Issue #5042: Structure sub-subclass does now initialize correctly with base + class positional arguments. + +- Issue #6882: Import uuid creates zombies processes. + +- Issue #6635: Fix profiler printing usage message. + +- Issue #6856: Add a filter keyword argument to TarFile.add(). + +- Issue #6888: pdb's alias command was broken when no arguments were given. + +- Issue #6857: Default format() alignment should be '>' for Decimal instances. + +- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning + NaN or raising InvalidContext. Also, fix infinite recursion in + long(Decimal('nan')). + +- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no + type specifier. + +- Issue #6239: ctypes.c_char_p return value must return bytes. + +- Issue #6838: Use a list to accumulate the value instead of repeatedly + concatenating strings in http.client's HTTPResponse._read_chunked providing a + significant speed increase when downloading large files servend with a + Transfer-Encoding of 'chunked'. + +- Trying to import a submodule from a module that is not a package, ImportError + should be raised, not AttributeError. + +- When the globals past to importlib.__import__() has __package__ set to None, + fall back to computing what __package__ should be instead of giving up. + +- Raise a TypeError when the name of a module to be imported for + importlib.__import__ is not a string (was raising an AttributeError before). + +- Allow the fromlist passed into importlib.__import__ to be any iterable. + +- Have importlib raise ImportError if None is found in sys.modules. + +- Issue #6054: Do not normalize stored pathnames in tarfile. + +- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN + payloads are now ordered by integer value rather than lexicographically. + +- Issue #1356969: Add missing info methods in tix.HList. + +- Issue #1522587: New constants and methods for the tix.Grid widget. + +- Issue #1250469: Fix the return value of tix.PanedWindow.panes. + +- Issue #1119673: Do not override tkinter.Text methods when creating a + ScrolledText. + +- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. + +- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview* + and yview* methods. + +- Issue #6629: Fix a data corruption issue in the new I/O library, which could + occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or + "wb+" mode) after having buffered a certain amount of data for reading. This + bug was not present in the pure Python implementation. + +- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in + POP3.apop. + +- Issue #2715: Remove remnants of Carbon.File from binhex module. + +- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal + digits in input, as recommended by the standard. Previously it was restricted + to accepting [0-9]. + +- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT + DO/DONT correctly. + +- Issue #1424152: Fix for http.client, urllib.request to support SSL while + working through proxy. Original patch by Christopher Li, changes made by + Senthil Kumaran. + +- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for + loaders that allow for modules to be executed. Both importlib.abc.PyLoader and + PyPycLoader inherit from this class and provide implementations in relation to + other methods required by the ABCs. + +- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like + the documentation said it did even though the code in PyLoader relied on the + abstract method required by ResourceLoader. + +- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how + to handle a comparison without loss of precision. Also add correct handling + of infinities and nans for comparisons with float. + +- Issue #6415: Fixed warnings.warn segfault on bad formatted string. + +- Issue #6358: The exit status of a command started with os.popen() was reported + differently than it did with python 2.x. + +- Issue #6323: The pdb debugger did not exit when running a script with a syntax + error. + +- Issue #3392: The subprocess communicate() method no longer fails in select() + when file descriptors are large; communicate() now uses poll() when possible. + +- Issue #6369: Fix an RLE decompression bug in the binhex module. + +- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. + +- The deprecated function string.maketrans has been removed. + +- Issue #4005: Fixed a crash of pydoc when there was a zip file present in + sys.path. + +- Issue #6218: io.StringIO and io.BytesIO instances are now picklable. + +- The os.get_exec_path() function to return the list of directories that will be + searched for an executable when launching a subprocess was added. + +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + +- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid + and os.read system calls where appropriate. + +- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t. + +- Issue #6247: The argparse module has been added to the standard library. + +- Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is a socket + option available on FreeBSD 7.1 and newer. + +- Issue #9315: Fix for the trace module to record correct class name + for tracing methods. + +Extension Modules +----------------- + +- Issue #9959: Tweak formula used for computing math.log of an integer, + making it marginally more accurate for exact powers of 2. + +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + +- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly + compared to other unix systems. In particular, os.getgroups() does not reflect + any changes made using os.setgroups() but basicly always returns the same + information as the id command. os.getgroups() can now return more than 16 + groups on MacOSX. + +- Issue #6095: Make directory argument to os.listdir optional. + +- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g., + struct.pack('>?')): if conversion to bool raised an exception then that + exception wasn't properly propagated on machines where char is unsigned. + +- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when + they contain instances of old-style classes. + +- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany + existing isinf and isnan functions. + +- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason + R. Coombs. + +- In struct.pack, correctly propogate exceptions from computing the truth of an + object in the '?' format. + +- Issue #9000: datetime.timezone objects now have eval-friendly repr. + +- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as + special methods. + +- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000. + Prior to this change, timezone adjustment in utctimetuple() could produce + tm_year value of 0 or 10,000. Now an OverflowError is raised in these edge + cases. + +- Issue #6641: The ``datetime.strptime`` method now supports the ``%z`` + directive. When the ``%z`` directive is present in the format string, an + aware ``datetime`` object is returned with ``tzinfo`` bound to a + ``datetime.timezone`` instance constructed from the parsed offset. If both + ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone + name, but ``%Z`` data without ``%z`` is discarded. + +- Issue #5094: The ``datetime`` module now has a simple concrete class + implementing ``datetime.tzinfo`` interface. Instances of the new class, + ``datetime.timezone``, return fixed name and UTC offset from their + ``tzname(dt)`` and ``utcoffset(dt)`` methods. The ``dst(dt)`` method always + returns ``None``. A class attribute, ``utc`` contains an instance + representing the UTC timezone. Original patch by Rafe Kaplan. + +- Issue #8973: Add __all__ to struct module; this ensures that help(struct) + includes documentation for the struct.Struct class. + +- Issue #3129: Trailing digits in struct format string are no longer ignored. + For example, "1" or "ilib123" are now invalid formats and cause + ``struct.error`` to be raised. Patch by Caleb Deveraux. + +- Issue #7384: If the system readline library is linked against ncurses, the + curses module must be linked against ncurses as well. Otherwise it is not safe + to load both the readline and curses modules in an application. + +- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA, + requiring a re-try in order to get the complete result. + +- Issue #8692: Optimize math.factorial: replace the previous naive algorithm + with an improved 'binary-split' algorithm that uses fewer multiplications and + allows many of the multiplications to be performed using plain C integer + arithmetic instead of PyLong arithmetic. Also uses a lookup table for small + arguments. + +- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing + overflow checks in the audioop module. + +- Issue #8644: The accuracy of td.total_seconds() has been improved (by + calculating with integer arithmetic instead of float arithmetic internally): + the result is now always correctly rounded, and is equivalent to ``td / + timedelta(seconds=1)``. + +- Issue #2706: Allow division of a timedelta by another timedelta: timedelta / + timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta, + timedelta) are all supported. + +- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. + +- Issue #8300: When passing a non-integer argument to struct.pack with any + integer format code, struct.pack first attempts to convert the non-integer + using its __index__ method. If that method is non-existent or raises + TypeError it goes on to try the __int__ method, as described below. + +- Issue #8142: Update libffi to the 3.0.9 release. + +- Issue #6949: Allow the _dbm extension to be built with db 4.8.x. + +- Issue #6544: Fix a reference leak in the kqueue implementation's error + handling. + +- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as + msvcr100.dll is not a platform assembly anymore. + +- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. + +- Issue #7078: Set struct.__doc__ from _struct.__doc__. + +- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module. + +- Issue #6877: It is now possible to link the readline extension to the libedit + readline emulation on OSX 10.5 or later. + +- Issue #6848: Fix curses module build failure on OS X 10.6. + +- Fix a segfault that could be triggered by expat with specially formed input. + +- Issue #6561: '\d' in a regex now matches only characters with Unicode category + 'Nd' (Number, Decimal Digit). Previously it also matched characters with + category 'No'. + +- Issue #4509: Array objects are no longer modified after an operation failing + due to the resize restriction in-place when the object has exported buffers. + +- Issue #2389: Array objects are now pickled in a portable manner. + +- Expat: Fix DoS via XML document with malformed UTF-8 sequences + (CVE_2009_3560). + +- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread + could raise an incorrect RuntimeError about not holding the import lock. The + import lock is now reinitialized after fork. + +- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 + parameter on some platforms such as OS X. + +- Build the ossaudio extension on GNU/kFreeBSD. + +- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in + the return value of QueryReflectionKey. + +- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice. + +Build +----- + +- Use OpenSSL 1.0.0a on Windows. + +- Issue #9280: Make sharedinstall depend on sharedmods. + +- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting + override the configure and makefile defaults, without deleting options the + user didn't intend to override. Developers should no longer need to specify + OPT or EXTRA_CFLAGS, although those variables are still present for + backward-compatibility. + +- Issue #8854: Fix finding Visual Studio 2008 on Windows x64. + +- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for + multiprocessing only. + +- Issue #8625: Turn off optimization in --with-pydebug builds with gcc. + (Optimization was unintentionally turned on in gcc --with-pydebug builds as a + result of the issue #1628484 fix, combined with autoconf's strange choice of + default CFLAGS produced by AC_PROG_CC for gcc.) + +- Issue #3646: It is now easily possible to install a Python framework into your + home directory on MacOSX, see Mac/README for more information. + +- Issue #3928: os.mknod() now available in Solaris, also. + +- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not + give false warnings. + +- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable + anymore. It also forwards the LDFLAGS settings to the linker when building a + shared library. + +- Issue #6716: Quote -x arguments of compileall in MSI installer. Exclude 2to3 + tests from compileall. + +- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. + +- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private + memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free + instead. Also disable caching of powers of 5. + +- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built. + +- Issue #6943: Use pkg-config to find the libffi headers when the + --with-system-ffi flag is used. + +- Issue #7609: Add a --with-system-expat option that causes the system's expat + library to be used for the pyexpat module instead of the one included with + Python. + +- Issue #7589: Only build the nis module when the correct header files are + found. + +- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. + +- Issue #5792: Extend the short float repr support to x86 systems using + icc or suncc. + +- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles + correctly under gcc on x86-64. This fixes a reported problem with the + --with-tsc build on x86-64. + +- Issue #6802: Fix build issues on MacOSX 10.6. + +- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6. + +- Issue #4601: 'make install' did not set the appropriate permissions on + directories. + +- Issue #5390: Add uninstall icon independent of whether file extensions are + installed. + +- Issue #7541: When using ``python-config`` with a framework install the + compiler might use the wrong library. + +- python-config now supports multiple options on the same command line. + +- Issue #8509: Fix quoting in help strings and code snippets in configure.in. + +- Issue #8510: Update to autoconf2.65. + +Documentation +------------- + +- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses + to Doc/license.rst. + +- Issue #9524: Document that two CTRL* signals are meant for use only + with os.kill. + +- Issue #9255: Document that the 'test' package is meant for internal Python use + only. + +- A small WSGI server was added as Tools/scripts/serve.py, and is used to + implement a local documentation server via 'make serve' in the doc directory. + +- Updating `Using Python` documentation to include description of CPython's -J + and -X options. + +- Document that importing a module that has None in sys.modules triggers an + ImportError. + +- Issue #6556: Fixed the Distutils configuration files location explanation for + Windows. + +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). + +- Issue #8909: Added the size of the bitmap used in the installer created by + distutils' bdist_wininst. Patch by Anatoly Techtonik. + +Tests +----- + +- Issue #9251: test_threaded_import didn't fail when run through regrtest if the + import lock was disabled. + +- Issue #8605: Skip test_gdb if Python is compiled with optimizations. + +- Issue #7449: Skip test_socketserver if threading support is disabled. + +- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled + by a decompressor object without errors (it returns incomplete uncompressed + data). + +- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid + UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding). + +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + +- Issue #7449: Fix many tests to support Python compiled without thread + support. Patches written by Jerry Seutter. + +- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of + SSL shutdowns. + +- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written + by Dave Malcolm. + +- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any + thread was previously started, most likely due to a platform bug. + +- Issue #8193: Fix test_zlib failure with zlib 1.2.4. + +- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi. + +- Issue #8263: Now regrtest.py will report a failure if it receives a + KeyboardInterrupt (SIGINT). + +- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special + Unicode normalization cases. + +- Issue #7783: test.support.open_urlresource invalidates the outdated files from + the local cache. + +- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are + effectively raised. + +- The four path modules (genericpath, macpath, ntpath, posixpath) share a common + TestCase for some tests: test_genericpath.CommonTest. + +- Print platform information when running the whole test suite, or using the + --verbose flag. + +- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly + filesystem encoding. + +- Issue #6292: for the moment at least, the test suite runs cleanly if python is + run with the -OO flag. Tests requiring docstrings are skipped. + +- Issue #7712: test.support gained a new `temp_cwd` context manager which is now + also used by regrtest to run all the tests in a temporary directory. The + original CWD is saved in `support.SAVEDCWD`. Thanks to Florent Xicluna who + helped with the patch. + +- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi + (only seen so far on platforms where the curses module wasn't built), due to + an uncleared exception. + +- Issue #7728: test_timeout was changed to use support.bind_port instead of a + hard coded port. + +- Issue #7376: Instead of running a self-test (which was failing) when called + with no arguments, doctest.py now gives a usage message. + +- Issue #7396: fix regrtest -s, which was broken by the -j enhancement. + +- Issue #7498: test_multiprocessing now uses test.support.find_unused_port + instead of a hardcoded port number in test_rapid_restart. + +- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file + in the Lib/test directory, which might be read-only for the user running the + tests. + +- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case + of an option with no handler. + +- Issue #7312: Add a -F flag to run the selected tests in a loop until a test + fails. Can be combined with -j. + +- Issue #6551: test_zipimport could import and then destroy some modules of the + encodings package, which would make other tests fail further down the road + because the internally cached encoders and decoders would point to empty + global variables. + +- Issue #7295: Do not use a hardcoded file name in test_tarfile. + +- Issue #7270: Add some dedicated unit tests for multi-thread synchronization + primitives such as Lock, RLock, Condition, Event and Semaphore. + +- Issue #7248 (part 2): Use a unique temporary directory for importlib source + tests instead of tempfile.tempdir. This prevents the tests from sharing state + between concurrent executions on the same system. + +- Issue #7248: In importlib.test.source.util a try/finally block did not make + sure that some referenced objects actually were created in the block before + calling methods on the object. + +- Issue #7222: Make thread "reaping" more reliable so that reference + leak-chasing test runs give sensible results. The previous method of reaping + threads could return successfully while some Thread objects were still + referenced. This also introduces a new private function: + ``_thread._count()``. + +- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer + runs the risk of causing the worker thread to fail. + +- Issue #7055: test___all__ now greedily detects all modules which have an + __all__ attribute, rather than using a hardcoded and incomplete list. + +- Issue #7058: Added save/restore for things like sys.argv and cwd to + runtest_inner in regrtest, with warnings if the called test modifies them, and + a new section in the summary report at the end. + +- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. + +- Fixed tests in importlib.test.source.test_abc_loader that were masking the + proper exceptions that should be raised for missing or improper code object + bytecode. + +- Removed importlib's custom test discovery code and switched to + unittest.TestLoader.discover(). + +Tools/Demos +----------- + +- Issue #5464, #8974: Implement plural forms in msgfmt.py. + +- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were + added to the `Tools/` directory. They were previously living in the sandbox. + + +What's New in Python 3.1? +========================= + +*Release date: 27-June-2009* + +Core and Builtins +----------------- + +- Issue #6334: Fix bug in range length calculation for ranges with + large arguments. + +- Issue #6329: Fixed iteration for memoryview objects (it was being blocked + because it wasn't recognized as a sequence). + +Library +------- + +- Issue #6126: Fixed pdb command-line usage. + +- Issue #6314: logging: performs extra checks on the "level" argument. + +- Issue #6274: Fixed possible file descriptors leak in subprocess.py + +- Accessing io.StringIO.buffer now raises an AttributeError instead of + io.UnsupportedOperation. + +- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. + (On Unix) + +- Issue #1202: zipfile module would cause a struct.error when attempting to + store files with a CRC32 > 2**31-1. + +Extension Modules +----------------- + +- Issue #5590: Remove unused global variable in pyexpat extension. + + +What's New in Python 3.1 Release Candidate 2? +============================================= + +*Release date: 13-June-2009* + +Core and Builtins +----------------- + +- Fixed SystemError triggered by "range([], 1, -1)". + +- Issue #5924: On Windows, a large PYTHONPATH environment variable + (more than 255 characters) would be completely ignored. + +- Issue #4547: When debugging a very large function, it was not always + possible to update the lineno attribute of the current frame. + +- Issue #5330: C functions called with keyword arguments were not reported by + the various profiling modules (profile, cProfile). Patch by Hagen F?rstenau. + +Library +------- + +- Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular + expression string pattern was trying to match against a bytes returned by + Popen. Tested under win32 to build the py-postgresql project. + +- Issue #6258: Support AMD64 in bdist_msi. + +- Issue #6195: fixed doctest to no longer try to read 'source' data from + binary files. + +- Issue #5262: Fixed bug in next rollover time computation in + TimedRotatingFileHandler. + +- Issue #6217: The C implementation of io.TextIOWrapper didn't include the + errors property. Additionally, the errors and encoding properties of StringIO + are always None now. + +- Issue #6137: The pickle module now translates module names when loading + or dumping pickles with a 2.x-compatible protocol, in order to make data + sharing and migration easier. This behaviour can be disabled using the + new `fix_imports` optional argument. + +- Removed the ipaddr module. + +- Issue #3613: base64.{encode,decode}string are now called + base64.{encode,decode}bytes which reflects what type they accept and return. + The old names are still there as deprecated aliases. + +- Issue #5767: Remove sgmlop support from xmlrpc.client. + +- Issue #6150: Fix test_unicode on wide-unicode builds. + +- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty + parameters. + +Windows +------- + +- Issue #6221: Delete test registry key before running the test. + +- Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. + +C-API +----- + +- Issue #5735: Python compiled with --with-pydebug should throw an + ImportError when trying to import modules compiled without + --with-pydebug, and vice-versa. + + +Build +----- + +- Issue #6154: Make sure the intl library is added to LIBS if needed. Also + added LIBS to OS X framework builds. + +- Issue #5809: Specifying both --enable-framework and --enable-shared is + an error. Configure now explicity tells you about this. + + + +What's New in Python 3.1 release candidate 1? +============================================= + +*Release date: 2009-05-30* + +Core and Builtins +----------------- + +- Issue #6097: Escape UTF-8 surrogates resulting from mbstocs conversion + of the command line. + +- Issue #6012: Add cleanup support to O& argument parsing. + +- Issue #6089: Fixed str.format with certain invalid field specifiers + that would raise SystemError. + +- Issue #5982: staticmethod and classmethod now expose the wrapped + function with __func__. + +- Added support for multiple context managers in the same with-statement. + Deprecated contextlib.nested() which is no longer needed. + +- Issue #5829: complex("1e500") no longer raises OverflowError. This + makes it consistent with float("1e500") and interpretation of real + and imaginary literals. + +- Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. + +- Issue #5994: the marshal module now has docstrings. + +- Issue #5981: Fix three minor inf/nan issues in float.fromhex: + (1) inf and nan strings with trailing whitespace were incorrectly + rejected; (2) parsing of strings representing infinities and nans + was locale aware; and (3) the interpretation of fromhex('-nan') + didn't match that of float('-nan'). + +Library +------- + +- Issue #4859: Implement PEP 383 for pwd, spwd, and grp. + +- smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259). + +- Issue #6121: pydoc now ignores leading and trailing spaces in the + argument to the 'help' function. + +- Issue #6118: urllib.parse.quote_plus ignored the encoding and errors + arguments for strings with a space in them. + +- collections.namedtuple() was not working with the following field + names: cls, self, tuple, itemgetter, and property. + +- In unittest, using a skipping decorator on a class is now equivalent to + skipping every test on the class. The ClassTestSuite class has been removed. + +- Issue #6050: Don't fail extracting a directory from a zipfile if + the directory already exists. + +- Issue #1309352: fcntl now converts its third arguments to a C `long` rather + than an int, which makes some operations possible under 64-bit Linux (e.g. + DN_MULTISHOT with F_NOTIFY). + +- Issue #5761: Add the name of the underlying file to the repr() of various + IO objects. + +- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix + by Musashi Tamura, tests by Marcin Bachry. + +- Issue #1983: Fix functions taking or returning a process identifier to use + the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have + a process identifier type wider than the standard C integer type. + +- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. + Patch by Farhan Ahmad, test by Marcin Bachry. + +- Issue #2116: Weak references and weak dictionaries now support copy()ing and + deepcopy()ing. + +- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. + +- Issue #5918: Fix a crash in the parser module. + +- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. + +- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io + library. This means, for example, that opening an UTF-16 text file in + append mode doesn't add a BOM at the end of the file if the file isn't + empty. + +- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' + file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix + corrects a pydoc regression. + +- Issue #5955: aifc's close method did not close the file it wrapped, + now it does. This also means getfp method now returns the real fp. + +Installation +------------ + +- Issue #6047: fullinstall has been removed because Python 3's executable will + now be known as python3. + +- Lib/smtpd.py is no longer installed as a script. + +Extension Modules +----------------- + +- Issue #3061: Use wcsftime for time.strftime where available. + +- Issue #4873: Fix resource leaks in error cases of pwd and grp. + +- Issue #6093: Fix off-by-one error in locale.strxfrm. + +- The _functools and _locale modules are now built into the libpython shared + library instead of as extension modules. + +Build +----- + +- Issue #3585: Add pkg-config support. It creates a python-2.7.pc file + and a python3.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by + Clinton Roy. + +Tests +----- + +- Issue #5442: Tests for importlib were not properly skipping case-sensitivity + tests on darwin even when the OS was installed on a case-sensitive + filesystem. Also fixed tests that should not be run when + sys.dont_write_bytecode is true. + + +What's New in Python 3.1 beta 1? +================================ + +*Release date: 2009-05-06* + +Core and Builtins +----------------- + +- Issue #5914: Add new C API function PyOS_string_to_double, and + deprecate PyOS_ascii_strtod and PyOS_ascii_atof. + +- Issue #3382: float.__format__, complex.__format__, and %-formatting + no longer map 'F' to 'f'. Because of issue #5859 (below), this only + affects nan -> NAN and inf -> INF. + +- Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames + in all operations, including splitdrive, split, etc. splitunc() now issues + a PendingDeprecation warning. + +- Issue #5920: For float.__format__, change the behavior with the + empty presentation type (that is, not one of 'e', 'f', 'g', or 'n') + to be like 'g' but with at least one decimal point and with a + default precision of 12. Previously, the behavior the same but with + a default precision of 6. This more closely matches str(), and + reduces surprises when adding alignment flags to the empty + presentation type. This also affects the new complex.__format__ in + the same way. + +- Implement PEP 383, Non-decodable Bytes in System Character Interfaces. + +- Issue #5890: in subclasses of 'property' the __doc__ attribute was + shadowed by classtype's, even if it was None. property now + inserts the __doc__ into the subclass instance __dict__. + +- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal + sequences. Patch by Nick Barnes and Victor Stinner. + +- Issue #3672: Reject surrogates in utf-8 codec; add surrogatepass error handler. + +- Issue #5883: In the io module, the BufferedIOBase and TextIOBase ABCs have + received a new method, detach(). detach() disconnects the underlying stream + from the buffer or text IO and returns it. + +- Issue #5859: Remove switch from '%f' to '%g'-style formatting for + floats with absolute value over 1e50. Also remove length + restrictions for float formatting: '%.67f' % 12.34 and '%.120e' % + 12.34 no longer raise an exception. + +- Issue #1588: Add complex.__format__. For example, + format(complex(1, 2./3), '.5') now produces a sensible result. + +- Issue #5864: Fix empty format code formatting for floats so that it + never gives more than the requested number of significant digits. + +- Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes + new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. + +- Issue #5835: Deprecate PyOS_ascii_formatd. + +- Issue #4971: Fix titlecase for characters that are their own + titlecase, but not their own uppercase. + +- Issue #5283: Setting __class__ in __del__ caused a segfault. + +- Issue #5816: complex(repr(z)) now recovers z exactly, even when + z involves nans, infs or negative zeros. + +- Issue #3166: Make int -> float conversions correctly rounded. + +- Issue #1869 (and many duplicates): make round(x, n) correctly + rounded for a float x, by using the decimal <-> binary conversions + from Python/dtoa.c. As a consequence, (e.g.) round(x, 2) now + consistently agrees with format(x, '.2f'). + +- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on + some builtin types. + +- Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100'. + +- Issue #5515: str.format() type 'n' combined with commas and leading + zeros no longer gives odd results with ints and floats. + +- Implement PEP 378, Format Specifier for Thousands Separator, for + floats. + +- The str function switches to exponential notation at + 1e11, not 1e12. This avoids printing 13 significant digits in + situations where only 12 of them are correct. Example problem + value: str(1e11 + 0.5). (This minor issue has existed in 2.x for a + long time.) + +- Issue #1580: On most platforms, use a 'short' float repr: for a + finite float x, repr(x) now outputs a string based on the shortest + sequence of decimal digits that rounds to x. Previous behaviour was + to output 17 significant digits and then strip trailing zeros. + Another minor difference is that the new repr switches to + exponential notation at 1e16 instead of the previous 1e17; this + avoids misleading output in some cases. + + There's a new sys attribute sys.float_repr_style, which takes + the value 'short' to indicate that we're using short float repr, + and 'legacy' if the short float repr isn't available for one + reason or another. + + The float repr change involves incorporating David Gay's 'perfect + rounding' code into the Python core (it's in Python/dtoa.c). As a + secondary consequence, all string-to-float and float-to-string + conversions (including all float formatting operations) will be + correctly rounded on these platforms. + + See issue #1580 discussions for details of platforms for which + this change does not apply. + +- Issue #5759: float() didn't call __float__ on str subclasses. + +- The string.maketrans() function is deprecated; there is a new static method + maketrans() on the bytes and bytearray classes. This removes confusion about + the types string.maketrans() is supposed to work with, and mirrors the + methods available on the str class. + +- Issue #2170: refactored xml.dom.minidom.normalize, increasing both + its clarity and its speed. + +- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)`` + to avoid compiler warnings. + +- Issue #3739: The unicode-internal encoder now reports the number of characters + consumed like any other encoder (instead of the number of bytes). + +Installation +------------ + +- Issue #5756: Install idle and pydoc with a 3 suffix. + +Library +------- + +- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument. + +- Issue #5311: bdist_msi can now build packages that do not depend on a + specific Python version. + +- Issue #5150: IDLE's format menu now has an option to strip trailing + whitespace. + +- Issue #5940: distutils.command.build_clib.check_library_list was not doing + the right type checkings anymore. + +- Issue #4875: On win32, ctypes.util.find_library does no longer + return directories. + +- Issue #5142: Add the ability to skip modules while stepping to pdb. + +- Issue #1309567: Fix linecache behavior of stripping subdirectories when + looking for files given by a relative filename. + +- Issue #5923: Update the ``turtle`` module to version 1.1, add two new + turtle demos in Demo/turtle. + +- Issue #5692: In ``zipfile.Zipfile``, fix wrong path calculation when + extracting a file to the root directory. + +- Issue #5913: os.listdir() should fail for empty path on windows. + +- Issue #5084: unpickling now interns the attribute names of pickled objects, + saving memory and avoiding growth in size of subsequent pickles. Proposal + and original patch by Jake McGuire. + +- The json module now works exclusively with str and not bytes. + +- Issue #3959: The ipaddr module has been added to the standard library. + Contributed by Google. + +- Issue #3002: ``shutil.copyfile()`` and ``shutil.copytree()`` now raise an + error when a named pipe is encountered, rather than blocking infinitely. + +- Issue #5857: tokenize.tokenize() now returns named tuples. + +- Issue #4305: ctypes should now build again on mipsel-linux-gnu + +- Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the + string is already in normalized form, by performing a quick check beforehand. + Original patch by Rauli Ruohonen. + +- Issue #5853: calling a function of the mimetypes module from several threads + at once could hit the recursion limit if the mimetypes database hadn't been + initialized before. + +- Issue #5854: Updated __all__ to include some missing names and remove some + names which should not be exported. + +- Issue #3102: All global symbols that the _ctypes extension defines + are now prefixed with 'Py' or '_ctypes'. + +- Issue #5041: ctypes does now allow pickling wide character. + +- Issue #5812: For the two-argument form of the Fraction constructor, + Fraction(m, n), m and n are permitted to be arbitrary Rational + instances. + +- Issue #5812: Fraction('1e6') is valid: more generally, any string + that's valid for float() is now valid for Fraction(), with the + exception of strings representing NaNs and infinities. + +- Issue #5734: BufferedRWPair was poorly tested and had several glaring + bugs. Patch by Brian Quinlan. + +- Issue #1161031: fix readwrite select flag handling: POLLPRI now + results in a handle_expt_event call, not handle_read_event, and POLLERR + and POLLNVAL now call handle_close, not handle_expt_event. Also, + dispatcher now has an 'ignore_log_types' attribute for suppressing + log messages, which is set to 'warning' by default. + +- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for + new arguments introduced in 2.5. + +- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in + makeunicodedata.py and regenerated the Unicode database (This fixes + u'\u1d79'.lower() == '\x00'). + +Extension Modules +----------------- + +- Issue #5881: Remove old undocumented compatibility interfaces in hashlib and + pwd. + +- Issue #5463: In struct module, remove deprecated float coercion + for integer type codes: struct.pack('L', 0.3) should now raise + an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. + The version number has been bumped to 0.3. + +- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built + using Berkeley DB. + +Tests +----- + +- Issue #5354: New test support function import_fresh_module() makes + it easy to import both normal and optimised versions of modules. + test_heapq and test_warnings have been adjusted to use it, tests for + other modules with both C and Python implementations in the stdlib + can be adjusted to use it over time. + +- Issue #5837: Certain sequences of calls to set() and unset() for + support.EnvironmentVarGuard objects restored the environment variables + incorrectly on __exit__. + +C-API +----- + +- Issue #5630: A replacement PyCObject API, PyCapsule, has been added. + + +What's New in Python 3.1 alpha 2? +================================= + +*Release date: 2009-4-4* + +Core and Builtins +----------------- + +- Implement PEP 378, Format Specifier for Thousands Separator, for + integers. + +- Issue #5666: Py_BuildValue's 'c' code should create byte strings. + +- Issue #5499: The 'c' code for argument parsing functions now only accepts a + byte, and the 'C' code only accepts a unicode character. + +- Fix a problem in PyErr_NormalizeException that leads to "undetected errors" + when hitting the recursion limit under certain circumstances. + +- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. + +- Fix a segfault when running test_exceptions with coverage, caused by + insufficient checks in accessors of Exception.__context__. + +- Issue #5604: non-ASCII characters in module name passed to + imp.find_module() were converted to UTF-8 while the path is + converted to the default filesystem encoding, causing nonsense. + +- Issue #5126: str.isprintable() returned False for space characters. + +- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to + the end sys.path, for compatibility with the system install of Python. + +- Issue #4688: Add a heuristic so that tuples and dicts containing only + untrackable objects are not tracked by the garbage collector. This can + reduce the size of collections and therefore the garbage collection overhead + on long-running programs, depending on their particular use of datatypes. + +- Issue #5512: Rewrite PyLong long division algorithm (x_divrem) to + improve its performance. Long divisions and remainder operations + are now between 50% and 150% faster. + +- Issue #4258: Make it possible to use base 2**30 instead of base + 2**15 for the internal representation of integers, for performance + reasons. Base 2**30 is enabled by default on 64-bit machines. Add + --enable-big-digits option to configure, which overrides the + default. Add sys.int_info structseq to provide information about + the internal format. + +- Issue #4474: PyUnicode_FromWideChar now converts characters outside + the BMP to surrogate pairs, on systems with sizeof(wchar_t) == 4 + and sizeof(Py_UNICODE) == 2. + +- Issue #5237: Allow auto-numbered fields in str.format(). For + example: '{} {}'.format(1, 2) == '1 2'. + +- Issue #5392: when a very low recursion limit was set, the interpreter would + abort with a fatal error after the recursion limit was hit twice. + +- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with + short file names. + +Library +------- + +- Issue #2625: added missing items() call to the for loop in + mailbox.MH.get_message(). + +- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat + error substitutions from non-strict codec error callbacks in + incrementalencoder and StreamWriter. + +- Issue #5656: Fix the coverage reporting when running the test suite with + the -T argument. + +- Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. + +- Issue #5624: Fix the _winreg module name still used in several modules. + +- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer. + +- Issue #5619: Multiprocessing children disobey the debug flag and causes + popups on windows buildbots. Patch applied to work around this issue. + +- Issue #5400: Added patch for multiprocessing on netbsd compilation/support + +- Issue #5387: Fixed mmap.move crash by integer overflow. + +- Issue #5261: Patch multiprocessing's semaphore.c to support context + manager use: "with multiprocessing.Lock()" works now. + +- Issue #5236: Change time.strptime() to only take strings. Didn't work with + bytes already but the failure was non-obvious. + +- Issue #5177: Multiprocessing's SocketListener class now uses + socket.SO_REUSEADDR on all connections so that the user no longer needs + to wait 120 seconds for the socket to expire. + +- Issue #5595: Fix UnboundedLocalError in ntpath.ismount(). + +- Issue #1174606: Calling read() without arguments of an unbounded file + (typically /dev/zero under Unix) could crash the interpreter. + +- The max_buffer_size arguments of io.BufferedWriter, io.BufferedRWPair, and + io.BufferedRandom have been deprecated for removal in Python 3.2. + +- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop + forever on incomplete input. That caused tarfile.open() to hang when used + with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or + partial bzip2 compressed data. + +- Issue #2110: Add support for thousands separator and 'n' type + specifier to Decimal.__format__ + +- Fix Decimal.__format__ bug that swapped the meanings of the '<' and + '>' alignment characters. + +- The error detection code in FileIO.close() could fail to reflect the `errno` + value, and report it as -1 instead. + +- Issue #5016: FileIO.seekable() could return False if the file position + was negative when truncated to a C int. Patch by Victor Stinner. + +Extension Modules +----------------- + +- Issue #5391: mmap now deals exclusively with bytes. + +- Issue #5463: In struct module, remove deprecated overflow wrapping + when packing an integer: struct.pack('=L', -1) now raises + struct.error instead of returning b'\xff\xff\xff\xff'. The + _PY_STRUCT_RANGE_CHECKING and _PY_STRUCT_OVERFLOW_MASKING constants + have been removed from the struct module. + + +What's New in Python 3.1 alpha 1 +================================ + +*Release date: 2009-03-07* + +Core and Builtins +----------------- + +- The io module has been reimplemented in C for speed. + +- Give dict views an informative __repr__. + +- Issue #5247: Improve error message when unknown format codes are + used when using str.format() with str, int, and float arguments. + +- Issue #5249: time.strftime returned malformed string when format string + contained non ascii character on windows. + +- Issue #4626: compile(), exec(), and eval() ignore the coding cookie if the + source has already been decoded into str. + +- Issue #5186: Reduce hash collisions for objects with no __hash__ method by + rotating the object pointer by 4 bits to the right. + +- Issue #4575: Fix Py_IS_INFINITY macro to work correctly on x87 FPUs: + it now forces its argument to double before testing for infinity. + +- Issue #5137: Make len() correctly raise a TypeError when a __len__ method + returns a non-number type. + +- Issue #5182: Removed memoryview.__str__. + +- Issue #1717: Removed builtin cmp() function, dropped tp_compare + slot, the C API functions PyObject_Compare and PyUnicode_Compare and + the type definition cmpfunc. The tp_compare slot has been renamed + to tp_reserved, and is reserved for future usage. + +- Issue #1242657: the __len__() and __length_hint__() calls in several tools + were suppressing all exceptions. These include list() and bytearray(). + +- Issue #4707: round(x, n) now returns an integer if x is an integer. + Previously it returned a float. + +- Issue #4753: By enabling a configure option named '--with-computed-gotos' + on compilers that support it (notably: gcc, SunPro, icc), the bytecode + evaluation loop is compiled with a new dispatch mechanism which gives + speedups of up to 20%, depending on the system, on various benchmarks. + +- Issue #4874: Most builtin decoders now reject unicode input. + +- Issue #4842: Don't allow trailing 'L' when constructing an integer + from a string. + +- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors. + +- Issue #4838: When a module is deallocated, free the memory backing the + optional module state data. + +- Issue #4910: Rename nb_long slot to nb_reserved, and change its + type to ``(void *)``. + +- Issue #4935: The overflow checking code in the expandtabs() method common + to str, bytes and bytearray could be optimized away by the compiler, letting + the interpreter segfault instead of raising an error. + +- Issue #3720: Fix a crash when an iterator modifies its class and removes its + __next__ method. + +- Issue #4910: Builtin int() function and PyNumber_Long/PyNumber_Int API + function no longer attempt to call the __long__ slot to convert an object + to an integer. Only the __int__ and __trunc__ slots are examined. + +- Issue #4893: Use NT threading on CE. + +- Issue #4915: Port sysmodule to Windows CE. + +- Issue #4868: utf-8, utf-16 and latin1 decoding are now 2x to 4x faster. The + common cases are optimized thanks to a dedicated fast path and a moderate + amount of loop unrolling. + +- Issue #4074: Change the criteria for doing a full garbage collection (i.e. + collecting the oldest generation) so that allocating lots of objects without + destroying them does not show quadratic performance. Based on a proposal by + Martin von L?wis at + http://mail.python.org/pipermail/python-dev/2008-June/080579.html. + +- Issue #4604: Some objects of the I/O library could still be used after + having been closed (for instance, a read() call could return some + previously buffered data). Patch by Dmitry Vasiliev. + +- Issue #4705: Fix the -u ("unbuffered binary stdout and stderr") command-line + flag to work properly. Furthermore, when specifying -u, the text stdout + and stderr streams have line-by-line buffering enabled (the default being + to buffer arbitrary chunks of data). + +- The internal table, _PyLong_DigitValue, is now an array of unsigned chars + instead of ints (reducing its size from 4 to 8 times thereby reducing + Python's overall memory). + +- Issue #1180193: When importing a module from a .pyc (or .pyo) file with + an existing .py counterpart, override the co_filename attributes of all + code objects if the original filename is obsolete (which can happen if the + file has been renamed, moved, or if it is accessed through different paths). + Patch by Ziga Seilnacht and Jean-Paul Calderone. + +- Issue #4580: Fix slicing of memoryviews when the item size is greater than + one byte. Also fixes the meaning of len() so that it returns the number of + items, rather than the size in bytes. + +- Issue #4075: Use OutputDebugStringW in Py_FatalError. + +- Issue #4747: When the terminal does not use utf-8, executing a script with + non-ascii characters in its name could fail with a "SyntaxError: None" error. + +- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed + to open file with a bytes filename on Windows. + +- Issue #3680: Reference cycles created through a dict, set or deque iterator + did not get collected. + +- Issue #4701: PyObject_Hash now implicitly calls PyType_Ready on types + where the tp_hash and tp_dict slots are both NULL. + +- Issue #4759: None is now allowed as the first argument of + bytearray.translate(). It was always allowed for bytes.translate(). + +- Added test case to ensure attempts to read from a file opened for writing + fail. + +- Issue #3106: Speedup some comparisons (str/str and int/int). + +- Issue #2183: Simplify and optimize bytecode for list, dict and set + comprehensions. Original patch for list comprehensions by Neal Norwitz. + +- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always + print elapsed times, not only when some objects are uncollectable / + unreachable. Original patch by Neil Schemenauer. + +- Issue #3439: Add a bit_length method to int. + +- Issue #2173: When getting device encoding, check that return value of + nl_langinfo is not the empty string. This was causing silent build + failures on OS X. + +- Issue #4597: Fixed several opcodes that weren't always propagating + exceptions. + +- Issue #4589: Fixed exception handling when the __exit__ function of a + context manager returns a value that cannot be converted to a bool. + +- Issue #4445: Replace "sizeof(PyBytesObject)" with + "offsetof(PyBytesObject, ob_sval) + 1" when allocating memory for + bytes instances. On a typical machine this saves 3 bytes of memory + (on average) per allocation of a bytes instance. + +- Issue #4533: File read operation was dreadfully slow due to a slowly + growing read buffer. Fixed by using the same growth rate algorithm as + Python 2.x. + +- Issue #4509: Various issues surrounding resize of bytearray objects to + which there are buffer exports (e.g. memoryview instances). + +- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` + method on file objects with closefd=False. The file descriptor is still + kept open but the file object behaves like a closed file. The ``FileIO`` + object also got a new readonly attribute ``closefd``. + +- Issue #4569: Interpreter crash when mutating a memoryview with an item size + larger than 1. + +- Issue #4748: Lambda generators no longer return a value. + +- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. + +- Issue #5108: Handle %s like %S, %R and %A in PyUnicode_FromFormatV(): Call + PyUnicode_DecodeUTF8() once, remember the result and output it in a second + step. This avoids problems with counting UTF-8 bytes that ignores the effect + of using the replace error handler in PyUnicode_DecodeUTF8(). + +Library +------- + +- Issue #7071: byte-compilation in Distutils is now done with respect to + sys.dont_write_bytecode. + +- Issue #7066: archive_util.make_archive now restores the cwd if an error is + raised. Initial patch by Ezio Melotti. + +- Issue #6516: Added owner/group support when creating tar archives in + Distutils. + +- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. + +- Issue #6163: Fixed HP-UX runtime library dir options in + distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and + Michael Haubenwallner. + +- Issue #6693: New functions in site.py to get user/global site packages paths. + +- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when + opening an empty or very small file. + +- Issue #6545: Removed assert statements in distutils.Extension, so the + behavior is similar when used with -O. + +- unittest has been split up into a package. All old names should still work. + +- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler + uses the same refactored function to get gcc/ld/dllwrap versions numbers. + It's `distutils.util.get_compiler_versions`. Added deprecation warnings + for the obsolete get_versions() functions. + +- Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list + +- Issue #6314: logging: Extra checks on the "level" argument in more places. + +- Issue #2622: Fixed an ImportError when importing email.message from a + standalone application built with py2exe or py2app. + +- Issue #6455: Fixed test_build_ext under win32. + +- Issue #6377: Enabled the compiler option, and deprecate its usage as an + attribute. + +- Issue #6413: Fixed the log level in distutils.dist for announce. + +- Issue #6403: Fixed package path usage in build_ext. + +- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was + unconditionally calling "os.close(sys.stdin.fileno())" resulting in file + descriptor errors + +- Issue #6365: Distutils build_ext inplace mode was copying the compiled + extension in a subdirectory if the extension name had dots. + +- Issue #6164: Added an AIX specific linker argument in Distutils + unixcompiler. Original patch by Sridhar Ratnakumar. + +- Issue #6286: Now Distutils upload command is based on urllib2 instead of + httplib, allowing the usage of http_proxy. + +- Issue #6287: Added the license field in Distutils documentation. + +- Issue #6263: Fixed syntax error in distutils.cygwincompiler. + +- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` + in Makefiles. This prevents compile errors when using syntax like: + `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. + +- Issue #6131: test_modulefinder leaked when run after test_distutils. + Patch by Hirokazu Yamamoto. + +- Issue #6048: Now Distutils uses the tarfile module in archive_util. + +- Issue #6062: In distutils, fixed the package option of build_ext. Feedback + and tests on pywin32 by Tim Golden. + +- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto. + +- Issue #6046: Fixed the library extension when distutils build_ext is used + inplace. Initial patch by Roumen Petrov. + +- Issue #6041: Now distutils `sdist` and `register` commands use `check` as a + subcommand. + +- Issue #6022: a test file was created in the current working directory by + test_get_outputs in Distutils. + +- Issue #5977: distutils build_ext.get_outputs was not taking into account the + inplace option. Initial patch by kxroberto. + +- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken + for old-style extensions. + +- Issue #5976: Fixed Distutils test_check_environ. + +- Issue #5941: Distutils build_clib command was not working anymore because + of an incomplete costumization of the archiver command. Added ARFLAGS in the + Makefile besides AR and make Distutils use it. Original patch by David + Cournapeau. + +- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. + +- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive + anymore. + +- Issue #5810: Fixed Distutils test_build_scripts so it uses + sysconfig.get_config_vars. + +- Issue #4951: Fixed failure in test_httpservers. + +- Issue #5795: Fixed test_distutils failure on Debian ppc. + +- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. + +- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting + a value in SafeConfigParser. + +- Issue #5732: added a new command in Distutils: check. + +- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows + platforms. Initial patch by Paul Moore. + +- Issue #5095: Added bdist_msi to the list of bdist supported formats. + Initial fix by Steven Bethard. + +- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. + Initial fix by Wayne Davison. + +- Issue #5694: removed spurious test output in Distutils (test_clean). + +- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module. + +- Issue #1665206 (partially): Move imports in cgitb to the top of the module + instead of performing them in functions. Helps prevent import deadlocking in + threads. + +- Issue #2522: locale.format now checks its first argument to ensure it has + been passed only one pattern, avoiding mysterious errors where it appeared + that it was failing to do localization. + +- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg + Brandl. + +- Issue #1222: locale.format() bug when the thousands separator is a space + character. + +- Issue #5472: Fixed distutils.test_util tear down. Original patch by + Tim Golden. + +- collections.deque() objects now have a read-only attribute called maxlen. + +- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after + it is has been populated and properly configured in order to prevent + window flashing. + +- Issue #4792: Prevent a segfault in _tkinter by using the + guaranteed to be safe interp argument given to the PythonCmd in place of + the Tcl interpreter taken from a PythonCmd_ClientData. + +- Issue #5193: Guarantee that tkinter.Text.search returns a string. + +- Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler. + Original patch by Akira Kitada. + +- Issue #5334: array.fromfile() failed to insert values when EOFError was raised. + +- Issue #5385: Fixed mmap crash after resize failure on windows. + +- Issue #5179: Fixed subprocess handle leak on failure on windows. + +- PEP 372: Added collections.OrderedDict(). + +- The _asdict() for method for namedtuples now returns an OrderedDict(). + +- configparser now defaults to using an ordered dictionary. + +- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes + import guess_extension`` was used. + +- Issue #1733986: Fixed mmap crash in accessing elements of second map object + with same tagname but larger size than first map. (Windows) + +- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer + overrun. + +- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils + bdist_rpm command. + +- Issue #5378: added --quiet option to Distutils bdist_rpm command. + +- Issue #5052: make Distutils compatible with 2.3 again. + +- Issue #5316: Fixed buildbot failures introduced by multiple inheritance + in Distutils tests. + +- Issue #5287: Add exception handling around findCaller() call to help out + IronPython. + +- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, + The file was resized to wrong size. + +- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. + +- Issue #2279: distutils.sdist.add_defaults now add files + from the package_data and the data_files metadata. + +- Issue #5257: refactored all tests in distutils, so they use + support.TempdirManager, to avoid writing in the tests directory. + +- Issue #4524: distutils build_script command failed with --with-suffix=3. + Initial patch by Amaury Forgeot d'Arc. + +- Issue #2461: added tests for distutils.util + +- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions + which inherited from numbers.py which did not have __slots__ defined. The + numbers hierarchy now has its own __slots__ declarations. + +- Issue #4631: Fix urlopen() result when an HTTP response uses chunked + encoding. + +- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a + function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). + +- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored + under NT and OS2. Patch by Philip Jenvey. + +- Issue #5128: Make compileall properly inspect bytecode to determine if needs + to be recreated. This avoids a timing hole thanks to the old reliance on the + ctime of the files involved. + +- Issue #5122: Synchronize tk load failure check to prevent a potential + deadlock. + +- Issue #1818: collections.namedtuple() now supports a keyword argument + 'rename' which lets invalid fieldnames be automatically converted to + positional names in the form, _1, _2, ... + +- Issue #4890: Handle empty text search pattern in Tkinter.Text.search. + +- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a + public documented method ``ZipImporter.get_filename()``. + +- Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support + the execution of packages by looking for and executing a ``__main__`` + submodule when a package name is supplied. Initial patch by Andi + Vajda. + +- Issue #1731706: Call Tcl_ConditionFinalize for Tcl_Conditions that will + not be used again (this requires Tcl/Tk 8.3.1), also fix a memory leak in + Tkapp_Call when calling from a thread different than the one that created + the Tcl interpreter. Patch by Robert Hancock. + +- Issue #4285: Change sys.version_info to be a named tuple. Patch by + Ross Light. + +- Issue #1520877: Now distutils.sysconfig reads $AR from the + environment/Makefile. Patch by Douglas Greiman. + +- Issue #1276768: The verbose option was not used in the code of + distutils.file_util and distutils.dir_util. + +- Issue #5132: Fixed trouble building extensions under Solaris with + --enabled-shared activated. Initial patch by Dave Peterson. + +- Issue #1581476: Always use the Tcl global namespace when calling into Tcl. + +- The shelve module now defaults to pickle protocol 3. + +- Fix a bug in the trace module where a bytes object from co_lnotab had its + items being passed through ord(). + +- Issue #2047: shutil.move() could believe that its destination path was + inside its source path if it began with the same letters (e.g. "src" vs. + "src.new"). + +- Added the ttk module. See issue #2983: Ttk support for Tkinter. + +- Removed isSequenceType(), isMappingType, and isNumberType() from the + operator module; use the abstract base classes instead. Also removed + the repeat() function; use mul() instead. + +- Issue #5021: doctest.testfile() did not create __name__ and + collections.namedtuple() relied on __name__ being defined. + +- Backport importlib from Python 3.1. Only the import_module() function has + been backported to help facilitate transitions from 2.7 to 3.1. + +- Issue #1885: distutils. When running sdist with --formats=tar,gztar + the tar file was overriden by the gztar one. + +- Issue #4863: distutils.mwerkscompiler has been removed. + +- Added a new itertools functions: combinations_with_replacement() + and compress(). + +- Issue #5032: added a step argument to itertools.count() and + allowed non-integer arguments. + +- Fix and properly document the multiprocessing module's logging + support, expose the internal levels and provide proper usage + examples. + +- Issue #1672332: fix unpickling of subnormal floats, which was + producing a ValueError on some platforms. + +- Issue #3881: Help Tcl to load even when started through the + unreadable local symlink to "Program Files" on Vista. + +- Issue #4710: Extract directories properly in the zipfile module; + allow adding directories to a zipfile. + +- Issue #3807: _multiprocessing build fails when configure is passed + --without-threads argument. When this occurs, _multiprocessing will + be disabled, and not compiled. + +- Issue #5008: When a file is opened in append mode with the new IO library, + do an explicit seek to the end of file (so that e.g. tell() returns the + file size rather than 0). This is consistent with the behaviour of the + traditional 2.x file object. + +- Issue #5013: Fixed a bug in FileHandler which occurred when the delay + parameter was set. + +- Issue #4842: Always append a trailing 'L' when pickling longs using + pickle protocol 0. When reading, the 'L' is optional. + +- Add the importlib package. + +- Issue #4301: Patch the logging module to add processName support, remove + _check_logger_class from multiprocessing. + +- Issue #3325: Remove python2.x try: except: imports for old cPickle from + multiprocessing. + +- Issue #4959: inspect.formatargspec now works for keyword only arguments + without defaults. + +- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks + for Unix machines for negative handles and large int handles. Without this check + it is possible to segfault the interpreter. + +- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue + in sharedctypes.py. + +- Issue #1225107: inspect.isclass() returned True for instances with a custom + __getattr__. + +- Issue #3826 and #4791: The socket module now closes the underlying socket + appropriately when it is being used via socket.makefile() objects + rather than delaying the close by waiting for garbage collection to do it. + +- Issue #1696199: Add collections.Counter() for rapid and convenient + counting. + +- Issue #3860: GzipFile and BZ2File now support the context manager protocol. + +- Issue #4867: Fixed a crash in ctypes when passing a string to a + function without defining argtypes. + +- Issue #4272: Add an optional argument to the GzipFile constructor to override + the timestamp in the gzip stream. The default value remains the current time. + The information can be used by e.g. gunzip when decompressing. Patch by + Jacques Frechet. + +- Restore Python 2.3 compatibility for decimal.py. + +- Issue #3638: Remove functions from _tkinter module level that depend on + TkappObject to work with multiple threads. + +- Issue #4718: Adapt the wsgiref package so that it actually works with + Python 3.x, in accordance with the `official amendments of the spec + `_. + +- Issue #4796: Added Decimal.from_float() and Context.create_decimal_from_float() + to the decimal module. + +- Fractions.from_float() no longer loses precision for integers too big to + cast as floats. + +- Issue #4812: add missing underscore prefix to some internal-use-only + constants in the decimal module. (Dec_0 becomes _Dec_0, etc.) + +- Issue #4790: The nsmallest() and nlargest() functions in the heapq module + did unnecessary work in the common case where no key function was specified. + +- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when + the function is not a generator. + +- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case + no MSVC compiler is found under Windows. Original patch by Philip Jenvey. + +- Issue #4646: distutils was choking on empty options arg in the setup + function. Original patch by Thomas Heller. + +- Issue #3767: Convert Tk object to string in tkColorChooser. + +- Issue #3248: Allow placing ScrolledText in a PanedWindow. + +- Issue #4444: Allow assertRaises() to be used as a context handler, so that + the code under test can be written inline if more practical. + +- Issue #4739: Add pydoc help topics for symbols, so that e.g. help('@') + works as expected in the interactive environment. + +- Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by + Gabriel Genellina. + +- Issue #4574: reading an UTF16-encoded text file crashes if \r on 64-char + boundary. + +- Issue #4223: inspect.getsource() will now correctly display source code + for packages loaded via zipimport (or any other conformant PEP 302 + loader). Original patch by Alexander Belopolsky. + +- Issue #4201: pdb can now access and display source code loaded via + zipimport (or any other conformant PEP 302 loader). Original patch by + Alexander Belopolsky. + +- Issue #4197: doctests in modules loaded via zipimport (or any other PEP + 302 conformant loader) will now work correctly in most cases (they + are still subject to the constraints that exist for all code running + from inside a module loaded via a PEP 302 loader and attempting to + perform IO operations based on __file__). Original patch by + Alexander Belopolsky. + +- Issues #4082 and #4512: Add runpy support to zipimport in a manner that + allows backporting to maintenance branches. Original patch by + Alexander Belopolsky. + +- Issue #4163: textwrap module: allow word splitting on a hyphen preceded by + a non-ASCII letter. + +- Issue #4616: TarFile.utime(): Restore directory times on Windows. + +- Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the + codec cannot be found. This is for compatibility with the builtin behavior. + +- Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to + give correct results in the case where one argument is a quiet NaN + and the other is a finite number that requires rounding. + +- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat + libs. + +- Added the subprocess.check_call_output() convenience function to get output + from a subprocess on success or raise an exception on error. + +- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to + support unusual filenames (such as those containing semi-colons) in + Content-Disposition headers. + +- Issue #4384: Added logging integration with warnings module using + captureWarnings(). This change includes a NullHandler which does nothing; + it will be of use to library developers who want to avoid the "No handlers + could be found for logger XXX" message which can appear if the library user + doesn't configure logging. + +- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an + exception. + +- Issue #4529: fix the parser module's validation of try-except-finally + statements. + +- Issue #4458: getopt.gnu_getopt() now recognizes a single "-" as an argument, + not a malformed option. + +- Added the subprocess.check_output() convenience function to get output + from a subprocess on success or raise an exception on error. + +- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input; + the corresponding tests now pass. + +- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because + it was calling the wrong open() function. + +- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to + support unusual filenames (such as those containing semi-colons) in + Content-Disposition headers. + +- Issue #4861: ctypes.util.find_library(): Robustify. Fix library detection on + biarch systems. Try to rely on ldconfig only, without using objdump and gcc. + +- Issue #5104: The socket module now raises OverflowError when 16-bit port and + protocol numbers are supplied outside the allowed 0-65536 range on bind() + and getservbyport(). + +- Windows locale mapping updated to Vista. + +Tools/Demos +----------- + +- Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1, + and make it 2.6-compatible. + +- Ttk demos added in Demo/tkinter/ttk/ + +- Issue #4677: add two list comprehension tests to pybench. + + +Build +----- + +- Issue #6094: Build correctly with Subversion 1.7. + +- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. + +- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the + linker, rather than always exit successfully. Patch by Floris Bruynooghe. + +- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify + the order that backends for the dbm extension are checked. + +- Link the shared python library with $(MODLIBS). + +- Issue #5134: Silence compiler warnings when compiling sqlite with VC++. + +- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. + +- Issue #4895: Use _strdup on Windows CE. + +- Issue #4472: "configure --enable-shared" now works on OSX + +- Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. + +- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". + +- Issue #4289: Remove Cancel button from AdvancedDlg. + +- Issue #1656675: Register a drop handler for .py* files on Windows. + +- Issue #4120: Exclude manifest from extension modules in VS2008. + +- Issue #4091: Install pythonxy.dll in system32 again. + +- Issue #4018: Disable "for me" installations on Vista. + +- Issue #3758: Add ``patchcheck`` build target to .PHONY. + +- Issue #4204: Fixed module build errors on FreeBSD 4. + + +C-API +----- + +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + +- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError + for negative arguments. Previously, it raised TypeError. + +- Issue #4720: The format for PyArg_ParseTupleAndKeywords can begin with '|'. + +- Issue #3632: from the gdb debugger, the 'pyo' macro can now be called when + the GIL is released, or owned by another thread. + +- Issue #4122: On Windows, fix a compilation error when using the + Py_UNICODE_ISSPACE macro in an extension module. + + +Extension Modules +----------------- + +- Issue #3745: Fix hashlib to always reject unicode and non buffer-api + supporting objects as input no matter how it was compiled (built in + implementations or external openssl library). + +- Issue #4397: Fix occasional test_socket failure on OS X. + +- Issue #4279: Fix build of parsermodule under Cygwin. + +- Issue #4751: hashlib now releases the GIL when hashing large buffers + (with a hardwired threshold of 2048 bytes), allowing better parallelization + on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner. + +- Issue #4051: Prevent conflict of UNICODE macros in cPickle. + +- Issue #4738: Each zlib object now has a separate lock, allowing to compress + or decompress several streams at once on multi-CPU systems. Also, the GIL + is now released when computing the CRC of a large buffer. Patch by ebfe. + +- Issue #4228: Pack negative values the same way as 2.4 in struct's L format. + +- Issue #1040026: Fix os.times result on systems where HZ is incorrect. + +- Issues #3167, #3682: Fix test_math failures for log, log10 on Solaris, + OpenBSD. + +- Issue #4583: array.array would not always prohibit resizing when a buffer + has been exported, resulting in an interpreter crash when accessing the + buffer. + + +- Issue #5228: Make functools.partial objects can now be pickled. + +Tests +----- + +- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running + regression tests in parallel, shortening the total runtime. + +- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to + Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate + the same behaviour as test_ttkguionly (and now also test_tk) which is to + skip the tests if DISPLAY is defined but can't be used. + +- regrtest no longer treats ImportError as equivalent to SkipTest. Imports + that should cause a test to be skipped are now done using import_module + from test support, which does the conversion. + +- Issue #5083: New 'gui' resource for regrtest. + + +Docs +---- + + What's New in Python 3.0 final ============================== diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -5,14 +5,147 @@ What's New in Python 3.3.1? =========================== -*Release date: XX-XXX-2012* +*Not yet released, see sections below for changes released in 3.3.0* + +.. *Release date: XX-XXX-2012* Core and Builtins ----------------- +- Issue #14783: Improve int() docstring and switch docstrings for str(), + range(), and slice() to use multi-line signatures. + +- Issue #15379: Fix passing of non-BMP characters as integers for the charmap + decoder (already working as unicode strings). Patch by Serhiy Storchaka. + +- Issue #15144: Fix possible integer overflow when handling pointers as integer + values, by using `Py_uintptr_t` instead of `size_t`. Patch by Serhiy + Storchaka. + +- Issue #15965: Explicitly cast `AT_FDCWD` as (int). Required on Solaris 10 + (which defines `AT_FDCWD` as ``0xffd19553``), harmless on other platforms. + +- Issue #15839: Convert SystemErrors in `super()` to RuntimeErrors. + +- Issue #15846: Fix SystemError which happened when using `ast.parse()` in an + exception handler on code with syntax errors. + +- Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + + Library ------- +- Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. + +- Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element + element_factory (fixes a regression in SimpleTAL). + +- Issue #16034: Fix performance regressions in the new `bz2.BZ2File` + implementation. Initial patch by Serhiy Storchaka. + +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + +- Issue #15756: `subprocess.poll()` now properly handles `errno.ECHILD` to + return a returncode of 0 when the child has already exited or cannot be waited + on. + +- Issue #15323: Improve failure message of `Mock.assert_called_once_with()`. + +- Issue #16064: ``unittest -m`` claims executable is "python", not "python3". + +- Issue #12376: Pass on parameters in `TextTestResult.__init__()` super call. + +- Issue #15222: Insert blank line after each message in mbox mailboxes. + +- Issue #16013: Fix `csv.Reader` parsing issue with ending quote characters. + Patch by Serhiy Storchaka. + +- Issue #15421: Fix an OverflowError in `Calendar.itermonthdates()` after + `datetime.MAXYEAR`. Patch by C?dric Krier. + +- Issue #15970: `xml.etree.ElementTree` now serializes correctly the empty HTML + elements 'meta' and 'param'. + +- Issue #15842: The `SocketIO.{readable,writable,seekable}` methods now raise + ValueError when the file-like object is closed. Patch by Alessandro Moura. + +- Issue #15876: Fix a refleak in the `curses` module: window.encoding. + +- Issue #15881: Fix `atexit` hook in `multiprocessing`. Original patch by Chris + McDonough. + +- Issue #15841: The readable(), writable() and seekable() methods of + `io.BytesIO` and `io.StringIO` objects now raise ValueError when the object + has been closed. Patch by Alessandro Moura. + +- Issue #16126: PyErr_Format format mismatch in _testcapimodule.c. + Patch by Serhiy Storchaka. + +- Issue #15447: Use `subprocess.DEVNULL` in webbrowser, instead of opening + `os.devnull` explicitly and leaving it open. + +- Issue #15509: `webbrowser.UnixBrowser` no longer passes empty arguments to + Popen when ``%action`` substitutions produce empty strings. + +- Issue #12776, issue #11839: Call `argparse` type function (specified by + add_argument) only once. Before, the type function was called twice in the + case where the default was specified and the argument was given as well. This + was especially problematic for the FileType type, as a default file would + always be opened, even if a file argument was specified on the command line. + +- Issue #15906: Fix a regression in `argparse` caused by the preceding change, + when ``action='append'``, ``type='str'`` and ``default=[]``. + +Tests +----- + +- Issue #16115: Add some tests for the executable argument to + subprocess.Popen(). Initial patch by Kushal Das. + +- Issue #15304: Fix warning message when `os.chdir()` fails inside + `test.support.temp_cwd()`. Patch by Chris Jerdonek. + +- Issue #15802: Fix test logic in `TestMaildir.test_create_tmp()`. Patch by + Serhiy Storchaka. + +- Issue #15557: Add a test suite for the `webbrowser` module, thanks to Anton + Barkovsky. + +Build +----- + +- Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError + after 2801bf875a24 (see #15801). + +- Issue #15819: Make sure we can build Python out-of-tree from a readonly source + directory. (Somewhat related to issue #9860.) + +Documentation +------------- + +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + +- Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd + argument. + +- Issue #15979: Improve timeit documentation. + +- Issue #16036: Improve documentation of built-in `int()`'s signature and + arguments. + +- Issue #15935: Clarification of `argparse` docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +Tools/Demos +----------- + What's New in Python 3.3.0? =========================== @@ -24,13 +157,13 @@ - Issue #16046: Fix loading sourceless legacy .pyo files. -- Issue #16060: Fix refcounting bug when __trunc__ returns an object - whose __int__ gives a non-integer. Patch by Serhiy Storchaka. +- Issue #16060: Fix refcounting bug when `__trunc__()` returns an object whose + `__int__()` gives a non-integer. Patch by Serhiy Storchaka. Extension Modules ----------------- -- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD() +- Issue #16012: Fix a regression in pyexpat. The parser's `UseForeignDTD()` method doesn't require an argument again. @@ -42,26 +175,26 @@ Core and Builtins ----------------- -- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap(). +- Issue #15900: Fix reference leak in `PyUnicode_TranslateCharmap()`. - Issue #15926: Fix crash after multiple reinitializations of the interpreter. - Issue #15895: Fix FILE pointer leak in one error branch of - PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit - is false an and set_main_loader() fails. + `PyRun_SimpleFileExFlags()` when filename points to a pyc/pyo file, closeit is + false an and set_main_loader() fails. - Fixes for a few crash and memory leak regressions found by Coverity. Library ------- -- Issue #15882: Change _decimal to accept any coefficient tuple when - constructing infinities. This is done for backwards compatibility - with decimal.py: Infinity coefficients are undefined in _decimal - (in accordance with the specification). - -- Issue #15925: Fix a regression in email.util where the parsedate() and - parsedate_tz() functions did not return None anymore when the argument could +- Issue #15882: Change `_decimal` to accept any coefficient tuple when + constructing infinities. This is done for backwards compatibility with + decimal.py: Infinity coefficients are undefined in _decimal (in accordance + with the specification). + +- Issue #15925: Fix a regression in `email.util` where the `parsedate()` and + `parsedate_tz()` functions did not return None anymore when the argument could not be parsed. Extension Modules @@ -73,7 +206,7 @@ - Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann. -- Issue #15969: faulthandler module: rename dump_tracebacks_later() to +- Issue #15969: `faulthandler` module: rename dump_tracebacks_later() to dump_traceback_later() and cancel_dump_tracebacks_later() to cancel_dump_traceback_later(). @@ -89,35 +222,34 @@ ----------------- - Issue #13992: The trashcan mechanism is now thread-safe. This eliminates - sporadic crashes in multi-thread programs when several long deallocator - chains ran concurrently and involved subclasses of built-in container - types. - -- Issue #15784: Modify OSError.__str__() to better distinguish between - errno error numbers and Windows error numbers. + sporadic crashes in multi-thread programs when several long deallocator chains + ran concurrently and involved subclasses of built-in container types. + +- Issue #15784: Modify `OSError`.__str__() to better distinguish between errno + error numbers and Windows error numbers. - Issue #15781: Fix two small race conditions in import's module locking. Library ------- -- Issue #15847: Fix a regression in argparse, which did not accept tuples - as argument lists anymore. - -- Issue #15828: Restore support for C extensions in imp.load_module(). - -- Issue #15340: Fix importing the random module when /dev/urandom cannot - be opened. This was a regression caused by the hash randomization patch. - -- Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize() +- Issue #15847: Fix a regression in argparse, which did not accept tuples as + argument lists anymore. + +- Issue #15828: Restore support for C extensions in `imp.load_module()`. + +- Issue #15340: Fix importing the random module when ``/dev/urandom`` cannot be + opened. This was a regression caused by the hash randomization patch. + +- Issue #10650: Deprecate the watchexp parameter of the `Decimal.quantize()` method. -- Issue #15785: Modify window.get_wch() API of the curses module: return - a character for most keys, and an integer for special keys, instead of - always returning an integer. So it is now possible to distinguish special - keys like keypad keys. - -- Issue #14223: Fix window.addch() of the curses module for special characters +- Issue #15785: Modify `window.get_wch()` API of the curses module: return a + character for most keys, and an integer for special keys, instead of always + returning an integer. So it is now possible to distinguish special keys like + keypad keys. + +- Issue #14223: Fix `window.addch()` of the curses module for special characters like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now calling the C function waddch()/mvwaddch() (as it was done in Python 3.2), instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still @@ -133,10 +265,10 @@ Documentation ------------- -- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted - the hashing of multi-dimensional memorviews and memoryviews with multi-byte - item formats. The intended restrictions have now been documented - they - will be correctly enforced in 3.3.1 +- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted the + hashing of multi-dimensional memorviews and memoryviews with multi-byte item + formats. The intended restrictions have now been documented - they will be + correctly enforced in 3.3.1. What's New in Python 3.3.0 Release Candidate 1? @@ -150,79 +282,78 @@ - Issue #15573: memoryview comparisons are now performed by value with full support for any valid struct module format definition. -- Issue #15316: When an item in the fromlist for __import__ doesn't exist, +- Issue #15316: When an item in the fromlist for `__import__()` doesn't exist, don't raise an error, but if an exception is raised as part of an import do let that propagate. -- Issue #15778: ensure that str(ImportError(msg)) returns a str - even when msg isn't a str. - -- Issue #2051: Source file permission bits are once again correctly - copied to the cached bytecode file. (The migration to importlib - reintroduced this problem because these was no regression test. A test - has been added as part of this patch) - -- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. - -- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. - Patch by Robin Schreiber. - -- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle +- Issue #15778: Ensure that ``str(ImportError(msg))`` returns a str even when + msg isn't a str. + +- Issue #2051: Source file permission bits are once again correctly copied to + the cached bytecode file. (The migration to importlib reintroduced this + problem because these was no regression test. A test has been added as part of + this patch) + +- Issue #15761: Fix crash when ``PYTHONEXECUTABLE`` is set on Mac OS X. + +- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. Patch by + Robin Schreiber. + +- Issue #15604: Update uses of `PyObject_IsTrue()` to check for and handle errors correctly. Patch by Serhiy Storchaka. -- Issue #14846: importlib.FileFinder now handles the case where the - directory being searched is removed after a previous import attempt +- Issue #14846: `importlib.FileFinder` now handles the case where the directory + being searched is removed after a previous import attempt. Library ------- -- Issue #13370: Ensure that ctypes works on Mac OS X when Python is - compiled using the clang compiler - -- Issue #13072: The array module's 'u' format code is now deprecated and - will be removed in Python 4.0. +- Issue #13370: Ensure that ctypes works on Mac OS X when Python is compiled + using the clang compiler. + +- Issue #13072: The array module's 'u' format code is now deprecated and will be + removed in Python 4.0. - Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. - Issue #15776: Allow pyvenv to work in existing directory with --clean. -- Issue #15249: BytesGenerator now correctly mangles From lines (when +- Issue #15249: email's BytesGenerator now correctly mangles From lines (when requested) even if the body contains undecodable bytes. - Issue #15777: Fix a refleak in _posixsubprocess. -- Issue ##665194: Update email.utils.localtime to use datetime.astimezone and +- Issue ##665194: Update `email.utils.localtime` to use datetime.astimezone and correctly handle historic changes in UTC offsets. - Issue #15199: Fix JavaScript's default MIME type to application/javascript. Patch by Bohuslav Kabrda. -- Issue #12643: code.InteractiveConsole now respects sys.excepthook when - displaying exceptions (Patch by Aaron Iles) - -- Issue #13579: string.Formatter now understands the 'a' conversion specifier. - -- Issue #15595: Fix subprocess.Popen(universal_newlines=True) - for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. +- Issue #12643: `code.InteractiveConsole` now respects `sys.excepthook` when + displaying exceptions. Patch by Aaron Iles. + +- Issue #13579: `string.Formatter` now understands the 'a' conversion specifier. + +- Issue #15595: Fix ``subprocess.Popen(universal_newlines=True)`` for certain + locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. - Issue #15477: In cmath and math modules, add workaround for platforms whose system-supplied log1p function doesn't respect signs of zeros. -- Issue #15715: importlib.__import__() will silence an ImportError when the use - of fromlist leads to a failed import. - -- Issue #14669: Fix pickling of connections and sockets on MacOSX - by sending/receiving an acknowledgment after file descriptor transfer. - TestPicklingConnection has been reenabled for MacOSX. +- Issue #15715: `importlib.__import__()` will silence an ImportError when the + use of fromlist leads to a failed import. + +- Issue #14669: Fix pickling of connections and sockets on Mac OS X by + sending/receiving an acknowledgment after file descriptor transfer. + TestPicklingConnection has been reenabled for Mac OS X. - Issue #11062: Fix adding a message from file to Babyl mailbox. -- Issue #15646: Prevent equivalent of a fork bomb when using - multiprocessing on Windows without the "if __name__ == '__main__'" - idiom. - -- Issue #15678: Fix IDLE menus when started from OS X command line - (3.3.0b2 regression). +- Issue #15646: Prevent equivalent of a fork bomb when using `multiprocessing` + on Windows without the ``if __name__ == '__main__'`` idiom. + +- Issue #15678: Fix IDLE menus when started from OS X command line (3.3.0b2 + regression). C API ----- @@ -236,44 +367,42 @@ Documentation ------------- -- Issue #14674: Add a discussion of the json module's standard compliance. +- Issue #14674: Add a discussion of the `json` module's standard compliance. Patch by Chris Rebert. - Create a 'Concurrent Execution' section in the docs, and split up the 'Optional Operating System Services' section to use a more user-centric - classification scheme (splitting them across the new CE section, IPC and - text processing). Operating system limitatons can be reflected with - the Sphinx :platform: tag, it doesn't make sense as part of the Table of - Contents. - -- Issue #4966: Bring the sequence docs up to date for the Py3k transition - and the many language enhancements since they were original written + classification scheme (splitting them across the new CE section, IPC and text + processing). Operating system limitatons can be reflected with the Sphinx + ``:platform:`` tag, it doesn't make sense as part of the Table of Contents. + +- Issue #4966: Bring the sequence docs up to date for the Py3k transition and + the many language enhancements since they were original written. - The "path importer" misnomer has been replaced with Eric Snow's - more-awkward-but-at-least-not-wrong suggestion of "path based finder" in - the import system reference docs - -- Issue #15640: Document importlib.abc.Finder as deprecated. - -- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + more-awkward-but-at-least-not-wrong suggestion of "path based finder" in the + import system reference docs. + +- Issue #15640: Document `importlib.abc.Finder` as deprecated. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by Daniel Ellis. Tests ----- - Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the - UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected - tests in test_posix.py to account for this. - -- Issue #15285: Refactor the approach for testing connect timeouts using - two external hosts that have been configured specifically for this type - of test. - -- Issue #15743: Remove the deprecated method usage in urllib tests. Patch by + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected tests in + test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using two + external hosts that have been configured specifically for this type of test. + +- Issue #15743: Remove the deprecated method usage in `urllib` tests. Patch by Jeff Knupp. -- Issue #15615: Add some tests for the json module's handling of invalid - input data. Patch by Kushal Das. +- Issue #15615: Add some tests for the `json` module's handling of invalid input + data. Patch by Kushal Das. Build ----- @@ -282,11 +411,11 @@ - Pick up 32-bit launcher from PGO directory on 64-bit PGO build. -- Drop PC\python_nt.h as it's not used. Add input dependency on custom +- Drop ``PC\python_nt.h`` as it's not used. Add input dependency on custom build step. -- Issue #15511: Drop explicit dependency on pythonxy.lib from _decimal - amd64 configuration. +- Issue #15511: Drop explicit dependency on pythonxy.lib from _decimal amd64 + configuration. - Add missing PGI/PGO configurations for pywlauncher. @@ -301,15 +430,15 @@ Core and Builtins ----------------- -- Issue #15568: Fix the return value of "yield from" when StopIteration is +- Issue #15568: Fix the return value of ``yield from`` when StopIteration is raised by a custom iterator. -- Issue #13119: sys.stdout and sys.stderr are now using "\r\n" newline on +- Issue #13119: `sys.stdout` and `sys.stderr` are now using "\r\n" newline on Windows, as Python 2. - Issue #15534: Fix the fast-search function for non-ASCII Unicode strings. -- Issue #15508: Fix the docstring for __import__ to have the proper default +- Issue #15508: Fix the docstring for `__import__()` to have the proper default value of 0 for 'level' and to not mention negative levels since they are not supported. @@ -322,17 +451,17 @@ byte code files) equal between 32-bit and 64-bit systems. - Issue #1692335: Move initial exception args assignment to - "BaseException.__new__" to help pickling of naive subclasses. - -- Issue #12834: Fix PyBuffer_ToContiguous() for non-contiguous arrays. - -- Issue #15456: Fix code __sizeof__ after #12399 change. Patch by Serhiy + `BaseException.__new__()` to help pickling of naive subclasses. + +- Issue #12834: Fix `PyBuffer_ToContiguous()` for non-contiguous arrays. + +- Issue #15456: Fix code `__sizeof__()` after #12399 change. Patch by Serhiy Storchaka. - Issue #15404: Refleak in PyMethodObject repr. -- Issue #15394: An issue in PyModule_Create that caused references to be leaked - on some error paths has been fixed. Patch by Julia Lawall. +- Issue #15394: An issue in `PyModule_Create()` that caused references to be + leaked on some error paths has been fixed. Patch by Julia Lawall. - Issue #15368: An issue that caused bytecode generation to be non-deterministic has been fixed. @@ -340,7 +469,7 @@ - Issue #15202: Consistently use the name "follow_symlinks" for new parameters in os and shutil functions. -- Issue #15314: __main__.__loader__ is now set correctly during interpreter +- Issue #15314: ``__main__.__loader__`` is now set correctly during interpreter startup. - Issue #15111: When a module imported using 'from import' has an ImportError @@ -358,10 +487,13 @@ - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, return the proper failure return value (1). Patch contributed by Jeff Knupp. -- Issue #15229: An OSError subclass whose __init__ doesn't call back +- Issue #15229: An `OSError` subclass whose __init__ doesn't call back OSError.__init__ could produce incomplete instances, leading to crashes when calling str() on them. @@ -371,41 +503,41 @@ Library ------- -- Issue #15424: Add a __sizeof__ implementation for array objects. Patch by +- Issue #15424: Add a `__sizeof__()` implementation for array objects. Patch by Ludwig H?hne. - Issue #15576: Allow extension modules to act as a package's __init__ module. -- Issue #15502: Have importlib.invalidate_caches() work on sys.meta_path instead - of sys.path_importer_cache. +- Issue #15502: Have `importlib.invalidate_caches()` work on `sys.meta_path` + instead of `sys.path_importer_cache`. - Issue #15163: Pydoc shouldn't list __loader__ as module data. - Issue #15471: Do not use mutable objects as defaults for - importlib.__import__(). + `importlib.__import__()`. - Issue #15559: To avoid a problematic failure mode when passed to the bytes - constructor, objects in the ipaddress module no longer implement __index__ - (they still implement __int__ as appropriate) + constructor, objects in the ipaddress module no longer implement `__index__()` + (they still implement `__int__()` as appropriate). - Issue #15546: Fix handling of pathological input data in the peek() and read1() methods of the BZ2File, GzipFile and LZMAFile classes. - Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog - ended with '\'. Patch by Roger Serwy. - -- Issue #12655: Instead of requiring a custom type, os.sched_getaffinity and - os.sched_setaffinity now use regular sets of integers to represent the CPUs a - process is restricted to. - -- Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() emulation - code. Patch by Philipp Hagemeister. + ended with ``\``. Patch by Roger Serwy. + +- Issue #12655: Instead of requiring a custom type, `os.sched_getaffinity()` and + `os.sched_setaffinity()` now use regular sets of integers to represent the + CPUs a process is restricted to. + +- Issue #15538: Fix compilation of the `socket.getnameinfo()` / + `socket.getaddrinfo()` emulation code. Patch by Philipp Hagemeister. - Issue #15519: Properly expose WindowsRegistryFinder in importlib (and use the - correct term for it). Original patch by Eric Snow. + correct term for it). Original patch by Eric Snow. - Issue #15502: Bring the importlib ABCs into line with the current state of the - import protocols given PEP 420. Original patch by Eric Snow. + import protocols given PEP 420. Original patch by Eric Snow. - Issue #15499: Launching a webbrowser in Unix used to sleep for a few seconds. Original patch by Anton Barkovsky. @@ -413,37 +545,38 @@ - Issue #15463: The faulthandler module truncates strings to 500 characters, instead of 100, to be able to display long file paths. -- Issue #6056: Make multiprocessing use setblocking(True) on the sockets it +- Issue #6056: Make `multiprocessing` use setblocking(True) on the sockets it uses. Original patch by J Derek Wilson. - Issue #15364: Fix sysconfig.get_config_var('srcdir') to be an absolute path. - Issue #15041: Update "see also" list in tkinter documentation. -- Issue #15413: os.times() had disappeared under Windows. - -- Issue #15402: An issue in the struct module that caused sys.getsizeof to +- Issue #15413: `os.times()` had disappeared under Windows. + +- Issue #15402: An issue in the struct module that caused `sys.getsizeof()` to return incorrect results for struct.Struct instances has been fixed. Initial patch by Serhiy Storchaka. -- Issue #15232: When mangle_from is True, email.Generator now correctly mangles - lines that start with 'From ' that occur in a MIME preamble or epilogue. +- Issue #15232: When mangle_from is True, `email.Generator` now correctly + mangles lines that start with 'From ' that occur in a MIME preamble or + epilogue. - Issue #15094: Incorrectly placed #endif in _tkinter.c. Patch by Serhiy Storchaka. -- Issue #13922: argparse no longer incorrectly strips '--'s that appear after +- Issue #13922: `argparse` no longer incorrectly strips '--'s that appear after the first one. -- Issue #12353: argparse now correctly handles null argument values. +- Issue #12353: `argparse` now correctly handles null argument values. - Issue #10017, issue #14998: Fix TypeError using pprint on dictionaries with user-defined types as keys or other unorderable keys. -- Issue #15397: inspect.getmodulename() is now based directly on importlib via a - new importlib.machinery.all_suffixes() API. - -- Issue #14635: telnetlib will use poll() rather than select() when possible to +- Issue #15397: `inspect.getmodulename()` is now based directly on importlib via + a new `importlib.machinery.all_suffixes()` API. + +- Issue #14635: `telnetlib` will use poll() rather than select() when possible to avoid failing due to the select() file descriptor limit. - Issue #15180: Clarify posixpath.join() error message when mixing str & bytes. @@ -460,7 +593,7 @@ - Issue #15233: Python now guarantees that callables registered with the atexit module will be called in a deterministic order. -- Issue #15238: shutil.copystat now copies Linux "extended attributes". +- Issue #15238: `shutil.copystat()` now copies Linux "extended attributes". - Issue #15230: runpy.run_path now correctly sets __package__ as described in the documentation. @@ -470,42 +603,42 @@ - Issue #15294: Fix a regression in pkgutil.extend_path()'s handling of nested namespace packages. -- Issue #15056: imp.cache_from_source() and source_from_cache() raise - NotImplementedError when sys.implementation.cache_tag is set to None. - -- Issue #15256: Grammatical mistake in exception raised by imp.find_module(). - -- Issue #5931: wsgiref environ variable SERVER_SOFTWARE will specify an +- Issue #15056: `imp.cache_from_source()` and `imp.source_from_cache()` raise + NotImplementedError when `sys.implementation.cache_tag` is set to None. + +- Issue #15256: Grammatical mistake in exception raised by `imp.find_module()`. + +- Issue #5931: `wsgiref` environ variable SERVER_SOFTWARE will specify an implementation specific term like CPython, Jython instead of generic "Python". - Issue #13248: Remove obsolete argument "max_buffer_size" of BufferedWriter and BufferedRWPair, from the io module. -- Issue #13248: Remove obsolete argument "version" of argparse.ArgumentParser. +- Issue #13248: Remove obsolete argument "version" of `argparse.ArgumentParser`. - Issue #14814: Implement more consistent ordering and sorting behaviour for ipaddress objects. -- Issue #14814: ipaddress network objects correctly return NotImplemented when +- Issue #14814: `ipaddress` network objects correctly return NotImplemented when compared to arbitrary objects instead of raising TypeError. - Issue #14990: Correctly fail with SyntaxError on invalid encoding declaration. -- Issue #14814: ipaddress now provides more informative error messages when +- Issue #14814: `ipaddress` now provides more informative error messages when constructing instances directly (changes permitted during beta due to provisional API status). -- Issue #15247: FileIO now raises an error when given a file descriptor pointing - to a directory. +- Issue #15247: `io.FileIO` now raises an error when given a file descriptor + pointing to a directory. - Issue #15261: Stop os.stat(fd) crashing on Windows when fd not open. -- Issue #15166: Implement imp.get_tag() using sys.implementation.cache_tag. - -- Issue #15210: Catch KeyError when importlib.__init__ can't find +- Issue #15166: Implement `imp.get_tag()` using `sys.implementation.cache_tag`. + +- Issue #15210: Catch KeyError when `importlib.__init__()` can't find _frozen_importlib in sys.modules, not ImportError. -- Issue #15030: importlib.abc.PyPycLoader now supports the new source size +- Issue #15030: `importlib.abc.PyPycLoader` now supports the new source size header field in .pyc files. - Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on @@ -518,7 +651,7 @@ renamed over the old file when flush() is called on an mbox, MMDF or Babyl mailbox. -- Issue 10924: Fixed crypt.mksalt() to use a RNG that is suitable for +- Issue 10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for cryptographic purpose. - Issue #15184: Ensure consistent results of OS X configuration tailoring for @@ -529,10 +662,10 @@ C API ----- -- Issue #15610: PyImport_ImportModuleEx() now uses a 'level' of 0 instead of -1. - -- Issues #15169, #14599: Strip out the C implementation of - imp.source_from_cache() used by PyImport_ExecCodeModuleWithPathnames() and +- Issue #15610: `PyImport_ImportModuleEx()` now uses a 'level' of 0 instead of -1. + +- Issue #15169, issue #14599: Strip out the C implementation of + `imp.source_from_cache()` used by PyImport_ExecCodeModuleWithPathnames() and used the Python code instead. Leads to PyImport_ExecCodeModuleObject() to not try to infer the source path from the bytecode path as PyImport_ExecCodeModuleWithPathnames() does. @@ -540,8 +673,8 @@ Extension Modules ----------------- -- Issue #6493: An issue in ctypes on Windows that caused structure bitfields - of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields of + type `ctypes.c_uint32` and width 32 to incorrectly be set has been fixed. - Issue #15194: Update libffi to the 3.0.11 release. @@ -556,15 +689,16 @@ - Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been enhanced to show information on more C frames relevant to CPython within the "py-bt" and "py-bt-full" commands: - * C frames that are waiting on the GIL - * C frames that are garbage-collecting - * C frames that are due to the invocation of a PyCFunction + + * C frames that are waiting on the GIL + * C frames that are garbage-collecting + * C frames that are due to the invocation of a PyCFunction Documentation ------------- -- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch - by Serhiy Storchaka. +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch by + Serhiy Storchaka. - Issue #15295: Reorganize and rewrite the documentation on the import system. @@ -579,25 +713,25 @@ "changed" since they will no longer work with modules directly imported by import itself. -- Issue #13557: Clarify effect of giving two different namespaces to exec or - execfile(). - -- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch +- Issue #13557: Clarify effect of giving two different namespaces to `exec()` or + `execfile()`. + +- Issue #15250: Document that `filecmp.dircmp()` compares files shallowly. Patch contributed by Chris Jerdonek. Tests ----- -- Issue #15467: Move helpers for __sizeof__ tests into test_support. Patch by - Serhiy Storchaka. +- Issue #15467: Move helpers for `__sizeof__()` tests into test_support. Patch + by Serhiy Storchaka. - Issue #15320: Make iterating the list of tests thread-safe when running tests in multiprocess mode. Patch by Chris Jerdonek. -- Issue #15168: Move importlib.test to test.test_importlib. +- Issue #15168: Move `importlib.test` to `test.test_importlib`. - Issue #15091: Reactivate a test on UNIX which was failing thanks to a - forgotten importlib.invalidate_caches() call. + forgotten `importlib.invalidate_caches()` call. - Issue #15230: Adopted a more systematic approach in the runpy tests. @@ -1943,6 +2077,10 @@ - PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() + and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to + the current locale encoding. + - Add internal API for static strings (_Py_identifier et al.). - Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described @@ -2357,11 +2495,6 @@ make sure two listeners can't bind to the same socket/pipe (or any existing socket/pipe). -- Issue #9021: Add an introduction to the copy module documentation. - -- Issue #6005: Examples in the socket library documentation use sendall, where - relevant, instead send method. - - Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. @@ -2470,8 +2603,6 @@ - Add a flags parameter to select.epoll. -- Issue #12798: Updated the mimetypes documentation. - - Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. @@ -2516,10 +2647,6 @@ - Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8. -- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() - and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to - the current locale encoding. - - Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem encoding and the surrogateescape error handler, rather than UTF-8. Patch by David Watson. @@ -2704,7 +2831,7 @@ - Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. -- Issue #13235: Added PendingDeprecationWarning to warn() method and function. +- Issue #13235: Added DeprecationWarning to logging.warn() method and function. - Issue #9168: now smtpd is able to bind privileged port. @@ -2725,12 +2852,12 @@ in order to display the prompt correctly. - Issue #12454: The mailbox module is now using ASCII, instead of the locale - encoding, to read and write MH mailboxes (.mh_sequences files). + encoding, to read and write .mh_sequences files. - Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are now available on Windows. -- issue #1673007: urllib2 to support HEAD request via new method argument. +- Issue #1673007: urllib.request now supports HEAD request via new method argument. Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. - Issue #12386: packaging does not fail anymore when writing the RESOURCES @@ -2771,8 +2898,6 @@ metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig Citro. -- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes. - - Issue #13034: When decoding some SSL certificates, the subjectAltName extension could be unreported. @@ -2882,8 +3007,9 @@ - Issue #12540: Prevent zombie IDLE processes on Windows due to changes in os.kill(). -- Add support for unary plus and unary minus to collections.Counter(). - Issue #13121: Also add support for inplace math operators. +- Issue #13121: add support for inplace math operators to collections.Counter. + +- Add support for unary plus and unary minus to collections.Counter. - Issue #12683: urlparse updated to include svn as schemes that uses relative paths. (svn from 1.5 onwards support relative path). @@ -2908,11 +3034,11 @@ - Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') in Python code) now finds the doc of the method. -- Issue #10968: Remove indirection in threading. The public names (Thread, +- Issue #10968: Remove indirection in threading. The public names (Event, Condition, etc.) used to be factory functions returning instances of hidden - classes (_Thread, _Condition, etc.), because (if Guido recalls correctly) this - code pre-dates the ability to subclass extension types. It is now possible to - inherit from Thread and other classes, without having to import the private + classes (_Event, _Condition, etc.), because (if Guido recalls correctly) this + code pre-dates the ability to subclass extension types. It is now possible + to inherit from these classes, without having to import the private underscored names like multiprocessing did. - Issue #9723: Add shlex.quote functions, to escape filenames and command @@ -3036,7 +3162,7 @@ - Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by the garbage collector while the Heap lock is held. -- Issue #12462: time.sleep() now calls immediatly the (Python) signal handler +- Issue #12462: time.sleep() now immediately calls the (Python) signal handler if it is interrupted by a signal, instead of having to wait until the next instruction. @@ -3189,7 +3315,7 @@ if the file is closed. - Issue #11109: New service_action method for BaseServer, used by ForkingMixin - class for cleanup. Initial Patch by Justin Wark. + class for cleanup. Initial Patch by Justin Warkentin. - Issue #12045: Avoid duplicate execution of command in ctypes.util._get_soname(). Patch by Sijin Joseph. @@ -3274,9 +3400,9 @@ - Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, instead of a RuntimeError: OSError has an errno attribute. -- Issue #3709: a flush_headers method to BaseHTTPRequestHandler which manages - the sending of headers to output stream and flushing the internal headers - buffer. Patch contribution by Andrew Schaaf +- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which + manages the sending of headers to output stream and flushing the internal + headers buffer. Patch contribution by Andrew Schaaf - Issue #11743: Rewrite multiprocessing connection classes in pure Python. @@ -3578,7 +3704,7 @@ not installed. Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile. Patch by Natalia B. Bidart. -- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used +- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used in a `with` statement. Contributed by Giampaolo Rodola. - Issue #11554: Fixed support for Japanese codecs; previously the body output @@ -3590,7 +3716,7 @@ - Issue #11407: `TestCase.run` returns the result object used or created. Contributed by Janathan Hartley. -- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified +- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified IP addresses in the proxy exception list. - Issue #11491: dbm.error is no longer raised when dbm.open is called with @@ -3747,7 +3873,7 @@ functions (BSD and OS X). Also add new stat file flags for OS X (UF_HIDDEN and UF_COMPRESSED). -- Issue #10645: Installing Python does no longer create a +- Issue #10645: Installing Python no longer creates a Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory. - Do not accidentally include the directory containing sqlite.h twice when @@ -4088,6 +4214,9 @@ Documentation ------------- +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + - Issues #13491 and #13995: Fix many errors in sqlite3 documentation. Initial patch for #13491 by Johannes Vogel. @@ -4095,6 +4224,13 @@ - Issue #13883: PYTHONCASEOK also works on OS X. +- Issue #9021: Add an introduction to the copy module documentation. + +- Issue #6005: Examples in the socket library documentation use sendall, where + relevant, instead send method. + +- Issue #12798: Updated the mimetypes documentation. + - Issue #12949: Document the kwonlyargcount argument for the PyCode_New C API function. @@ -4109,5401 +4245,4 @@ - Issue #11818: Fix tempfile examples for Python 3. -What's New in Python 3.2? -========================= - -*Release date: 20-Feb-2011* - -Core and Builtins ------------------ - -- Issue #11249: Fix potential crashes when using the limited API. - -Build ------ - -- Issue #11222: Fix non-framework shared library build on Mac OS X. - -- Issue #11184: Fix large-file support on AIX. - -- Issue #941346: Fix broken shared library build on AIX. - -Documentation -------------- - -- Issue #10709: Add updated AIX notes in Misc/README.AIX. - - -What's New in Python 3.2 Release Candidate 3? -============================================= - -*Release date: 13-Feb-2011* - -Core and Builtins ------------------ - -- Issue #11134: Add missing fields to typeslots.h. - -- Issue #11135: Remove redundant doc field from PyType_Spec. - -- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited - ABI. - -- Issue #11118: Fix bogus export of None in python3.dll. - -Library -------- - -- Issue #11116: any error during addition of a message to a mailbox now causes a - rollback, instead of leaving the mailbox partially modified. - -- Issue #11132: Fix passing of "optimize" parameter when recursing in - compileall.compile_dir(). - -- Issue #11110: Fix a potential decref of a NULL in sqlite3. - -- Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch - by Stan Mihai. - -Build ------ - -- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X - installers now includes a link to the installed documentation and no longer - includes an Extras directory. The Tools directory is now installed in the - framework under share/doc. - -- Issue #11121: Fix building with --enable-shared. - -Tests ------ - -- Issue #10971: test_zipimport_support is once again compatible with the refleak - hunter feature of test.regrtest. - - -What's New in Python 3.2 Release Candidate 2? -============================================= - -*Release date: 30-Jan-2011* - -Core and Builtins ------------------ - -- Issue #10451: memoryview objects could allow to mutate a readable buffer. - Initial patch by Ross Lagerwall. - -Library -------- - -- Issue #9124: mailbox now accepts binary input and reads and writes mailbox - files in binary mode, using the email package's binary support to parse - arbitrary email messages. StringIO and text file input is deprecated, - and string input fails early if non-ASCII characters are used, where - previously it would fail when the email was processed in a later step. - -- Issue #10845: Mitigate the incompatibility between the multiprocessing - module on Windows and the use of package, zipfile or directory execution - by special casing main modules that actually *are* called __main__.py. - -- Issue #11045: Protect logging call against None argument. - -- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save - commands. - -- Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, - preventing a confusing hung appearance on OS X with the windows - obscured. - -- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the - menu accelerators for Open Module, Go to Line, and New Indent Width. - The accelerators still work but no longer appear in the menu items. - -- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True). - -- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 - conversion. - -- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message - with a None body. - -- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a - keyword-only argument. The preceding positional argument was deprecated, - so it made no sense to add filter as a positional argument. - -- Issue #11004: Repaired edge case in deque.count(). - -- Issue #10974: IDLE no longer crashes if its recent files list includes files - with non-ASCII characters in their path names. - -- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both - return sets instead of one returning a tuple and the other a frozenset. - -- Issue #10987: Fix the recursion limit handling in the _pickle module. - -- Issue #10983: Fix several bugs making tunnel requests in http.client. - -- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode - filenames, at bootstrap, if the codec registry is not ready yet. It is still - possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding) - for all file entries in the ZIP file. - -- Issue #10949: Improved robustness of rotating file handlers. - -- Issue #10955: Fix a potential crash when trying to mmap() a file past its - length. Initial patch by Ross Lagerwall. - -- Issue #10898: Allow compiling the posix module when the C library defines - a symbol named FSTAT. - -- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1) - encoding. This is the preferred encoding of PEP 3333 and the base encoding - of HTTP 1.1. - -- To match the behaviour of HTTP server, the HTTP client library now also - encodes headers with iso-8859-1 (latin1) encoding. It was already doing - that for incoming headers which makes this behaviour now consistent in - both incoming and outgoing direction. - -- Issue #9509: argparse now properly handles IOErrors raised by - argparse.FileType. - -- Issue #10961: The new pydoc server now better handles exceptions raised - during request handling. - -- Issue #10680: Fix mutually exclusive arguments for argument groups in - argparse. - -Build ------ - -- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with - the system-provided Python. - - -What's New in Python 3.2 Release Candidate 1 -============================================ - -*Release date: 16-Jan-2011* - -Core and Builtins ------------------ - -- Issue #10889: range indexing and slicing now works correctly on ranges with - a length that exceeds sys.maxsize. - -- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a - class. - -- Issue #8020: Avoid a crash where the small objects allocator would read - non-Python managed memory while it is being modified by another thread. Patch - by Matt Bandy. - -- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all - io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser - translates newlines (\r\n => \n). - -- Remove buffer API from stable ABI for now, see #10181. - -- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file - doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int - (length bigger than 2^31-1 bytes). - -- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and - stdprinter.write() clamp the length to INT_MAX on Windows. - -- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() - can now handle dates after 2038. - -- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and - PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the - filesystem encoding instead of UTF-8. - -- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem - encoding instead of UTF-8. - -- Add sys.flags attribute for the new -q command-line option. - -- Issue #11506: Trying to assign to a bytes literal should result in a - SyntaxError. - -Library -------- - -- Issue #10916: mmap should not segfault when a file is mapped using 0 as length - and a non-zero offset, and an attempt to read past the end of file is made - (IndexError is raised instead). Patch by Ross Lagerwall. - -- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead - of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. - -- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather - than the currently problematic Apple-supplied one, when running with the - 64-/32-bit installer variant. - -- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not - as unicode, and accept binary files. Add encoding and errors attributes to - cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn - Linderman). - -- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl(). - -- Issue #10899: No function type annotations in the standard library. Removed - function type annotations from _pyio.py. - -- Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'. - -- Issue #10872: The repr() of TextIOWrapper objects now includes the mode - if available. - -- Issue #10869: Fixed bug where ast.increment_lineno modified the root node - twice. - -- Issue #5871: email.header.Header.encode now raises an error if any - continuation line in the formatted value has no leading white space and looks - like a header. Since Generator uses Header to format all headers, this check - is made for all headers in any serialized message at serialization time. This - provides protection against header injection attacks. - -- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially - private by renaming it to ``_GeneratorContextManager``. - -- Issue #10042: Fixed the total_ordering decorator to handle cross-type - comparisons that could lead to infinite recursion. - -- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with - non-ASCII bytes (parsed by a BytesParser) when doing conversion to 7bit-clean - presentation, instead of replacing them with ?s. - -- email.header.Header was incorrectly encoding folding whitespace when - rfc2047-encoding header values with embedded newlines, leaving them without - folding whitespace. It now uses the continuation_ws, as it does for - continuation lines that it creates itself. - -- Issue #1777412, #10827: Changed the rules for 2-digit years. The - time.asctime(), time.ctime() and time.strftime() functions will now format - any year when ``time.accept2dyear`` is False and will accept years >= 1000 - otherwise. ``time.mktime`` and ``time.strftime`` now accept full range - supported by the OS. With Visual Studio or on Solaris, the year is limited to - the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated. - -- Issue #7858: Raise an error properly when os.utime() fails under Windows - on an existing file. - -- Issue #3839: wsgiref should not override a Content-Length header set by - the application. Initial patch by Clovis Fabricio. - -- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the - compilation (if the input is a string). - -- Issue #7995: When calling accept() on a socket with a timeout, the returned - socket is now always blocking, regardless of the operating system. - -- Issue #10756: atexit normalizes the exception before displaying it. Patch by - Andreas St?hrk. - -- Issue #10790: email.header.Header.append's charset logic now works correctly - for charsets whose output codec is different from its input codec. - -- Issue #10819: SocketIO.name property returns -1 when its closed, instead of - raising a ValueError, to fix repr(). - -- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if - the input buffer length doesn't fit into an unsigned int (length bigger than - 2^32-1 bytes). - -- Issue #6643: Reinitialize locks held within the threading module after fork to - avoid a potential rare deadlock or crash on some platforms. - -- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file - descriptors (0, 1, 2) are closed in the parent process. Initial patch by Ross - Lagerwall. - -- `unittest.TestCase` can be instantiated without a method name; for simpler - exploration from the interactive interpreter. - -- Issue #10798: Reject supporting concurrent.futures if the system has too - few POSIX semaphores. - -- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from - the codec aliases. They are still accessible via codecs.lookup(). - -- Issue #10801: In zipfile, support different encodings for the header and the - filenames. - -- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott - David Daniels. - -- Fix collections.OrderedDict.setdefault() so that it works in subclasses that - define __missing__(). - -- Issue #10786: unittest.TextTestRunner default stream no longer bound at import - time. `sys.stderr` now looked up at instantiation time. Fix contributed by - Mark Roddy. - -- Issue #10753: Characters ';', '=' and ',' in the PATH_INFO environment variable - won't be quoted when the URI is constructed by the wsgiref.util's request_uri - method. According to RFC 3986, these characters can be a part of params in - PATH component of URI and need not be quoted. - -- Issue #10738: Fix webbrowser.Opera.raise_opts. - -- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how - browsers actually parse cookies. - -- Issue #9333: os.symlink now available regardless of user privileges. The - function now raises OSError on Windows >=6.0 when the user is unable to create - symbolic links. XP and 2003 still raise NotImplementedError. - -- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8. - -- Issue #10730: Add SVG mime types to mimetypes module. - -- Issue #10768: Make the Tkinter ScrolledText widget work again. - -- Issue #10777: Fix "dictionary changed size during iteration" bug in - ElementTree register_namespace(). - -- Issue #10626: test_logging now preserves logger disabled states. - -- Issue #10774: test_logging now removes temp files created during tests. - -- Issue #5258/#10642: if site.py encounters a .pth file that generates an error, - it now prints the filename, line number, and traceback to stderr and skips - the rest of that individual file, instead of stopping processing entirely. - -- Issue #10763: subprocess.communicate() closes stdout and stderr if both are - pipes (bug specific to Windows). - -- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better - compliance (no "s around encoded values). - -- Improved the diff message in the unittest module's assertCountEqual(). - -- Issue #1155362: email.utils.parsedate_tz now handles a missing space before - the '-' of a timezone field as well as before a '+'. - -- Issue #4871: The zipfile module now gives a more useful error message if - an attempt is made to use a string to specify the archive password. - -- Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only. - -- Deprecated assertDictContainsSubset() in the unittest module. - -C-API ------ - -- PyObject_CallMethod now passes along any underlying AttributeError from - PyObject_GetAttr, instead of replacing it with something less informative - -- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and - PyEval_ReleaseLock(). The thread-state aware APIs should be used instead. - -- Issue #10333: Remove ancient GC API, which has been deprecated since Python - 2.2. - -Build ------ - -- Issue #10843: Update third-party library versions used in OS X 32-bit - installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4 - and RTREE enabled), and ncursesw 5.5 (wide-char support enabled). - -- Issue #10820: Fix OS X framework installs to support version-specific - scripts (#10679). - -- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in - the configure script but use $GREP instead. Patch by Fabian Groffen. - -- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD - and DragonFly BSD. Patch by Nicolas Joly. - -- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with - a version-specific suffix on "make altinstall". - -- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with - timestamp profiling (--with-tsc): the preprocessor test for the PowerPC - support now looks for "__powerpc__" as well as "__ppc__": the latter seems to - only be present on OS X; the former is the correct one for Linux with GCC. - -- Issue #1099: Fix the build on MacOSX when building a framework with pydebug - using GCC 4.0. - -Tools/Demos ------------ - -- Issue #10843: Install the Tools directory on OS X in the applications Extras - (/Applications/Python 3.n/Extras/) where the Demo directory had previous been - installed. - -- Issue #7962: The Demo directory is gone. Most of the old and unmaintained - demos have been removed, others integrated in documentation or a new - Tools/demo subdirectory. - -- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell. - Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian - Curtin. - -Tests ------ - -- Issue #11910: Fix test_heapq to skip the C tests when _heapq is missing. - -- Fix test_startfile to wait for child process to terminate before finishing. - -- Issue #10822: Fix test_posix:test_getgroups failure under Solaris. Patch - by Ross Lagerwall. - -- Make the --coverage flag work for test.regrtest. - -- Issue #1677694: Refactor and improve test_timeout. Original patch by - Bj?rn Lindqvist. - -- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects. - Patch by Jean-Paul Calderone and Sandro Tosi. - -- Issue #6293: Have regrtest.py echo back sys.flags. This is done by default in - whole runs and enabled selectively using ``--header`` when running an explicit - list of tests. Original patch by Collin Winter. - - -What's New in Python 3.2 Beta 2? -================================ - -*Release date: 19-Dec-2010* - -Core and Builtins ------------------ - -- Issue #8844: Regular and recursive lock acquisitions can now be interrupted - by signals on platforms using pthreads. Patch by Reid Kleckner. - -- Issue #4236: PyModule_Create2 now checks the import machinery directly - rather than the Py_IsInitialized flag, avoiding a Fatal Python - error in certain circumstances when an import is done in __del__. - -- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and - Daniel Urban. - -Library -------- - -- Issue #3243: Support iterable bodies in httplib. Patch Contributions by - Xuanji Li and Chris AtLee. - -- Issue #10611: SystemExit exception will no longer kill a unittest run. - -- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean - up function. - -- Issue #10573: use actual/expected consistently in unittest methods. - The order of the args of assertCountEqual is also changed. - -- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated - words in the local part of email addresses, thereby preserving the input. - -- Issue #6791: Limit header line length (to 65535 bytes) in http.client - and http.server, to avoid denial of services from the other party. - -- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. - -- Issue #9907: Fix tab handling on OSX when using editline by calling - rl_initialize first, then setting our custom defaults, then reading .editrc. - -- Issue #4188: Avoid creating dummy thread objects when logging operations - from the threading module (with the internal verbose flag activated). - -- Issue #10711: Remove HTTP 0.9 support from http.client. The ``strict`` - parameter to HTTPConnection and friends is deprecated. - -- Issue #9721: Fix the behavior of urljoin when the relative url starts with a - ';' character. Patch by Wes Chow. - -- Issue #10714: Limit length of incoming request in http.server to 65536 bytes - for security reasons. Initial patch by Ross Lagerwall. - -- Issue #9558: Fix distutils.command.build_ext with VS 8.0. - -- Issue #10667: Fast path for collections.Counter(). - -- Issue #10695: passing the port as a string value to telnetlib no longer - causes debug mode to fail. - -- Issue #1078919: add_header now automatically RFC2231 encodes parameters - that contain non-ascii values. - -- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits - a warning on sys.stderr rather than throwing a misleading exception - if cleanup fails due to nulling out of modules during shutdown. - Also avoids an AttributeError when mkdtemp call fails and issues - a ResourceWarning on implicit cleanup via __del__. - -- Issue #10107: Warn about unsaved files in IDLE on OSX. - -- Issue #7213: subprocess.Popen's default for close_fds has been changed. - It is now True in most cases other than on Windows when input, output or - error handles are provided. - -- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually - added in 3.2beta1) to allow specifying a specific list of file descriptors - to keep open in the child process. - -- Issue #1731717: Fixed the problem where subprocess.wait() could cause an - OSError exception when The OS had been told to ignore SIGCLD in our process - or otherwise not wait for exiting child processes. - -Tests ------ - -- Issue #775964: test_grp now skips YP/NIS entries instead of failing when - encountering them. - -Tools/Demos ------------ - -- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and - Cocoa AquaTk. - -- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree. - -- Issue #10706: Remove outdated script runtests.sh. Either ``make test`` - or ``python -m test`` should be used instead. - -Build ------ - -- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4. - -- Issue #9234: argparse supports alias names for subparsers. - - -What's New in Python 3.2 Beta 1? -================================ - -*Release date: 05-Dec-2010* - -Core and Builtins ------------------ - -- Issue #10630: Return dict views from the dict proxy keys()/values()/items() - methods. - -- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__ - with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. - -- Issue #1772833: Add the -q command-line option to suppress copyright and - version output in interactive mode. - -- Provide an *optimize* parameter in the built-in compile() function. - -- Fixed several corner case issues on Windows in os.stat/os.lstat related to - reparse points. - -- PEP 384 (Defining a Stable ABI) is implemented. - -- Issue #2690: Range objects support negative indices and slicing. - -- Issue #9915: Speed up sorting with a key. - -- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much - larger than operand ``b``. Patch by Andrew Bennetts. - -- Issue #10518: Bring back the callable() builtin. - -- Issue #7094: Added alternate formatting (specified by '#') to ``__format__`` - method of float, complex, and Decimal. This allows more precise control over - when decimal points are displayed. - -- Issue #10474: range.count() should return integers. - -- Issue #1574217: isinstance now catches only AttributeError, rather than - masking all errors. - -Library -------- - -- logging: added "handler of last resort". See http://bit.ly/last-resort-handler - -- test.support: Added TestHandler and Matcher classes for better support of - assertions about logging. - -- Issue #4391: Use proper plural forms in argparse. - -- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on - UnicodeEncodeError. - -- Add the "display" and "undisplay" pdb commands. - -- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again - after a "continue" command. - -- Add the "interact" pdb command. - -- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf. - -- Issue #1569291: Speed up array.repeat(). - -- Provide an interface to set the optimization level of compilation in - py_compile, compileall and zipfile.PyZipFile. - -- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by - RFC3986. Anything before :// is considered a scheme and is followed by an - authority (or netloc) and by '/' led path, which is optional. - -- Issue #6045: dbm.gnu databases now support get() and setdefault() methods. - -- Issue #10620: `python -m unittest` can accept file paths instead of module - names for running specific tests. - -- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`, - `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_` - and replace them with the correct methods in the Python test suite. - -- Issue #10272: The ssl module now raises socket.timeout instead of a generic - SSLError on socket timeouts. - -- Issue #10528: Allow translators to reorder placeholders in localizable - messages from argparse. - -- Issue #10497: Fix incorrect use of gettext in argparse. - -- Issue #10478: Reentrant calls inside buffered IO objects (for example by - way of a signal handler) now raise a RuntimeError instead of freezing the - current process. - -- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests. - -- Issue #10549: Fix pydoc traceback when text-documenting certain classes. - -- Issue #2001: New HTML server with enhanced Web page features. Patch by Ron - Adam. - -- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership - of non-weakrefable objects. - -- Issue #940286: pydoc.Helper.help() ignores input/output init parameters. - -- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent - DoS attacks. Patch by Savio Sena. - -- Issue #4925: Add filename to error message when executable can't be found in - subprocess. - -- Issue #10391: Don't dereference invalid memory in error messages in the ast - module. - -- Issue #10027: st_nlink was not being set on Windows calls to os.stat or - os.lstat. Patch by Hirokazu Yamamoto. - -- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is - held by the user's account, i.e., when the function can actually be used. - -- Issue #8879: Add os.link support for Windows. - -- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved - failure messages by default. Patch by Mark Roddy. - -- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to - guess at the correct parsing of invalid html. - -- Issue #10554: Add context manager support to subprocess.Popen objects. - -- Issue #8989: email.utils.make_msgid now has a domain parameter that can - override the domain name used in the generated msgid. - -- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File - exists' exception when a target directory already exists with the specified - mode. Patch by Ray Allen. - -- Issue #9573: os.fork() now works correctly when triggered as a side effect of - a module import. - -- Issue #10464: netrc now correctly handles lines with embedded '#' characters. - -- Added itertools.accumulate(). - -- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``. - Original patch by Daniel Urban. - -- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to - `assertRegex` and `assertRaisesRegex`. - -- Issue #10535: Enable silenced warnings in unittest by default. - -- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte - sequences as input in addition to character strings. - -- Issue #10586: The statistics API for the new functools.lru_cache has been - changed to a single cache_info() method returning a named tuple. - -- Issue #10323: itertools.islice() now consumes the minimum number of inputs - before stopping. Formerly, the final state of the underlying iterator was - undefined. - -- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and - __next__. - -- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new - more informative name, unittest.CountEqual. - -- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. - -- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can - be set to False to turn off the previously undocumented 'popularity' - heuristic. Patch by Terry Reedy and Eli Bendersky. - -- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate - undocumented and now redundant isbjunk and isbpopular methods. - -- Issue #9846: zipfile is now correctly closing underlying file objects. - -- Issue #10459: Update CJK character names to Unicode 6.0. - -- Issue #4493: urllib.request adds '/' in front of path components which does not - start with '/. Common behavior exhibited by browsers and other clients. - -- Issue #6378: idle.bat now runs with the appropriate Python version rather than - the system default. Patch by Sridhar Ratnakumar. - -- Issue #10470: 'python -m unittest' will now run test discovery by default, - when no extra arguments have been provided. - -- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to - output stream only when end_headers is invoked. This is a speedup and an - internal optimization. Patch by endian. - -- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho - Eckhardt. - -- Issue #10453: compileall now uses argparse instead of getopt, and thus - provides clean output when called with '-h'. - -- Issue #8078: Add constants for higher baud rates in the termios module. Patch - by Rodolpho Eckhardt. - -- Issue #10407: Fix two NameErrors in distutils. - -- Issue #10371: Deprecated undocumented functions in the trace module. - -- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the - end of the file. - -- configparser: 100% test coverage. - -- Issue #10499: configparser supports pluggable interpolation handlers. The - default classic interpolation handler is called BasicInterpolation. Another - interpolation handler added (ExtendedInterpolation) which supports the syntax - used by zc.buildout (e.g. interpolation between sections). - -- configparser: the SafeConfigParser class has been renamed to ConfigParser. - The legacy ConfigParser class has been removed but its interpolation mechanism - is still available as LegacyInterpolation. - -- configparser: Usage of RawConfigParser is now discouraged for new projects - in favor of ConfigParser(interpolation=None). - -- Issue #1682942: configparser supports alternative option/value delimiters. - -- Issue #5412: configparser supports mapping protocol access. - -- Issue #9411: configparser supports specifying encoding for read operations. - -- Issue #9421: configparser's getint(), getfloat() and getboolean() methods - accept vars and default arguments just like get() does. - -- Issue #9452: configparser supports reading from strings and dictionaries - (thanks to the mapping protocol API, the latter can be used to copy data - between parsers). - -- configparser: accepted INI file structure is now customizable, including - comment prefixes, name of the DEFAULT section, empty lines in multiline - values, and indentation. - -- Issue #10326: unittest.TestCase instances can be pickled. - -- Issue #9926: Wrapped TestSuite subclass does not get __call__ executed. - -- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex - zeros on systems where the log1p function fails to respect the sign of zero. - This fixes a test failure on AIX. - -- Issue #9732: Addition of getattr_static to the inspect module. - -- Issue #10446: Module documentation generated by pydoc now links to a - version-specific online reference manual. - -- Make the 'No module named' exception message from importlib consistent. - -- Issue #10443: Add the SSLContext.set_default_verify_paths() method. - -- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module. - Patch by Robert Collins. - -- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather - than strings. - -C-API ------ - -- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(), - which transforms non-ASCII decimal digits in a Unicode string to their ASCII - equivalents. - -- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly - zero-initialize all fields, fixing compiler warnings seen when building - extension modules with gcc with "-Wmissing-field-initializers" (implied by - "-W"). - -- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil - Schemenauer. - -- structseq.h is now included in Python.h. - -- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. - -Tests ------ - -- regrtest.py once again ensures the test directory is removed from sys.path - when it is invoked directly as the __main__ module. - -- `python -m test` can be used to run the test suite as well as `python -m - test.regrtest`. - -- Do not fail test_socket when the IP address of the local hostname cannot be - looked up. - -- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric - Carstensen. - -Build ------ - -- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and - PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals. - -Documentation -------------- - -- Issue #10299: List the built-in functions in a table in functions.rst. - - -What's New in Python 3.2 Alpha 4? -================================= - -*Release date: 13-Nov-2010* - -Core and Builtins ------------------ - -- Issue #10372: Import the warnings module only after the IO library is - initialized, so as to avoid bootstrap issues with the '-W' option. - -- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused - undocumented value PyBUF_SHADOW, and strangely-looking code in - PyMemoryView_GetContiguous. - -- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``. - -- If FileIO.__init__ fails, close the file descriptor. - -- Issue #10221: dict.pop(k) now has a key error message that includes the - missing key (same message d[k] returns for missing keys). - -- Issue #5437: A preallocated MemoryError instance should not keep traceback - data (including local variables caught in the stack trace) alive infinitely. - -- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length - of the offending line. - -- Issue #10089: Add support for arbitrary -X options on the command line. They - can be retrieved through a new attribute ``sys._xoptions``. - -- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of - the locale encoding. If the LANG (and LC_ALL and LC_CTYPE) environment - variable is not set, the locale encoding is ISO-8859-1, whereas most programs - (including Python) expect UTF-8. Python already uses UTF-8 for the filesystem - encoding and to encode command line arguments on this OS. - -- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect - filenames encoded to the filesystem encoding with the surrogateescape error - handler (to support undecodable bytes), instead of UTF-8 in strict mode. - -- Issue #9997: Don't let the name "top" have special significance in scope - resolution. - -- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as - the default 512 when compiling on AIX. - -- Use locale encoding instead of UTF-8 to encode and decode filenames if - Py_FileSystemDefaultEncoding is not set. - -- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file - descriptor. - -- Issue #9418: Moved private string methods ``_formatter_parser`` and - ``_formatter_field_name_split`` into a new ``_string`` module. - -- Issue #9992: Remove PYTHONFSENCODING environment variable. - -Library -------- - -- Issue #12943: python -m tokenize support has been added to tokenize. - -- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. - -- Issue #10356: Decimal.__hash__(-1) should return -2. - -- Issue #1553375: logging: Added stack_info kwarg to display stack information. - -- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru. - -- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See also issue - #10356.) - -- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard - IMAP4 connections. Original patch by Lorenzo M. Catucci. - -- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if - there are non-base64 alphabet characters in the input. - -- Issue #10386: Add __all__ to token module; this simplifies importing in - tokenize module and prevents leaking of private names through ``import *``. - -- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by Lorenzo - M. Catucci. - -- Fix IMAP.login() to work properly. - -- Issue #9244: multiprocessing pool worker processes could terminate - unexpectedly if the return value of a task could not be pickled. Only the - ``repr`` of such errors are now sent back, wrapped in an - ``MaybeEncodingError`` exception. - -- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of - ``multiprocessing.Pool`` now accepts a ``error_callback`` argument. This can - be a callback with the signature ``callback(exc)``, which will be called if - the target raises an exception. - -- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL - sockets now has additional items such as ``issuer`` and ``notBefore``. - -- ``usenetrc`` is now false by default for NNTP objects. - -- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS. - Patch by Andrew Vant. - -- Issue #10335: Add tokenize.open(), detect the file encoding using - tokenize.detect_encoding() and open it in read only mode. - -- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new - method send_message to send an email.message.Message object. - -- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error - handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source - code directory name contains a non-ASCII character and the locale encoding is - ASCII. - -- Issue #10329: The trace module writes reports using the input Python script - encoding, instead of the locale encoding. Patch written by Alexander - Belopolsky. - -- Issue #10126: Fix distutils' test_build when Python was built with - --enable-shared. - -- Issue #9281: Prevent race condition with mkdir in distutils. Patch by - Arfrever. - -- Issue #10229: Fix caching error in gettext. - -- Issue #10252: Close file objects in a timely manner in distutils code and - tests. Patch by Brian Brazil, completed by ?ric Araujo. - -- Issue #10180: Pickling file objects is now explicitly forbidden, since - unpickling them produced nonsensical results. - -- Issue #10311: The signal module now restores errno before returning from its - low-level signal handler. Patch by Hallvard B Furuseth. - -- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects. - -- Issue #10283: Add a ``group_pattern`` argument to NNTP.list(). - -- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI - environment better, and to correct unicode environment values for WSGI 1.0.1. - -- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER - response, instead of raising an exception. - -- wsgiref now implements and validates PEP 3333, rather than an experimental - extension of PEP 333. (Note: earlier versions of Python 3.x may have - incorrectly validated some non-compliant applications as WSGI compliant; if - your app validates with Python <3.2b1+, but not on this version, it is likely - the case that your app was not compliant.) - -- Issue #10280: NNTP.nntp_version should reflect the highest version advertised - by the server. - -- Issue #10184: Touch directories only once when extracting a tarfile. - -- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts - that were formerly found under Demo/turtle. - -- Issue #10265: Close file objects explicitly in sunau. Patch by Brian Brazil. - -- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a - filename. Patch by Brian Brazil. - -- Issue #10110: Queue objects didn't recognize full queues when the maxsize - parameter had been reduced. - -- Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. - -- logging: Added style option to basicConfig() to allow %, {} or $-formatting. - -- Issue #5729: json.dumps() now supports using a string such as '\t' for - pretty-printing multilevel objects. - -- Issue #10253: FileIO leaks a file descriptor when trying to open a file for - append that isn't seekable. Patch by Brian Brazil. - -- Support context manager protocol for file-like objects returned by mailbox - ``get_file()`` methods. - -- Issue #10246: uu.encode didn't close file objects explicitly when filenames - were given to it. Patch by Brian Brazil. - -- Issue #10198: fix duplicate header written to wave files when writeframes() is - called without data. - -- Close file objects in modulefinder in a timely manner. - -- Close a io.TextIOWrapper object in email.parser in a timely manner. - -- Close a file object in distutils.sysconfig in a timely manner. - -- Close a file object in pkgutil in a timely manner. - -- Issue #10233: Close file objects in a timely manner in the tarfile module and - its test suite. - -- Issue #10093: ResourceWarnings are now issued when files and sockets are - deallocated without explicit closing. These warnings are silenced by default, - except in pydebug mode. - -- tarfile.py: Add support for all missing variants of the GNU sparse extensions - and create files with holes when extracting sparse members. - -- Issue #10218: Return timeout status from ``Condition.wait`` in threading. - -- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and - deprecate the old name ``zipfile.BadZipfile``. - -- Issue #5027: The standard ``xml`` namespace is now understood by - xml.sax.saxutils.XMLGenerator as being bound to - http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell. - -- Issue #5975: Add csv.unix_dialect class. - -- Issue #7761: telnetlib.interact failures on Windows fixed. - -- logging: Added style option to Formatter to allow %, {} or $-formatting. - -- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a - context manager. - -- Issue #1349106: Generator (and BytesGenerator) flatten method and Header - encode method now support a 'linesep' argument. - -- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in - order to support the TLS SNI extension. ``HTTPSConnection`` and ``urlopen()`` - also use this argument, so that HTTPS virtual hosts are now supported. - -- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items. - -- Issue #10163: Skip unreadable registry keys during mimetypes initialization. - -- logging: Made StreamHandler terminator configurable. - -- logging: Allowed filters to be just callables. - -- logging: Added tests for _logRecordClass changes. - -- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. - -- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to - increase flexibility of LogRecord creation. - -- Issue #5117: Case normalization was needed on ntpath.relpath(). Also fixed - root directory issue on posixpath.relpath(). (Ported working fixes from - ntpath.) - -- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option - short_empty_elements to direct it to use self-closing tags when appropriate. - -- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags. Add --abiflags - switch to python-config for command line access. - -- Issue #6098: Don't claim DOM level 3 conformance in minidom. - -- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty - XML namespace attribute is encountered. - -- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic - characters by default. Deprecate ``cgi.escape()``. - -- Issue #9409: Fix the regex to match all kind of filenames, for interactive - debugging in doctests. - -- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the - same instance as ``datetime.timezone.utc``. - -- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where - supported by the system. Patch by Nikita Vetoshkin. - -- Issue #10063: file:// scheme will stop accessing remote hosts via ftp - protocol. file:// urls had fallback to access remote hosts via ftp. This was - not correct, change is made to raise a URLError when a remote host is tried to - access via file:// scheme. - -- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is - created in modes 'a' or 'w' and then closed without adding any files. Raise - BadZipfile (rather than IOError) when opening small non-ZIP files. - -- Issue #10041: The signature of optional arguments in socket.makefile() didn't - match that of io.open(), and they also didn't get forwarded properly to - TextIOWrapper in text mode. Patch by Kai Zhu. - -- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and - urllib.request.urlopen now take optional arguments to allow for server - certificate checking, as recommended in public uses of HTTPS. - -- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the - current directory was deleted. Patch written by W. Trevor King. - -- Issue #3873: Speed up unpickling from file objects that have a peek() method. - -- Issue #10075: Add a session_stats() method to SSLContext objects. - -- Issue #9948: Fixed problem of losing filename case information. - -Extension Modules ------------------ - -- Issue #5109: array.array constructor will now use fast code when - initial data is provided in an array object with correct type. - -- Issue #6317: Now winsound.PlaySound only accepts unicode. - -- Issue #6317: Now winsound.PlaySound can accept non ascii filename. - -- Issue #9377: Use Unicode API for gethostname on Windows. - -- Issue #10143: Update "os.pathconf" values. - -- Issue #6518: Support context manager protcol for ossaudiodev types. - -- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. - -- Issue #9054: Fix a crash occurring when using the pyexpat module with expat - version 2.0.1. - -- Issue #5355: Provide mappings from Expat error numbers to string descriptions - and backwards, in order to actually make it possible to analyze error codes - provided by ExpatError. - -- The Unicode database was updated to 6.0.0. - -C-API ------ - -- Issue #10288: The deprecated family of "char"-handling macros - (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead. - -- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t - type has been introduced. - -Tools/Demos ------------ - -- Issue #10117: Tools/scripts/reindent.py now accepts source files that use - encoding other than ASCII or UTF-8. Source encoding is preserved when - reindented code is written to a file. - -- Issue #7287: Demo/imputil/knee.py was removed. - -Tests ------ - -- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well - as unicode strings. Initial patch by Sandro Tosi. - -- Issue #10294: Remove dead code form test_unicode_file. - -- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new - test specific to unicode (non-ascii name and filename). - -Build ------ - -- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure. - -- Issue #8852: Allow the socket module to build on OpenSolaris. - -- Drop -OPT:Olimit compiler option. - -- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. - -- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension. - -- Issue #7473: avoid link errors when building a framework with a different set - of architectures than the one that is currently installed. - - -What's New in Python 3.2 Alpha 3? -================================= - -*Release date: 09-Oct-2010* - -Core and Builtins ------------------ - -- Issue #10068: Global objects which have reference cycles with their module's - dict are now cleared again. This causes issue #7140 to appear again. - -- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename() - encodings. - -- ast.literal_eval() can now handle negative numbers. It is also a little more - liberal in what it accepts without compromising the safety of the evaluation. - For example, 3j+4 and 3+4+5 are both accepted. - -- Issue #10006: type.__abstractmethods__ now raises an AttributeError. As a - result metaclasses can now be ABCs (see #9533). - -- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t. - -- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace - UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and - 32 bits wchar_t (eg. Linux in narrow build). - -- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression - introduced by issue #9324. - -- Issue #9979: Create function PyUnicode_AsWideCharString(). - -- Issue #7397: Mention that importlib.import_module() is probably what someone - really wants to be using in __import__'s docstring. - -- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg - to use named arguments. - -- Issue #9930: Remove bogus subtype check that was causing (e.g.) - float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. - -- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin. - -- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other - threads are still running. Instead, reinitialize the GIL on a second call to - Py_Initialize(). - -- All SyntaxErrors now have a column offset and therefore a caret when the error - is printed. - -- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the - module that was imported, but instead gets the module from sys.modules. - -- Issue #9213: The range type_items now provides index() and count() methods, to - conform to the Sequence ABC. Patch by Daniel Urban and Daniel Stutzbach. - -- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called - with a non-empty format string. This is an effort to future-proof user - code. If a derived class does not currently implement __format__ but later - adds its own __format__, it would most likely break user code that had - supplied a format string. This will be changed to a DeprecationWaring in - Python 3.3 and it will be an error in Python 3.4. - -- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly - re-created on a subsequent call to Py_Initialize(). The problem (a crash) - wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial. - -- Issue #9210: Configure option --with-wctype-functions was removed. Using the - functions from the libc caused the methods .upper() and lower() to become - locale aware and created subtly wrong results. - -- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a - non-ASCII byte in the format string. - -- Issue #4617: Previously it was illegal to delete a name from the local - namespace if it occurs as a free variable in a nested block. This limitation - of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). - -- Issue #9804: ascii() now always represents unicode surrogate pairs as a single - ``\UXXXXXXXX``, regardless of whether the character is printable or not. - Also, the "backslashreplace" error handler now joins surrogate pairs into a - single character on UCS-2 builds. - -- Issue #9757: memoryview objects get a release() method to release the - underlying buffer (previously this was only done when deallocating the - memoryview), and gain support for the context management protocol. - -- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid - thread-local storage key. - -Library -------- - -- Issue #2236: distutils' mkpath ignored the mode parameter. - -- Fix typo in one sdist option (medata-check). - -- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce. - -- Issue #1718574: Fix options that were supposed to accept arguments but did - not in build_clib. - -- Issue #9437: Fix building C extensions with non-default LDFLAGS. - -- Issue #4661: email can now parse bytes input and generate either converted - 7bit output or bytes output. Email version bumped to 5.1.0. - -- Issue #1589: Add ssl.match_hostname(), to help implement server identity - verification for higher-level protocols. - -- Issue #9759: GzipFile now raises ValueError when an operation is attempted - after the file is closed. Patch by Jeffrey Finkelstein. - -- Issue #9042: Fix interaction of custom translation classes and caching in - gettext. - -- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method - returning a (sock, addr) pair which is called when a connection has been - established with a new remote endpoint. This is supposed to be used as a - replacement for old handle_accept() and avoids the user to call accept() - directly. - -- Issue #9065: tarfile no longer uses "root" as the default for the uname and - gname field. - -- Issue #8980: Fixed a failure in distutils.command check that was shadowed by - an environment that does not have docutils. Patch by Arfrever. - -- Issue #1050268: parseaddr now correctly quotes double quote and backslash - characters that appear inside quoted strings in email addresses. - -- Issue #10004: quoprimime no longer generates a traceback when confronted with - invalid characters after '=' in a Q-encoded word. - -- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before - sending a 200 OK for the Expect: 100-continue request header. - -- Issue #9360: Cleanup and improvements to the nntplib module. The API now - conforms to the philosophy of bytes and unicode separation in Python 3. A - test suite has also been added. - -- Issue #9962: GzipFile now has the peek() method. - -- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, - retry the select() loop instead of bailing out. This is because select() can - incorrectly report a socket as ready for reading (for example, if it received - some data with an invalid checksum). - -- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) - -- Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is - received. Now sendall() properly calls signal handlers if necessary, and - retries sending if these returned successfully, including on sockets with a - timeout. - -- Issue #9947: logging: Fixed locking bug in stopListening. - -- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler. - -- Issue #9936: Fixed executable lines' search in the trace module. - -- Issue #9790: Rework imports necessary for samefile and sameopenfile - in ntpath. - -- Issue #9928: Properly initialize the types exported by the bz2 module. - -- Issue #1675951: Allow GzipFile to work with unseekable file objects. Patch by - Florian Festi. - -- Logging: Added QueueListener class to facilitate logging usage for - performance-critical threads. - -- Issue #9916: Add some missing errno symbols. - -- Issue #9877: Expose sysconfig.get_makefile_filename() - -- logging: Added hasHandlers() method to Logger and LoggerAdapter. - -- Issue #9908: Fix os.stat() on bytes paths under Windows 7. - -- Issue #2643: msync() is not called anymore when deallocating an open mmap - object, only munmap(). - -- logging: Changed LoggerAdapter implementation internally, to make it easier to - subclass in a useful way. - -- logging: hasHandlers method was added to Logger, and isEnabledFor, - getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter. - LoggerAdapter was introduced into the unit tests for logging. - -- Issue #1686: Fix string.Template when overriding the pattern attribute. - -- Issue #9854: SocketIO objects now observe the RawIOBase interface in - non-blocking mode: they return None when an operation would block (instead of - raising an exception). - -- Issue #1730136: Fix the comparison between a tk.font.Font and an object of - another kind. - -- Issue #9441: logging has better coverage for rotating file handlers. - -- Issue #9865: collections.OrderedDict now has a __sizeof__ method. - -- Issue #9854: The default read() implementation in io.RawIOBase now handles - non-blocking readinto() returning None correctly. - -- Issue #1552: socket.socketpair() now returns regular socket.socket objects - supporting the whole socket API (rather than the "raw" _socket.socket - objects). - -- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto() - to match the corresponding socket methods. - -- Issue #9840: Added a decorator to reprlib for wrapping __repr__ methods to make - them handle recursive calls within the same thread. - -- logging: Enhanced HTTPHandler with secure and credentials initializers. - -- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X. - -- Issue #9837: The read() method of ZipExtFile objects (as returned by - ZipFile.open()) could return more bytes than requested. - -- Issue #9826: OrderedDict.__repr__ can now handle self-referential values: - d['x'] = d. - -- Issue #9825: Using __del__ in the definition of collections.OrderedDict made - it possible for the user to create self-referencing ordered dictionaries which - become permanently uncollectable GC garbage. Reinstated the Python 3.1 - approach of using weakref proxies so that reference cycles never get created - in the first place. - -- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and - encode the value with filesystem encoding and surrogateescape (instead of - utf-8 in strict mode) . Patch written by David Watson. - -- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING - environment variable to set the filesystem encoding at Python startup. - sys.setfilesystemencoding() creates inconsistencies because it is unable to - reencode all filenames in all objects. - -- Issue #9410: Various optimizations to the pickle module, leading to speedups - up to 4x (depending on the benchmark). Mostly ported from Unladen Swallow; - initial patch by Alexandre Vassalotti. - -- The pprint module now supports printing OrderedDicts in their given order - (formerly, it would sort the keys). - -- Logging: Added QueueHandler class to facilitate logging usage with - multiprocessing. - -- Issue #9707: Rewritten reference implementation of threading.local which is - friendlier towards reference cycles. This change is not normally visible - since an optimized C implementation (_thread._local) is used instead. - -- Issue #6394: os.getppid() is now supported on Windows. Note that it will - still return the id of the parent process after it has exited. This process - id may even have been reused by another unrelated process. - -- Issue #9792: In case of connection failure, socket.create_connection() would - swallow the exception and raise a new one, making it impossible to fetch the - original errno, or to filter timeout errors. Now the original error is - re-raised. - -- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and - the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated - back after the system call. Original patch by Brian Brazil. - -- Updates to the random module: - - * Document which parts of the module are guaranteed to stay the same across - versions and which parts are subject to change. - - * Update the seed() method to use all of the bits in a string instead of just - the hash value. This makes better use of the seed value and assures the - seeding is platform independent. Issue #7889. - - * Improved the random()-->integer algorithm used in choice(), shuffle(), - sample(), randrange(), and randint(). Formerly, it used int(n*random()) - which has a slight bias whenever n is not a power of two. Issue #9025. - - * Improved documentation of arguments to randrange(). Issue #9379. - -- collections.OrderedDict now supports a new method for repositioning keys to - either end. - -- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test - cases now also have assertWarns and assertWarnsRegexp methods to check that a - given warning type was triggered by the code under test. - -- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of - their contents without duplicating them. The view is both readable and - writable. - -- Issue #7566: Implement os.path.sameopenfile for Windows. - -- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an - unsupported operation is attempted (for example, writing to a file open only - for reading). - -- hashlib has two new constant attributes: algorithms_guaranteed and - algorithms_avaiable that respectively list the names of hash algorithms - guaranteed to exist in all Python implementations and the names of hash - algorithms available in the current process. - -- A new package ``concurrent.futures`` as defined by PEP 3148. - -C-API ------ - -- Add PyErr_SyntaxLocationEx, which supports passing a column offset. - -- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or - PySequence_DelSlice when the object doesn't have any mapping operations - defined. - -Tools/Demos ------------ - -- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as - wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb) - and the interpreter under test. - -Tests ------ - -- Issue #9308: Added tests for importing encoded modules that do not - depend on specific stdlib modules being encoded in a certain way. - -- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom - certificate and private key files used by SSL-related certs. - -- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests - in test_os) - -- Issue #7110: regrtest now sends test failure reports and single-failure - tracebacks to stderr rather than stdout. - -- Issue #9628: fix runtests.sh -x option so more than one test can be excluded. - -- Issue #9899: Fix test_tkinter.test_font on various platforms. Patch by Ned - Deily. - -- Issue #9894: Do not hardcode ENOENT in test_subprocess. - -- Issue #9315: Added tests for the trace module. Patch by Eli Bendersky. - -- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the - case when running profile or trace, for example. - -- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. - -Build ------ - -- Issue #10062: Allow building on platforms which do not have sem_timedwait. - -- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by Akira - Kitada. - -- Issue #10055: Make json C89-compliant in UCS4 mode. - -- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows) - -- Issue #1633863: Don't ignore $CC under AIX. - -- Issue #9810: Compile bzip2 source files in Python's project file directly. It - used to be built with bzip2's makefile. - -- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in - module. - -- Issue #9806: python-config now has an ``--extension-suffix`` option that - outputs the suffix for dynamic libraries including the ABI version name - defined by PEP 3149. - -- Issue #941346: Improve the build process under AIX and allow Python to be - built as a shared library. Patch by S?bastien Sabl?. - -- Issue #4026: Make the fcntl extension build under AIX. Patch by S?bastien - Sabl?. - -- Issue #9701: The MacOSX installer can patch the shell profile to ensure that - the "bin" directory inside the framework is on the shell's search path. This - feature now also supports the ZSH shell. - - -What's New in Python 3.2 Alpha 2? -================================= - -*Release date: 05-Sep-2010* - -Core and Builtins ------------------ - -- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by - the new (and simpler) DUP_TOP_TWO. Performance isn't changed, but our - bytecode is a bit simplified. Patch by Demur Rumed. - -- Issue #9766: Rename poorly named variables exposed by _warnings to prevent - confusion with the proper variables names from 'warnings' itself. - -- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to - conform to the Set ABC. Patch by Daniel Urban. - -- Issue #9737: Fix a crash when trying to delete a slice or an item from a - memoryview object. - -- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are - now removed, since their effect was inexistent in 3.x (the default encoding is - hardcoded to utf-8 and cannot be changed). - -- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API - properly. Patch by Stefan Behnel. - -- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most - platforms. Previously, it inlined only when using Microsoft Visual C. - -- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. - -- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. - -- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match - the pyconfig.h generated by configure on other systems. - -- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that - occur during attribute lookup are now propagated to the caller. - -- Issue #8622: Add PYTHONFSENCODING environment variable to override the - filesystem encoding. - -- Issue #5127: The C functions that access the Unicode Database now accept and - return characters from the full Unicode range, even on narrow unicode builds - (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others). A visible difference - in Python is that unicodedata.numeric() now returns the correct value for - large code points, and repr() may consider more characters as printable. - -- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename - as a unicode object, instead of a byte string. Function needed to support - unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new - function. - -- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx(). - -- Issue #9612: The set object is now 64-bit clean under Windows. - -- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for - the module file to be executed with the -m command line option. - -- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to - write a message formatted by PyUnicode_FromFormatV() to sys.stdout and - sys.stderr. - -- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter: - decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str - objects are output as-is. - -- Issue #9203: Computed gotos are now enabled by default on supported compilers - (which are detected by the configure script). They can still be disable - selectively by specifying --without-computed-gotos. - -- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but - use PyUnicode_FromFormatV() to format the warning message. - -- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an - array. - -- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. - -- Issue #9337: The str() of a float or complex number is now identical to its - repr(). - -- Issue #9416: Fix some issues with complex formatting where the output with no - type specifier failed to match the str output: - - - format(complex(-0.0, 2.0), '-') omitted the real part from the output, - - format(complex(0.0, 2.0), '-') included a sign and parentheses. - -Extension Modules ------------------ - -- Issue #8013: time.asctime and time.ctime no longer call system - asctime and ctime functions. The year range for time.asctime is now - 1900 through maxint. The range for time.ctime is the same as for - time.localtime. The string produced by these functions is longer - than 24 characters when year is greater than 9999. - -- Issue #6608: time.asctime is now checking struct tm fields its input - before passing it to the system asctime. Patch by MunSic Jeong. - -- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file - descriptor is provided. Patch by Pascal Chambon. - -- Issue #7736: Release the GIL around calls to opendir() and closedir() in the - posix module. Patch by Marcin Bachry. - -- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the - socket module, and fix the width of socket descriptors to be correctly - detected under 64-bit Windows. - -- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo - and gethostbyaddr. getnameinfo is now restricted to numeric addresses as - input. - -- Issue #9214: Set operations on a KeysView or ItemsView in collections now - correctly return a set. Patch by Eli Bendersky. - -- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by - Matthew Ahrens. - -- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using - the surrogate error handler. - -- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other - than ``TypeError`` raised by the iterator argument. - -- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo. - -- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter - Lock around all system calls. Original patch by Ryan Kelly. - -- Issue #8524: Add a detach() method to socket objects, so as to put the socket - into the closed state without closing the underlying file descriptor. - -- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty. - -- Issue #6869: Fix a refcount problem in the _ctypes extension. - -- Issue #5504: ctypes should now work with systems where mmap can't be - PROT_WRITE and PROT_EXEC. - -- Issue #9507: Named tuple repr will now automatically display the right name in - a tuple subclass. - -- Issue #9324: Add parameter validation to signal.signal on Windows in order to - prevent crashes. - -- Issue #9526: Remove some outdated (int) casts that were preventing the array - module from working correctly with arrays of more than 2**31 elements. - -- Fix memory leak in ssl._ssl._test_decode_cert. - -- Issue #8065: Fix memory leak in readline module (from failure to free the - result of history_get_history_state()). - -- Issue #9450: Fix memory leak in readline.replace_history_item and - readline.remove_history_item for readline version >= 5.0. - -- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. - -- Issue #8046: Add context manager protocol support and .closed property to mmap - objects. - -Library -------- - -- Issue #7451: Improve decoding performance of JSON objects, and reduce the - memory consumption of said decoded objects when they use the same strings as - keys. - -- Issue #1100562: Fix deep-copying of objects derived from the list and dict - types. Patch by Michele Orr? and Bj?rn Lindqvist. - -- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows. - -- Issue #9421: Made the get methods consistently accept the vars and - default arguments on all parser classes. - -- Issue #7005: Fixed output of None values for RawConfigParser.write and - ConfigParser.write. - -- Issue #8990: array.fromstring() and array.tostring() get renamed to - frombytes() and tobytes(), respectively, to avoid confusion. Furthermore, - array.frombytes(), array.extend() as well as the array.array() constructor now - accept bytearray objects. Patch by Thomas Jollans. - -- Issue #808164: Fixed socket.close to avoid references to globals, to avoid - issues when socket.close is called from a __del__ method. - -- Issue #9706: ssl module provides a better error handling in various - circumstances. - -- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting - rid of the cached copy of thread-local attribute dictionary. - -- Issue #1512791: In setframerate() in the wave module, non-integral frame rates - are rounded to the nearest integer. - -- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of - falling into recursion. - -- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four - character years even if the message contains RFC822 two character years. - -- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive - operations on its self, namely x -= x and x ^= x. - -- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error - handling when accepting a new connection. - -- Issue #9601: ftplib now provides a workaround for non-compliant - implementations such as IIS shipped with Windows server 2003 returning invalid - response codes for MKD and PWD commands. - -- Issue #658749: asyncore's connect() method now correctly interprets winsock - errors. - -- Issue #9501: Fixed logging regressions in cleanup code. - -- Fix functools.total_ordering() to skip methods inherited from object. - -- Issue #9572: Importlib should not raise an exception if a directory it thought - it needed to create was done concurrently by another process. - -- Issue #9617: Signals received during a low-level write operation aren't - ignored by the buffered IO layer anymore. - -- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding. - -- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape - error handler, or strict error handler on Windows. - -- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and - ``gzip.decompress``. Original patch by Anand B. Pillai. - -- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a - ssl.SSLContext object allowing bundling SSL configuration options, - certificates and private keys into a single (potentially long-lived) - structure. - -- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as - single keyword arguments. - -- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py - compiler flag values over defining its own. - -- Issue #9147: Added dis.code_info() which is similar to show_code() but returns - formatted code information in a string rather than displaying on screen. - -- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute - pointing to the original callable. - -- Issue #3445: functools.update_wrapper now tolerates missing attributes on - wrapped callables. - -- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod. - -- Issue #9605: posix.getlogin() decodes the username with file filesystem - encoding and surrogateescape error handler. Patch written by David Watson. - -- Issue #9604: posix.initgroups() encodes the username using the fileystem - encoding and surrogateescape error handler. Patch written by David Watson. - -- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name - using the filesystem encoding and surrogateescape error handler. Patch written - by David Watson. - -- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants, - for use with the statvfs() function. Patch by Adam Jackson. - -- Issue #8688: MANIFEST files created by distutils now include a magic comment - indicating they are generated. Manually maintained MANIFESTs without this - marker will not be overwritten or removed. - -- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a - BadZipfile error is raised if it doesn't match (as used to be the case in - Python 2.5 and earlier). - -- Issue #9550: a BufferedReader could issue an additional read when the original - read request had been satisfied, which could block indefinitely when the - underlying raw IO channel was e.g. a socket. Report and original patch by - Jason V. Miller. - -- Issue #3757: thread-local objects now support cyclic garbage collection. - Thread-local objects involved in reference cycles will be deallocated timely - by the cyclic GC, even if the underlying thread is still running. - -- Issue #9452: Add read_file, read_string, and read_dict to the configparser - API; new source attribute to exceptions. - -- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current - node. - -- Issue #8047: Fix the xml.etree serializer to return bytes by default. Use - ``encoding="unicode"`` to generate a Unicode string. - -- Issue #8280: urllib2's Request method will remove fragments in the url. This - is how it is supposed to work, wget and curl do the same. Previous behavior - was wrong. - -- Issue #6683: For SMTP logins we now try all authentication methods advertised - by the server. Many servers are buggy and advertise authentication methods - they do not support in reality. - -- Issue #8814: function annotations (the ``__annotations__`` attribute) are now - included in the set of attributes copied by default by functools.wraps and - functools.update_wrapper. Patch by Terrence Cole. - -- Issue #2944: asyncore doesn't handle connection refused correctly. - -- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate - the private attributes. Add tests for smtpd module. - -- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word - encoded in base64 is lacking padding. - -- Issue #9444: Argparse now uses the first element of prefix_chars as the option - character for the added 'h/help' option if prefix_chars does not contain a - '-', instead of raising an error. - -- Issue #7372: Fix pstats regression when stripping paths from profile data - generated with the profile module. - -- Issue #9428: Fix running scripts with the profile/cProfile modules from the - command line. - -- Issue #7781: Fix restricting stats by entry counts in the pstats interactive - browser. - -- Issue #9209: Do not crash in the pstats interactive browser on invalid regular - expressions. - -- Update collections.OrderedDict to match the implementation in Py2.7 (based on - lists instead of weakly referenced Link objects). - -- Issue #8397: Raise an error when attempting to mix iteration and regular reads - on a BZ2File object, rather than returning incorrect results. - -- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when - re-initializing a buffered IO object by calling its ``__init__`` method. - -- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links - across devices. - -- Issue #8826: Properly load old-style "expires" attribute in http.cookies. - -- Issue #1690103: Fix initial namespace for code run with trace.main(). - -- Issue #7395: Fix tracebacks in pstats interactive browser. - -- Issue #8230: Fix Lib/test/sortperf.py. - -- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final - newline, it no longer truncates the last character of the last command line. - -- Issue #5146: Handle UID THREAD command correctly in imaplib. - -- Issue #5147: Fix the header generated for cookie files written by - http.cookiejar.MozillaCookieJar. - -- Issue #8198: In pydoc, output all help text to the correct stream when - sys.stdout is reassigned. - -- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` - in ntpath.normpath(). - -- Issue #1286: Allow using fileinput.FileInput as a context manager. - -- Add lru_cache() decorator to the functools module. - -Tools/Demos ------------ - -- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147. - -- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing - non-ASCII content. - -Tests ------ - -- Issue #9601: Provide a test case for ftplib.parse257. - -- Issue #8857: Provide a test case for socket.getaddrinfo. - -- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. - -- Issue #8433: Fix test_curses failure with newer versions of ncurses. - -- Issue #9496: Provide a test suite for the rlcompleter module. Patch by - Michele Orr?. - -- Issue #8687: provide a test suite for sched.py module. - -Build ------ - -- Issue #1303434: Generate ZIP file containing all PDBs. - -- Issue #9193: PEP 3149 is accepted. - -- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F() - become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively. - -- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by - S?bastien Sabl?. - -- Don't run pgen twice when using make -j. - - -What's New in Python 3.2 Alpha 1? -================================= - -*Release date: 01-Aug-2010* - -Core and Builtins ------------------ - -- Issue #8991: convertbuffer() rejects discontigious buffers. - -- Issue #7616: Fix copying of overlapping memoryview slices with the Intel - compiler. - -- Issue #8413: structsequence now subclasses tuple. - -- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the - start byte and the continuation byte(s) are now considered invalid, instead of - the number of bytes specified by the start byte. E.g.: - '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces - with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80') - even if '\xf1' is the start byte of a 4-bytes sequence. Previous versions - returned a single u'\ufffd'. - -- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0 - rather than 0.0. So "-7j" is now exactly equivalent to "-(7j)". - -- Be more specific in error messages about positional arguments. - -- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes - objects, as described in the documentation. - -- Issue #6543: Write the traceback in the terminal encoding instead of utf-8. - Fix the encoding of the modules filename. Patch written by Amaury Forgeot - d'Arc. - -- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code - dealing with unary minus applied to a constant. The removed code was mutating - the ST, causing a second compilation to fail. - -- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict - mode raises unicode errors. The encoder only supports "strict" and "replace" - error handlers, the decoder only supports "strict" and "ignore" error - handlers. Patch written by Mark Hammond. - -- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use - "w*" format instead. Add tests for "w*" format. - -- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z" - formats if the string contains a null byte/character. Write unit tests for - string formats. - -- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test - suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module - location of the raised exception. - -- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode - filenames and enable os.fsencode(). - -- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. - -- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the - interpreter with characters outside the Basic Multilingual Plane (higher than - 0x10000). - -- Issue #8950: (See also issue #5080). Py_ArgParse*() functions now raise - TypeError instead of giving a DeprecationWarning when a float is parsed using - the 'L' code (for long long). (All other integer codes already raise - TypeError in this case.) - -- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to - enable shortcuts for upper case encoding name. Add also a shortcut for - "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode(). - -- Issue #8838: Remove codecs.charbuffer_encode() function. The buffer protocol - doesn't support "char buffer" anymore in Python 3. - -- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*" - instead. codecs.charbuffer_encode() now accepts modifiable buffer objects - like bytearray. - -- Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no - used anymore and it was never documented. - -- In str.format(), raise a ValueError when indexes to arguments are too large. - -- Issue #2844: Make int('42', n) consistently raise ValueError for invalid - integers n (including n = -909). - -- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances - of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it - easy to maintain the invariant that hash(x) == hash(y) whenever x and y have - equal value. - -- Issue #8748: Fix two issues with comparisons between complex and integer - objects. (1) The comparison could incorrectly return True in some cases - (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality. - (2) The comparison raised an OverflowError for large integers, leading to - unpredictable exceptions when combining integers and complex objects in sets - or dicts. - -- Issue #8766: Initialize _warnings module before importing the first module. - Fix a crash if an empty directory called "encodings" exists in sys.path. - -- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system - encoding and surrogateescape error handler instead of the locale encoding to - be consistent with os.environ. Add PySys_AddWarnOptionUnicode() function. - -- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead - of strict) error handler to escape surrogates. - -- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode - object to Py_FileSystemDefaultEncoding with the "surrogateescape" error - handler, and return bytes. If Py_FileSystemDefaultEncoding is not set, fall - back to UTF-8. - -- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any - error handler, not only the default error handler (strict). - -- Issue #8610: Load file system codec at startup, and display a fatal error on - failure. Set the file system encoding to utf-8 (instead of None) if getting - the locale encoding failed, or if nl_langinfo(CODESET) function is missing. - -- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of - PyUnicode_FromString() to support surrogates in the filename and use the right - encoding. - -- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells. - -- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler. - -- Issue #8419: Prevent the dict constructor from accepting non-string keyword - arguments. - -- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute - indirectly Python signal handlers anymore because mywrite() ignores exceptions - (KeyboardInterrupt). - -- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing - unicode string (eg. backslashreplace). - -- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects - anymore, you have to convert your bytearray filenames to bytes. - -- Issue #7332: Remove the 16KB stack-based buffer in - PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit - compared to the dynamic memory allocation fallback. Patch by Charles-Fran?ois - Natali. - -- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is - passed to bytes or bytearray. - -- Issue #7301: Add environment variable $PYTHONWARNINGS. - -- Issue #8329: Don't return the same lists from select.select when no fds are - changed. - -- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on - 64-bit machines. The shift count for either left or right shift is permitted - to be up to sys.maxsize. - -- Ensure that tokenization of identifiers is not affected by locale. - -- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever. - -- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. - -- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it - is set. - -- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding - is unknown. - -- Issue #1583863: A str subclass can now override the __str__ method. - -- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with - PyMemberDefs could produce an internal error; raise TypeError instead. - -- Issue #7845: Rich comparison methods on the complex type now return - NotImplemented rather than raising a TypeError when comparing with an - incompatible type; this allows user-defined classes to implement their own - comparisons with complex. - -- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt - (SIGINT). If an error occurs while importing the site module, the error is - printed and Python exits. Initialize the GIL before importing the site module. - -- Issue #7173: Generator finalization could invalidate sys.exc_info(). - -- Issue #7544: Preallocate thread memory before creating the thread to avoid a - fatal error in low memory condition. - -- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM - check fails. - -- Handle errors from looking up __prepare__ correctly. - -- Issue #5939: Add additional runtime checking to ensure a valid capsule in - Modules/_ctypes/callproc.c. - -- Issue #7309: Fix unchecked attribute access when converting - UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings. - -- Issue #6902: Fix problem with built-in types format incorrectly with 0 - padding. - -- Issue #7988: Fix default alignment to be right aligned for complex.__format__. - Now it matches other numeric types. - -- Issue #5988: Remove deprecated functions PyOS_ascii_formatd, - PyOS_ascii_strtod, and PyOS_ascii_atof. Use PyOS_double_to_string and - PyOS_string_to_double instead. See issue #5835 for the original deprecations. - -- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` - fails. Patch by Florent Xicluna. - -- Issue #7788: Fix an interpreter crash produced by deleting a list slice with - very large step value. - -- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and - add the additional members returned in an OSVERSIONINFOEX structure. The new - members are service_pack_major, service_pack_minor, suite_mask, and - product_type. - -- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could - crash in many places because of the PyByteArray_AS_STRING() macro returning - NULL. The macro now returns a statically allocated empty string instead. - -- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`, - where the right hand operand is a set of constants, by turning the set into a - frozenset and pre-building it as a constant. The comparison operation is made - against the constant instead of building a new set each time it is executed (a - similar optimization already existed which turned a list of constants into a - pre-built tuple). Patch and additional tests by Dave Malcolm. - -- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods - of bytes, bytearray and unicode objects by using a common implementation based - on stringlib's fast search. Patch by Florent Xicluna. - -- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2, - including: (1) a serious 'wrong output' bug that could occur for long (> 40 - digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when - parsing certain long numeric strings corresponding to subnormal values, (3) a - memory leak for some values large enough to cause overflow, and (4) a number - of flaws that could lead to incorrectly rounded results. - -- The __complex__ method is now looked up on the class of instances to make it - consistent with other special methods. - -- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, - `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. - -- Issue #7604: Deleting an unset slotted attribute did not raise an - AttributeError. - -- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero) - in ** operator. The behaviour now conforms to that described in C99 Annex F. - -- Issue #1811: improve accuracy and cross-platform consistency for true division - of integers: the result of a/b is now correctly rounded for ints a and b (at - least on IEEE 754 platforms), and in particular does not depend on the - internal representation of an int. - -- Issue #6834: replace the implementation for the 'python' and 'pythonw' - executables on OSX. - - These executables now work properly with the arch(1) command: ``arch -ppc - python`` will start a universal binary version of python in PPC mode (unlike - previous releases). - -- Issue #7466: Segmentation fault when the garbage collector is called in the - middle of populating a tuple. Patch by Florent Xicluna. - -- Issue #7419: setlocale() could crash the interpreter on Windows when called - with invalid values. - -- Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+" - mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z). - -- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX - 10.6. - -- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding. - -- Issue #6970: Remove redundant calls when comparing objects that don't - implement the relevant rich comparison methods. - -- Issue #7298: Fixes for range and reversed(range(...)). Iteration over - range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C - long but the length of the range did not. Also fix several cases where - reversed(range(a, b, c)) gave wrong results, and fix a refleak for - reversed(range(a, b, c)) with large arguments. - -- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised - during the formation of an output tuple. - -- Issue #3297: On wide unicode builds, do not split unicode characters into - surrogates. - -- Remove length limitation when constructing a complex number from a string. - -- Issue #1087418: Boost performance of bitwise operations for longs. - -- Support for AtheOS has been completely removed from the code base. It was - disabled since Python 3.0. - -- Support for several legacy threading libraries has been disabled. These - libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code - will be entirely removed in 3.3. - -- Support for OSF* has been disabled. If nobody stands up, support will be - removed in 3.3. See . - -- Peephole constant folding had missed UNARY_POSITIVE. - -- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which - fixes the problem of some exceptions being thrown at shutdown when the - interpreter is killed. Patch by Adam Olsen. - -- Issue #7147: Remove support for compiling Python without complex number - support. - -- Issue #7120: logging: Removed import of multiprocessing which is causing crash - in GAE. - -- Issue #1754094: Improve the stack depth calculation in the compiler. There - should be no other effect than a small decrease in memory use. Patch by - Christopher Tur Lesniewski-Laas. - -- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using - byte values greater than 127. Patch by Derk Drukker. - -- Issue #1571184: The Unicode database contains properties for more characters. - The tables for code points representing numeric values, white spaces or line - breaks are now generated from the official Unicode Character Database files, - and include information from the Unihan.txt file. - -- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of - producing internally inconsistent Python longs. - -- Issue #6990: Fix threading.local subclasses leaving old state around after a - reference cycle GC which could be recycled by new locals. - -- Issue #5460: Fix an ambiguity in the grammar. - -- Issue #1766304: Improve performance of membership tests on range objects. - -- Issue #6713: Improve performance of integer -> string conversions. - -- Issue #6846: Fix bug where bytearray.pop() returns negative integers. - -- Issue #6750: A text file opened with io.open() could duplicate its output when - writing from multiple threads at the same time. - -- Issue #6707: dir() on an uninitialized module caused a crash. - -- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. - -- Issue #6573: set.union() stopped processing inputs if an instance of self - occurred in the argument chain. - -- Issue #6070: On posix platforms import no longer copies the execute bit from - the .py file to the .pyc file if it is set. - -- Issue #1616979: Added the cp720 (Arabic DOS) encoding. - -- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object, - and not an int. Fix the corresponding error message, and the documentation. - -- The deprecated PyCObject has been removed. - -- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h. This fixes a - build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead - of stdint.h on that platform. - -- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the - 'surrogateescape' error handler, a string which contains unpaired surrogates. - -- Issue #4856: Remove checks for win NT. - -- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument - to construct a null-initialized bytes object. - -- Issue #1023290: Add from_bytes() and to_bytes() methods to integers. These - methods allow the conversion of integers to bytes, and vice-versa. - -- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances - from being copied with copy.copy(), and bytes subclasses from being pickled - properly. - -- Code objects now support weak references. - -- Issue #7072: isspace(0xa0) is true on Mac OS X. - -- Issue #8084: PEP 370 now conforms to system conventions for framework builds - on MacOS X. That is, "python setup.py install --user" will install into - "~/Library/Python/2.7" instead of "~/.local". - -C-API ------ - -- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the - variable argument list. `Py_VA_COPY` is equivalent to C99 - `va_copy`, but available on all python platforms. - -- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX] - instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX]. This makes it safe to do - "step = -step" when reversing a slice. - -- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the - interpreter to set sys.argv without also modifying sys.path. This helps fix - `CVE-2008-5983 - `_. - -- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are - strings in an efficient manner. - -- Issue #8276: PyEval_CallObject() is now only available in macro form. The - function declaration, which was kept for backwards compatibility reasons, is - now removed (the macro was introduced in 1997!). - -- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to - PyLong_AsLongAndOverflow. - -- Make PyUnicode_CompareWithASCIIString return not equal if the Python string - has '\0' at the end. - -- Issue #5080: The argument parsing functions PyArg_ParseTuple, - PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and - PyArg_Parse now raise a DeprecationWarning for float arguments passed with the - 'L' format code. This will become a TypeError in a future version of Python, - to match the behaviour of the other integer format codes. - -- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added. - -- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in - PyArg_ParseTupleAndKeywords. - -- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and - PyErr_Format, on machines with HAVE_LONG_LONG defined. - -- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in - PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for - accessing the d_type and d_name members of structures using PyDescr_COMMON. - -- Issue #6405: Remove duplicate type declarations in descrobject.h. - -- The code flags for old __future__ features are now available again. - -- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of - PyCode_Addr2Line(). - -- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code - object at a specified file, function, and line number. - -- Issue #1419652: Change the first argument to PyImport_AppendInittab() to - ``const char *`` as the string is stored beyond the call. - -- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc - allocator will be automatically disabled when running under Valgrind. This - gives improved memory leak detection when running under Valgrind, while taking - advantage of pymalloc at other times. - -Library -------- - -- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the - old commands are restored. - -- For traceback debugging, the pdb listing now also shows the locations where - the exception was originally (re)raised, if it differs from the last line - executed (e.g. in case of finally clauses). - -- The pdb command "source" has been added. It displays the source code for a - given object, if possible. - -- The pdb command "longlist" has been added. It displays the whole source code - for the current function. - -- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error - output into methods. - -- Issue #809887: Make the output of pdb's breakpoint deletions more consistent; - emit a message when a breakpoint is enabled or disabled. - -- Issue #5294: Fix the behavior of pdb's "continue" command when called in the - top-level debugged frame. - -- Issue #5727: Restore the ability to use readline when calling into pdb in - doctests. - -- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the - source file to be debugged is in a non-builtin encoding. - -- Issue #8048: Prevent doctests from failing when sys.displayhook has been - reassigned. - -- Issue #8015: In pdb, do not crash when an empty line is entered as a - breakpoint command. - -- In pdb, allow giving a line number to the "until" command. - -- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc - files. Also, add a command-line option "-c" that runs a command as if given - in .pdbrc. - -- Issue #4179: In pdb, allow "list ." as a command to return to the currently - debugged line. - -- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *`` - entries, consider the first one. - -- Issue #6630: Allow customizing regex flags when subclassing the - string.Template class. - -- Issue #9411: Allow specifying an encoding for config files in the configparser - module. - -- Issue #1682942: Improvements to configparser: support alternate delimiters, - alternate comment prefixes and empty lines in values. - -- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. - -- Issue #8966: ctypes: Remove implicit bytes-unicode conversion. - -- Issue #9378: python -m pickle will now load and display the - first object in the pickle file. - -- Issue #4770: Restrict binascii module to accept only bytes (as specified). - And fix the email package to encode to ASCII instead of ``raw-unicode-escape`` - before ASCII-to-binary decoding. - -- Issue #9384: ``python -m tkinter`` will now display a simple demo applet. - -- The default size of the re module's compiled regular expression cache has been - increased from 100 to 500 and the cache replacement policy has changed from - simply clearing the entire cache on overflow to forgetting the least recently - used cached compiled regular expressions. This is a performance win for - applications that use a lot of regular expressions and limits the impact of - the performance hit anytime the cache is exceeded. - -- Issue #7113: Speed up loading in configparser. Patch by ?ukasz Langa. - -- Issue #9032: XML-RPC client retries the request on EPIPE error. The EPIPE - error occurs when the server closes the socket and the client sends a big - XML-RPC request. - -- Issue #4629: getopt raises an error if an argument ends with "=", whereas - getopt doesn't accept a value (eg. --help= is rejected if getopt uses - ['help='] long options). - -- Issue #7989: Added pure python implementation of the `datetime` module. The C - module is renamed to `_datetime` and if available, overrides all classes - defined in datetime with fast C impementation. Python implementation is based - on the original python prototype for the datetime module by Tim Peters with - minor modifications by the PyPy project. The test suite now tests `datetime` - module with and without `_datetime` acceleration using the same test cases. - -- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). - -- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the - script being traced. Patch by Eli Bendersky. - -- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for - the patch. - -- Issue #3704: http.cookiejar was not properly handling URLs with a / in the - parameters. - -- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument - which controls printing of opcode descriptions in ``dis()`` output. - -- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo - crosses an 8192 byte boundary. - -- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee. - -- ``ast.literal_eval()`` now allows byte literals. - -- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated - keyword arguments called 'self' or 'other' specially. - -- ``ast.literal_eval()`` now allows set literals. - -- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS. - -- Issue #7646: The fnmatch pattern cache no longer grows without bound. - -- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError - produced when profiling the decimal module. This was due to a dangerous - iteration over 'locals()' in Context.__init__. - -- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10 - and the exponent is tiny (for example, ``Decimal(10) ** - Decimal('1e-999999999')``). - -- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError. - -- Issue #9130: Fix validation of relative imports in parser module. - -- Issue #9128: Fix validation of class decorators in parser module. - -- Issue #9094: python -m pickletools will now disassemble pickle files listed in - the command line arguments. See output of python -m pickletools -h for more - details. - -- Issue #5468: urlencode to handle bytes type and other encodings in its query - parameter. Patch by Dan Mahn. - -- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, - ensure that the input string length is a multiple of the frame size. - -- Issue #6507: Accept source strings in dis.dis(). Original patch by Daniel - Urban. - -- Issue #7829: Clearly document that the dis module is exposing an - implementation detail that is not stable between Python VMs or releases. - -- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor - raises an exception. - -- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs - that act as both context managers and decorators. contextmanager changes to - use ContextDecorator. - -- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader - for removal in Python 3.4. - -- Issue #9064: pdb's "up" and "down" commands now accept an optional argument - giving the number of frames to go. - -- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not - ``str`` or ``bytes``. - -- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an - OpenSSL structure. - -- Issue #8682: The ssl module now temporary increments the reference count of a - socket object got through ``PyWeakref_GetObject``, so as to avoid possible - deallocation while the object is still being used. - -- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong - password instead of presenting an interactive prompt. Older behavior can be - obtained by passing retry=True to http_error_xxx methods of FancyURLOpener. - -- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile - smart enough to find source files in the linecache. - -- Issue #5610: feedparser no longer eats extra characters at the end of a body - part if the body part ends with a ``\r\n``. - -- Issue #8986: math.erfc was incorrectly raising OverflowError for values - between -27.3 and -30.0 on some platforms. - -- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows. - -- Issue #8966: If a ctypes structure field is an array of c_char, convert its - value to bytes instead of str (as done for c_char and c_char_p). - -- Issue #8188: Comparisons between Decimal and Fraction objects are now - permitted, returning a result based on the exact numerical values of the - operands. This builds on issue #2531, which allowed Decimal-to-float - comparisons; all comparisons involving numeric types (bool, int, float, - complex, Decimal, Fraction) should now act as expected. - -- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by - Thomas Jollans. - -- Issue #8899: time.struct_time now has class and attribute docstrings. - -- Issue #6470: Drop UNC prefix in FixTk. - -- Issue #4768: base64 encoded email body parts were incorrectly stored as binary - strings. They are now correctly converted to strings. - -- Issue #8833: tarfile created hard link entries with a size field != 0 by - mistake. - -- Charset.body_encode now correctly handles base64 encoding by encoding with the - output_charset before calling base64mime.encode. Passes the tests from 2.x - issue #1368247. - -- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction - attribute that is True iff there are uncommitted changes. - -- Issue #1289118: datetime.timedelta objects can now be multiplied by float and - divided by float and int objects. Results are rounded to the nearest multiple - of timedelta.resolution with ties resolved using round-half-to-even method. - -- Issue #7150: Raise OverflowError if the result of adding or subtracting - timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. - -- Issue #8806: add SSL contexts support to ftplib. - -- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer - and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes - API. - -- Issue #8770: Now sysconfig displays information when it's called as a script. - Initial idea by Sridhar Ratnakumar. - -- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by - Fredrik H??rd. - -- Issue #8540: Decimal module: rename the Context._clamp attribute to - Context.clamp and make it public. This is useful in creating contexts that - correspond to the decimal interchange formats specified in IEEE 754. - -- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM - twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and - StreamWriter classes. - -- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead - of the C file stderr, to use stderr encoding and error handler. - -- Issue #8782: Add a trailing newline in linecache.updatecache to the last line - of files without one. - -- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when - comparing to a non-mapping. - -- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the - correct encoding. - -- Issue #4870: Add an `options` attribute to SSL contexts, as well as several - ``OP_*`` constants to the `ssl` module. This allows to selectively disable - protocol versions, when used in combination with `PROTOCOL_SSLv23`. - -- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. - -- Issue #8663: distutils.log emulates backslashreplace error handler. Fix - compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if - stdout is not a TTY). - -- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value. - subprocess.Popen() and os._execvpe() support bytes program name. Add - os.supports_bytes_environ flag: True if the native OS type of the environment - is bytes (eg. False on Windows). - -- Issue #8633: tarfile is now able to read and write archives with "raw" binary - pax headers as described in POSIX.1-2008. - -- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes, - unquote, unquote_to_bytes. - -- Issue #8688: Distutils now recalculates MANIFEST everytime. - -- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with - surrogates and bytes for the filename. - -- Issue #8550: Add first class ``SSLContext`` objects to the ssl module. - -- Issue #8681: Make the zlib module's error messages more informative when the - zlib itself doesn't give any detailed explanation. - -- The audioop module now supports sound fragments of length greater than 2**31 - bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN. - -- Issue #4972: Add support for the context manager protocol to the ftplib.FTP - class. - -- Issue #8664: In py_compile, create __pycache__ when the compiled path is - given. - -- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes - for use in the file system, environment variables or the command line. - -- Issue #8571: Fix an internal error when compressing or decompressing a chunk - larger than 1GB with the zlib module's compressor and decompressor objects. - -- Issue #8603: Support bytes environmental variables on Unix: Add os.environb - mapping and os.getenvb() function. os.unsetenv() encodes str argument to the - file system encoding with the surrogateescape error handler (instead of - utf8/strict) and accepts bytes. posix.environ keys and values are now bytes. - -- Issue #8573: asyncore _strerror() function might throw ValueError. - -- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error - messages when accessing undefined class attributes because of the cheap - inheritance with the underlying socket object. The cheap inheritance has been - deprecated. - -- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. - Patch by Tres Seaver. - -- Issue #8390: tarfile uses surrogateescape as the default error handler - (instead of replace in read mode or strict in write mode). - -- Issue #7755: Use an unencumbered audio file for tests. - -- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent - and any children created using ``os.fork`` on MacOS X 10.6. - -- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal - operation raises multiple signals and more than one of those signals is - trapped, the specification determines the order in which the signals should be - handled. In many cases this order wasn't being followed, leading to the wrong - Python exception being raised. - -- Issue #7865: The close() method of ``io`` objects should not swallow - exceptions raised by the implicit flush(). Also qensure that calling close() - several times is supported. Patch by Pascal Chambon. - -- Issue #4687: Fix accuracy of garbage collection runtimes displayed with - gc.DEBUG_STATS. - -- Issue #8354: The siginterrupt setting is now preserved for all signals, not - just SIGCHLD. - -- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does - webbrowser.get("safari"). - -- Issue #8464: tarfile no longer creates files with execute permissions set when - mode="w|" is used. - -- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of - the Linux kernel. Patch by Yaniv Aknin. - -- Issue #8295: Added shutil.unpack_archive. - -- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. - It should correctly return an empty response now. - -- Issue #8546: Reject None given as the buffering argument to _pyio.open. - -- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by - Sridhar Ratnakumar. - -- Issue #6656: fix locale.format_string to handle escaped percents - and mappings. - -- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where - the method could block indefinitely if called just before the event loop - started running. This also fixes the occasional freezes witnessed in - test_httpservers. - -- Issue #8524: When creating an SSL socket, the timeout value of the original - socket wasn't retained (instead, a socket with a positive timeout would be - turned into a non-blocking SSL socket). - -- Issue #5103: SSL handshake would ignore the socket timeout and block - indefinitely if the other end didn't respond. - -- The do_handshake() method of SSL objects now adjusts the blocking mode of the - SSL structure if necessary (as other methods already do). - -- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and - bytes strings for environment keys and values. - -- Issue #8467: Pure Python implementation of subprocess encodes the error - message using surrogatepass error handler to support surrogates in the - message. - -- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames. - -- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the - string "python" as the *ident*. openlog() arguments are all optional and - keywords. - -- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a - non-infinite timeout. Also make that method friendlier with applications - wanting to continue using the socket in clear-text mode, by disabling - OpenSSL's internal readahead. Thanks to Darryl Miles for guidance. - -- Issue #8496: make mailcap.lookup() always return a list, rather than an - iterator. Patch by Gregory Nofi. - -- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the - collation name contains a surrogate character. - -- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl - extension, such that verification of some SSL certificates doesn't fail - because of an "unknown algorithm". - -- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree. - -- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree. - -- Issue #4814: timeout parameter is now applied also for connections resulting - from PORT/EPRT commands. - -- Issue #8463: added missing reference to bztar in shutil's documentation. - -- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as - long as the user didn't specify 'automatic proxy configuration'). - -- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code - as stated in RFC-959 at chapter 5.4. - -- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with - surrogates. - -- Issue #850728: Add a *timeout* parameter to the `acquire()` method of - `threading.Semaphore` objects. Original patch by Torsten Landschoff. - -- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the - available cipher list. Helps fix test_ssl with OpenSSL 1.0.0. - -- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for - the current working directory. - -- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII - using backslashreplace error handler. - -- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. - -- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony - Locke and Hans Ulrich Niedermann. - -- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. - -- Issue #7316: The acquire() method of lock objects in the ``threading`` - module now takes an optional timeout argument in seconds. Timeout support - relies on the system threading library, so as to avoid a semi-busy wait loop. - -- Issue #8383: pickle and pickletools use surrogatepass error handler when - encoding unicode as utf8 to support lone surrogates and stay compatible with - Python 2.x and 3.x. - -- Issue #7585: difflib context and unified diffs now place a tab between - filename and date, conforming to the 'standards' they were originally designed - to follow. This improves compatibility with patch tools. - -- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 - character sets will now consistently use a Content-Transfer-Encoding of 7bit - rather than sometimes being marked as 8bit. - -- Issue #8375: test_distutils now checks if the temporary directory are still - present before it cleans them. - -- Issue #8374: Update the internal alias table in the ``locale`` module to - cover recent locale changes and additions. - -- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module, - using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and - `ssl.OPENSSL_VERSION_NUMBER`. - -- Add functools.total_ordering() and functools.cmp_to_key(). - -- Issue #8257: The Decimal construct now accepts a float instance directly, - converting that float to a Decimal of equal value: - - >>> Decimal(1.1) - Decimal('1.100000000000000088817841970012523233890533447265625') - -- Issue #8294: The Fraction constructor now accepts Decimal and float instances - directly. - -- Issue #7279: Comparisons involving a Decimal signaling NaN now signal - InvalidOperation instead of returning False. (Comparisons involving a quiet - NaN are unchanged.) Also, Decimal quiet NaNs are now hashable; Decimal - signaling NaNs remain unhashable. - -- Issue #2531: Comparison operations between floats and Decimal instances now - return a result based on the numeric values of the operands; previously they - returned an arbitrary result based on the relative ordering of id(float) and - id(Decimal). See also issue #8188, which adds Decimal-to-Fraction - comparisons. - -- Added a subtract() method to collections.Counter(). - -- Issue #8233: When run as a script, py_compile.py optionally takes a single - argument `-` which tells it to read files to compile from stdin. Each line is - read on demand and the named file is compiled immediately. (Original patch by - Piotr O?arowski). - -- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and - form feed (0x0C) are now considered linebreaks, as specified in Unicode - Standard Annex #14. See issue #7643. http://www.unicode.org/reports/tr14/ - -- Comparisons using one of <, <=, >, >= between a complex instance and a - Fractions instance now raise TypeError instead of returning True/False. This - makes Fraction <=> complex comparisons consistent with int <=> complex, float - <=> complex, and complex <=> complex comparisons. - -- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some - methods (such as oss_mixer_device.fileno()) were not available. Initial patch - by Bertrand Janin. - -- Issue #8205: Remove the "Modules" directory from sys.path when Python is - running from the build directory (POSIX only). - -- Issue #7512: shutil.copystat() could raise an OSError when the filesystem - didn't support chflags() (for example ZFS under FreeBSD). The error is now - silenced. - -- Issue #7860: platform.uname now reports the correct 'machine' type when Python - is running in WOW64 mode on 64 bit Windows. - -- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets. - Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking - reads and writes are always retried by OpenSSL itself. - -- Issue #4282: Fix the main function of the profile module for a non-ASCII - script, open the file in binary mode and not in text mode with the default - (utf8) encoding. - -- Issue #8179: Fix macpath.realpath() on a non-existing path. - -- Issue #8024: Update the Unicode database to 5.2. - -- Issue #8168: py_compile now handles files with utf-8 BOMS. - -- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is - detected. - -- Issue #6716/2: Backslash-replace error output in compilall. - -- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox - with Tcl/Tk-8.5. - -- Issue #8140: extend compileall to compile single files. Add -i option. - -- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the - locale. - -- The internals of the subprocess module on POSIX systems have been replaced by - an extension module (_posixsubprocess) so that the fork()+exec() can be done - safely without the possibility of deadlock in multithreaded applications. - -- subprocess.Popen now has restore_signals and start_new_session features. The - default of restore_signals=True is a new behavior compared to earlier Python - versions. This means that signals such as SIGPIPE are not ignored by default - in subprocesses launched by Python (Issue #1652). - -- Issue #6472: The xml.etree package is updated to ElementTree 1.3. The - cElementTree module is updated too. - -- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to - an non existent program name and Python is unable to retrieve the real program - name. - -- Issue #7880: Fix sysconfig when the python executable is a symbolic link. - -- Issue #6509: fix re.sub to work properly when the pattern, the string, and the - replacement were all bytes. Patch by Antoine Pitrou. - -- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure - bugs and allows loading SQLite extensions from shared libraries. - -- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public - Review Issue #29 (http://unicode.org/review/pr-29.html). - -- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, - reset also the pointer to the current pointer context. - -- Issue #7232: Add support for the context manager protocol to the TarFile - class. - -- Issue #7250: Fix info leak of os.environ across multi-run uses of - wsgiref.handlers.CGIHandler. - -- Issue #1729305: Fix doctest to handle encode error with "backslashreplace". - -- Issue #691291: codecs.open() should not convert end of lines on reading and - writing. - -- Issue #7869: logging: improved diagnostic for format-time errors. - -- Issue #7868: logging: added loggerClass attribute to Manager. - -- logging: Implemented PEP 391. - -- Issue #1537721: Add a writeheader() method to csv.DictWriter. - -- Issue #7959: ctypes callback functions are now registered correctly with the - cycle garbage collector. - -- Issue #5801: removed spurious empty lines in wsgiref. - -- Issue #6666: fix bug in trace.py that applied the list of directories to be - ignored only to the first file. Noted by Bogdan Opanchuk. - -- Issue #7597: curses.use_env() can now be called before initscr(). Noted by - Kan-Ru Chen. - -- Issue #7310: fix the __repr__ of os.environ to show the environment variables. - -- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822 - messages parsed by email.Parser.HeaderParser. - -- Issue #7361: Importlib was not properly checking the number of bytes in - bytecode file when it was less then 8 bytes. - -- Issue #7633: In the decimal module, Context class methods (with the exception - of canonical and is_canonical) now accept instances of int and long wherever a - Decimal instance is accepted, and implicitly convert that argument to Decimal. - Previously only some arguments were converted. - -- Issue #7835: shelve should no longer produce mysterious warnings during - interpreter shutdown. - -- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML - processing instructions and comments. These raw characters are allowed by the - XML specification, and are necessary when outputting e.g. PHP code in a - processing instruction. Patch by Neil Muller. - -- Issue #6233: ElementTree failed converting unicode characters to XML entities - when they could't be represented in the requested output encoding. Patch by - Jerry Chen. - -- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the - compression type. - -- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is - specified, rather than fall through to AF_PACKET (in the `socket` module). - Also, raise ValueError rather than TypeError when an unknown TIPC address type - is specified. Patch by Brian Curtin. - -- Issue #6939: Fix file I/O objects in the `io` module to keep the original file - position when calling `truncate()`. It would previously change the file - position to the given argument, which goes against the tradition of - ftruncate() and other truncation APIs. Patch by Pascal Chambon. - -- Issue #7610: Reworked implementation of the internal - ``zipfile.ZipExtFile`` class used to represent files stored inside an - archive. The new implementation is significantly faster and can be wrapped in - a ``io.BufferedReader`` object for more speedups. It also solves an - issue where interleaved calls to `read()` and `readline()` give wrong results. - Patch by Nir Aides. - -- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, - allowing for a maximum number of tasks within the pool to be completed by the - worker before that worker is terminated, and a new one created to replace it. - -- Issue #7792: Registering non-classes to ABCs raised an obscure error. - -- Issue #7785: Don't accept bytes in FileIO.write(). - -- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. - -- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when - the release file is empty. - -- Issue #7561: Fix crashes when using bytearray objects with the posix - module. - -- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in - multipart/signed MIME parts, which fixes one of the sources of invalid - modifications to such parts by Generator. - -- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`. Patch - by Florent Xicluna, along with some additional tests. - -- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte - argument. Patch by Victor Stinner. - -- Issue #3299: Fix possible crash in the _sre module when given bad argument - values in debug mode. Patch by Victor Stinner. - -- Issue #2846: Add support for gzip.GzipFile reading zero-padded files. Patch - by Brian Curtin. - -- Issue #7681: Use floor division in appropiate places in the wave module. - -- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since - Extension extra options may change the output without changing the .c - file). Initial patch by Collin Winter. - -- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc - when it has a fully qualified configuration prefix. Initial patch by Arfrever. - -- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the - destruction of weakref'ed objects while iterating. - -- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor - Stinner. - -- Issue #1628205: Socket file objects returned by socket.socket.makefile() now - properly handles EINTR within the read, readline, write & flush methods. The - socket.sendall() method now properly handles interrupted system calls. - -- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and - make it implement the `io.BufferedIOBase` ABC to allow for further speedups by - wrapping it in an `io.BufferedReader`. Patch by Nir Aides. - -- Issue #3972: http.client.HTTPConnection now accepts an optional source_address - parameter to allow specifying where your connections come from. - -- socket.create_connection now accepts an optional source_address parameter. - -- Issue #5511: now zipfile.ZipFile can be used as a context manager. Initial - patch by Brian Curtin. - -- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML - Manifest file in text mode so string patterns can be used in regular - expressions. - -- Issue #7552: Removed line feed in the base64 Authorization header in the - Distutils upload command to avoid an error when PyPI reads it. This occurs on - long passwords. Initial patch by JP St. Pierre. - -- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by - Tatsuhiro Tsujikawa. - -- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a - TypeError when given an `str` object (rather than a `bytes`-like object). - Patch by Victor Stinner and Florent Xicluna. - -- Issue #7349: Make methods of file objects in the io module accept None as an - argument where file-like objects (ie StringIO and BytesIO) accept them to mean - the same as passing no argument. - -- Issue #7357: tarfile no longer suppresses fatal extraction errors by default. - -- Issue #5949: added check for correct lineends in input from IMAP server in - imaplib. - -- Add count() and reverse() methods to collections.deque(). - -- Fix variations of extending deques: d.extend(d) d.extendleft(d) d+=d - -- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong - parameter types. Patch by Victor Stinner. - -- Issue #7457: added a read_pkg_file method to - distutils.dist.DistributionMetadata. - -- logging: Added optional `secure` parameter to SMTPHandler, to enable use of - TLS with authentication credentials. - -- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated - in Distutils. Patch by Stephen Emslie. - -- Issue #4120: Drop reference to CRT from manifest when building extensions with - msvc9compiler. - -- Issue #7333: The `posix` module gains an `initgroups()` function providing - access to the initgroups(3) C library call on Unix systems which implement it. - Patch by Jean-Paul Calderone. - -- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group - ownership when the group is not forced, because the group may be different - from the user's group and inherit from its container when the test is run. - -- Issue #4486: When an exception has an explicit cause, do not print its - implicit context too. This affects the `traceback` module as well as built-in - exception printing. - -- Issue #1515: Enable use of deepcopy() with instance methods. Patch by Robert - Collins. - -- Issue #7403: logging: Fixed possible race condition in lock creation. - -- Issue #6845: Add restart support for binary upload in ftplib. The - `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` - argument. Patch by Pablo Mouzo. - -- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method - returning the total number of seconds in the duration. Patch by Brian - Quinlan. - -- Issue #7133: SSL objects now support the new buffer API. - -- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters. - -- Issue #6123: tarfile now opens empty archives correctly and consistently - raises ReadError on empty files. - -- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2. - -- Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead - of __str__. - -- Issue #7341: Close the internal file object in the TarFile constructor in case - of an error. - -- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh - Windows box. Help provided by David Bolen. - -- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS - or SSL. Patch by Giampaolo Rodola'. - -- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch. - -- Issue #4969: The mimetypes module now reads the MIME database from the - registry under Windows. Patch by Gabriel Genellina. - -- Issue #6816: runpy now provides a run_path function that allows Python code to - execute file paths that refer to source or compiled Python files as well as - zipfiles, directories and other valid sys.path entries that contain a - __main__.py file. This allows applications that run other Python scripts to - support the same flexibility as the CPython command line itself. - -- Issue #7318: multiprocessing now uses a timeout when it fails to establish a - connection with another process, rather than looping endlessly. The default - timeout is 20 seconds, which should be amply sufficient for local connections. - -- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and - unpickled. This fixes crashes under Windows when trying to run - test_multiprocessing in verbose mode. - -- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass`` - argument added to the TextTestRunner constructor allowing a different result - class to be used without having to subclass. - -- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test - name in failure reports even if the test has a docstring. - -- Issue #3001: Add a C implementation of recursive locks which is used by - default when instantiating a `threading.RLock` object. This makes recursive - locks as fast as regular non-recursive locks (previously, they were slower by - 10x to 15x). - -- Issue #7282: Fix a memory leak when an RLock was used in a thread other than - those started through `threading.Thread` (for example, using - `_thread.start_new_thread()`). - -- Issue #7187: Importlib would not silence the IOError raised when trying to - write new bytecode when it was made read-only. - -- Issue #7264: Fix a possible deadlock when deallocating thread-local objects - which are part of a reference cycle. - -- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent - objects on 64-bit systems. Patch by Michael Broghton. - -- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a - modification is done through it. This fixes inconsistencies and test failures - on systems with slightly bogus mtime behaviour. - -- Issue #7246 & Issue #7208: getpass now properly flushes input before reading - from stdin so that existing input does not confuse it and lead to incorrect - entry or an IOError. It also properly flushes it afterwards to avoid the - terminal echoing the input afterwards on OSes such as Solaris. - -- Issue #7233: Fix a number of two-argument Decimal methods to make sure that - they accept an int or long as the second argument. Also fix buggy handling of - large arguments (those with coefficient longer than the current precision) in - shift and rotate. - -- Issue #4750: Store the basename of the original filename in the gzip FNAME - header as required by RFC 1952. - -- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in - Distutils. - -- Issue #7218: Fix test_site for win32, the directory comparison was done with - an uppercase. - -- Issue #7205: Fix a possible deadlock when using a BZ2File object from - several threads at once. - -- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424. - -- Issue #7099: Decimal.is_normal now returns True for numbers with exponent - larger than emax. - -- Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows - platforms, and assorted locale fixes by Derk Drukker. - -- Issue #5833: Fix extra space character in readline completion with the GNU - readline library version 6.0. - -- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment. - -- Issue #7086: Added TCP support to SysLogHandler, and tidied up some - anachronisms in the code which were a relic of 1.5.2 compatibility. - -- Issue #7082: When falling back to the MIME 'name' parameter, the correct place - to look for it is the Content-Type header. - -- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the - builtin tokenizer. - -- Issue #7048: Force Decimal.logb to round its result when that result is too - large to fit in the current precision. - -- Issue #6236, #6348: Fix various failures in the I/O library under AIX and - other platforms, when using a non-gcc compiler. Patch by Derk Drukker. - -- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now - always result in NULL. - -- Issue #5042: Structure sub-subclass does now initialize correctly with base - class positional arguments. - -- Issue #6882: Import uuid creates zombies processes. - -- Issue #6635: Fix profiler printing usage message. - -- Issue #6856: Add a filter keyword argument to TarFile.add(). - -- Issue #6888: pdb's alias command was broken when no arguments were given. - -- Issue #6857: Default format() alignment should be '>' for Decimal instances. - -- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning - NaN or raising InvalidContext. Also, fix infinite recursion in - long(Decimal('nan')). - -- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no - type specifier. - -- Issue #6239: ctypes.c_char_p return value must return bytes. - -- Issue #6838: Use a list to accumulate the value instead of repeatedly - concatenating strings in http.client's HTTPResponse._read_chunked providing a - significant speed increase when downloading large files servend with a - Transfer-Encoding of 'chunked'. - -- Trying to import a submodule from a module that is not a package, ImportError - should be raised, not AttributeError. - -- When the globals past to importlib.__import__() has __package__ set to None, - fall back to computing what __package__ should be instead of giving up. - -- Raise a TypeError when the name of a module to be imported for - importlib.__import__ is not a string (was raising an AttributeError before). - -- Allow the fromlist passed into importlib.__import__ to be any iterable. - -- Have importlib raise ImportError if None is found in sys.modules. - -- Issue #6054: Do not normalize stored pathnames in tarfile. - -- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN - payloads are now ordered by integer value rather than lexicographically. - -- Issue #1356969: Add missing info methods in tix.HList. - -- Issue #1522587: New constants and methods for the tix.Grid widget. - -- Issue #1250469: Fix the return value of tix.PanedWindow.panes. - -- Issue #1119673: Do not override tkinter.Text methods when creating a - ScrolledText. - -- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. - -- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview* - and yview* methods. - -- Issue #6629: Fix a data corruption issue in the new I/O library, which could - occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or - "wb+" mode) after having buffered a certain amount of data for reading. This - bug was not present in the pure Python implementation. - -- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in - POP3.apop. - -- Issue #2715: Remove remnants of Carbon.File from binhex module. - -- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal - digits in input, as recommended by the standard. Previously it was restricted - to accepting [0-9]. - -- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT - DO/DONT correctly. - -- Issue #1424152: Fix for http.client, urllib.request to support SSL while - working through proxy. Original patch by Christopher Li, changes made by - Senthil Kumaran. - -- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for - loaders that allow for modules to be executed. Both importlib.abc.PyLoader and - PyPycLoader inherit from this class and provide implementations in relation to - other methods required by the ABCs. - -- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like - the documentation said it did even though the code in PyLoader relied on the - abstract method required by ResourceLoader. - -- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how - to handle a comparison without loss of precision. Also add correct handling - of infinities and nans for comparisons with float. - -- Issue #6415: Fixed warnings.warn segfault on bad formatted string. - -- Issue #6358: The exit status of a command started with os.popen() was reported - differently than it did with python 2.x. - -- Issue #6323: The pdb debugger did not exit when running a script with a syntax - error. - -- Issue #3392: The subprocess communicate() method no longer fails in select() - when file descriptors are large; communicate() now uses poll() when possible. - -- Issue #6369: Fix an RLE decompression bug in the binhex module. - -- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. - -- The deprecated function string.maketrans has been removed. - -- Issue #4005: Fixed a crash of pydoc when there was a zip file present in - sys.path. - -- Issue #6218: io.StringIO and io.BytesIO instances are now picklable. - -- The os.get_exec_path() function to return the list of directories that will be - searched for an executable when launching a subprocess was added. - -- Issue #7481: When a threading.Thread failed to start it would leave the - instance stuck in initial state and present in threading.enumerate(). - -- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid - and os.read system calls where appropriate. - -- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t. - -- Issue #6247: The argparse module has been added to the standard library. - -- Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is a socket - option available on FreeBSD 7.1 and newer. - -- Issue #9315: Fix for the trace module to record correct class name - for tracing methods. - -Extension Modules ------------------ - -- Issue #9959: Tweak formula used for computing math.log of an integer, - making it marginally more accurate for exact powers of 2. - -- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. - -- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly - compared to other unix systems. In particular, os.getgroups() does not reflect - any changes made using os.setgroups() but basicly always returns the same - information as the id command. os.getgroups() can now return more than 16 - groups on MacOSX. - -- Issue #6095: Make directory argument to os.listdir optional. - -- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g., - struct.pack('>?')): if conversion to bool raised an exception then that - exception wasn't properly propagated on machines where char is unsigned. - -- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when - they contain instances of old-style classes. - -- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany - existing isinf and isnan functions. - -- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason - R. Coombs. - -- In struct.pack, correctly propogate exceptions from computing the truth of an - object in the '?' format. - -- Issue #9000: datetime.timezone objects now have eval-friendly repr. - -- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as - special methods. - -- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000. - Prior to this change, timezone adjustment in utctimetuple() could produce - tm_year value of 0 or 10,000. Now an OverflowError is raised in these edge - cases. - -- Issue #6641: The ``datetime.strptime`` method now supports the ``%z`` - directive. When the ``%z`` directive is present in the format string, an - aware ``datetime`` object is returned with ``tzinfo`` bound to a - ``datetime.timezone`` instance constructed from the parsed offset. If both - ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone - name, but ``%Z`` data without ``%z`` is discarded. - -- Issue #5094: The ``datetime`` module now has a simple concrete class - implementing ``datetime.tzinfo`` interface. Instances of the new class, - ``datetime.timezone``, return fixed name and UTC offset from their - ``tzname(dt)`` and ``utcoffset(dt)`` methods. The ``dst(dt)`` method always - returns ``None``. A class attribute, ``utc`` contains an instance - representing the UTC timezone. Original patch by Rafe Kaplan. - -- Issue #8973: Add __all__ to struct module; this ensures that help(struct) - includes documentation for the struct.Struct class. - -- Issue #3129: Trailing digits in struct format string are no longer ignored. - For example, "1" or "ilib123" are now invalid formats and cause - ``struct.error`` to be raised. Patch by Caleb Deveraux. - -- Issue #7384: If the system readline library is linked against ncurses, the - curses module must be linked against ncurses as well. Otherwise it is not safe - to load both the readline and curses modules in an application. - -- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA, - requiring a re-try in order to get the complete result. - -- Issue #8692: Optimize math.factorial: replace the previous naive algorithm - with an improved 'binary-split' algorithm that uses fewer multiplications and - allows many of the multiplications to be performed using plain C integer - arithmetic instead of PyLong arithmetic. Also uses a lookup table for small - arguments. - -- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing - overflow checks in the audioop module. - -- Issue #8644: The accuracy of td.total_seconds() has been improved (by - calculating with integer arithmetic instead of float arithmetic internally): - the result is now always correctly rounded, and is equivalent to ``td / - timedelta(seconds=1)``. - -- Issue #2706: Allow division of a timedelta by another timedelta: timedelta / - timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta, - timedelta) are all supported. - -- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. - -- Issue #8300: When passing a non-integer argument to struct.pack with any - integer format code, struct.pack first attempts to convert the non-integer - using its __index__ method. If that method is non-existent or raises - TypeError it goes on to try the __int__ method, as described below. - -- Issue #8142: Update libffi to the 3.0.9 release. - -- Issue #6949: Allow the _dbm extension to be built with db 4.8.x. - -- Issue #6544: Fix a reference leak in the kqueue implementation's error - handling. - -- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as - msvcr100.dll is not a platform assembly anymore. - -- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. - -- Issue #7078: Set struct.__doc__ from _struct.__doc__. - -- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module. - -- Issue #6877: It is now possible to link the readline extension to the libedit - readline emulation on OSX 10.5 or later. - -- Issue #6848: Fix curses module build failure on OS X 10.6. - -- Fix a segfault that could be triggered by expat with specially formed input. - -- Issue #6561: '\d' in a regex now matches only characters with Unicode category - 'Nd' (Number, Decimal Digit). Previously it also matched characters with - category 'No'. - -- Issue #4509: Array objects are no longer modified after an operation failing - due to the resize restriction in-place when the object has exported buffers. - -- Issue #2389: Array objects are now pickled in a portable manner. - -- Expat: Fix DoS via XML document with malformed UTF-8 sequences - (CVE_2009_3560). - -- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread - could raise an incorrect RuntimeError about not holding the import lock. The - import lock is now reinitialized after fork. - -- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 - parameter on some platforms such as OS X. - -- Build the ossaudio extension on GNU/kFreeBSD. - -- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in - the return value of QueryReflectionKey. - -- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice. - -Build ------ - -- Use OpenSSL 1.0.0a on Windows. - -- Issue #9280: Make sharedinstall depend on sharedmods. - -- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting - override the configure and makefile defaults, without deleting options the - user didn't intend to override. Developers should no longer need to specify - OPT or EXTRA_CFLAGS, although those variables are still present for - backward-compatibility. - -- Issue #8854: Fix finding Visual Studio 2008 on Windows x64. - -- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for - multiprocessing only. - -- Issue #8625: Turn off optimization in --with-pydebug builds with gcc. - (Optimization was unintentionally turned on in gcc --with-pydebug builds as a - result of the issue #1628484 fix, combined with autoconf's strange choice of - default CFLAGS produced by AC_PROG_CC for gcc.) - -- Issue #3646: It is now easily possible to install a Python framework into your - home directory on MacOSX, see Mac/README for more information. - -- Issue #3928: os.mknod() now available in Solaris, also. - -- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not - give false warnings. - -- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable - anymore. It also forwards the LDFLAGS settings to the linker when building a - shared library. - -- Issue #6716: Quote -x arguments of compileall in MSI installer. Exclude 2to3 - tests from compileall. - -- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. - -- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private - memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free - instead. Also disable caching of powers of 5. - -- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built. - -- Issue #6943: Use pkg-config to find the libffi headers when the - --with-system-ffi flag is used. - -- Issue #7609: Add a --with-system-expat option that causes the system's expat - library to be used for the pyexpat module instead of the one included with - Python. - -- Issue #7589: Only build the nis module when the correct header files are - found. - -- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. - -- Issue #5792: Extend the short float repr support to x86 systems using - icc or suncc. - -- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles - correctly under gcc on x86-64. This fixes a reported problem with the - --with-tsc build on x86-64. - -- Issue #6802: Fix build issues on MacOSX 10.6. - -- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6. - -- Issue #4601: 'make install' did not set the appropriate permissions on - directories. - -- Issue #5390: Add uninstall icon independent of whether file extensions are - installed. - -- Issue #7541: When using ``python-config`` with a framework install the - compiler might use the wrong library. - -- python-config now supports multiple options on the same command line. - -- Issue #8509: Fix quoting in help strings and code snippets in configure.in. - -- Issue #8510: Update to autoconf2.65. - -Documentation -------------- - -- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses - to Doc/license.rst. - -- Issue #9524: Document that two CTRL* signals are meant for use only - with os.kill. - -- Issue #9255: Document that the 'test' package is meant for internal Python use - only. - -- A small WSGI server was added as Tools/scripts/serve.py, and is used to - implement a local documentation server via 'make serve' in the doc directory. - -- Updating `Using Python` documentation to include description of CPython's -J - and -X options. - -- Document that importing a module that has None in sys.modules triggers an - ImportError. - -- Issue #6556: Fixed the Distutils configuration files location explanation for - Windows. - -- Update python manual page (options -B, -O0, -s, environment variables - PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). - -- Issue #8909: Added the size of the bitmap used in the installer created by - distutils' bdist_wininst. Patch by Anatoly Techtonik. - -Tests ------ - -- Issue #9251: test_threaded_import didn't fail when run through regrtest if the - import lock was disabled. - -- Issue #8605: Skip test_gdb if Python is compiled with optimizations. - -- Issue #7449: Skip test_socketserver if threading support is disabled. - -- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled - by a decompressor object without errors (it returns incomplete uncompressed - data). - -- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid - UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding). - -- Issue #8576: Remove use of find_unused_port() in test_smtplib and - test_multiprocessing. Patch by Paul Moore. - -- Issue #7449: Fix many tests to support Python compiled without thread - support. Patches written by Jerry Seutter. - -- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of - SSL shutdowns. - -- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written - by Dave Malcolm. - -- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any - thread was previously started, most likely due to a platform bug. - -- Issue #8193: Fix test_zlib failure with zlib 1.2.4. - -- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi. - -- Issue #8263: Now regrtest.py will report a failure if it receives a - KeyboardInterrupt (SIGINT). - -- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special - Unicode normalization cases. - -- Issue #7783: test.support.open_urlresource invalidates the outdated files from - the local cache. - -- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are - effectively raised. - -- The four path modules (genericpath, macpath, ntpath, posixpath) share a common - TestCase for some tests: test_genericpath.CommonTest. - -- Print platform information when running the whole test suite, or using the - --verbose flag. - -- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly - filesystem encoding. - -- Issue #6292: for the moment at least, the test suite runs cleanly if python is - run with the -OO flag. Tests requiring docstrings are skipped. - -- Issue #7712: test.support gained a new `temp_cwd` context manager which is now - also used by regrtest to run all the tests in a temporary directory. The - original CWD is saved in `support.SAVEDCWD`. Thanks to Florent Xicluna who - helped with the patch. - -- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi - (only seen so far on platforms where the curses module wasn't built), due to - an uncleared exception. - -- Issue #7728: test_timeout was changed to use support.bind_port instead of a - hard coded port. - -- Issue #7376: Instead of running a self-test (which was failing) when called - with no arguments, doctest.py now gives a usage message. - -- Issue #7396: fix regrtest -s, which was broken by the -j enhancement. - -- Issue #7498: test_multiprocessing now uses test.support.find_unused_port - instead of a hardcoded port number in test_rapid_restart. - -- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file - in the Lib/test directory, which might be read-only for the user running the - tests. - -- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case - of an option with no handler. - -- Issue #7312: Add a -F flag to run the selected tests in a loop until a test - fails. Can be combined with -j. - -- Issue #6551: test_zipimport could import and then destroy some modules of the - encodings package, which would make other tests fail further down the road - because the internally cached encoders and decoders would point to empty - global variables. - -- Issue #7295: Do not use a hardcoded file name in test_tarfile. - -- Issue #7270: Add some dedicated unit tests for multi-thread synchronization - primitives such as Lock, RLock, Condition, Event and Semaphore. - -- Issue #7248 (part 2): Use a unique temporary directory for importlib source - tests instead of tempfile.tempdir. This prevents the tests from sharing state - between concurrent executions on the same system. - -- Issue #7248: In importlib.test.source.util a try/finally block did not make - sure that some referenced objects actually were created in the block before - calling methods on the object. - -- Issue #7222: Make thread "reaping" more reliable so that reference - leak-chasing test runs give sensible results. The previous method of reaping - threads could return successfully while some Thread objects were still - referenced. This also introduces a new private function: - ``_thread._count()``. - -- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer - runs the risk of causing the worker thread to fail. - -- Issue #7055: test___all__ now greedily detects all modules which have an - __all__ attribute, rather than using a hardcoded and incomplete list. - -- Issue #7058: Added save/restore for things like sys.argv and cwd to - runtest_inner in regrtest, with warnings if the called test modifies them, and - a new section in the summary report at the end. - -- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. - -- Fixed tests in importlib.test.source.test_abc_loader that were masking the - proper exceptions that should be raised for missing or improper code object - bytecode. - -- Removed importlib's custom test discovery code and switched to - unittest.TestLoader.discover(). - -Tools/Demos ------------ - -- Issue #5464, #8974: Implement plural forms in msgfmt.py. - -- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were - added to the `Tools/` directory. They were previously living in the sandbox. - - -What's New in Python 3.1? -========================= - -*Release date: 27-June-2009* - -Core and Builtins ------------------ - -- Issue #6334: Fix bug in range length calculation for ranges with - large arguments. - -- Issue #6329: Fixed iteration for memoryview objects (it was being blocked - because it wasn't recognized as a sequence). - -Library -------- - -- Issue #6126: Fixed pdb command-line usage. - -- Issue #6314: logging: performs extra checks on the "level" argument. - -- Issue #6274: Fixed possible file descriptors leak in subprocess.py - -- Accessing io.StringIO.buffer now raises an AttributeError instead of - io.UnsupportedOperation. - -- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. - (On Unix) - -- Issue #1202: zipfile module would cause a struct.error when attempting to - store files with a CRC32 > 2**31-1. - -Extension Modules ------------------ - -- Issue #5590: Remove unused global variable in pyexpat extension. - - -What's New in Python 3.1 Release Candidate 2? -============================================= - -*Release date: 13-June-2009* - -Core and Builtins ------------------ - -- Fixed SystemError triggered by "range([], 1, -1)". - -- Issue #5924: On Windows, a large PYTHONPATH environment variable - (more than 255 characters) would be completely ignored. - -- Issue #4547: When debugging a very large function, it was not always - possible to update the lineno attribute of the current frame. - -- Issue #5330: C functions called with keyword arguments were not reported by - the various profiling modules (profile, cProfile). Patch by Hagen F?rstenau. - -Library -------- - -- Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular - expression string pattern was trying to match against a bytes returned by - Popen. Tested under win32 to build the py-postgresql project. - -- Issue #6258: Support AMD64 in bdist_msi. - -- Issue #6195: fixed doctest to no longer try to read 'source' data from - binary files. - -- Issue #5262: Fixed bug in next rollover time computation in - TimedRotatingFileHandler. - -- Issue #6217: The C implementation of io.TextIOWrapper didn't include the - errors property. Additionally, the errors and encoding properties of StringIO - are always None now. - -- Issue #6137: The pickle module now translates module names when loading - or dumping pickles with a 2.x-compatible protocol, in order to make data - sharing and migration easier. This behaviour can be disabled using the - new `fix_imports` optional argument. - -- Removed the ipaddr module. - -- Issue #3613: base64.{encode,decode}string are now called - base64.{encode,decode}bytes which reflects what type they accept and return. - The old names are still there as deprecated aliases. - -- Issue #5767: Remove sgmlop support from xmlrpc.client. - -- Issue #6150: Fix test_unicode on wide-unicode builds. - -- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty - parameters. - -Windows -------- - -- Issue #6221: Delete test registry key before running the test. - -- Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. - -C-API ------ - -- Issue #5735: Python compiled with --with-pydebug should throw an - ImportError when trying to import modules compiled without - --with-pydebug, and vice-versa. - - -Build ------ - -- Issue #6154: Make sure the intl library is added to LIBS if needed. Also - added LIBS to OS X framework builds. - -- Issue #5809: Specifying both --enable-framework and --enable-shared is - an error. Configure now explicity tells you about this. - - - -What's New in Python 3.1 release candidate 1? -============================================= - -*Release date: 2009-05-30* - -Core and Builtins ------------------ - -- Issue #6097: Escape UTF-8 surrogates resulting from mbstocs conversion - of the command line. - -- Issue #6012: Add cleanup support to O& argument parsing. - -- Issue #6089: Fixed str.format with certain invalid field specifiers - that would raise SystemError. - -- Issue #5982: staticmethod and classmethod now expose the wrapped - function with __func__. - -- Added support for multiple context managers in the same with-statement. - Deprecated contextlib.nested() which is no longer needed. - -- Issue #5829: complex("1e500") no longer raises OverflowError. This - makes it consistent with float("1e500") and interpretation of real - and imaginary literals. - -- Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. - -- Issue #5994: the marshal module now has docstrings. - -- Issue #5981: Fix three minor inf/nan issues in float.fromhex: - (1) inf and nan strings with trailing whitespace were incorrectly - rejected; (2) parsing of strings representing infinities and nans - was locale aware; and (3) the interpretation of fromhex('-nan') - didn't match that of float('-nan'). - -Library -------- - -- Issue #4859: Implement PEP 383 for pwd, spwd, and grp. - -- smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259). - -- Issue #6121: pydoc now ignores leading and trailing spaces in the - argument to the 'help' function. - -- Issue #6118: urllib.parse.quote_plus ignored the encoding and errors - arguments for strings with a space in them. - -- collections.namedtuple() was not working with the following field - names: cls, self, tuple, itemgetter, and property. - -- In unittest, using a skipping decorator on a class is now equivalent to - skipping every test on the class. The ClassTestSuite class has been removed. - -- Issue #6050: Don't fail extracting a directory from a zipfile if - the directory already exists. - -- Issue #1309352: fcntl now converts its third arguments to a C `long` rather - than an int, which makes some operations possible under 64-bit Linux (e.g. - DN_MULTISHOT with F_NOTIFY). - -- Issue #5761: Add the name of the underlying file to the repr() of various - IO objects. - -- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix - by Musashi Tamura, tests by Marcin Bachry. - -- Issue #1983: Fix functions taking or returning a process identifier to use - the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have - a process identifier type wider than the standard C integer type. - -- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. - Patch by Farhan Ahmad, test by Marcin Bachry. - -- Issue #2116: Weak references and weak dictionaries now support copy()ing and - deepcopy()ing. - -- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. - -- Issue #5918: Fix a crash in the parser module. - -- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. - -- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io - library. This means, for example, that opening an UTF-16 text file in - append mode doesn't add a BOM at the end of the file if the file isn't - empty. - -- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' - file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix - corrects a pydoc regression. - -- Issue #5955: aifc's close method did not close the file it wrapped, - now it does. This also means getfp method now returns the real fp. - -Installation ------------- - -- Issue #6047: fullinstall has been removed because Python 3's executable will - now be known as python3. - -- Lib/smtpd.py is no longer installed as a script. - -Extension Modules ------------------ - -- Issue #3061: Use wcsftime for time.strftime where available. - -- Issue #4873: Fix resource leaks in error cases of pwd and grp. - -- Issue #6093: Fix off-by-one error in locale.strxfrm. - -- The _functools and _locale modules are now built into the libpython shared - library instead of as extension modules. - -Build ------ - -- Issue #3585: Add pkg-config support. It creates a python-2.7.pc file - and a python3.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by - Clinton Roy. - -Tests ------ - -- Issue #5442: Tests for importlib were not properly skipping case-sensitivity - tests on darwin even when the OS was installed on a case-sensitive - filesystem. Also fixed tests that should not be run when - sys.dont_write_bytecode is true. - - -What's New in Python 3.1 beta 1? -================================ - -*Release date: 2009-05-06* - -Core and Builtins ------------------ - -- Issue #5914: Add new C API function PyOS_string_to_double, and - deprecate PyOS_ascii_strtod and PyOS_ascii_atof. - -- Issue #3382: float.__format__, complex.__format__, and %-formatting - no longer map 'F' to 'f'. Because of issue #5859 (below), this only - affects nan -> NAN and inf -> INF. - -- Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames - in all operations, including splitdrive, split, etc. splitunc() now issues - a PendingDeprecation warning. - -- Issue #5920: For float.__format__, change the behavior with the - empty presentation type (that is, not one of 'e', 'f', 'g', or 'n') - to be like 'g' but with at least one decimal point and with a - default precision of 12. Previously, the behavior the same but with - a default precision of 6. This more closely matches str(), and - reduces surprises when adding alignment flags to the empty - presentation type. This also affects the new complex.__format__ in - the same way. - -- Implement PEP 383, Non-decodable Bytes in System Character Interfaces. - -- Issue #5890: in subclasses of 'property' the __doc__ attribute was - shadowed by classtype's, even if it was None. property now - inserts the __doc__ into the subclass instance __dict__. - -- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal - sequences. Patch by Nick Barnes and Victor Stinner. - -- Issue #3672: Reject surrogates in utf-8 codec; add surrogatepass error handler. - -- Issue #5883: In the io module, the BufferedIOBase and TextIOBase ABCs have - received a new method, detach(). detach() disconnects the underlying stream - from the buffer or text IO and returns it. - -- Issue #5859: Remove switch from '%f' to '%g'-style formatting for - floats with absolute value over 1e50. Also remove length - restrictions for float formatting: '%.67f' % 12.34 and '%.120e' % - 12.34 no longer raise an exception. - -- Issue #1588: Add complex.__format__. For example, - format(complex(1, 2./3), '.5') now produces a sensible result. - -- Issue #5864: Fix empty format code formatting for floats so that it - never gives more than the requested number of significant digits. - -- Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes - new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. - -- Issue #5835: Deprecate PyOS_ascii_formatd. - -- Issue #4971: Fix titlecase for characters that are their own - titlecase, but not their own uppercase. - -- Issue #5283: Setting __class__ in __del__ caused a segfault. - -- Issue #5816: complex(repr(z)) now recovers z exactly, even when - z involves nans, infs or negative zeros. - -- Issue #3166: Make int -> float conversions correctly rounded. - -- Issue #1869 (and many duplicates): make round(x, n) correctly - rounded for a float x, by using the decimal <-> binary conversions - from Python/dtoa.c. As a consequence, (e.g.) round(x, 2) now - consistently agrees with format(x, '.2f'). - -- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on - some builtin types. - -- Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100'. - -- Issue #5515: str.format() type 'n' combined with commas and leading - zeros no longer gives odd results with ints and floats. - -- Implement PEP 378, Format Specifier for Thousands Separator, for - floats. - -- The str function switches to exponential notation at - 1e11, not 1e12. This avoids printing 13 significant digits in - situations where only 12 of them are correct. Example problem - value: str(1e11 + 0.5). (This minor issue has existed in 2.x for a - long time.) - -- Issue #1580: On most platforms, use a 'short' float repr: for a - finite float x, repr(x) now outputs a string based on the shortest - sequence of decimal digits that rounds to x. Previous behaviour was - to output 17 significant digits and then strip trailing zeros. - Another minor difference is that the new repr switches to - exponential notation at 1e16 instead of the previous 1e17; this - avoids misleading output in some cases. - - There's a new sys attribute sys.float_repr_style, which takes - the value 'short' to indicate that we're using short float repr, - and 'legacy' if the short float repr isn't available for one - reason or another. - - The float repr change involves incorporating David Gay's 'perfect - rounding' code into the Python core (it's in Python/dtoa.c). As a - secondary consequence, all string-to-float and float-to-string - conversions (including all float formatting operations) will be - correctly rounded on these platforms. - - See issue #1580 discussions for details of platforms for which - this change does not apply. - -- Issue #5759: float() didn't call __float__ on str subclasses. - -- The string.maketrans() function is deprecated; there is a new static method - maketrans() on the bytes and bytearray classes. This removes confusion about - the types string.maketrans() is supposed to work with, and mirrors the - methods available on the str class. - -- Issue #2170: refactored xml.dom.minidom.normalize, increasing both - its clarity and its speed. - -- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)`` - to avoid compiler warnings. - -- Issue #3739: The unicode-internal encoder now reports the number of characters - consumed like any other encoder (instead of the number of bytes). - -Installation ------------- - -- Issue #5756: Install idle and pydoc with a 3 suffix. - -Library -------- - -- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument. - -- Issue #5311: bdist_msi can now build packages that do not depend on a - specific Python version. - -- Issue #5150: IDLE's format menu now has an option to strip trailing - whitespace. - -- Issue #5940: distutils.command.build_clib.check_library_list was not doing - the right type checkings anymore. - -- Issue #4875: On win32, ctypes.util.find_library does no longer - return directories. - -- Issue #5142: Add the ability to skip modules while stepping to pdb. - -- Issue #1309567: Fix linecache behavior of stripping subdirectories when - looking for files given by a relative filename. - -- Issue #5923: Update the ``turtle`` module to version 1.1, add two new - turtle demos in Demo/turtle. - -- Issue #5692: In ``zipfile.Zipfile``, fix wrong path calculation when - extracting a file to the root directory. - -- Issue #5913: os.listdir() should fail for empty path on windows. - -- Issue #5084: unpickling now interns the attribute names of pickled objects, - saving memory and avoiding growth in size of subsequent pickles. Proposal - and original patch by Jake McGuire. - -- The json module now works exclusively with str and not bytes. - -- Issue #3959: The ipaddr module has been added to the standard library. - Contributed by Google. - -- Issue #3002: ``shutil.copyfile()`` and ``shutil.copytree()`` now raise an - error when a named pipe is encountered, rather than blocking infinitely. - -- Issue #5857: tokenize.tokenize() now returns named tuples. - -- Issue #4305: ctypes should now build again on mipsel-linux-gnu - -- Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the - string is already in normalized form, by performing a quick check beforehand. - Original patch by Rauli Ruohonen. - -- Issue #5853: calling a function of the mimetypes module from several threads - at once could hit the recursion limit if the mimetypes database hadn't been - initialized before. - -- Issue #5854: Updated __all__ to include some missing names and remove some - names which should not be exported. - -- Issue #3102: All global symbols that the _ctypes extension defines - are now prefixed with 'Py' or '_ctypes'. - -- Issue #5041: ctypes does now allow pickling wide character. - -- Issue #5812: For the two-argument form of the Fraction constructor, - Fraction(m, n), m and n are permitted to be arbitrary Rational - instances. - -- Issue #5812: Fraction('1e6') is valid: more generally, any string - that's valid for float() is now valid for Fraction(), with the - exception of strings representing NaNs and infinities. - -- Issue #5734: BufferedRWPair was poorly tested and had several glaring - bugs. Patch by Brian Quinlan. - -- Issue #1161031: fix readwrite select flag handling: POLLPRI now - results in a handle_expt_event call, not handle_read_event, and POLLERR - and POLLNVAL now call handle_close, not handle_expt_event. Also, - dispatcher now has an 'ignore_log_types' attribute for suppressing - log messages, which is set to 'warning' by default. - -- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for - new arguments introduced in 2.5. - -- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in - makeunicodedata.py and regenerated the Unicode database (This fixes - u'\u1d79'.lower() == '\x00'). - -Extension Modules ------------------ - -- Issue #5881: Remove old undocumented compatibility interfaces in hashlib and - pwd. - -- Issue #5463: In struct module, remove deprecated float coercion - for integer type codes: struct.pack('L', 0.3) should now raise - an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. - The version number has been bumped to 0.3. - -- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built - using Berkeley DB. - -Tests ------ - -- Issue #5354: New test support function import_fresh_module() makes - it easy to import both normal and optimised versions of modules. - test_heapq and test_warnings have been adjusted to use it, tests for - other modules with both C and Python implementations in the stdlib - can be adjusted to use it over time. - -- Issue #5837: Certain sequences of calls to set() and unset() for - support.EnvironmentVarGuard objects restored the environment variables - incorrectly on __exit__. - -C-API ------ - -- Issue #5630: A replacement PyCObject API, PyCapsule, has been added. - - -What's New in Python 3.1 alpha 2? -================================= - -*Release date: 2009-4-4* - -Core and Builtins ------------------ - -- Implement PEP 378, Format Specifier for Thousands Separator, for - integers. - -- Issue #5666: Py_BuildValue's 'c' code should create byte strings. - -- Issue #5499: The 'c' code for argument parsing functions now only accepts a - byte, and the 'C' code only accepts a unicode character. - -- Fix a problem in PyErr_NormalizeException that leads to "undetected errors" - when hitting the recursion limit under certain circumstances. - -- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. - -- Fix a segfault when running test_exceptions with coverage, caused by - insufficient checks in accessors of Exception.__context__. - -- Issue #5604: non-ASCII characters in module name passed to - imp.find_module() were converted to UTF-8 while the path is - converted to the default filesystem encoding, causing nonsense. - -- Issue #5126: str.isprintable() returned False for space characters. - -- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to - the end sys.path, for compatibility with the system install of Python. - -- Issue #4688: Add a heuristic so that tuples and dicts containing only - untrackable objects are not tracked by the garbage collector. This can - reduce the size of collections and therefore the garbage collection overhead - on long-running programs, depending on their particular use of datatypes. - -- Issue #5512: Rewrite PyLong long division algorithm (x_divrem) to - improve its performance. Long divisions and remainder operations - are now between 50% and 150% faster. - -- Issue #4258: Make it possible to use base 2**30 instead of base - 2**15 for the internal representation of integers, for performance - reasons. Base 2**30 is enabled by default on 64-bit machines. Add - --enable-big-digits option to configure, which overrides the - default. Add sys.int_info structseq to provide information about - the internal format. - -- Issue #4474: PyUnicode_FromWideChar now converts characters outside - the BMP to surrogate pairs, on systems with sizeof(wchar_t) == 4 - and sizeof(Py_UNICODE) == 2. - -- Issue #5237: Allow auto-numbered fields in str.format(). For - example: '{} {}'.format(1, 2) == '1 2'. - -- Issue #5392: when a very low recursion limit was set, the interpreter would - abort with a fatal error after the recursion limit was hit twice. - -- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with - short file names. - -Library -------- - -- Issue #2625: added missing items() call to the for loop in - mailbox.MH.get_message(). - -- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat - error substitutions from non-strict codec error callbacks in - incrementalencoder and StreamWriter. - -- Issue #5656: Fix the coverage reporting when running the test suite with - the -T argument. - -- Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. - -- Issue #5624: Fix the _winreg module name still used in several modules. - -- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer. - -- Issue #5619: Multiprocessing children disobey the debug flag and causes - popups on windows buildbots. Patch applied to work around this issue. - -- Issue #5400: Added patch for multiprocessing on netbsd compilation/support - -- Issue #5387: Fixed mmap.move crash by integer overflow. - -- Issue #5261: Patch multiprocessing's semaphore.c to support context - manager use: "with multiprocessing.Lock()" works now. - -- Issue #5236: Change time.strptime() to only take strings. Didn't work with - bytes already but the failure was non-obvious. - -- Issue #5177: Multiprocessing's SocketListener class now uses - socket.SO_REUSEADDR on all connections so that the user no longer needs - to wait 120 seconds for the socket to expire. - -- Issue #5595: Fix UnboundedLocalError in ntpath.ismount(). - -- Issue #1174606: Calling read() without arguments of an unbounded file - (typically /dev/zero under Unix) could crash the interpreter. - -- The max_buffer_size arguments of io.BufferedWriter, io.BufferedRWPair, and - io.BufferedRandom have been deprecated for removal in Python 3.2. - -- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop - forever on incomplete input. That caused tarfile.open() to hang when used - with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or - partial bzip2 compressed data. - -- Issue #2110: Add support for thousands separator and 'n' type - specifier to Decimal.__format__ - -- Fix Decimal.__format__ bug that swapped the meanings of the '<' and - '>' alignment characters. - -- The error detection code in FileIO.close() could fail to reflect the `errno` - value, and report it as -1 instead. - -- Issue #5016: FileIO.seekable() could return False if the file position - was negative when truncated to a C int. Patch by Victor Stinner. - -Extension Modules ------------------ - -- Issue #5391: mmap now deals exclusively with bytes. - -- Issue #5463: In struct module, remove deprecated overflow wrapping - when packing an integer: struct.pack('=L', -1) now raises - struct.error instead of returning b'\xff\xff\xff\xff'. The - _PY_STRUCT_RANGE_CHECKING and _PY_STRUCT_OVERFLOW_MASKING constants - have been removed from the struct module. - - -What's New in Python 3.1 alpha 1 -================================ - -*Release date: 2009-03-07* - -Core and Builtins ------------------ - -- The io module has been reimplemented in C for speed. - -- Give dict views an informative __repr__. - -- Issue #5247: Improve error message when unknown format codes are - used when using str.format() with str, int, and float arguments. - -- Issue #5249: time.strftime returned malformed string when format string - contained non ascii character on windows. - -- Issue #4626: compile(), exec(), and eval() ignore the coding cookie if the - source has already been decoded into str. - -- Issue #5186: Reduce hash collisions for objects with no __hash__ method by - rotating the object pointer by 4 bits to the right. - -- Issue #4575: Fix Py_IS_INFINITY macro to work correctly on x87 FPUs: - it now forces its argument to double before testing for infinity. - -- Issue #5137: Make len() correctly raise a TypeError when a __len__ method - returns a non-number type. - -- Issue #5182: Removed memoryview.__str__. - -- Issue #1717: Removed builtin cmp() function, dropped tp_compare - slot, the C API functions PyObject_Compare and PyUnicode_Compare and - the type definition cmpfunc. The tp_compare slot has been renamed - to tp_reserved, and is reserved for future usage. - -- Issue #1242657: the __len__() and __length_hint__() calls in several tools - were suppressing all exceptions. These include list() and bytearray(). - -- Issue #4707: round(x, n) now returns an integer if x is an integer. - Previously it returned a float. - -- Issue #4753: By enabling a configure option named '--with-computed-gotos' - on compilers that support it (notably: gcc, SunPro, icc), the bytecode - evaluation loop is compiled with a new dispatch mechanism which gives - speedups of up to 20%, depending on the system, on various benchmarks. - -- Issue #4874: Most builtin decoders now reject unicode input. - -- Issue #4842: Don't allow trailing 'L' when constructing an integer - from a string. - -- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors. - -- Issue #4838: When a module is deallocated, free the memory backing the - optional module state data. - -- Issue #4910: Rename nb_long slot to nb_reserved, and change its - type to ``(void *)``. - -- Issue #4935: The overflow checking code in the expandtabs() method common - to str, bytes and bytearray could be optimized away by the compiler, letting - the interpreter segfault instead of raising an error. - -- Issue #3720: Fix a crash when an iterator modifies its class and removes its - __next__ method. - -- Issue #4910: Builtin int() function and PyNumber_Long/PyNumber_Int API - function no longer attempt to call the __long__ slot to convert an object - to an integer. Only the __int__ and __trunc__ slots are examined. - -- Issue #4893: Use NT threading on CE. - -- Issue #4915: Port sysmodule to Windows CE. - -- Issue #4868: utf-8, utf-16 and latin1 decoding are now 2x to 4x faster. The - common cases are optimized thanks to a dedicated fast path and a moderate - amount of loop unrolling. - -- Issue #4074: Change the criteria for doing a full garbage collection (i.e. - collecting the oldest generation) so that allocating lots of objects without - destroying them does not show quadratic performance. Based on a proposal by - Martin von L?wis at - http://mail.python.org/pipermail/python-dev/2008-June/080579.html. - -- Issue #4604: Some objects of the I/O library could still be used after - having been closed (for instance, a read() call could return some - previously buffered data). Patch by Dmitry Vasiliev. - -- Issue #4705: Fix the -u ("unbuffered binary stdout and stderr") command-line - flag to work properly. Furthermore, when specifying -u, the text stdout - and stderr streams have line-by-line buffering enabled (the default being - to buffer arbitrary chunks of data). - -- The internal table, _PyLong_DigitValue, is now an array of unsigned chars - instead of ints (reducing its size from 4 to 8 times thereby reducing - Python's overall memory). - -- Issue #1180193: When importing a module from a .pyc (or .pyo) file with - an existing .py counterpart, override the co_filename attributes of all - code objects if the original filename is obsolete (which can happen if the - file has been renamed, moved, or if it is accessed through different paths). - Patch by Ziga Seilnacht and Jean-Paul Calderone. - -- Issue #4580: Fix slicing of memoryviews when the item size is greater than - one byte. Also fixes the meaning of len() so that it returns the number of - items, rather than the size in bytes. - -- Issue #4075: Use OutputDebugStringW in Py_FatalError. - -- Issue #4747: When the terminal does not use utf-8, executing a script with - non-ascii characters in its name could fail with a "SyntaxError: None" error. - -- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed - to open file with a bytes filename on Windows. - -- Issue #3680: Reference cycles created through a dict, set or deque iterator - did not get collected. - -- Issue #4701: PyObject_Hash now implicitly calls PyType_Ready on types - where the tp_hash and tp_dict slots are both NULL. - -- Issue #4759: None is now allowed as the first argument of - bytearray.translate(). It was always allowed for bytes.translate(). - -- Added test case to ensure attempts to read from a file opened for writing - fail. - -- Issue #3106: Speedup some comparisons (str/str and int/int). - -- Issue #2183: Simplify and optimize bytecode for list, dict and set - comprehensions. Original patch for list comprehensions by Neal Norwitz. - -- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always - print elapsed times, not only when some objects are uncollectable / - unreachable. Original patch by Neil Schemenauer. - -- Issue #3439: Add a bit_length method to int. - -- Issue #2173: When getting device encoding, check that return value of - nl_langinfo is not the empty string. This was causing silent build - failures on OS X. - -- Issue #4597: Fixed several opcodes that weren't always propagating - exceptions. - -- Issue #4589: Fixed exception handling when the __exit__ function of a - context manager returns a value that cannot be converted to a bool. - -- Issue #4445: Replace "sizeof(PyBytesObject)" with - "offsetof(PyBytesObject, ob_sval) + 1" when allocating memory for - bytes instances. On a typical machine this saves 3 bytes of memory - (on average) per allocation of a bytes instance. - -- Issue #4533: File read operation was dreadfully slow due to a slowly - growing read buffer. Fixed by using the same growth rate algorithm as - Python 2.x. - -- Issue #4509: Various issues surrounding resize of bytearray objects to - which there are buffer exports (e.g. memoryview instances). - -- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` - method on file objects with closefd=False. The file descriptor is still - kept open but the file object behaves like a closed file. The ``FileIO`` - object also got a new readonly attribute ``closefd``. - -- Issue #4569: Interpreter crash when mutating a memoryview with an item size - larger than 1. - -- Issue #4748: Lambda generators no longer return a value. - -- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. - -- Issue #5108: Handle %s like %S, %R and %A in PyUnicode_FromFormatV(): Call - PyUnicode_DecodeUTF8() once, remember the result and output it in a second - step. This avoids problems with counting UTF-8 bytes that ignores the effect - of using the replace error handler in PyUnicode_DecodeUTF8(). - -Library -------- - -- Issue #7071: byte-compilation in Distutils is now done with respect to - sys.dont_write_bytecode. - -- Issue #7066: archive_util.make_archive now restores the cwd if an error is - raised. Initial patch by Ezio Melotti. - -- Issue #6516: Added owner/group support when creating tar archives in - Distutils. - -- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. - -- Issue #6163: Fixed HP-UX runtime library dir options in - distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and - Michael Haubenwallner. - -- Issue #6693: New functions in site.py to get user/global site packages paths. - -- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when - opening an empty or very small file. - -- Issue #6545: Removed assert statements in distutils.Extension, so the - behavior is similar when used with -O. - -- unittest has been split up into a package. All old names should still work. - -- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler - uses the same refactored function to get gcc/ld/dllwrap versions numbers. - It's `distutils.util.get_compiler_versions`. Added deprecation warnings - for the obsolete get_versions() functions. - -- Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list - -- Issue #6314: logging: Extra checks on the "level" argument in more places. - -- Issue #2622: Fixed an ImportError when importing email.message from a - standalone application built with py2exe or py2app. - -- Issue #6455: Fixed test_build_ext under win32. - -- Issue #6377: Enabled the compiler option, and deprecate its usage as an - attribute. - -- Issue #6413: Fixed the log level in distutils.dist for announce. - -- Issue #6403: Fixed package path usage in build_ext. - -- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was - unconditionally calling "os.close(sys.stdin.fileno())" resulting in file - descriptor errors - -- Issue #6365: Distutils build_ext inplace mode was copying the compiled - extension in a subdirectory if the extension name had dots. - -- Issue #6164: Added an AIX specific linker argument in Distutils - unixcompiler. Original patch by Sridhar Ratnakumar. - -- Issue #6286: Now Distutils upload command is based on urllib2 instead of - httplib, allowing the usage of http_proxy. - -- Issue #6287: Added the license field in Distutils documentation. - -- Issue #6263: Fixed syntax error in distutils.cygwincompiler. - -- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` - in Makefiles. This prevents compile errors when using syntax like: - `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. - -- Issue #6131: test_modulefinder leaked when run after test_distutils. - Patch by Hirokazu Yamamoto. - -- Issue #6048: Now Distutils uses the tarfile module in archive_util. - -- Issue #6062: In distutils, fixed the package option of build_ext. Feedback - and tests on pywin32 by Tim Golden. - -- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto. - -- Issue #6046: Fixed the library extension when distutils build_ext is used - inplace. Initial patch by Roumen Petrov. - -- Issue #6041: Now distutils `sdist` and `register` commands use `check` as a - subcommand. - -- Issue #6022: a test file was created in the current working directory by - test_get_outputs in Distutils. - -- Issue #5977: distutils build_ext.get_outputs was not taking into account the - inplace option. Initial patch by kxroberto. - -- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken - for old-style extensions. - -- Issue #5976: Fixed Distutils test_check_environ. - -- Issue #5941: Distutils build_clib command was not working anymore because - of an incomplete costumization of the archiver command. Added ARFLAGS in the - Makefile besides AR and make Distutils use it. Original patch by David - Cournapeau. - -- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. - -- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive - anymore. - -- Issue #5810: Fixed Distutils test_build_scripts so it uses - sysconfig.get_config_vars. - -- Issue #4951: Fixed failure in test_httpservers. - -- Issue #5795: Fixed test_distutils failure on Debian ppc. - -- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. - -- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting - a value in SafeConfigParser. - -- Issue #5732: added a new command in Distutils: check. - -- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows - platforms. Initial patch by Paul Moore. - -- Issue #5095: Added bdist_msi to the list of bdist supported formats. - Initial fix by Steven Bethard. - -- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. - Initial fix by Wayne Davison. - -- Issue #5694: removed spurious test output in Distutils (test_clean). - -- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module. - -- Issue #1665206 (partially): Move imports in cgitb to the top of the module - instead of performing them in functions. Helps prevent import deadlocking in - threads. - -- Issue #2522: locale.format now checks its first argument to ensure it has - been passed only one pattern, avoiding mysterious errors where it appeared - that it was failing to do localization. - -- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg - Brandl. - -- Issue #1222: locale.format() bug when the thousands separator is a space - character. - -- Issue #5472: Fixed distutils.test_util tear down. Original patch by - Tim Golden. - -- collections.deque() objects now have a read-only attribute called maxlen. - -- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after - it is has been populated and properly configured in order to prevent - window flashing. - -- Issue #4792: Prevent a segfault in _tkinter by using the - guaranteed to be safe interp argument given to the PythonCmd in place of - the Tcl interpreter taken from a PythonCmd_ClientData. - -- Issue #5193: Guarantee that tkinter.Text.search returns a string. - -- Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler. - Original patch by Akira Kitada. - -- Issue #5334: array.fromfile() failed to insert values when EOFError was raised. - -- Issue #5385: Fixed mmap crash after resize failure on windows. - -- Issue #5179: Fixed subprocess handle leak on failure on windows. - -- PEP 372: Added collections.OrderedDict(). - -- The _asdict() for method for namedtuples now returns an OrderedDict(). - -- configparser now defaults to using an ordered dictionary. - -- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes - import guess_extension`` was used. - -- Issue #1733986: Fixed mmap crash in accessing elements of second map object - with same tagname but larger size than first map. (Windows) - -- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer - overrun. - -- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils - bdist_rpm command. - -- Issue #5378: added --quiet option to Distutils bdist_rpm command. - -- Issue #5052: make Distutils compatible with 2.3 again. - -- Issue #5316: Fixed buildbot failures introduced by multiple inheritance - in Distutils tests. - -- Issue #5287: Add exception handling around findCaller() call to help out - IronPython. - -- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, - The file was resized to wrong size. - -- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. - -- Issue #2279: distutils.sdist.add_defaults now add files - from the package_data and the data_files metadata. - -- Issue #5257: refactored all tests in distutils, so they use - support.TempdirManager, to avoid writing in the tests directory. - -- Issue #4524: distutils build_script command failed with --with-suffix=3. - Initial patch by Amaury Forgeot d'Arc. - -- Issue #2461: added tests for distutils.util - -- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions - which inherited from numbers.py which did not have __slots__ defined. The - numbers hierarchy now has its own __slots__ declarations. - -- Issue #4631: Fix urlopen() result when an HTTP response uses chunked - encoding. - -- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a - function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). - -- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored - under NT and OS2. Patch by Philip Jenvey. - -- Issue #5128: Make compileall properly inspect bytecode to determine if needs - to be recreated. This avoids a timing hole thanks to the old reliance on the - ctime of the files involved. - -- Issue #5122: Synchronize tk load failure check to prevent a potential - deadlock. - -- Issue #1818: collections.namedtuple() now supports a keyword argument - 'rename' which lets invalid fieldnames be automatically converted to - positional names in the form, _1, _2, ... - -- Issue #4890: Handle empty text search pattern in Tkinter.Text.search. - -- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a - public documented method ``ZipImporter.get_filename()``. - -- Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support - the execution of packages by looking for and executing a ``__main__`` - submodule when a package name is supplied. Initial patch by Andi - Vajda. - -- Issue #1731706: Call Tcl_ConditionFinalize for Tcl_Conditions that will - not be used again (this requires Tcl/Tk 8.3.1), also fix a memory leak in - Tkapp_Call when calling from a thread different than the one that created - the Tcl interpreter. Patch by Robert Hancock. - -- Issue #4285: Change sys.version_info to be a named tuple. Patch by - Ross Light. - -- Issue #1520877: Now distutils.sysconfig reads $AR from the - environment/Makefile. Patch by Douglas Greiman. - -- Issue #1276768: The verbose option was not used in the code of - distutils.file_util and distutils.dir_util. - -- Issue #5132: Fixed trouble building extensions under Solaris with - --enabled-shared activated. Initial patch by Dave Peterson. - -- Issue #1581476: Always use the Tcl global namespace when calling into Tcl. - -- The shelve module now defaults to pickle protocol 3. - -- Fix a bug in the trace module where a bytes object from co_lnotab had its - items being passed through ord(). - -- Issue #2047: shutil.move() could believe that its destination path was - inside its source path if it began with the same letters (e.g. "src" vs. - "src.new"). - -- Added the ttk module. See issue #2983: Ttk support for Tkinter. - -- Removed isSequenceType(), isMappingType, and isNumberType() from the - operator module; use the abstract base classes instead. Also removed - the repeat() function; use mul() instead. - -- Issue #5021: doctest.testfile() did not create __name__ and - collections.namedtuple() relied on __name__ being defined. - -- Backport importlib from Python 3.1. Only the import_module() function has - been backported to help facilitate transitions from 2.7 to 3.1. - -- Issue #1885: distutils. When running sdist with --formats=tar,gztar - the tar file was overriden by the gztar one. - -- Issue #4863: distutils.mwerkscompiler has been removed. - -- Added a new itertools functions: combinations_with_replacement() - and compress(). - -- Issue #5032: added a step argument to itertools.count() and - allowed non-integer arguments. - -- Fix and properly document the multiprocessing module's logging - support, expose the internal levels and provide proper usage - examples. - -- Issue #1672332: fix unpickling of subnormal floats, which was - producing a ValueError on some platforms. - -- Issue #3881: Help Tcl to load even when started through the - unreadable local symlink to "Program Files" on Vista. - -- Issue #4710: Extract directories properly in the zipfile module; - allow adding directories to a zipfile. - -- Issue #3807: _multiprocessing build fails when configure is passed - --without-threads argument. When this occurs, _multiprocessing will - be disabled, and not compiled. - -- Issue #5008: When a file is opened in append mode with the new IO library, - do an explicit seek to the end of file (so that e.g. tell() returns the - file size rather than 0). This is consistent with the behaviour of the - traditional 2.x file object. - -- Issue #5013: Fixed a bug in FileHandler which occurred when the delay - parameter was set. - -- Issue #4842: Always append a trailing 'L' when pickling longs using - pickle protocol 0. When reading, the 'L' is optional. - -- Add the importlib package. - -- Issue #4301: Patch the logging module to add processName support, remove - _check_logger_class from multiprocessing. - -- Issue #3325: Remove python2.x try: except: imports for old cPickle from - multiprocessing. - -- Issue #4959: inspect.formatargspec now works for keyword only arguments - without defaults. - -- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks - for Unix machines for negative handles and large int handles. Without this check - it is possible to segfault the interpreter. - -- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue - in sharedctypes.py. - -- Issue #1225107: inspect.isclass() returned True for instances with a custom - __getattr__. - -- Issue #3826 and #4791: The socket module now closes the underlying socket - appropriately when it is being used via socket.makefile() objects - rather than delaying the close by waiting for garbage collection to do it. - -- Issue #1696199: Add collections.Counter() for rapid and convenient - counting. - -- Issue #3860: GzipFile and BZ2File now support the context manager protocol. - -- Issue #4867: Fixed a crash in ctypes when passing a string to a - function without defining argtypes. - -- Issue #4272: Add an optional argument to the GzipFile constructor to override - the timestamp in the gzip stream. The default value remains the current time. - The information can be used by e.g. gunzip when decompressing. Patch by - Jacques Frechet. - -- Restore Python 2.3 compatibility for decimal.py. - -- Issue #3638: Remove functions from _tkinter module level that depend on - TkappObject to work with multiple threads. - -- Issue #4718: Adapt the wsgiref package so that it actually works with - Python 3.x, in accordance with the `official amendments of the spec - `_. - -- Issue #4796: Added Decimal.from_float() and Context.create_decimal_from_float() - to the decimal module. - -- Fractions.from_float() no longer loses precision for integers too big to - cast as floats. - -- Issue #4812: add missing underscore prefix to some internal-use-only - constants in the decimal module. (Dec_0 becomes _Dec_0, etc.) - -- Issue #4790: The nsmallest() and nlargest() functions in the heapq module - did unnecessary work in the common case where no key function was specified. - -- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when - the function is not a generator. - -- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case - no MSVC compiler is found under Windows. Original patch by Philip Jenvey. - -- Issue #4646: distutils was choking on empty options arg in the setup - function. Original patch by Thomas Heller. - -- Issue #3767: Convert Tk object to string in tkColorChooser. - -- Issue #3248: Allow placing ScrolledText in a PanedWindow. - -- Issue #4444: Allow assertRaises() to be used as a context handler, so that - the code under test can be written inline if more practical. - -- Issue #4739: Add pydoc help topics for symbols, so that e.g. help('@') - works as expected in the interactive environment. - -- Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by - Gabriel Genellina. - -- Issue #4574: reading an UTF16-encoded text file crashes if \r on 64-char - boundary. - -- Issue #4223: inspect.getsource() will now correctly display source code - for packages loaded via zipimport (or any other conformant PEP 302 - loader). Original patch by Alexander Belopolsky. - -- Issue #4201: pdb can now access and display source code loaded via - zipimport (or any other conformant PEP 302 loader). Original patch by - Alexander Belopolsky. - -- Issue #4197: doctests in modules loaded via zipimport (or any other PEP - 302 conformant loader) will now work correctly in most cases (they - are still subject to the constraints that exist for all code running - from inside a module loaded via a PEP 302 loader and attempting to - perform IO operations based on __file__). Original patch by - Alexander Belopolsky. - -- Issues #4082 and #4512: Add runpy support to zipimport in a manner that - allows backporting to maintenance branches. Original patch by - Alexander Belopolsky. - -- Issue #4163: textwrap module: allow word splitting on a hyphen preceded by - a non-ASCII letter. - -- Issue #4616: TarFile.utime(): Restore directory times on Windows. - -- Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the - codec cannot be found. This is for compatibility with the builtin behavior. - -- Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to - give correct results in the case where one argument is a quiet NaN - and the other is a finite number that requires rounding. - -- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat - libs. - -- Added the subprocess.check_call_output() convenience function to get output - from a subprocess on success or raise an exception on error. - -- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to - support unusual filenames (such as those containing semi-colons) in - Content-Disposition headers. - -- Issue #4384: Added logging integration with warnings module using - captureWarnings(). This change includes a NullHandler which does nothing; - it will be of use to library developers who want to avoid the "No handlers - could be found for logger XXX" message which can appear if the library user - doesn't configure logging. - -- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an - exception. - -- Issue #4529: fix the parser module's validation of try-except-finally - statements. - -- Issue #4458: getopt.gnu_getopt() now recognizes a single "-" as an argument, - not a malformed option. - -- Added the subprocess.check_output() convenience function to get output - from a subprocess on success or raise an exception on error. - -- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input; - the corresponding tests now pass. - -- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because - it was calling the wrong open() function. - -- Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to - support unusual filenames (such as those containing semi-colons) in - Content-Disposition headers. - -- Issue #4861: ctypes.util.find_library(): Robustify. Fix library detection on - biarch systems. Try to rely on ldconfig only, without using objdump and gcc. - -- Issue #5104: The socket module now raises OverflowError when 16-bit port and - protocol numbers are supplied outside the allowed 0-65536 range on bind() - and getservbyport(). - -- Windows locale mapping updated to Vista. - -Tools/Demos ------------ - -- Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1, - and make it 2.6-compatible. - -- Ttk demos added in Demo/tkinter/ttk/ - -- Issue #4677: add two list comprehension tests to pybench. - - -Build ------ - -- Issue #6094: Build correctly with Subversion 1.7. - -- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. - -- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the - linker, rather than always exit successfully. Patch by Floris Bruynooghe. - -- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify - the order that backends for the dbm extension are checked. - -- Link the shared python library with $(MODLIBS). - -- Issue #5134: Silence compiler warnings when compiling sqlite with VC++. - -- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. - -- Issue #4895: Use _strdup on Windows CE. - -- Issue #4472: "configure --enable-shared" now works on OSX - -- Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. - -- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". - -- Issue #4289: Remove Cancel button from AdvancedDlg. - -- Issue #1656675: Register a drop handler for .py* files on Windows. - -- Issue #4120: Exclude manifest from extension modules in VS2008. - -- Issue #4091: Install pythonxy.dll in system32 again. - -- Issue #4018: Disable "for me" installations on Vista. - -- Issue #3758: Add ``patchcheck`` build target to .PHONY. - -- Issue #4204: Fixed module build errors on FreeBSD 4. - - -C-API ------ - -- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with - NUL: Bogus TypeError detail string. - -- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError - for negative arguments. Previously, it raised TypeError. - -- Issue #4720: The format for PyArg_ParseTupleAndKeywords can begin with '|'. - -- Issue #3632: from the gdb debugger, the 'pyo' macro can now be called when - the GIL is released, or owned by another thread. - -- Issue #4122: On Windows, fix a compilation error when using the - Py_UNICODE_ISSPACE macro in an extension module. - - -Extension Modules ------------------ - -- Issue #3745: Fix hashlib to always reject unicode and non buffer-api - supporting objects as input no matter how it was compiled (built in - implementations or external openssl library). - -- Issue #4397: Fix occasional test_socket failure on OS X. - -- Issue #4279: Fix build of parsermodule under Cygwin. - -- Issue #4751: hashlib now releases the GIL when hashing large buffers - (with a hardwired threshold of 2048 bytes), allowing better parallelization - on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner. - -- Issue #4051: Prevent conflict of UNICODE macros in cPickle. - -- Issue #4738: Each zlib object now has a separate lock, allowing to compress - or decompress several streams at once on multi-CPU systems. Also, the GIL - is now released when computing the CRC of a large buffer. Patch by ebfe. - -- Issue #4228: Pack negative values the same way as 2.4 in struct's L format. - -- Issue #1040026: Fix os.times result on systems where HZ is incorrect. - -- Issues #3167, #3682: Fix test_math failures for log, log10 on Solaris, - OpenBSD. - -- Issue #4583: array.array would not always prohibit resizing when a buffer - has been exported, resulting in an interpreter crash when accessing the - buffer. - - -- Issue #5228: Make functools.partial objects can now be pickled. - -Tests ------ - -- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running - regression tests in parallel, shortening the total runtime. - -- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to - Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate - the same behaviour as test_ttkguionly (and now also test_tk) which is to - skip the tests if DISPLAY is defined but can't be used. - -- regrtest no longer treats ImportError as equivalent to SkipTest. Imports - that should cause a test to be skipped are now done using import_module - from test support, which does the conversion. - -- Issue #5083: New 'gui' resource for regrtest. - - -Docs ----- - - **(For information about older versions, consult the HISTORY file.)** diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -177,12 +177,12 @@ return NULL; size = PyBytes_GET_SIZE(str); - newsize = 4*size; - if (newsize > PY_SSIZE_T_MAX || newsize / 4 != size) { + if (size > PY_SSIZE_T_MAX / 4) { PyErr_SetString(PyExc_OverflowError, "string is too large to encode"); return NULL; } + newsize = 4*size; v = PyBytes_FromStringAndSize(NULL, newsize); if (v == NULL) { diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1265,14 +1265,13 @@ assert(ptoappend != NULL); assert(ntoappend > 0); while (usednew + ntoappend > totalnew) { - size_t bigger = totalnew << 1; - if ((bigger >> 1) != totalnew) { /* overflow */ + if (totalnew > (PY_SSIZE_T_MAX >> 1)) { /* overflow */ PyErr_NoMemory(); goto Done; } - if (_PyBytes_Resize(&newfmt, bigger) < 0) + totalnew <<= 1; + if (_PyBytes_Resize(&newfmt, totalnew) < 0) goto Done; - totalnew = bigger; pnew = PyBytes_AsString(newfmt) + usednew; } memcpy(pnew, ptoappend, ntoappend); diff --git a/Modules/_decimal/libmpdec/typearith.h b/Modules/_decimal/libmpdec/typearith.h --- a/Modules/_decimal/libmpdec/typearith.h +++ b/Modules/_decimal/libmpdec/typearith.h @@ -207,10 +207,10 @@ { mpd_uint_t h, l; - asm ( "mulq %3\n\t" - : "=d" (h), "=a" (l) - : "%a" (a), "rm" (b) - : "cc" + __asm__ ( "mulq %3\n\t" + : "=d" (h), "=a" (l) + : "%a" (a), "rm" (b) + : "cc" ); *hi = h; @@ -223,10 +223,10 @@ { mpd_uint_t qq, rr; - asm ( "divq %4\n\t" - : "=a" (qq), "=d" (rr) - : "a" (lo), "d" (hi), "rm" (d) - : "cc" + __asm__ ( "divq %4\n\t" + : "=a" (qq), "=d" (rr) + : "a" (lo), "d" (hi), "rm" (d) + : "cc" ); *q = qq; @@ -464,10 +464,10 @@ { mpd_uint_t h, l; - asm ( "mull %3\n\t" - : "=d" (h), "=a" (l) - : "%a" (a), "rm" (b) - : "cc" + __asm__ ( "mull %3\n\t" + : "=d" (h), "=a" (l) + : "%a" (a), "rm" (b) + : "cc" ); *hi = h; @@ -480,10 +480,10 @@ { mpd_uint_t qq, rr; - asm ( "divl %4\n\t" - : "=a" (qq), "=d" (rr) - : "a" (lo), "d" (hi), "rm" (d) - : "cc" + __asm__ ( "divl %4\n\t" + : "=a" (qq), "=d" (rr) + : "a" (lo), "d" (hi), "rm" (d) + : "cc" ); *q = qq; diff --git a/Modules/_decimal/libmpdec/umodarith.h b/Modules/_decimal/libmpdec/umodarith.h --- a/Modules/_decimal/libmpdec/umodarith.h +++ b/Modules/_decimal/libmpdec/umodarith.h @@ -402,22 +402,22 @@ { mpd_uint_t retval; - asm ( - "fildl %2\n\t" - "fildl %1\n\t" - "fmulp %%st, %%st(1)\n\t" - "fldt (%4)\n\t" - "fmul %%st(1), %%st\n\t" - "flds %5\n\t" - "fadd %%st, %%st(1)\n\t" - "fsubrp %%st, %%st(1)\n\t" - "fldl (%3)\n\t" - "fmulp %%st, %%st(1)\n\t" - "fsubrp %%st, %%st(1)\n\t" - "fistpl %0\n\t" - : "=m" (retval) - : "m" (a), "m" (b), "r" (dmod), "r" (dinvmod), "m" (MPD_TWO63) - : "st", "memory" + __asm__ ( + "fildl %2\n\t" + "fildl %1\n\t" + "fmulp %%st, %%st(1)\n\t" + "fldt (%4)\n\t" + "fmul %%st(1), %%st\n\t" + "flds %5\n\t" + "fadd %%st, %%st(1)\n\t" + "fsubrp %%st, %%st(1)\n\t" + "fldl (%3)\n\t" + "fmulp %%st, %%st(1)\n\t" + "fsubrp %%st, %%st(1)\n\t" + "fistpl %0\n\t" + : "=m" (retval) + : "m" (a), "m" (b), "r" (dmod), "r" (dinvmod), "m" (MPD_TWO63) + : "st", "memory" ); return retval; @@ -432,33 +432,33 @@ ppro_mulmod2c(mpd_uint_t *a0, mpd_uint_t *a1, mpd_uint_t w, double *dmod, uint32_t *dinvmod) { - asm ( - "fildl %2\n\t" - "fildl (%1)\n\t" - "fmul %%st(1), %%st\n\t" - "fxch %%st(1)\n\t" - "fildl (%0)\n\t" - "fmulp %%st, %%st(1) \n\t" - "fldt (%4)\n\t" - "flds %5\n\t" - "fld %%st(2)\n\t" - "fmul %%st(2)\n\t" - "fadd %%st(1)\n\t" - "fsub %%st(1)\n\t" - "fmull (%3)\n\t" - "fsubrp %%st, %%st(3)\n\t" - "fxch %%st(2)\n\t" - "fistpl (%0)\n\t" - "fmul %%st(2)\n\t" - "fadd %%st(1)\n\t" - "fsubp %%st, %%st(1)\n\t" - "fmull (%3)\n\t" - "fsubrp %%st, %%st(1)\n\t" - "fistpl (%1)\n\t" - : : "r" (a0), "r" (a1), "m" (w), - "r" (dmod), "r" (dinvmod), - "m" (MPD_TWO63) - : "st", "memory" + __asm__ ( + "fildl %2\n\t" + "fildl (%1)\n\t" + "fmul %%st(1), %%st\n\t" + "fxch %%st(1)\n\t" + "fildl (%0)\n\t" + "fmulp %%st, %%st(1) \n\t" + "fldt (%4)\n\t" + "flds %5\n\t" + "fld %%st(2)\n\t" + "fmul %%st(2)\n\t" + "fadd %%st(1)\n\t" + "fsub %%st(1)\n\t" + "fmull (%3)\n\t" + "fsubrp %%st, %%st(3)\n\t" + "fxch %%st(2)\n\t" + "fistpl (%0)\n\t" + "fmul %%st(2)\n\t" + "fadd %%st(1)\n\t" + "fsubp %%st, %%st(1)\n\t" + "fmull (%3)\n\t" + "fsubrp %%st, %%st(1)\n\t" + "fistpl (%1)\n\t" + : : "r" (a0), "r" (a1), "m" (w), + "r" (dmod), "r" (dinvmod), + "m" (MPD_TWO63) + : "st", "memory" ); } @@ -471,41 +471,41 @@ ppro_mulmod2(mpd_uint_t *a0, mpd_uint_t b0, mpd_uint_t *a1, mpd_uint_t b1, double *dmod, uint32_t *dinvmod) { - asm ( - "fildl %3\n\t" - "fildl (%2)\n\t" - "fmulp %%st, %%st(1)\n\t" - "fildl %1\n\t" - "fildl (%0)\n\t" - "fmulp %%st, %%st(1)\n\t" - "fldt (%5)\n\t" - "fld %%st(2)\n\t" - "fmul %%st(1), %%st\n\t" - "fxch %%st(1)\n\t" - "fmul %%st(2), %%st\n\t" - "flds %6\n\t" - "fldl (%4)\n\t" - "fxch %%st(3)\n\t" - "fadd %%st(1), %%st\n\t" - "fxch %%st(2)\n\t" - "fadd %%st(1), %%st\n\t" - "fxch %%st(2)\n\t" - "fsub %%st(1), %%st\n\t" - "fxch %%st(2)\n\t" - "fsubp %%st, %%st(1)\n\t" - "fxch %%st(1)\n\t" - "fmul %%st(2), %%st\n\t" - "fxch %%st(1)\n\t" - "fmulp %%st, %%st(2)\n\t" - "fsubrp %%st, %%st(3)\n\t" - "fsubrp %%st, %%st(1)\n\t" - "fxch %%st(1)\n\t" - "fistpl (%2)\n\t" - "fistpl (%0)\n\t" - : : "r" (a0), "m" (b0), "r" (a1), "m" (b1), - "r" (dmod), "r" (dinvmod), - "m" (MPD_TWO63) - : "st", "memory" + __asm__ ( + "fildl %3\n\t" + "fildl (%2)\n\t" + "fmulp %%st, %%st(1)\n\t" + "fildl %1\n\t" + "fildl (%0)\n\t" + "fmulp %%st, %%st(1)\n\t" + "fldt (%5)\n\t" + "fld %%st(2)\n\t" + "fmul %%st(1), %%st\n\t" + "fxch %%st(1)\n\t" + "fmul %%st(2), %%st\n\t" + "flds %6\n\t" + "fldl (%4)\n\t" + "fxch %%st(3)\n\t" + "fadd %%st(1), %%st\n\t" + "fxch %%st(2)\n\t" + "fadd %%st(1), %%st\n\t" + "fxch %%st(2)\n\t" + "fsub %%st(1), %%st\n\t" + "fxch %%st(2)\n\t" + "fsubp %%st, %%st(1)\n\t" + "fxch %%st(1)\n\t" + "fmul %%st(2), %%st\n\t" + "fxch %%st(1)\n\t" + "fmulp %%st, %%st(2)\n\t" + "fsubrp %%st, %%st(3)\n\t" + "fsubrp %%st, %%st(1)\n\t" + "fxch %%st(1)\n\t" + "fistpl (%2)\n\t" + "fistpl (%0)\n\t" + : : "r" (a0), "m" (b0), "r" (a1), "m" (b1), + "r" (dmod), "r" (dinvmod), + "m" (MPD_TWO63) + : "st", "memory" ); } /* END PPRO GCC ASM */ diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py --- a/Modules/_decimal/tests/bench.py +++ b/Modules/_decimal/tests/bench.py @@ -18,8 +18,13 @@ C = import_fresh_module('decimal', fresh=['_decimal']) P = import_fresh_module('decimal', blocked=['_decimal']) - -# Pi function from the decimal.py documentation +# +# NOTE: This is the pi function from the decimal documentation, modified +# for benchmarking purposes. Since floats do not have a context, the higher +# intermediate precision from the original is NOT used, so the modified +# algorithm only gives an approximation to the correctly rounded result. +# For serious use, refer to the documentation or the appropriate literature. +# def pi_float(): """native float""" lasts, t, s, n, na, d, da = 0, 3.0, 3, 1, 0, 0, 24 diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -123,17 +123,11 @@ return NULL; } - args = PyTuple_New(2); + args = PyTuple_Pack(2, object, memo); if (!args) return NULL; - - Py_INCREF(object); PyTuple_SET_ITEM(args, 0, (PyObject*) object); - Py_INCREF(memo); PyTuple_SET_ITEM(args, 1, (PyObject*) memo); - result = PyObject_CallObject(elementtree_deepcopy_obj, args); - Py_DECREF(args); - return result; } @@ -141,48 +135,16 @@ list_join(PyObject* list) { /* join list elements (destroying the list in the process) */ - PyObject* joiner; - PyObject* function; - PyObject* args; PyObject* result; - switch (PyList_GET_SIZE(list)) { - case 0: - Py_DECREF(list); - return PyBytes_FromString(""); - case 1: - result = PyList_GET_ITEM(list, 0); - Py_INCREF(result); - Py_DECREF(list); - return result; - } - - /* two or more elements: slice out a suitable separator from the - first member, and use that to join the entire list */ - - joiner = PySequence_GetSlice(PyList_GET_ITEM(list, 0), 0, 0); + joiner = PyUnicode_FromStringAndSize("", 0); if (!joiner) return NULL; - - function = PyObject_GetAttrString(joiner, "join"); - if (!function) { - Py_DECREF(joiner); - return NULL; - } - - args = PyTuple_New(1); - if (!args) - return NULL; - - PyTuple_SET_ITEM(args, 0, list); - - result = PyObject_CallObject(function, args); - - Py_DECREF(args); /* also removes list */ - Py_DECREF(function); + result = PyUnicode_Join(joiner, list); Py_DECREF(joiner); - + if (result) + Py_DECREF(list); return result; } @@ -399,6 +361,7 @@ return -1; if (kwds) { if (PyDict_Update(attrib, kwds) < 0) { + Py_DECREF(attrib); return -1; } } @@ -407,38 +370,34 @@ attrib = get_attrib_from_keywords(kwds); if (!attrib) return -1; - } else { - /* no attrib arg, no kwds, so no attributes */ - Py_INCREF(Py_None); - attrib = Py_None; } self_elem = (ElementObject *)self; - if (attrib != Py_None && !is_empty_dict(attrib)) { + if (attrib != NULL && !is_empty_dict(attrib)) { if (create_extra(self_elem, attrib) < 0) { - PyObject_Del(self_elem); + Py_DECREF(attrib); return -1; } } /* We own a reference to attrib here and it's no longer needed. */ - Py_DECREF(attrib); + Py_XDECREF(attrib); /* Replace the objects already pointed to by tag, text and tail. */ tmp = self_elem->tag; + Py_INCREF(tag); self_elem->tag = tag; - Py_INCREF(tag); Py_DECREF(tmp); tmp = self_elem->text; + Py_INCREF(Py_None); self_elem->text = Py_None; + Py_DECREF(JOIN_OBJ(tmp)); + + tmp = self_elem->tail; Py_INCREF(Py_None); - Py_DECREF(JOIN_OBJ(tmp)); - - tmp = self_elem->tail; self_elem->tail = Py_None; - Py_INCREF(Py_None); Py_DECREF(JOIN_OBJ(tmp)); return 0; @@ -520,11 +479,11 @@ PyObject* res = self->extra->attrib; if (res == Py_None) { - Py_DECREF(res); /* create missing dictionary */ res = PyDict_New(); if (!res) return NULL; + Py_DECREF(Py_None); self->extra->attrib = res; } @@ -824,7 +783,7 @@ } /* add object to memo dictionary (so deepcopy won't visit it again) */ - id = PyLong_FromLong((Py_uintptr_t) self); + id = PyLong_FromSsize_t((Py_uintptr_t) self); if (!id) goto error; @@ -2038,8 +1997,8 @@ PyObject *root; /* root node (first created node) */ - ElementObject *this; /* current node */ - ElementObject *last; /* most recently created node */ + PyObject *this; /* current node */ + PyObject *last; /* most recently created node */ PyObject *data; /* data collector (string or list), or NULL */ @@ -2071,9 +2030,9 @@ t->root = NULL; Py_INCREF(Py_None); - t->this = (ElementObject *)Py_None; + t->this = Py_None; Py_INCREF(Py_None); - t->last = (ElementObject *)Py_None; + t->last = Py_None; t->data = NULL; t->element_factory = NULL; @@ -2081,6 +2040,7 @@ if (!t->stack) { Py_DECREF(t->this); Py_DECREF(t->last); + Py_DECREF((PyObject *) t); return NULL; } t->index = 0; @@ -2098,6 +2058,7 @@ static char *kwlist[] = {"element_factory", 0}; PyObject *element_factory = NULL; TreeBuilderObject *self_tb = (TreeBuilderObject *)self; + PyObject *tmp; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:TreeBuilder", kwlist, &element_factory)) { @@ -2106,8 +2067,9 @@ if (element_factory) { Py_INCREF(element_factory); - Py_XDECREF(self_tb->element_factory); + tmp = self_tb->element_factory; self_tb->element_factory = element_factory; + Py_XDECREF(tmp); } return 0; @@ -2128,17 +2090,17 @@ static int treebuilder_gc_clear(TreeBuilderObject *self) { - Py_XDECREF(self->end_ns_event_obj); - Py_XDECREF(self->start_ns_event_obj); - Py_XDECREF(self->end_event_obj); - Py_XDECREF(self->start_event_obj); - Py_XDECREF(self->events); - Py_DECREF(self->stack); - Py_XDECREF(self->data); - Py_DECREF(self->last); - Py_DECREF(self->this); + Py_CLEAR(self->end_ns_event_obj); + Py_CLEAR(self->start_ns_event_obj); + Py_CLEAR(self->end_event_obj); + Py_CLEAR(self->start_event_obj); + Py_CLEAR(self->events); + Py_CLEAR(self->stack); + Py_CLEAR(self->data); + Py_CLEAR(self->last); + Py_CLEAR(self->this); Py_CLEAR(self->element_factory); - Py_XDECREF(self->root); + Py_CLEAR(self->root); return 0; } @@ -2151,6 +2113,64 @@ } /* -------------------------------------------------------------------- */ +/* helpers for handling of arbitrary element-like objects */ + +static int +treebuilder_set_element_text_or_tail(PyObject *element, PyObject *data, + PyObject **dest, _Py_Identifier *name) +{ + if (Element_CheckExact(element)) { + Py_DECREF(JOIN_OBJ(*dest)); + *dest = JOIN_SET(data, PyList_CheckExact(data)); + return 0; + } + else { + PyObject *joined = list_join(data); + int r; + if (joined == NULL) + return -1; + r = _PyObject_SetAttrId(element, name, joined); + Py_DECREF(joined); + return r; + } +} + +/* These two functions steal a reference to data */ +static int +treebuilder_set_element_text(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(text); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->text, &PyId_text); +} + +static int +treebuilder_set_element_tail(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(tail); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->tail, &PyId_tail); +} + +static int +treebuilder_add_subelement(PyObject *element, PyObject *child) +{ + _Py_IDENTIFIER(append); + if (Element_CheckExact(element)) { + ElementObject *elem = (ElementObject *) element; + return element_add_subelement(elem, child); + } + else { + PyObject *res; + res = _PyObject_CallMethodId(element, &PyId_append, "O", child); + if (res == NULL) + return -1; + Py_DECREF(res); + return 0; + } +} + +/* -------------------------------------------------------------------- */ /* handlers */ LOCAL(PyObject*) @@ -2162,15 +2182,12 @@ if (self->data) { if (self->this == self->last) { - Py_DECREF(JOIN_OBJ(self->last->text)); - self->last->text = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); - } else { - Py_DECREF(JOIN_OBJ(self->last->tail)); - self->last->tail = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; + } + else { + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; } self->data = NULL; } @@ -2184,10 +2201,10 @@ return NULL; } - this = (PyObject*) self->this; + this = self->this; if (this != Py_None) { - if (element_add_subelement((ElementObject*) this, node) < 0) + if (treebuilder_add_subelement(this, node) < 0) goto error; } else { if (self->root) { @@ -2213,19 +2230,17 @@ Py_DECREF(this); Py_INCREF(node); - self->this = (ElementObject*) node; + self->this = node; Py_DECREF(self->last); Py_INCREF(node); - self->last = (ElementObject*) node; + self->last = node; if (self->start_event_obj) { PyObject* res; PyObject* action = self->start_event_obj; - res = PyTuple_New(2); + res = PyTuple_Pack(2, action, node); if (res) { - Py_INCREF(action); PyTuple_SET_ITEM(res, 0, (PyObject*) action); - Py_INCREF(node); PyTuple_SET_ITEM(res, 1, (PyObject*) node); PyList_Append(self->events, res); Py_DECREF(res); } else @@ -2243,7 +2258,7 @@ treebuilder_handle_data(TreeBuilderObject* self, PyObject* data) { if (!self->data) { - if (self->last == (ElementObject*) Py_None) { + if (self->last == Py_None) { /* ignore calls to data before the first call to start */ Py_RETURN_NONE; } @@ -2253,6 +2268,7 @@ /* more than one item; use a list to collect items */ if (PyBytes_CheckExact(self->data) && Py_REFCNT(self->data) == 1 && PyBytes_CheckExact(data) && PyBytes_GET_SIZE(data) == 1) { + /* XXX this code path unused in Python 3? */ /* expat often generates single character data sections; handle the most common case by resizing the existing string... */ Py_ssize_t size = PyBytes_GET_SIZE(self->data); @@ -2282,15 +2298,11 @@ if (self->data) { if (self->this == self->last) { - Py_DECREF(JOIN_OBJ(self->last->text)); - self->last->text = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; } else { - Py_DECREF(JOIN_OBJ(self->last->tail)); - self->last->tail = JOIN_SET( - self->data, PyList_CheckExact(self->data) - ); + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; } self->data = NULL; } @@ -2310,17 +2322,15 @@ Py_DECREF(self->last); - self->last = (ElementObject*) self->this; - self->this = (ElementObject*) item; + self->last = self->this; + self->this = item; if (self->end_event_obj) { PyObject* res; PyObject* action = self->end_event_obj; PyObject* node = (PyObject*) self->last; - res = PyTuple_New(2); + res = PyTuple_Pack(2, action, node); if (res) { - Py_INCREF(action); PyTuple_SET_ITEM(res, 0, (PyObject*) action); - Py_INCREF(node); PyTuple_SET_ITEM(res, 1, (PyObject*) node); PyList_Append(self->events, res); Py_DECREF(res); } else @@ -2366,8 +2376,12 @@ PyTuple_SET_ITEM(res, 1, parcel); PyList_Append(self->events, res); Py_DECREF(res); - } else + } + else { + Py_DECREF(action); + Py_DECREF(parcel); PyErr_Clear(); /* FIXME: propagate error */ + } } /* -------------------------------------------------------------------- */ @@ -2526,7 +2540,7 @@ /* convert a UTF-8 tag/attribute name from the expat parser to a universal name string */ - int size = strlen(string); + Py_ssize_t size = (Py_ssize_t) strlen(string); PyObject* key; PyObject* value; @@ -2545,7 +2559,7 @@ PyObject* tag; char* p; - int i; + Py_ssize_t i; /* look for namespace separator */ for (i = 0; i < size; i++) @@ -2717,13 +2731,7 @@ attrib_in += 2; } } else { - Py_INCREF(Py_None); - attrib = Py_None; - } - - /* If we get None, pass an empty dictionary on */ - if (attrib == Py_None) { - Py_DECREF(attrib); + /* Pass an empty dictionary on */ attrib = PyDict_New(); if (!attrib) return; @@ -3015,14 +3023,14 @@ self_xp->names = PyDict_New(); if (!self_xp->names) { - Py_XDECREF(self_xp->entity); + Py_CLEAR(self_xp->entity); return -1; } self_xp->parser = EXPAT(ParserCreate_MM)(encoding, &ExpatMemoryHandler, "}"); if (!self_xp->parser) { - Py_XDECREF(self_xp->entity); - Py_XDECREF(self_xp->names); + Py_CLEAR(self_xp->entity); + Py_CLEAR(self_xp->names); PyErr_NoMemory(); return -1; } @@ -3032,8 +3040,8 @@ } else { target = treebuilder_new(&TreeBuilder_Type, NULL, NULL); if (!target) { - Py_XDECREF(self_xp->entity); - Py_XDECREF(self_xp->names); + Py_CLEAR(self_xp->entity); + Py_CLEAR(self_xp->names); EXPAT(ParserFree)(self_xp->parser); return -1; } @@ -3109,17 +3117,17 @@ { EXPAT(ParserFree)(self->parser); - Py_XDECREF(self->handle_close); - Py_XDECREF(self->handle_pi); - Py_XDECREF(self->handle_comment); - Py_XDECREF(self->handle_end); - Py_XDECREF(self->handle_data); - Py_XDECREF(self->handle_start); - Py_XDECREF(self->handle_doctype); - - Py_XDECREF(self->target); - Py_XDECREF(self->entity); - Py_XDECREF(self->names); + Py_CLEAR(self->handle_close); + Py_CLEAR(self->handle_pi); + Py_CLEAR(self->handle_comment); + Py_CLEAR(self->handle_end); + Py_CLEAR(self->handle_data); + Py_CLEAR(self->handle_start); + Py_CLEAR(self->handle_doctype); + + Py_CLEAR(self->target); + Py_CLEAR(self->entity); + Py_CLEAR(self->names); return 0; } @@ -3227,17 +3235,12 @@ break; } temp = PyUnicode_AsEncodedString(buffer, "utf-8", "surrogatepass"); + Py_DECREF(buffer); if (!temp) { /* Propagate exception from PyUnicode_AsEncodedString */ - Py_DECREF(buffer); Py_DECREF(reader); return NULL; } - - /* Here we no longer need the original buffer since it contains - * unicode. Make it point to the encoded bytes object. - */ - Py_DECREF(buffer); buffer = temp; } else if (!PyBytes_CheckExact(buffer) || PyBytes_GET_SIZE(buffer) == 0) { @@ -3307,10 +3310,10 @@ target->events = events; /* clear out existing events */ - Py_XDECREF(target->start_event_obj); target->start_event_obj = NULL; - Py_XDECREF(target->end_event_obj); target->end_event_obj = NULL; - Py_XDECREF(target->start_ns_event_obj); target->start_ns_event_obj = NULL; - Py_XDECREF(target->end_ns_event_obj); target->end_ns_event_obj = NULL; + Py_CLEAR(target->start_event_obj); + Py_CLEAR(target->end_event_obj); + Py_CLEAR(target->start_ns_event_obj); + Py_CLEAR(target->end_ns_event_obj); if (event_set == Py_None) { /* default is "end" only */ diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -284,7 +284,8 @@ n = newn; if (keyused >= keymax) { unsigned long bigger = keymax << 1; - if ((bigger >> 1) != keymax) { + if ((bigger >> 1) != keymax || + bigger > PY_SSIZE_T_MAX / sizeof(*key)) { PyErr_NoMemory(); goto Done; } diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1238,7 +1238,7 @@ o = PySequence_Fast_GET_ITEM(sub_keywords, i); if (!PyUnicode_FSConverter(o, (void *)(converted + i))) { PyErr_Format(PyExc_ValueError, - "parse_tuple_and_keywords: could not convert keywords[%s] to narrow string", i); + "parse_tuple_and_keywords: could not convert keywords[%zd] to narrow string", i); goto exit; } keywords[i] = PyBytes_AS_STRING(converted[i]); diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -483,11 +483,11 @@ return NULL; } - nbytes = size * descr->itemsize; /* Check for overflow */ - if (nbytes / descr->itemsize != (size_t)size) { + if (size > PY_SSIZE_T_MAX / descr->itemsize) { return PyErr_NoMemory(); } + nbytes = size * descr->itemsize; op = (arrayobject *) type->tp_alloc(type, 0); if (op == NULL) { return NULL; @@ -1251,11 +1251,15 @@ if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n)) return NULL; - nbytes = n * itemsize; - if (nbytes < 0 || nbytes/itemsize != n) { + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return NULL; + } + if (n > PY_SSIZE_T_MAX / itemsize) { PyErr_NoMemory(); return NULL; } + nbytes = n * itemsize; b = _PyObject_CallMethodId(f, &PyId_read, "n", nbytes); if (b == NULL) diff --git a/Modules/audioop.c b/Modules/audioop.c --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1108,8 +1108,7 @@ PyErr_SetString(AudioopError, "# of channels should be >= 1"); return NULL; } - bytes_per_frame = size * nchannels; - if (bytes_per_frame / nchannels != size) { + if (size > INT_MAX / nchannels) { /* This overflow test is rigorously correct because both multiplicands are >= 1. Use the argument names from the docs for the error msg. */ @@ -1117,6 +1116,7 @@ "width * nchannels too big for a C int"); return NULL; } + bytes_per_frame = size * nchannels; if (weightA < 1 || weightB < 0) { PyErr_SetString(AudioopError, "weightA should be >= 1, weightB should be >= 0"); diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -875,7 +875,12 @@ PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); return NULL; } - fseek(fp, -22, SEEK_END); + + if (fseek(fp, -22, SEEK_END) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } header_position = ftell(fp); if (fread(endof_central_dir, 1, 22, fp) != 22) { fclose(fp); @@ -904,11 +909,13 @@ PyObject *t; int err; - fseek(fp, header_offset, 0); /* Start of file header */ + if (fseek(fp, header_offset, 0) == -1) /* Start of file header */ + goto fseek_error; l = PyMarshal_ReadLongFromFile(fp); if (l != 0x02014B50) break; /* Bad: Central Dir File Header */ - fseek(fp, header_offset + 8, 0); + if (fseek(fp, header_offset + 8, 0) == -1) + goto fseek_error; flags = (unsigned short)PyMarshal_ReadShortFromFile(fp); compress = PyMarshal_ReadShortFromFile(fp); time = PyMarshal_ReadShortFromFile(fp); @@ -920,7 +927,8 @@ header_size = 46 + name_size + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); - fseek(fp, header_offset + 42, 0); + if (fseek(fp, header_offset + 42, 0) == -1) + goto fseek_error; file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; if (name_size > MAXPATHLEN) name_size = MAXPATHLEN; @@ -980,6 +988,12 @@ PySys_FormatStderr("# zipimport: found %ld names in %R\n", count, archive); return files; +fseek_error: + fclose(fp); + Py_XDECREF(files); + Py_XDECREF(nameobj); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; error: fclose(fp); Py_XDECREF(files); @@ -1050,7 +1064,12 @@ } /* Check to make sure the local file header is correct */ - fseek(fp, file_offset, 0); + if (fseek(fp, file_offset, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = PyMarshal_ReadLongFromFile(fp); if (l != 0x04034B50) { /* Bad: Local File Header */ @@ -1060,7 +1079,12 @@ fclose(fp); return NULL; } - fseek(fp, file_offset + 26, 0); + if (fseek(fp, file_offset + 26, 0) == -1) { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } + l = 30 + PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp); /* local header size */ file_offset += l; /* Start of file data */ @@ -1077,8 +1101,13 @@ buf = PyBytes_AsString(raw_data); err = fseek(fp, file_offset, 0); - if (err == 0) + if (err == 0) { bytes_read = fread(buf, 1, data_size, fp); + } else { + fclose(fp); + PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + return NULL; + } fclose(fp); if (err || bytes_read != data_size) { PyErr_SetString(PyExc_IOError, diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -668,10 +668,9 @@ assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0); if (ndigits > 0) { digit msd = v->ob_digit[ndigits - 1]; - - result = (ndigits - 1) * PyLong_SHIFT; - if (result / PyLong_SHIFT != (size_t)(ndigits - 1)) + if ((size_t)(ndigits - 1) > PY_SIZE_MAX / (size_t)PyLong_SHIFT) goto Overflow; + result = (size_t)(ndigits - 1) * (size_t)PyLong_SHIFT; do { ++result; if (result == 0) @@ -4849,13 +4848,20 @@ }; PyDoc_STRVAR(long_doc, -"int(x[, base]) -> integer\n\ +"int(x=0) -> integer\n\ +int(x, base=10) -> integer\n\ \n\ -Convert a string or number to an integer, if possible. A floating\n\ -point argument will be truncated towards zero (this does not include a\n\ -string representation of a floating point number!) When converting a\n\ -string, use the optional base. It is an error to supply a base when\n\ -converting a non-string."); +Convert a number or string to an integer, or return 0 if no arguments\n\ +are given. If x is a number, return x.__int__(). For floating point\n\ +numbers, this truncates towards zero.\n\ +\n\ +If x is not a number or if base is given, then x must be a string,\n\ +bytes, or bytearray instance representing an integer literal in the\n\ +given base. The literal can be preceded by '+' or '-' and be surrounded\n\ +by whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\n\ +Base 0 means to interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4"); static PyNumberMethods long_as_number = { (binaryfunc)long_add, /*nb_add*/ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -136,7 +136,8 @@ } PyDoc_STRVAR(range_doc, -"range([start,] stop[, step]) -> range object\n\ +"range(stop) -> range object\n\ +range(start, stop[, step]) -> range object\n\ \n\ Returns a virtual sequence of numbers from start to stop by step."); @@ -969,7 +970,7 @@ { PyObject *start=NULL, *stop=NULL, *step=NULL; PyObject *range; - + /* create a range object for pickling */ start = PyLong_FromLong(r->start); if (start == NULL) diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -269,7 +269,8 @@ } PyDoc_STRVAR(slice_doc, -"slice([start,] stop[, step])\n\ +"slice(stop)\n\ +slice(start, stop[, step])\n\ \n\ Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -96,15 +96,11 @@ else #endif { - Py_ssize_t nbytes = size * sizeof(PyObject *); /* Check for overflow */ - if (nbytes / sizeof(PyObject *) != (size_t)size || - (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *))) - { + if (size > (PY_SSIZE_T_MAX - sizeof(PyTupleObject) - + sizeof(PyObject *)) / sizeof(PyObject *)) { return PyErr_NoMemory(); } - /* nbytes += sizeof(PyTupleObject) - sizeof(PyObject *); */ - op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size); if (op == NULL) return NULL; @@ -481,9 +477,9 @@ if (Py_SIZE(a) == 0) return PyTuple_New(0); } + if (n > PY_SSIZE_T_MAX / Py_SIZE(a)) + return PyErr_NoMemory(); size = Py_SIZE(a) * n; - if (size/Py_SIZE(a) != n) - return PyErr_NoMemory(); np = (PyTupleObject *) PyTuple_New(size); if (np == NULL) return NULL; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4492,7 +4492,6 @@ void *data; Py_ssize_t len; PyObject *v; - Py_ssize_t allocated; int inShift = 0; Py_ssize_t i; unsigned int base64bits = 0; @@ -4510,11 +4509,9 @@ return PyBytes_FromStringAndSize(NULL, 0); /* It might be possible to tighten this worst case */ - allocated = 8 * len; - if (allocated / 8 != len) + if (len > PY_SSIZE_T_MAX / 8) return PyErr_NoMemory(); - - v = PyBytes_FromStringAndSize(NULL, allocated); + v = PyBytes_FromStringAndSize(NULL, len * 8); if (v == NULL) return NULL; @@ -5092,7 +5089,7 @@ Py_ssize_t len; PyObject *v; unsigned char *p; - Py_ssize_t nsize, bytesize, i; + Py_ssize_t nsize, i; /* Offsets from p for storing byte pairs in the right order. */ #ifdef BYTEORDER_IS_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; @@ -5120,10 +5117,9 @@ len = PyUnicode_GET_LENGTH(str); nsize = len + (byteorder == 0); - bytesize = nsize * 4; - if (bytesize / 4 != nsize) + if (nsize > PY_SSIZE_T_MAX / 4) return PyErr_NoMemory(); - v = PyBytes_FromStringAndSize(NULL, bytesize); + v = PyBytes_FromStringAndSize(NULL, nsize * 4); if (v == NULL) return NULL; @@ -5772,18 +5768,12 @@ void *data; Py_ssize_t expandsize = 0; - /* Initial allocation is based on the longest-possible unichr + /* Initial allocation is based on the longest-possible character escape. - In wide (UTF-32) builds '\U00xxxxxx' is 10 chars per source - unichr, so in this case it's the longest unichr escape. In - narrow (UTF-16) builds this is five chars per source unichr - since there are two unichrs in the surrogate pair, so in narrow - (UTF-16) builds it's not the longest unichr escape. - - In wide or narrow builds '\uxxxx' is 6 chars per source unichr, - so in the narrow (UTF-16) build case it's the longest unichr - escape. + For UCS1 strings it's '\xxx', 4 bytes per source character. + For UCS2 strings it's '\uxxxx', 6 bytes per source character. + For UCS4 strings it's '\U00xxxxxx', 10 bytes per source character. */ if (!PyUnicode_Check(unicode)) { @@ -10165,7 +10155,7 @@ } else { Py_ssize_t n, i, j, ires; - Py_ssize_t product, new_size; + Py_ssize_t new_size; int rkind = skind; char *res; @@ -10197,19 +10187,18 @@ } /* new_size = PyUnicode_GET_LENGTH(self) + n * (PyUnicode_GET_LENGTH(str2) - PyUnicode_GET_LENGTH(str1))); */ - product = n * (len2-len1); - if ((product / (len2-len1)) != n) { + if (len2 > len1 && len2 - len1 > (PY_SSIZE_T_MAX - slen) / n) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; } - new_size = slen + product; + new_size = slen + n * (len2 - len1); if (new_size == 0) { Py_INCREF(unicode_empty); u = unicode_empty; goto done; } - if (new_size < 0 || new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { + if (new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; @@ -13442,8 +13431,10 @@ uformat = PyUnicode_FromObject(format); if (uformat == NULL) return NULL; - if (PyUnicode_READY(uformat) == -1) + if (PyUnicode_READY(uformat) == -1) { Py_DECREF(uformat); + return NULL; + } fmt = PyUnicode_DATA(uformat); fmtkind = PyUnicode_KIND(uformat); @@ -14083,7 +14074,8 @@ } PyDoc_STRVAR(unicode_doc, - "str(object[, encoding[, errors]]) -> str\n\ +"str(object='') -> str\n\ +str(bytes_or_buffer[, encoding[, errors]]) -> str\n\ \n\ Create a new string object from the given object. If encoding or\n\ errors is specified, then the object must expose a data buffer\n\ diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1064,7 +1064,7 @@ self.emit("case %s:" % t.name, 2) self.emit("Py_INCREF(%s_singleton);" % t.name, 3) self.emit("return %s_singleton;" % t.name, 3) - self.emit("default:" % name, 2) + self.emit("default:", 2) self.emit('/* should never happen, but just in case ... */', 3) code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name self.emit(code, 3, reflow=False) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1985,6 +1985,7 @@ # solaris: problems with register allocation. # icc >= 11.0 works as well. define_macros = config['ppro'] + extra_compile_args.append('-Wno-unknown-pragmas') else: define_macros = config['ansi32'] else: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 17:16:52 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 9 Oct 2012 17:16:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3Xbhqm4Mq4zR2q@mail.python.org> http://hg.python.org/cpython/rev/5733529b297c changeset: 79629:5733529b297c parent: 79627:49e57a0e4a2d parent: 79628:4d5cb87230f4 user: Benjamin Peterson date: Tue Oct 09 11:16:33 2012 -0400 summary: merge 3.3 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 21:47:55 2012 From: python-checkins at python.org (local-hg) Date: Tue, 9 Oct 2012 21:47:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?hooks=3A_Restrict_number_of_lines_in_?= =?utf-8?q?log_message=2E?= Message-ID: <3XbprW1dV9zQnN@mail.python.org> http://hg.python.org/hooks/rev/fc6022656a7b changeset: 87:fc6022656a7b user: hg repo admin date: Tue Oct 09 19:47:53 2012 +0000 summary: Restrict number of lines in log message. files: hgirker.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hgirker.py b/hgirker.py --- a/hgirker.py +++ b/hgirker.py @@ -54,7 +54,10 @@ d['branch'] = ctx.branch() d['author'] = person(ctx.user()) d['rev'] = '%d:%s' % (ctx.rev(), ns) - d['logmsg'] = ctx.description() + logmsg = filter(None, ctx.description().splitlines()) + d['logmsg'] = ' '.join(logmsg[:4]) + if len(logmsg) > 4: + d['logmsg'] += '...' if env['baseurl']: d['url'] = env['baseurl'].rstrip('/') + '/rev/%s' % ns else: -- Repository URL: http://hg.python.org/hooks From python-checkins at python.org Tue Oct 9 22:21:21 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 22:21:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTcw?= =?utf-8?q?=3A_Remove_Linux_skip_from_test=5Fsubprocess=27s_test=5Fexecuta?= =?utf-8?q?ble_test=2E?= Message-ID: <3Xbqb553cRzMSD@mail.python.org> http://hg.python.org/cpython/rev/9451908da615 changeset: 79630:9451908da615 branch: 3.3 parent: 79628:4d5cb87230f4 user: Chris Jerdonek date: Tue Oct 09 13:17:49 2012 -0700 summary: Issue #16170: Remove Linux skip from test_subprocess's test_executable test. files: Lib/test/test_subprocess.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -200,13 +200,16 @@ p.wait() self.assertEqual(47, p.returncode) - # TODO: make this test work on Linux. - # This may be failing on Linux because of issue #7774. - @unittest.skipIf(sys.platform not in ('win32', 'darwin'), - "possible bug using executable argument on Linux") def test_executable(self): # Check that the executable argument works. - self._assert_python(["doesnotexist", "-c"], executable=sys.executable) + # + # On Unix (non-Mac and non-Windows), Python looks at args[0] to + # determine where its standard library is, so we need the directory + # of args[0] to be valid for the Popen() call to Python to succeed. + # See also issue #16170 and issue #7774. + doesnotexist = os.path.join(os.path.dirname(sys.executable), + "doesnotexist") + self._assert_python([doesnotexist, "-c"], executable=sys.executable) def test_executable_takes_precedence(self): # Check that the executable argument takes precedence over args[0]. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 9 22:21:23 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 9 Oct 2012 22:21:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316170=3A_Merge_subprocess_test_unskip_from_3=2E?= =?utf-8?q?3=2E?= Message-ID: <3Xbqb70gTVzQpP@mail.python.org> http://hg.python.org/cpython/rev/0ee03c9b098f changeset: 79631:0ee03c9b098f parent: 79629:5733529b297c parent: 79630:9451908da615 user: Chris Jerdonek date: Tue Oct 09 13:19:23 2012 -0700 summary: Issue #16170: Merge subprocess test unskip from 3.3. files: Lib/test/test_subprocess.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -200,13 +200,16 @@ p.wait() self.assertEqual(47, p.returncode) - # TODO: make this test work on Linux. - # This may be failing on Linux because of issue #7774. - @unittest.skipIf(sys.platform not in ('win32', 'darwin'), - "possible bug using executable argument on Linux") def test_executable(self): # Check that the executable argument works. - self._assert_python(["doesnotexist", "-c"], executable=sys.executable) + # + # On Unix (non-Mac and non-Windows), Python looks at args[0] to + # determine where its standard library is, so we need the directory + # of args[0] to be valid for the Popen() call to Python to succeed. + # See also issue #16170 and issue #7774. + doesnotexist = os.path.join(os.path.dirname(sys.executable), + "doesnotexist") + self._assert_python([doesnotexist, "-c"], executable=sys.executable) def test_executable_takes_precedence(self): # Check that the executable argument takes precedence over args[0]. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Wed Oct 10 05:58:51 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Wed, 10 Oct 2012 05:58:51 +0200 Subject: [Python-checkins] Daily reference leaks (0ee03c9b098f): sum=0 Message-ID: results for 0ee03c9b098f on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogEiKnYS', '-x'] From python-checkins at python.org Wed Oct 10 12:52:44 2012 From: python-checkins at python.org (gregory.p.smith) Date: Wed, 10 Oct 2012 12:52:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixes_Issue_?= =?utf-8?q?=2316114=3A_The_subprocess_module_no_longer_provides_a?= Message-ID: <3XcBwX6VrwzP7m@mail.python.org> http://hg.python.org/cpython/rev/e938fa6be509 changeset: 79632:e938fa6be509 branch: 3.2 parent: 79616:7de9c620716e user: Gregory P. Smith date: Wed Oct 10 03:34:47 2012 -0700 summary: Fixes Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. It now keeps track of if the child got as far as preexec and reports it if not back to the parent via a special "noexec" error message value in the error pipe so that the cwd can be blamed for a failed chdir instead of the exec of the executable being blamed instead. The executable is also always reported accurately when exec fails. Unittests enhanced to cover these cases. files: Lib/subprocess.py | 14 ++++++- Lib/test/test_subprocess.py | 47 +++++++++++++++++++++--- Misc/NEWS | 4 ++ Modules/_posixsubprocess.c | 7 +++- 4 files changed, 63 insertions(+), 9 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1169,6 +1169,7 @@ if executable is None: executable = args[0] + orig_executable = executable # For transferring possible exec failure from child to parent. # Data format: "exception name:hex errno:description" @@ -1224,6 +1225,7 @@ self._child_created = True if self.pid == 0: # Child + reached_preexec = False try: # Close parent's pipe ends if p2cwrite != -1: @@ -1288,6 +1290,7 @@ if start_new_session and hasattr(os, 'setsid'): os.setsid() + reached_preexec = True if preexec_fn: preexec_fn() @@ -1303,6 +1306,8 @@ errno_num = exc_value.errno else: errno_num = 0 + if not reached_preexec: + exc_value = "noexec" message = '%s:%x:%s' % (exc_type.__name__, errno_num, exc_value) message = message.encode(errors="surrogatepass") @@ -1364,10 +1369,17 @@ err_msg = err_msg.decode(errors="surrogatepass") if issubclass(child_exception_type, OSError) and hex_errno: errno_num = int(hex_errno, 16) + child_exec_never_called = (err_msg == "noexec") + if child_exec_never_called: + err_msg = "" if errno_num != 0: err_msg = os.strerror(errno_num) if errno_num == errno.ENOENT: - err_msg += ': ' + repr(args[0]) + if child_exec_never_called: + # The error must be from chdir(cwd). + err_msg += ': ' + repr(cwd) + else: + err_msg += ': ' + repr(orig_executable) raise child_exception_type(errno_num, err_msg) raise child_exception_type(err_msg) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -884,24 +884,30 @@ @unittest.skipIf(mswindows, "POSIX specific tests") class POSIXProcessTestCase(BaseTestCase): - def test_exceptions(self): - nonexistent_dir = "/_this/pa.th/does/not/exist" + def setUp(self): + super().setUp() + self._nonexistent_dir = "/_this/pa.th/does/not/exist" + + def _get_chdir_exception(self): try: - os.chdir(nonexistent_dir) + os.chdir(self._nonexistent_dir) except OSError as e: # This avoids hard coding the errno value or the OS perror() # string and instead capture the exception that we want to see # below for comparison. desired_exception = e - desired_exception.strerror += ': ' + repr(sys.executable) + desired_exception.strerror += ': ' + repr(self._nonexistent_dir) else: self.fail("chdir to nonexistant directory %s succeeded." % - nonexistent_dir) + self._nonexistent_dir) + return desired_exception - # Error in the child re-raised in the parent. + def test_exception_cwd(self): + """Test error in the child raised in the parent for a bad cwd.""" + desired_exception = self._get_chdir_exception() try: p = subprocess.Popen([sys.executable, "-c", ""], - cwd=nonexistent_dir) + cwd=self._nonexistent_dir) except OSError as e: # Test that the child process chdir failure actually makes # it up to the parent process as the correct exception. @@ -910,6 +916,33 @@ else: self.fail("Expected OSError: %s" % desired_exception) + def test_exception_bad_executable(self): + """Test error in the child raised in the parent for a bad executable.""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([sys.executable, "-c", ""], + executable=self._nonexistent_dir) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + + def test_exception_bad_args_0(self): + """Test error in the child raised in the parent for a bad args[0].""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([self._nonexistent_dir, "-c", ""]) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + def test_restore_signals(self): # Code coverage for both values of restore_signals to make sure it # at least does not blow up. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -129,6 +129,10 @@ Library ------- +- Issue #16114: The subprocess module no longer provides a misleading + error message stating that args[0] did not exist when either the cwd or + executable keyword arguments specified a path that did not exist. + - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to return a returncode of 0 when the child has already exited or cannot be waited on. diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -354,7 +354,7 @@ PyObject *preexec_fn, PyObject *preexec_fn_args_tuple) { - int i, saved_errno, unused; + int i, saved_errno, unused, reached_preexec = 0; PyObject *result; const char* err_msg = ""; /* Buffer large enough to hold a hex integer. We can't malloc. */ @@ -438,6 +438,7 @@ POSIX_CALL(setsid()); #endif + reached_preexec = 1; if (preexec_fn != Py_None && preexec_fn_args_tuple) { /* This is where the user has asked us to deadlock their program. */ result = PyObject_Call(preexec_fn, preexec_fn_args_tuple, NULL); @@ -487,6 +488,10 @@ } unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); unused = write(errpipe_write, ":", 1); + if (!reached_preexec) { + /* Indicate to the parent that the error happened before exec(). */ + unused = write(errpipe_write, "noexec", 6); + } /* We can't call strerror(saved_errno). It is not async signal safe. * The parent process will look the error message up. */ } else { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 12:52:46 2012 From: python-checkins at python.org (gregory.p.smith) Date: Wed, 10 Oct 2012 12:52:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Fixes_Issue_=2316114=3A_The_subprocess_module_no_longer_provid?= =?utf-8?q?es_a?= Message-ID: <3XcBwZ3MK1zQxX@mail.python.org> http://hg.python.org/cpython/rev/ee30d7ef70be changeset: 79633:ee30d7ef70be branch: 3.3 parent: 79630:9451908da615 parent: 79632:e938fa6be509 user: Gregory P. Smith date: Wed Oct 10 03:44:47 2012 -0700 summary: Fixes Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. files: Lib/subprocess.py | 10 ++++- Lib/test/test_subprocess.py | 47 +++++++++++++++++++++--- Misc/NEWS | 4 ++ Modules/_posixsubprocess.c | 7 +++- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1327,6 +1327,7 @@ if executable is None: executable = args[0] + orig_executable = executable # For transferring possible exec failure from child to parent. # Data format: "exception name:hex errno:description" @@ -1409,10 +1410,17 @@ err_msg = err_msg.decode(errors="surrogatepass") if issubclass(child_exception_type, OSError) and hex_errno: errno_num = int(hex_errno, 16) + child_exec_never_called = (err_msg == "noexec") + if child_exec_never_called: + err_msg = "" if errno_num != 0: err_msg = os.strerror(errno_num) if errno_num == errno.ENOENT: - err_msg += ': ' + repr(args[0]) + if child_exec_never_called: + # The error must be from chdir(cwd). + err_msg += ': ' + repr(cwd) + else: + err_msg += ': ' + repr(orig_executable) raise child_exception_type(errno_num, err_msg) raise child_exception_type(err_msg) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1038,24 +1038,30 @@ @unittest.skipIf(mswindows, "POSIX specific tests") class POSIXProcessTestCase(BaseTestCase): - def test_exceptions(self): - nonexistent_dir = "/_this/pa.th/does/not/exist" + def setUp(self): + super().setUp() + self._nonexistent_dir = "/_this/pa.th/does/not/exist" + + def _get_chdir_exception(self): try: - os.chdir(nonexistent_dir) + os.chdir(self._nonexistent_dir) except OSError as e: # This avoids hard coding the errno value or the OS perror() # string and instead capture the exception that we want to see # below for comparison. desired_exception = e - desired_exception.strerror += ': ' + repr(sys.executable) + desired_exception.strerror += ': ' + repr(self._nonexistent_dir) else: self.fail("chdir to nonexistant directory %s succeeded." % - nonexistent_dir) + self._nonexistent_dir) + return desired_exception - # Error in the child re-raised in the parent. + def test_exception_cwd(self): + """Test error in the child raised in the parent for a bad cwd.""" + desired_exception = self._get_chdir_exception() try: p = subprocess.Popen([sys.executable, "-c", ""], - cwd=nonexistent_dir) + cwd=self._nonexistent_dir) except OSError as e: # Test that the child process chdir failure actually makes # it up to the parent process as the correct exception. @@ -1064,6 +1070,33 @@ else: self.fail("Expected OSError: %s" % desired_exception) + def test_exception_bad_executable(self): + """Test error in the child raised in the parent for a bad executable.""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([sys.executable, "-c", ""], + executable=self._nonexistent_dir) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + + def test_exception_bad_args_0(self): + """Test error in the child raised in the parent for a bad args[0].""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([self._nonexistent_dir, "-c", ""]) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + def test_restore_signals(self): # Code coverage for both values of restore_signals to make sure it # at least does not blow up. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,10 @@ Library ------- +- Issue #16114: The subprocess module no longer provides a misleading error + message stating that args[0] did not exist when either the cwd or executable + keyword arguments specified a path that did not exist. + - Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. - Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -356,7 +356,7 @@ PyObject *preexec_fn, PyObject *preexec_fn_args_tuple) { - int i, saved_errno, unused; + int i, saved_errno, unused, reached_preexec = 0; PyObject *result; const char* err_msg = ""; /* Buffer large enough to hold a hex integer. We can't malloc. */ @@ -440,6 +440,7 @@ POSIX_CALL(setsid()); #endif + reached_preexec = 1; if (preexec_fn != Py_None && preexec_fn_args_tuple) { /* This is where the user has asked us to deadlock their program. */ result = PyObject_Call(preexec_fn, preexec_fn_args_tuple, NULL); @@ -489,6 +490,10 @@ } unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); unused = write(errpipe_write, ":", 1); + if (!reached_preexec) { + /* Indicate to the parent that the error happened before exec(). */ + unused = write(errpipe_write, "noexec", 6); + } /* We can't call strerror(saved_errno). It is not async signal safe. * The parent process will look the error message up. */ } else { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 12:53:24 2012 From: python-checkins at python.org (gregory.p.smith) Date: Wed, 10 Oct 2012 12:53:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Fixes_Issue_=2316114=3A_The_subprocess_module_no_longer_?= =?utf-8?q?provides_a?= Message-ID: <3XcBxJ0hT1zP7m@mail.python.org> http://hg.python.org/cpython/rev/543bb0e0afb9 changeset: 79634:543bb0e0afb9 parent: 79631:0ee03c9b098f parent: 79633:ee30d7ef70be user: Gregory P. Smith date: Wed Oct 10 03:53:16 2012 -0700 summary: Fixes Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. files: Lib/subprocess.py | 10 ++++- Lib/test/test_subprocess.py | 47 +++++++++++++++++++++--- Misc/NEWS | 4 ++ Modules/_posixsubprocess.c | 7 +++- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1327,6 +1327,7 @@ if executable is None: executable = args[0] + orig_executable = executable # For transferring possible exec failure from child to parent. # Data format: "exception name:hex errno:description" @@ -1409,10 +1410,17 @@ err_msg = err_msg.decode(errors="surrogatepass") if issubclass(child_exception_type, OSError) and hex_errno: errno_num = int(hex_errno, 16) + child_exec_never_called = (err_msg == "noexec") + if child_exec_never_called: + err_msg = "" if errno_num != 0: err_msg = os.strerror(errno_num) if errno_num == errno.ENOENT: - err_msg += ': ' + repr(args[0]) + if child_exec_never_called: + # The error must be from chdir(cwd). + err_msg += ': ' + repr(cwd) + else: + err_msg += ': ' + repr(orig_executable) raise child_exception_type(errno_num, err_msg) raise child_exception_type(err_msg) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1038,24 +1038,30 @@ @unittest.skipIf(mswindows, "POSIX specific tests") class POSIXProcessTestCase(BaseTestCase): - def test_exceptions(self): - nonexistent_dir = "/_this/pa.th/does/not/exist" + def setUp(self): + super().setUp() + self._nonexistent_dir = "/_this/pa.th/does/not/exist" + + def _get_chdir_exception(self): try: - os.chdir(nonexistent_dir) + os.chdir(self._nonexistent_dir) except OSError as e: # This avoids hard coding the errno value or the OS perror() # string and instead capture the exception that we want to see # below for comparison. desired_exception = e - desired_exception.strerror += ': ' + repr(sys.executable) + desired_exception.strerror += ': ' + repr(self._nonexistent_dir) else: self.fail("chdir to nonexistant directory %s succeeded." % - nonexistent_dir) + self._nonexistent_dir) + return desired_exception - # Error in the child re-raised in the parent. + def test_exception_cwd(self): + """Test error in the child raised in the parent for a bad cwd.""" + desired_exception = self._get_chdir_exception() try: p = subprocess.Popen([sys.executable, "-c", ""], - cwd=nonexistent_dir) + cwd=self._nonexistent_dir) except OSError as e: # Test that the child process chdir failure actually makes # it up to the parent process as the correct exception. @@ -1064,6 +1070,33 @@ else: self.fail("Expected OSError: %s" % desired_exception) + def test_exception_bad_executable(self): + """Test error in the child raised in the parent for a bad executable.""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([sys.executable, "-c", ""], + executable=self._nonexistent_dir) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + + def test_exception_bad_args_0(self): + """Test error in the child raised in the parent for a bad args[0].""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([self._nonexistent_dir, "-c", ""]) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + def test_restore_signals(self): # Code coverage for both values of restore_signals to make sure it # at least does not blow up. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -42,6 +42,10 @@ Library ------- +- Issue #16114: The subprocess module no longer provides a misleading error + message stating that args[0] did not exist when either the cwd or executable + keyword arguments specified a path that did not exist. + - Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. - Issue #1492704: shutil.copyfile() raises a distinct SameFileError now if diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -356,7 +356,7 @@ PyObject *preexec_fn, PyObject *preexec_fn_args_tuple) { - int i, saved_errno, unused; + int i, saved_errno, unused, reached_preexec = 0; PyObject *result; const char* err_msg = ""; /* Buffer large enough to hold a hex integer. We can't malloc. */ @@ -440,6 +440,7 @@ POSIX_CALL(setsid()); #endif + reached_preexec = 1; if (preexec_fn != Py_None && preexec_fn_args_tuple) { /* This is where the user has asked us to deadlock their program. */ result = PyObject_Call(preexec_fn, preexec_fn_args_tuple, NULL); @@ -489,6 +490,10 @@ } unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); unused = write(errpipe_write, ":", 1); + if (!reached_preexec) { + /* Indicate to the parent that the error happened before exec(). */ + unused = write(errpipe_write, "noexec", 6); + } /* We can't call strerror(saved_errno). It is not async signal safe. * The parent process will look the error message up. */ } else { -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Wed Oct 10 13:20:30 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Wed, 10 Oct 2012 04:20:30 -0700 Subject: [Python-checkins] cpython (merge 3.2 -> 3.3): Fixes Issue #16114: The subprocess module no longer provides a In-Reply-To: <3XcBwZ3MK1zQxX@mail.python.org> References: <3XcBwZ3MK1zQxX@mail.python.org> Message-ID: On Wed, Oct 10, 2012 at 3:52 AM, gregory.p.smith wrote: > http://hg.python.org/cpython/rev/ee30d7ef70be > changeset: 79633:ee30d7ef70be > branch: 3.3 > parent: 79630:9451908da615 > parent: 79632:e938fa6be509 > user: Gregory P. Smith > date: Wed Oct 10 03:44:47 2012 -0700 > summary: > Fixes Issue #16114: The subprocess module no longer provides a > misleading error message stating that args[0] did not exist when > either the cwd or executable keyword arguments specified a path that > did not exist. > + def test_exception_cwd(self): > + """Test error in the child raised in the parent for a bad cwd.""" > + desired_exception = self._get_chdir_exception() > try: > p = subprocess.Popen([sys.executable, "-c", ""], > - cwd=nonexistent_dir) > + cwd=self._nonexistent_dir) > except OSError as e: > # Test that the child process chdir failure actually makes > # it up to the parent process as the correct exception. > @@ -1064,6 +1070,33 @@ > else: > self.fail("Expected OSError: %s" % desired_exception) I was on this issue but didn't have an opportunity to comment. It would be cleaner to use the self.assertRaises() pattern here and also probably better to share code across the three test methods which are nearly identical to one another (there is a fourth scenario I would also add of shell=True). I would also check for FileNotFoundError instead of OSError in the 3.3 and later versions. --Chris > > + def test_exception_bad_executable(self): > + """Test error in the child raised in the parent for a bad executable.""" > + desired_exception = self._get_chdir_exception() > + try: > + p = subprocess.Popen([sys.executable, "-c", ""], > + executable=self._nonexistent_dir) > + except OSError as e: > + # Test that the child process exec failure actually makes > + # it up to the parent process as the correct exception. > + self.assertEqual(desired_exception.errno, e.errno) > + self.assertEqual(desired_exception.strerror, e.strerror) > + else: > + self.fail("Expected OSError: %s" % desired_exception) > + > + def test_exception_bad_args_0(self): > + """Test error in the child raised in the parent for a bad args[0].""" > + desired_exception = self._get_chdir_exception() > + try: > + p = subprocess.Popen([self._nonexistent_dir, "-c", ""]) > + except OSError as e: > + # Test that the child process exec failure actually makes > + # it up to the parent process as the correct exception. > + self.assertEqual(desired_exception.errno, e.errno) > + self.assertEqual(desired_exception.strerror, e.strerror) > + else: > + self.fail("Expected OSError: %s" % desired_exception) > + > def test_restore_signals(self): > # Code coverage for both values of restore_signals to make sure it > # at least does not blow up. > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -37,6 +37,10 @@ > Library > ------- > > +- Issue #16114: The subprocess module no longer provides a misleading error > + message stating that args[0] did not exist when either the cwd or executable > + keyword arguments specified a path that did not exist. > + > - Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. > > - Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element > diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c > --- a/Modules/_posixsubprocess.c > +++ b/Modules/_posixsubprocess.c > @@ -356,7 +356,7 @@ > PyObject *preexec_fn, > PyObject *preexec_fn_args_tuple) > { > - int i, saved_errno, unused; > + int i, saved_errno, unused, reached_preexec = 0; > PyObject *result; > const char* err_msg = ""; > /* Buffer large enough to hold a hex integer. We can't malloc. */ > @@ -440,6 +440,7 @@ > POSIX_CALL(setsid()); > #endif > > + reached_preexec = 1; > if (preexec_fn != Py_None && preexec_fn_args_tuple) { > /* This is where the user has asked us to deadlock their program. */ > result = PyObject_Call(preexec_fn, preexec_fn_args_tuple, NULL); > @@ -489,6 +490,10 @@ > } > unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); > unused = write(errpipe_write, ":", 1); > + if (!reached_preexec) { > + /* Indicate to the parent that the error happened before exec(). */ > + unused = write(errpipe_write, "noexec", 6); > + } > /* We can't call strerror(saved_errno). It is not async signal safe. > * The parent process will look the error message up. */ > } else { > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From python-checkins at python.org Wed Oct 10 16:21:24 2012 From: python-checkins at python.org (chris.jerdonek) Date: Wed, 10 Oct 2012 16:21:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Divide_doctest_=22Option_Flags_and_Directives=22_section_in?= =?utf-8?q?to_two=2E?= Message-ID: <3XcHYJ3ZyfzQyZ@mail.python.org> http://hg.python.org/cpython/rev/00555659253d changeset: 79635:00555659253d branch: 3.3 parent: 79633:ee30d7ef70be user: Chris Jerdonek date: Wed Oct 10 06:52:08 2012 -0700 summary: Issue #12947: Divide doctest "Option Flags and Directives" section into two. This changeset also applies the rendering workaround to the last remaining example in the file that has a doctest directive that should be displayed. files: Doc/library/doctest.rst | 66 +++++++++++++++++----------- 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -318,7 +318,8 @@ Tabs in output generated by the tested code are not modified. Because any hard tabs in the sample output *are* expanded, this means that if the code output includes hard tabs, the only way the doctest can pass is if the - :const:`NORMALIZE_WHITESPACE` option or directive is in effect. + :const:`NORMALIZE_WHITESPACE` option or :ref:`directive ` + is in effect. Alternatively, the test can be rewritten to capture the output and compare it to an expected value as part of the test. This handling of tabs in the source was arrived at through trial and error, and has proven to be the least @@ -483,15 +484,16 @@ SyntaxError: invalid syntax +.. _option-flags-and-directives: .. _doctest-options: -Option Flags and Directives -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Option Flags +^^^^^^^^^^^^ A number of option flags control various aspects of doctest's behavior. Symbolic names for the flags are supplied as module constants, which can be or'ed together and passed to various functions. The names can also be used in -doctest directives (see below). +:ref:`doctest directives `. The first group of options define test semantics, controlling aspects of how doctest decides whether actual output matches an example's expected output: @@ -545,8 +547,8 @@ :exc:`TypeError` is raised. It will also ignore the module name used in Python 3 doctest reports. Hence - both these variations will work regardless of whether the test is run under - Python 2.7 or Python 3.2 (or later versions): + both of these variations will work with the flag specified, regardless of + whether the test is run under Python 2.7 or Python 3.2 (or later versions):: >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): @@ -562,15 +564,16 @@ exception name. Using :const:`IGNORE_EXCEPTION_DETAIL` and the details from Python 2.3 is also the only clear way to write a doctest that doesn't care about the exception detail yet continues to pass under Python 2.3 or - earlier (those releases do not support doctest directives and ignore them - as irrelevant comments). For example, :: + earlier (those releases do not support :ref:`doctest directives + ` and ignore them as irrelevant comments). For example:: >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment - passes under Python 2.3 and later Python versions, even though the detail + passes under Python 2.3 and later Python versions with the flag specified, + even though the detail changed in Python 2.4 to say "does not" instead of "doesn't". .. versionchanged:: 3.2 @@ -632,9 +635,30 @@ A bitmask or'ing together all the reporting flags above. -"Doctest directives" may be used to modify the option flags for individual -examples. Doctest directives are expressed as a special Python comment -following an example's source code: + +There is also a way to register new option flag names, though this isn't +useful unless you intend to extend :mod:`doctest` internals via subclassing: + + +.. function:: register_optionflag(name) + + Create a new option flag with a given name, and return the new flag's integer + value. :func:`register_optionflag` can be used when subclassing + :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are + supported by your subclasses. :func:`register_optionflag` should always be + called using the following idiom:: + + MY_FLAG = register_optionflag('MY_FLAG') + + +.. _doctest-directives: + +Directives +^^^^^^^^^^ + +Doctest directives may be used to modify the :ref:`option flags +` for an individual example. Doctest directives are +special Python comments following an example's source code: .. productionlist:: doctest directive: "#" "doctest:" `directive_options` @@ -708,20 +732,6 @@ functions that run doctests, establishing different defaults. In such cases, disabling an option via ``-`` in a directive can be useful. -There's also a way to register new option flag names, although this isn't useful -unless you intend to extend :mod:`doctest` internals via subclassing: - - -.. function:: register_optionflag(name) - - Create a new option flag with a given name, and return the new flag's integer - value. :func:`register_optionflag` can be used when subclassing - :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are - supported by your subclasses. :func:`register_optionflag` should always be - called using the following idiom:: - - MY_FLAG = register_optionflag('MY_FLAG') - .. _doctest-warnings: @@ -759,7 +769,9 @@ >>> C() # the default repr() for instances embeds an address <__main__.C instance at 0x00AC18F0> -The :const:`ELLIPSIS` directive gives a nice approach for the last example:: +The :const:`ELLIPSIS` directive gives a nice approach for the last example: + +.. code-block:: text >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:21:26 2012 From: python-checkins at python.org (chris.jerdonek) Date: Wed, 10 Oct 2012 16:21:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2312947=3A_Merge_doctest_documentation_improvemen?= =?utf-8?q?ts_from_3=2E3=2E?= Message-ID: <3XcHYL0XD0zR0R@mail.python.org> http://hg.python.org/cpython/rev/467c9f663b77 changeset: 79636:467c9f663b77 parent: 79634:543bb0e0afb9 parent: 79635:00555659253d user: Chris Jerdonek date: Wed Oct 10 06:56:32 2012 -0700 summary: Issue #12947: Merge doctest documentation improvements from 3.3. files: Doc/library/doctest.rst | 66 +++++++++++++++++----------- 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -318,7 +318,8 @@ Tabs in output generated by the tested code are not modified. Because any hard tabs in the sample output *are* expanded, this means that if the code output includes hard tabs, the only way the doctest can pass is if the - :const:`NORMALIZE_WHITESPACE` option or directive is in effect. + :const:`NORMALIZE_WHITESPACE` option or :ref:`directive ` + is in effect. Alternatively, the test can be rewritten to capture the output and compare it to an expected value as part of the test. This handling of tabs in the source was arrived at through trial and error, and has proven to be the least @@ -483,15 +484,16 @@ SyntaxError: invalid syntax +.. _option-flags-and-directives: .. _doctest-options: -Option Flags and Directives -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Option Flags +^^^^^^^^^^^^ A number of option flags control various aspects of doctest's behavior. Symbolic names for the flags are supplied as module constants, which can be or'ed together and passed to various functions. The names can also be used in -doctest directives (see below). +:ref:`doctest directives `. The first group of options define test semantics, controlling aspects of how doctest decides whether actual output matches an example's expected output: @@ -545,8 +547,8 @@ :exc:`TypeError` is raised. It will also ignore the module name used in Python 3 doctest reports. Hence - both these variations will work regardless of whether the test is run under - Python 2.7 or Python 3.2 (or later versions): + both of these variations will work with the flag specified, regardless of + whether the test is run under Python 2.7 or Python 3.2 (or later versions):: >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): @@ -562,15 +564,16 @@ exception name. Using :const:`IGNORE_EXCEPTION_DETAIL` and the details from Python 2.3 is also the only clear way to write a doctest that doesn't care about the exception detail yet continues to pass under Python 2.3 or - earlier (those releases do not support doctest directives and ignore them - as irrelevant comments). For example, :: + earlier (those releases do not support :ref:`doctest directives + ` and ignore them as irrelevant comments). For example:: >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment - passes under Python 2.3 and later Python versions, even though the detail + passes under Python 2.3 and later Python versions with the flag specified, + even though the detail changed in Python 2.4 to say "does not" instead of "doesn't". .. versionchanged:: 3.2 @@ -632,9 +635,30 @@ A bitmask or'ing together all the reporting flags above. -"Doctest directives" may be used to modify the option flags for individual -examples. Doctest directives are expressed as a special Python comment -following an example's source code: + +There is also a way to register new option flag names, though this isn't +useful unless you intend to extend :mod:`doctest` internals via subclassing: + + +.. function:: register_optionflag(name) + + Create a new option flag with a given name, and return the new flag's integer + value. :func:`register_optionflag` can be used when subclassing + :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are + supported by your subclasses. :func:`register_optionflag` should always be + called using the following idiom:: + + MY_FLAG = register_optionflag('MY_FLAG') + + +.. _doctest-directives: + +Directives +^^^^^^^^^^ + +Doctest directives may be used to modify the :ref:`option flags +` for an individual example. Doctest directives are +special Python comments following an example's source code: .. productionlist:: doctest directive: "#" "doctest:" `directive_options` @@ -708,20 +732,6 @@ functions that run doctests, establishing different defaults. In such cases, disabling an option via ``-`` in a directive can be useful. -There's also a way to register new option flag names, although this isn't useful -unless you intend to extend :mod:`doctest` internals via subclassing: - - -.. function:: register_optionflag(name) - - Create a new option flag with a given name, and return the new flag's integer - value. :func:`register_optionflag` can be used when subclassing - :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are - supported by your subclasses. :func:`register_optionflag` should always be - called using the following idiom:: - - MY_FLAG = register_optionflag('MY_FLAG') - .. _doctest-warnings: @@ -759,7 +769,9 @@ >>> C() # the default repr() for instances embeds an address <__main__.C instance at 0x00AC18F0> -The :const:`ELLIPSIS` directive gives a nice approach for the last example:: +The :const:`ELLIPSIS` directive gives a nice approach for the last example: + +.. code-block:: text >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:21:27 2012 From: python-checkins at python.org (chris.jerdonek) Date: Wed, 10 Oct 2012 16:21:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Backport_doctest_documentation_improvements_from_3=2E3=2E?= Message-ID: <3XcHYM5SdgzR0m@mail.python.org> http://hg.python.org/cpython/rev/15bfa778ec21 changeset: 79637:15bfa778ec21 branch: 2.7 parent: 79614:b2f282991973 user: Chris Jerdonek date: Wed Oct 10 07:13:56 2012 -0700 summary: Issue #12947: Backport doctest documentation improvements from 3.3. files: Doc/library/doctest.rst | 85 +++++++++++++++++----------- 1 files changed, 50 insertions(+), 35 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -339,7 +339,8 @@ Tabs in output generated by the tested code are not modified. Because any hard tabs in the sample output *are* expanded, this means that if the code output includes hard tabs, the only way the doctest can pass is if the - :const:`NORMALIZE_WHITESPACE` option or directive is in effect. + :const:`NORMALIZE_WHITESPACE` option or :ref:`directive ` + is in effect. Alternatively, the test can be rewritten to capture the output and compare it to an expected value as part of the test. This handling of tabs in the source was arrived at through trial and error, and has proven to be the least @@ -511,15 +512,16 @@ SyntaxError: invalid syntax +.. _option-flags-and-directives: .. _doctest-options: -Option Flags and Directives -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Option Flags +^^^^^^^^^^^^ A number of option flags control various aspects of doctest's behavior. Symbolic names for the flags are supplied as module constants, which can be or'ed together and passed to various functions. The names can also be used in -doctest directives (see below). +:ref:`doctest directives `. The first group of options define test semantics, controlling aspects of how doctest decides whether actual output matches an example's expected output: @@ -573,8 +575,8 @@ :exc:`TypeError` is raised. It will also ignore the module name used in Python 3 doctest reports. Hence - both these variations will work regardless of whether the test is run under - Python 2.7 or Python 3.2 (or later versions): + both of these variations will work with the flag specified, regardless of + whether the test is run under Python 2.7 or Python 3.2 (or later versions):: >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): @@ -590,15 +592,16 @@ exception name. Using :const:`IGNORE_EXCEPTION_DETAIL` and the details from Python 2.3 is also the only clear way to write a doctest that doesn't care about the exception detail yet continues to pass under Python 2.3 or - earlier (those releases do not support doctest directives and ignore them - as irrelevant comments). For example, :: + earlier (those releases do not support :ref:`doctest directives + ` and ignore them as irrelevant comments). For example:: >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment - passes under Python 2.3 and later Python versions, even though the detail + passes under Python 2.3 and later Python versions with the flag specified, + even though the detail changed in Python 2.4 to say "does not" instead of "doesn't". .. versionchanged:: 2.7 @@ -662,9 +665,40 @@ A bitmask or'ing together all the reporting flags above. -"Doctest directives" may be used to modify the option flags for individual -examples. Doctest directives are expressed as a special Python comment -following an example's source code: + +.. versionadded:: 2.4 + The constants + :const:`DONT_ACCEPT_BLANKLINE`, :const:`NORMALIZE_WHITESPACE`, + :const:`ELLIPSIS`, :const:`IGNORE_EXCEPTION_DETAIL`, :const:`REPORT_UDIFF`, + :const:`REPORT_CDIFF`, :const:`REPORT_NDIFF`, + :const:`REPORT_ONLY_FIRST_FAILURE`, :const:`COMPARISON_FLAGS` and + :const:`REPORTING_FLAGS` were added. + +There's also a way to register new option flag names, although this isn't useful +unless you intend to extend :mod:`doctest` internals via subclassing: + + +.. function:: register_optionflag(name) + + Create a new option flag with a given name, and return the new flag's integer + value. :func:`register_optionflag` can be used when subclassing + :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are + supported by your subclasses. :func:`register_optionflag` should always be + called using the following idiom:: + + MY_FLAG = register_optionflag('MY_FLAG') + + .. versionadded:: 2.4 + + +.. _doctest-directives: + +Directives +^^^^^^^^^^ + +Doctest directives may be used to modify the :ref:`option flags +` for an individual example. Doctest directives are +special Python comments following an example's source code: .. productionlist:: doctest directive: "#" "doctest:" `directive_options` @@ -739,28 +773,7 @@ disabling an option via ``-`` in a directive can be useful. .. versionadded:: 2.4 - Doctest directives and the associated constants - :const:`DONT_ACCEPT_BLANKLINE`, :const:`NORMALIZE_WHITESPACE`, - :const:`ELLIPSIS`, :const:`IGNORE_EXCEPTION_DETAIL`, :const:`REPORT_UDIFF`, - :const:`REPORT_CDIFF`, :const:`REPORT_NDIFF`, - :const:`REPORT_ONLY_FIRST_FAILURE`, :const:`COMPARISON_FLAGS` and - :const:`REPORTING_FLAGS` were added. - -There's also a way to register new option flag names, although this isn't useful -unless you intend to extend :mod:`doctest` internals via subclassing: - - -.. function:: register_optionflag(name) - - Create a new option flag with a given name, and return the new flag's integer - value. :func:`register_optionflag` can be used when subclassing - :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are - supported by your subclasses. :func:`register_optionflag` should always be - called using the following idiom:: - - MY_FLAG = register_optionflag('MY_FLAG') - - .. versionadded:: 2.4 + Support for doctest directives was added. .. _doctest-warnings: @@ -800,7 +813,9 @@ >>> C() # the default repr() for instances embeds an address <__main__.C instance at 0x00AC18F0> -The :const:`ELLIPSIS` directive gives a nice approach for the last example:: +The :const:`ELLIPSIS` directive gives a nice approach for the last example: + +.. code-block:: text >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:50:45 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:50:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_revert_earlier_workaround_and_use_a_monkey-patch_to_enable?= Message-ID: <3XcJC94f98zQxX@mail.python.org> http://hg.python.org/cpython/rev/9057da41cf0b changeset: 79638:9057da41cf0b branch: 3.2 parent: 79531:1dc66e654806 user: Georg Brandl date: Wed Oct 10 16:45:11 2012 +0200 summary: Issue #12947: revert earlier workaround and use a monkey-patch to enable showing doctest directives only in the doctest docs. files: Doc/library/doctest.rst | 7 +++- Doc/tools/sphinxext/pyspecific.py | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -1,3 +1,5 @@ +:keepdoctest: + :mod:`doctest` --- Test interactive Python examples =================================================== @@ -652,7 +654,7 @@ For example, this test passes:: - >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE + >>> print(list(range(20))) # doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] @@ -664,7 +666,8 @@ >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] -Multiple directives can be used on a single physical line, separated by commas:: +Multiple directives can be used on a single physical line, separated by +commas:: >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -33,9 +33,38 @@ self.body.append('%s ' % text) from sphinx.writers.html import HTMLTranslator +from sphinx.writers.latex import LaTeXTranslator from sphinx.locale import versionlabels HTMLTranslator.visit_versionmodified = new_visit_versionmodified +HTMLTranslator.visit_versionmodified = new_visit_versionmodified +# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +# doctest docs themselves +orig_visit_literal_block = HTMLTranslator.visit_literal_block +def new_visit_literal_block(self, node): + meta = self.builder.env.metadata[self.builder.current_docname] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_visit_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block + +orig_depart_literal_block = LaTeXTranslator.depart_literal_block +def new_depart_literal_block(self, node): + meta = self.builder.env.metadata[self.curfilestack[-1]] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_depart_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +LaTeXTranslator.depart_literal_block = new_depart_literal_block # Support for marking up and linking to bugs.python.org issues -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:50:47 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:50:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_revert_earlier_workaround_and_use_a_monkey-patch_to_enable?= Message-ID: <3XcJCC1RmdzQxv@mail.python.org> http://hg.python.org/cpython/rev/1202c1449d83 changeset: 79639:1202c1449d83 branch: 3.3 parent: 79635:00555659253d user: Georg Brandl date: Wed Oct 10 16:45:11 2012 +0200 summary: Issue #12947: revert earlier workaround and use a monkey-patch to enable showing doctest directives only in the doctest docs. files: Doc/library/doctest.rst | 31 ++++-------------- Doc/tools/sphinxext/pyspecific.py | 29 +++++++++++++++++ 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -1,3 +1,5 @@ +:keepdoctest: + :mod:`doctest` --- Test interactive Python examples =================================================== @@ -674,43 +676,28 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. -.. note:: - Due to an `unfortunate limitation`_ of our current documentation - publishing process, syntax highlighting has been disabled in the examples - below in order to ensure the doctest directives are correctly displayed. +For example, this test passes:: - .. _unfortunate limitation: http://bugs.python.org/issue12947 - -For example, this test passes: - -.. code-block:: text - - >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE + >>> print(list(range(20))) # doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so: - -.. code-block:: text +so:: >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] Multiple directives can be used on a single physical line, separated by -commas: - -.. code-block:: text +commas:: >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined: - -.. code-block:: text +combined:: >>> print(list(range(20))) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -718,9 +705,7 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line: - -.. code-block:: text +a directive to comfortably fit on the same line:: >>> print(list(range(5)) + list(range(10, 20)) + list(range(30, 40))) ... # doctest: +ELLIPSIS diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -33,9 +33,38 @@ self.body.append('%s ' % text) from sphinx.writers.html import HTMLTranslator +from sphinx.writers.latex import LaTeXTranslator from sphinx.locale import versionlabels HTMLTranslator.visit_versionmodified = new_visit_versionmodified +HTMLTranslator.visit_versionmodified = new_visit_versionmodified +# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +# doctest docs themselves +orig_visit_literal_block = HTMLTranslator.visit_literal_block +def new_visit_literal_block(self, node): + meta = self.builder.env.metadata[self.builder.current_docname] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_visit_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block + +orig_depart_literal_block = LaTeXTranslator.depart_literal_block +def new_depart_literal_block(self, node): + meta = self.builder.env.metadata[self.curfilestack[-1]] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_depart_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +LaTeXTranslator.depart_literal_block = new_depart_literal_block # Support for marking up and linking to bugs.python.org issues -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:50:48 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:50:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_merge_3=2E2_heads?= Message-ID: <3XcJCD4jHGzR06@mail.python.org> http://hg.python.org/cpython/rev/24499eebbc2f changeset: 79640:24499eebbc2f branch: 3.2 parent: 79632:e938fa6be509 parent: 79638:9057da41cf0b user: Georg Brandl date: Wed Oct 10 16:49:02 2012 +0200 summary: merge 3.2 heads files: Doc/library/doctest.rst | 7 +++- Doc/tools/sphinxext/pyspecific.py | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -1,3 +1,5 @@ +:keepdoctest: + :mod:`doctest` --- Test interactive Python examples =================================================== @@ -652,7 +654,7 @@ For example, this test passes:: - >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE + >>> print(list(range(20))) # doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] @@ -664,7 +666,8 @@ >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] -Multiple directives can be used on a single physical line, separated by commas:: +Multiple directives can be used on a single physical line, separated by +commas:: >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -33,9 +33,38 @@ self.body.append('%s ' % text) from sphinx.writers.html import HTMLTranslator +from sphinx.writers.latex import LaTeXTranslator from sphinx.locale import versionlabels HTMLTranslator.visit_versionmodified = new_visit_versionmodified +HTMLTranslator.visit_versionmodified = new_visit_versionmodified +# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +# doctest docs themselves +orig_visit_literal_block = HTMLTranslator.visit_literal_block +def new_visit_literal_block(self, node): + meta = self.builder.env.metadata[self.builder.current_docname] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_visit_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block + +orig_depart_literal_block = LaTeXTranslator.depart_literal_block +def new_depart_literal_block(self, node): + meta = self.builder.env.metadata[self.curfilestack[-1]] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_depart_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +LaTeXTranslator.depart_literal_block = new_depart_literal_block # Support for marking up and linking to bugs.python.org issues -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:50:50 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:50:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_3=2E2?= Message-ID: <3XcJCG0mVJzQxv@mail.python.org> http://hg.python.org/cpython/rev/e784f6c106b0 changeset: 79641:e784f6c106b0 branch: 3.3 parent: 79639:1202c1449d83 parent: 79640:24499eebbc2f user: Georg Brandl date: Wed Oct 10 16:49:11 2012 +0200 summary: merge 3.2 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:50:51 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:50:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3XcJCH4qy5zR0q@mail.python.org> http://hg.python.org/cpython/rev/121d280e4863 changeset: 79642:121d280e4863 parent: 79636:467c9f663b77 parent: 79641:e784f6c106b0 user: Georg Brandl date: Wed Oct 10 16:49:18 2012 +0200 summary: merge 3.3 files: Doc/library/doctest.rst | 31 ++++-------------- Doc/tools/sphinxext/pyspecific.py | 29 +++++++++++++++++ 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -1,3 +1,5 @@ +:keepdoctest: + :mod:`doctest` --- Test interactive Python examples =================================================== @@ -674,43 +676,28 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. -.. note:: - Due to an `unfortunate limitation`_ of our current documentation - publishing process, syntax highlighting has been disabled in the examples - below in order to ensure the doctest directives are correctly displayed. +For example, this test passes:: - .. _unfortunate limitation: http://bugs.python.org/issue12947 - -For example, this test passes: - -.. code-block:: text - - >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE + >>> print(list(range(20))) # doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so: - -.. code-block:: text +so:: >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] Multiple directives can be used on a single physical line, separated by -commas: - -.. code-block:: text +commas:: >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined: - -.. code-block:: text +combined:: >>> print(list(range(20))) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -718,9 +705,7 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line: - -.. code-block:: text +a directive to comfortably fit on the same line:: >>> print(list(range(5)) + list(range(10, 20)) + list(range(30, 40))) ... # doctest: +ELLIPSIS diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -33,9 +33,38 @@ self.body.append('%s ' % text) from sphinx.writers.html import HTMLTranslator +from sphinx.writers.latex import LaTeXTranslator from sphinx.locale import versionlabels HTMLTranslator.visit_versionmodified = new_visit_versionmodified +HTMLTranslator.visit_versionmodified = new_visit_versionmodified +# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +# doctest docs themselves +orig_visit_literal_block = HTMLTranslator.visit_literal_block +def new_visit_literal_block(self, node): + meta = self.builder.env.metadata[self.builder.current_docname] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_visit_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block + +orig_depart_literal_block = LaTeXTranslator.depart_literal_block +def new_depart_literal_block(self, node): + meta = self.builder.env.metadata[self.curfilestack[-1]] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_depart_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +LaTeXTranslator.depart_literal_block = new_depart_literal_block # Support for marking up and linking to bugs.python.org issues -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:53:06 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:53:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_revert_earlier_workaround_and_use_a_monkey-patch_to_enable?= Message-ID: <3XcJFt2nJ3zQsB@mail.python.org> http://hg.python.org/cpython/rev/ffe9f644d5af changeset: 79643:ffe9f644d5af branch: 2.7 parent: 79637:15bfa778ec21 user: Georg Brandl date: Wed Oct 10 16:45:11 2012 +0200 summary: Issue #12947: revert earlier workaround and use a monkey-patch to enable showing doctest directives only in the doctest docs. files: Doc/library/doctest.rst | 33 +++++------------- Doc/tools/sphinxext/pyspecific.py | 29 ++++++++++++++++ 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -1,3 +1,5 @@ +:keepdoctest: + :mod:`doctest` --- Test interactive Python examples =================================================== @@ -714,43 +716,28 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. -.. note:: - Due to an `unfortunate limitation`_ of our current documentation - publishing process, syntax highlighting has been disabled in the examples - below in order to ensure the doctest directives are correctly displayed. - - .. _unfortunate limitation: http://bugs.python.org/issue12947 - -For example, this test passes: - -.. code-block:: text - - >>> print range(20) #doctest: +NORMALIZE_WHITESPACE +For example, this test passes:: + + >>> print range(20) # doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so: - -.. code-block:: text +so:: >>> print range(20) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] Multiple directives can be used on a single physical line, separated by -commas: - -.. code-block:: text +commas:: >>> print range(20) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined: - -.. code-block:: text +combined:: >>> print range(20) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -758,9 +745,7 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line: - -.. code-block:: text +a directive to comfortably fit on the same line:: >>> print range(5) + range(10,20) + range(30,40) + range(50,60) ... # doctest: +ELLIPSIS diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -33,9 +33,38 @@ self.body.append('%s' % text) from sphinx.writers.html import HTMLTranslator +from sphinx.writers.latex import LaTeXTranslator from sphinx.locale import versionlabels HTMLTranslator.visit_versionmodified = new_visit_versionmodified +HTMLTranslator.visit_versionmodified = new_visit_versionmodified +# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +# doctest docs themselves +orig_visit_literal_block = HTMLTranslator.visit_literal_block +def new_visit_literal_block(self, node): + meta = self.builder.env.metadata[self.builder.current_docname] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_visit_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block + +orig_depart_literal_block = LaTeXTranslator.depart_literal_block +def new_depart_literal_block(self, node): + meta = self.builder.env.metadata[self.curfilestack[-1]] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_depart_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +LaTeXTranslator.depart_literal_block = new_depart_literal_block # Support for marking up and linking to bugs.python.org issues -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:55:36 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:55:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Missed_one_ins?= =?utf-8?q?tance_of_code-block=3A=3A_text_highlighting_to_revert=2E?= Message-ID: <3XcJJm5MlHzQvL@mail.python.org> http://hg.python.org/cpython/rev/c7d0c79b6865 changeset: 79644:c7d0c79b6865 branch: 3.3 parent: 79641:e784f6c106b0 user: Georg Brandl date: Wed Oct 10 16:56:15 2012 +0200 summary: Missed one instance of code-block:: text highlighting to revert. files: Doc/library/doctest.rst | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -754,9 +754,7 @@ >>> C() # the default repr() for instances embeds an address <__main__.C instance at 0x00AC18F0> -The :const:`ELLIPSIS` directive gives a nice approach for the last example: - -.. code-block:: text +The :const:`ELLIPSIS` directive gives a nice approach for the last example:: >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:55:38 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:55:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3XcJJp0nTfzQy2@mail.python.org> http://hg.python.org/cpython/rev/0d6910bef979 changeset: 79645:0d6910bef979 parent: 79642:121d280e4863 parent: 79644:c7d0c79b6865 user: Georg Brandl date: Wed Oct 10 16:56:22 2012 +0200 summary: merge 3.3 files: Doc/library/doctest.rst | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -754,9 +754,7 @@ >>> C() # the default repr() for instances embeds an address <__main__.C instance at 0x00AC18F0> -The :const:`ELLIPSIS` directive gives a nice approach for the last example: - -.. code-block:: text +The :const:`ELLIPSIS` directive gives a nice approach for the last example:: >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 16:55:39 2012 From: python-checkins at python.org (georg.brandl) Date: Wed, 10 Oct 2012 16:55:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Missed_one_ins?= =?utf-8?q?tance_of_code-block=3A=3A_text_highlighting_to_revert=2E?= Message-ID: <3XcJJq3BhmzQxv@mail.python.org> http://hg.python.org/cpython/rev/328ed76d98a5 changeset: 79646:328ed76d98a5 branch: 2.7 parent: 79643:ffe9f644d5af user: Georg Brandl date: Wed Oct 10 16:56:15 2012 +0200 summary: Missed one instance of code-block:: text highlighting to revert. files: Doc/library/doctest.rst | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -798,9 +798,7 @@ >>> C() # the default repr() for instances embeds an address <__main__.C instance at 0x00AC18F0> -The :const:`ELLIPSIS` directive gives a nice approach for the last example: - -.. code-block:: text +The :const:`ELLIPSIS` directive gives a nice approach for the last example:: >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 17:40:17 2012 From: python-checkins at python.org (chris.jerdonek) Date: Wed, 10 Oct 2012 17:40:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Remove_doctest_directives_from_the_doctest_examples_in_the?= Message-ID: <3XcKJK3TwkzPBq@mail.python.org> http://hg.python.org/cpython/rev/705a70b0fff4 changeset: 79647:705a70b0fff4 branch: 3.3 parent: 79644:c7d0c79b6865 user: Chris Jerdonek date: Wed Oct 10 08:34:38 2012 -0700 summary: Issue #12947: Remove doctest directives from the doctest examples in the "Option Flag" section. The doctest examples that illustrate the use of doctest option flags independent of doctest directives should not display doctest directives. files: Doc/library/doctest.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -552,11 +552,11 @@ both of these variations will work with the flag specified, regardless of whether the test is run under Python 2.7 or Python 3.2 (or later versions):: - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): CustomError: message - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): my_module.CustomError: message @@ -569,7 +569,7 @@ earlier (those releases do not support :ref:`doctest directives ` and ignore them as irrelevant comments). For example:: - >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL + >>> (1, 2)[3] = 'moo' Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 17:40:19 2012 From: python-checkins at python.org (chris.jerdonek) Date: Wed, 10 Oct 2012 17:40:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2312947=3A_Merge_doctest_documentation_change_fro?= =?utf-8?b?bSAzLjMu?= Message-ID: <3XcKJM4ZTszQyZ@mail.python.org> http://hg.python.org/cpython/rev/9475fc82768e changeset: 79648:9475fc82768e parent: 79645:0d6910bef979 parent: 79647:705a70b0fff4 user: Chris Jerdonek date: Wed Oct 10 08:36:43 2012 -0700 summary: Issue #12947: Merge doctest documentation change from 3.3. files: Doc/library/doctest.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -552,11 +552,11 @@ both of these variations will work with the flag specified, regardless of whether the test is run under Python 2.7 or Python 3.2 (or later versions):: - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): CustomError: message - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): my_module.CustomError: message @@ -569,7 +569,7 @@ earlier (those releases do not support :ref:`doctest directives ` and ignore them as irrelevant comments). For example:: - >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL + >>> (1, 2)[3] = 'moo' Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 17:40:21 2012 From: python-checkins at python.org (chris.jerdonek) Date: Wed, 10 Oct 2012 17:40:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyOTQ3?= =?utf-8?q?=3A_Backport_doctest_documentation_change_from_3=2E3=2E?= Message-ID: <3XcKJP0RKFzQyl@mail.python.org> http://hg.python.org/cpython/rev/8704f9e7ad7c changeset: 79649:8704f9e7ad7c branch: 2.7 parent: 79646:328ed76d98a5 user: Chris Jerdonek date: Wed Oct 10 08:39:34 2012 -0700 summary: Issue #12947: Backport doctest documentation change from 3.3. files: Doc/library/doctest.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -580,11 +580,11 @@ both of these variations will work with the flag specified, regardless of whether the test is run under Python 2.7 or Python 3.2 (or later versions):: - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): CustomError: message - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): my_module.CustomError: message @@ -597,7 +597,7 @@ earlier (those releases do not support :ref:`doctest directives ` and ignore them as irrelevant comments). For example:: - >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL + >>> (1, 2)[3] = 'moo' Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 20:10:51 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 10 Oct 2012 20:10:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_add_some_missing_DISPATCH?= =?utf-8?b?KCk=?= Message-ID: <3XcNf36nNxzQk3@mail.python.org> http://hg.python.org/cpython/rev/5a13f9b842b1 changeset: 79650:5a13f9b842b1 parent: 79629:5733529b297c user: Benjamin Peterson date: Wed Oct 10 14:10:33 2012 -0400 summary: add some missing DISPATCH() files: Python/ceval.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1955,7 +1955,7 @@ } } PUSH(x); - break; + DISPATCH(); } TARGET(STORE_NAME) @@ -1977,11 +1977,13 @@ TARGET(DELETE_NAME) w = GETITEM(names, oparg); if ((x = f->f_locals) != NULL) { - if ((err = PyObject_DelItem(x, w)) != 0) + if ((err = PyObject_DelItem(x, w)) != 0) { format_exc_check_arg(PyExc_NameError, NAME_ERROR_MSG, w); - break; + break; + } + DISPATCH(); } PyErr_Format(PyExc_SystemError, "no locals when deleting %R", w); @@ -1999,8 +2001,6 @@ Py_INCREF(w); PUSH(w); } - Py_DECREF(v); - DISPATCH(); } else if (PyList_CheckExact(v) && PyList_GET_SIZE(v) == oparg) { PyObject **items = \ @@ -2016,9 +2016,11 @@ } else { /* unpack_iterable() raised an exception */ why = WHY_EXCEPTION; + Py_DECREF(v); + break; } Py_DECREF(v); - break; + DISPATCH(); TARGET(UNPACK_EX) { @@ -2029,10 +2031,12 @@ stack_pointer + totalargs)) { stack_pointer += totalargs; } else { + Py_DECREF(v); why = WHY_EXCEPTION; + break; } Py_DECREF(v); - break; + DISPATCH(); } TARGET(STORE_ATTR) @@ -2052,6 +2056,7 @@ err = PyObject_SetAttr(v, w, (PyObject *)NULL); /* del v.w */ Py_DECREF(v); + if (err == 0) DISPATCH(); break; TARGET(STORE_GLOBAL) @@ -2064,10 +2069,12 @@ TARGET(DELETE_GLOBAL) w = GETITEM(names, oparg); - if ((err = PyDict_DelItem(f->f_globals, w)) != 0) + if ((err = PyDict_DelItem(f->f_globals, w)) != 0) { format_exc_check_arg( PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w); - break; + break; + } + DISPATCH(); TARGET(LOAD_NAME) w = GETITEM(names, oparg); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 20:10:53 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 10 Oct 2012 20:10:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge_heads?= Message-ID: <3XcNf55z0KzQsm@mail.python.org> http://hg.python.org/cpython/rev/73e7bebb3aa4 changeset: 79651:73e7bebb3aa4 parent: 79650:5a13f9b842b1 parent: 79648:9475fc82768e user: Benjamin Peterson date: Wed Oct 10 14:10:44 2012 -0400 summary: merge heads files: Doc/library/doctest.rst | 99 +++++++++--------- Doc/tools/sphinxext/pyspecific.py | 29 +++++ Lib/subprocess.py | 10 +- Lib/test/test_subprocess.py | 60 +++++++++-- Misc/NEWS | 4 + Modules/_posixsubprocess.c | 7 +- 6 files changed, 143 insertions(+), 66 deletions(-) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -1,3 +1,5 @@ +:keepdoctest: + :mod:`doctest` --- Test interactive Python examples =================================================== @@ -318,7 +320,8 @@ Tabs in output generated by the tested code are not modified. Because any hard tabs in the sample output *are* expanded, this means that if the code output includes hard tabs, the only way the doctest can pass is if the - :const:`NORMALIZE_WHITESPACE` option or directive is in effect. + :const:`NORMALIZE_WHITESPACE` option or :ref:`directive ` + is in effect. Alternatively, the test can be rewritten to capture the output and compare it to an expected value as part of the test. This handling of tabs in the source was arrived at through trial and error, and has proven to be the least @@ -483,15 +486,16 @@ SyntaxError: invalid syntax +.. _option-flags-and-directives: .. _doctest-options: -Option Flags and Directives -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Option Flags +^^^^^^^^^^^^ A number of option flags control various aspects of doctest's behavior. Symbolic names for the flags are supplied as module constants, which can be or'ed together and passed to various functions. The names can also be used in -doctest directives (see below). +:ref:`doctest directives `. The first group of options define test semantics, controlling aspects of how doctest decides whether actual output matches an example's expected output: @@ -545,14 +549,14 @@ :exc:`TypeError` is raised. It will also ignore the module name used in Python 3 doctest reports. Hence - both these variations will work regardless of whether the test is run under - Python 2.7 or Python 3.2 (or later versions): + both of these variations will work with the flag specified, regardless of + whether the test is run under Python 2.7 or Python 3.2 (or later versions):: - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): CustomError: message - >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL + >>> raise CustomError('message') Traceback (most recent call last): my_module.CustomError: message @@ -562,15 +566,16 @@ exception name. Using :const:`IGNORE_EXCEPTION_DETAIL` and the details from Python 2.3 is also the only clear way to write a doctest that doesn't care about the exception detail yet continues to pass under Python 2.3 or - earlier (those releases do not support doctest directives and ignore them - as irrelevant comments). For example, :: + earlier (those releases do not support :ref:`doctest directives + ` and ignore them as irrelevant comments). For example:: - >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL + >>> (1, 2)[3] = 'moo' Traceback (most recent call last): File "", line 1, in ? TypeError: object doesn't support item assignment - passes under Python 2.3 and later Python versions, even though the detail + passes under Python 2.3 and later Python versions with the flag specified, + even though the detail changed in Python 2.4 to say "does not" instead of "doesn't". .. versionchanged:: 3.2 @@ -632,9 +637,30 @@ A bitmask or'ing together all the reporting flags above. -"Doctest directives" may be used to modify the option flags for individual -examples. Doctest directives are expressed as a special Python comment -following an example's source code: + +There is also a way to register new option flag names, though this isn't +useful unless you intend to extend :mod:`doctest` internals via subclassing: + + +.. function:: register_optionflag(name) + + Create a new option flag with a given name, and return the new flag's integer + value. :func:`register_optionflag` can be used when subclassing + :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are + supported by your subclasses. :func:`register_optionflag` should always be + called using the following idiom:: + + MY_FLAG = register_optionflag('MY_FLAG') + + +.. _doctest-directives: + +Directives +^^^^^^^^^^ + +Doctest directives may be used to modify the :ref:`option flags +` for an individual example. Doctest directives are +special Python comments following an example's source code: .. productionlist:: doctest directive: "#" "doctest:" `directive_options` @@ -650,43 +676,28 @@ An example's doctest directives modify doctest's behavior for that single example. Use ``+`` to enable the named behavior, or ``-`` to disable it. -.. note:: - Due to an `unfortunate limitation`_ of our current documentation - publishing process, syntax highlighting has been disabled in the examples - below in order to ensure the doctest directives are correctly displayed. +For example, this test passes:: - .. _unfortunate limitation: http://bugs.python.org/issue12947 - -For example, this test passes: - -.. code-block:: text - - >>> print(list(range(20))) #doctest: +NORMALIZE_WHITESPACE + >>> print(list(range(20))) # doctest: +NORMALIZE_WHITESPACE [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] Without the directive it would fail, both because the actual output doesn't have two blanks before the single-digit list elements, and because the actual output is on a single line. This test also passes, and also requires a directive to do -so: - -.. code-block:: text +so:: >>> print(list(range(20))) # doctest: +ELLIPSIS [0, 1, ..., 18, 19] Multiple directives can be used on a single physical line, separated by -commas: - -.. code-block:: text +commas:: >>> print(list(range(20))) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE [0, 1, ..., 18, 19] If multiple directive comments are used for a single example, then they are -combined: - -.. code-block:: text +combined:: >>> print(list(range(20))) # doctest: +ELLIPSIS ... # doctest: +NORMALIZE_WHITESPACE @@ -694,9 +705,7 @@ As the previous example shows, you can add ``...`` lines to your example containing only directives. This can be useful when an example is too long for -a directive to comfortably fit on the same line: - -.. code-block:: text +a directive to comfortably fit on the same line:: >>> print(list(range(5)) + list(range(10, 20)) + list(range(30, 40))) ... # doctest: +ELLIPSIS @@ -708,20 +717,6 @@ functions that run doctests, establishing different defaults. In such cases, disabling an option via ``-`` in a directive can be useful. -There's also a way to register new option flag names, although this isn't useful -unless you intend to extend :mod:`doctest` internals via subclassing: - - -.. function:: register_optionflag(name) - - Create a new option flag with a given name, and return the new flag's integer - value. :func:`register_optionflag` can be used when subclassing - :class:`OutputChecker` or :class:`DocTestRunner` to create new options that are - supported by your subclasses. :func:`register_optionflag` should always be - called using the following idiom:: - - MY_FLAG = register_optionflag('MY_FLAG') - .. _doctest-warnings: diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -33,9 +33,38 @@ self.body.append('%s ' % text) from sphinx.writers.html import HTMLTranslator +from sphinx.writers.latex import LaTeXTranslator from sphinx.locale import versionlabels HTMLTranslator.visit_versionmodified = new_visit_versionmodified +HTMLTranslator.visit_versionmodified = new_visit_versionmodified +# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +# doctest docs themselves +orig_visit_literal_block = HTMLTranslator.visit_literal_block +def new_visit_literal_block(self, node): + meta = self.builder.env.metadata[self.builder.current_docname] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_visit_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block + +orig_depart_literal_block = LaTeXTranslator.depart_literal_block +def new_depart_literal_block(self, node): + meta = self.builder.env.metadata[self.curfilestack[-1]] + old_trim_doctest_flags = self.highlighter.trim_doctest_flags + if 'keepdoctest' in meta: + self.highlighter.trim_doctest_flags = False + try: + orig_depart_literal_block(self, node) + finally: + self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +LaTeXTranslator.depart_literal_block = new_depart_literal_block # Support for marking up and linking to bugs.python.org issues diff --git a/Lib/subprocess.py b/Lib/subprocess.py --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1327,6 +1327,7 @@ if executable is None: executable = args[0] + orig_executable = executable # For transferring possible exec failure from child to parent. # Data format: "exception name:hex errno:description" @@ -1409,10 +1410,17 @@ err_msg = err_msg.decode(errors="surrogatepass") if issubclass(child_exception_type, OSError) and hex_errno: errno_num = int(hex_errno, 16) + child_exec_never_called = (err_msg == "noexec") + if child_exec_never_called: + err_msg = "" if errno_num != 0: err_msg = os.strerror(errno_num) if errno_num == errno.ENOENT: - err_msg += ': ' + repr(args[0]) + if child_exec_never_called: + # The error must be from chdir(cwd). + err_msg += ': ' + repr(cwd) + else: + err_msg += ': ' + repr(orig_executable) raise child_exception_type(errno_num, err_msg) raise child_exception_type(err_msg) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -200,13 +200,16 @@ p.wait() self.assertEqual(47, p.returncode) - # TODO: make this test work on Linux. - # This may be failing on Linux because of issue #7774. - @unittest.skipIf(sys.platform not in ('win32', 'darwin'), - "possible bug using executable argument on Linux") def test_executable(self): # Check that the executable argument works. - self._assert_python(["doesnotexist", "-c"], executable=sys.executable) + # + # On Unix (non-Mac and non-Windows), Python looks at args[0] to + # determine where its standard library is, so we need the directory + # of args[0] to be valid for the Popen() call to Python to succeed. + # See also issue #16170 and issue #7774. + doesnotexist = os.path.join(os.path.dirname(sys.executable), + "doesnotexist") + self._assert_python([doesnotexist, "-c"], executable=sys.executable) def test_executable_takes_precedence(self): # Check that the executable argument takes precedence over args[0]. @@ -1035,24 +1038,30 @@ @unittest.skipIf(mswindows, "POSIX specific tests") class POSIXProcessTestCase(BaseTestCase): - def test_exceptions(self): - nonexistent_dir = "/_this/pa.th/does/not/exist" + def setUp(self): + super().setUp() + self._nonexistent_dir = "/_this/pa.th/does/not/exist" + + def _get_chdir_exception(self): try: - os.chdir(nonexistent_dir) + os.chdir(self._nonexistent_dir) except OSError as e: # This avoids hard coding the errno value or the OS perror() # string and instead capture the exception that we want to see # below for comparison. desired_exception = e - desired_exception.strerror += ': ' + repr(sys.executable) + desired_exception.strerror += ': ' + repr(self._nonexistent_dir) else: self.fail("chdir to nonexistant directory %s succeeded." % - nonexistent_dir) + self._nonexistent_dir) + return desired_exception - # Error in the child re-raised in the parent. + def test_exception_cwd(self): + """Test error in the child raised in the parent for a bad cwd.""" + desired_exception = self._get_chdir_exception() try: p = subprocess.Popen([sys.executable, "-c", ""], - cwd=nonexistent_dir) + cwd=self._nonexistent_dir) except OSError as e: # Test that the child process chdir failure actually makes # it up to the parent process as the correct exception. @@ -1061,6 +1070,33 @@ else: self.fail("Expected OSError: %s" % desired_exception) + def test_exception_bad_executable(self): + """Test error in the child raised in the parent for a bad executable.""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([sys.executable, "-c", ""], + executable=self._nonexistent_dir) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + + def test_exception_bad_args_0(self): + """Test error in the child raised in the parent for a bad args[0].""" + desired_exception = self._get_chdir_exception() + try: + p = subprocess.Popen([self._nonexistent_dir, "-c", ""]) + except OSError as e: + # Test that the child process exec failure actually makes + # it up to the parent process as the correct exception. + self.assertEqual(desired_exception.errno, e.errno) + self.assertEqual(desired_exception.strerror, e.strerror) + else: + self.fail("Expected OSError: %s" % desired_exception) + def test_restore_signals(self): # Code coverage for both values of restore_signals to make sure it # at least does not blow up. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -42,6 +42,10 @@ Library ------- +- Issue #16114: The subprocess module no longer provides a misleading error + message stating that args[0] did not exist when either the cwd or executable + keyword arguments specified a path that did not exist. + - Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. - Issue #1492704: shutil.copyfile() raises a distinct SameFileError now if diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -356,7 +356,7 @@ PyObject *preexec_fn, PyObject *preexec_fn_args_tuple) { - int i, saved_errno, unused; + int i, saved_errno, unused, reached_preexec = 0; PyObject *result; const char* err_msg = ""; /* Buffer large enough to hold a hex integer. We can't malloc. */ @@ -440,6 +440,7 @@ POSIX_CALL(setsid()); #endif + reached_preexec = 1; if (preexec_fn != Py_None && preexec_fn_args_tuple) { /* This is where the user has asked us to deadlock their program. */ result = PyObject_Call(preexec_fn, preexec_fn_args_tuple, NULL); @@ -489,6 +490,10 @@ } unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); unused = write(errpipe_write, ":", 1); + if (!reached_preexec) { + /* Indicate to the parent that the error happened before exec(). */ + unused = write(errpipe_write, "noexec", 6); + } /* We can't call strerror(saved_errno). It is not async signal safe. * The parent process will look the error message up. */ } else { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 10 20:36:32 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 10 Oct 2012 20:36:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?cGVwczogUmVwbGFjZSAiLmV4dCIgd2l0aCAi?= =?utf-8?q?=2Esuffix=22=2C_and_add_the_=22=2Esuffixes=22_property=2E?= Message-ID: <3XcPCh4zywzQnT@mail.python.org> http://hg.python.org/peps/rev/86d69edb5de8 changeset: 4547:86d69edb5de8 user: Antoine Pitrou date: Wed Oct 10 20:34:57 2012 +0200 summary: Replace ".ext" with ".suffix", and add the ".suffixes" property. files: pep-0428.txt | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -362,9 +362,9 @@ Properties ---------- -Five simple properties are provided on every path (each can be empty):: +Six simple properties are provided on every path (each can be empty):: - >>> p = PureNTPath('c:/pathlib/setup.py') + >>> p = PureNTPath('c:/Downloads/pathlib.tar.gz') >>> p.drive 'c:' >>> p.root @@ -372,9 +372,13 @@ >>> p.anchor 'c:\\' >>> p.name - 'setup.py' - >>> p.ext - '.py' + 'pathlib.tar.gz' + >>> p.basename + 'pathlib.tar' + >>> p.suffix + '.gz' + >>> p.suffixes + ['.tar', '.gz'] Sequence-like access -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Wed Oct 10 20:37:07 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 10 Oct 2012 20:37:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_They_are_seven_=28as_I_added_?= =?utf-8?q?=22basename=22_too=29=2E?= Message-ID: <3XcPDM6MxtzQnT@mail.python.org> http://hg.python.org/peps/rev/1ae4c774bd16 changeset: 4548:1ae4c774bd16 user: Antoine Pitrou date: Wed Oct 10 20:35:33 2012 +0200 summary: They are seven (as I added "basename" too). files: pep-0428.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -362,7 +362,7 @@ Properties ---------- -Six simple properties are provided on every path (each can be empty):: +Seven simple properties are provided on every path (each can be empty):: >>> p = PureNTPath('c:/Downloads/pathlib.tar.gz') >>> p.drive -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Wed Oct 10 20:57:20 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 10 Oct 2012 20:57:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Add_with=5Fname=28=29_and_wit?= =?utf-8?q?h=5Fsuffix=28=29_methods=2E?= Message-ID: <3XcPgh0XWmzQpC@mail.python.org> http://hg.python.org/peps/rev/3be135be70c5 changeset: 4549:3be135be70c5 user: Antoine Pitrou date: Wed Oct 10 20:55:44 2012 +0200 summary: Add with_name() and with_suffix() methods. files: pep-0428.txt | 91 ++++++++++++++++++++++++++++----------- 1 files changed, 64 insertions(+), 27 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -306,33 +306,6 @@ PurePosixPath('.') -Joining -------- - -A path can be joined with another using the ``__getitem__`` operator:: - - >>> p = PurePosixPath('foo') - >>> p['bar'] - PurePosixPath('foo/bar') - >>> p[PurePosixPath('bar')] - PurePosixPath('foo/bar') - -As with constructing, multiple path components can be specified, either -collapsed or separately:: - - >>> p['bar/xyzzy'] - PurePosixPath('foo/bar/xyzzy') - >>> p['bar', 'xyzzy'] - PurePosixPath('foo/bar/xyzzy') - -A join() method is also provided, with the same behaviour. It can serve -as a factory function:: - - >>> path_factory = p.join - >>> path_factory('bar') - PurePosixPath('foo/bar') - - Representing ------------ @@ -381,6 +354,70 @@ ['.tar', '.gz'] +Deriving new paths +------------------ + +Joining +^^^^^^^ + +A path can be joined with another using the ``__getitem__`` operator:: + + >>> p = PurePosixPath('foo') + >>> p['bar'] + PurePosixPath('foo/bar') + >>> p[PurePosixPath('bar')] + PurePosixPath('foo/bar') + +As with the constructor, multiple path components can be specified, either +collapsed or separately:: + + >>> p['bar/xyzzy'] + PurePosixPath('foo/bar/xyzzy') + >>> p['bar', 'xyzzy'] + PurePosixPath('foo/bar/xyzzy') + +A join() method is also provided, with the same behaviour. It can serve +as a factory function:: + + >>> path_factory = p.join + >>> path_factory('bar') + PurePosixPath('foo/bar') + +Changing the path name +^^^^^^^^^^^^^^^^^^^^^^ + +The ``with_name()`` method returns a new path, with the name changed:: + + >>> p = PureNTPath('c:/Downloads/pathlib.tar.gz') + >>> p.with_name('setup.py') + PureNTPath('c:\\Downloads\\setup.py') + +It fails with a ``ValueError`` if the path doesn't have an actual name:: + + >>> p = PureNTPath('c:/') + >>> p.with_name('setup.py') + Traceback (most recent call last): + File "", line 1, in + File "pathlib.py", line 875, in with_name + raise ValueError("%r has an empty name" % (self,)) + ValueError: PureNTPath('c:\\') has an empty name + >>> p.name + '' + +Changing the path suffix +^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``with_suffix()`` method returns a new path with the suffix changed. +However, if the path has no suffix, the new suffix is added:: + + >>> p = PureNTPath('c:/Downloads/pathlib.tar.gz') + >>> p.with_suffix('.bz2') + PureNTPath('c:\\Downloads\\pathlib.tar.bz2') + >>> p = PureNTPath('README') + >>> p.with_suffix('.bz2') + PureNTPath('README.bz2') + + Sequence-like access -------------------- -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Wed Oct 10 21:04:23 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 10 Oct 2012 21:04:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Rename_relative=5Fto=28=29_to?= =?utf-8?q?_relative=28=29=2C_removing_the_old_relative=28=29_method=2E?= Message-ID: <3XcPqq23c0zQqt@mail.python.org> http://hg.python.org/peps/rev/3d6a0f00b70e changeset: 4550:3d6a0f00b70e user: Antoine Pitrou date: Wed Oct 10 21:01:50 2012 +0200 summary: Rename relative_to() to relative(), removing the old relative() method. files: pep-0428.txt | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/pep-0428.txt b/pep-0428.txt --- a/pep-0428.txt +++ b/pep-0428.txt @@ -383,8 +383,8 @@ >>> path_factory('bar') PurePosixPath('foo/bar') -Changing the path name -^^^^^^^^^^^^^^^^^^^^^^ +Changing the path's final component +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The ``with_name()`` method returns a new path, with the name changed:: @@ -404,9 +404,6 @@ >>> p.name '' -Changing the path suffix -^^^^^^^^^^^^^^^^^^^^^^^^ - The ``with_suffix()`` method returns a new path with the suffix changed. However, if the path has no suffix, the new suffix is added:: @@ -417,6 +414,24 @@ >>> p.with_suffix('.bz2') PureNTPath('README.bz2') +Making the path relative +^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``relative()`` method computes the relative difference of a path to +another:: + + >>> PurePosixPath('/usr/bin/python').relative('/usr') + PurePosixPath('bin/python') + +ValueError is raised if the method cannot return a meaningful value:: + + >>> PurePosixPath('/usr/bin/python').relative('/etc') + Traceback (most recent call last): + File "", line 1, in + File "pathlib.py", line 926, in relative + .format(str(self), str(formatted))) + ValueError: '/usr/bin/python' does not start with '/etc' + Sequence-like access -------------------- @@ -481,18 +496,6 @@ >>> PureNTPath('c:/PATHLIB/setup.py').match('c:*lib/*.PY') True -``relative()`` returns a new relative path by stripping the drive and root:: - - >>> PurePosixPath('setup.py').relative() - PurePosixPath('setup.py') - >>> PurePosixPath('/setup.py').relative() - PurePosixPath('setup.py') - -``relative_to()`` computes the relative difference of a path to another:: - - >>> PurePosixPath('/usr/bin/python').relative_to('/usr') - PurePosixPath('bin/python') - ``normcase()`` returns a case-folded version of the path for NT paths:: >>> PurePosixPath('CAPS').normcase() -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Thu Oct 11 01:18:50 2012 From: python-checkins at python.org (brett.cannon) Date: Thu, 11 Oct 2012 01:18:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Closes_issue_?= =?utf-8?q?=2315111=3A_Calling_=5F=5Fimport=5F=5F_with_a_module_specified_?= =?utf-8?q?in?= Message-ID: <3XcWTQ15tQzQLs@mail.python.org> http://hg.python.org/cpython/rev/09b5158d5284 changeset: 79652:09b5158d5284 branch: 3.3 parent: 79647:705a70b0fff4 user: Brett Cannon date: Wed Oct 10 19:03:46 2012 -0400 summary: Closes issue #15111: Calling __import__ with a module specified in fromlist which causes its own ImportError (e.g. the module tries to import a non-existent module) should have that exception propagate. files: Lib/importlib/_bootstrap.py | 12 +- Lib/test/test_importlib/import_/test_fromlist.py | 15 +- Misc/NEWS | 4 + Python/importlib.h | 938 +++++---- 4 files changed, 495 insertions(+), 474 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1602,19 +1602,19 @@ fromlist.extend(module.__all__) for x in fromlist: if not hasattr(module, x): + from_name = '{}.{}'.format(module.__name__, x) try: - _call_with_frames_removed(import_, - '{}.{}'.format(module.__name__, x)) + _call_with_frames_removed(import_, from_name) except ImportError as exc: # Backwards-compatibility dictates we ignore failed # imports triggered by fromlist for modules that don't # exist. # TODO(brett): In Python 3.4, have import raise # ModuleNotFound and catch that. - if hasattr(exc, '_not_found') and exc._not_found: - pass - else: - raise + if getattr(exc, '_not_found', False): + if exc.name == from_name: + continue + raise return module diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -52,7 +52,7 @@ module = import_util.import_('module', fromlist=['attr']) self.assertEqual(module.__name__, 'module') - def test_unexistent_object(self): + def test_nonexistent_object(self): # [bad object] with util.mock_modules('module') as importer: with util.import_state(meta_path=[importer]): @@ -69,6 +69,19 @@ self.assertTrue(hasattr(module, 'module')) self.assertEqual(module.module.__name__, 'pkg.module') + def test_module_from_package_triggers_ImportError(self): + # If a submodule causes an ImportError because it tries to import + # a module which doesn't exist, that should let the ImportError + # propagate. + def module_code(): + import i_do_not_exist + with util.mock_modules('pkg.__init__', 'pkg.mod', + module_code={'pkg.mod': module_code}) as importer: + with util.import_state(meta_path=[importer]): + with self.assertRaises(ImportError) as exc: + import_util.import_('pkg', fromlist=['mod']) + self.assertEquals('i_do_not_exist', exc.exception.name) + def test_empty_string(self): with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: with util.import_state(meta_path=[importer]): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -33,6 +33,10 @@ - Issue #15801: Make sure mappings passed to '%' formatting are actually subscriptable. +- Issue #15111: __import__ should let ImportError propagate when a module that + is imported as a side-effect of using fromlist tries to import a module + that cannot be found. + Library ------- diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 01:18:51 2012 From: python-checkins at python.org (brett.cannon) Date: Thu, 11 Oct 2012 01:18:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_fix_for_issue_=2315111=2E?= Message-ID: <3XcWTR4ny1zQpC@mail.python.org> http://hg.python.org/cpython/rev/31db8e3272f1 changeset: 79653:31db8e3272f1 parent: 79651:73e7bebb3aa4 parent: 79652:09b5158d5284 user: Brett Cannon date: Wed Oct 10 19:18:37 2012 -0400 summary: Merge fix for issue #15111. files: Lib/importlib/_bootstrap.py | 12 +- Lib/test/test_importlib/import_/test_fromlist.py | 15 +- Misc/NEWS | 3 + Python/importlib.h | 924 +++++---- 4 files changed, 487 insertions(+), 467 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1602,19 +1602,19 @@ fromlist.extend(module.__all__) for x in fromlist: if not hasattr(module, x): + from_name = '{}.{}'.format(module.__name__, x) try: - _call_with_frames_removed(import_, - '{}.{}'.format(module.__name__, x)) + _call_with_frames_removed(import_, from_name) except ImportError as exc: # Backwards-compatibility dictates we ignore failed # imports triggered by fromlist for modules that don't # exist. # TODO(brett): In Python 3.4, have import raise # ModuleNotFound and catch that. - if hasattr(exc, '_not_found') and exc._not_found: - pass - else: - raise + if getattr(exc, '_not_found', False): + if exc.name == from_name: + continue + raise return module diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -52,7 +52,7 @@ module = import_util.import_('module', fromlist=['attr']) self.assertEqual(module.__name__, 'module') - def test_unexistent_object(self): + def test_nonexistent_object(self): # [bad object] with util.mock_modules('module') as importer: with util.import_state(meta_path=[importer]): @@ -69,6 +69,19 @@ self.assertTrue(hasattr(module, 'module')) self.assertEqual(module.module.__name__, 'pkg.module') + def test_module_from_package_triggers_ImportError(self): + # If a submodule causes an ImportError because it tries to import + # a module which doesn't exist, that should let the ImportError + # propagate. + def module_code(): + import i_do_not_exist + with util.mock_modules('pkg.__init__', 'pkg.mod', + module_code={'pkg.mod': module_code}) as importer: + with util.import_state(meta_path=[importer]): + with self.assertRaises(ImportError) as exc: + import_util.import_('pkg', fromlist=['mod']) + self.assertEquals('i_do_not_exist', exc.exception.name) + def test_empty_string(self): with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: with util.import_state(meta_path=[importer]): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,9 @@ - Issue #15801: Make sure mappings passed to '%' formatting are actually subscriptable. +- Issue #15111: __import__ should propagate ImportError when raised as a + side-effect of a module triggered from using fromlist. + Library ------- diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 01:23:24 2012 From: python-checkins at python.org (daniel.holth) Date: Thu, 11 Oct 2012 01:23:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_lower_wheel_spec_version?= Message-ID: <3XcWZh3YxMzQLs@mail.python.org> http://hg.python.org/peps/rev/e5f21965677e changeset: 4551:e5f21965677e user: Daniel Holth date: Wed Oct 10 19:23:03 2012 -0400 summary: lower wheel spec version files: pep-0427.txt | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -1,5 +1,5 @@ PEP: 427 -Title: The Wheel Binary Package Format 1.0 +Title: The Wheel Binary Package Format 0.1 Version: $Revision$ Last-Modified: $Date$ Author: Daniel Holth @@ -25,6 +25,15 @@ final paths at any later time. +Note +==== + +This draft PEP describes version 0.1 of the "wheel" format. When the PEP +is accepted, the version will be changed to 1.0. (The major version +is used to indicate potentially backwards-incompatible changes to the +format.) + + Rationale ========= @@ -49,7 +58,9 @@ Installing a wheel 'distribution-1.0.py32.none.any.whl' ------------------------------------------------------- -#. Unpack. +Wheel installation notionally consists of two phases: + +- Unpack. a. Parse ``distribution-1.0.dist-info/WHEEL``. b. Check that installer is compatible with Wheel-Version. Warn if @@ -58,7 +69,7 @@ (site-packages). d. Else unpack archive into platlib (site-packages). -#. Spread. +- Spread. a. Unpacked archive includes ``distribution-1.0.dist-info/`` and (if there is data) ``distribution-1.0.data/``. @@ -125,7 +136,7 @@ #. Wheel files contain metadata about the wheel format itself in ``{distribution}-{version}.dist-info/WHEEL``:: - Wheel-Version: 1.0 + Wheel-Version: 0.1 Generator: bdist_wheel 0.7 Root-Is-Purelib: true -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Thu Oct 11 01:24:48 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 11 Oct 2012 01:24:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316135=3A_Removal?= =?utf-8?q?_of_OS/2_support_=28distutils=29?= Message-ID: <3XcWcJ0p1FzQLs@mail.python.org> http://hg.python.org/cpython/rev/147b9d530dd0 changeset: 79654:147b9d530dd0 user: Jesus Cea date: Thu Oct 11 01:20:12 2012 +0200 summary: Closes #16135: Removal of OS/2 support (distutils) files: Lib/distutils/ccompiler.py | 5 +- Lib/distutils/command/bdist.py | 3 +- Lib/distutils/command/bdist_dumb.py | 8 +- Lib/distutils/command/build_ext.py | 26 +- Lib/distutils/command/install.py | 15 - Lib/distutils/emxccompiler.py | 315 ------------- Lib/distutils/spawn.py | 24 +- Lib/distutils/sysconfig.py | 24 - Lib/distutils/tests/test_bdist_dumb.py | 2 - Lib/distutils/tests/test_install.py | 2 +- Lib/distutils/tests/test_util.py | 2 +- Lib/distutils/util.py | 6 - 12 files changed, 7 insertions(+), 425 deletions(-) diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -351,7 +351,7 @@ return macros, objects, extra, pp_opts, build def _get_cc_args(self, pp_opts, debug, before): - # works for unixccompiler, emxccompiler, cygwinccompiler + # works for unixccompiler, cygwinccompiler cc_args = pp_opts + ['-c'] if debug: cc_args[:0] = ['-g'] @@ -926,7 +926,6 @@ # on a cygwin built python we can use gcc like an ordinary UNIXish # compiler ('cygwin.*', 'unix'), - ('os2emx', 'emx'), # OS name mappings ('posix', 'unix'), @@ -968,8 +967,6 @@ "Mingw32 port of GNU C Compiler for Win32"), 'bcpp': ('bcppcompiler', 'BCPPCompiler', "Borland C++ Compiler"), - 'emx': ('emxccompiler', 'EMXCCompiler', - "EMX port of GNU C Compiler for OS/2"), } def show_compilers(): diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py --- a/Lib/distutils/command/bdist.py +++ b/Lib/distutils/command/bdist.py @@ -52,8 +52,7 @@ # This won't do in reality: will need to distinguish RPM-ish Linux, # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS. default_format = {'posix': 'gztar', - 'nt': 'zip', - 'os2': 'zip'} + 'nt': 'zip'} # Establish the preferred order (for the --help-formats option). format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar', diff --git a/Lib/distutils/command/bdist_dumb.py b/Lib/distutils/command/bdist_dumb.py --- a/Lib/distutils/command/bdist_dumb.py +++ b/Lib/distutils/command/bdist_dumb.py @@ -38,8 +38,7 @@ boolean_options = ['keep-temp', 'skip-build', 'relative'] default_format = { 'posix': 'gztar', - 'nt': 'zip', - 'os2': 'zip' } + 'nt': 'zip' } def initialize_options(self): self.bdist_dir = None @@ -85,11 +84,6 @@ archive_basename = "%s.%s" % (self.distribution.get_fullname(), self.plat_name) - # OS/2 objects to any ":" characters in a filename (such as when - # a timestamp is used in a version) so change them to hyphens. - if os.name == "os2": - archive_basename = archive_basename.replace(":", "-") - pseudoinstall_root = os.path.join(self.dist_dir, archive_basename) if not self.relative: archive_root = self.bdist_dir diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -223,11 +223,6 @@ self.library_dirs.append(os.path.join(sys.exec_prefix, 'PC', 'VC6')) - # OS/2 (EMX) doesn't support Debug vs Release builds, but has the - # import libraries in its "Config" subdirectory - if os.name == 'os2': - self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config')) - # for extensions under Cygwin and AtheOS Python's library directory must be # appended to library_dirs if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos': @@ -613,9 +608,6 @@ return fn else: return "swig.exe" - elif os.name == "os2": - # assume swig available in the PATH. - return "swig.exe" else: raise DistutilsPlatformError( "I don't know how to find (much less run) SWIG " @@ -666,9 +658,6 @@ """ from distutils.sysconfig import get_config_var ext_path = ext_name.split('.') - # OS/2 has an 8 character module (extension) limit :-( - if os.name == "os2": - ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8] # extensions in debug_mode are named 'module_d.pyd' under windows so_ext = get_config_var('SO') if os.name == 'nt' and self.debug: @@ -689,7 +678,7 @@ def get_libraries(self, ext): """Return the list of libraries to link against when building a shared extension. On most platforms, this is just 'ext.libraries'; - on Windows and OS/2, we add the Python library (eg. python20.dll). + on Windows, we add the Python library (eg. python20.dll). """ # The python library is always needed on Windows. For MSVC, this # is redundant, since the library is mentioned in a pragma in @@ -709,19 +698,6 @@ return ext.libraries + [pythonlib] else: return ext.libraries - elif sys.platform == "os2emx": - # EMX/GCC requires the python library explicitly, and I - # believe VACPP does as well (though not confirmed) - AIM Apr01 - template = "python%d%d" - # debug versions of the main DLL aren't supported, at least - # not at this time - AIM Apr01 - #if self.debug: - # template = template + '_d' - pythonlib = (template % - (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) - # don't extend ext.libraries, it may be shared with other - # extensions, it is a reference to the original list - return ext.libraries + [pythonlib] elif sys.platform[:6] == "cygwin": template = "python%d.%d" pythonlib = (template % diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -58,13 +58,6 @@ 'data' : '$base', }, 'nt': WINDOWS_SCHEME, - 'os2': { - 'purelib': '$base/Lib/site-packages', - 'platlib': '$base/Lib/site-packages', - 'headers': '$base/Include/$dist_name', - 'scripts': '$base/Scripts', - 'data' : '$base', - }, } # user site schemes @@ -86,14 +79,6 @@ 'data' : '$userbase', } - INSTALL_SCHEMES['os2_home'] = { - 'purelib': '$usersite', - 'platlib': '$usersite', - 'headers': '$userbase/include/python$py_version_short/$dist_name', - 'scripts': '$userbase/bin', - 'data' : '$userbase', - } - # The keys to an installation scheme; if any new types of files are to be # installed, be sure to add an entry to every installation scheme above, # and to SCHEME_KEYS here. diff --git a/Lib/distutils/emxccompiler.py b/Lib/distutils/emxccompiler.py deleted file mode 100644 --- a/Lib/distutils/emxccompiler.py +++ /dev/null @@ -1,315 +0,0 @@ -"""distutils.emxccompiler - -Provides the EMXCCompiler class, a subclass of UnixCCompiler that -handles the EMX port of the GNU C compiler to OS/2. -""" - -# issues: -# -# * OS/2 insists that DLLs can have names no longer than 8 characters -# We put export_symbols in a def-file, as though the DLL can have -# an arbitrary length name, but truncate the output filename. -# -# * only use OMF objects and use LINK386 as the linker (-Zomf) -# -# * always build for multithreading (-Zmt) as the accompanying OS/2 port -# of Python is only distributed with threads enabled. -# -# tested configurations: -# -# * EMX gcc 2.81/EMX 0.9d fix03 - -import os,sys,copy -from distutils.ccompiler import gen_preprocess_options, gen_lib_options -from distutils.unixccompiler import UnixCCompiler -from distutils.file_util import write_file -from distutils.errors import DistutilsExecError, CompileError, UnknownFileError -from distutils import log - -class EMXCCompiler (UnixCCompiler): - - compiler_type = 'emx' - obj_extension = ".obj" - static_lib_extension = ".lib" - shared_lib_extension = ".dll" - static_lib_format = "%s%s" - shared_lib_format = "%s%s" - res_extension = ".res" # compiled resource file - exe_extension = ".exe" - - def __init__ (self, - verbose=0, - dry_run=0, - force=0): - - UnixCCompiler.__init__ (self, verbose, dry_run, force) - - (status, details) = check_config_h() - self.debug_print("Python's GCC status: %s (details: %s)" % - (status, details)) - if status is not CONFIG_H_OK: - self.warn( - "Python's pyconfig.h doesn't seem to support your compiler. " + - ("Reason: %s." % details) + - "Compiling may fail because of undefined preprocessor macros.") - - (self.gcc_version, self.ld_version) = \ - get_versions() - self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" % - (self.gcc_version, - self.ld_version) ) - - # Hard-code GCC because that's what this is all about. - # XXX optimization, warnings etc. should be customizable. - self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - linker_exe='gcc -Zomf -Zmt -Zcrtdll', - linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') - - # want the gcc library statically linked (so that we don't have - # to distribute a version dependent on the compiler we have) - self.dll_libraries=["gcc"] - - # __init__ () - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - if ext == '.rc': - # gcc requires '.rc' compiled to binary ('.res') files !!! - try: - self.spawn(["rc", "-r", src]) - except DistutilsExecError as msg: - raise CompileError(msg) - else: # for other files use the C-compiler - try: - self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + - extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - - def link (self, - target_desc, - objects, - output_filename, - output_dir=None, - libraries=None, - library_dirs=None, - runtime_library_dirs=None, - export_symbols=None, - debug=0, - extra_preargs=None, - extra_postargs=None, - build_temp=None, - target_lang=None): - - # use separate copies, so we can modify the lists - extra_preargs = copy.copy(extra_preargs or []) - libraries = copy.copy(libraries or []) - objects = copy.copy(objects or []) - - # Additional libraries - libraries.extend(self.dll_libraries) - - # handle export symbols by creating a def-file - # with executables this only works with gcc/ld as linker - if ((export_symbols is not None) and - (target_desc != self.EXECUTABLE)): - # (The linker doesn't do anything if output is up-to-date. - # So it would probably better to check if we really need this, - # but for this we had to insert some unchanged parts of - # UnixCCompiler, and this is not what we want.) - - # we want to put some files in the same directory as the - # object files are, build_temp doesn't help much - # where are the object files - temp_dir = os.path.dirname(objects[0]) - # name of dll to give the helper files the same base name - (dll_name, dll_extension) = os.path.splitext( - os.path.basename(output_filename)) - - # generate the filenames for these files - def_file = os.path.join(temp_dir, dll_name + ".def") - - # Generate .def file - contents = [ - "LIBRARY %s INITINSTANCE TERMINSTANCE" % \ - os.path.splitext(os.path.basename(output_filename))[0], - "DATA MULTIPLE NONSHARED", - "EXPORTS"] - for sym in export_symbols: - contents.append(' "%s"' % sym) - self.execute(write_file, (def_file, contents), - "writing %s" % def_file) - - # next add options for def-file and to creating import libraries - # for gcc/ld the def-file is specified as any other object files - objects.append(def_file) - - #end: if ((export_symbols is not None) and - # (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")): - - # who wants symbols and a many times larger output file - # should explicitly switch the debug mode on - # otherwise we let dllwrap/ld strip the output file - # (On my machine: 10KB < stripped_file < ??100KB - # unstripped_file = stripped_file + XXX KB - # ( XXX=254 for a typical python extension)) - if not debug: - extra_preargs.append("-s") - - UnixCCompiler.link(self, - target_desc, - objects, - output_filename, - output_dir, - libraries, - library_dirs, - runtime_library_dirs, - None, # export_symbols, we do this in our def-file - debug, - extra_preargs, - extra_postargs, - build_temp, - target_lang) - - # link () - - # -- Miscellaneous methods ----------------------------------------- - - # override the object_filenames method from CCompiler to - # support rc and res-files - def object_filenames (self, - source_filenames, - strip_dir=0, - output_dir=''): - if output_dir is None: output_dir = '' - obj_names = [] - for src_name in source_filenames: - # use normcase to make sure '.rc' is really '.rc' and not '.RC' - (base, ext) = os.path.splitext (os.path.normcase(src_name)) - if ext not in (self.src_extensions + ['.rc']): - raise UnknownFileError("unknown file type '%s' (from '%s')" % \ - (ext, src_name)) - if strip_dir: - base = os.path.basename (base) - if ext == '.rc': - # these need to be compiled to object files - obj_names.append (os.path.join (output_dir, - base + self.res_extension)) - else: - obj_names.append (os.path.join (output_dir, - base + self.obj_extension)) - return obj_names - - # object_filenames () - - # override the find_library_file method from UnixCCompiler - # to deal with file naming/searching differences - def find_library_file(self, dirs, lib, debug=0): - shortlib = '%s.lib' % lib - longlib = 'lib%s.lib' % lib # this form very rare - - # get EMX's default library directory search path - try: - emx_dirs = os.environ['LIBRARY_PATH'].split(';') - except KeyError: - emx_dirs = [] - - for dir in dirs + emx_dirs: - shortlibp = os.path.join(dir, shortlib) - longlibp = os.path.join(dir, longlib) - if os.path.exists(shortlibp): - return shortlibp - elif os.path.exists(longlibp): - return longlibp - - # Oops, didn't find it in *any* of 'dirs' - return None - -# class EMXCCompiler - - -# Because these compilers aren't configured in Python's pyconfig.h file by -# default, we should at least warn the user if he is using a unmodified -# version. - -CONFIG_H_OK = "ok" -CONFIG_H_NOTOK = "not ok" -CONFIG_H_UNCERTAIN = "uncertain" - -def check_config_h(): - - """Check if the current Python installation (specifically, pyconfig.h) - appears amenable to building extensions with GCC. Returns a tuple - (status, details), where 'status' is one of the following constants: - CONFIG_H_OK - all is well, go ahead and compile - CONFIG_H_NOTOK - doesn't look good - CONFIG_H_UNCERTAIN - not sure -- unable to read pyconfig.h - 'details' is a human-readable string explaining the situation. - - Note there are two ways to conclude "OK": either 'sys.version' contains - the string "GCC" (implying that this Python was built with GCC), or the - installed "pyconfig.h" contains the string "__GNUC__". - """ - - # XXX since this function also checks sys.version, it's not strictly a - # "pyconfig.h" check -- should probably be renamed... - - from distutils import sysconfig - # if sys.version contains GCC then python was compiled with - # GCC, and the pyconfig.h file should be OK - if sys.version.find("GCC") >= 0: - return (CONFIG_H_OK, "sys.version mentions 'GCC'") - - fn = sysconfig.get_config_h_filename() - try: - # It would probably better to read single lines to search. - # But we do this only once, and it is fast enough - f = open(fn) - try: - s = f.read() - finally: - f.close() - - except IOError as exc: - # if we can't read this file, we cannot say it is wrong - # the compiler will complain later about this file as missing - return (CONFIG_H_UNCERTAIN, - "couldn't read '%s': %s" % (fn, exc.strerror)) - - else: - # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar - if s.find("__GNUC__") >= 0: - return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn) - else: - return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn) - - -def get_versions(): - """ Try to find out the versions of gcc and ld. - If not possible it returns None for it. - """ - from distutils.version import StrictVersion - from distutils.spawn import find_executable - import re - - gcc_exe = find_executable('gcc') - if gcc_exe: - out = os.popen(gcc_exe + ' -dumpversion','r') - try: - out_string = out.read() - finally: - out.close() - result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII) - if result: - gcc_version = StrictVersion(result.group(1)) - else: - gcc_version = None - else: - gcc_version = None - # EMX ld has no way of reporting version number, and we use GCC - # anyway - so we can link OMF DLLs - ld_version = None - return (gcc_version, ld_version) diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py --- a/Lib/distutils/spawn.py +++ b/Lib/distutils/spawn.py @@ -32,8 +32,6 @@ _spawn_posix(cmd, search_path, dry_run=dry_run) elif os.name == 'nt': _spawn_nt(cmd, search_path, dry_run=dry_run) - elif os.name == 'os2': - _spawn_os2(cmd, search_path, dry_run=dry_run) else: raise DistutilsPlatformError( "don't know how to spawn programs on platform '%s'" % os.name) @@ -74,26 +72,6 @@ raise DistutilsExecError( "command '%s' failed with exit status %d" % (cmd[0], rc)) -def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0): - executable = cmd[0] - if search_path: - # either we find one or it stays the same - executable = find_executable(executable) or executable - log.info(' '.join([executable] + cmd[1:])) - if not dry_run: - # spawnv for OS/2 EMX requires a full path to the .exe - try: - rc = os.spawnv(os.P_WAIT, executable, cmd) - except OSError as exc: - # this seems to happen when the command isn't found - raise DistutilsExecError( - "command '%s' failed: %s" % (cmd[0], exc.args[-1])) - if rc != 0: - # and this reflects the command running but failing - log.debug("command '%s' failed with exit status %d" % (cmd[0], rc)) - raise DistutilsExecError( - "command '%s' failed with exit status %d" % (cmd[0], rc)) - if sys.platform == 'darwin': from distutils import sysconfig _cfg_target = None @@ -180,7 +158,7 @@ paths = path.split(os.pathsep) base, ext = os.path.splitext(executable) - if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'): + if (sys.platform == 'win32') and (ext != '.exe'): executable = executable + '.exe' if not os.path.isfile(executable): diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -110,8 +110,6 @@ return os.path.join(prefix, "include", python_dir) elif os.name == "nt": return os.path.join(prefix, "include") - elif os.name == "os2": - return os.path.join(prefix, "Include") else: raise DistutilsPlatformError( "I don't know where Python installs its C header files " @@ -153,11 +151,6 @@ return prefix else: return os.path.join(prefix, "Lib", "site-packages") - elif os.name == "os2": - if standard_lib: - return os.path.join(prefix, "Lib") - else: - return os.path.join(prefix, "Lib", "site-packages") else: raise DistutilsPlatformError( "I don't know where Python installs its library " @@ -492,23 +485,6 @@ _config_vars = g -def _init_os2(): - """Initialize the module as appropriate for OS/2""" - g = {} - # set basic install directories - g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1) - g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1) - - # XXX hmmm.. a normal install puts include files here - g['INCLUDEPY'] = get_python_inc(plat_specific=0) - - g['SO'] = '.pyd' - g['EXE'] = ".exe" - - global _config_vars - _config_vars = g - - def get_config_vars(*args): """With no arguments, return a dictionary of all configuration variables relevant for the current platform. Generally this includes diff --git a/Lib/distutils/tests/test_bdist_dumb.py b/Lib/distutils/tests/test_bdist_dumb.py --- a/Lib/distutils/tests/test_bdist_dumb.py +++ b/Lib/distutils/tests/test_bdist_dumb.py @@ -75,8 +75,6 @@ # see what we have dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) base = "%s.%s.zip" % (dist.get_fullname(), cmd.plat_name) - if os.name == 'os2': - base = base.replace(':', '-') self.assertEqual(dist_created, [base]) diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -94,7 +94,7 @@ self.addCleanup(cleanup) - for key in ('nt_user', 'unix_user', 'os2_home'): + for key in ('nt_user', 'unix_user'): self.assertIn(key, INSTALL_SCHEMES) dist = Distribution({'name': 'xx'}) diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py --- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -236,7 +236,7 @@ self.assertRaises(DistutilsPlatformError, change_root, 'c:\\root', 'its\\here') - # XXX platforms to be covered: os2, mac + # XXX platforms to be covered: mac def test_check_environ(self): util._environ_checked = 0 diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -154,12 +154,6 @@ path = path[1:] return os.path.join(new_root, path) - elif os.name == 'os2': - (drive, path) = os.path.splitdrive(pathname) - if path[0] == os.sep: - path = path[1:] - return os.path.join(new_root, path) - else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 01:56:13 2012 From: python-checkins at python.org (jesus.cea) Date: Thu, 11 Oct 2012 01:56:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316135=3A_Removal?= =?utf-8?q?_of_OS/2_support_=28distutils=29_=28II=29?= Message-ID: <3XcXJY60qqzQLs@mail.python.org> http://hg.python.org/cpython/rev/e3e43287ad48 changeset: 79655:e3e43287ad48 user: Jesus Cea date: Thu Oct 11 01:56:01 2012 +0200 summary: Closes #16135: Removal of OS/2 support (distutils) (II) files: Lib/test/test_sundry.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py --- a/Lib/test/test_sundry.py +++ b/Lib/test/test_sundry.py @@ -13,7 +13,6 @@ import distutils.bcppcompiler import distutils.ccompiler import distutils.cygwinccompiler - import distutils.emxccompiler import distutils.filelist if sys.platform.startswith('win'): import distutils.msvccompiler -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 02:58:19 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 02:58:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Make_further_improvements_to_subprocess=2EPopen=28=29_docum?= =?utf-8?q?entation=2E?= Message-ID: <3XcYhC6JdVzQxd@mail.python.org> http://hg.python.org/cpython/rev/41ffed580eef changeset: 79656:41ffed580eef branch: 3.2 parent: 79640:24499eebbc2f user: Chris Jerdonek date: Wed Oct 10 17:46:18 2012 -0700 summary: Issue #16115: Make further improvements to subprocess.Popen() documentation. files: Doc/library/subprocess.rst | 42 +++++++++++++++---------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -286,19 +286,27 @@ functions. -.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, stderr=None, preexec_fn=None, close_fds=True, shell=False, cwd=None, env=None, universal_newlines=False, startupinfo=None, creationflags=0, restore_signals=True, start_new_session=False, pass_fds=()) +.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, \ + stderr=None, preexec_fn=None, close_fds=True, shell=False, \ + cwd=None, env=None, universal_newlines=False, \ + startupinfo=None, creationflags=0, restore_signals=True, \ + start_new_session=False, pass_fds=()) - Arguments are: + Execute a child program in a new process. On Unix, the class uses + :meth:`os.execvp`-like behavior to execute the child program. On Windows, + the class uses the Windows ``CreateProcess()`` function. The arguments to + :class:`Popen` are as follows. *args* should be a sequence of program arguments or else a single string. By default, the program to execute is the first item in *args* if *args* is - a sequence and the string itself if *args* is a string. However, see the - *shell* and *executable* arguments for differences from this behavior. + a sequence. If *args* is a string, the interpretation is + platform-dependent and described below. See the *shell* and *executable* + arguments for additional differences from the default behavior. Unless + otherwise stated, it is recommended to pass *args* as a sequence. - On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to - execute the child program. If *args* is a string, the string is - interpreted as the name or path of the program to execute; this only works - if the program is being given no arguments. + On Unix, if *args* is a string, the string is interpreted as the name or + path of the program to execute. However, this can only be done if not + passing arguments to the program. .. note:: @@ -319,14 +327,13 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Windows, the :class:`Popen` class uses ``CreateProcess()`` to - execute the child program, which operates on strings. If *args* is a - sequence, it will be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows, if *args* is a sequence, it will be converted to a string in a + manner described in :ref:`converting-argument-sequence`. This is because + the underlying ``CreateProcess()`` operates on strings. The *shell* argument (which defaults to *False*) specifies whether to use - the shell as the program to execute. It is recommended to pass *args* as a - sequence if *shell* is *False* and as a string if *shell* is *True*. + the shell as the program to execute. If *shell* is *True*, it is + recommended to pass *args* as a string rather than as a sequence. On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If *args* is a string, the string specifies the command @@ -365,9 +372,10 @@ The *executable* argument specifies a replacement program to execute. It is very seldom needed. When ``shell=False``, *executable* replaces the - program to execute specified by *args*. However, the *args* program is - still treated by most programs as the command name, which can then be - different from the program actually executed. On Unix, the *args* name + program to execute specified by *args*. However, the original *args* is + still passed to the program. Most programs treat the program specified + by *args* as the command name, which can then be different from the program + actually executed. On Unix, the *args* name becomes the display name for the executable in utilities such as :program:`ps`. If ``shell=True``, on Unix the *executable* argument specifies a replacement shell for the default :file:`/bin/sh`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 02:58:21 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 02:58:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316115=3A_Merge_subprocess=2EPopen=28=29_documentation?= =?utf-8?q?_improvements_from_3=2E2=2E?= Message-ID: <3XcYhF2wxdzR0R@mail.python.org> http://hg.python.org/cpython/rev/bae644e46556 changeset: 79657:bae644e46556 branch: 3.3 parent: 79652:09b5158d5284 parent: 79656:41ffed580eef user: Chris Jerdonek date: Wed Oct 10 17:47:55 2012 -0700 summary: Issue #16115: Merge subprocess.Popen() documentation improvements from 3.2. files: Doc/library/subprocess.rst | 42 +++++++++++++++---------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -354,19 +354,27 @@ functions. -.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, stderr=None, preexec_fn=None, close_fds=True, shell=False, cwd=None, env=None, universal_newlines=False, startupinfo=None, creationflags=0, restore_signals=True, start_new_session=False, pass_fds=()) +.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, \ + stderr=None, preexec_fn=None, close_fds=True, shell=False, \ + cwd=None, env=None, universal_newlines=False, \ + startupinfo=None, creationflags=0, restore_signals=True, \ + start_new_session=False, pass_fds=()) - Arguments are: + Execute a child program in a new process. On Unix, the class uses + :meth:`os.execvp`-like behavior to execute the child program. On Windows, + the class uses the Windows ``CreateProcess()`` function. The arguments to + :class:`Popen` are as follows. *args* should be a sequence of program arguments or else a single string. By default, the program to execute is the first item in *args* if *args* is - a sequence and the string itself if *args* is a string. However, see the - *shell* and *executable* arguments for differences from this behavior. + a sequence. If *args* is a string, the interpretation is + platform-dependent and described below. See the *shell* and *executable* + arguments for additional differences from the default behavior. Unless + otherwise stated, it is recommended to pass *args* as a sequence. - On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to - execute the child program. If *args* is a string, the string is - interpreted as the name or path of the program to execute; this only works - if the program is being given no arguments. + On Unix, if *args* is a string, the string is interpreted as the name or + path of the program to execute. However, this can only be done if not + passing arguments to the program. .. note:: @@ -387,14 +395,13 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Windows, the :class:`Popen` class uses ``CreateProcess()`` to - execute the child program, which operates on strings. If *args* is a - sequence, it will be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows, if *args* is a sequence, it will be converted to a string in a + manner described in :ref:`converting-argument-sequence`. This is because + the underlying ``CreateProcess()`` operates on strings. The *shell* argument (which defaults to *False*) specifies whether to use - the shell as the program to execute. It is recommended to pass *args* as a - sequence if *shell* is *False* and as a string if *shell* is *True*. + the shell as the program to execute. If *shell* is *True*, it is + recommended to pass *args* as a string rather than as a sequence. On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If *args* is a string, the string specifies the command @@ -433,9 +440,10 @@ The *executable* argument specifies a replacement program to execute. It is very seldom needed. When ``shell=False``, *executable* replaces the - program to execute specified by *args*. However, the *args* program is - still treated by most programs as the command name, which can then be - different from the program actually executed. On Unix, the *args* name + program to execute specified by *args*. However, the original *args* is + still passed to the program. Most programs treat the program specified + by *args* as the command name, which can then be different from the program + actually executed. On Unix, the *args* name becomes the display name for the executable in utilities such as :program:`ps`. If ``shell=True``, on Unix the *executable* argument specifies a replacement shell for the default :file:`/bin/sh`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 02:58:22 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 02:58:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316115=3A_Merge_subprocess=2EPopen=28=29_documen?= =?utf-8?q?tation_improvements_from_3=2E3=2E?= Message-ID: <3XcYhG6Nc9zR05@mail.python.org> http://hg.python.org/cpython/rev/178ba363af1c changeset: 79658:178ba363af1c parent: 79655:e3e43287ad48 parent: 79657:bae644e46556 user: Chris Jerdonek date: Wed Oct 10 17:49:00 2012 -0700 summary: Issue #16115: Merge subprocess.Popen() documentation improvements from 3.3. files: Doc/library/subprocess.rst | 42 +++++++++++++++---------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -354,19 +354,27 @@ functions. -.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, stderr=None, preexec_fn=None, close_fds=True, shell=False, cwd=None, env=None, universal_newlines=False, startupinfo=None, creationflags=0, restore_signals=True, start_new_session=False, pass_fds=()) +.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, \ + stderr=None, preexec_fn=None, close_fds=True, shell=False, \ + cwd=None, env=None, universal_newlines=False, \ + startupinfo=None, creationflags=0, restore_signals=True, \ + start_new_session=False, pass_fds=()) - Arguments are: + Execute a child program in a new process. On Unix, the class uses + :meth:`os.execvp`-like behavior to execute the child program. On Windows, + the class uses the Windows ``CreateProcess()`` function. The arguments to + :class:`Popen` are as follows. *args* should be a sequence of program arguments or else a single string. By default, the program to execute is the first item in *args* if *args* is - a sequence and the string itself if *args* is a string. However, see the - *shell* and *executable* arguments for differences from this behavior. + a sequence. If *args* is a string, the interpretation is + platform-dependent and described below. See the *shell* and *executable* + arguments for additional differences from the default behavior. Unless + otherwise stated, it is recommended to pass *args* as a sequence. - On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to - execute the child program. If *args* is a string, the string is - interpreted as the name or path of the program to execute; this only works - if the program is being given no arguments. + On Unix, if *args* is a string, the string is interpreted as the name or + path of the program to execute. However, this can only be done if not + passing arguments to the program. .. note:: @@ -387,14 +395,13 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Windows, the :class:`Popen` class uses ``CreateProcess()`` to - execute the child program, which operates on strings. If *args* is a - sequence, it will be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows, if *args* is a sequence, it will be converted to a string in a + manner described in :ref:`converting-argument-sequence`. This is because + the underlying ``CreateProcess()`` operates on strings. The *shell* argument (which defaults to *False*) specifies whether to use - the shell as the program to execute. It is recommended to pass *args* as a - sequence if *shell* is *False* and as a string if *shell* is *True*. + the shell as the program to execute. If *shell* is *True*, it is + recommended to pass *args* as a string rather than as a sequence. On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If *args* is a string, the string specifies the command @@ -433,9 +440,10 @@ The *executable* argument specifies a replacement program to execute. It is very seldom needed. When ``shell=False``, *executable* replaces the - program to execute specified by *args*. However, the *args* program is - still treated by most programs as the command name, which can then be - different from the program actually executed. On Unix, the *args* name + program to execute specified by *args*. However, the original *args* is + still passed to the program. Most programs treat the program specified + by *args* as the command name, which can then be different from the program + actually executed. On Unix, the *args* name becomes the display name for the executable in utilities such as :program:`ps`. If ``shell=True``, on Unix the *executable* argument specifies a replacement shell for the default :file:`/bin/sh`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 02:58:24 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 02:58:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MTE1?= =?utf-8?q?=3A_Backport_subprocess=2EPopen=28=29_documentation_improvement?= =?utf-8?q?s_from_3=2E2=2E?= Message-ID: <3XcYhJ2rY0zR02@mail.python.org> http://hg.python.org/cpython/rev/f051e37ac11d changeset: 79659:f051e37ac11d branch: 2.7 parent: 79649:8704f9e7ad7c user: Chris Jerdonek date: Wed Oct 10 17:55:41 2012 -0700 summary: Issue #16115: Backport subprocess.Popen() documentation improvements from 3.2. files: Doc/library/subprocess.rst | 41 +++++++++++++++---------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -269,19 +269,26 @@ functions. -.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, stderr=None, preexec_fn=None, close_fds=False, shell=False, cwd=None, env=None, universal_newlines=False, startupinfo=None, creationflags=0) +.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=None, \ + stderr=None, preexec_fn=None, close_fds=False, shell=False, \ + cwd=None, env=None, universal_newlines=False, \ + startupinfo=None, creationflags=0) - Arguments are: + Execute a child program in a new process. On Unix, the class uses + :meth:`os.execvp`-like behavior to execute the child program. On Windows, + the class uses the Windows ``CreateProcess()`` function. The arguments to + :class:`Popen` are as follows. *args* should be a sequence of program arguments or else a single string. By default, the program to execute is the first item in *args* if *args* is - a sequence and the string itself if *args* is a string. However, see the - *shell* and *executable* arguments for differences from this behavior. + a sequence. If *args* is a string, the interpretation is + platform-dependent and described below. See the *shell* and *executable* + arguments for additional differences from the default behavior. Unless + otherwise stated, it is recommended to pass *args* as a sequence. - On Unix, the :class:`Popen` class uses :meth:`os.execvp`-like behavior to - execute the child program. If *args* is a string, the string is - interpreted as the name or path of the program to execute; this only works - if the program is being given no arguments. + On Unix, if *args* is a string, the string is interpreted as the name or + path of the program to execute. However, this can only be done if not + passing arguments to the program. .. note:: @@ -302,14 +309,13 @@ used in the shell (such as filenames containing spaces or the *echo* command shown above) are single list elements. - On Windows, the :class:`Popen` class uses ``CreateProcess()`` to - execute the child program, which operates on strings. If *args* is a - sequence, it will be converted to a string in a manner described in - :ref:`converting-argument-sequence`. + On Windows, if *args* is a sequence, it will be converted to a string in a + manner described in :ref:`converting-argument-sequence`. This is because + the underlying ``CreateProcess()`` operates on strings. The *shell* argument (which defaults to *False*) specifies whether to use - the shell as the program to execute. It is recommended to pass *args* as a - sequence if *shell* is *False* and as a string if *shell* is *True*. + the shell as the program to execute. If *shell* is *True*, it is + recommended to pass *args* as a string rather than as a sequence. On Unix with ``shell=True``, the shell defaults to :file:`/bin/sh`. If *args* is a string, the string specifies the command @@ -342,9 +348,10 @@ The *executable* argument specifies a replacement program to execute. It is very seldom needed. When ``shell=False``, *executable* replaces the - program to execute specified by *args*. However, the *args* program is - still treated by most programs as the command name, which can then be - different from the program actually executed. On Unix, the *args* name + program to execute specified by *args*. However, the original *args* is + still passed to the program. Most programs treat the program specified + by *args* as the command name, which can then be different from the program + actually executed. On Unix, the *args* name becomes the display name for the executable in utilities such as :program:`ps`. If ``shell=True``, on Unix the *executable* argument specifies a replacement shell for the default :file:`/bin/sh`. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Thu Oct 11 05:57:56 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Thu, 11 Oct 2012 05:57:56 +0200 Subject: [Python-checkins] Daily reference leaks (178ba363af1c): sum=0 Message-ID: results for 178ba363af1c on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogyo8oxi', '-x'] From python-checkins at python.org Thu Oct 11 08:01:00 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 08:01:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_placement_?= =?utf-8?q?of_shell=3DTrue_warning_in_subprocess=2EPopen=28=29_docs=2E?= Message-ID: <3XchPS4rQvzQw2@mail.python.org> http://hg.python.org/cpython/rev/42bddca6b2b1 changeset: 79660:42bddca6b2b1 branch: 3.2 parent: 79656:41ffed580eef user: Chris Jerdonek date: Wed Oct 10 22:52:22 2012 -0700 summary: Fix placement of shell=True warning in subprocess.Popen() docs. files: Doc/library/subprocess.rst | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -260,8 +260,8 @@ untrusted source makes a program vulnerable to `shell injection `_, a serious security flaw which can result in arbitrary command execution. - For this reason, the use of *shell=True* is **strongly discouraged** in cases - where the command string is constructed from external input:: + For this reason, the use of ``shell=True`` is **strongly discouraged** + in cases where the command string is constructed from external input:: >>> from subprocess import call >>> filename = input("What file would you like to display?\n") @@ -346,18 +346,18 @@ Popen(['/bin/sh', '-c', args[0], args[1], ...]) - .. warning:: - - Enabling this option can be a security hazard if combined with untrusted - input. See the warning under :ref:`frequently-used-arguments` - for details. - On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable specifies the default shell. The only time you need to specify ``shell=True`` on Windows is when the command you wish to execute is built into the shell (e.g. :command:`dir` or :command:`copy`). You do not need ``shell=True`` to run a batch file or console-based executable. + .. warning:: + + Passing ``shell=True`` can be a security hazard if combined with + untrusted input. See the warning under :ref:`frequently-used-arguments` + for details. + *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line buffered, any other positive value means use a buffer of (approximately) that -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 08:01:02 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 08:01:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_from_3=2E2=3A_Fix_placement_of_shell=3DTrue_warning_in_s?= =?utf-8?q?ubprocess=2EPopen=28=29_docs=2E?= Message-ID: <3XchPV0FPnzQw2@mail.python.org> http://hg.python.org/cpython/rev/6dcd68079b7e changeset: 79661:6dcd68079b7e branch: 3.3 parent: 79657:bae644e46556 parent: 79660:42bddca6b2b1 user: Chris Jerdonek date: Wed Oct 10 22:53:35 2012 -0700 summary: Merge from 3.2: Fix placement of shell=True warning in subprocess.Popen() docs. files: Doc/library/subprocess.rst | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -328,8 +328,8 @@ untrusted source makes a program vulnerable to `shell injection `_, a serious security flaw which can result in arbitrary command execution. - For this reason, the use of *shell=True* is **strongly discouraged** in cases - where the command string is constructed from external input:: + For this reason, the use of ``shell=True`` is **strongly discouraged** + in cases where the command string is constructed from external input:: >>> from subprocess import call >>> filename = input("What file would you like to display?\n") @@ -414,18 +414,18 @@ Popen(['/bin/sh', '-c', args[0], args[1], ...]) - .. warning:: - - Enabling this option can be a security hazard if combined with untrusted - input. See the warning under :ref:`frequently-used-arguments` - for details. - On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable specifies the default shell. The only time you need to specify ``shell=True`` on Windows is when the command you wish to execute is built into the shell (e.g. :command:`dir` or :command:`copy`). You do not need ``shell=True`` to run a batch file or console-based executable. + .. warning:: + + Passing ``shell=True`` can be a security hazard if combined with + untrusted input. See the warning under :ref:`frequently-used-arguments` + for details. + *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line buffered, any other positive value means use a buffer of (approximately) that -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 08:01:03 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 08:01:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_Fix_placement_of_shell=3DTrue_warnin?= =?utf-8?q?g_in_subprocess=2EPopen=28=29_docs=2E?= Message-ID: <3XchPW2kRhzQxp@mail.python.org> http://hg.python.org/cpython/rev/eb1ed6f8bcbb changeset: 79662:eb1ed6f8bcbb parent: 79658:178ba363af1c parent: 79661:6dcd68079b7e user: Chris Jerdonek date: Wed Oct 10 22:54:55 2012 -0700 summary: Merge from 3.3: Fix placement of shell=True warning in subprocess.Popen() docs. files: Doc/library/subprocess.rst | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -328,8 +328,8 @@ untrusted source makes a program vulnerable to `shell injection `_, a serious security flaw which can result in arbitrary command execution. - For this reason, the use of *shell=True* is **strongly discouraged** in cases - where the command string is constructed from external input:: + For this reason, the use of ``shell=True`` is **strongly discouraged** + in cases where the command string is constructed from external input:: >>> from subprocess import call >>> filename = input("What file would you like to display?\n") @@ -414,18 +414,18 @@ Popen(['/bin/sh', '-c', args[0], args[1], ...]) - .. warning:: - - Enabling this option can be a security hazard if combined with untrusted - input. See the warning under :ref:`frequently-used-arguments` - for details. - On Windows with ``shell=True``, the :envvar:`COMSPEC` environment variable specifies the default shell. The only time you need to specify ``shell=True`` on Windows is when the command you wish to execute is built into the shell (e.g. :command:`dir` or :command:`copy`). You do not need ``shell=True`` to run a batch file or console-based executable. + .. warning:: + + Passing ``shell=True`` can be a security hazard if combined with + untrusted input. See the warning under :ref:`frequently-used-arguments` + for details. + *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line buffered, any other positive value means use a buffer of (approximately) that -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 08:01:04 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 11 Oct 2012 08:01:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?= =?utf-8?q?3=2E2=3A_Fix_placement_of_shell=3DTrue_warning_in_subprocess=2E?= =?utf-8?q?Popen=28=29?= Message-ID: <3XchPX5Kk1zQxM@mail.python.org> http://hg.python.org/cpython/rev/bbdb90bf2692 changeset: 79663:bbdb90bf2692 branch: 2.7 parent: 79659:f051e37ac11d user: Chris Jerdonek date: Wed Oct 10 22:58:57 2012 -0700 summary: Backport from 3.2: Fix placement of shell=True warning in subprocess.Popen() docs. files: Doc/library/subprocess.rst | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -243,8 +243,8 @@ untrusted source makes a program vulnerable to `shell injection `_, a serious security flaw which can result in arbitrary command execution. - For this reason, the use of *shell=True* is **strongly discouraged** in cases - where the command string is constructed from external input:: + For this reason, the use of ``shell=True`` is **strongly discouraged** + in cases where the command string is constructed from external input:: >>> from subprocess import call >>> filename = input("What file would you like to display?\n") @@ -334,6 +334,12 @@ into the shell (e.g. :command:`dir` or :command:`copy`). You do not need ``shell=True`` to run a batch file or console-based executable. + .. warning:: + + Passing ``shell=True`` can be a security hazard if combined with + untrusted input. See the warning under :ref:`frequently-used-arguments` + for details. + *bufsize*, if given, has the same meaning as the corresponding argument to the built-in open() function: :const:`0` means unbuffered, :const:`1` means line buffered, any other positive value means use a buffer of (approximately) that @@ -375,15 +381,6 @@ child process. Note that on Windows, you cannot set *close_fds* to true and also redirect the standard handles by setting *stdin*, *stdout* or *stderr*. - If *shell* is :const:`True`, the specified command will be executed through the - shell. - - .. warning:: - - Enabling this option can be a security hazard if combined with untrusted - input. See the warning under :ref:`frequently-used-arguments` - for details. - If *cwd* is not ``None``, the child's current directory will be changed to *cwd* before it is executed. Note that this directory is not considered when searching the executable, so you can't specify the program's path relative to -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 08:16:43 2012 From: python-checkins at python.org (senthil.kumaran) Date: Thu, 11 Oct 2012 08:16:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316088=3A_BaseHTTP?= =?utf-8?q?RequestHandler=27s_send=5Ferror_method_includes_a?= Message-ID: <3Xchlb3cqdzQt2@mail.python.org> http://hg.python.org/cpython/rev/ee34cb049a10 changeset: 79664:ee34cb049a10 parent: 79658:178ba363af1c user: Senthil Kumaran date: Wed Oct 10 23:16:21 2012 -0700 summary: Issue #16088: BaseHTTPRequestHandler's send_error method includes a Content-Length header. Patch by Antoine Pitrou. files: Doc/library/http.server.rst | 3 +++ Lib/http/server.py | 4 +++- Lib/test/test_httpservers.py | 12 ++++++++++++ Misc/NEWS | 3 +++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst --- a/Doc/library/http.server.rst +++ b/Doc/library/http.server.rst @@ -177,6 +177,9 @@ complete set of headers is sent, followed by text composed using the :attr:`error_message_format` class variable. + .. versionchanged:: 3.4 + The error response includes a Content-Length header. + .. method:: send_response(code, message=None) Adds a response header to the headers buffer and logs the accepted diff --git a/Lib/http/server.py b/Lib/http/server.py --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -425,12 +425,14 @@ # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201) content = (self.error_message_format % {'code': code, 'message': _quote_html(message), 'explain': explain}) + body = content.encode('UTF-8', 'replace') self.send_response(code, message) self.send_header("Content-Type", self.error_content_type) self.send_header('Connection', 'close') + self.send_header('Content-Length', int(len(body))) self.end_headers() if self.command != 'HEAD' and code >= 200 and code not in (204, 304): - self.wfile.write(content.encode('UTF-8', 'replace')) + self.wfile.write(body) def send_response(self, code, message=None): """Add the response header to the headers buffer and log the diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -92,6 +92,9 @@ def do_KEYERROR(self): self.send_error(999) + def do_NOTFOUND(self): + self.send_error(404) + def do_CUSTOM(self): self.send_response(999) self.send_header('Content-Type', 'text/html') @@ -211,6 +214,15 @@ self.assertEqual(res.getheader('X-Special'), 'D?ngerous Mind') self.assertEqual(res.read(), '?rger mit Unicode'.encode('utf-8')) + def test_error_content_length(self): + # Issue #16088: standard error responses should have a content-length + self.con.request('NOTFOUND', '/') + res = self.con.getresponse() + self.assertEqual(res.status, 404) + data = res.read() + import pdb; pdb.set_trace() + self.assertEqual(int(res.getheader('Content-Length')), len(data)) + class SimpleHTTPServerTestCase(BaseTestCase): class request_handler(NoLogRequestHandler, SimpleHTTPRequestHandler): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,9 @@ Library ------- +- Issue #16088: BaseHTTPRequestHandler's send_error method includes a + Content-Length header in it's response now. Patch by Antoine Pitrou. + - Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 08:16:44 2012 From: python-checkins at python.org (senthil.kumaran) Date: Thu, 11 Oct 2012 08:16:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_Automated_merge_with_ssh=3A//hg=2Epython=2Eorg/cpython?= Message-ID: <3Xchlc6PpdzQyR@mail.python.org> http://hg.python.org/cpython/rev/b8b0189d90e4 changeset: 79665:b8b0189d90e4 parent: 79662:eb1ed6f8bcbb parent: 79664:ee34cb049a10 user: Senthil Kumaran date: Wed Oct 10 23:16:29 2012 -0700 summary: Automated merge with ssh://hg.python.org/cpython files: Doc/library/http.server.rst | 3 +++ Lib/http/server.py | 4 +++- Lib/test/test_httpservers.py | 12 ++++++++++++ Misc/NEWS | 3 +++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst --- a/Doc/library/http.server.rst +++ b/Doc/library/http.server.rst @@ -177,6 +177,9 @@ complete set of headers is sent, followed by text composed using the :attr:`error_message_format` class variable. + .. versionchanged:: 3.4 + The error response includes a Content-Length header. + .. method:: send_response(code, message=None) Adds a response header to the headers buffer and logs the accepted diff --git a/Lib/http/server.py b/Lib/http/server.py --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -425,12 +425,14 @@ # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201) content = (self.error_message_format % {'code': code, 'message': _quote_html(message), 'explain': explain}) + body = content.encode('UTF-8', 'replace') self.send_response(code, message) self.send_header("Content-Type", self.error_content_type) self.send_header('Connection', 'close') + self.send_header('Content-Length', int(len(body))) self.end_headers() if self.command != 'HEAD' and code >= 200 and code not in (204, 304): - self.wfile.write(content.encode('UTF-8', 'replace')) + self.wfile.write(body) def send_response(self, code, message=None): """Add the response header to the headers buffer and log the diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -92,6 +92,9 @@ def do_KEYERROR(self): self.send_error(999) + def do_NOTFOUND(self): + self.send_error(404) + def do_CUSTOM(self): self.send_response(999) self.send_header('Content-Type', 'text/html') @@ -211,6 +214,15 @@ self.assertEqual(res.getheader('X-Special'), 'D?ngerous Mind') self.assertEqual(res.read(), '?rger mit Unicode'.encode('utf-8')) + def test_error_content_length(self): + # Issue #16088: standard error responses should have a content-length + self.con.request('NOTFOUND', '/') + res = self.con.getresponse() + self.assertEqual(res.status, 404) + data = res.read() + import pdb; pdb.set_trace() + self.assertEqual(int(res.getheader('Content-Length')), len(data)) + class SimpleHTTPServerTestCase(BaseTestCase): class request_handler(NoLogRequestHandler, SimpleHTTPRequestHandler): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,9 @@ Library ------- +- Issue #16088: BaseHTTPRequestHandler's send_error method includes a + Content-Length header in it's response now. Patch by Antoine Pitrou. + - Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 09:11:32 2012 From: python-checkins at python.org (senthil.kumaran) Date: Thu, 11 Oct 2012 09:11:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_code_smell=2E_remove_pdb?= Message-ID: <3Xcjyr0QYgzQsm@mail.python.org> http://hg.python.org/cpython/rev/ad51ed93377c changeset: 79666:ad51ed93377c user: Senthil Kumaran date: Thu Oct 11 00:11:26 2012 -0700 summary: code smell. remove pdb files: Lib/test/test_httpservers.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -220,7 +220,6 @@ res = self.con.getresponse() self.assertEqual(res.status, 404) data = res.read() - import pdb; pdb.set_trace() self.assertEqual(int(res.getheader('Content-Length')), len(data)) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 15:38:30 2012 From: python-checkins at python.org (ezio.melotti) Date: Thu, 11 Oct 2012 15:38:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?devguide=3A_Fix_typo=2E?= Message-ID: <3XctYL0nm3zMGT@mail.python.org> http://hg.python.org/devguide/rev/291342c08dd6 changeset: 557:291342c08dd6 user: Ezio Melotti date: Thu Oct 11 16:38:18 2012 +0300 summary: Fix typo. files: stdlibchanges.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stdlibchanges.rst b/stdlibchanges.rst --- a/stdlibchanges.rst +++ b/stdlibchanges.rst @@ -4,7 +4,7 @@ ==================== While the stdlib contains a great amount of useful code, sometimes you want -more than is provided. This document it meant to explain how you can get either +more than is provided. This document is meant to explain how you can get either a new addition to a pre-existing module in the stdlib or add an entirely new module. -- Repository URL: http://hg.python.org/devguide From python-checkins at python.org Thu Oct 11 18:23:03 2012 From: python-checkins at python.org (vinay.sajip) Date: Thu, 11 Oct 2012 18:23:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2315776=3A_pyvenv_?= =?utf-8?q?now_works_with_existing_directories=2E?= Message-ID: <3XcyCC3Zf1zR1B@mail.python.org> http://hg.python.org/cpython/rev/c3c188a0325a changeset: 79667:c3c188a0325a user: Vinay Sajip date: Thu Oct 11 17:22:45 2012 +0100 summary: Closes #15776: pyvenv now works with existing directories. files: Doc/library/venv.rst | 5 +- Lib/test/test_venv.py | 59 +++++++++++++++++++++++++++++- Lib/venv/__init__.py | 23 +++++++---- 3 files changed, 74 insertions(+), 13 deletions(-) diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst --- a/Doc/library/venv.rst +++ b/Doc/library/venv.rst @@ -75,8 +75,8 @@ * ``system_site_packages`` -- a Boolean value indicating that the system Python site-packages should be available to the environment (defaults to ``False``). - * ``clear`` -- a Boolean value which, if True, will delete any existing target - directory instead of raising an exception (defaults to ``False``). + * ``clear`` -- a Boolean value which, if True, will delete the contents of + any existing target directory, before creating the environment. * ``symlinks`` -- a Boolean value indicating whether to attempt to symlink the Python binary (and any necessary DLLs or other binaries, @@ -88,7 +88,6 @@ upgraded in-place (defaults to ``False``). - Creators of third-party virtual environment tools will be free to use the provided ``EnvBuilder`` class as a base class. diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -113,13 +113,68 @@ out, err = p.communicate() self.assertEqual(out.strip(), expected.encode()) + if sys.platform == 'win32': + ENV_SUBDIRS = ( + ('Scripts',), + ('Include',), + ('Lib',), + ('Lib', 'site-packages'), + ) + else: + ENV_SUBDIRS = ( + ('bin',), + ('include',), + ('lib',), + ('lib', 'python%d.%d' % sys.version_info[:2]), + ('lib', 'python%d.%d' % sys.version_info[:2], 'site-packages'), + ) + + def create_contents(self, paths, filename): + """ + Create some files in the environment which are unrelated + to the virtual environment. + """ + for subdirs in paths: + d = os.path.join(self.env_dir, *subdirs) + os.mkdir(d) + fn = os.path.join(d, filename) + with open(fn, 'wb') as f: + f.write(b'Still here?') + def test_overwrite_existing(self): """ - Test control of overwriting an existing environment directory. + Test creating environment in an existing directory. """ - self.assertRaises(ValueError, venv.create, self.env_dir) + self.create_contents(self.ENV_SUBDIRS, 'foo') + venv.create(self.env_dir) + for subdirs in self.ENV_SUBDIRS: + fn = os.path.join(self.env_dir, *(subdirs + ('foo',))) + self.assertTrue(os.path.exists(fn)) + with open(fn, 'rb') as f: + self.assertEqual(f.read(), b'Still here?') + builder = venv.EnvBuilder(clear=True) builder.create(self.env_dir) + for subdirs in self.ENV_SUBDIRS: + fn = os.path.join(self.env_dir, *(subdirs + ('foo',))) + self.assertFalse(os.path.exists(fn)) + + def clear_directory(self, path): + for fn in os.listdir(path): + fn = os.path.join(path, fn) + if os.path.islink(fn) or os.path.isfile(fn): + os.remove(fn) + elif os.path.isdir(fn): + shutil.rmtree(fn) + + def test_unoverwritable_fails(self): + #create a file clashing with directories in the env dir + for paths in self.ENV_SUBDIRS[:3]: + fn = os.path.join(self.env_dir, *paths) + with open(fn, 'wb') as f: + f.write(b'') + self.assertRaises((ValueError, OSError), venv.create, self.env_dir) + self.clear_directory(self.env_dir) def test_upgrade(self): """ diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -90,6 +90,14 @@ self.setup_scripts(context) self.post_setup(context) + def clear_directory(self, path): + for fn in os.listdir(path): + fn = os.path.join(path, fn) + if os.path.islink(fn) or os.path.isfile(fn): + os.remove(fn) + elif os.path.isdir(fn): + shutil.rmtree(fn) + def ensure_directories(self, env_dir): """ Create the directories for the environment. @@ -101,11 +109,11 @@ def create_if_needed(d): if not os.path.exists(d): os.makedirs(d) + elif os.path.islink(d) or os.path.isfile(d): + raise ValueError('Unable to create directory %r' % d) - if os.path.exists(env_dir) and not (self.clear or self.upgrade): - raise ValueError('Directory exists: %s' % env_dir) if os.path.exists(env_dir) and self.clear: - shutil.rmtree(env_dir) + self.clear_directory(env_dir) context = Context() context.env_dir = env_dir context.env_name = os.path.split(env_dir)[1] @@ -369,11 +377,10 @@ 'when symlinks are not the default for ' 'the platform.') parser.add_argument('--clear', default=False, action='store_true', - dest='clear', help='Delete the environment ' - 'directory if it already ' - 'exists. If not specified and ' - 'the directory exists, an error' - ' is raised.') + dest='clear', help='Delete the contents of the ' + 'environment directory if it ' + 'already exists, before ' + 'environment creation.') parser.add_argument('--upgrade', default=False, action='store_true', dest='upgrade', help='Upgrade the environment ' 'directory to use this version ' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 23:13:06 2012 From: python-checkins at python.org (brian.curtin) Date: Thu, 11 Oct 2012 23:13:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogRml4ICMxNjE3Ni4g?= =?utf-8?q?Properly_identify_Windows_8_via_platform=2Eplatform=28=29?= Message-ID: <3Xd4dt40YXzR2s@mail.python.org> http://hg.python.org/cpython/rev/8245333db1e5 changeset: 79668:8245333db1e5 branch: 3.2 parent: 79660:42bddca6b2b1 user: Brian Curtin date: Thu Oct 11 16:07:52 2012 -0500 summary: Fix #16176. Properly identify Windows 8 via platform.platform() Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server. files: Lib/platform.py | 7 ++++++- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -668,8 +668,13 @@ release = '7' else: release = '2008ServerR2' + elif min == 2: + if product_type == VER_NT_WORKSTATION: + release = '8' + else: + release = '2012Server' else: - release = 'post2008Server' + release = 'post2012Server' else: if not release: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -129,6 +129,8 @@ Library ------- +- Issue #16176: Properly identify Windows 8 via platform.platform() + - Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 23:13:07 2012 From: python-checkins at python.org (brian.curtin) Date: Thu, 11 Oct 2012 23:13:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_3=2E2?= Message-ID: <3Xd4dv6GVZzR2v@mail.python.org> http://hg.python.org/cpython/rev/f1c1b59d8181 changeset: 79669:f1c1b59d8181 branch: 3.3 parent: 79661:6dcd68079b7e parent: 79668:8245333db1e5 user: Brian Curtin date: Thu Oct 11 16:11:37 2012 -0500 summary: Merge 3.2 files: Lib/platform.py | 7 ++++++- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -595,8 +595,13 @@ release = '7' else: release = '2008ServerR2' + elif min == 2: + if product_type == VER_NT_WORKSTATION: + release = '8' + else: + release = '2012Server' else: - release = 'post2008Server' + release = 'post2012Server' else: if not release: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -41,6 +41,8 @@ Library ------- +- Issue #16176: Properly identify Windows 8 via platform.platform() + - Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 23:13:09 2012 From: python-checkins at python.org (brian.curtin) Date: Thu, 11 Oct 2012 23:13:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4y?= Message-ID: <3Xd4dx1PKvzR3q@mail.python.org> http://hg.python.org/cpython/rev/2802b26c64a9 changeset: 79670:2802b26c64a9 parent: 79667:c3c188a0325a parent: 79668:8245333db1e5 user: Brian Curtin date: Thu Oct 11 16:12:47 2012 -0500 summary: Merge 3.2 files: Lib/platform.py | 7 ++++++- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -595,8 +595,13 @@ release = '7' else: release = '2008ServerR2' + elif min == 2: + if product_type == VER_NT_WORKSTATION: + release = '8' + else: + release = '2012Server' else: - release = 'post2008Server' + release = 'post2012Server' else: if not release: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,8 @@ Library ------- +- Issue #16176: Properly identify Windows 8 via platform.platform() + - Issue #16088: BaseHTTPRequestHandler's send_error method includes a Content-Length header in it's response now. Patch by Antoine Pitrou. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 11 23:17:01 2012 From: python-checkins at python.org (brian.curtin) Date: Thu, 11 Oct 2012 23:17:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRml4ICMxNjE3Ni4g?= =?utf-8?q?Properly_identify_Windows_8_via_platform=2Eplatform=28=29?= Message-ID: <3Xd4kP5JljzQxg@mail.python.org> http://hg.python.org/cpython/rev/e3acc945f0cb changeset: 79671:e3acc945f0cb branch: 2.7 parent: 79663:bbdb90bf2692 user: Brian Curtin date: Thu Oct 11 16:16:50 2012 -0500 summary: Fix #16176. Properly identify Windows 8 via platform.platform() Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server. files: Lib/platform.py | 7 ++++++- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -673,8 +673,13 @@ release = '7' else: release = '2008ServerR2' + elif min == 2: + if product_type == VER_NT_WORKSTATION: + release = '8' + else: + release = '2012Server' else: - release = 'post2008Server' + release = 'post2012Server' else: if not release: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -119,6 +119,8 @@ Library ------- +- Issue #16176: Properly identify Windows 8 via platform.platform() + - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to return a returncode of 0 when the child has already exited or cannot be waited on. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 00:31:54 2012 From: python-checkins at python.org (daniel.holth) Date: Fri, 12 Oct 2012 00:31:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_explain_=23!python_rewrite-on?= =?utf-8?q?-install?= Message-ID: <3Xd6Np1tx5zR2Y@mail.python.org> http://hg.python.org/peps/rev/e125e3715018 changeset: 4552:e125e3715018 user: Daniel Holth date: Thu Oct 11 18:31:41 2012 -0400 summary: explain #!python rewrite-on-install files: pep-0427.txt | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -86,6 +86,22 @@ f. Compile any installed .py to .pyc. (Uninstallers should be smart enough to remove .pyc even if it is not mentioned in RECORD.) +Recommended installer features +'''''''''''''''''''''''''''''' + +Rewrite ``#!python``. + In wheel, scripts are packaged in + ``{distribution}-{version}.data/scripts/``. If the first line of + a file in ``scripts/`` starts with exactly b'#!python', rewrite to + point to the correct interpreter. Unix installers may need to add + the +x bit to these files if the archive was created on Windows. + +Generate script wrappers. + In wheel, scripts packaged on Unix systems will certainly not have + accompanying .exe wrappers. Windows installers may want to add them + during install. + + File Format ----------- @@ -309,11 +325,10 @@ FAQ === -Wheel defines a .data directory. Should I put all my data there? - No. The word 'data' is used only because it is short, and is only - meant to indicate files that are not installed into site-packages. - This specification does not have an opinion on how you should - organize your code. +Wheel defines a .data directory. Should I put all my data there? + This specification does not have an opinion on how you should organize + your code. The .data directory is just a place for any files that are + not normally installed inside ``site-packages`` or on the PYTHONPATH. Copyright -- Repository URL: http://hg.python.org/peps From chris.jerdonek at gmail.com Fri Oct 12 01:06:34 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Thu, 11 Oct 2012 16:06:34 -0700 Subject: [Python-checkins] cpython (merge 3.2 -> default): Merge 3.2 In-Reply-To: <3Xd4dx1PKvzR3q@mail.python.org> References: <3Xd4dx1PKvzR3q@mail.python.org> Message-ID: On Thu, Oct 11, 2012 at 2:13 PM, brian.curtin wrote: > http://hg.python.org/cpython/rev/2802b26c64a9 > changeset: 79670:2802b26c64a9 > parent: 79667:c3c188a0325a > parent: 79668:8245333db1e5 > user: Brian Curtin > date: Thu Oct 11 16:12:47 2012 -0500 > summary: > Merge 3.2 FYI, it looks like a merge from 3.3 to default is missing from this set of changes. --Chris > > files: > Lib/platform.py | 7 ++++++- > Misc/NEWS | 2 ++ > 2 files changed, 8 insertions(+), 1 deletions(-) > > > diff --git a/Lib/platform.py b/Lib/platform.py > --- a/Lib/platform.py > +++ b/Lib/platform.py > @@ -595,8 +595,13 @@ > release = '7' > else: > release = '2008ServerR2' > + elif min == 2: > + if product_type == VER_NT_WORKSTATION: > + release = '8' > + else: > + release = '2012Server' > else: > - release = 'post2008Server' > + release = 'post2012Server' > > else: > if not release: > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -45,6 +45,8 @@ > Library > ------- > > +- Issue #16176: Properly identify Windows 8 via platform.platform() > + > - Issue #16088: BaseHTTPRequestHandler's send_error method includes a > Content-Length header in it's response now. Patch by Antoine Pitrou. > > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From python-checkins at python.org Fri Oct 12 01:16:47 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 01:16:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MTk5?= =?utf-8?q?=3A_Fix_typo_in_2to3_docs=2E_Thanks_to_Mark_Lawrence_for_the_re?= =?utf-8?q?port=2E?= Message-ID: <3Xd7Nb3PNXzR4B@mail.python.org> http://hg.python.org/cpython/rev/c7f11e450c31 changeset: 79672:c7f11e450c31 branch: 3.2 parent: 79668:8245333db1e5 user: Chris Jerdonek date: Thu Oct 11 15:59:32 2012 -0700 summary: Issue #16199: Fix typo in 2to3 docs. Thanks to Mark Lawrence for the report. files: Doc/library/2to3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -23,7 +23,7 @@ also located in the :file:`Tools/scripts` directory of the Python root. 2to3's basic arguments are a list of files or directories to transform. The -directories are to recursively traversed for Python sources. +directories are recursively traversed for Python sources. Here is a sample Python 2.x source file, :file:`example.py`:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 01:16:48 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 01:16:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316199=3A_Merge_2to3_typo_fix_from_3=2E2=2E?= Message-ID: <3Xd7Nc5ZDfzR56@mail.python.org> http://hg.python.org/cpython/rev/d83dfa6a381a changeset: 79673:d83dfa6a381a branch: 3.3 parent: 79669:f1c1b59d8181 parent: 79672:c7f11e450c31 user: Chris Jerdonek date: Thu Oct 11 16:01:00 2012 -0700 summary: Issue #16199: Merge 2to3 typo fix from 3.2. files: Doc/library/2to3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -23,7 +23,7 @@ also located in the :file:`Tools/scripts` directory of the Python root. 2to3's basic arguments are a list of files or directories to transform. The -directories are to recursively traversed for Python sources. +directories are recursively traversed for Python sources. Here is a sample Python 2.x source file, :file:`example.py`:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 01:16:50 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 01:16:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316199=3A_Merge_2to3_typo_fix_from_3=2E3_=28and_?= =?utf-8?q?resolve_previous_merge=29=2E?= Message-ID: <3Xd7Nf0gdRzR5D@mail.python.org> http://hg.python.org/cpython/rev/880e62fa7770 changeset: 79674:880e62fa7770 parent: 79670:2802b26c64a9 parent: 79673:d83dfa6a381a user: Chris Jerdonek date: Thu Oct 11 16:13:45 2012 -0700 summary: Issue #16199: Merge 2to3 typo fix from 3.3 (and resolve previous merge). files: Doc/library/2to3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -23,7 +23,7 @@ also located in the :file:`Tools/scripts` directory of the Python root. 2to3's basic arguments are a list of files or directories to transform. The -directories are to recursively traversed for Python sources. +directories are recursively traversed for Python sources. Here is a sample Python 2.x source file, :file:`example.py`:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 01:16:51 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 01:16:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MTk5?= =?utf-8?q?=3A_Backport_2to3_typo_fix_from_3=2E2=2E?= Message-ID: <3Xd7Ng333YzR5F@mail.python.org> http://hg.python.org/cpython/rev/c0a2294de787 changeset: 79675:c0a2294de787 branch: 2.7 parent: 79671:e3acc945f0cb user: Chris Jerdonek date: Thu Oct 11 16:15:46 2012 -0700 summary: Issue #16199: Backport 2to3 typo fix from 3.2. files: Doc/library/2to3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -23,7 +23,7 @@ also located in the :file:`Tools/scripts` directory of the Python root. 2to3's basic arguments are a list of files or directories to transform. The -directories are to recursively traversed for Python sources. +directories are recursively traversed for Python sources. Here is a sample Python 2.x source file, :file:`example.py`:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 03:50:46 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 03:50:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_link_to_st?= =?utf-8?q?r=2Eformat=28=29_in_docs=2E?= Message-ID: <3XdBpG5dx2zR4s@mail.python.org> http://hg.python.org/cpython/rev/16daf3fa259c changeset: 79676:16daf3fa259c branch: 3.2 parent: 79672:c7f11e450c31 user: Chris Jerdonek date: Thu Oct 11 18:47:54 2012 -0700 summary: Fix link to str.format() in docs. files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1173,7 +1173,7 @@ builtin: print Called by the :func:`format` built-in function (and by extension, the - :meth:`format` method of class :class:`str`) to produce a "formatted" + :meth:`str.format` method of class :class:`str`) to produce a "formatted" string representation of an object. The ``format_spec`` argument is a string that contains a description of the formatting options desired. The interpretation of the ``format_spec`` argument is up to the type -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 03:50:48 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 03:50:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_from_3=2E2=3A_Fix_link_to_str=2Eformat=28=29_in_docs=2E?= Message-ID: <3XdBpJ11sTzR5D@mail.python.org> http://hg.python.org/cpython/rev/765aa8d49da6 changeset: 79677:765aa8d49da6 branch: 3.3 parent: 79673:d83dfa6a381a parent: 79676:16daf3fa259c user: Chris Jerdonek date: Thu Oct 11 18:49:02 2012 -0700 summary: Merge from 3.2: Fix link to str.format() in docs. files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1189,7 +1189,7 @@ builtin: print Called by the :func:`format` built-in function (and by extension, the - :meth:`format` method of class :class:`str`) to produce a "formatted" + :meth:`str.format` method of class :class:`str`) to produce a "formatted" string representation of an object. The ``format_spec`` argument is a string that contains a description of the formatting options desired. The interpretation of the ``format_spec`` argument is up to the type -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 03:50:49 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 03:50:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_Fix_link_to_str=2Eformat=28=29_in_do?= =?utf-8?b?Y3Mu?= Message-ID: <3XdBpK3XxwzR5G@mail.python.org> http://hg.python.org/cpython/rev/07eed21a0391 changeset: 79678:07eed21a0391 parent: 79674:880e62fa7770 parent: 79677:765aa8d49da6 user: Chris Jerdonek date: Thu Oct 11 18:49:52 2012 -0700 summary: Merge from 3.3: Fix link to str.format() in docs. files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1189,7 +1189,7 @@ builtin: print Called by the :func:`format` built-in function (and by extension, the - :meth:`format` method of class :class:`str`) to produce a "formatted" + :meth:`str.format` method of class :class:`str`) to produce a "formatted" string representation of an object. The ``format_spec`` argument is a string that contains a description of the formatting options desired. The interpretation of the ``format_spec`` argument is up to the type -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 04:00:27 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 04:00:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_and_adjust?= =?utf-8?q?_some_string-related_links_in_the_docs=2E?= Message-ID: <3XdC1R6gR8zR4d@mail.python.org> http://hg.python.org/cpython/rev/f0400f398164 changeset: 79679:f0400f398164 branch: 3.3 parent: 79677:765aa8d49da6 user: Chris Jerdonek date: Thu Oct 11 18:57:48 2012 -0700 summary: Add and adjust some string-related links in the docs. files: Doc/library/functions.rst | 11 +++++------ Doc/library/stdtypes.rst | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1206,7 +1206,8 @@ .. function:: str(object='') str(object[, encoding[, errors]]) - Return a string version of an object, using one of the following modes: + Return a :ref:`string ` version of an object, using one of the + following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1229,11 +1230,9 @@ Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings see :ref:`typesseq` which describes sequence - functionality (strings are sequences), and also the string-specific methods - described in the :ref:`string-methods` section. To output formatted strings, - see the :ref:`string-formatting` section. In addition see the - :ref:`stringservices` section. + For more information on strings and string methods, see the :ref:`textseq` + section. To output formatted strings, see the :ref:`string-formatting` + section. In addition, see the :ref:`stringservices` section. .. function:: sum(iterable[, start]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1357,8 +1357,8 @@ object: io.StringIO -Textual data in Python is handled with :class:`str` objects, which are -immutable sequences of Unicode code points. String literals are +Textual data in Python is handled with ``str`` objects, which are immutable +:ref:`sequences ` of Unicode code points. String literals are written in a variety of ways: * Single quotes: ``'allows embedded "double" quotes'`` @@ -1376,8 +1376,8 @@ including supported escape sequences, and the ``r`` ("raw") prefix that disables most escape sequence processing. -Strings may also be created from other objects with the :ref:`str ` -built-in. +Strings may also be created from other objects with the built-in +function :func:`str`. Since there is no separate "character" type, indexing a string produces strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 04:00:29 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 12 Oct 2012 04:00:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_Add_and_adjust_some_string-related_l?= =?utf-8?q?inks_in_the_docs=2E?= Message-ID: <3XdC1T26XwzR5K@mail.python.org> http://hg.python.org/cpython/rev/6fb1fb550319 changeset: 79680:6fb1fb550319 parent: 79678:07eed21a0391 parent: 79679:f0400f398164 user: Chris Jerdonek date: Thu Oct 11 18:59:34 2012 -0700 summary: Merge from 3.3: Add and adjust some string-related links in the docs. files: Doc/library/functions.rst | 11 +++++------ Doc/library/stdtypes.rst | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1206,7 +1206,8 @@ .. function:: str(object='') str(object[, encoding[, errors]]) - Return a string version of an object, using one of the following modes: + Return a :ref:`string ` version of an object, using one of the + following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1229,11 +1230,9 @@ Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings see :ref:`typesseq` which describes sequence - functionality (strings are sequences), and also the string-specific methods - described in the :ref:`string-methods` section. To output formatted strings, - see the :ref:`string-formatting` section. In addition see the - :ref:`stringservices` section. + For more information on strings and string methods, see the :ref:`textseq` + section. To output formatted strings, see the :ref:`string-formatting` + section. In addition, see the :ref:`stringservices` section. .. function:: sum(iterable[, start]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1357,8 +1357,8 @@ object: io.StringIO -Textual data in Python is handled with :class:`str` objects, which are -immutable sequences of Unicode code points. String literals are +Textual data in Python is handled with ``str`` objects, which are immutable +:ref:`sequences ` of Unicode code points. String literals are written in a variety of ways: * Single quotes: ``'allows embedded "double" quotes'`` @@ -1376,8 +1376,8 @@ including supported escape sequences, and the ``r`` ("raw") prefix that disables most escape sequence processing. -Strings may also be created from other objects with the :ref:`str ` -built-in. +Strings may also be created from other objects with the built-in +function :func:`str`. Since there is no separate "character" type, indexing a string produces strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Fri Oct 12 05:58:45 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Fri, 12 Oct 2012 05:58:45 +0200 Subject: [Python-checkins] Daily reference leaks (880e62fa7770): sum=0 Message-ID: results for 880e62fa7770 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogVZq6YM', '-x'] From python-checkins at python.org Fri Oct 12 10:02:50 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 10:02:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_and_add_mo?= =?utf-8?q?re_links=2E?= Message-ID: <3XdM3Z52GdzQt5@mail.python.org> http://hg.python.org/cpython/rev/06deefec71e3 changeset: 79681:06deefec71e3 branch: 3.3 parent: 79679:f0400f398164 user: Ezio Melotti date: Fri Oct 12 10:59:14 2012 +0300 summary: Fix and add more links. files: Doc/howto/unicode.rst | 2 +- Doc/library/functions.rst | 14 +++++++++++--- Doc/library/string.rst | 2 +- Doc/tutorial/introduction.rst | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -414,7 +414,7 @@ ---------- The ``str`` type is described in the Python library reference at -:ref:`typesseq`. +:ref:`textseq`. The documentation for the :mod:`unicodedata` module. diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,6 +122,8 @@ Without an argument, an array of size 0 is created. + See also :ref:`binaryseq` and :ref:`typebytearray`. + .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -135,6 +137,8 @@ Bytes objects can also be created with literals, see :ref:`strings`. + See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. + .. function:: callable(object) @@ -687,6 +691,8 @@ method; if the value returned is equal to *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. + See also :ref:`typeiter`. + One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -707,7 +713,7 @@ :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. .. function:: locals() @@ -1081,7 +1087,7 @@ :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. .. function:: repr(object) @@ -1309,7 +1315,7 @@ :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. .. function:: type(object) @@ -1342,6 +1348,8 @@ ... >>> X = type('X', (object,), dict(a=1)) + See also :ref:`bltin-type-objects`. + .. function:: vars([object]) diff --git a/Doc/library/string.rst b/Doc/library/string.rst --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -10,7 +10,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` :ref:`string-methods` diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -390,7 +390,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` Strings are examples of *sequence types*, and support the common operations supported by such types. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 10:02:52 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 10:02:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_link_additions/fixes_with_3=2E3=2E?= Message-ID: <3XdM3c0PfLzQt5@mail.python.org> http://hg.python.org/cpython/rev/336afc64c1dc changeset: 79682:336afc64c1dc parent: 79680:6fb1fb550319 parent: 79681:06deefec71e3 user: Ezio Melotti date: Fri Oct 12 11:02:39 2012 +0300 summary: Merge link additions/fixes with 3.3. files: Doc/howto/unicode.rst | 2 +- Doc/library/functions.rst | 14 +++++++++++--- Doc/library/string.rst | 2 +- Doc/tutorial/introduction.rst | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -414,7 +414,7 @@ ---------- The ``str`` type is described in the Python library reference at -:ref:`typesseq`. +:ref:`textseq`. The documentation for the :mod:`unicodedata` module. diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,6 +122,8 @@ Without an argument, an array of size 0 is created. + See also :ref:`binaryseq` and :ref:`typebytearray`. + .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -135,6 +137,8 @@ Bytes objects can also be created with literals, see :ref:`strings`. + See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. + .. function:: callable(object) @@ -687,6 +691,8 @@ method; if the value returned is equal to *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. + See also :ref:`typeiter`. + One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -707,7 +713,7 @@ :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. .. function:: locals() @@ -1081,7 +1087,7 @@ :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. .. function:: repr(object) @@ -1309,7 +1315,7 @@ :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. .. function:: type(object) @@ -1342,6 +1348,8 @@ ... >>> X = type('X', (object,), dict(a=1)) + See also :ref:`bltin-type-objects`. + .. function:: vars([object]) diff --git a/Doc/library/string.rst b/Doc/library/string.rst --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -10,7 +10,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` :ref:`string-methods` diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -390,7 +390,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` Strings are examples of *sequence types*, and support the common operations supported by such types. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:30:46 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:30:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Improve_markup?= =?utf-8?q?_in_functional=2Erst=2C_and_fix_a_couple_of_errors=2E?= Message-ID: <3XdQLG2G7QzQvw@mail.python.org> http://hg.python.org/cpython/rev/1c589cacbb39 changeset: 79683:1c589cacbb39 branch: 3.2 parent: 79676:16daf3fa259c user: Ezio Melotti date: Fri Oct 12 12:42:51 2012 +0300 summary: Improve markup in functional.rst, and fix a couple of errors. files: Doc/howto/functional.rst | 310 +++++++++++++------------- 1 files changed, 155 insertions(+), 155 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -181,18 +181,18 @@ An iterator is an object representing a stream of data; this object returns the data one element at a time. A Python iterator must support a method called -``__next__()`` that takes no arguments and always returns the next element of -the stream. If there are no more elements in the stream, ``__next__()`` must -raise the ``StopIteration`` exception. Iterators don't have to be finite, -though; it's perfectly reasonable to write an iterator that produces an infinite -stream of data. +:meth:`~iterator.__next__` that takes no arguments and always returns the next +element of the stream. If there are no more elements in the stream, +:meth:`~iterator.__next__` must raise the :exc:`StopIteration` exception. +Iterators don't have to be finite, though; it's perfectly reasonable to write +an iterator that produces an infinite stream of data. The built-in :func:`iter` function takes an arbitrary object and tries to return an iterator that will return the object's contents or elements, raising :exc:`TypeError` if the object doesn't support iteration. Several of Python's built-in data types support iteration, the most common being lists and -dictionaries. An object is called an **iterable** object if you can get an -iterator for it. +dictionaries. An object is called :term:`iterable` if you can get an iterator +for it. You can experiment with the iteration interface manually: @@ -200,7 +200,7 @@ >>> it = iter(L) >>> it <...iterator object at ...> - >>> it.__next__() + >>> it.__next__() # same as next(it) 1 >>> next(it) 2 @@ -213,9 +213,9 @@ >>> Python expects iterable objects in several different contexts, the most -important being the ``for`` statement. In the statement ``for X in Y``, Y must -be an iterator or some object for which ``iter()`` can create an iterator. -These two statements are equivalent:: +important being the :keyword:`for` statement. In the statement ``for X in Y``, +Y must be an iterator or some object for which :func:`iter` can create an +iterator. These two statements are equivalent:: for i in iter(obj): @@ -246,16 +246,16 @@ iterator argument and will return the largest or smallest element. The ``"in"`` and ``"not in"`` operators also support iterators: ``X in iterator`` is true if X is found in the stream returned by the iterator. You'll run into obvious -problems if the iterator is infinite; ``max()``, ``min()`` +problems if the iterator is infinite; :func:`max`, :func:`min` will never return, and if the element X never appears in the stream, the ``"in"`` and ``"not in"`` operators won't return either. Note that you can only go forward in an iterator; there's no way to get the previous element, reset the iterator, or make a copy of it. Iterator objects can optionally provide these additional capabilities, but the iterator protocol -only specifies the ``next()`` method. Functions may therefore consume all of -the iterator's output, and if you need to do something different with the same -stream, you'll have to create a new iterator. +only specifies the :meth:`~iterator.__next__` method. Functions may therefore +consume all of the iterator's output, and if you need to do something different +with the same stream, you'll have to create a new iterator. @@ -296,7 +296,7 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`values` or :meth:`items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: @@ -305,9 +305,9 @@ >>> dict(iter(L)) {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} -Files also support iteration by calling the ``readline()`` method until there -are no more lines in the file. This means you can read each line of a file like -this:: +Files also support iteration by calling the :meth:`~io.TextIOBase.readline` +method until there are no more lines in the file. This means you can read each +line of a file like this:: for line in file: # do something for each line @@ -415,7 +415,7 @@ >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x,y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -425,9 +425,9 @@ comprehension below is a syntax error, while the second one is correct:: # Syntax error - [ x,y for x in seq1 for y in seq2] + [x, y for x in seq1 for y in seq2] # Correct - [ (x,y) for x in seq1 for y in seq2] + [(x, y) for x in seq1 for y in seq2] Generators @@ -454,9 +454,9 @@ for i in range(N): yield i -Any function containing a ``yield`` keyword is a generator function; this is -detected by Python's :term:`bytecode` compiler which compiles the function -specially as a result. +Any function containing a :keyword:`yield` keyword is a generator function; +this is detected by Python's :term:`bytecode` compiler which compiles the +function specially as a result. When you call a generator function, it doesn't return a single value; instead it returns a generator object that supports the iterator protocol. On executing @@ -464,7 +464,8 @@ ``return`` statement. The big difference between ``yield`` and a ``return`` statement is that on reaching a ``yield`` the generator's state of execution is suspended and local variables are preserved. On the next call to the -generator's ``.__next__()`` method, the function will resume executing. +generator's :meth:`~generator.__next__` method, the function will resume +executing. Here's a sample usage of the ``generate_ints()`` generator: @@ -491,17 +492,19 @@ ``return`` the generator cannot return any further values. ``return`` with a value, such as ``return 5``, is a syntax error inside a generator function. The end of the generator's results can also be indicated by raising -``StopIteration`` manually, or by just letting the flow of execution fall off +:exc:`StopIteration` manually, or by just letting the flow of execution fall off the bottom of the function. You could achieve the effect of generators manually by writing your own class and storing all the local variables of the generator as instance variables. For example, returning a list of integers could be done by setting ``self.count`` to -0, and having the ``__next__()`` method increment ``self.count`` and return it. +0, and having the :meth:`~iterator.__next__` method increment ``self.count`` and +return it. However, for a moderately complicated generator, writing a corresponding class can be much messier. -The test suite included with Python's library, ``test_generators.py``, contains +The test suite included with Python's library, +:source:`Lib/test/test_generators.py`, contains a number of more interesting examples. Here's one generator that implements an in-order traversal of a tree using generators recursively. :: @@ -544,23 +547,23 @@ The parentheses aren't always necessary, but it's easier to always add them instead of having to remember when they're needed. -(PEP 342 explains the exact rules, which are that a ``yield``-expression must +(:pep:`342` explains the exact rules, which are that a ``yield``-expression must always be parenthesized except when it occurs at the top-level expression on the right-hand side of an assignment. This means you can write ``val = yield i`` but have to use parentheses when there's an operation, as in ``val = (yield i) + 12``.) -Values are sent into a generator by calling its ``send(value)`` method. This -method resumes the generator's code and the ``yield`` expression returns the -specified value. If the regular ``__next__()`` method is called, the ``yield`` -returns ``None``. +Values are sent into a generator by calling its :meth:`send(value) +` method. This method resumes the generator's code and the +``yield`` expression returns the specified value. If the regular +:meth:`~generator.__next__` method is called, the ``yield`` returns ``None``. Here's a simple counter that increments by 1 and allows changing the value of the internal counter. .. testcode:: - def counter (maximum): + def counter(maximum): i = 0 while i < maximum: val = (yield i) @@ -589,20 +592,23 @@ Because ``yield`` will often be returning ``None``, you should always check for this case. Don't just use its value in expressions unless you're sure that the -``send()`` method will be the only method used resume your generator function. +:meth:`~generator.send` method will be the only method used resume your +generator function. -In addition to ``send()``, there are two other new methods on generators: +In addition to :meth:`~generator.send`, there are two other methods on +generators: -* ``throw(type, value=None, traceback=None)`` is used to raise an exception - inside the generator; the exception is raised by the ``yield`` expression - where the generator's execution is paused. +* :meth:`throw(type, value=None, traceback=None) ` is used to + raise an exception inside the generator; the exception is raised by the + ``yield`` expression where the generator's execution is paused. -* ``close()`` raises a :exc:`GeneratorExit` exception inside the generator to - terminate the iteration. On receiving this exception, the generator's code - must either raise :exc:`GeneratorExit` or :exc:`StopIteration`; catching the - exception and doing anything else is illegal and will trigger a - :exc:`RuntimeError`. ``close()`` will also be called by Python's garbage - collector when the generator is garbage-collected. +* :meth:`~generator.close` raises a :exc:`GeneratorExit` exception inside the + generator to terminate the iteration. On receiving this exception, the + generator's code must either raise :exc:`GeneratorExit` or + :exc:`StopIteration`; catching the exception and doing anything else is + illegal and will trigger a :exc:`RuntimeError`. :meth:`~generator.close` + will also be called by Python's garbage collector when the generator is + garbage-collected. If you need to run cleanup code when a :exc:`GeneratorExit` occurs, I suggest using a ``try: ... finally:`` suite instead of catching :exc:`GeneratorExit`. @@ -624,13 +630,12 @@ Two of Python's built-in functions, :func:`map` and :func:`filter` duplicate the features of generator expressions: -``map(f, iterA, iterB, ...)`` returns an iterator over the sequence +:func:`map(f, iterA, iterB, ...) ` returns an iterator over the sequence ``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``. >>> def upper(s): ... return s.upper() - >>> list(map(upper, ['sentence', 'fragment'])) ['SENTENCE', 'FRAGMENT'] >>> [upper(s) for s in ['sentence', 'fragment']] @@ -638,11 +643,11 @@ You can of course achieve the same effect with a list comprehension. -``filter(predicate, iter)`` returns an iterator over all the sequence elements -that meet a certain condition, and is similarly duplicated by list -comprehensions. A **predicate** is a function that returns the truth value of -some condition; for use with :func:`filter`, the predicate must take a single -value. +:func:`filter(predicate, iter) ` returns an iterator over all the +sequence elements that meet a certain condition, and is similarly duplicated by +list comprehensions. A **predicate** is a function that returns the truth +value of some condition; for use with :func:`filter`, the predicate must take a +single value. >>> def is_even(x): ... return (x % 2) == 0 @@ -657,8 +662,8 @@ [0, 2, 4, 6, 8] -``enumerate(iter)`` counts off the elements in the iterable, returning 2-tuples -containing the count and each element. :: +:func:`enumerate(iter) ` counts off the elements in the iterable, +returning 2-tuples containing the count and each element. :: >>> for item in enumerate(['subject', 'verb', 'object']): ... print(item) @@ -674,10 +679,10 @@ if line.strip() == '': print('Blank line at line #%i' % i) -``sorted(iterable, [key=None], [reverse=False])`` collects all the elements of -the iterable into a list, sorts the list, and returns the sorted result. The -``key``, and ``reverse`` arguments are passed through to the constructed list's -``.sort()`` method. :: +:func:`sorted(iterable, key=None, reverse=False) ` collects all the +elements of the iterable into a list, sorts the list, and returns the sorted +result. The *key*, and *reverse* arguments are passed through to the +constructed list's :meth:`~list.sort` method. :: >>> import random >>> # Generate 8 random numbers between [0, 10000) @@ -689,14 +694,13 @@ >>> sorted(rand_list, reverse=True) [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] -(For a more detailed discussion of sorting, see the Sorting mini-HOWTO in the -Python wiki at http://wiki.python.org/moin/HowTo/Sorting.) +(For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -The ``any(iter)`` and ``all(iter)`` built-ins look at the truth values of an -iterable's contents. :func:`any` returns True if any element in the iterable is -a true value, and :func:`all` returns True if all of the elements are true -values: +The :func:`any(iter) ` and :func:`all(iter) ` built-ins look at the +truth values of an iterable's contents. :func:`any` returns True if any element +in the iterable is a true value, and :func:`all` returns True if all of the +elements are true values: >>> any([0,1,0]) True @@ -712,7 +716,7 @@ True -``zip(iterA, iterB, ...)`` takes one element from each iterable and +:func:`zip(iterA, iterB, ...) ` takes one element from each iterable and returns them in a tuple:: zip(['a', 'b', 'c'], (1, 2, 3)) => @@ -752,42 +756,44 @@ Creating new iterators ---------------------- -``itertools.count(n)`` returns an infinite stream of integers, increasing by 1 -each time. You can optionally supply the starting number, which defaults to 0:: +:func:`itertools.count(n) ` returns an infinite stream of +integers, increasing by 1 each time. You can optionally supply the starting +number, which defaults to 0:: itertools.count() => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... itertools.count(10) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... -``itertools.cycle(iter)`` saves a copy of the contents of a provided iterable -and returns a new iterator that returns its elements from first to last. The -new iterator will repeat these elements infinitely. :: +:func:`itertools.cycle(iter) ` saves a copy of the contents of +a provided iterable and returns a new iterator that returns its elements from +first to last. The new iterator will repeat these elements infinitely. :: itertools.cycle([1,2,3,4,5]) => 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, ... -``itertools.repeat(elem, [n])`` returns the provided element ``n`` times, or -returns the element endlessly if ``n`` is not provided. :: +:func:`itertools.repeat(elem, [n]) ` returns the provided +element *n* times, or returns the element endlessly if *n* is not provided. :: itertools.repeat('abc') => abc, abc, abc, abc, abc, abc, abc, abc, abc, abc, ... itertools.repeat('abc', 5) => abc, abc, abc, abc, abc -``itertools.chain(iterA, iterB, ...)`` takes an arbitrary number of iterables as -input, and returns all the elements of the first iterator, then all the elements -of the second, and so on, until all of the iterables have been exhausted. :: +:func:`itertools.chain(iterA, iterB, ...) ` takes an arbitrary +number of iterables as input, and returns all the elements of the first +iterator, then all the elements of the second, and so on, until all of the +iterables have been exhausted. :: itertools.chain(['a', 'b', 'c'], (1, 2, 3)) => a, b, c, 1, 2, 3 -``itertools.islice(iter, [start], stop, [step])`` returns a stream that's a -slice of the iterator. With a single ``stop`` argument, it will return the -first ``stop`` elements. If you supply a starting index, you'll get -``stop-start`` elements, and if you supply a value for ``step``, elements will -be skipped accordingly. Unlike Python's string and list slicing, you can't use -negative values for ``start``, ``stop``, or ``step``. :: +:func:`itertools.islice(iter, [start], stop, [step]) ` returns +a stream that's a slice of the iterator. With a single *stop* argument, it +will return the first *stop* elements. If you supply a starting index, you'll +get *stop-start* elements, and if you supply a value for *step*, elements +will be skipped accordingly. Unlike Python's string and list slicing, you can't +use negative values for *start*, *stop*, or *step*. :: itertools.islice(range(10), 8) => 0, 1, 2, 3, 4, 5, 6, 7 @@ -796,9 +802,10 @@ itertools.islice(range(10), 2, 8, 2) => 2, 4, 6 -``itertools.tee(iter, [n])`` replicates an iterator; it returns ``n`` -independent iterators that will all return the contents of the source iterator. -If you don't supply a value for ``n``, the default is 2. Replicating iterators +:func:`itertools.tee(iter, [n]) ` replicates an iterator; it +returns *n* independent iterators that will all return the contents of the +source iterator. +If you don't supply a value for *n*, the default is 2. Replicating iterators requires saving some of the contents of the source iterator, so this can consume significant memory if the iterator is large and one of the new iterators is consumed more than the others. :: @@ -816,19 +823,21 @@ Calling functions on elements ----------------------------- -The ``operator`` module contains a set of functions corresponding to Python's -operators. Some examples are ``operator.add(a, b)`` (adds two values), -``operator.ne(a, b)`` (same as ``a!=b``), and ``operator.attrgetter('id')`` -(returns a callable that fetches the ``"id"`` attribute). +The :mod:`operator` module contains a set of functions corresponding to Python's +operators. Some examples are :func:`operator.add(a, b) ` (adds +two values), :func:`operator.ne(a, b) ` (same as ``a != b``), and +:func:`operator.attrgetter('id') ` +(returns a callable that fetches the ``.id`` attribute). -``itertools.starmap(func, iter)`` assumes that the iterable will return a stream -of tuples, and calls ``f()`` using these tuples as the arguments:: +:func:`itertools.starmap(func, iter) ` assumes that the +iterable will return a stream of tuples, and calls *func* using these tuples as +the arguments:: itertools.starmap(os.path.join, - [('/usr', 'bin', 'java'), ('/bin', 'python'), - ('/usr', 'bin', 'perl'),('/usr', 'bin', 'ruby')]) + [('/bin', 'python'), ('/usr', 'bin', 'java'), + ('/usr', 'bin', 'perl'), ('/usr', 'bin', 'ruby')]) => - /usr/bin/java, /bin/python, /usr/bin/perl, /usr/bin/ruby + /bin/python, /usr/bin/java, /usr/bin/perl, /usr/bin/ruby Selecting elements @@ -837,20 +846,18 @@ Another group of functions chooses a subset of an iterator's elements based on a predicate. -``itertools.filterfalse(predicate, iter)`` is the opposite, returning all -elements for which the predicate returns false:: +:func:`itertools.filterfalse(predicate, iter) ` is the +opposite, returning all elements for which the predicate returns false:: itertools.filterfalse(is_even, itertools.count()) => 1, 3, 5, 7, 9, 11, 13, 15, ... -``itertools.takewhile(predicate, iter)`` returns elements for as long as the -predicate returns true. Once the predicate returns false, the iterator will -signal the end of its results. - -:: +:func:`itertools.takewhile(predicate, iter) ` returns +elements for as long as the predicate returns true. Once the predicate returns +false, the iterator will signal the end of its results. :: def less_than_10(x): - return (x < 10) + return x < 10 itertools.takewhile(less_than_10, itertools.count()) => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 @@ -858,10 +865,9 @@ itertools.takewhile(is_even, itertools.count()) => 0 -``itertools.dropwhile(predicate, iter)`` discards elements while the predicate -returns true, and then returns the rest of the iterable's results. - -:: +:func:`itertools.dropwhile(predicate, iter) ` discards +elements while the predicate returns true, and then returns the rest of the +iterable's results. :: itertools.dropwhile(less_than_10, itertools.count()) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... @@ -873,14 +879,14 @@ Grouping elements ----------------- -The last function I'll discuss, ``itertools.groupby(iter, key_func=None)``, is -the most complicated. ``key_func(elem)`` is a function that can compute a key -value for each element returned by the iterable. If you don't supply a key -function, the key is simply each element itself. +The last function I'll discuss, :func:`itertools.groupby(iter, key_func=None) +`, is the most complicated. ``key_func(elem)`` is a function +that can compute a key value for each element returned by the iterable. If you +don't supply a key function, the key is simply each element itself. -``groupby()`` collects all the consecutive elements from the underlying iterable -that have the same key value, and returns a stream of 2-tuples containing a key -value and an iterator for the elements with that key. +:func:`~itertools.groupby` collects all the consecutive elements from the +underlying iterable that have the same key value, and returns a stream of +2-tuples containing a key value and an iterator for the elements with that key. :: @@ -890,7 +896,7 @@ ... ] - def get_state (city_state): + def get_state(city_state): return city_state[1] itertools.groupby(city_list, get_state) => @@ -906,9 +912,9 @@ iterator-3 => ('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ') -``groupby()`` assumes that the underlying iterable's contents will already be -sorted based on the key. Note that the returned iterators also use the -underlying iterable, so you have to consume the results of iterator-1 before +:func:`~itertools.groupby` assumes that the underlying iterable's contents will +already be sorted based on the key. Note that the returned iterators also use +the underlying iterable, so you have to consume the results of iterator-1 before requesting iterator-2 and its corresponding key. @@ -926,33 +932,34 @@ ``g(b, c)`` that's equivalent to ``f(1, b, c)``; you're filling in a value for one of ``f()``'s parameters. This is called "partial function application". -The constructor for ``partial`` takes the arguments ``(function, arg1, arg2, -... kwarg1=value1, kwarg2=value2)``. The resulting object is callable, so you -can just call it to invoke ``function`` with the filled-in arguments. +The constructor for :func:`~functools.partial` takes the arguments +``(function, arg1, arg2, ..., kwarg1=value1, kwarg2=value2)``. The resulting +object is callable, so you can just call it to invoke ``function`` with the +filled-in arguments. Here's a small but realistic example:: import functools - def log (message, subsystem): - "Write the contents of 'message' to the specified subsystem." + def log(message, subsystem): + """Write the contents of 'message' to the specified subsystem.""" print('%s: %s' % (subsystem, message)) ... server_log = functools.partial(log, subsystem='server') server_log('Unable to open socket') -``functools.reduce(func, iter, [initial_value])`` cumulatively performs an -operation on all the iterable's elements and, therefore, can't be applied to -infinite iterables. (Note it is not in :mod:`builtins`, but in the -:mod:`functools` module.) ``func`` must be a function that takes two elements -and returns a single value. :func:`functools.reduce` takes the first two -elements A and B returned by the iterator and calculates ``func(A, B)``. It -then requests the third element, C, calculates ``func(func(A, B), C)``, combines -this result with the fourth element returned, and continues until the iterable -is exhausted. If the iterable returns no values at all, a :exc:`TypeError` -exception is raised. If the initial value is supplied, it's used as a starting -point and ``func(initial_value, A)`` is the first calculation. :: +:func:`functools.reduce(func, iter, [initial_value]) ` +cumulatively performs an operation on all the iterable's elements and, +therefore, can't be applied to infinite iterables. *func* must be a function +that takes two elements and returns a single value. :func:`functools.reduce` +takes the first two elements A and B returned by the iterator and calculates +``func(A, B)``. It then requests the third element, C, calculates +``func(func(A, B), C)``, combines this result with the fourth element returned, +and continues until the iterable is exhausted. If the iterable returns no +values at all, a :exc:`TypeError` exception is raised. If the initial value is +supplied, it's used as a starting point and ``func(initial_value, A)`` is the +first calculation. :: >>> import operator, functools >>> functools.reduce(operator.concat, ['A', 'BB', 'C']) @@ -978,8 +985,8 @@ >>> sum([]) 0 -For many uses of :func:`functools.reduce`, though, it can be clearer to just write the -obvious :keyword:`for` loop:: +For many uses of :func:`functools.reduce`, though, it can be clearer to just +write the obvious :keyword:`for` loop:: import functools # Instead of: @@ -1023,28 +1030,23 @@ existing_files = filter(os.path.exists, file_list) If the function you need doesn't exist, you need to write it. One way to write -small functions is to use the ``lambda`` statement. ``lambda`` takes a number -of parameters and an expression combining these parameters, and creates a small -function that returns the value of the expression:: +small functions is to use the :keyword:`lambda` statement. ``lambda`` takes a +number of parameters and an expression combining these parameters, and creates +an anonymous function that returns the value of the expression:: - lowercase = lambda x: x.lower() + adder = lambda x, y: x+y print_assign = lambda name, value: name + '=' + str(value) - adder = lambda x, y: x+y - An alternative is to just use the ``def`` statement and define a function in the usual way:: - def lowercase(x): - return x.lower() + def adder(x, y): + return x + y def print_assign(name, value): return name + '=' + str(value) - def adder(x,y): - return x + y - Which alternative is preferable? That's a style question; my usual course is to avoid using ``lambda``. @@ -1053,9 +1055,7 @@ expression, which means you can't have multiway ``if... elif... else`` comparisons or ``try... except`` statements. If you try to do too much in a ``lambda`` statement, you'll end up with an overly complicated expression that's -hard to read. Quick, what's the following code doing? - -:: +hard to read. Quick, what's the following code doing? :: import functools total = functools.reduce(lambda a, b: (0, a[1] + b[1]), items)[1] @@ -1065,7 +1065,7 @@ little bit better:: import functools - def combine (a, b): + def combine(a, b): return 0, a[1] + b[1] total = functools.reduce(combine, items)[1] @@ -1085,12 +1085,12 @@ Fredrik Lundh once suggested the following set of rules for refactoring uses of ``lambda``: -1) Write a lambda function. -2) Write a comment explaining what the heck that lambda does. -3) Study the comment for a while, and think of a name that captures the essence +1. Write a lambda function. +2. Write a comment explaining what the heck that lambda does. +3. Study the comment for a while, and think of a name that captures the essence of the comment. -4) Convert the lambda to a def statement, using that name. -5) Remove the comment. +4. Convert the lambda to a def statement, using that name. +5. Remove the comment. I really like these rules, but you're free to disagree about whether this lambda-free style is better. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:30:48 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:30:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_functional_howto_improvements_with_3=2E2=2E?= Message-ID: <3XdQLJ0qm2zR00@mail.python.org> http://hg.python.org/cpython/rev/17ab7343ef4e changeset: 79684:17ab7343ef4e branch: 3.3 parent: 79681:06deefec71e3 parent: 79683:1c589cacbb39 user: Ezio Melotti date: Fri Oct 12 13:23:32 2012 +0300 summary: Merge functional howto improvements with 3.2. files: Doc/howto/functional.rst | 311 +++++++++++++------------- 1 files changed, 156 insertions(+), 155 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -181,18 +181,18 @@ An iterator is an object representing a stream of data; this object returns the data one element at a time. A Python iterator must support a method called -``__next__()`` that takes no arguments and always returns the next element of -the stream. If there are no more elements in the stream, ``__next__()`` must -raise the ``StopIteration`` exception. Iterators don't have to be finite, -though; it's perfectly reasonable to write an iterator that produces an infinite -stream of data. +:meth:`~iterator.__next__` that takes no arguments and always returns the next +element of the stream. If there are no more elements in the stream, +:meth:`~iterator.__next__` must raise the :exc:`StopIteration` exception. +Iterators don't have to be finite, though; it's perfectly reasonable to write +an iterator that produces an infinite stream of data. The built-in :func:`iter` function takes an arbitrary object and tries to return an iterator that will return the object's contents or elements, raising :exc:`TypeError` if the object doesn't support iteration. Several of Python's built-in data types support iteration, the most common being lists and -dictionaries. An object is called an **iterable** object if you can get an -iterator for it. +dictionaries. An object is called :term:`iterable` if you can get an iterator +for it. You can experiment with the iteration interface manually: @@ -200,7 +200,7 @@ >>> it = iter(L) >>> it <...iterator object at ...> - >>> it.__next__() + >>> it.__next__() # same as next(it) 1 >>> next(it) 2 @@ -213,9 +213,9 @@ >>> Python expects iterable objects in several different contexts, the most -important being the ``for`` statement. In the statement ``for X in Y``, Y must -be an iterator or some object for which ``iter()`` can create an iterator. -These two statements are equivalent:: +important being the :keyword:`for` statement. In the statement ``for X in Y``, +Y must be an iterator or some object for which :func:`iter` can create an +iterator. These two statements are equivalent:: for i in iter(obj): @@ -246,16 +246,16 @@ iterator argument and will return the largest or smallest element. The ``"in"`` and ``"not in"`` operators also support iterators: ``X in iterator`` is true if X is found in the stream returned by the iterator. You'll run into obvious -problems if the iterator is infinite; ``max()``, ``min()`` +problems if the iterator is infinite; :func:`max`, :func:`min` will never return, and if the element X never appears in the stream, the ``"in"`` and ``"not in"`` operators won't return either. Note that you can only go forward in an iterator; there's no way to get the previous element, reset the iterator, or make a copy of it. Iterator objects can optionally provide these additional capabilities, but the iterator protocol -only specifies the ``next()`` method. Functions may therefore consume all of -the iterator's output, and if you need to do something different with the same -stream, you'll have to create a new iterator. +only specifies the :meth:`~iterator.__next__` method. Functions may therefore +consume all of the iterator's output, and if you need to do something different +with the same stream, you'll have to create a new iterator. @@ -296,7 +296,8 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`values` or :meth:`items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate +iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: @@ -305,9 +306,9 @@ >>> dict(iter(L)) {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} -Files also support iteration by calling the ``readline()`` method until there -are no more lines in the file. This means you can read each line of a file like -this:: +Files also support iteration by calling the :meth:`~io.TextIOBase.readline` +method until there are no more lines in the file. This means you can read each +line of a file like this:: for line in file: # do something for each line @@ -415,7 +416,7 @@ >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x,y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -425,9 +426,9 @@ comprehension below is a syntax error, while the second one is correct:: # Syntax error - [ x,y for x in seq1 for y in seq2] + [x, y for x in seq1 for y in seq2] # Correct - [ (x,y) for x in seq1 for y in seq2] + [(x, y) for x in seq1 for y in seq2] Generators @@ -454,9 +455,9 @@ for i in range(N): yield i -Any function containing a ``yield`` keyword is a generator function; this is -detected by Python's :term:`bytecode` compiler which compiles the function -specially as a result. +Any function containing a :keyword:`yield` keyword is a generator function; +this is detected by Python's :term:`bytecode` compiler which compiles the +function specially as a result. When you call a generator function, it doesn't return a single value; instead it returns a generator object that supports the iterator protocol. On executing @@ -464,7 +465,8 @@ ``return`` statement. The big difference between ``yield`` and a ``return`` statement is that on reaching a ``yield`` the generator's state of execution is suspended and local variables are preserved. On the next call to the -generator's ``.__next__()`` method, the function will resume executing. +generator's :meth:`~generator.__next__` method, the function will resume +executing. Here's a sample usage of the ``generate_ints()`` generator: @@ -491,17 +493,19 @@ ``return`` the generator cannot return any further values. ``return`` with a value, such as ``return 5``, is a syntax error inside a generator function. The end of the generator's results can also be indicated by raising -``StopIteration`` manually, or by just letting the flow of execution fall off +:exc:`StopIteration` manually, or by just letting the flow of execution fall off the bottom of the function. You could achieve the effect of generators manually by writing your own class and storing all the local variables of the generator as instance variables. For example, returning a list of integers could be done by setting ``self.count`` to -0, and having the ``__next__()`` method increment ``self.count`` and return it. +0, and having the :meth:`~iterator.__next__` method increment ``self.count`` and +return it. However, for a moderately complicated generator, writing a corresponding class can be much messier. -The test suite included with Python's library, ``test_generators.py``, contains +The test suite included with Python's library, +:source:`Lib/test/test_generators.py`, contains a number of more interesting examples. Here's one generator that implements an in-order traversal of a tree using generators recursively. :: @@ -544,23 +548,23 @@ The parentheses aren't always necessary, but it's easier to always add them instead of having to remember when they're needed. -(PEP 342 explains the exact rules, which are that a ``yield``-expression must +(:pep:`342` explains the exact rules, which are that a ``yield``-expression must always be parenthesized except when it occurs at the top-level expression on the right-hand side of an assignment. This means you can write ``val = yield i`` but have to use parentheses when there's an operation, as in ``val = (yield i) + 12``.) -Values are sent into a generator by calling its ``send(value)`` method. This -method resumes the generator's code and the ``yield`` expression returns the -specified value. If the regular ``__next__()`` method is called, the ``yield`` -returns ``None``. +Values are sent into a generator by calling its :meth:`send(value) +` method. This method resumes the generator's code and the +``yield`` expression returns the specified value. If the regular +:meth:`~generator.__next__` method is called, the ``yield`` returns ``None``. Here's a simple counter that increments by 1 and allows changing the value of the internal counter. .. testcode:: - def counter (maximum): + def counter(maximum): i = 0 while i < maximum: val = (yield i) @@ -589,20 +593,23 @@ Because ``yield`` will often be returning ``None``, you should always check for this case. Don't just use its value in expressions unless you're sure that the -``send()`` method will be the only method used resume your generator function. +:meth:`~generator.send` method will be the only method used resume your +generator function. -In addition to ``send()``, there are two other new methods on generators: +In addition to :meth:`~generator.send`, there are two other methods on +generators: -* ``throw(type, value=None, traceback=None)`` is used to raise an exception - inside the generator; the exception is raised by the ``yield`` expression - where the generator's execution is paused. +* :meth:`throw(type, value=None, traceback=None) ` is used to + raise an exception inside the generator; the exception is raised by the + ``yield`` expression where the generator's execution is paused. -* ``close()`` raises a :exc:`GeneratorExit` exception inside the generator to - terminate the iteration. On receiving this exception, the generator's code - must either raise :exc:`GeneratorExit` or :exc:`StopIteration`; catching the - exception and doing anything else is illegal and will trigger a - :exc:`RuntimeError`. ``close()`` will also be called by Python's garbage - collector when the generator is garbage-collected. +* :meth:`~generator.close` raises a :exc:`GeneratorExit` exception inside the + generator to terminate the iteration. On receiving this exception, the + generator's code must either raise :exc:`GeneratorExit` or + :exc:`StopIteration`; catching the exception and doing anything else is + illegal and will trigger a :exc:`RuntimeError`. :meth:`~generator.close` + will also be called by Python's garbage collector when the generator is + garbage-collected. If you need to run cleanup code when a :exc:`GeneratorExit` occurs, I suggest using a ``try: ... finally:`` suite instead of catching :exc:`GeneratorExit`. @@ -624,13 +631,12 @@ Two of Python's built-in functions, :func:`map` and :func:`filter` duplicate the features of generator expressions: -``map(f, iterA, iterB, ...)`` returns an iterator over the sequence +:func:`map(f, iterA, iterB, ...) ` returns an iterator over the sequence ``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``. >>> def upper(s): ... return s.upper() - >>> list(map(upper, ['sentence', 'fragment'])) ['SENTENCE', 'FRAGMENT'] >>> [upper(s) for s in ['sentence', 'fragment']] @@ -638,11 +644,11 @@ You can of course achieve the same effect with a list comprehension. -``filter(predicate, iter)`` returns an iterator over all the sequence elements -that meet a certain condition, and is similarly duplicated by list -comprehensions. A **predicate** is a function that returns the truth value of -some condition; for use with :func:`filter`, the predicate must take a single -value. +:func:`filter(predicate, iter) ` returns an iterator over all the +sequence elements that meet a certain condition, and is similarly duplicated by +list comprehensions. A **predicate** is a function that returns the truth +value of some condition; for use with :func:`filter`, the predicate must take a +single value. >>> def is_even(x): ... return (x % 2) == 0 @@ -657,8 +663,8 @@ [0, 2, 4, 6, 8] -``enumerate(iter)`` counts off the elements in the iterable, returning 2-tuples -containing the count and each element. :: +:func:`enumerate(iter) ` counts off the elements in the iterable, +returning 2-tuples containing the count and each element. :: >>> for item in enumerate(['subject', 'verb', 'object']): ... print(item) @@ -674,10 +680,10 @@ if line.strip() == '': print('Blank line at line #%i' % i) -``sorted(iterable, [key=None], [reverse=False])`` collects all the elements of -the iterable into a list, sorts the list, and returns the sorted result. The -``key``, and ``reverse`` arguments are passed through to the constructed list's -``.sort()`` method. :: +:func:`sorted(iterable, key=None, reverse=False) ` collects all the +elements of the iterable into a list, sorts the list, and returns the sorted +result. The *key*, and *reverse* arguments are passed through to the +constructed list's :meth:`~list.sort` method. :: >>> import random >>> # Generate 8 random numbers between [0, 10000) @@ -689,14 +695,13 @@ >>> sorted(rand_list, reverse=True) [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] -(For a more detailed discussion of sorting, see the Sorting mini-HOWTO in the -Python wiki at http://wiki.python.org/moin/HowTo/Sorting.) +(For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -The ``any(iter)`` and ``all(iter)`` built-ins look at the truth values of an -iterable's contents. :func:`any` returns True if any element in the iterable is -a true value, and :func:`all` returns True if all of the elements are true -values: +The :func:`any(iter) ` and :func:`all(iter) ` built-ins look at the +truth values of an iterable's contents. :func:`any` returns True if any element +in the iterable is a true value, and :func:`all` returns True if all of the +elements are true values: >>> any([0,1,0]) True @@ -712,7 +717,7 @@ True -``zip(iterA, iterB, ...)`` takes one element from each iterable and +:func:`zip(iterA, iterB, ...) ` takes one element from each iterable and returns them in a tuple:: zip(['a', 'b', 'c'], (1, 2, 3)) => @@ -752,42 +757,44 @@ Creating new iterators ---------------------- -``itertools.count(n)`` returns an infinite stream of integers, increasing by 1 -each time. You can optionally supply the starting number, which defaults to 0:: +:func:`itertools.count(n) ` returns an infinite stream of +integers, increasing by 1 each time. You can optionally supply the starting +number, which defaults to 0:: itertools.count() => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... itertools.count(10) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... -``itertools.cycle(iter)`` saves a copy of the contents of a provided iterable -and returns a new iterator that returns its elements from first to last. The -new iterator will repeat these elements infinitely. :: +:func:`itertools.cycle(iter) ` saves a copy of the contents of +a provided iterable and returns a new iterator that returns its elements from +first to last. The new iterator will repeat these elements infinitely. :: itertools.cycle([1,2,3,4,5]) => 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, ... -``itertools.repeat(elem, [n])`` returns the provided element ``n`` times, or -returns the element endlessly if ``n`` is not provided. :: +:func:`itertools.repeat(elem, [n]) ` returns the provided +element *n* times, or returns the element endlessly if *n* is not provided. :: itertools.repeat('abc') => abc, abc, abc, abc, abc, abc, abc, abc, abc, abc, ... itertools.repeat('abc', 5) => abc, abc, abc, abc, abc -``itertools.chain(iterA, iterB, ...)`` takes an arbitrary number of iterables as -input, and returns all the elements of the first iterator, then all the elements -of the second, and so on, until all of the iterables have been exhausted. :: +:func:`itertools.chain(iterA, iterB, ...) ` takes an arbitrary +number of iterables as input, and returns all the elements of the first +iterator, then all the elements of the second, and so on, until all of the +iterables have been exhausted. :: itertools.chain(['a', 'b', 'c'], (1, 2, 3)) => a, b, c, 1, 2, 3 -``itertools.islice(iter, [start], stop, [step])`` returns a stream that's a -slice of the iterator. With a single ``stop`` argument, it will return the -first ``stop`` elements. If you supply a starting index, you'll get -``stop-start`` elements, and if you supply a value for ``step``, elements will -be skipped accordingly. Unlike Python's string and list slicing, you can't use -negative values for ``start``, ``stop``, or ``step``. :: +:func:`itertools.islice(iter, [start], stop, [step]) ` returns +a stream that's a slice of the iterator. With a single *stop* argument, it +will return the first *stop* elements. If you supply a starting index, you'll +get *stop-start* elements, and if you supply a value for *step*, elements +will be skipped accordingly. Unlike Python's string and list slicing, you can't +use negative values for *start*, *stop*, or *step*. :: itertools.islice(range(10), 8) => 0, 1, 2, 3, 4, 5, 6, 7 @@ -796,9 +803,10 @@ itertools.islice(range(10), 2, 8, 2) => 2, 4, 6 -``itertools.tee(iter, [n])`` replicates an iterator; it returns ``n`` -independent iterators that will all return the contents of the source iterator. -If you don't supply a value for ``n``, the default is 2. Replicating iterators +:func:`itertools.tee(iter, [n]) ` replicates an iterator; it +returns *n* independent iterators that will all return the contents of the +source iterator. +If you don't supply a value for *n*, the default is 2. Replicating iterators requires saving some of the contents of the source iterator, so this can consume significant memory if the iterator is large and one of the new iterators is consumed more than the others. :: @@ -816,19 +824,21 @@ Calling functions on elements ----------------------------- -The ``operator`` module contains a set of functions corresponding to Python's -operators. Some examples are ``operator.add(a, b)`` (adds two values), -``operator.ne(a, b)`` (same as ``a!=b``), and ``operator.attrgetter('id')`` -(returns a callable that fetches the ``"id"`` attribute). +The :mod:`operator` module contains a set of functions corresponding to Python's +operators. Some examples are :func:`operator.add(a, b) ` (adds +two values), :func:`operator.ne(a, b) ` (same as ``a != b``), and +:func:`operator.attrgetter('id') ` +(returns a callable that fetches the ``.id`` attribute). -``itertools.starmap(func, iter)`` assumes that the iterable will return a stream -of tuples, and calls ``f()`` using these tuples as the arguments:: +:func:`itertools.starmap(func, iter) ` assumes that the +iterable will return a stream of tuples, and calls *func* using these tuples as +the arguments:: itertools.starmap(os.path.join, - [('/usr', 'bin', 'java'), ('/bin', 'python'), - ('/usr', 'bin', 'perl'),('/usr', 'bin', 'ruby')]) + [('/bin', 'python'), ('/usr', 'bin', 'java'), + ('/usr', 'bin', 'perl'), ('/usr', 'bin', 'ruby')]) => - /usr/bin/java, /bin/python, /usr/bin/perl, /usr/bin/ruby + /bin/python, /usr/bin/java, /usr/bin/perl, /usr/bin/ruby Selecting elements @@ -837,20 +847,18 @@ Another group of functions chooses a subset of an iterator's elements based on a predicate. -``itertools.filterfalse(predicate, iter)`` is the opposite, returning all -elements for which the predicate returns false:: +:func:`itertools.filterfalse(predicate, iter) ` is the +opposite, returning all elements for which the predicate returns false:: itertools.filterfalse(is_even, itertools.count()) => 1, 3, 5, 7, 9, 11, 13, 15, ... -``itertools.takewhile(predicate, iter)`` returns elements for as long as the -predicate returns true. Once the predicate returns false, the iterator will -signal the end of its results. - -:: +:func:`itertools.takewhile(predicate, iter) ` returns +elements for as long as the predicate returns true. Once the predicate returns +false, the iterator will signal the end of its results. :: def less_than_10(x): - return (x < 10) + return x < 10 itertools.takewhile(less_than_10, itertools.count()) => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 @@ -858,10 +866,9 @@ itertools.takewhile(is_even, itertools.count()) => 0 -``itertools.dropwhile(predicate, iter)`` discards elements while the predicate -returns true, and then returns the rest of the iterable's results. - -:: +:func:`itertools.dropwhile(predicate, iter) ` discards +elements while the predicate returns true, and then returns the rest of the +iterable's results. :: itertools.dropwhile(less_than_10, itertools.count()) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... @@ -873,14 +880,14 @@ Grouping elements ----------------- -The last function I'll discuss, ``itertools.groupby(iter, key_func=None)``, is -the most complicated. ``key_func(elem)`` is a function that can compute a key -value for each element returned by the iterable. If you don't supply a key -function, the key is simply each element itself. +The last function I'll discuss, :func:`itertools.groupby(iter, key_func=None) +`, is the most complicated. ``key_func(elem)`` is a function +that can compute a key value for each element returned by the iterable. If you +don't supply a key function, the key is simply each element itself. -``groupby()`` collects all the consecutive elements from the underlying iterable -that have the same key value, and returns a stream of 2-tuples containing a key -value and an iterator for the elements with that key. +:func:`~itertools.groupby` collects all the consecutive elements from the +underlying iterable that have the same key value, and returns a stream of +2-tuples containing a key value and an iterator for the elements with that key. :: @@ -890,7 +897,7 @@ ... ] - def get_state (city_state): + def get_state(city_state): return city_state[1] itertools.groupby(city_list, get_state) => @@ -906,9 +913,9 @@ iterator-3 => ('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ') -``groupby()`` assumes that the underlying iterable's contents will already be -sorted based on the key. Note that the returned iterators also use the -underlying iterable, so you have to consume the results of iterator-1 before +:func:`~itertools.groupby` assumes that the underlying iterable's contents will +already be sorted based on the key. Note that the returned iterators also use +the underlying iterable, so you have to consume the results of iterator-1 before requesting iterator-2 and its corresponding key. @@ -926,33 +933,34 @@ ``g(b, c)`` that's equivalent to ``f(1, b, c)``; you're filling in a value for one of ``f()``'s parameters. This is called "partial function application". -The constructor for ``partial`` takes the arguments ``(function, arg1, arg2, -... kwarg1=value1, kwarg2=value2)``. The resulting object is callable, so you -can just call it to invoke ``function`` with the filled-in arguments. +The constructor for :func:`~functools.partial` takes the arguments +``(function, arg1, arg2, ..., kwarg1=value1, kwarg2=value2)``. The resulting +object is callable, so you can just call it to invoke ``function`` with the +filled-in arguments. Here's a small but realistic example:: import functools - def log (message, subsystem): - "Write the contents of 'message' to the specified subsystem." + def log(message, subsystem): + """Write the contents of 'message' to the specified subsystem.""" print('%s: %s' % (subsystem, message)) ... server_log = functools.partial(log, subsystem='server') server_log('Unable to open socket') -``functools.reduce(func, iter, [initial_value])`` cumulatively performs an -operation on all the iterable's elements and, therefore, can't be applied to -infinite iterables. (Note it is not in :mod:`builtins`, but in the -:mod:`functools` module.) ``func`` must be a function that takes two elements -and returns a single value. :func:`functools.reduce` takes the first two -elements A and B returned by the iterator and calculates ``func(A, B)``. It -then requests the third element, C, calculates ``func(func(A, B), C)``, combines -this result with the fourth element returned, and continues until the iterable -is exhausted. If the iterable returns no values at all, a :exc:`TypeError` -exception is raised. If the initial value is supplied, it's used as a starting -point and ``func(initial_value, A)`` is the first calculation. :: +:func:`functools.reduce(func, iter, [initial_value]) ` +cumulatively performs an operation on all the iterable's elements and, +therefore, can't be applied to infinite iterables. *func* must be a function +that takes two elements and returns a single value. :func:`functools.reduce` +takes the first two elements A and B returned by the iterator and calculates +``func(A, B)``. It then requests the third element, C, calculates +``func(func(A, B), C)``, combines this result with the fourth element returned, +and continues until the iterable is exhausted. If the iterable returns no +values at all, a :exc:`TypeError` exception is raised. If the initial value is +supplied, it's used as a starting point and ``func(initial_value, A)`` is the +first calculation. :: >>> import operator, functools >>> functools.reduce(operator.concat, ['A', 'BB', 'C']) @@ -978,8 +986,8 @@ >>> sum([]) 0 -For many uses of :func:`functools.reduce`, though, it can be clearer to just write the -obvious :keyword:`for` loop:: +For many uses of :func:`functools.reduce`, though, it can be clearer to just +write the obvious :keyword:`for` loop:: import functools # Instead of: @@ -1023,28 +1031,23 @@ existing_files = filter(os.path.exists, file_list) If the function you need doesn't exist, you need to write it. One way to write -small functions is to use the ``lambda`` statement. ``lambda`` takes a number -of parameters and an expression combining these parameters, and creates a small -function that returns the value of the expression:: +small functions is to use the :keyword:`lambda` statement. ``lambda`` takes a +number of parameters and an expression combining these parameters, and creates +an anonymous function that returns the value of the expression:: - lowercase = lambda x: x.lower() + adder = lambda x, y: x+y print_assign = lambda name, value: name + '=' + str(value) - adder = lambda x, y: x+y - An alternative is to just use the ``def`` statement and define a function in the usual way:: - def lowercase(x): - return x.lower() + def adder(x, y): + return x + y def print_assign(name, value): return name + '=' + str(value) - def adder(x,y): - return x + y - Which alternative is preferable? That's a style question; my usual course is to avoid using ``lambda``. @@ -1053,9 +1056,7 @@ expression, which means you can't have multiway ``if... elif... else`` comparisons or ``try... except`` statements. If you try to do too much in a ``lambda`` statement, you'll end up with an overly complicated expression that's -hard to read. Quick, what's the following code doing? - -:: +hard to read. Quick, what's the following code doing? :: import functools total = functools.reduce(lambda a, b: (0, a[1] + b[1]), items)[1] @@ -1065,7 +1066,7 @@ little bit better:: import functools - def combine (a, b): + def combine(a, b): return 0, a[1] + b[1] total = functools.reduce(combine, items)[1] @@ -1085,12 +1086,12 @@ Fredrik Lundh once suggested the following set of rules for refactoring uses of ``lambda``: -1) Write a lambda function. -2) Write a comment explaining what the heck that lambda does. -3) Study the comment for a while, and think of a name that captures the essence +1. Write a lambda function. +2. Write a comment explaining what the heck that lambda does. +3. Study the comment for a while, and think of a name that captures the essence of the comment. -4) Convert the lambda to a def statement, using that name. -5) Remove the comment. +4. Convert the lambda to a def statement, using that name. +5. Remove the comment. I really like these rules, but you're free to disagree about whether this lambda-free style is better. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:30:49 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:30:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_functional_howto_improvements_with_3=2E3=2E?= Message-ID: <3XdQLK6vbrzR3D@mail.python.org> http://hg.python.org/cpython/rev/89b04a96e163 changeset: 79685:89b04a96e163 parent: 79682:336afc64c1dc parent: 79684:17ab7343ef4e user: Ezio Melotti date: Fri Oct 12 13:23:52 2012 +0300 summary: Merge functional howto improvements with 3.3. files: Doc/howto/functional.rst | 311 +++++++++++++------------- 1 files changed, 156 insertions(+), 155 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -181,18 +181,18 @@ An iterator is an object representing a stream of data; this object returns the data one element at a time. A Python iterator must support a method called -``__next__()`` that takes no arguments and always returns the next element of -the stream. If there are no more elements in the stream, ``__next__()`` must -raise the ``StopIteration`` exception. Iterators don't have to be finite, -though; it's perfectly reasonable to write an iterator that produces an infinite -stream of data. +:meth:`~iterator.__next__` that takes no arguments and always returns the next +element of the stream. If there are no more elements in the stream, +:meth:`~iterator.__next__` must raise the :exc:`StopIteration` exception. +Iterators don't have to be finite, though; it's perfectly reasonable to write +an iterator that produces an infinite stream of data. The built-in :func:`iter` function takes an arbitrary object and tries to return an iterator that will return the object's contents or elements, raising :exc:`TypeError` if the object doesn't support iteration. Several of Python's built-in data types support iteration, the most common being lists and -dictionaries. An object is called an **iterable** object if you can get an -iterator for it. +dictionaries. An object is called :term:`iterable` if you can get an iterator +for it. You can experiment with the iteration interface manually: @@ -200,7 +200,7 @@ >>> it = iter(L) >>> it <...iterator object at ...> - >>> it.__next__() + >>> it.__next__() # same as next(it) 1 >>> next(it) 2 @@ -213,9 +213,9 @@ >>> Python expects iterable objects in several different contexts, the most -important being the ``for`` statement. In the statement ``for X in Y``, Y must -be an iterator or some object for which ``iter()`` can create an iterator. -These two statements are equivalent:: +important being the :keyword:`for` statement. In the statement ``for X in Y``, +Y must be an iterator or some object for which :func:`iter` can create an +iterator. These two statements are equivalent:: for i in iter(obj): @@ -246,16 +246,16 @@ iterator argument and will return the largest or smallest element. The ``"in"`` and ``"not in"`` operators also support iterators: ``X in iterator`` is true if X is found in the stream returned by the iterator. You'll run into obvious -problems if the iterator is infinite; ``max()``, ``min()`` +problems if the iterator is infinite; :func:`max`, :func:`min` will never return, and if the element X never appears in the stream, the ``"in"`` and ``"not in"`` operators won't return either. Note that you can only go forward in an iterator; there's no way to get the previous element, reset the iterator, or make a copy of it. Iterator objects can optionally provide these additional capabilities, but the iterator protocol -only specifies the ``next()`` method. Functions may therefore consume all of -the iterator's output, and if you need to do something different with the same -stream, you'll have to create a new iterator. +only specifies the :meth:`~iterator.__next__` method. Functions may therefore +consume all of the iterator's output, and if you need to do something different +with the same stream, you'll have to create a new iterator. @@ -296,7 +296,8 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`values` or :meth:`items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate +iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: @@ -305,9 +306,9 @@ >>> dict(iter(L)) {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} -Files also support iteration by calling the ``readline()`` method until there -are no more lines in the file. This means you can read each line of a file like -this:: +Files also support iteration by calling the :meth:`~io.TextIOBase.readline` +method until there are no more lines in the file. This means you can read each +line of a file like this:: for line in file: # do something for each line @@ -415,7 +416,7 @@ >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x,y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -425,9 +426,9 @@ comprehension below is a syntax error, while the second one is correct:: # Syntax error - [ x,y for x in seq1 for y in seq2] + [x, y for x in seq1 for y in seq2] # Correct - [ (x,y) for x in seq1 for y in seq2] + [(x, y) for x in seq1 for y in seq2] Generators @@ -454,9 +455,9 @@ for i in range(N): yield i -Any function containing a ``yield`` keyword is a generator function; this is -detected by Python's :term:`bytecode` compiler which compiles the function -specially as a result. +Any function containing a :keyword:`yield` keyword is a generator function; +this is detected by Python's :term:`bytecode` compiler which compiles the +function specially as a result. When you call a generator function, it doesn't return a single value; instead it returns a generator object that supports the iterator protocol. On executing @@ -464,7 +465,8 @@ ``return`` statement. The big difference between ``yield`` and a ``return`` statement is that on reaching a ``yield`` the generator's state of execution is suspended and local variables are preserved. On the next call to the -generator's ``.__next__()`` method, the function will resume executing. +generator's :meth:`~generator.__next__` method, the function will resume +executing. Here's a sample usage of the ``generate_ints()`` generator: @@ -491,17 +493,19 @@ ``return`` the generator cannot return any further values. ``return`` with a value, such as ``return 5``, is a syntax error inside a generator function. The end of the generator's results can also be indicated by raising -``StopIteration`` manually, or by just letting the flow of execution fall off +:exc:`StopIteration` manually, or by just letting the flow of execution fall off the bottom of the function. You could achieve the effect of generators manually by writing your own class and storing all the local variables of the generator as instance variables. For example, returning a list of integers could be done by setting ``self.count`` to -0, and having the ``__next__()`` method increment ``self.count`` and return it. +0, and having the :meth:`~iterator.__next__` method increment ``self.count`` and +return it. However, for a moderately complicated generator, writing a corresponding class can be much messier. -The test suite included with Python's library, ``test_generators.py``, contains +The test suite included with Python's library, +:source:`Lib/test/test_generators.py`, contains a number of more interesting examples. Here's one generator that implements an in-order traversal of a tree using generators recursively. :: @@ -544,23 +548,23 @@ The parentheses aren't always necessary, but it's easier to always add them instead of having to remember when they're needed. -(PEP 342 explains the exact rules, which are that a ``yield``-expression must +(:pep:`342` explains the exact rules, which are that a ``yield``-expression must always be parenthesized except when it occurs at the top-level expression on the right-hand side of an assignment. This means you can write ``val = yield i`` but have to use parentheses when there's an operation, as in ``val = (yield i) + 12``.) -Values are sent into a generator by calling its ``send(value)`` method. This -method resumes the generator's code and the ``yield`` expression returns the -specified value. If the regular ``__next__()`` method is called, the ``yield`` -returns ``None``. +Values are sent into a generator by calling its :meth:`send(value) +` method. This method resumes the generator's code and the +``yield`` expression returns the specified value. If the regular +:meth:`~generator.__next__` method is called, the ``yield`` returns ``None``. Here's a simple counter that increments by 1 and allows changing the value of the internal counter. .. testcode:: - def counter (maximum): + def counter(maximum): i = 0 while i < maximum: val = (yield i) @@ -589,20 +593,23 @@ Because ``yield`` will often be returning ``None``, you should always check for this case. Don't just use its value in expressions unless you're sure that the -``send()`` method will be the only method used resume your generator function. +:meth:`~generator.send` method will be the only method used resume your +generator function. -In addition to ``send()``, there are two other new methods on generators: +In addition to :meth:`~generator.send`, there are two other methods on +generators: -* ``throw(type, value=None, traceback=None)`` is used to raise an exception - inside the generator; the exception is raised by the ``yield`` expression - where the generator's execution is paused. +* :meth:`throw(type, value=None, traceback=None) ` is used to + raise an exception inside the generator; the exception is raised by the + ``yield`` expression where the generator's execution is paused. -* ``close()`` raises a :exc:`GeneratorExit` exception inside the generator to - terminate the iteration. On receiving this exception, the generator's code - must either raise :exc:`GeneratorExit` or :exc:`StopIteration`; catching the - exception and doing anything else is illegal and will trigger a - :exc:`RuntimeError`. ``close()`` will also be called by Python's garbage - collector when the generator is garbage-collected. +* :meth:`~generator.close` raises a :exc:`GeneratorExit` exception inside the + generator to terminate the iteration. On receiving this exception, the + generator's code must either raise :exc:`GeneratorExit` or + :exc:`StopIteration`; catching the exception and doing anything else is + illegal and will trigger a :exc:`RuntimeError`. :meth:`~generator.close` + will also be called by Python's garbage collector when the generator is + garbage-collected. If you need to run cleanup code when a :exc:`GeneratorExit` occurs, I suggest using a ``try: ... finally:`` suite instead of catching :exc:`GeneratorExit`. @@ -624,13 +631,12 @@ Two of Python's built-in functions, :func:`map` and :func:`filter` duplicate the features of generator expressions: -``map(f, iterA, iterB, ...)`` returns an iterator over the sequence +:func:`map(f, iterA, iterB, ...) ` returns an iterator over the sequence ``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``. >>> def upper(s): ... return s.upper() - >>> list(map(upper, ['sentence', 'fragment'])) ['SENTENCE', 'FRAGMENT'] >>> [upper(s) for s in ['sentence', 'fragment']] @@ -638,11 +644,11 @@ You can of course achieve the same effect with a list comprehension. -``filter(predicate, iter)`` returns an iterator over all the sequence elements -that meet a certain condition, and is similarly duplicated by list -comprehensions. A **predicate** is a function that returns the truth value of -some condition; for use with :func:`filter`, the predicate must take a single -value. +:func:`filter(predicate, iter) ` returns an iterator over all the +sequence elements that meet a certain condition, and is similarly duplicated by +list comprehensions. A **predicate** is a function that returns the truth +value of some condition; for use with :func:`filter`, the predicate must take a +single value. >>> def is_even(x): ... return (x % 2) == 0 @@ -657,8 +663,8 @@ [0, 2, 4, 6, 8] -``enumerate(iter)`` counts off the elements in the iterable, returning 2-tuples -containing the count and each element. :: +:func:`enumerate(iter) ` counts off the elements in the iterable, +returning 2-tuples containing the count and each element. :: >>> for item in enumerate(['subject', 'verb', 'object']): ... print(item) @@ -674,10 +680,10 @@ if line.strip() == '': print('Blank line at line #%i' % i) -``sorted(iterable, [key=None], [reverse=False])`` collects all the elements of -the iterable into a list, sorts the list, and returns the sorted result. The -``key``, and ``reverse`` arguments are passed through to the constructed list's -``.sort()`` method. :: +:func:`sorted(iterable, key=None, reverse=False) ` collects all the +elements of the iterable into a list, sorts the list, and returns the sorted +result. The *key*, and *reverse* arguments are passed through to the +constructed list's :meth:`~list.sort` method. :: >>> import random >>> # Generate 8 random numbers between [0, 10000) @@ -689,14 +695,13 @@ >>> sorted(rand_list, reverse=True) [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] -(For a more detailed discussion of sorting, see the Sorting mini-HOWTO in the -Python wiki at http://wiki.python.org/moin/HowTo/Sorting.) +(For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -The ``any(iter)`` and ``all(iter)`` built-ins look at the truth values of an -iterable's contents. :func:`any` returns True if any element in the iterable is -a true value, and :func:`all` returns True if all of the elements are true -values: +The :func:`any(iter) ` and :func:`all(iter) ` built-ins look at the +truth values of an iterable's contents. :func:`any` returns True if any element +in the iterable is a true value, and :func:`all` returns True if all of the +elements are true values: >>> any([0,1,0]) True @@ -712,7 +717,7 @@ True -``zip(iterA, iterB, ...)`` takes one element from each iterable and +:func:`zip(iterA, iterB, ...) ` takes one element from each iterable and returns them in a tuple:: zip(['a', 'b', 'c'], (1, 2, 3)) => @@ -752,42 +757,44 @@ Creating new iterators ---------------------- -``itertools.count(n)`` returns an infinite stream of integers, increasing by 1 -each time. You can optionally supply the starting number, which defaults to 0:: +:func:`itertools.count(n) ` returns an infinite stream of +integers, increasing by 1 each time. You can optionally supply the starting +number, which defaults to 0:: itertools.count() => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... itertools.count(10) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... -``itertools.cycle(iter)`` saves a copy of the contents of a provided iterable -and returns a new iterator that returns its elements from first to last. The -new iterator will repeat these elements infinitely. :: +:func:`itertools.cycle(iter) ` saves a copy of the contents of +a provided iterable and returns a new iterator that returns its elements from +first to last. The new iterator will repeat these elements infinitely. :: itertools.cycle([1,2,3,4,5]) => 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, ... -``itertools.repeat(elem, [n])`` returns the provided element ``n`` times, or -returns the element endlessly if ``n`` is not provided. :: +:func:`itertools.repeat(elem, [n]) ` returns the provided +element *n* times, or returns the element endlessly if *n* is not provided. :: itertools.repeat('abc') => abc, abc, abc, abc, abc, abc, abc, abc, abc, abc, ... itertools.repeat('abc', 5) => abc, abc, abc, abc, abc -``itertools.chain(iterA, iterB, ...)`` takes an arbitrary number of iterables as -input, and returns all the elements of the first iterator, then all the elements -of the second, and so on, until all of the iterables have been exhausted. :: +:func:`itertools.chain(iterA, iterB, ...) ` takes an arbitrary +number of iterables as input, and returns all the elements of the first +iterator, then all the elements of the second, and so on, until all of the +iterables have been exhausted. :: itertools.chain(['a', 'b', 'c'], (1, 2, 3)) => a, b, c, 1, 2, 3 -``itertools.islice(iter, [start], stop, [step])`` returns a stream that's a -slice of the iterator. With a single ``stop`` argument, it will return the -first ``stop`` elements. If you supply a starting index, you'll get -``stop-start`` elements, and if you supply a value for ``step``, elements will -be skipped accordingly. Unlike Python's string and list slicing, you can't use -negative values for ``start``, ``stop``, or ``step``. :: +:func:`itertools.islice(iter, [start], stop, [step]) ` returns +a stream that's a slice of the iterator. With a single *stop* argument, it +will return the first *stop* elements. If you supply a starting index, you'll +get *stop-start* elements, and if you supply a value for *step*, elements +will be skipped accordingly. Unlike Python's string and list slicing, you can't +use negative values for *start*, *stop*, or *step*. :: itertools.islice(range(10), 8) => 0, 1, 2, 3, 4, 5, 6, 7 @@ -796,9 +803,10 @@ itertools.islice(range(10), 2, 8, 2) => 2, 4, 6 -``itertools.tee(iter, [n])`` replicates an iterator; it returns ``n`` -independent iterators that will all return the contents of the source iterator. -If you don't supply a value for ``n``, the default is 2. Replicating iterators +:func:`itertools.tee(iter, [n]) ` replicates an iterator; it +returns *n* independent iterators that will all return the contents of the +source iterator. +If you don't supply a value for *n*, the default is 2. Replicating iterators requires saving some of the contents of the source iterator, so this can consume significant memory if the iterator is large and one of the new iterators is consumed more than the others. :: @@ -816,19 +824,21 @@ Calling functions on elements ----------------------------- -The ``operator`` module contains a set of functions corresponding to Python's -operators. Some examples are ``operator.add(a, b)`` (adds two values), -``operator.ne(a, b)`` (same as ``a!=b``), and ``operator.attrgetter('id')`` -(returns a callable that fetches the ``"id"`` attribute). +The :mod:`operator` module contains a set of functions corresponding to Python's +operators. Some examples are :func:`operator.add(a, b) ` (adds +two values), :func:`operator.ne(a, b) ` (same as ``a != b``), and +:func:`operator.attrgetter('id') ` +(returns a callable that fetches the ``.id`` attribute). -``itertools.starmap(func, iter)`` assumes that the iterable will return a stream -of tuples, and calls ``f()`` using these tuples as the arguments:: +:func:`itertools.starmap(func, iter) ` assumes that the +iterable will return a stream of tuples, and calls *func* using these tuples as +the arguments:: itertools.starmap(os.path.join, - [('/usr', 'bin', 'java'), ('/bin', 'python'), - ('/usr', 'bin', 'perl'),('/usr', 'bin', 'ruby')]) + [('/bin', 'python'), ('/usr', 'bin', 'java'), + ('/usr', 'bin', 'perl'), ('/usr', 'bin', 'ruby')]) => - /usr/bin/java, /bin/python, /usr/bin/perl, /usr/bin/ruby + /bin/python, /usr/bin/java, /usr/bin/perl, /usr/bin/ruby Selecting elements @@ -837,20 +847,18 @@ Another group of functions chooses a subset of an iterator's elements based on a predicate. -``itertools.filterfalse(predicate, iter)`` is the opposite, returning all -elements for which the predicate returns false:: +:func:`itertools.filterfalse(predicate, iter) ` is the +opposite, returning all elements for which the predicate returns false:: itertools.filterfalse(is_even, itertools.count()) => 1, 3, 5, 7, 9, 11, 13, 15, ... -``itertools.takewhile(predicate, iter)`` returns elements for as long as the -predicate returns true. Once the predicate returns false, the iterator will -signal the end of its results. - -:: +:func:`itertools.takewhile(predicate, iter) ` returns +elements for as long as the predicate returns true. Once the predicate returns +false, the iterator will signal the end of its results. :: def less_than_10(x): - return (x < 10) + return x < 10 itertools.takewhile(less_than_10, itertools.count()) => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 @@ -858,10 +866,9 @@ itertools.takewhile(is_even, itertools.count()) => 0 -``itertools.dropwhile(predicate, iter)`` discards elements while the predicate -returns true, and then returns the rest of the iterable's results. - -:: +:func:`itertools.dropwhile(predicate, iter) ` discards +elements while the predicate returns true, and then returns the rest of the +iterable's results. :: itertools.dropwhile(less_than_10, itertools.count()) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... @@ -873,14 +880,14 @@ Grouping elements ----------------- -The last function I'll discuss, ``itertools.groupby(iter, key_func=None)``, is -the most complicated. ``key_func(elem)`` is a function that can compute a key -value for each element returned by the iterable. If you don't supply a key -function, the key is simply each element itself. +The last function I'll discuss, :func:`itertools.groupby(iter, key_func=None) +`, is the most complicated. ``key_func(elem)`` is a function +that can compute a key value for each element returned by the iterable. If you +don't supply a key function, the key is simply each element itself. -``groupby()`` collects all the consecutive elements from the underlying iterable -that have the same key value, and returns a stream of 2-tuples containing a key -value and an iterator for the elements with that key. +:func:`~itertools.groupby` collects all the consecutive elements from the +underlying iterable that have the same key value, and returns a stream of +2-tuples containing a key value and an iterator for the elements with that key. :: @@ -890,7 +897,7 @@ ... ] - def get_state (city_state): + def get_state(city_state): return city_state[1] itertools.groupby(city_list, get_state) => @@ -906,9 +913,9 @@ iterator-3 => ('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ') -``groupby()`` assumes that the underlying iterable's contents will already be -sorted based on the key. Note that the returned iterators also use the -underlying iterable, so you have to consume the results of iterator-1 before +:func:`~itertools.groupby` assumes that the underlying iterable's contents will +already be sorted based on the key. Note that the returned iterators also use +the underlying iterable, so you have to consume the results of iterator-1 before requesting iterator-2 and its corresponding key. @@ -926,33 +933,34 @@ ``g(b, c)`` that's equivalent to ``f(1, b, c)``; you're filling in a value for one of ``f()``'s parameters. This is called "partial function application". -The constructor for ``partial`` takes the arguments ``(function, arg1, arg2, -... kwarg1=value1, kwarg2=value2)``. The resulting object is callable, so you -can just call it to invoke ``function`` with the filled-in arguments. +The constructor for :func:`~functools.partial` takes the arguments +``(function, arg1, arg2, ..., kwarg1=value1, kwarg2=value2)``. The resulting +object is callable, so you can just call it to invoke ``function`` with the +filled-in arguments. Here's a small but realistic example:: import functools - def log (message, subsystem): - "Write the contents of 'message' to the specified subsystem." + def log(message, subsystem): + """Write the contents of 'message' to the specified subsystem.""" print('%s: %s' % (subsystem, message)) ... server_log = functools.partial(log, subsystem='server') server_log('Unable to open socket') -``functools.reduce(func, iter, [initial_value])`` cumulatively performs an -operation on all the iterable's elements and, therefore, can't be applied to -infinite iterables. (Note it is not in :mod:`builtins`, but in the -:mod:`functools` module.) ``func`` must be a function that takes two elements -and returns a single value. :func:`functools.reduce` takes the first two -elements A and B returned by the iterator and calculates ``func(A, B)``. It -then requests the third element, C, calculates ``func(func(A, B), C)``, combines -this result with the fourth element returned, and continues until the iterable -is exhausted. If the iterable returns no values at all, a :exc:`TypeError` -exception is raised. If the initial value is supplied, it's used as a starting -point and ``func(initial_value, A)`` is the first calculation. :: +:func:`functools.reduce(func, iter, [initial_value]) ` +cumulatively performs an operation on all the iterable's elements and, +therefore, can't be applied to infinite iterables. *func* must be a function +that takes two elements and returns a single value. :func:`functools.reduce` +takes the first two elements A and B returned by the iterator and calculates +``func(A, B)``. It then requests the third element, C, calculates +``func(func(A, B), C)``, combines this result with the fourth element returned, +and continues until the iterable is exhausted. If the iterable returns no +values at all, a :exc:`TypeError` exception is raised. If the initial value is +supplied, it's used as a starting point and ``func(initial_value, A)`` is the +first calculation. :: >>> import operator, functools >>> functools.reduce(operator.concat, ['A', 'BB', 'C']) @@ -978,8 +986,8 @@ >>> sum([]) 0 -For many uses of :func:`functools.reduce`, though, it can be clearer to just write the -obvious :keyword:`for` loop:: +For many uses of :func:`functools.reduce`, though, it can be clearer to just +write the obvious :keyword:`for` loop:: import functools # Instead of: @@ -1023,28 +1031,23 @@ existing_files = filter(os.path.exists, file_list) If the function you need doesn't exist, you need to write it. One way to write -small functions is to use the ``lambda`` statement. ``lambda`` takes a number -of parameters and an expression combining these parameters, and creates a small -function that returns the value of the expression:: +small functions is to use the :keyword:`lambda` statement. ``lambda`` takes a +number of parameters and an expression combining these parameters, and creates +an anonymous function that returns the value of the expression:: - lowercase = lambda x: x.lower() + adder = lambda x, y: x+y print_assign = lambda name, value: name + '=' + str(value) - adder = lambda x, y: x+y - An alternative is to just use the ``def`` statement and define a function in the usual way:: - def lowercase(x): - return x.lower() + def adder(x, y): + return x + y def print_assign(name, value): return name + '=' + str(value) - def adder(x,y): - return x + y - Which alternative is preferable? That's a style question; my usual course is to avoid using ``lambda``. @@ -1053,9 +1056,7 @@ expression, which means you can't have multiway ``if... elif... else`` comparisons or ``try... except`` statements. If you try to do too much in a ``lambda`` statement, you'll end up with an overly complicated expression that's -hard to read. Quick, what's the following code doing? - -:: +hard to read. Quick, what's the following code doing? :: import functools total = functools.reduce(lambda a, b: (0, a[1] + b[1]), items)[1] @@ -1065,7 +1066,7 @@ little bit better:: import functools - def combine (a, b): + def combine(a, b): return 0, a[1] + b[1] total = functools.reduce(combine, items)[1] @@ -1085,12 +1086,12 @@ Fredrik Lundh once suggested the following set of rules for refactoring uses of ``lambda``: -1) Write a lambda function. -2) Write a comment explaining what the heck that lambda does. -3) Study the comment for a while, and think of a name that captures the essence +1. Write a lambda function. +2. Write a comment explaining what the heck that lambda does. +3. Study the comment for a while, and think of a name that captures the essence of the comment. -4) Convert the lambda to a def statement, using that name. -5) Remove the comment. +4. Convert the lambda to a def statement, using that name. +5. Remove the comment. I really like these rules, but you're free to disagree about whether this lambda-free style is better. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:30:51 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:30:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Make_doctests_?= =?utf-8?q?pass_in_the_functional_howto=2E?= Message-ID: <3XdQLM22YVzQvw@mail.python.org> http://hg.python.org/cpython/rev/9b6e8d4b960e changeset: 79686:9b6e8d4b960e branch: 3.2 parent: 79683:1c589cacbb39 user: Ezio Melotti date: Fri Oct 12 13:24:19 2012 +0300 summary: Make doctests pass in the functional howto. files: Doc/howto/functional.rst | 43 +++++++++++---------------- 1 files changed, 17 insertions(+), 26 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -198,7 +198,7 @@ >>> L = [1,2,3] >>> it = iter(L) - >>> it + >>> it #doctest: +ELLIPSIS <...iterator object at ...> >>> it.__next__() # same as next(it) 1 @@ -267,15 +267,11 @@ iterator. Calling :func:`iter` on a dictionary returns an iterator that will loop over the -dictionary's keys: - -.. not a doctest since dict ordering varies across Pythons - -:: +dictionary's keys:: >>> m = {'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4, 'May': 5, 'Jun': 6, ... 'Jul': 7, 'Aug': 8, 'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12} - >>> for key in m: + >>> for key in m: #doctest: +SKIP ... print(key, m[key]) Mar 3 Feb 2 @@ -410,12 +406,9 @@ lengths of all the sequences. If you have two lists of length 3, the output list is 9 elements long: -.. doctest:: - :options: +NORMALIZE_WHITESPACE - >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x, y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] #doctest: +NORMALIZE_WHITESPACE [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -448,11 +441,9 @@ Here's the simplest example of a generator function: -.. testcode:: - - def generate_ints(N): - for i in range(N): - yield i + >>> def generate_ints(N): + ... for i in range(N): + ... yield i Any function containing a :keyword:`yield` keyword is a generator function; this is detected by Python's :term:`bytecode` compiler which compiles the @@ -470,7 +461,7 @@ Here's a sample usage of the ``generate_ints()`` generator: >>> gen = generate_ints(3) - >>> gen + >>> gen #doctest: +ELLIPSIS >>> next(gen) 0 @@ -575,16 +566,16 @@ And here's an example of changing the counter: - >>> it = counter(10) - >>> next(it) + >>> it = counter(10) #doctest: +SKIP + >>> next(it) #doctest: +SKIP 0 - >>> next(it) + >>> next(it) #doctest: +SKIP 1 - >>> it.send(8) + >>> it.send(8) #doctest: +SKIP 8 - >>> next(it) + >>> next(it) #doctest: +SKIP 9 - >>> next(it) + >>> next(it) #doctest: +SKIP Traceback (most recent call last): File "t.py", line 15, in ? it.next() @@ -687,11 +678,11 @@ >>> import random >>> # Generate 8 random numbers between [0, 10000) >>> rand_list = random.sample(range(10000), 8) - >>> rand_list + >>> rand_list #doctest: +SKIP [769, 7953, 9828, 6431, 8442, 9878, 6213, 2207] - >>> sorted(rand_list) + >>> sorted(rand_list) #doctest: +SKIP [769, 2207, 6213, 6431, 7953, 8442, 9828, 9878] - >>> sorted(rand_list, reverse=True) + >>> sorted(rand_list, reverse=True) #doctest: +SKIP [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] (For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:30:52 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:30:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_doctest_fixes_in_functional_howto_with_3=2E2=2E?= Message-ID: <3XdQLN5HBYzQxd@mail.python.org> http://hg.python.org/cpython/rev/9a89d99934f4 changeset: 79687:9a89d99934f4 branch: 3.3 parent: 79684:17ab7343ef4e parent: 79686:9b6e8d4b960e user: Ezio Melotti date: Fri Oct 12 13:25:54 2012 +0300 summary: Merge doctest fixes in functional howto with 3.2. files: Doc/howto/functional.rst | 45 +++++++++++---------------- 1 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -198,7 +198,7 @@ >>> L = [1,2,3] >>> it = iter(L) - >>> it + >>> it #doctest: +ELLIPSIS <...iterator object at ...> >>> it.__next__() # same as next(it) 1 @@ -267,15 +267,11 @@ iterator. Calling :func:`iter` on a dictionary returns an iterator that will loop over the -dictionary's keys: - -.. not a doctest since dict ordering varies across Pythons - -:: +dictionary's keys:: >>> m = {'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4, 'May': 5, 'Jun': 6, ... 'Jul': 7, 'Aug': 8, 'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12} - >>> for key in m: + >>> for key in m: #doctest: +SKIP ... print(key, m[key]) Mar 3 Feb 2 @@ -303,7 +299,7 @@ of ``(key, value)`` tuples: >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] - >>> dict(iter(L)) + >>> dict(iter(L)) #doctest: +SKIP {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} Files also support iteration by calling the :meth:`~io.TextIOBase.readline` @@ -411,12 +407,9 @@ lengths of all the sequences. If you have two lists of length 3, the output list is 9 elements long: -.. doctest:: - :options: +NORMALIZE_WHITESPACE - >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x, y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] #doctest: +NORMALIZE_WHITESPACE [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -449,11 +442,9 @@ Here's the simplest example of a generator function: -.. testcode:: - - def generate_ints(N): - for i in range(N): - yield i + >>> def generate_ints(N): + ... for i in range(N): + ... yield i Any function containing a :keyword:`yield` keyword is a generator function; this is detected by Python's :term:`bytecode` compiler which compiles the @@ -471,7 +462,7 @@ Here's a sample usage of the ``generate_ints()`` generator: >>> gen = generate_ints(3) - >>> gen + >>> gen #doctest: +ELLIPSIS >>> next(gen) 0 @@ -576,16 +567,16 @@ And here's an example of changing the counter: - >>> it = counter(10) - >>> next(it) + >>> it = counter(10) #doctest: +SKIP + >>> next(it) #doctest: +SKIP 0 - >>> next(it) + >>> next(it) #doctest: +SKIP 1 - >>> it.send(8) + >>> it.send(8) #doctest: +SKIP 8 - >>> next(it) + >>> next(it) #doctest: +SKIP 9 - >>> next(it) + >>> next(it) #doctest: +SKIP Traceback (most recent call last): File "t.py", line 15, in ? it.next() @@ -688,11 +679,11 @@ >>> import random >>> # Generate 8 random numbers between [0, 10000) >>> rand_list = random.sample(range(10000), 8) - >>> rand_list + >>> rand_list #doctest: +SKIP [769, 7953, 9828, 6431, 8442, 9878, 6213, 2207] - >>> sorted(rand_list) + >>> sorted(rand_list) #doctest: +SKIP [769, 2207, 6213, 6431, 7953, 8442, 9828, 9878] - >>> sorted(rand_list, reverse=True) + >>> sorted(rand_list, reverse=True) #doctest: +SKIP [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] (For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:30:54 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:30:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_doctest_fixes_in_functional_howto_with_3=2E3=2E?= Message-ID: <3XdQLQ0LxVzQyR@mail.python.org> http://hg.python.org/cpython/rev/3534acfa8e37 changeset: 79688:3534acfa8e37 parent: 79685:89b04a96e163 parent: 79687:9a89d99934f4 user: Ezio Melotti date: Fri Oct 12 13:30:25 2012 +0300 summary: Merge doctest fixes in functional howto with 3.3. files: Doc/howto/functional.rst | 45 +++++++++++---------------- 1 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -198,7 +198,7 @@ >>> L = [1,2,3] >>> it = iter(L) - >>> it + >>> it #doctest: +ELLIPSIS <...iterator object at ...> >>> it.__next__() # same as next(it) 1 @@ -267,15 +267,11 @@ iterator. Calling :func:`iter` on a dictionary returns an iterator that will loop over the -dictionary's keys: - -.. not a doctest since dict ordering varies across Pythons - -:: +dictionary's keys:: >>> m = {'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4, 'May': 5, 'Jun': 6, ... 'Jul': 7, 'Aug': 8, 'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12} - >>> for key in m: + >>> for key in m: #doctest: +SKIP ... print(key, m[key]) Mar 3 Feb 2 @@ -303,7 +299,7 @@ of ``(key, value)`` tuples: >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] - >>> dict(iter(L)) + >>> dict(iter(L)) #doctest: +SKIP {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} Files also support iteration by calling the :meth:`~io.TextIOBase.readline` @@ -411,12 +407,9 @@ lengths of all the sequences. If you have two lists of length 3, the output list is 9 elements long: -.. doctest:: - :options: +NORMALIZE_WHITESPACE - >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x, y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] #doctest: +NORMALIZE_WHITESPACE [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -449,11 +442,9 @@ Here's the simplest example of a generator function: -.. testcode:: - - def generate_ints(N): - for i in range(N): - yield i + >>> def generate_ints(N): + ... for i in range(N): + ... yield i Any function containing a :keyword:`yield` keyword is a generator function; this is detected by Python's :term:`bytecode` compiler which compiles the @@ -471,7 +462,7 @@ Here's a sample usage of the ``generate_ints()`` generator: >>> gen = generate_ints(3) - >>> gen + >>> gen #doctest: +ELLIPSIS >>> next(gen) 0 @@ -576,16 +567,16 @@ And here's an example of changing the counter: - >>> it = counter(10) - >>> next(it) + >>> it = counter(10) #doctest: +SKIP + >>> next(it) #doctest: +SKIP 0 - >>> next(it) + >>> next(it) #doctest: +SKIP 1 - >>> it.send(8) + >>> it.send(8) #doctest: +SKIP 8 - >>> next(it) + >>> next(it) #doctest: +SKIP 9 - >>> next(it) + >>> next(it) #doctest: +SKIP Traceback (most recent call last): File "t.py", line 15, in ? it.next() @@ -688,11 +679,11 @@ >>> import random >>> # Generate 8 random numbers between [0, 10000) >>> rand_list = random.sample(range(10000), 8) - >>> rand_list + >>> rand_list #doctest: +SKIP [769, 7953, 9828, 6431, 8442, 9878, 6213, 2207] - >>> sorted(rand_list) + >>> sorted(rand_list) #doctest: +SKIP [769, 2207, 6213, 6431, 7953, 8442, 9828, 9878] - >>> sorted(rand_list, reverse=True) + >>> sorted(rand_list, reverse=True) #doctest: +SKIP [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] (For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:46:50 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:46:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_links_to_t?= =?utf-8?b?aGUgX19uZXh0X18gbWV0aG9kLg==?= Message-ID: <3XdQhp1hK9zPHP@mail.python.org> http://hg.python.org/cpython/rev/d6ba5441a2e9 changeset: 79689:d6ba5441a2e9 branch: 3.2 parent: 79686:9b6e8d4b960e user: Ezio Melotti date: Fri Oct 12 13:42:08 2012 +0300 summary: Fix links to the __next__ method. files: Doc/glossary.rst | 2 +- Doc/library/concurrent.futures.rst | 22 +++++++++------- Doc/library/dis.rst | 8 +++--- Doc/library/exceptions.rst | 2 +- Doc/library/functions.rst | 21 ++++++++------- Doc/library/stdtypes.rst | 9 +++--- Doc/reference/datamodel.rst | 6 ++-- Doc/reference/expressions.rst | 23 +++++++++-------- Doc/tutorial/classes.rst | 18 +++++++------- Doc/whatsnew/3.0.rst | 4 +- 10 files changed, 60 insertions(+), 55 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -354,7 +354,7 @@ iterator An object representing a stream of data. Repeated calls to the iterator's - :meth:`__next__` method (or passing it to the built-in function + :meth:`~iterator.__next__` method (or passing it to the built-in function :func:`next`) return successive items in the stream. When no more data are available a :exc:`StopIteration` exception is raised instead. At this point, the iterator object is exhausted and any further calls to its diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -42,12 +42,13 @@ Equivalent to ``map(func, *iterables)`` except *func* is executed asynchronously and several calls to *func* may be made concurrently. The - returned iterator raises a :exc:`TimeoutError` if :meth:`__next__()` is - called and the result isn't available after *timeout* seconds from the - original call to :meth:`Executor.map`. *timeout* can be an int or a - float. If *timeout* is not specified or ``None``, there is no limit to - the wait time. If a call raises an exception, then that exception will - be raised when its value is retrieved from the iterator. + returned iterator raises a :exc:`TimeoutError` if + :meth:`~iterator.__next__` is called and the result isn't available + after *timeout* seconds from the original call to :meth:`Executor.map`. + *timeout* can be an int or a float. If *timeout* is not specified or + ``None``, there is no limit to the wait time. If a call raises an + exception, then that exception will be raised when its value is + retrieved from the iterator. .. method:: shutdown(wait=True) @@ -358,10 +359,11 @@ different :class:`Executor` instances) given by *fs* that yields futures as they complete (finished or were cancelled). Any futures that completed before :func:`as_completed` is called will be yielded first. The returned - iterator raises a :exc:`TimeoutError` if :meth:`__next__` is called and the - result isn't available after *timeout* seconds from the original call to - :func:`as_completed`. *timeout* can be an int or float. If *timeout* is not - specified or ``None``, there is no limit to the wait time. + iterator raises a :exc:`TimeoutError` if :meth:`~iterator.__next__` is + called and the result isn't available after *timeout* seconds from the + original call to :func:`as_completed`. *timeout* can be an int or float. + If *timeout* is not specified or ``None``, there is no limit to the wait + time. .. seealso:: diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -658,10 +658,10 @@ .. opcode:: FOR_ITER (delta) - ``TOS`` is an :term:`iterator`. Call its :meth:`__next__` method. If this - yields a new value, push it on the stack (leaving the iterator below it). If - the iterator indicates it is exhausted ``TOS`` is popped, and the byte code - counter is incremented by *delta*. + ``TOS`` is an :term:`iterator`. Call its :meth:`~iterator.__next__` method. + If this yields a new value, push it on the stack (leaving the iterator below + it). If the iterator indicates it is exhausted ``TOS`` is popped, and the + byte code counter is incremented by *delta*. .. opcode:: LOAD_GLOBAL (namei) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -262,7 +262,7 @@ .. exception:: StopIteration Raised by built-in function :func:`next` and an :term:`iterator`\'s - :meth:`__next__` method to signal that there are no further values. + :meth:`~iterator.__next__` method to signal that there are no further values. .. exception:: SyntaxError diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -346,10 +346,10 @@ .. function:: enumerate(iterable, start=0) Return an enumerate object. *iterable* must be a sequence, an - :term:`iterator`, or some other object which supports iteration. The - :meth:`__next__` method of the iterator returned by :func:`enumerate` returns a - tuple containing a count (from *start* which defaults to 0) and the - values obtained from iterating over *iterable*. + :term:`iterator`, or some other object which supports iteration. + The :meth:`~iterator.__next__` method of the iterator returned by + :func:`enumerate` returns a tuple containing a count (from *start* which + defaults to 0) and the values obtained from iterating over *iterable*. >>> seasons = ['Spring', 'Summer', 'Fall', 'Winter'] >>> list(enumerate(seasons)) @@ -681,9 +681,10 @@ starting at ``0``). If it does not support either of those protocols, :exc:`TypeError` is raised. If the second argument, *sentinel*, is given, then *object* must be a callable object. The iterator created in this case - will call *object* with no arguments for each call to its :meth:`__next__` - method; if the value returned is equal to *sentinel*, :exc:`StopIteration` - will be raised, otherwise the value will be returned. + will call *object* with no arguments for each call to its + :meth:`~iterator.__next__` method; if the value returned is equal to + *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will + be returned. One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file @@ -781,9 +782,9 @@ .. function:: next(iterator[, default]) - Retrieve the next item from the *iterator* by calling its :meth:`__next__` - method. If *default* is given, it is returned if the iterator is exhausted, - otherwise :exc:`StopIteration` is raised. + Retrieve the next item from the *iterator* by calling its + :meth:`~iterator.__next__` method. If *default* is given, it is returned + if the iterator is exhausted, otherwise :exc:`StopIteration` is raised. .. function:: object() diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -775,9 +775,9 @@ specific types are not important beyond their implementation of the iterator protocol. -Once an iterator's :meth:`__next__` method raises :exc:`StopIteration`, it must -continue to do so on subsequent calls. Implementations that do not obey this -property are deemed broken. +Once an iterator's :meth:`~iterator.__next__` method raises +:exc:`StopIteration`, it must continue to do so on subsequent calls. +Implementations that do not obey this property are deemed broken. .. _generator-types: @@ -788,7 +788,8 @@ Python's :term:`generator`\s provide a convenient way to implement the iterator protocol. If a container object's :meth:`__iter__` method is implemented as a generator, it will automatically return an iterator object (technically, a -generator object) supplying the :meth:`__iter__` and :meth:`__next__` methods. +generator object) supplying the :meth:`__iter__` and :meth:`~generator.__next__` +methods. More information about generators can be found in :ref:`the documentation for the yield expression `. diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -588,9 +588,9 @@ A function or method which uses the :keyword:`yield` statement (see section :ref:`yield`) is called a :dfn:`generator function`. Such a function, when called, always returns an iterator object which can be used to execute the - body of the function: calling the iterator's :meth:`__next__` method will - cause the function to execute until it provides a value using the - :keyword:`yield` statement. When the function executes a + body of the function: calling the iterator's :meth:`iterator__next__` + method will cause the function to execute until it provides a value + using the :keyword:`yield` statement. When the function executes a :keyword:`return` statement or falls off the end, a :exc:`StopIteration` exception is raised and the iterator will have reached the end of the set of values to be returned. diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -294,13 +294,13 @@ brackets or curly braces. Variables used in the generator expression are evaluated lazily when the -:meth:`__next__` method is called for generator object (in the same fashion as -normal generators). However, the leftmost :keyword:`for` clause is immediately -evaluated, so that an error produced by it can be seen before any other possible -error in the code that handles the generator expression. Subsequent -:keyword:`for` clauses cannot be evaluated immediately since they may depend on -the previous :keyword:`for` loop. For example: ``(x*y for x in range(10) for y -in bar(x))``. +:meth:`~generator.__next__` method is called for generator object (in the same +fashion as normal generators). However, the leftmost :keyword:`for` clause is +immediately evaluated, so that an error produced by it can be seen before any +other possible error in the code that handles the generator expression. +Subsequent :keyword:`for` clauses cannot be evaluated immediately since they +may depend on the previous :keyword:`for` loop. For example: ``(x*y for x in +range(10) for y in bar(x))``. The parentheses can be omitted on calls with only one argument. See section :ref:`calls` for the detail. @@ -371,10 +371,11 @@ Starts the execution of a generator function or resumes it at the last executed :keyword:`yield` expression. When a generator function is resumed - with a :meth:`__next__` method, the current :keyword:`yield` expression - always evaluates to :const:`None`. The execution then continues to the next - :keyword:`yield` expression, where the generator is suspended again, and the - value of the :token:`expression_list` is returned to :meth:`next`'s caller. + with a :meth:`~generator.__next__` method, the current :keyword:`yield` + expression always evaluates to :const:`None`. The execution then continues + to the next :keyword:`yield` expression, where the generator is suspended + again, and the value of the :token:`expression_list` is returned to + :meth:`next`'s caller. If the generator exits without yielding another value, a :exc:`StopIteration` exception is raised. diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -738,11 +738,11 @@ This style of access is clear, concise, and convenient. The use of iterators pervades and unifies Python. Behind the scenes, the :keyword:`for` statement calls :func:`iter` on the container object. The function returns an iterator -object that defines the method :meth:`__next__` which accesses elements in the -container one at a time. When there are no more elements, :meth:`__next__` -raises a :exc:`StopIteration` exception which tells the :keyword:`for` loop to -terminate. You can call the :meth:`__next__` method using the :func:`next` -built-in function; this example shows how it all works:: +object that defines the method :meth:`~iterator.__next__` which accesses +elements in the container one at a time. When there are no more elements, +:meth:`__next__` raises a :exc:`StopIteration` exception which tells the +:keyword:`for` loop to terminate. You can call the :meth:`__next__` method +using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) @@ -762,8 +762,8 @@ Having seen the mechanics behind the iterator protocol, it is easy to add iterator behavior to your classes. Define an :meth:`__iter__` method which -returns an object with a :meth:`__next__` method. If the class defines -:meth:`__next__`, then :meth:`__iter__` can just return ``self``:: +returns an object with a :meth:`~iterator.__next__` method. If the class +defines :meth:`__next__`, then :meth:`__iter__` can just return ``self``:: class Reverse: """Iterator for looping over a sequence backwards.""" @@ -820,8 +820,8 @@ Anything that can be done with generators can also be done with class based iterators as described in the previous section. What makes generators so -compact is that the :meth:`__iter__` and :meth:`__next__` methods are created -automatically. +compact is that the :meth:`__iter__` and :meth:`~generator.__next__` methods +are created automatically. Another key feature is that the local variables and execution state are automatically saved between calls. This made the function easier to write and diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -771,7 +771,7 @@ respectively). * :pep:`3114`: the standard :meth:`next` method has been renamed to - :meth:`__next__`. + :meth:`~iterator.__next__`. * The :meth:`__oct__` and :meth:`__hex__` special methods are removed -- :func:`oct` and :func:`hex` use :meth:`__index__` now to convert @@ -807,7 +807,7 @@ To get the old behavior of :func:`input`, use ``eval(input())``. * A new built-in function :func:`next` was added to call the - :meth:`__next__` method on an object. + :meth:`~iterator.__next__` method on an object. * The :func:`round` function rounding strategy and return type have changed. Exact halfway cases are now rounded to the nearest even -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:46:51 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:46:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_=5F=5Fnext=5F=5F_method_link_fixes_with_3=2E2=2E?= Message-ID: <3XdQhq5fzqzR1D@mail.python.org> http://hg.python.org/cpython/rev/0cddf0bd19f8 changeset: 79690:0cddf0bd19f8 branch: 3.3 parent: 79687:9a89d99934f4 parent: 79689:d6ba5441a2e9 user: Ezio Melotti date: Fri Oct 12 13:45:38 2012 +0300 summary: Merge __next__ method link fixes with 3.2. files: Doc/glossary.rst | 2 +- Doc/library/concurrent.futures.rst | 22 +++++++++------- Doc/library/dis.rst | 8 +++--- Doc/library/exceptions.rst | 4 +- Doc/library/functions.rst | 21 ++++++++------- Doc/library/stdtypes.rst | 9 +++--- Doc/reference/datamodel.rst | 6 ++-- Doc/reference/expressions.rst | 23 +++++++++-------- Doc/tutorial/classes.rst | 18 +++++++------- Doc/whatsnew/3.0.rst | 4 +- 10 files changed, 61 insertions(+), 56 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -365,7 +365,7 @@ iterator An object representing a stream of data. Repeated calls to the iterator's - :meth:`__next__` method (or passing it to the built-in function + :meth:`~iterator.__next__` method (or passing it to the built-in function :func:`next`) return successive items in the stream. When no more data are available a :exc:`StopIteration` exception is raised instead. At this point, the iterator object is exhausted and any further calls to its diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -42,12 +42,13 @@ Equivalent to ``map(func, *iterables)`` except *func* is executed asynchronously and several calls to *func* may be made concurrently. The - returned iterator raises a :exc:`TimeoutError` if :meth:`__next__()` is - called and the result isn't available after *timeout* seconds from the - original call to :meth:`Executor.map`. *timeout* can be an int or a - float. If *timeout* is not specified or ``None``, there is no limit to - the wait time. If a call raises an exception, then that exception will - be raised when its value is retrieved from the iterator. + returned iterator raises a :exc:`TimeoutError` if + :meth:`~iterator.__next__` is called and the result isn't available + after *timeout* seconds from the original call to :meth:`Executor.map`. + *timeout* can be an int or a float. If *timeout* is not specified or + ``None``, there is no limit to the wait time. If a call raises an + exception, then that exception will be raised when its value is + retrieved from the iterator. .. method:: shutdown(wait=True) @@ -364,10 +365,11 @@ different :class:`Executor` instances) given by *fs* that yields futures as they complete (finished or were cancelled). Any futures that completed before :func:`as_completed` is called will be yielded first. The returned - iterator raises a :exc:`TimeoutError` if :meth:`__next__` is called and the - result isn't available after *timeout* seconds from the original call to - :func:`as_completed`. *timeout* can be an int or float. If *timeout* is not - specified or ``None``, there is no limit to the wait time. + iterator raises a :exc:`TimeoutError` if :meth:`~iterator.__next__` is + called and the result isn't available after *timeout* seconds from the + original call to :func:`as_completed`. *timeout* can be an int or float. + If *timeout* is not specified or ``None``, there is no limit to the wait + time. .. seealso:: diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -660,10 +660,10 @@ .. opcode:: FOR_ITER (delta) - ``TOS`` is an :term:`iterator`. Call its :meth:`__next__` method. If this - yields a new value, push it on the stack (leaving the iterator below it). If - the iterator indicates it is exhausted ``TOS`` is popped, and the byte code - counter is incremented by *delta*. + ``TOS`` is an :term:`iterator`. Call its :meth:`~iterator.__next__` method. + If this yields a new value, push it on the stack (leaving the iterator below + it). If the iterator indicates it is exhausted ``TOS`` is popped, and the + byte code counter is incremented by *delta*. .. opcode:: LOAD_GLOBAL (namei) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -275,8 +275,8 @@ .. exception:: StopIteration Raised by built-in function :func:`next` and an :term:`iterator`\'s - :meth:`__next__` method to signal that there are no further items to be - produced by the iterator. + :meth:`~iterator.__next__` method to signal that there are no further + items produced by the iterator. The exception object has a single attribute :attr:`value`, which is given as an argument when constructing the exception, and defaults diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -352,10 +352,10 @@ .. function:: enumerate(iterable, start=0) Return an enumerate object. *iterable* must be a sequence, an - :term:`iterator`, or some other object which supports iteration. The - :meth:`__next__` method of the iterator returned by :func:`enumerate` returns a - tuple containing a count (from *start* which defaults to 0) and the - values obtained from iterating over *iterable*. + :term:`iterator`, or some other object which supports iteration. + The :meth:`~iterator.__next__` method of the iterator returned by + :func:`enumerate` returns a tuple containing a count (from *start* which + defaults to 0) and the values obtained from iterating over *iterable*. >>> seasons = ['Spring', 'Summer', 'Fall', 'Winter'] >>> list(enumerate(seasons)) @@ -687,9 +687,10 @@ starting at ``0``). If it does not support either of those protocols, :exc:`TypeError` is raised. If the second argument, *sentinel*, is given, then *object* must be a callable object. The iterator created in this case - will call *object* with no arguments for each call to its :meth:`__next__` - method; if the value returned is equal to *sentinel*, :exc:`StopIteration` - will be raised, otherwise the value will be returned. + will call *object* with no arguments for each call to its + :meth:`~iterator.__next__` method; if the value returned is equal to + *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will + be returned. See also :ref:`typeiter`. @@ -785,9 +786,9 @@ .. function:: next(iterator[, default]) - Retrieve the next item from the *iterator* by calling its :meth:`__next__` - method. If *default* is given, it is returned if the iterator is exhausted, - otherwise :exc:`StopIteration` is raised. + Retrieve the next item from the *iterator* by calling its + :meth:`~iterator.__next__` method. If *default* is given, it is returned + if the iterator is exhausted, otherwise :exc:`StopIteration` is raised. .. function:: object() diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -779,9 +779,9 @@ specific types are not important beyond their implementation of the iterator protocol. -Once an iterator's :meth:`__next__` method raises :exc:`StopIteration`, it must -continue to do so on subsequent calls. Implementations that do not obey this -property are deemed broken. +Once an iterator's :meth:`~iterator.__next__` method raises +:exc:`StopIteration`, it must continue to do so on subsequent calls. +Implementations that do not obey this property are deemed broken. .. _generator-types: @@ -792,7 +792,8 @@ Python's :term:`generator`\s provide a convenient way to implement the iterator protocol. If a container object's :meth:`__iter__` method is implemented as a generator, it will automatically return an iterator object (technically, a -generator object) supplying the :meth:`__iter__` and :meth:`__next__` methods. +generator object) supplying the :meth:`__iter__` and :meth:`~generator.__next__` +methods. More information about generators can be found in :ref:`the documentation for the yield expression `. diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -600,9 +600,9 @@ A function or method which uses the :keyword:`yield` statement (see section :ref:`yield`) is called a :dfn:`generator function`. Such a function, when called, always returns an iterator object which can be used to execute the - body of the function: calling the iterator's :meth:`__next__` method will - cause the function to execute until it provides a value using the - :keyword:`yield` statement. When the function executes a + body of the function: calling the iterator's :meth:`iterator__next__` + method will cause the function to execute until it provides a value + using the :keyword:`yield` statement. When the function executes a :keyword:`return` statement or falls off the end, a :exc:`StopIteration` exception is raised and the iterator will have reached the end of the set of values to be returned. diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -294,13 +294,13 @@ brackets or curly braces. Variables used in the generator expression are evaluated lazily when the -:meth:`__next__` method is called for generator object (in the same fashion as -normal generators). However, the leftmost :keyword:`for` clause is immediately -evaluated, so that an error produced by it can be seen before any other possible -error in the code that handles the generator expression. Subsequent -:keyword:`for` clauses cannot be evaluated immediately since they may depend on -the previous :keyword:`for` loop. For example: ``(x*y for x in range(10) for y -in bar(x))``. +:meth:`~generator.__next__` method is called for generator object (in the same +fashion as normal generators). However, the leftmost :keyword:`for` clause is +immediately evaluated, so that an error produced by it can be seen before any +other possible error in the code that handles the generator expression. +Subsequent :keyword:`for` clauses cannot be evaluated immediately since they +may depend on the previous :keyword:`for` loop. For example: ``(x*y for x in +range(10) for y in bar(x))``. The parentheses can be omitted on calls with only one argument. See section :ref:`calls` for the detail. @@ -394,10 +394,11 @@ Starts the execution of a generator function or resumes it at the last executed :keyword:`yield` expression. When a generator function is resumed - with a :meth:`__next__` method, the current :keyword:`yield` expression - always evaluates to :const:`None`. The execution then continues to the next - :keyword:`yield` expression, where the generator is suspended again, and the - value of the :token:`expression_list` is returned to :meth:`next`'s caller. + with a :meth:`~generator.__next__` method, the current :keyword:`yield` + expression always evaluates to :const:`None`. The execution then continues + to the next :keyword:`yield` expression, where the generator is suspended + again, and the value of the :token:`expression_list` is returned to + :meth:`next`'s caller. If the generator exits without yielding another value, a :exc:`StopIteration` exception is raised. diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -737,11 +737,11 @@ This style of access is clear, concise, and convenient. The use of iterators pervades and unifies Python. Behind the scenes, the :keyword:`for` statement calls :func:`iter` on the container object. The function returns an iterator -object that defines the method :meth:`__next__` which accesses elements in the -container one at a time. When there are no more elements, :meth:`__next__` -raises a :exc:`StopIteration` exception which tells the :keyword:`for` loop to -terminate. You can call the :meth:`__next__` method using the :func:`next` -built-in function; this example shows how it all works:: +object that defines the method :meth:`~iterator.__next__` which accesses +elements in the container one at a time. When there are no more elements, +:meth:`__next__` raises a :exc:`StopIteration` exception which tells the +:keyword:`for` loop to terminate. You can call the :meth:`__next__` method +using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) @@ -761,8 +761,8 @@ Having seen the mechanics behind the iterator protocol, it is easy to add iterator behavior to your classes. Define an :meth:`__iter__` method which -returns an object with a :meth:`__next__` method. If the class defines -:meth:`__next__`, then :meth:`__iter__` can just return ``self``:: +returns an object with a :meth:`~iterator.__next__` method. If the class +defines :meth:`__next__`, then :meth:`__iter__` can just return ``self``:: class Reverse: """Iterator for looping over a sequence backwards.""" @@ -819,8 +819,8 @@ Anything that can be done with generators can also be done with class based iterators as described in the previous section. What makes generators so -compact is that the :meth:`__iter__` and :meth:`__next__` methods are created -automatically. +compact is that the :meth:`__iter__` and :meth:`~generator.__next__` methods +are created automatically. Another key feature is that the local variables and execution state are automatically saved between calls. This made the function easier to write and diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -771,7 +771,7 @@ respectively). * :pep:`3114`: the standard :meth:`next` method has been renamed to - :meth:`__next__`. + :meth:`~iterator.__next__`. * The :meth:`__oct__` and :meth:`__hex__` special methods are removed -- :func:`oct` and :func:`hex` use :meth:`__index__` now to convert @@ -807,7 +807,7 @@ To get the old behavior of :func:`input`, use ``eval(input())``. * A new built-in function :func:`next` was added to call the - :meth:`__next__` method on an object. + :meth:`~iterator.__next__` method on an object. * The :func:`round` function rounding strategy and return type have changed. Exact halfway cases are now rounded to the nearest even -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 12:46:53 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 12 Oct 2012 12:46:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgX19uZXh0X18gbWV0aG9kIGxpbmsgZml4ZXMgd2l0aCAzLjMu?= Message-ID: <3XdQhs2XSvzR1D@mail.python.org> http://hg.python.org/cpython/rev/05c8928362ee changeset: 79691:05c8928362ee parent: 79688:3534acfa8e37 parent: 79690:0cddf0bd19f8 user: Ezio Melotti date: Fri Oct 12 13:46:37 2012 +0300 summary: Merge __next__ method link fixes with 3.3. files: Doc/glossary.rst | 2 +- Doc/library/concurrent.futures.rst | 22 +++++++++------- Doc/library/dis.rst | 8 +++--- Doc/library/exceptions.rst | 4 +- Doc/library/functions.rst | 21 ++++++++------- Doc/library/stdtypes.rst | 9 +++--- Doc/reference/datamodel.rst | 6 ++-- Doc/reference/expressions.rst | 23 +++++++++-------- Doc/tutorial/classes.rst | 18 +++++++------- Doc/whatsnew/3.0.rst | 4 +- 10 files changed, 61 insertions(+), 56 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -365,7 +365,7 @@ iterator An object representing a stream of data. Repeated calls to the iterator's - :meth:`__next__` method (or passing it to the built-in function + :meth:`~iterator.__next__` method (or passing it to the built-in function :func:`next`) return successive items in the stream. When no more data are available a :exc:`StopIteration` exception is raised instead. At this point, the iterator object is exhausted and any further calls to its diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -42,12 +42,13 @@ Equivalent to ``map(func, *iterables)`` except *func* is executed asynchronously and several calls to *func* may be made concurrently. The - returned iterator raises a :exc:`TimeoutError` if :meth:`__next__()` is - called and the result isn't available after *timeout* seconds from the - original call to :meth:`Executor.map`. *timeout* can be an int or a - float. If *timeout* is not specified or ``None``, there is no limit to - the wait time. If a call raises an exception, then that exception will - be raised when its value is retrieved from the iterator. + returned iterator raises a :exc:`TimeoutError` if + :meth:`~iterator.__next__` is called and the result isn't available + after *timeout* seconds from the original call to :meth:`Executor.map`. + *timeout* can be an int or a float. If *timeout* is not specified or + ``None``, there is no limit to the wait time. If a call raises an + exception, then that exception will be raised when its value is + retrieved from the iterator. .. method:: shutdown(wait=True) @@ -364,10 +365,11 @@ different :class:`Executor` instances) given by *fs* that yields futures as they complete (finished or were cancelled). Any futures that completed before :func:`as_completed` is called will be yielded first. The returned - iterator raises a :exc:`TimeoutError` if :meth:`__next__` is called and the - result isn't available after *timeout* seconds from the original call to - :func:`as_completed`. *timeout* can be an int or float. If *timeout* is not - specified or ``None``, there is no limit to the wait time. + iterator raises a :exc:`TimeoutError` if :meth:`~iterator.__next__` is + called and the result isn't available after *timeout* seconds from the + original call to :func:`as_completed`. *timeout* can be an int or float. + If *timeout* is not specified or ``None``, there is no limit to the wait + time. .. seealso:: diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -660,10 +660,10 @@ .. opcode:: FOR_ITER (delta) - ``TOS`` is an :term:`iterator`. Call its :meth:`__next__` method. If this - yields a new value, push it on the stack (leaving the iterator below it). If - the iterator indicates it is exhausted ``TOS`` is popped, and the byte code - counter is incremented by *delta*. + ``TOS`` is an :term:`iterator`. Call its :meth:`~iterator.__next__` method. + If this yields a new value, push it on the stack (leaving the iterator below + it). If the iterator indicates it is exhausted ``TOS`` is popped, and the + byte code counter is incremented by *delta*. .. opcode:: LOAD_GLOBAL (namei) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -275,8 +275,8 @@ .. exception:: StopIteration Raised by built-in function :func:`next` and an :term:`iterator`\'s - :meth:`__next__` method to signal that there are no further items to be - produced by the iterator. + :meth:`~iterator.__next__` method to signal that there are no further + items produced by the iterator. The exception object has a single attribute :attr:`value`, which is given as an argument when constructing the exception, and defaults diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -352,10 +352,10 @@ .. function:: enumerate(iterable, start=0) Return an enumerate object. *iterable* must be a sequence, an - :term:`iterator`, or some other object which supports iteration. The - :meth:`__next__` method of the iterator returned by :func:`enumerate` returns a - tuple containing a count (from *start* which defaults to 0) and the - values obtained from iterating over *iterable*. + :term:`iterator`, or some other object which supports iteration. + The :meth:`~iterator.__next__` method of the iterator returned by + :func:`enumerate` returns a tuple containing a count (from *start* which + defaults to 0) and the values obtained from iterating over *iterable*. >>> seasons = ['Spring', 'Summer', 'Fall', 'Winter'] >>> list(enumerate(seasons)) @@ -687,9 +687,10 @@ starting at ``0``). If it does not support either of those protocols, :exc:`TypeError` is raised. If the second argument, *sentinel*, is given, then *object* must be a callable object. The iterator created in this case - will call *object* with no arguments for each call to its :meth:`__next__` - method; if the value returned is equal to *sentinel*, :exc:`StopIteration` - will be raised, otherwise the value will be returned. + will call *object* with no arguments for each call to its + :meth:`~iterator.__next__` method; if the value returned is equal to + *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will + be returned. See also :ref:`typeiter`. @@ -785,9 +786,9 @@ .. function:: next(iterator[, default]) - Retrieve the next item from the *iterator* by calling its :meth:`__next__` - method. If *default* is given, it is returned if the iterator is exhausted, - otherwise :exc:`StopIteration` is raised. + Retrieve the next item from the *iterator* by calling its + :meth:`~iterator.__next__` method. If *default* is given, it is returned + if the iterator is exhausted, otherwise :exc:`StopIteration` is raised. .. function:: object() diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -779,9 +779,9 @@ specific types are not important beyond their implementation of the iterator protocol. -Once an iterator's :meth:`__next__` method raises :exc:`StopIteration`, it must -continue to do so on subsequent calls. Implementations that do not obey this -property are deemed broken. +Once an iterator's :meth:`~iterator.__next__` method raises +:exc:`StopIteration`, it must continue to do so on subsequent calls. +Implementations that do not obey this property are deemed broken. .. _generator-types: @@ -792,7 +792,8 @@ Python's :term:`generator`\s provide a convenient way to implement the iterator protocol. If a container object's :meth:`__iter__` method is implemented as a generator, it will automatically return an iterator object (technically, a -generator object) supplying the :meth:`__iter__` and :meth:`__next__` methods. +generator object) supplying the :meth:`__iter__` and :meth:`~generator.__next__` +methods. More information about generators can be found in :ref:`the documentation for the yield expression `. diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -600,9 +600,9 @@ A function or method which uses the :keyword:`yield` statement (see section :ref:`yield`) is called a :dfn:`generator function`. Such a function, when called, always returns an iterator object which can be used to execute the - body of the function: calling the iterator's :meth:`__next__` method will - cause the function to execute until it provides a value using the - :keyword:`yield` statement. When the function executes a + body of the function: calling the iterator's :meth:`iterator__next__` + method will cause the function to execute until it provides a value + using the :keyword:`yield` statement. When the function executes a :keyword:`return` statement or falls off the end, a :exc:`StopIteration` exception is raised and the iterator will have reached the end of the set of values to be returned. diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -294,13 +294,13 @@ brackets or curly braces. Variables used in the generator expression are evaluated lazily when the -:meth:`__next__` method is called for generator object (in the same fashion as -normal generators). However, the leftmost :keyword:`for` clause is immediately -evaluated, so that an error produced by it can be seen before any other possible -error in the code that handles the generator expression. Subsequent -:keyword:`for` clauses cannot be evaluated immediately since they may depend on -the previous :keyword:`for` loop. For example: ``(x*y for x in range(10) for y -in bar(x))``. +:meth:`~generator.__next__` method is called for generator object (in the same +fashion as normal generators). However, the leftmost :keyword:`for` clause is +immediately evaluated, so that an error produced by it can be seen before any +other possible error in the code that handles the generator expression. +Subsequent :keyword:`for` clauses cannot be evaluated immediately since they +may depend on the previous :keyword:`for` loop. For example: ``(x*y for x in +range(10) for y in bar(x))``. The parentheses can be omitted on calls with only one argument. See section :ref:`calls` for the detail. @@ -394,10 +394,11 @@ Starts the execution of a generator function or resumes it at the last executed :keyword:`yield` expression. When a generator function is resumed - with a :meth:`__next__` method, the current :keyword:`yield` expression - always evaluates to :const:`None`. The execution then continues to the next - :keyword:`yield` expression, where the generator is suspended again, and the - value of the :token:`expression_list` is returned to :meth:`next`'s caller. + with a :meth:`~generator.__next__` method, the current :keyword:`yield` + expression always evaluates to :const:`None`. The execution then continues + to the next :keyword:`yield` expression, where the generator is suspended + again, and the value of the :token:`expression_list` is returned to + :meth:`next`'s caller. If the generator exits without yielding another value, a :exc:`StopIteration` exception is raised. diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -737,11 +737,11 @@ This style of access is clear, concise, and convenient. The use of iterators pervades and unifies Python. Behind the scenes, the :keyword:`for` statement calls :func:`iter` on the container object. The function returns an iterator -object that defines the method :meth:`__next__` which accesses elements in the -container one at a time. When there are no more elements, :meth:`__next__` -raises a :exc:`StopIteration` exception which tells the :keyword:`for` loop to -terminate. You can call the :meth:`__next__` method using the :func:`next` -built-in function; this example shows how it all works:: +object that defines the method :meth:`~iterator.__next__` which accesses +elements in the container one at a time. When there are no more elements, +:meth:`__next__` raises a :exc:`StopIteration` exception which tells the +:keyword:`for` loop to terminate. You can call the :meth:`__next__` method +using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) @@ -761,8 +761,8 @@ Having seen the mechanics behind the iterator protocol, it is easy to add iterator behavior to your classes. Define an :meth:`__iter__` method which -returns an object with a :meth:`__next__` method. If the class defines -:meth:`__next__`, then :meth:`__iter__` can just return ``self``:: +returns an object with a :meth:`~iterator.__next__` method. If the class +defines :meth:`__next__`, then :meth:`__iter__` can just return ``self``:: class Reverse: """Iterator for looping over a sequence backwards.""" @@ -819,8 +819,8 @@ Anything that can be done with generators can also be done with class based iterators as described in the previous section. What makes generators so -compact is that the :meth:`__iter__` and :meth:`__next__` methods are created -automatically. +compact is that the :meth:`__iter__` and :meth:`~generator.__next__` methods +are created automatically. Another key feature is that the local variables and execution state are automatically saved between calls. This made the function easier to write and diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -771,7 +771,7 @@ respectively). * :pep:`3114`: the standard :meth:`next` method has been renamed to - :meth:`__next__`. + :meth:`~iterator.__next__`. * The :meth:`__oct__` and :meth:`__hex__` special methods are removed -- :func:`oct` and :func:`hex` use :meth:`__index__` now to convert @@ -807,7 +807,7 @@ To get the old behavior of :func:`input`, use ``eval(input())``. * A new built-in function :func:`next` was added to call the - :meth:`__next__` method on an object. + :meth:`~iterator.__next__` method on an object. * The :func:`round` function rounding strategy and return type have changed. Exact halfway cases are now rounded to the nearest even -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 15:09:05 2012 From: python-checkins at python.org (antoine.pitrou) Date: Fri, 12 Oct 2012 15:09:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Skip_slow_benchmarks_?= =?utf-8?q?=28hexiom2=29_in_fast_mode_except_when_explicitly_selected=2E?= Message-ID: <3XdTrx5D5MzPG2@mail.python.org> http://hg.python.org/benchmarks/rev/670759f365c4 changeset: 187:670759f365c4 user: Antoine Pitrou date: Fri Oct 12 15:07:25 2012 +0200 summary: Skip slow benchmarks (hexiom2) in fast mode except when explicitly selected. files: perf.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/perf.py b/perf.py --- a/perf.py +++ b/perf.py @@ -2112,6 +2112,8 @@ "py3k": ["2to3", "2n3", "chameleon", "mako_v2"] } +SLOW_BENCHMARKS = ["hexiom2"] + def _ExpandBenchmarkName(bm_name, bench_groups): """Recursively expand name benchmark names. @@ -2131,7 +2133,7 @@ yield bm_name -def ParseBenchmarksOption(benchmarks_opt, bench_groups): +def ParseBenchmarksOption(benchmarks_opt, bench_groups, fast=False): """Parses and verifies the --benchmarks option. Args: @@ -2164,6 +2166,14 @@ logging.warning("No benchmark named %s", bm) else: should_run.remove(bm) + if fast: + # In fast mode, skip slow benchmarks that weren't explicitly selected + # on the command line. + to_skip = (should_run - positive_benchmarks) & set(SLOW_BENCHMARKS) + if to_skip: + logging.info("Skipping slow benchmarks (%s) in fast mode", + ', '.join(sorted(to_skip))) + should_run = should_run - to_skip return should_run @@ -2321,7 +2331,8 @@ if options.diff_instrumentation: info("Suppressing performance data due to --diff_instrumentation") - should_run = ParseBenchmarksOption(options.benchmarks, bench_groups) + should_run = ParseBenchmarksOption(options.benchmarks, bench_groups, + options.fast) results = [] for name in sorted(should_run): -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Fri Oct 12 15:16:58 2012 From: python-checkins at python.org (antoine.pitrou) Date: Fri, 12 Oct 2012 15:16:58 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Mention_pathlib_in_the_?= =?utf-8?q?README?= Message-ID: <3XdV223WqrzQtx@mail.python.org> http://hg.python.org/benchmarks/rev/a172eb246805 changeset: 188:a172eb246805 user: Antoine Pitrou date: Fri Oct 12 15:15:18 2012 +0200 summary: Mention pathlib in the README files: README.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -95,6 +95,7 @@ - lockfile: release 0.3 - Mako: rev 9ca34926d830 from http://hg.makotemplates.org/mako - Mercurial: release 1.2.1 +- pathlib: rev 1438df2f2016 from https://bitbucket.org/pitrou/pathlib/ - Psyco: release 1.6 - PyBench: release 2.6.4 - Rietveld: r427 from http://rietveld.googlecode.com/svn/trunk -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Fri Oct 12 15:19:13 2012 From: python-checkins at python.org (antoine.pitrou) Date: Fri, 12 Oct 2012 15:19:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Some_test_commit_for_th?= =?utf-8?q?e_benchmarks_repo_configuration?= Message-ID: <3XdV4d16tnzM3k@mail.python.org> http://hg.python.org/benchmarks/rev/55123e4398dc changeset: 189:55123e4398dc user: Antoine Pitrou date: Fri Oct 12 15:17:34 2012 +0200 summary: Some test commit for the benchmarks repo configuration files: README.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -101,3 +101,4 @@ - Rietveld: r427 from http://rietveld.googlecode.com/svn/trunk - Spambayes: r3256 http://spambayes.svn.sourceforge.net/svnroot/spambayes/trunk/spambayes - Spitfire: release 0.7.4 + -- Repository URL: http://hg.python.org/benchmarks From python-checkins at python.org Fri Oct 12 16:00:40 2012 From: python-checkins at python.org (brett.cannon) Date: Fri, 12 Oct 2012 16:00:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_uses_of_=25_with_st?= =?utf-8?b?ci5mb3JtYXQu?= Message-ID: <3XdW0S2Sk9zR1y@mail.python.org> http://hg.python.org/cpython/rev/987a8724b220 changeset: 79692:987a8724b220 user: Brett Cannon date: Fri Oct 12 10:00:34 2012 -0400 summary: Remove uses of % with str.format. files: Lib/importlib/_bootstrap.py | 6 +- Python/importlib.h | 7534 +++++++++++----------- 2 files changed, 3771 insertions(+), 3769 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -237,7 +237,7 @@ self.wakeup.release() def __repr__(self): - return "_ModuleLock(%r) at %d" % (self.name, id(self)) + return "_ModuleLock({!r}) at {}".format(self.name, id(self)) class _DummyModuleLock: @@ -258,7 +258,7 @@ self.count -= 1 def __repr__(self): - return "_DummyModuleLock(%r) at %d" % (self.name, id(self)) + return "_DummyModuleLock({!r}) at {}".format(self.name, id(self)) # The following two functions are for consumption by Python/import.c. @@ -1434,7 +1434,7 @@ return path_hook_for_FileFinder def __repr__(self): - return "FileFinder(%r)" % (self.path,) + return "FileFinder({!r})".format(self.path) # Import itself ############################################################### diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 17:35:04 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 17:35:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_ceval_cleanup?= Message-ID: <3XdY5N4LmczR1L@mail.python.org> http://hg.python.org/cpython/rev/ac30a1b1cf17 changeset: 79693:ac30a1b1cf17 user: Benjamin Peterson date: Fri Oct 12 11:34:51 2012 -0400 summary: ceval cleanup - Make many variables local to the opcode; Kill u, v, w, and x. - Force every opcode to end with DISPATCH or jump to error handling. - Simplify error handling. - Check error statuses in more places. Closes #16191. files: Python/ceval.c | 2276 ++++++++++++++++++----------------- 1 files changed, 1176 insertions(+), 1100 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -742,7 +742,6 @@ enum why_code { WHY_NOT = 0x0001, /* No error */ WHY_EXCEPTION = 0x0002, /* Exception occurred */ - WHY_RERAISE = 0x0004, /* Exception re-raised by 'finally' */ WHY_RETURN = 0x0008, /* 'return' statement */ WHY_BREAK = 0x0010, /* 'break' statement */ WHY_CONTINUE = 0x0020, /* 'continue' statement */ @@ -753,7 +752,7 @@ static void save_exc_state(PyThreadState *, PyFrameObject *); static void swap_exc_state(PyThreadState *, PyFrameObject *); static void restore_and_clear_exc_state(PyThreadState *, PyFrameObject *); -static enum why_code do_raise(PyObject *, PyObject *); +static int do_raise(PyObject *, PyObject *); static int unpack_iterable(PyObject *, int, int, PyObject **); /* Records whether tracing is on for any thread. Counts the number of @@ -798,12 +797,6 @@ register int opcode; /* Current opcode */ register int oparg; /* Current opcode argument, if any */ register enum why_code why; /* Reason for block stack unwind */ - register int err; /* Error status -- nonzero if error */ - register PyObject *x; /* Result object -- NULL if error */ - register PyObject *v; /* Temporary objects popped off stack */ - register PyObject *w; - register PyObject *u; - register PyObject *t; register PyObject **fastlocals, **freevars; PyObject *retval = NULL; /* Return value */ PyThreadState *tstate = PyThreadState_GET(); @@ -1206,14 +1199,9 @@ #endif why = WHY_NOT; - err = 0; - x = Py_None; /* Not a reference, just anything non-NULL */ - w = NULL; - - if (throwflag) { /* support for generator.throw() */ - why = WHY_EXCEPTION; - goto on_error; - } + + if (throwflag) /* support for generator.throw() */ + goto error; for (;;) { #ifdef WITH_TSC @@ -1255,10 +1243,8 @@ ticked = 1; #endif if (_Py_atomic_load_relaxed(&pendingcalls_to_do)) { - if (Py_MakePendingCalls() < 0) { - why = WHY_EXCEPTION; - goto on_error; - } + if (Py_MakePendingCalls() < 0) + goto error; } #ifdef WITH_THREAD if (_Py_atomic_load_relaxed(&gil_drop_request)) { @@ -1276,13 +1262,12 @@ #endif /* Check for asynchronous exceptions. */ if (tstate->async_exc != NULL) { - x = tstate->async_exc; + PyObject *exc = tstate->async_exc; tstate->async_exc = NULL; UNSIGNAL_ASYNC_EXC(); - PyErr_SetNone(x); - Py_DECREF(x); - why = WHY_EXCEPTION; - goto on_error; + PyErr_SetNone(exc); + Py_DECREF(exc); + goto error; } } @@ -1293,6 +1278,7 @@ if (_Py_TracingPossible && tstate->c_tracefunc != NULL && !tstate->tracing) { + int err; /* see maybe_call_line_trace for expository comments */ f->f_stacktop = stack_pointer; @@ -1307,10 +1293,9 @@ stack_pointer = f->f_stacktop; f->f_stacktop = NULL; } - if (err) { + if (err) /* trace function raised an exception */ - goto on_error; - } + goto error; } /* Extract opcode and argument */ @@ -1357,87 +1342,99 @@ TARGET(NOP) FAST_DISPATCH(); - TARGET(LOAD_FAST) - x = GETLOCAL(oparg); - if (x != NULL) { - Py_INCREF(x); - PUSH(x); - FAST_DISPATCH(); + TARGET(LOAD_FAST) { + PyObject *value = GETLOCAL(oparg); + if (value == NULL) { + format_exc_check_arg(PyExc_UnboundLocalError, + UNBOUNDLOCAL_ERROR_MSG, + PyTuple_GetItem(co->co_varnames, oparg)); + goto error; } - format_exc_check_arg(PyExc_UnboundLocalError, - UNBOUNDLOCAL_ERROR_MSG, - PyTuple_GetItem(co->co_varnames, oparg)); - break; - - TARGET(LOAD_CONST) - x = GETITEM(consts, oparg); - Py_INCREF(x); - PUSH(x); + Py_INCREF(value); + PUSH(value); FAST_DISPATCH(); + } + + TARGET(LOAD_CONST) { + PyObject *value = GETITEM(consts, oparg); + Py_INCREF(value); + PUSH(value); + FAST_DISPATCH(); + } PREDICTED_WITH_ARG(STORE_FAST); - TARGET(STORE_FAST) - v = POP(); - SETLOCAL(oparg, v); + TARGET(STORE_FAST) { + PyObject *value = POP(); + SETLOCAL(oparg, value); FAST_DISPATCH(); - - TARGET(POP_TOP) - v = POP(); - Py_DECREF(v); + } + + TARGET(POP_TOP) { + PyObject *value = POP(); + Py_DECREF(value); FAST_DISPATCH(); - - TARGET(ROT_TWO) - v = TOP(); - w = SECOND(); - SET_TOP(w); - SET_SECOND(v); + } + + TARGET(ROT_TWO) { + PyObject *top = TOP(); + PyObject *second = SECOND(); + SET_TOP(second); + SET_SECOND(top); FAST_DISPATCH(); - - TARGET(ROT_THREE) - v = TOP(); - w = SECOND(); - x = THIRD(); - SET_TOP(w); - SET_SECOND(x); - SET_THIRD(v); + } + + TARGET(ROT_THREE) { + PyObject *top = TOP(); + PyObject *second = SECOND(); + PyObject *third = THIRD(); + SET_TOP(second); + SET_SECOND(third); + SET_THIRD(top); FAST_DISPATCH(); - - TARGET(DUP_TOP) - v = TOP(); - Py_INCREF(v); - PUSH(v); + } + + TARGET(DUP_TOP) { + PyObject *top = TOP(); + Py_INCREF(top); + PUSH(top); FAST_DISPATCH(); - - TARGET(DUP_TOP_TWO) - x = TOP(); - Py_INCREF(x); - w = SECOND(); - Py_INCREF(w); + } + + TARGET(DUP_TOP_TWO) { + PyObject *top = TOP(); + Py_INCREF(top); + PyObject *second = SECOND(); + Py_INCREF(second); STACKADJ(2); - SET_TOP(x); - SET_SECOND(w); + SET_TOP(top); + SET_SECOND(second); FAST_DISPATCH(); - - TARGET(UNARY_POSITIVE) - v = TOP(); - x = PyNumber_Positive(v); - Py_DECREF(v); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(UNARY_NEGATIVE) - v = TOP(); - x = PyNumber_Negative(v); - Py_DECREF(v); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(UNARY_NOT) - v = TOP(); - err = PyObject_IsTrue(v); - Py_DECREF(v); + } + + TARGET(UNARY_POSITIVE) { + PyObject *value = TOP(); + PyObject *res = PyNumber_Positive(value); + Py_DECREF(value); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(UNARY_NEGATIVE) { + PyObject *value = TOP(); + PyObject *res = PyNumber_Negative(value); + Py_DECREF(value); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(UNARY_NOT) { + PyObject *value = TOP(); + int err = PyObject_IsTrue(value); + Py_DECREF(value); if (err == 0) { Py_INCREF(Py_True); SET_TOP(Py_True); @@ -1450,416 +1447,467 @@ DISPATCH(); } STACKADJ(-1); - break; - - TARGET(UNARY_INVERT) - v = TOP(); - x = PyNumber_Invert(v); - Py_DECREF(v); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_POWER) - w = POP(); - v = TOP(); - x = PyNumber_Power(v, w, Py_None); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_MULTIPLY) - w = POP(); - v = TOP(); - x = PyNumber_Multiply(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_TRUE_DIVIDE) - w = POP(); - v = TOP(); - x = PyNumber_TrueDivide(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_FLOOR_DIVIDE) - w = POP(); - v = TOP(); - x = PyNumber_FloorDivide(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_MODULO) - w = POP(); - v = TOP(); - if (PyUnicode_CheckExact(v)) - x = PyUnicode_Format(v, w); - else - x = PyNumber_Remainder(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_ADD) - w = POP(); - v = TOP(); - if (PyUnicode_CheckExact(v) && - PyUnicode_CheckExact(w)) { - x = unicode_concatenate(v, w, f, next_instr); + goto error; + } + + TARGET(UNARY_INVERT) { + PyObject *value = TOP(); + PyObject *res = PyNumber_Invert(value); + Py_DECREF(value); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_POWER) { + PyObject *exp = POP(); + PyObject *base = TOP(); + PyObject *res = PyNumber_Power(base, exp, Py_None); + Py_DECREF(base); + Py_DECREF(exp); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_MULTIPLY) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_Multiply(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_TRUE_DIVIDE) { + PyObject *divisor = POP(); + PyObject *dividend = TOP(); + PyObject *quotient = PyNumber_TrueDivide(dividend, divisor); + Py_DECREF(dividend); + Py_DECREF(divisor); + SET_TOP(quotient); + if (quotient == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_FLOOR_DIVIDE) { + PyObject *divisor = POP(); + PyObject *dividend = TOP(); + PyObject *quotient = PyNumber_FloorDivide(dividend, divisor); + Py_DECREF(dividend); + Py_DECREF(divisor); + SET_TOP(quotient); + if (quotient == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_MODULO) { + PyObject *divisor = POP(); + PyObject *dividend = TOP(); + PyObject *res = PyUnicode_CheckExact(dividend) ? + PyUnicode_Format(dividend, divisor) : + PyNumber_Remainder(dividend, divisor); + Py_DECREF(divisor); + Py_DECREF(dividend); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_ADD) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *sum; + if (PyUnicode_CheckExact(left) && + PyUnicode_CheckExact(right)) { + sum = unicode_concatenate(left, right, f, next_instr); /* unicode_concatenate consumed the ref to v */ - goto skip_decref_vx; } else { - x = PyNumber_Add(v, w); + sum = PyNumber_Add(left, right); + Py_DECREF(left); } + Py_DECREF(right); + SET_TOP(sum); + if (sum == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_SUBTRACT) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *diff = PyNumber_Subtract(left, right); + Py_DECREF(right); + Py_DECREF(left); + SET_TOP(diff); + if (diff == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_SUBSCR) { + PyObject *sub = POP(); + PyObject *container = TOP(); + PyObject *res = PyObject_GetItem(container, sub); + Py_DECREF(container); + Py_DECREF(sub); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_LSHIFT) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_Lshift(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_RSHIFT) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_Rshift(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_AND) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_And(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_XOR) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_Xor(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(BINARY_OR) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_Or(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(LIST_APPEND) { + PyObject *v = POP(); + PyObject *list = PEEK(oparg); + int err; + err = PyList_Append(list, v); Py_DECREF(v); - skip_decref_vx: - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_SUBTRACT) - w = POP(); - v = TOP(); - x = PyNumber_Subtract(v, w); + if (err != 0) + goto error; + PREDICT(JUMP_ABSOLUTE); + DISPATCH(); + } + + TARGET(SET_ADD) { + PyObject *v = POP(); + PyObject *set = stack_pointer[-oparg]; + int err; + err = PySet_Add(set, v); Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_SUBSCR) - w = POP(); - v = TOP(); - x = PyObject_GetItem(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_LSHIFT) - w = POP(); - v = TOP(); - x = PyNumber_Lshift(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_RSHIFT) - w = POP(); - v = TOP(); - x = PyNumber_Rshift(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_AND) - w = POP(); - v = TOP(); - x = PyNumber_And(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_XOR) - w = POP(); - v = TOP(); - x = PyNumber_Xor(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(BINARY_OR) - w = POP(); - v = TOP(); - x = PyNumber_Or(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(LIST_APPEND) - w = POP(); - v = PEEK(oparg); - err = PyList_Append(v, w); - Py_DECREF(w); - if (err == 0) { - PREDICT(JUMP_ABSOLUTE); - DISPATCH(); - } - break; - - TARGET(SET_ADD) - w = POP(); - v = stack_pointer[-oparg]; - err = PySet_Add(v, w); - Py_DECREF(w); - if (err == 0) { - PREDICT(JUMP_ABSOLUTE); - DISPATCH(); - } - break; - - TARGET(INPLACE_POWER) - w = POP(); - v = TOP(); - x = PyNumber_InPlacePower(v, w, Py_None); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_MULTIPLY) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceMultiply(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_TRUE_DIVIDE) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceTrueDivide(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_FLOOR_DIVIDE) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceFloorDivide(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_MODULO) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceRemainder(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_ADD) - w = POP(); - v = TOP(); - if (PyUnicode_CheckExact(v) && - PyUnicode_CheckExact(w)) { - x = unicode_concatenate(v, w, f, next_instr); + if (err != 0) + goto error; + PREDICT(JUMP_ABSOLUTE); + DISPATCH(); + } + + TARGET(INPLACE_POWER) { + PyObject *exp = POP(); + PyObject *base = TOP(); + PyObject *res = PyNumber_InPlacePower(base, exp, Py_None); + Py_DECREF(base); + Py_DECREF(exp); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_MULTIPLY) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceMultiply(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_TRUE_DIVIDE) { + PyObject *divisor = POP(); + PyObject *dividend = TOP(); + PyObject *quotient = PyNumber_InPlaceTrueDivide(dividend, divisor); + Py_DECREF(dividend); + Py_DECREF(divisor); + SET_TOP(quotient); + if (quotient == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_FLOOR_DIVIDE) { + PyObject *divisor = POP(); + PyObject *dividend = TOP(); + PyObject *quotient = PyNumber_InPlaceFloorDivide(dividend, divisor); + Py_DECREF(dividend); + Py_DECREF(divisor); + SET_TOP(quotient); + if (quotient == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_MODULO) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *mod = PyNumber_InPlaceRemainder(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(mod); + if (mod == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_ADD) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *sum; + if (PyUnicode_CheckExact(left) && PyUnicode_CheckExact(right)) { + sum = unicode_concatenate(left, right, f, next_instr); /* unicode_concatenate consumed the ref to v */ - goto skip_decref_v; } else { - x = PyNumber_InPlaceAdd(v, w); + sum = PyNumber_InPlaceAdd(left, right); + Py_DECREF(left); } - Py_DECREF(v); - skip_decref_v: - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_SUBTRACT) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceSubtract(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_LSHIFT) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceLshift(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_RSHIFT) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceRshift(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_AND) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceAnd(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_XOR) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceXor(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(INPLACE_OR) - w = POP(); - v = TOP(); - x = PyNumber_InPlaceOr(v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(STORE_SUBSCR) - w = TOP(); - v = SECOND(); - u = THIRD(); + Py_DECREF(right); + SET_TOP(sum); + if (sum == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_SUBTRACT) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *diff = PyNumber_InPlaceSubtract(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(diff); + if (diff == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_LSHIFT) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceLshift(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_RSHIFT) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceRshift(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_AND) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceAnd(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_XOR) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceXor(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(INPLACE_OR) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceOr(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(STORE_SUBSCR) { + PyObject *sub = TOP(); + PyObject *container = SECOND(); + PyObject *v = THIRD(); + int err; STACKADJ(-3); /* v[w] = u */ - err = PyObject_SetItem(v, w, u); - Py_DECREF(u); + err = PyObject_SetItem(container, sub, v); Py_DECREF(v); - Py_DECREF(w); - if (err == 0) DISPATCH(); - break; - - TARGET(DELETE_SUBSCR) - w = TOP(); - v = SECOND(); + Py_DECREF(container); + Py_DECREF(sub); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(DELETE_SUBSCR) { + PyObject *sub = TOP(); + PyObject *container = SECOND(); + int err; STACKADJ(-2); /* del v[w] */ - err = PyObject_DelItem(v, w); - Py_DECREF(v); - Py_DECREF(w); - if (err == 0) DISPATCH(); - break; - - TARGET(PRINT_EXPR) - v = POP(); - w = PySys_GetObject("displayhook"); - if (w == NULL) { + err = PyObject_DelItem(container, sub); + Py_DECREF(container); + Py_DECREF(sub); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(PRINT_EXPR) { + PyObject *value = POP(); + PyObject *hook = PySys_GetObject("displayhook"); + if (hook == NULL) { PyErr_SetString(PyExc_RuntimeError, "lost sys.displayhook"); - err = -1; - x = NULL; + Py_DECREF(value); + goto error; } - if (err == 0) { - x = PyTuple_Pack(1, v); - if (x == NULL) - err = -1; - } - if (err == 0) { - w = PyEval_CallObject(w, x); - Py_XDECREF(w); - if (w == NULL) - err = -1; - } - Py_DECREF(v); - Py_XDECREF(x); - break; + PyObject *res = PyObject_CallFunctionObjArgs(hook, value, NULL); + Py_DECREF(value); + if (res == NULL) + goto error; + Py_DECREF(res); + DISPATCH(); + } #ifdef CASE_TOO_BIG default: switch (opcode) { #endif - TARGET(RAISE_VARARGS) - v = w = NULL; + TARGET(RAISE_VARARGS) { + PyObject *cause = NULL, *exc = NULL; switch (oparg) { case 2: - v = POP(); /* cause */ + cause = POP(); /* cause */ case 1: - w = POP(); /* exc */ + exc = POP(); /* exc */ case 0: /* Fallthrough */ - why = do_raise(w, v); + if (do_raise(exc, cause)) { + why = WHY_EXCEPTION; + goto fast_block_end; + } break; default: PyErr_SetString(PyExc_SystemError, "bad RAISE_VARARGS oparg"); - why = WHY_EXCEPTION; break; } - break; - - TARGET(STORE_LOCALS) - x = POP(); - v = f->f_locals; - Py_XDECREF(v); - f->f_locals = x; + goto error; + } + + TARGET(STORE_LOCALS) { + PyObject *locals = POP(); + PyObject *old = f->f_locals; + Py_XDECREF(old); + f->f_locals = locals; DISPATCH(); - - TARGET(RETURN_VALUE) + } + + TARGET(RETURN_VALUE) { retval = POP(); why = WHY_RETURN; goto fast_block_end; - - TARGET(YIELD_FROM) - u = POP(); - x = TOP(); - /* send u to x */ - if (PyGen_CheckExact(x)) { - retval = _PyGen_Send((PyGenObject *)x, u); + } + + TARGET(YIELD_FROM) { + PyObject *v = POP(); + PyObject *reciever = TOP(); + int err; + if (PyGen_CheckExact(reciever)) { + retval = _PyGen_Send((PyGenObject *)reciever, v); } else { _Py_IDENTIFIER(send); - if (u == Py_None) - retval = Py_TYPE(x)->tp_iternext(x); + if (v == Py_None) + retval = Py_TYPE(reciever)->tp_iternext(reciever); else - retval = _PyObject_CallMethodId(x, &PyId_send, "O", u); + retval = _PyObject_CallMethodId(reciever, &PyId_send, "O", v); } - Py_DECREF(u); - if (!retval) { + Py_DECREF(v); + if (retval == NULL) { PyObject *val; - x = POP(); /* Remove iter from stack */ - Py_DECREF(x); err = _PyGen_FetchStopIterationValue(&val); - if (err < 0) { - x = NULL; - break; - } - x = val; - PUSH(x); - continue; + if (err < 0) + goto error; + Py_DECREF(reciever); + SET_TOP(val); + DISPATCH(); } /* x remains on stack, retval is value to be yielded */ f->f_stacktop = stack_pointer; @@ -1867,39 +1915,38 @@ /* and repeat... */ f->f_lasti--; goto fast_yield; - - TARGET(YIELD_VALUE) + } + + TARGET(YIELD_VALUE) { retval = POP(); f->f_stacktop = stack_pointer; why = WHY_YIELD; goto fast_yield; - - TARGET(POP_EXCEPT) - { - PyTryBlock *b = PyFrame_BlockPop(f); - if (b->b_type != EXCEPT_HANDLER) { - PyErr_SetString(PyExc_SystemError, - "popped block is not an except handler"); - why = WHY_EXCEPTION; - break; - } - UNWIND_EXCEPT_HANDLER(b); + } + + TARGET(POP_EXCEPT) { + PyTryBlock *b = PyFrame_BlockPop(f); + if (b->b_type != EXCEPT_HANDLER) { + PyErr_SetString(PyExc_SystemError, + "popped block is not an except handler"); + goto error; } + UNWIND_EXCEPT_HANDLER(b); DISPATCH(); - - TARGET(POP_BLOCK) - { - PyTryBlock *b = PyFrame_BlockPop(f); - UNWIND_BLOCK(b); - } + } + + TARGET(POP_BLOCK) { + PyTryBlock *b = PyFrame_BlockPop(f); + UNWIND_BLOCK(b); DISPATCH(); + } PREDICTED(END_FINALLY); - TARGET(END_FINALLY) - v = POP(); - if (PyLong_Check(v)) { - why = (enum why_code) PyLong_AS_LONG(v); - assert(why != WHY_YIELD); + TARGET(END_FINALLY) { + PyObject *status = POP(); + if (PyLong_Check(status)) { + why = (enum why_code) PyLong_AS_LONG(status); + assert(why != WHY_YIELD && why != WHY_EXCEPTION); if (why == WHY_RETURN || why == WHY_CONTINUE) retval = POP(); @@ -1912,255 +1959,281 @@ assert(b->b_type == EXCEPT_HANDLER); UNWIND_EXCEPT_HANDLER(b); why = WHY_NOT; + Py_DECREF(status); + DISPATCH(); } + Py_DECREF(status); + goto fast_block_end; } - else if (PyExceptionClass_Check(v)) { - w = POP(); - u = POP(); - PyErr_Restore(v, w, u); - why = WHY_RERAISE; - break; + else if (PyExceptionClass_Check(status)) { + PyObject *exc = POP(); + PyObject *tb = POP(); + PyErr_Restore(status, exc, tb); + why = WHY_EXCEPTION; + goto fast_block_end; } - else if (v != Py_None) { + else if (status != Py_None) { PyErr_SetString(PyExc_SystemError, "'finally' pops bad exception"); - why = WHY_EXCEPTION; + Py_DECREF(status); + goto error; } - Py_DECREF(v); - break; - - TARGET(LOAD_BUILD_CLASS) - { + Py_DECREF(status); + DISPATCH(); + } + + TARGET(LOAD_BUILD_CLASS) { _Py_IDENTIFIER(__build_class__); + PyObject *bc; if (PyDict_CheckExact(f->f_builtins)) { - x = _PyDict_GetItemId(f->f_builtins, &PyId___build_class__); - if (x == NULL) { + bc = _PyDict_GetItemId(f->f_builtins, &PyId___build_class__); + if (bc == NULL) { PyErr_SetString(PyExc_NameError, "__build_class__ not found"); - break; + goto error; } - Py_INCREF(x); + Py_INCREF(bc); } else { PyObject *build_class_str = _PyUnicode_FromId(&PyId___build_class__); if (build_class_str == NULL) break; - x = PyObject_GetItem(f->f_builtins, build_class_str); - if (x == NULL) { + bc = PyObject_GetItem(f->f_builtins, build_class_str); + if (bc == NULL) { if (PyErr_ExceptionMatches(PyExc_KeyError)) PyErr_SetString(PyExc_NameError, "__build_class__ not found"); - break; + goto error; } } - PUSH(x); + PUSH(bc); DISPATCH(); } - TARGET(STORE_NAME) - w = GETITEM(names, oparg); - v = POP(); - if ((x = f->f_locals) != NULL) { - if (PyDict_CheckExact(x)) - err = PyDict_SetItem(x, w, v); - else - err = PyObject_SetItem(x, w, v); + TARGET(STORE_NAME) { + PyObject *name = GETITEM(names, oparg); + PyObject *v = POP(); + PyObject *ns = f->f_locals; + int err; + if (ns == NULL) { + PyErr_Format(PyExc_SystemError, + "no locals found when storing %R", name); Py_DECREF(v); - if (err == 0) DISPATCH(); - break; + goto error; } - PyErr_Format(PyExc_SystemError, - "no locals found when storing %R", w); - break; - - TARGET(DELETE_NAME) - w = GETITEM(names, oparg); - if ((x = f->f_locals) != NULL) { - if ((err = PyObject_DelItem(x, w)) != 0) { - format_exc_check_arg(PyExc_NameError, - NAME_ERROR_MSG, - w); - break; + if (PyDict_CheckExact(ns)) + err = PyDict_SetItem(ns, name, v); + else + err = PyObject_SetItem(ns, name, v); + Py_DECREF(v); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(DELETE_NAME) { + PyObject *name = GETITEM(names, oparg); + PyObject *ns = f->f_locals; + int err; + if (ns == NULL) { + PyErr_Format(PyExc_SystemError, + "no locals when deleting %R", name); + goto error; + } + err = PyObject_DelItem(ns, name); + if (err != 0) { + format_exc_check_arg(PyExc_NameError, + NAME_ERROR_MSG, + name); + goto error; + } + DISPATCH(); + } + + PREDICTED_WITH_ARG(UNPACK_SEQUENCE); + TARGET(UNPACK_SEQUENCE) { + PyObject *seq = POP(), *item, **items; + if (PyTuple_CheckExact(seq) && + PyTuple_GET_SIZE(seq) == oparg) { + items = ((PyTupleObject *)seq)->ob_item; + while (oparg--) { + item = items[oparg]; + Py_INCREF(item); + PUSH(item); } - DISPATCH(); - } - PyErr_Format(PyExc_SystemError, - "no locals when deleting %R", w); - break; - - PREDICTED_WITH_ARG(UNPACK_SEQUENCE); - TARGET(UNPACK_SEQUENCE) - v = POP(); - if (PyTuple_CheckExact(v) && - PyTuple_GET_SIZE(v) == oparg) { - PyObject **items = \ - ((PyTupleObject *)v)->ob_item; + } else if (PyList_CheckExact(seq) && + PyList_GET_SIZE(seq) == oparg) { + items = ((PyListObject *)seq)->ob_item; while (oparg--) { - w = items[oparg]; - Py_INCREF(w); - PUSH(w); + item = items[oparg]; + Py_INCREF(item); + PUSH(item); } - } else if (PyList_CheckExact(v) && - PyList_GET_SIZE(v) == oparg) { - PyObject **items = \ - ((PyListObject *)v)->ob_item; - while (oparg--) { - w = items[oparg]; - Py_INCREF(w); - PUSH(w); - } - } else if (unpack_iterable(v, oparg, -1, + } else if (unpack_iterable(seq, oparg, -1, stack_pointer + oparg)) { STACKADJ(oparg); } else { /* unpack_iterable() raised an exception */ - why = WHY_EXCEPTION; - Py_DECREF(v); - break; + Py_DECREF(seq); + goto error; } - Py_DECREF(v); + Py_DECREF(seq); DISPATCH(); - - TARGET(UNPACK_EX) - { + } + + TARGET(UNPACK_EX) { int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8); - v = POP(); - - if (unpack_iterable(v, oparg & 0xFF, oparg >> 8, + PyObject *seq = POP(); + + if (unpack_iterable(seq, oparg & 0xFF, oparg >> 8, stack_pointer + totalargs)) { stack_pointer += totalargs; } else { - Py_DECREF(v); - why = WHY_EXCEPTION; - break; + Py_DECREF(seq); + goto error; } - Py_DECREF(v); + Py_DECREF(seq); DISPATCH(); } - TARGET(STORE_ATTR) - w = GETITEM(names, oparg); - v = TOP(); - u = SECOND(); + TARGET(STORE_ATTR) { + PyObject *name = GETITEM(names, oparg); + PyObject *owner = TOP(); + PyObject *v = SECOND(); + int err; STACKADJ(-2); - err = PyObject_SetAttr(v, w, u); /* v.w = u */ + err = PyObject_SetAttr(owner, name, v); Py_DECREF(v); - Py_DECREF(u); - if (err == 0) DISPATCH(); - break; - - TARGET(DELETE_ATTR) - w = GETITEM(names, oparg); - v = POP(); - err = PyObject_SetAttr(v, w, (PyObject *)NULL); - /* del v.w */ + Py_DECREF(owner); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(DELETE_ATTR) { + PyObject *name = GETITEM(names, oparg); + PyObject *owner = POP(); + int err; + err = PyObject_SetAttr(owner, name, (PyObject *)NULL); + Py_DECREF(owner); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(STORE_GLOBAL) { + PyObject *name = GETITEM(names, oparg); + PyObject *v = POP(); + int err; + err = PyDict_SetItem(f->f_globals, name, v); Py_DECREF(v); - if (err == 0) DISPATCH(); - break; - - TARGET(STORE_GLOBAL) - w = GETITEM(names, oparg); - v = POP(); - err = PyDict_SetItem(f->f_globals, w, v); - Py_DECREF(v); - if (err == 0) DISPATCH(); - break; - - TARGET(DELETE_GLOBAL) - w = GETITEM(names, oparg); - if ((err = PyDict_DelItem(f->f_globals, w)) != 0) { + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(DELETE_GLOBAL) { + PyObject *name = GETITEM(names, oparg); + int err; + err = PyDict_DelItem(f->f_globals, name); + if (err != 0) { format_exc_check_arg( - PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w); - break; + PyExc_NameError, GLOBAL_NAME_ERROR_MSG, name); + goto error; } DISPATCH(); - - TARGET(LOAD_NAME) - w = GETITEM(names, oparg); - if ((v = f->f_locals) == NULL) { + } + + TARGET(LOAD_NAME) { + PyObject *name = GETITEM(names, oparg); + PyObject *locals = f->f_locals; + PyObject *v; + if (locals == NULL) { PyErr_Format(PyExc_SystemError, - "no locals when loading %R", w); - why = WHY_EXCEPTION; - break; + "no locals when loading %R", name); + goto error; } - if (PyDict_CheckExact(v)) { - x = PyDict_GetItem(v, w); - Py_XINCREF(x); + if (PyDict_CheckExact(locals)) { + v = PyDict_GetItem(locals, name); + Py_XINCREF(v); } else { - x = PyObject_GetItem(v, w); - if (x == NULL && PyErr_Occurred()) { + v = PyObject_GetItem(locals, name); + if (v == NULL && PyErr_Occurred()) { if (!PyErr_ExceptionMatches( PyExc_KeyError)) break; PyErr_Clear(); } } - if (x == NULL) { - x = PyDict_GetItem(f->f_globals, w); - Py_XINCREF(x); - if (x == NULL) { + if (v == NULL) { + v = PyDict_GetItem(f->f_globals, name); + Py_XINCREF(v); + if (v == NULL) { if (PyDict_CheckExact(f->f_builtins)) { - x = PyDict_GetItem(f->f_builtins, w); - if (x == NULL) { + v = PyDict_GetItem(f->f_builtins, name); + if (v == NULL) { format_exc_check_arg( PyExc_NameError, - NAME_ERROR_MSG, w); - break; + NAME_ERROR_MSG, name); + goto error; } - Py_INCREF(x); + Py_INCREF(v); } else { - x = PyObject_GetItem(f->f_builtins, w); - if (x == NULL) { + v = PyObject_GetItem(f->f_builtins, name); + if (v == NULL) { if (PyErr_ExceptionMatches(PyExc_KeyError)) format_exc_check_arg( PyExc_NameError, - NAME_ERROR_MSG, w); - break; + NAME_ERROR_MSG, name); + goto error; } } } } - PUSH(x); + PUSH(v); DISPATCH(); - - TARGET(LOAD_GLOBAL) - w = GETITEM(names, oparg); + } + + TARGET(LOAD_GLOBAL) { + PyObject *name = GETITEM(names, oparg); + PyObject *v; if (PyDict_CheckExact(f->f_globals) && PyDict_CheckExact(f->f_builtins)) { - x = _PyDict_LoadGlobal((PyDictObject *)f->f_globals, + v = _PyDict_LoadGlobal((PyDictObject *)f->f_globals, (PyDictObject *)f->f_builtins, - w); - if (x == NULL) { + name); + if (v == NULL) { if (!PyErr_Occurred()) format_exc_check_arg(PyExc_NameError, - GLOBAL_NAME_ERROR_MSG, w); - break; + GLOBAL_NAME_ERROR_MSG, name); + goto error; } - Py_INCREF(x); + Py_INCREF(v); } else { /* Slow-path if globals or builtins is not a dict */ - x = PyObject_GetItem(f->f_globals, w); - if (x == NULL) { - x = PyObject_GetItem(f->f_builtins, w); - if (x == NULL) { + v = PyObject_GetItem(f->f_globals, name); + if (v == NULL) { + v = PyObject_GetItem(f->f_builtins, name); + if (v == NULL) { if (PyErr_ExceptionMatches(PyExc_KeyError)) format_exc_check_arg( PyExc_NameError, - GLOBAL_NAME_ERROR_MSG, w); - break; + GLOBAL_NAME_ERROR_MSG, name); + goto error; } } } - PUSH(x); + PUSH(v); DISPATCH(); - - TARGET(DELETE_FAST) - x = GETLOCAL(oparg); - if (x != NULL) { + } + + TARGET(DELETE_FAST) { + PyObject *v = GETLOCAL(oparg); + if (v != NULL) { SETLOCAL(oparg, NULL); DISPATCH(); } @@ -2169,252 +2242,277 @@ UNBOUNDLOCAL_ERROR_MSG, PyTuple_GetItem(co->co_varnames, oparg) ); - break; - - TARGET(DELETE_DEREF) - x = freevars[oparg]; - if (PyCell_GET(x) != NULL) { - PyCell_Set(x, NULL); + goto error; + } + + TARGET(DELETE_DEREF) { + PyObject *cell = freevars[oparg]; + if (PyCell_GET(cell) != NULL) { + PyCell_Set(cell, NULL); DISPATCH(); } - err = -1; format_exc_unbound(co, oparg); - break; - - TARGET(LOAD_CLOSURE) - x = freevars[oparg]; - Py_INCREF(x); - PUSH(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(LOAD_DEREF) - x = freevars[oparg]; - w = PyCell_Get(x); - if (w != NULL) { - PUSH(w); - DISPATCH(); + goto error; + } + + TARGET(LOAD_CLOSURE) { + PyObject *cell = freevars[oparg]; + Py_INCREF(cell); + PUSH(cell); + DISPATCH(); + } + + TARGET(LOAD_DEREF) { + PyObject *cell = freevars[oparg]; + PyObject *value = PyCell_GET(cell); + if (value == NULL) { + format_exc_unbound(co, oparg); + goto error; } - err = -1; - format_exc_unbound(co, oparg); - break; - - TARGET(STORE_DEREF) - w = POP(); - x = freevars[oparg]; - PyCell_Set(x, w); - Py_DECREF(w); + Py_INCREF(value); + PUSH(value); DISPATCH(); - - TARGET(BUILD_TUPLE) - x = PyTuple_New(oparg); - if (x != NULL) { - for (; --oparg >= 0;) { - w = POP(); - PyTuple_SET_ITEM(x, oparg, w); - } - PUSH(x); - DISPATCH(); + } + + TARGET(STORE_DEREF) { + PyObject *v = POP(); + PyObject *cell = freevars[oparg]; + PyCell_Set(cell, v); + Py_DECREF(v); + DISPATCH(); + } + + TARGET(BUILD_TUPLE) { + PyObject *tup = PyTuple_New(oparg); + if (tup == NULL) + goto error; + while (--oparg >= 0) { + PyObject *item = POP(); + PyTuple_SET_ITEM(tup, oparg, item); } - break; - - TARGET(BUILD_LIST) - x = PyList_New(oparg); - if (x != NULL) { - for (; --oparg >= 0;) { - w = POP(); - PyList_SET_ITEM(x, oparg, w); - } - PUSH(x); - DISPATCH(); + PUSH(tup); + DISPATCH(); + } + + TARGET(BUILD_LIST) { + PyObject *list = PyList_New(oparg); + if (list == NULL) + goto error; + while (--oparg >= 0) { + PyObject *item = POP(); + PyList_SET_ITEM(list, oparg, item); } - break; - - TARGET(BUILD_SET) - x = PySet_New(NULL); - if (x != NULL) { - for (; --oparg >= 0;) { - w = POP(); - if (err == 0) - err = PySet_Add(x, w); - Py_DECREF(w); - } - if (err != 0) { - Py_DECREF(x); - break; - } - PUSH(x); - DISPATCH(); + PUSH(list); + DISPATCH(); + } + + TARGET(BUILD_SET) { + PyObject *set = PySet_New(NULL); + int err = 0; + if (set == NULL) + goto error; + while (--oparg >= 0) { + PyObject *item = POP(); + if (err == 0) + err = PySet_Add(set, item); + Py_DECREF(item); } - break; - - TARGET(BUILD_MAP) - x = _PyDict_NewPresized((Py_ssize_t)oparg); - PUSH(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(STORE_MAP) - w = TOP(); /* key */ - u = SECOND(); /* value */ - v = THIRD(); /* dict */ + if (err != 0) { + Py_DECREF(set); + goto error; + } + PUSH(set); + DISPATCH(); + } + + TARGET(BUILD_MAP) { + PyObject *map = _PyDict_NewPresized((Py_ssize_t)oparg); + if (map == NULL) + goto error; + PUSH(map); + DISPATCH(); + } + + TARGET(STORE_MAP) { + PyObject *key = TOP(); + PyObject *value = SECOND(); + PyObject *map = THIRD(); + int err; STACKADJ(-2); - assert (PyDict_CheckExact(v)); - err = PyDict_SetItem(v, w, u); /* v[w] = u */ - Py_DECREF(u); - Py_DECREF(w); - if (err == 0) DISPATCH(); - break; - - TARGET(MAP_ADD) - w = TOP(); /* key */ - u = SECOND(); /* value */ + assert(PyDict_CheckExact(map)); + err = PyDict_SetItem(map, key, value); + Py_DECREF(value); + Py_DECREF(key); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(MAP_ADD) { + PyObject *key = TOP(); + PyObject *value = SECOND(); + PyObject *map; + int err; STACKADJ(-2); - v = stack_pointer[-oparg]; /* dict */ - assert (PyDict_CheckExact(v)); - err = PyDict_SetItem(v, w, u); /* v[w] = u */ - Py_DECREF(u); - Py_DECREF(w); - if (err == 0) { - PREDICT(JUMP_ABSOLUTE); - DISPATCH(); - } - break; - - TARGET(LOAD_ATTR) - w = GETITEM(names, oparg); - v = TOP(); - x = PyObject_GetAttr(v, w); - Py_DECREF(v); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(COMPARE_OP) - w = POP(); - v = TOP(); - x = cmp_outcome(oparg, v, w); - Py_DECREF(v); - Py_DECREF(w); - SET_TOP(x); - if (x == NULL) break; + map = stack_pointer[-oparg]; /* dict */ + assert(PyDict_CheckExact(map)); + err = PyDict_SetItem(map, key, value); /* v[w] = u */ + Py_DECREF(value); + Py_DECREF(key); + if (err != 0) + goto error; + PREDICT(JUMP_ABSOLUTE); + DISPATCH(); + } + + TARGET(LOAD_ATTR) { + PyObject *name = GETITEM(names, oparg); + PyObject *owner = TOP(); + PyObject *res = PyObject_GetAttr(owner, name); + Py_DECREF(owner); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(COMPARE_OP) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = cmp_outcome(oparg, left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; PREDICT(POP_JUMP_IF_FALSE); PREDICT(POP_JUMP_IF_TRUE); DISPATCH(); - - TARGET(IMPORT_NAME) - { + } + + TARGET(IMPORT_NAME) { _Py_IDENTIFIER(__import__); - w = GETITEM(names, oparg); - x = _PyDict_GetItemId(f->f_builtins, &PyId___import__); - if (x == NULL) { + PyObject *name = GETITEM(names, oparg); + PyObject *func = _PyDict_GetItemId(f->f_builtins, &PyId___import__); + PyObject *from, *level, *args; + if (func == NULL) { PyErr_SetString(PyExc_ImportError, "__import__ not found"); - break; + goto error; } - Py_INCREF(x); - v = POP(); - u = TOP(); - if (PyLong_AsLong(u) != -1 || PyErr_Occurred()) - w = PyTuple_Pack(5, - w, + Py_INCREF(func); + from = POP(); + level = TOP(); + if (PyLong_AsLong(level) != -1 || PyErr_Occurred()) + args = PyTuple_Pack(5, + name, f->f_globals, f->f_locals == NULL ? Py_None : f->f_locals, - v, - u); + from, + level); else - w = PyTuple_Pack(4, - w, + args = PyTuple_Pack(4, + name, f->f_globals, f->f_locals == NULL ? Py_None : f->f_locals, - v); - Py_DECREF(v); - Py_DECREF(u); - if (w == NULL) { - u = POP(); - Py_DECREF(x); - x = NULL; - break; + from); + Py_DECREF(level); + Py_DECREF(from); + if (args == NULL) { + Py_DECREF(func); + STACKADJ(-1); + goto error; } READ_TIMESTAMP(intr0); - v = x; - x = PyEval_CallObject(v, w); - Py_DECREF(v); + PyObject *res = PyEval_CallObject(func, args); READ_TIMESTAMP(intr1); - Py_DECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; + Py_DECREF(args); + Py_DECREF(func); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); } - TARGET(IMPORT_STAR) - v = POP(); + TARGET(IMPORT_STAR) { + PyObject *from = POP(), *locals; + int err; PyFrame_FastToLocals(f); - if ((x = f->f_locals) == NULL) { + locals = f->f_locals; + if (locals == NULL) { PyErr_SetString(PyExc_SystemError, "no locals found during 'import *'"); - break; + goto error; } READ_TIMESTAMP(intr0); - err = import_all_from(x, v); + err = import_all_from(locals, from); READ_TIMESTAMP(intr1); PyFrame_LocalsToFast(f, 0); - Py_DECREF(v); - if (err == 0) DISPATCH(); - break; - - TARGET(IMPORT_FROM) - w = GETITEM(names, oparg); - v = TOP(); + Py_DECREF(from); + if (err != 0) + goto error; + DISPATCH(); + } + + TARGET(IMPORT_FROM) { + PyObject *name = GETITEM(names, oparg); + PyObject *from = TOP(); + PyObject *res; READ_TIMESTAMP(intr0); - x = import_from(v, w); + res = import_from(from, name); READ_TIMESTAMP(intr1); - PUSH(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(JUMP_FORWARD) + PUSH(res); + if (res == NULL) + goto error; + DISPATCH(); + } + + TARGET(JUMP_FORWARD) { JUMPBY(oparg); FAST_DISPATCH(); + } PREDICTED_WITH_ARG(POP_JUMP_IF_FALSE); - TARGET(POP_JUMP_IF_FALSE) - w = POP(); - if (w == Py_True) { - Py_DECREF(w); + TARGET(POP_JUMP_IF_FALSE) { + PyObject *cond = POP(); + int err; + if (cond == Py_True) { + Py_DECREF(cond); FAST_DISPATCH(); } - if (w == Py_False) { - Py_DECREF(w); + if (cond == Py_False) { + Py_DECREF(cond); JUMPTO(oparg); FAST_DISPATCH(); } - err = PyObject_IsTrue(w); - Py_DECREF(w); + err = PyObject_IsTrue(cond); + Py_DECREF(cond); if (err > 0) err = 0; else if (err == 0) JUMPTO(oparg); else - break; + goto error; DISPATCH(); + } PREDICTED_WITH_ARG(POP_JUMP_IF_TRUE); - TARGET(POP_JUMP_IF_TRUE) - w = POP(); - if (w == Py_False) { - Py_DECREF(w); + TARGET(POP_JUMP_IF_TRUE) { + PyObject *cond = POP(); + int err; + if (cond == Py_False) { + Py_DECREF(cond); FAST_DISPATCH(); } - if (w == Py_True) { - Py_DECREF(w); + if (cond == Py_True) { + Py_DECREF(cond); JUMPTO(oparg); FAST_DISPATCH(); } - err = PyObject_IsTrue(w); - Py_DECREF(w); + err = PyObject_IsTrue(cond); + Py_DECREF(cond); if (err > 0) { err = 0; JUMPTO(oparg); @@ -2422,58 +2520,63 @@ else if (err == 0) ; else - break; + goto error; DISPATCH(); - - TARGET(JUMP_IF_FALSE_OR_POP) - w = TOP(); - if (w == Py_True) { + } + + TARGET(JUMP_IF_FALSE_OR_POP) { + PyObject *cond = TOP(); + int err; + if (cond == Py_True) { STACKADJ(-1); - Py_DECREF(w); + Py_DECREF(cond); FAST_DISPATCH(); } - if (w == Py_False) { + if (cond == Py_False) { JUMPTO(oparg); FAST_DISPATCH(); } - err = PyObject_IsTrue(w); + err = PyObject_IsTrue(cond); if (err > 0) { STACKADJ(-1); - Py_DECREF(w); + Py_DECREF(cond); err = 0; } else if (err == 0) JUMPTO(oparg); else - break; + goto error; DISPATCH(); - - TARGET(JUMP_IF_TRUE_OR_POP) - w = TOP(); - if (w == Py_False) { + } + + TARGET(JUMP_IF_TRUE_OR_POP) { + PyObject *cond = TOP(); + int err; + if (cond == Py_False) { STACKADJ(-1); - Py_DECREF(w); + Py_DECREF(cond); FAST_DISPATCH(); } - if (w == Py_True) { + if (cond == Py_True) { JUMPTO(oparg); FAST_DISPATCH(); } - err = PyObject_IsTrue(w); + err = PyObject_IsTrue(cond); if (err > 0) { err = 0; JUMPTO(oparg); } else if (err == 0) { STACKADJ(-1); - Py_DECREF(w); + Py_DECREF(cond); } else - break; + goto error; DISPATCH(); + } PREDICTED_WITH_ARG(JUMP_ABSOLUTE); - TARGET(JUMP_ABSOLUTE) + TARGET(JUMP_ABSOLUTE) { JUMPTO(oparg); #if FAST_LOOPS /* Enabling this path speeds-up all while and for-loops by bypassing @@ -2487,60 +2590,60 @@ #else DISPATCH(); #endif - - TARGET(GET_ITER) + } + + TARGET(GET_ITER) { /* before: [obj]; after [getiter(obj)] */ - v = TOP(); - x = PyObject_GetIter(v); - Py_DECREF(v); - if (x != NULL) { - SET_TOP(x); - PREDICT(FOR_ITER); - DISPATCH(); - } - STACKADJ(-1); - break; + PyObject *iterable = TOP(); + PyObject *iter = PyObject_GetIter(iterable); + Py_DECREF(iterable); + SET_TOP(iter); + if (iter == NULL) + goto error; + PREDICT(FOR_ITER); + DISPATCH(); + } PREDICTED_WITH_ARG(FOR_ITER); - TARGET(FOR_ITER) + TARGET(FOR_ITER) { /* before: [iter]; after: [iter, iter()] *or* [] */ - v = TOP(); - x = (*v->ob_type->tp_iternext)(v); - if (x != NULL) { - PUSH(x); + PyObject *iter = TOP(); + PyObject *next = (*iter->ob_type->tp_iternext)(iter); + if (next != NULL) { + PUSH(next); PREDICT(STORE_FAST); PREDICT(UNPACK_SEQUENCE); DISPATCH(); } if (PyErr_Occurred()) { - if (!PyErr_ExceptionMatches( - PyExc_StopIteration)) - break; + if (!PyErr_ExceptionMatches(PyExc_StopIteration)) + goto error; PyErr_Clear(); } /* iterator ended normally */ - x = v = POP(); - Py_DECREF(v); + STACKADJ(-1); + Py_DECREF(iter); JUMPBY(oparg); DISPATCH(); - - TARGET(BREAK_LOOP) + } + + TARGET(BREAK_LOOP) { why = WHY_BREAK; goto fast_block_end; - - TARGET(CONTINUE_LOOP) + } + + TARGET(CONTINUE_LOOP) { retval = PyLong_FromLong(oparg); - if (!retval) { - x = NULL; - break; - } + if (retval == NULL) + goto error; why = WHY_CONTINUE; goto fast_block_end; + } TARGET_WITH_IMPL(SETUP_LOOP, _setup_finally) TARGET_WITH_IMPL(SETUP_EXCEPT, _setup_finally) TARGET(SETUP_FINALLY) - _setup_finally: + _setup_finally: { /* NOTE: If you add any new block-setup opcodes that are not try/except/finally handlers, you may need to update the PyGen_NeedsFinalizing() function. @@ -2549,37 +2652,35 @@ PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg, STACK_LEVEL()); DISPATCH(); - - TARGET(SETUP_WITH) - { + } + + TARGET(SETUP_WITH) { _Py_IDENTIFIER(__exit__); _Py_IDENTIFIER(__enter__); - w = TOP(); - x = special_lookup(w, &PyId___exit__); - if (!x) - break; - SET_TOP(x); - u = special_lookup(w, &PyId___enter__); - Py_DECREF(w); - if (!u) { - x = NULL; - break; - } - x = PyObject_CallFunctionObjArgs(u, NULL); - Py_DECREF(u); - if (!x) - break; + PyObject *mgr = TOP(); + PyObject *exit = special_lookup(mgr, &PyId___exit__), *enter; + PyObject *res; + if (exit == NULL) + goto error; + SET_TOP(exit); + enter = special_lookup(mgr, &PyId___enter__); + Py_DECREF(mgr); + if (enter == NULL) + goto error; + res = PyObject_CallFunctionObjArgs(enter, NULL); + Py_DECREF(enter); + if (res == NULL) + goto error; /* Setup the finally block before pushing the result of __enter__ on the stack. */ PyFrame_BlockSetup(f, SETUP_FINALLY, INSTR_OFFSET() + oparg, STACK_LEVEL()); - PUSH(x); + PUSH(res); DISPATCH(); } - TARGET(WITH_CLEANUP) - { + TARGET(WITH_CLEANUP) { /* At the top of the stack are 1-3 values indicating how/why we entered the finally clause: - TOP = None @@ -2606,42 +2707,42 @@ */ PyObject *exit_func; - u = TOP(); - if (u == Py_None) { + PyObject *exc = TOP(), *val = Py_None, *tb = Py_None, *res; + int err; + if (exc == Py_None) { (void)POP(); exit_func = TOP(); - SET_TOP(u); - v = w = Py_None; + SET_TOP(exc); } - else if (PyLong_Check(u)) { - (void)POP(); - switch(PyLong_AsLong(u)) { + else if (PyLong_Check(exc)) { + STACKADJ(-1); + switch (PyLong_AsLong(exc)) { case WHY_RETURN: case WHY_CONTINUE: /* Retval in TOP. */ exit_func = SECOND(); SET_SECOND(TOP()); - SET_TOP(u); + SET_TOP(exc); break; default: exit_func = TOP(); - SET_TOP(u); + SET_TOP(exc); break; } - u = v = w = Py_None; + exc = Py_None; } else { - PyObject *tp, *exc, *tb; + PyObject *tp2, *exc2, *tb2; PyTryBlock *block; - v = SECOND(); - w = THIRD(); - tp = FOURTH(); - exc = PEEK(5); - tb = PEEK(6); + val = SECOND(); + tb = THIRD(); + tp2 = FOURTH(); + exc2 = PEEK(5); + tb2 = PEEK(6); exit_func = PEEK(7); - SET_VALUE(7, tb); - SET_VALUE(6, exc); - SET_VALUE(5, tp); + SET_VALUE(7, tb2); + SET_VALUE(6, exc2); + SET_VALUE(5, tp2); /* UNWIND_EXCEPT_HANDLER will pop this off. */ SET_FOURTH(NULL); /* We just shifted the stack down, so we have @@ -2652,56 +2753,53 @@ block->b_level--; } /* XXX Not the fastest way to call it... */ - x = PyObject_CallFunctionObjArgs(exit_func, u, v, w, - NULL); + res = PyObject_CallFunctionObjArgs(exit_func, exc, val, tb, NULL); Py_DECREF(exit_func); - if (x == NULL) - break; /* Go to error exit */ - - if (u != Py_None) - err = PyObject_IsTrue(x); + if (res == NULL) + goto error; + + if (exc != Py_None) + err = PyObject_IsTrue(res); else err = 0; - Py_DECREF(x); + Py_DECREF(res); if (err < 0) - break; /* Go to error exit */ + goto error; else if (err > 0) { err = 0; /* There was an exception and a True return */ PUSH(PyLong_FromLong((long) WHY_SILENCED)); } PREDICT(END_FINALLY); - break; + DISPATCH(); } - TARGET(CALL_FUNCTION) - { - PyObject **sp; + TARGET(CALL_FUNCTION) { + PyObject **sp, *res; PCALL(PCALL_ALL); sp = stack_pointer; #ifdef WITH_TSC - x = call_function(&sp, oparg, &intr0, &intr1); + res = call_function(&sp, oparg, &intr0, &intr1); #else - x = call_function(&sp, oparg); + res = call_function(&sp, oparg); #endif stack_pointer = sp; - PUSH(x); - if (x != NULL) - DISPATCH(); - break; + PUSH(res); + if (res == NULL) + goto error; + DISPATCH(); } TARGET_WITH_IMPL(CALL_FUNCTION_VAR, _call_function_var_kw) TARGET_WITH_IMPL(CALL_FUNCTION_KW, _call_function_var_kw) TARGET(CALL_FUNCTION_VAR_KW) - _call_function_var_kw: - { + _call_function_var_kw: { int na = oparg & 0xff; int nk = (oparg>>8) & 0xff; int flags = (opcode - CALL_FUNCTION) & 3; int n = na + 2 * nk; - PyObject **pfunc, *func, **sp; + PyObject **pfunc, *func, **sp, *res; PCALL(PCALL_ALL); if (flags & CALL_FLAG_VAR) n++; @@ -2724,137 +2822,156 @@ Py_INCREF(func); sp = stack_pointer; READ_TIMESTAMP(intr0); - x = ext_do_call(func, &sp, flags, na, nk); + res = ext_do_call(func, &sp, flags, na, nk); READ_TIMESTAMP(intr1); stack_pointer = sp; Py_DECREF(func); while (stack_pointer > pfunc) { - w = POP(); - Py_DECREF(w); + PyObject *o = POP(); + Py_DECREF(o); } - PUSH(x); - if (x != NULL) - DISPATCH(); - break; + PUSH(res); + if (res == NULL) + goto error; + DISPATCH(); } TARGET_WITH_IMPL(MAKE_CLOSURE, _make_function) TARGET(MAKE_FUNCTION) - _make_function: - { + _make_function: { int posdefaults = oparg & 0xff; int kwdefaults = (oparg>>8) & 0xff; int num_annotations = (oparg >> 16) & 0x7fff; - w = POP(); /* qualname */ - v = POP(); /* code object */ - x = PyFunction_NewWithQualName(v, f->f_globals, w); - Py_DECREF(v); - Py_DECREF(w); - - if (x != NULL && opcode == MAKE_CLOSURE) { - v = POP(); - if (PyFunction_SetClosure(x, v) != 0) { + PyObject *qualname = POP(); /* qualname */ + PyObject *code = POP(); /* code object */ + PyObject *func = PyFunction_NewWithQualName(code, f->f_globals, qualname); + Py_DECREF(code); + Py_DECREF(qualname); + + if (func == NULL) + goto error; + + if (opcode == MAKE_CLOSURE) { + PyObject *closure = POP(); + if (PyFunction_SetClosure(func, closure) != 0) { /* Can't happen unless bytecode is corrupt. */ - why = WHY_EXCEPTION; + Py_DECREF(func); + Py_DECREF(closure); + goto error; } - Py_DECREF(v); + Py_DECREF(closure); } - if (x != NULL && num_annotations > 0) { + if (num_annotations > 0) { Py_ssize_t name_ix; - u = POP(); /* names of args with annotations */ - v = PyDict_New(); - if (v == NULL) { - Py_DECREF(x); - x = NULL; - break; + PyObject *names = POP(); /* names of args with annotations */ + PyObject *anns = PyDict_New(); + if (anns == NULL) { + Py_DECREF(func); + goto error; } - name_ix = PyTuple_Size(u); + name_ix = PyTuple_Size(names); assert(num_annotations == name_ix+1); while (name_ix > 0) { + PyObject *name, *value; + int err; --name_ix; - t = PyTuple_GET_ITEM(u, name_ix); - w = POP(); - /* XXX(nnorwitz): check for errors */ - PyDict_SetItem(v, t, w); - Py_DECREF(w); + name = PyTuple_GET_ITEM(names, name_ix); + value = POP(); + err = PyDict_SetItem(anns, name, value); + Py_DECREF(value); + if (err != 0) { + Py_DECREF(anns); + Py_DECREF(func); + goto error; + } } - if (PyFunction_SetAnnotations(x, v) != 0) { + if (PyFunction_SetAnnotations(func, anns) != 0) { /* Can't happen unless PyFunction_SetAnnotations changes. */ - why = WHY_EXCEPTION; + Py_DECREF(anns); + Py_DECREF(func); + goto error; } - Py_DECREF(v); - Py_DECREF(u); + Py_DECREF(anns); + Py_DECREF(names); } /* XXX Maybe this should be a separate opcode? */ - if (x != NULL && posdefaults > 0) { - v = PyTuple_New(posdefaults); - if (v == NULL) { - Py_DECREF(x); - x = NULL; - break; + if (posdefaults > 0) { + PyObject *defs = PyTuple_New(posdefaults); + if (defs == NULL) { + Py_DECREF(func); + goto error; } - while (--posdefaults >= 0) { - w = POP(); - PyTuple_SET_ITEM(v, posdefaults, w); - } - if (PyFunction_SetDefaults(x, v) != 0) { + while (--posdefaults >= 0) + PyTuple_SET_ITEM(defs, posdefaults, POP()); + if (PyFunction_SetDefaults(func, defs) != 0) { /* Can't happen unless PyFunction_SetDefaults changes. */ - why = WHY_EXCEPTION; + Py_DECREF(defs); + Py_DECREF(func); + goto error; } - Py_DECREF(v); + Py_DECREF(defs); } - if (x != NULL && kwdefaults > 0) { - v = PyDict_New(); - if (v == NULL) { - Py_DECREF(x); - x = NULL; - break; + if (kwdefaults > 0) { + PyObject *defs = PyDict_New(); + if (defs == NULL) { + Py_DECREF(func); + goto error; } while (--kwdefaults >= 0) { - w = POP(); /* default value */ - u = POP(); /* kw only arg name */ - /* XXX(nnorwitz): check for errors */ - PyDict_SetItem(v, u, w); - Py_DECREF(w); - Py_DECREF(u); + PyObject *v = POP(); /* default value */ + PyObject *key = POP(); /* kw only arg name */ + int err = PyDict_SetItem(defs, key, v); + Py_DECREF(v); + Py_DECREF(key); + if (err != 0) { + Py_DECREF(defs); + Py_DECREF(func); + goto error; + } } - if (PyFunction_SetKwDefaults(x, v) != 0) { + if (PyFunction_SetKwDefaults(func, defs) != 0) { /* Can't happen unless PyFunction_SetKwDefaults changes. */ - why = WHY_EXCEPTION; + Py_DECREF(func); + Py_DECREF(defs); + goto error; } - Py_DECREF(v); + Py_DECREF(defs); } - PUSH(x); - break; + PUSH(func); + DISPATCH(); } - TARGET(BUILD_SLICE) + TARGET(BUILD_SLICE) { + PyObject *start, *stop, *step, *slice; if (oparg == 3) - w = POP(); + step = POP(); else - w = NULL; - v = POP(); - u = TOP(); - x = PySlice_New(u, v, w); - Py_DECREF(u); - Py_DECREF(v); - Py_XDECREF(w); - SET_TOP(x); - if (x != NULL) DISPATCH(); - break; - - TARGET(EXTENDED_ARG) + step = NULL; + stop = POP(); + start = TOP(); + slice = PySlice_New(start, stop, step); + Py_DECREF(start); + Py_DECREF(stop); + Py_XDECREF(step); + SET_TOP(slice); + if (slice == NULL) + goto error; + DISPATCH(); + } + + TARGET(EXTENDED_ARG) { opcode = NEXTOP(); oparg = oparg<<16 | NEXTARG(); goto dispatch_opcode; + } #if USE_COMPUTED_GOTOS _unknown_opcode: @@ -2865,8 +2982,7 @@ PyFrame_GetLineNumber(f), opcode); PyErr_SetString(PyExc_SystemError, "unknown opcode"); - why = WHY_EXCEPTION; - break; + goto error; #ifdef CASE_TOO_BIG } @@ -2874,71 +2990,31 @@ } /* switch */ - on_error: - + /* This should never be reached. Every opcode should end with DISPATCH() + or goto error. */ + assert(0); + +error: READ_TIMESTAMP(inst1); - /* Quickly continue if no error occurred */ - - if (why == WHY_NOT) { - if (err == 0 && x != NULL) { -#ifdef CHECKEXC - /* This check is expensive! */ - if (PyErr_Occurred()) - fprintf(stderr, - "XXX undetected error\n"); - else { -#endif - READ_TIMESTAMP(loop1); - continue; /* Normal, fast path */ -#ifdef CHECKEXC - } -#endif - } - why = WHY_EXCEPTION; - x = Py_None; - err = 0; - } - - /* Double-check exception status */ - - if (why == WHY_EXCEPTION || why == WHY_RERAISE) { - if (!PyErr_Occurred()) { - PyErr_SetString(PyExc_SystemError, - "error return without exception set"); - why = WHY_EXCEPTION; - } - } -#ifdef CHECKEXC - else { - /* This check is expensive! */ - if (PyErr_Occurred()) { - char buf[128]; - sprintf(buf, "Stack unwind with exception " - "set and why=%d", why); - Py_FatalError(buf); - } - } -#endif - - /* Log traceback info if this is a real exception */ - - if (why == WHY_EXCEPTION) { - PyTraceBack_Here(f); - - if (tstate->c_tracefunc != NULL) - call_exc_trace(tstate->c_tracefunc, - tstate->c_traceobj, f); - } - - /* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */ - - if (why == WHY_RERAISE) - why = WHY_EXCEPTION; + assert(why == WHY_NOT); + why = WHY_EXCEPTION; + + /* Double-check exception status. */ + if (!PyErr_Occurred()) + PyErr_SetString(PyExc_SystemError, + "error return without exception set"); + + /* Log traceback info. */ + PyTraceBack_Here(f); + + if (tstate->c_tracefunc != NULL) + call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f); + +fast_block_end: + assert(why != WHY_NOT); /* Unwind stacks if a (pseudo) exception occurred */ - -fast_block_end: while (why != WHY_NOT && f->f_iblock > 0) { /* Peek at the current block. */ PyTryBlock *b = &f->f_blockstack[f->f_iblock - 1]; @@ -3022,8 +3098,8 @@ assert(why != WHY_YIELD); /* Pop remaining stack entries. */ while (!EMPTY()) { - v = POP(); - Py_XDECREF(v); + PyObject *o = POP(); + Py_XDECREF(o); } if (why != WHY_RETURN) @@ -3523,7 +3599,7 @@ /* Logic for the raise statement (too complicated for inlining). This *consumes* a reference count to each of its arguments. */ -static enum why_code +static int do_raise(PyObject *exc, PyObject *cause) { PyObject *type = NULL, *value = NULL; @@ -3538,13 +3614,13 @@ if (type == Py_None) { PyErr_SetString(PyExc_RuntimeError, "No active exception to reraise"); - return WHY_EXCEPTION; - } + return 0; + } Py_XINCREF(type); Py_XINCREF(value); Py_XINCREF(tb); PyErr_Restore(type, value, tb); - return WHY_RERAISE; + return 1; } /* We support the following forms of raise: @@ -3607,13 +3683,13 @@ /* PyErr_SetObject incref's its arguments */ Py_XDECREF(value); Py_XDECREF(type); - return WHY_EXCEPTION; + return 0; raise_error: Py_XDECREF(value); Py_XDECREF(type); Py_XDECREF(cause); - return WHY_EXCEPTION; + return 0; } /* Iterate v argcnt times and store the results on the stack (via decreasing -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 17:38:02 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 17:38:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_move_declaration_to_top_of?= =?utf-8?q?_block?= Message-ID: <3XdY8p3B0GzR1L@mail.python.org> http://hg.python.org/cpython/rev/6ca52f901fc1 changeset: 79694:6ca52f901fc1 user: Benjamin Peterson date: Fri Oct 12 11:37:56 2012 -0400 summary: move declaration to top of block files: Python/ceval.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1402,8 +1402,8 @@ TARGET(DUP_TOP_TWO) { PyObject *top = TOP(); + PyObject *second = SECOND(); Py_INCREF(top); - PyObject *second = SECOND(); Py_INCREF(second); STACKADJ(2); SET_TOP(top); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 17:41:23 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 17:41:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_move_more_variable_declara?= =?utf-8?q?tions_to_the_top_of_blocks?= Message-ID: <3XdYDg31ZxzR5X@mail.python.org> http://hg.python.org/cpython/rev/fb40d0ab0c77 changeset: 79695:fb40d0ab0c77 user: Benjamin Peterson date: Fri Oct 12 11:40:01 2012 -0400 summary: move more variable declarations to the top of blocks files: Python/ceval.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1834,13 +1834,14 @@ TARGET(PRINT_EXPR) { PyObject *value = POP(); PyObject *hook = PySys_GetObject("displayhook"); + PyObject *res; if (hook == NULL) { PyErr_SetString(PyExc_RuntimeError, "lost sys.displayhook"); Py_DECREF(value); goto error; } - PyObject *res = PyObject_CallFunctionObjArgs(hook, value, NULL); + res = PyObject_CallFunctionObjArgs(hook, value, NULL); Py_DECREF(value); if (res == NULL) goto error; @@ -2394,7 +2395,7 @@ _Py_IDENTIFIER(__import__); PyObject *name = GETITEM(names, oparg); PyObject *func = _PyDict_GetItemId(f->f_builtins, &PyId___import__); - PyObject *from, *level, *args; + PyObject *from, *level, *args, *res; if (func == NULL) { PyErr_SetString(PyExc_ImportError, "__import__ not found"); @@ -2426,7 +2427,7 @@ goto error; } READ_TIMESTAMP(intr0); - PyObject *res = PyEval_CallObject(func, args); + res = PyEval_CallObject(func, args); READ_TIMESTAMP(intr1); Py_DECREF(args); Py_DECREF(func); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 17:44:25 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 17:44:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_fix_to_work_if_=5F=5Fdoc?= =?utf-8?q?=5F=5F_is_removed?= Message-ID: <3XdYJ92HKLzQts@mail.python.org> http://hg.python.org/cpython/rev/1a4f426eb712 changeset: 79696:1a4f426eb712 user: Benjamin Peterson date: Fri Oct 12 11:44:10 2012 -0400 summary: fix to work if __doc__ is removed files: Lib/test/test_runpy.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -565,10 +565,10 @@ with open(filename, 'w', encoding='latin1') as f: f.write(""" #coding:latin1 -"non-ASCII: h\xe9" +s = "non-ASCII: h\xe9" """) result = run_path(filename) - self.assertEqual(result['__doc__'], "non-ASCII: h\xe9") + self.assertEqual(result['s'], "non-ASCII: h\xe9") def test_main(): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 17:44:26 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 17:44:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbjogc2tpcCBpZiBfX2RvY19fIGlz?= =?utf-8?q?_gone?= Message-ID: <3XdYJB4KKZzPG2@mail.python.org> http://hg.python.org/cpython/rev/182884b460bf changeset: 79697:182884b460bf user: Benjamin Peterson date: Fri Oct 12 11:44:19 2012 -0400 summary: skip if __doc__ is gone files: Lib/test/test_timeit.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -250,6 +250,7 @@ s = self.run_main(seconds_per_increment=60.0, switches=['-r-5']) self.assertEqual(s, "10 loops, best of 1: 60 sec per loop\n") + @unittest.skipIf(sys.flags.optimize >= 2, "need __doc__") def test_main_help(self): s = self.run_main(switches=['-h']) # Note: It's not clear that the trailing space was intended as part of -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 18:02:11 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 18:02:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_fix_to_work_if?= =?utf-8?q?_=5F=5Fdoc=5F=5F_is_removed?= Message-ID: <3XdYhg6Hp0zR48@mail.python.org> http://hg.python.org/cpython/rev/ce2181520dd7 changeset: 79698:ce2181520dd7 branch: 3.2 parent: 79689:d6ba5441a2e9 user: Benjamin Peterson date: Fri Oct 12 11:44:10 2012 -0400 summary: fix to work if __doc__ is removed files: Lib/test/test_runpy.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -523,10 +523,10 @@ with open(filename, 'w', encoding='latin1') as f: f.write(""" #coding:latin1 -"non-ASCII: h\xe9" +s = "non-ASCII: h\xe9" """) result = run_path(filename) - self.assertEqual(result['__doc__'], "non-ASCII: h\xe9") + self.assertEqual(result['s'], "non-ASCII: h\xe9") def test_main(): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 18:02:13 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 18:02:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogc2tpcCBpZiBfX2Rv?= =?utf-8?q?c=5F=5F_is_gone?= Message-ID: <3XdYhj1GhXzR48@mail.python.org> http://hg.python.org/cpython/rev/da1d2283e31f changeset: 79699:da1d2283e31f branch: 3.2 user: Benjamin Peterson date: Fri Oct 12 11:44:19 2012 -0400 summary: skip if __doc__ is gone files: Lib/test/test_timeit.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -250,6 +250,7 @@ s = self.run_main(seconds_per_increment=60.0, switches=['-r-5']) self.assertEqual(s, "10 loops, best of 1: 60 sec per loop\n") + @unittest.skipIf(sys.flags.optimize >= 2, "need __doc__") def test_main_help(self): s = self.run_main(switches=['-h']) # Note: It's not clear that the trailing space was intended as part of -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 18:02:14 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 18:02:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4y?= Message-ID: <3XdYhk3fF5zR5T@mail.python.org> http://hg.python.org/cpython/rev/d3d4737fa093 changeset: 79700:d3d4737fa093 parent: 79697:182884b460bf parent: 79699:da1d2283e31f user: Benjamin Peterson date: Fri Oct 12 12:02:06 2012 -0400 summary: merge 3.2 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 18:05:17 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 18:05:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_3=2E2?= Message-ID: <3XdYmF48FVzR3X@mail.python.org> http://hg.python.org/cpython/rev/d4ab5859721e changeset: 79701:d4ab5859721e branch: 3.3 parent: 79661:6dcd68079b7e parent: 79699:da1d2283e31f user: Benjamin Peterson date: Fri Oct 12 12:04:32 2012 -0400 summary: merge 3.2 files: Doc/glossary.rst | 2 +- Doc/howto/functional.rst | 351 ++++++++-------- Doc/library/2to3.rst | 2 +- Doc/library/concurrent.futures.rst | 22 +- Doc/library/dis.rst | 8 +- Doc/library/functions.rst | 21 +- Doc/library/stdtypes.rst | 9 +- Doc/reference/datamodel.rst | 8 +- Doc/reference/expressions.rst | 23 +- Doc/tutorial/classes.rst | 18 +- Doc/whatsnew/3.0.rst | 4 +- Lib/platform.py | 7 +- Lib/test/test_runpy.py | 4 +- Lib/test/test_timeit.py | 1 + 14 files changed, 241 insertions(+), 239 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -365,7 +365,7 @@ iterator An object representing a stream of data. Repeated calls to the iterator's - :meth:`__next__` method (or passing it to the built-in function + :meth:`~iterator.__next__` method (or passing it to the built-in function :func:`next`) return successive items in the stream. When no more data are available a :exc:`StopIteration` exception is raised instead. At this point, the iterator object is exhausted and any further calls to its diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -181,26 +181,26 @@ An iterator is an object representing a stream of data; this object returns the data one element at a time. A Python iterator must support a method called -``__next__()`` that takes no arguments and always returns the next element of -the stream. If there are no more elements in the stream, ``__next__()`` must -raise the ``StopIteration`` exception. Iterators don't have to be finite, -though; it's perfectly reasonable to write an iterator that produces an infinite -stream of data. +:meth:`~iterator.__next__` that takes no arguments and always returns the next +element of the stream. If there are no more elements in the stream, +:meth:`~iterator.__next__` must raise the :exc:`StopIteration` exception. +Iterators don't have to be finite, though; it's perfectly reasonable to write +an iterator that produces an infinite stream of data. The built-in :func:`iter` function takes an arbitrary object and tries to return an iterator that will return the object's contents or elements, raising :exc:`TypeError` if the object doesn't support iteration. Several of Python's built-in data types support iteration, the most common being lists and -dictionaries. An object is called an **iterable** object if you can get an -iterator for it. +dictionaries. An object is called :term:`iterable` if you can get an iterator +for it. You can experiment with the iteration interface manually: >>> L = [1,2,3] >>> it = iter(L) - >>> it + >>> it #doctest: +ELLIPSIS <...iterator object at ...> - >>> it.__next__() + >>> it.__next__() # same as next(it) 1 >>> next(it) 2 @@ -213,9 +213,9 @@ >>> Python expects iterable objects in several different contexts, the most -important being the ``for`` statement. In the statement ``for X in Y``, Y must -be an iterator or some object for which ``iter()`` can create an iterator. -These two statements are equivalent:: +important being the :keyword:`for` statement. In the statement ``for X in Y``, +Y must be an iterator or some object for which :func:`iter` can create an +iterator. These two statements are equivalent:: for i in iter(obj): @@ -246,16 +246,16 @@ iterator argument and will return the largest or smallest element. The ``"in"`` and ``"not in"`` operators also support iterators: ``X in iterator`` is true if X is found in the stream returned by the iterator. You'll run into obvious -problems if the iterator is infinite; ``max()``, ``min()`` +problems if the iterator is infinite; :func:`max`, :func:`min` will never return, and if the element X never appears in the stream, the ``"in"`` and ``"not in"`` operators won't return either. Note that you can only go forward in an iterator; there's no way to get the previous element, reset the iterator, or make a copy of it. Iterator objects can optionally provide these additional capabilities, but the iterator protocol -only specifies the ``next()`` method. Functions may therefore consume all of -the iterator's output, and if you need to do something different with the same -stream, you'll have to create a new iterator. +only specifies the :meth:`~iterator.__next__` method. Functions may therefore +consume all of the iterator's output, and if you need to do something different +with the same stream, you'll have to create a new iterator. @@ -267,15 +267,11 @@ iterator. Calling :func:`iter` on a dictionary returns an iterator that will loop over the -dictionary's keys: - -.. not a doctest since dict ordering varies across Pythons - -:: +dictionary's keys:: >>> m = {'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4, 'May': 5, 'Jun': 6, ... 'Jul': 7, 'Aug': 8, 'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12} - >>> for key in m: + >>> for key in m: #doctest: +SKIP ... print(key, m[key]) Mar 3 Feb 2 @@ -296,7 +292,7 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`values` or :meth:`items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: @@ -305,9 +301,9 @@ >>> dict(iter(L)) {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} -Files also support iteration by calling the ``readline()`` method until there -are no more lines in the file. This means you can read each line of a file like -this:: +Files also support iteration by calling the :meth:`~io.TextIOBase.readline` +method until there are no more lines in the file. This means you can read each +line of a file like this:: for line in file: # do something for each line @@ -410,12 +406,9 @@ lengths of all the sequences. If you have two lists of length 3, the output list is 9 elements long: -.. doctest:: - :options: +NORMALIZE_WHITESPACE - >>> seq1 = 'abc' >>> seq2 = (1,2,3) - >>> [(x,y) for x in seq1 for y in seq2] + >>> [(x, y) for x in seq1 for y in seq2] #doctest: +NORMALIZE_WHITESPACE [('a', 1), ('a', 2), ('a', 3), ('b', 1), ('b', 2), ('b', 3), ('c', 1), ('c', 2), ('c', 3)] @@ -425,9 +418,9 @@ comprehension below is a syntax error, while the second one is correct:: # Syntax error - [ x,y for x in seq1 for y in seq2] + [x, y for x in seq1 for y in seq2] # Correct - [ (x,y) for x in seq1 for y in seq2] + [(x, y) for x in seq1 for y in seq2] Generators @@ -448,15 +441,13 @@ Here's the simplest example of a generator function: -.. testcode:: + >>> def generate_ints(N): + ... for i in range(N): + ... yield i - def generate_ints(N): - for i in range(N): - yield i - -Any function containing a ``yield`` keyword is a generator function; this is -detected by Python's :term:`bytecode` compiler which compiles the function -specially as a result. +Any function containing a :keyword:`yield` keyword is a generator function; +this is detected by Python's :term:`bytecode` compiler which compiles the +function specially as a result. When you call a generator function, it doesn't return a single value; instead it returns a generator object that supports the iterator protocol. On executing @@ -464,12 +455,13 @@ ``return`` statement. The big difference between ``yield`` and a ``return`` statement is that on reaching a ``yield`` the generator's state of execution is suspended and local variables are preserved. On the next call to the -generator's ``.__next__()`` method, the function will resume executing. +generator's :meth:`~generator.__next__` method, the function will resume +executing. Here's a sample usage of the ``generate_ints()`` generator: >>> gen = generate_ints(3) - >>> gen + >>> gen #doctest: +ELLIPSIS >>> next(gen) 0 @@ -491,17 +483,19 @@ ``return`` the generator cannot return any further values. ``return`` with a value, such as ``return 5``, is a syntax error inside a generator function. The end of the generator's results can also be indicated by raising -``StopIteration`` manually, or by just letting the flow of execution fall off +:exc:`StopIteration` manually, or by just letting the flow of execution fall off the bottom of the function. You could achieve the effect of generators manually by writing your own class and storing all the local variables of the generator as instance variables. For example, returning a list of integers could be done by setting ``self.count`` to -0, and having the ``__next__()`` method increment ``self.count`` and return it. +0, and having the :meth:`~iterator.__next__` method increment ``self.count`` and +return it. However, for a moderately complicated generator, writing a corresponding class can be much messier. -The test suite included with Python's library, ``test_generators.py``, contains +The test suite included with Python's library, +:source:`Lib/test/test_generators.py`, contains a number of more interesting examples. Here's one generator that implements an in-order traversal of a tree using generators recursively. :: @@ -544,23 +538,23 @@ The parentheses aren't always necessary, but it's easier to always add them instead of having to remember when they're needed. -(PEP 342 explains the exact rules, which are that a ``yield``-expression must +(:pep:`342` explains the exact rules, which are that a ``yield``-expression must always be parenthesized except when it occurs at the top-level expression on the right-hand side of an assignment. This means you can write ``val = yield i`` but have to use parentheses when there's an operation, as in ``val = (yield i) + 12``.) -Values are sent into a generator by calling its ``send(value)`` method. This -method resumes the generator's code and the ``yield`` expression returns the -specified value. If the regular ``__next__()`` method is called, the ``yield`` -returns ``None``. +Values are sent into a generator by calling its :meth:`send(value) +` method. This method resumes the generator's code and the +``yield`` expression returns the specified value. If the regular +:meth:`~generator.__next__` method is called, the ``yield`` returns ``None``. Here's a simple counter that increments by 1 and allows changing the value of the internal counter. .. testcode:: - def counter (maximum): + def counter(maximum): i = 0 while i < maximum: val = (yield i) @@ -572,16 +566,16 @@ And here's an example of changing the counter: - >>> it = counter(10) - >>> next(it) + >>> it = counter(10) #doctest: +SKIP + >>> next(it) #doctest: +SKIP 0 - >>> next(it) + >>> next(it) #doctest: +SKIP 1 - >>> it.send(8) + >>> it.send(8) #doctest: +SKIP 8 - >>> next(it) + >>> next(it) #doctest: +SKIP 9 - >>> next(it) + >>> next(it) #doctest: +SKIP Traceback (most recent call last): File "t.py", line 15, in ? it.next() @@ -589,20 +583,23 @@ Because ``yield`` will often be returning ``None``, you should always check for this case. Don't just use its value in expressions unless you're sure that the -``send()`` method will be the only method used resume your generator function. +:meth:`~generator.send` method will be the only method used resume your +generator function. -In addition to ``send()``, there are two other new methods on generators: +In addition to :meth:`~generator.send`, there are two other methods on +generators: -* ``throw(type, value=None, traceback=None)`` is used to raise an exception - inside the generator; the exception is raised by the ``yield`` expression - where the generator's execution is paused. +* :meth:`throw(type, value=None, traceback=None) ` is used to + raise an exception inside the generator; the exception is raised by the + ``yield`` expression where the generator's execution is paused. -* ``close()`` raises a :exc:`GeneratorExit` exception inside the generator to - terminate the iteration. On receiving this exception, the generator's code - must either raise :exc:`GeneratorExit` or :exc:`StopIteration`; catching the - exception and doing anything else is illegal and will trigger a - :exc:`RuntimeError`. ``close()`` will also be called by Python's garbage - collector when the generator is garbage-collected. +* :meth:`~generator.close` raises a :exc:`GeneratorExit` exception inside the + generator to terminate the iteration. On receiving this exception, the + generator's code must either raise :exc:`GeneratorExit` or + :exc:`StopIteration`; catching the exception and doing anything else is + illegal and will trigger a :exc:`RuntimeError`. :meth:`~generator.close` + will also be called by Python's garbage collector when the generator is + garbage-collected. If you need to run cleanup code when a :exc:`GeneratorExit` occurs, I suggest using a ``try: ... finally:`` suite instead of catching :exc:`GeneratorExit`. @@ -624,13 +621,12 @@ Two of Python's built-in functions, :func:`map` and :func:`filter` duplicate the features of generator expressions: -``map(f, iterA, iterB, ...)`` returns an iterator over the sequence +:func:`map(f, iterA, iterB, ...) ` returns an iterator over the sequence ``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``. >>> def upper(s): ... return s.upper() - >>> list(map(upper, ['sentence', 'fragment'])) ['SENTENCE', 'FRAGMENT'] >>> [upper(s) for s in ['sentence', 'fragment']] @@ -638,11 +634,11 @@ You can of course achieve the same effect with a list comprehension. -``filter(predicate, iter)`` returns an iterator over all the sequence elements -that meet a certain condition, and is similarly duplicated by list -comprehensions. A **predicate** is a function that returns the truth value of -some condition; for use with :func:`filter`, the predicate must take a single -value. +:func:`filter(predicate, iter) ` returns an iterator over all the +sequence elements that meet a certain condition, and is similarly duplicated by +list comprehensions. A **predicate** is a function that returns the truth +value of some condition; for use with :func:`filter`, the predicate must take a +single value. >>> def is_even(x): ... return (x % 2) == 0 @@ -657,8 +653,8 @@ [0, 2, 4, 6, 8] -``enumerate(iter)`` counts off the elements in the iterable, returning 2-tuples -containing the count and each element. :: +:func:`enumerate(iter) ` counts off the elements in the iterable, +returning 2-tuples containing the count and each element. :: >>> for item in enumerate(['subject', 'verb', 'object']): ... print(item) @@ -674,29 +670,28 @@ if line.strip() == '': print('Blank line at line #%i' % i) -``sorted(iterable, [key=None], [reverse=False])`` collects all the elements of -the iterable into a list, sorts the list, and returns the sorted result. The -``key``, and ``reverse`` arguments are passed through to the constructed list's -``.sort()`` method. :: +:func:`sorted(iterable, key=None, reverse=False) ` collects all the +elements of the iterable into a list, sorts the list, and returns the sorted +result. The *key*, and *reverse* arguments are passed through to the +constructed list's :meth:`~list.sort` method. :: >>> import random >>> # Generate 8 random numbers between [0, 10000) >>> rand_list = random.sample(range(10000), 8) - >>> rand_list + >>> rand_list #doctest: +SKIP [769, 7953, 9828, 6431, 8442, 9878, 6213, 2207] - >>> sorted(rand_list) + >>> sorted(rand_list) #doctest: +SKIP [769, 2207, 6213, 6431, 7953, 8442, 9828, 9878] - >>> sorted(rand_list, reverse=True) + >>> sorted(rand_list, reverse=True) #doctest: +SKIP [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] -(For a more detailed discussion of sorting, see the Sorting mini-HOWTO in the -Python wiki at http://wiki.python.org/moin/HowTo/Sorting.) +(For a more detailed discussion of sorting, see the :ref:`sortinghowto`.) -The ``any(iter)`` and ``all(iter)`` built-ins look at the truth values of an -iterable's contents. :func:`any` returns True if any element in the iterable is -a true value, and :func:`all` returns True if all of the elements are true -values: +The :func:`any(iter) ` and :func:`all(iter) ` built-ins look at the +truth values of an iterable's contents. :func:`any` returns True if any element +in the iterable is a true value, and :func:`all` returns True if all of the +elements are true values: >>> any([0,1,0]) True @@ -712,7 +707,7 @@ True -``zip(iterA, iterB, ...)`` takes one element from each iterable and +:func:`zip(iterA, iterB, ...) ` takes one element from each iterable and returns them in a tuple:: zip(['a', 'b', 'c'], (1, 2, 3)) => @@ -752,42 +747,44 @@ Creating new iterators ---------------------- -``itertools.count(n)`` returns an infinite stream of integers, increasing by 1 -each time. You can optionally supply the starting number, which defaults to 0:: +:func:`itertools.count(n) ` returns an infinite stream of +integers, increasing by 1 each time. You can optionally supply the starting +number, which defaults to 0:: itertools.count() => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... itertools.count(10) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... -``itertools.cycle(iter)`` saves a copy of the contents of a provided iterable -and returns a new iterator that returns its elements from first to last. The -new iterator will repeat these elements infinitely. :: +:func:`itertools.cycle(iter) ` saves a copy of the contents of +a provided iterable and returns a new iterator that returns its elements from +first to last. The new iterator will repeat these elements infinitely. :: itertools.cycle([1,2,3,4,5]) => 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, ... -``itertools.repeat(elem, [n])`` returns the provided element ``n`` times, or -returns the element endlessly if ``n`` is not provided. :: +:func:`itertools.repeat(elem, [n]) ` returns the provided +element *n* times, or returns the element endlessly if *n* is not provided. :: itertools.repeat('abc') => abc, abc, abc, abc, abc, abc, abc, abc, abc, abc, ... itertools.repeat('abc', 5) => abc, abc, abc, abc, abc -``itertools.chain(iterA, iterB, ...)`` takes an arbitrary number of iterables as -input, and returns all the elements of the first iterator, then all the elements -of the second, and so on, until all of the iterables have been exhausted. :: +:func:`itertools.chain(iterA, iterB, ...) ` takes an arbitrary +number of iterables as input, and returns all the elements of the first +iterator, then all the elements of the second, and so on, until all of the +iterables have been exhausted. :: itertools.chain(['a', 'b', 'c'], (1, 2, 3)) => a, b, c, 1, 2, 3 -``itertools.islice(iter, [start], stop, [step])`` returns a stream that's a -slice of the iterator. With a single ``stop`` argument, it will return the -first ``stop`` elements. If you supply a starting index, you'll get -``stop-start`` elements, and if you supply a value for ``step``, elements will -be skipped accordingly. Unlike Python's string and list slicing, you can't use -negative values for ``start``, ``stop``, or ``step``. :: +:func:`itertools.islice(iter, [start], stop, [step]) ` returns +a stream that's a slice of the iterator. With a single *stop* argument, it +will return the first *stop* elements. If you supply a starting index, you'll +get *stop-start* elements, and if you supply a value for *step*, elements +will be skipped accordingly. Unlike Python's string and list slicing, you can't +use negative values for *start*, *stop*, or *step*. :: itertools.islice(range(10), 8) => 0, 1, 2, 3, 4, 5, 6, 7 @@ -796,9 +793,10 @@ itertools.islice(range(10), 2, 8, 2) => 2, 4, 6 -``itertools.tee(iter, [n])`` replicates an iterator; it returns ``n`` -independent iterators that will all return the contents of the source iterator. -If you don't supply a value for ``n``, the default is 2. Replicating iterators +:func:`itertools.tee(iter, [n]) ` replicates an iterator; it +returns *n* independent iterators that will all return the contents of the +source iterator. +If you don't supply a value for *n*, the default is 2. Replicating iterators requires saving some of the contents of the source iterator, so this can consume significant memory if the iterator is large and one of the new iterators is consumed more than the others. :: @@ -816,19 +814,21 @@ Calling functions on elements ----------------------------- -The ``operator`` module contains a set of functions corresponding to Python's -operators. Some examples are ``operator.add(a, b)`` (adds two values), -``operator.ne(a, b)`` (same as ``a!=b``), and ``operator.attrgetter('id')`` -(returns a callable that fetches the ``"id"`` attribute). +The :mod:`operator` module contains a set of functions corresponding to Python's +operators. Some examples are :func:`operator.add(a, b) ` (adds +two values), :func:`operator.ne(a, b) ` (same as ``a != b``), and +:func:`operator.attrgetter('id') ` +(returns a callable that fetches the ``.id`` attribute). -``itertools.starmap(func, iter)`` assumes that the iterable will return a stream -of tuples, and calls ``f()`` using these tuples as the arguments:: +:func:`itertools.starmap(func, iter) ` assumes that the +iterable will return a stream of tuples, and calls *func* using these tuples as +the arguments:: itertools.starmap(os.path.join, - [('/usr', 'bin', 'java'), ('/bin', 'python'), - ('/usr', 'bin', 'perl'),('/usr', 'bin', 'ruby')]) + [('/bin', 'python'), ('/usr', 'bin', 'java'), + ('/usr', 'bin', 'perl'), ('/usr', 'bin', 'ruby')]) => - /usr/bin/java, /bin/python, /usr/bin/perl, /usr/bin/ruby + /bin/python, /usr/bin/java, /usr/bin/perl, /usr/bin/ruby Selecting elements @@ -837,20 +837,18 @@ Another group of functions chooses a subset of an iterator's elements based on a predicate. -``itertools.filterfalse(predicate, iter)`` is the opposite, returning all -elements for which the predicate returns false:: +:func:`itertools.filterfalse(predicate, iter) ` is the +opposite, returning all elements for which the predicate returns false:: itertools.filterfalse(is_even, itertools.count()) => 1, 3, 5, 7, 9, 11, 13, 15, ... -``itertools.takewhile(predicate, iter)`` returns elements for as long as the -predicate returns true. Once the predicate returns false, the iterator will -signal the end of its results. - -:: +:func:`itertools.takewhile(predicate, iter) ` returns +elements for as long as the predicate returns true. Once the predicate returns +false, the iterator will signal the end of its results. :: def less_than_10(x): - return (x < 10) + return x < 10 itertools.takewhile(less_than_10, itertools.count()) => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 @@ -858,10 +856,9 @@ itertools.takewhile(is_even, itertools.count()) => 0 -``itertools.dropwhile(predicate, iter)`` discards elements while the predicate -returns true, and then returns the rest of the iterable's results. - -:: +:func:`itertools.dropwhile(predicate, iter) ` discards +elements while the predicate returns true, and then returns the rest of the +iterable's results. :: itertools.dropwhile(less_than_10, itertools.count()) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... @@ -873,14 +870,14 @@ Grouping elements ----------------- -The last function I'll discuss, ``itertools.groupby(iter, key_func=None)``, is -the most complicated. ``key_func(elem)`` is a function that can compute a key -value for each element returned by the iterable. If you don't supply a key -function, the key is simply each element itself. +The last function I'll discuss, :func:`itertools.groupby(iter, key_func=None) +`, is the most complicated. ``key_func(elem)`` is a function +that can compute a key value for each element returned by the iterable. If you +don't supply a key function, the key is simply each element itself. -``groupby()`` collects all the consecutive elements from the underlying iterable -that have the same key value, and returns a stream of 2-tuples containing a key -value and an iterator for the elements with that key. +:func:`~itertools.groupby` collects all the consecutive elements from the +underlying iterable that have the same key value, and returns a stream of +2-tuples containing a key value and an iterator for the elements with that key. :: @@ -890,7 +887,7 @@ ... ] - def get_state (city_state): + def get_state(city_state): return city_state[1] itertools.groupby(city_list, get_state) => @@ -906,9 +903,9 @@ iterator-3 => ('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ') -``groupby()`` assumes that the underlying iterable's contents will already be -sorted based on the key. Note that the returned iterators also use the -underlying iterable, so you have to consume the results of iterator-1 before +:func:`~itertools.groupby` assumes that the underlying iterable's contents will +already be sorted based on the key. Note that the returned iterators also use +the underlying iterable, so you have to consume the results of iterator-1 before requesting iterator-2 and its corresponding key. @@ -926,33 +923,34 @@ ``g(b, c)`` that's equivalent to ``f(1, b, c)``; you're filling in a value for one of ``f()``'s parameters. This is called "partial function application". -The constructor for ``partial`` takes the arguments ``(function, arg1, arg2, -... kwarg1=value1, kwarg2=value2)``. The resulting object is callable, so you -can just call it to invoke ``function`` with the filled-in arguments. +The constructor for :func:`~functools.partial` takes the arguments +``(function, arg1, arg2, ..., kwarg1=value1, kwarg2=value2)``. The resulting +object is callable, so you can just call it to invoke ``function`` with the +filled-in arguments. Here's a small but realistic example:: import functools - def log (message, subsystem): - "Write the contents of 'message' to the specified subsystem." + def log(message, subsystem): + """Write the contents of 'message' to the specified subsystem.""" print('%s: %s' % (subsystem, message)) ... server_log = functools.partial(log, subsystem='server') server_log('Unable to open socket') -``functools.reduce(func, iter, [initial_value])`` cumulatively performs an -operation on all the iterable's elements and, therefore, can't be applied to -infinite iterables. (Note it is not in :mod:`builtins`, but in the -:mod:`functools` module.) ``func`` must be a function that takes two elements -and returns a single value. :func:`functools.reduce` takes the first two -elements A and B returned by the iterator and calculates ``func(A, B)``. It -then requests the third element, C, calculates ``func(func(A, B), C)``, combines -this result with the fourth element returned, and continues until the iterable -is exhausted. If the iterable returns no values at all, a :exc:`TypeError` -exception is raised. If the initial value is supplied, it's used as a starting -point and ``func(initial_value, A)`` is the first calculation. :: +:func:`functools.reduce(func, iter, [initial_value]) ` +cumulatively performs an operation on all the iterable's elements and, +therefore, can't be applied to infinite iterables. *func* must be a function +that takes two elements and returns a single value. :func:`functools.reduce` +takes the first two elements A and B returned by the iterator and calculates +``func(A, B)``. It then requests the third element, C, calculates +``func(func(A, B), C)``, combines this result with the fourth element returned, +and continues until the iterable is exhausted. If the iterable returns no +values at all, a :exc:`TypeError` exception is raised. If the initial value is +supplied, it's used as a starting point and ``func(initial_value, A)`` is the +first calculation. :: >>> import operator, functools >>> functools.reduce(operator.concat, ['A', 'BB', 'C']) @@ -978,8 +976,8 @@ >>> sum([]) 0 -For many uses of :func:`functools.reduce`, though, it can be clearer to just write the -obvious :keyword:`for` loop:: +For many uses of :func:`functools.reduce`, though, it can be clearer to just +write the obvious :keyword:`for` loop:: import functools # Instead of: @@ -1023,28 +1021,23 @@ existing_files = filter(os.path.exists, file_list) If the function you need doesn't exist, you need to write it. One way to write -small functions is to use the ``lambda`` statement. ``lambda`` takes a number -of parameters and an expression combining these parameters, and creates a small -function that returns the value of the expression:: +small functions is to use the :keyword:`lambda` statement. ``lambda`` takes a +number of parameters and an expression combining these parameters, and creates +an anonymous function that returns the value of the expression:: - lowercase = lambda x: x.lower() + adder = lambda x, y: x+y print_assign = lambda name, value: name + '=' + str(value) - adder = lambda x, y: x+y - An alternative is to just use the ``def`` statement and define a function in the usual way:: - def lowercase(x): - return x.lower() + def adder(x, y): + return x + y def print_assign(name, value): return name + '=' + str(value) - def adder(x,y): - return x + y - Which alternative is preferable? That's a style question; my usual course is to avoid using ``lambda``. @@ -1053,9 +1046,7 @@ expression, which means you can't have multiway ``if... elif... else`` comparisons or ``try... except`` statements. If you try to do too much in a ``lambda`` statement, you'll end up with an overly complicated expression that's -hard to read. Quick, what's the following code doing? - -:: +hard to read. Quick, what's the following code doing? :: import functools total = functools.reduce(lambda a, b: (0, a[1] + b[1]), items)[1] @@ -1065,7 +1056,7 @@ little bit better:: import functools - def combine (a, b): + def combine(a, b): return 0, a[1] + b[1] total = functools.reduce(combine, items)[1] @@ -1085,12 +1076,12 @@ Fredrik Lundh once suggested the following set of rules for refactoring uses of ``lambda``: -1) Write a lambda function. -2) Write a comment explaining what the heck that lambda does. -3) Study the comment for a while, and think of a name that captures the essence +1. Write a lambda function. +2. Write a comment explaining what the heck that lambda does. +3. Study the comment for a while, and think of a name that captures the essence of the comment. -4) Convert the lambda to a def statement, using that name. -5) Remove the comment. +4. Convert the lambda to a def statement, using that name. +5. Remove the comment. I really like these rules, but you're free to disagree about whether this lambda-free style is better. diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -23,7 +23,7 @@ also located in the :file:`Tools/scripts` directory of the Python root. 2to3's basic arguments are a list of files or directories to transform. The -directories are to recursively traversed for Python sources. +directories are recursively traversed for Python sources. Here is a sample Python 2.x source file, :file:`example.py`:: diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -42,12 +42,13 @@ Equivalent to ``map(func, *iterables)`` except *func* is executed asynchronously and several calls to *func* may be made concurrently. The - returned iterator raises a :exc:`TimeoutError` if :meth:`__next__()` is - called and the result isn't available after *timeout* seconds from the - original call to :meth:`Executor.map`. *timeout* can be an int or a - float. If *timeout* is not specified or ``None``, there is no limit to - the wait time. If a call raises an exception, then that exception will - be raised when its value is retrieved from the iterator. + returned iterator raises a :exc:`TimeoutError` if + :meth:`~iterator.__next__` is called and the result isn't available + after *timeout* seconds from the original call to :meth:`Executor.map`. + *timeout* can be an int or a float. If *timeout* is not specified or + ``None``, there is no limit to the wait time. If a call raises an + exception, then that exception will be raised when its value is + retrieved from the iterator. .. method:: shutdown(wait=True) @@ -364,10 +365,11 @@ different :class:`Executor` instances) given by *fs* that yields futures as they complete (finished or were cancelled). Any futures that completed before :func:`as_completed` is called will be yielded first. The returned - iterator raises a :exc:`TimeoutError` if :meth:`__next__` is called and the - result isn't available after *timeout* seconds from the original call to - :func:`as_completed`. *timeout* can be an int or float. If *timeout* is not - specified or ``None``, there is no limit to the wait time. + iterator raises a :exc:`TimeoutError` if :meth:`~iterator.__next__` is + called and the result isn't available after *timeout* seconds from the + original call to :func:`as_completed`. *timeout* can be an int or float. + If *timeout* is not specified or ``None``, there is no limit to the wait + time. .. seealso:: diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -660,10 +660,10 @@ .. opcode:: FOR_ITER (delta) - ``TOS`` is an :term:`iterator`. Call its :meth:`__next__` method. If this - yields a new value, push it on the stack (leaving the iterator below it). If - the iterator indicates it is exhausted ``TOS`` is popped, and the byte code - counter is incremented by *delta*. + ``TOS`` is an :term:`iterator`. Call its :meth:`~iterator.__next__` method. + If this yields a new value, push it on the stack (leaving the iterator below + it). If the iterator indicates it is exhausted ``TOS`` is popped, and the + byte code counter is incremented by *delta*. .. opcode:: LOAD_GLOBAL (namei) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -348,10 +348,10 @@ .. function:: enumerate(iterable, start=0) Return an enumerate object. *iterable* must be a sequence, an - :term:`iterator`, or some other object which supports iteration. The - :meth:`__next__` method of the iterator returned by :func:`enumerate` returns a - tuple containing a count (from *start* which defaults to 0) and the - values obtained from iterating over *iterable*. + :term:`iterator`, or some other object which supports iteration. + The :meth:`~iterator.__next__` method of the iterator returned by + :func:`enumerate` returns a tuple containing a count (from *start* which + defaults to 0) and the values obtained from iterating over *iterable*. >>> seasons = ['Spring', 'Summer', 'Fall', 'Winter'] >>> list(enumerate(seasons)) @@ -683,9 +683,10 @@ starting at ``0``). If it does not support either of those protocols, :exc:`TypeError` is raised. If the second argument, *sentinel*, is given, then *object* must be a callable object. The iterator created in this case - will call *object* with no arguments for each call to its :meth:`__next__` - method; if the value returned is equal to *sentinel*, :exc:`StopIteration` - will be raised, otherwise the value will be returned. + will call *object* with no arguments for each call to its + :meth:`~iterator.__next__` method; if the value returned is equal to + *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will + be returned. One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file @@ -779,9 +780,9 @@ .. function:: next(iterator[, default]) - Retrieve the next item from the *iterator* by calling its :meth:`__next__` - method. If *default* is given, it is returned if the iterator is exhausted, - otherwise :exc:`StopIteration` is raised. + Retrieve the next item from the *iterator* by calling its + :meth:`~iterator.__next__` method. If *default* is given, it is returned + if the iterator is exhausted, otherwise :exc:`StopIteration` is raised. .. function:: object() diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -779,9 +779,9 @@ specific types are not important beyond their implementation of the iterator protocol. -Once an iterator's :meth:`__next__` method raises :exc:`StopIteration`, it must -continue to do so on subsequent calls. Implementations that do not obey this -property are deemed broken. +Once an iterator's :meth:`~iterator.__next__` method raises +:exc:`StopIteration`, it must continue to do so on subsequent calls. +Implementations that do not obey this property are deemed broken. .. _generator-types: @@ -792,7 +792,8 @@ Python's :term:`generator`\s provide a convenient way to implement the iterator protocol. If a container object's :meth:`__iter__` method is implemented as a generator, it will automatically return an iterator object (technically, a -generator object) supplying the :meth:`__iter__` and :meth:`__next__` methods. +generator object) supplying the :meth:`__iter__` and :meth:`~generator.__next__` +methods. More information about generators can be found in :ref:`the documentation for the yield expression `. diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -600,9 +600,9 @@ A function or method which uses the :keyword:`yield` statement (see section :ref:`yield`) is called a :dfn:`generator function`. Such a function, when called, always returns an iterator object which can be used to execute the - body of the function: calling the iterator's :meth:`__next__` method will - cause the function to execute until it provides a value using the - :keyword:`yield` statement. When the function executes a + body of the function: calling the iterator's :meth:`iterator__next__` + method will cause the function to execute until it provides a value + using the :keyword:`yield` statement. When the function executes a :keyword:`return` statement or falls off the end, a :exc:`StopIteration` exception is raised and the iterator will have reached the end of the set of values to be returned. @@ -1189,7 +1189,7 @@ builtin: print Called by the :func:`format` built-in function (and by extension, the - :meth:`format` method of class :class:`str`) to produce a "formatted" + :meth:`str.format` method of class :class:`str`) to produce a "formatted" string representation of an object. The ``format_spec`` argument is a string that contains a description of the formatting options desired. The interpretation of the ``format_spec`` argument is up to the type diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -294,13 +294,13 @@ brackets or curly braces. Variables used in the generator expression are evaluated lazily when the -:meth:`__next__` method is called for generator object (in the same fashion as -normal generators). However, the leftmost :keyword:`for` clause is immediately -evaluated, so that an error produced by it can be seen before any other possible -error in the code that handles the generator expression. Subsequent -:keyword:`for` clauses cannot be evaluated immediately since they may depend on -the previous :keyword:`for` loop. For example: ``(x*y for x in range(10) for y -in bar(x))``. +:meth:`~generator.__next__` method is called for generator object (in the same +fashion as normal generators). However, the leftmost :keyword:`for` clause is +immediately evaluated, so that an error produced by it can be seen before any +other possible error in the code that handles the generator expression. +Subsequent :keyword:`for` clauses cannot be evaluated immediately since they +may depend on the previous :keyword:`for` loop. For example: ``(x*y for x in +range(10) for y in bar(x))``. The parentheses can be omitted on calls with only one argument. See section :ref:`calls` for the detail. @@ -394,10 +394,11 @@ Starts the execution of a generator function or resumes it at the last executed :keyword:`yield` expression. When a generator function is resumed - with a :meth:`__next__` method, the current :keyword:`yield` expression - always evaluates to :const:`None`. The execution then continues to the next - :keyword:`yield` expression, where the generator is suspended again, and the - value of the :token:`expression_list` is returned to :meth:`next`'s caller. + with a :meth:`~generator.__next__` method, the current :keyword:`yield` + expression always evaluates to :const:`None`. The execution then continues + to the next :keyword:`yield` expression, where the generator is suspended + again, and the value of the :token:`expression_list` is returned to + :meth:`next`'s caller. If the generator exits without yielding another value, a :exc:`StopIteration` exception is raised. diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -737,11 +737,11 @@ This style of access is clear, concise, and convenient. The use of iterators pervades and unifies Python. Behind the scenes, the :keyword:`for` statement calls :func:`iter` on the container object. The function returns an iterator -object that defines the method :meth:`__next__` which accesses elements in the -container one at a time. When there are no more elements, :meth:`__next__` -raises a :exc:`StopIteration` exception which tells the :keyword:`for` loop to -terminate. You can call the :meth:`__next__` method using the :func:`next` -built-in function; this example shows how it all works:: +object that defines the method :meth:`~iterator.__next__` which accesses +elements in the container one at a time. When there are no more elements, +:meth:`__next__` raises a :exc:`StopIteration` exception which tells the +:keyword:`for` loop to terminate. You can call the :meth:`__next__` method +using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) @@ -761,8 +761,8 @@ Having seen the mechanics behind the iterator protocol, it is easy to add iterator behavior to your classes. Define an :meth:`__iter__` method which -returns an object with a :meth:`__next__` method. If the class defines -:meth:`__next__`, then :meth:`__iter__` can just return ``self``:: +returns an object with a :meth:`~iterator.__next__` method. If the class +defines :meth:`__next__`, then :meth:`__iter__` can just return ``self``:: class Reverse: """Iterator for looping over a sequence backwards.""" @@ -819,8 +819,8 @@ Anything that can be done with generators can also be done with class based iterators as described in the previous section. What makes generators so -compact is that the :meth:`__iter__` and :meth:`__next__` methods are created -automatically. +compact is that the :meth:`__iter__` and :meth:`~generator.__next__` methods +are created automatically. Another key feature is that the local variables and execution state are automatically saved between calls. This made the function easier to write and diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -771,7 +771,7 @@ respectively). * :pep:`3114`: the standard :meth:`next` method has been renamed to - :meth:`__next__`. + :meth:`~iterator.__next__`. * The :meth:`__oct__` and :meth:`__hex__` special methods are removed -- :func:`oct` and :func:`hex` use :meth:`__index__` now to convert @@ -807,7 +807,7 @@ To get the old behavior of :func:`input`, use ``eval(input())``. * A new built-in function :func:`next` was added to call the - :meth:`__next__` method on an object. + :meth:`~iterator.__next__` method on an object. * The :func:`round` function rounding strategy and return type have changed. Exact halfway cases are now rounded to the nearest even diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -595,8 +595,13 @@ release = '7' else: release = '2008ServerR2' + elif min == 2: + if product_type == VER_NT_WORKSTATION: + release = '8' + else: + release = '2012Server' else: - release = 'post2008Server' + release = 'post2012Server' else: if not release: diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -565,10 +565,10 @@ with open(filename, 'w', encoding='latin1') as f: f.write(""" #coding:latin1 -"non-ASCII: h\xe9" +s = "non-ASCII: h\xe9" """) result = run_path(filename) - self.assertEqual(result['__doc__'], "non-ASCII: h\xe9") + self.assertEqual(result['s'], "non-ASCII: h\xe9") def test_main(): diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -250,6 +250,7 @@ s = self.run_main(seconds_per_increment=60.0, switches=['-r-5']) self.assertEqual(s, "10 loops, best of 1: 60 sec per loop\n") + @unittest.skipIf(sys.flags.optimize >= 2, "need __doc__") def test_main_help(self): s = self.run_main(switches=['-h']) # Note: It's not clear that the trailing space was intended as part of -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 18:05:18 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 18:05:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_merge_heads?= Message-ID: <3XdYmG6jxSzR3X@mail.python.org> http://hg.python.org/cpython/rev/de8787029fe4 changeset: 79702:de8787029fe4 branch: 3.3 parent: 79701:d4ab5859721e parent: 79690:0cddf0bd19f8 user: Benjamin Peterson date: Fri Oct 12 12:05:01 2012 -0400 summary: merge heads files: Doc/howto/unicode.rst | 2 +- Doc/library/exceptions.rst | 4 ++-- Doc/library/stdtypes.rst | 8 ++++---- Doc/library/string.rst | 2 +- Doc/tutorial/introduction.rst | 2 +- Misc/NEWS | 2 ++ 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -414,7 +414,7 @@ ---------- The ``str`` type is described in the Python library reference at -:ref:`typesseq`. +:ref:`textseq`. The documentation for the :mod:`unicodedata` module. diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -275,8 +275,8 @@ .. exception:: StopIteration Raised by built-in function :func:`next` and an :term:`iterator`\'s - :meth:`__next__` method to signal that there are no further items to be - produced by the iterator. + :meth:`~iterator.__next__` method to signal that there are no further + items produced by the iterator. The exception object has a single attribute :attr:`value`, which is given as an argument when constructing the exception, and defaults diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1358,8 +1358,8 @@ object: io.StringIO -Textual data in Python is handled with :class:`str` objects, which are -immutable sequences of Unicode code points. String literals are +Textual data in Python is handled with ``str`` objects, which are immutable +:ref:`sequences ` of Unicode code points. String literals are written in a variety of ways: * Single quotes: ``'allows embedded "double" quotes'`` @@ -1377,8 +1377,8 @@ including supported escape sequences, and the ``r`` ("raw") prefix that disables most escape sequence processing. -Strings may also be created from other objects with the :ref:`str ` -built-in. +Strings may also be created from other objects with the built-in +function :func:`str`. Since there is no separate "character" type, indexing a string produces strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``. diff --git a/Doc/library/string.rst b/Doc/library/string.rst --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -10,7 +10,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` :ref:`string-methods` diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -390,7 +390,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` Strings are examples of *sequence types*, and support the common operations supported by such types. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -41,6 +41,8 @@ Library ------- +- Issue #16176: Properly identify Windows 8 via platform.platform() + - Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable keyword arguments specified a path that did not exist. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 18:05:20 2012 From: python-checkins at python.org (benjamin.peterson) Date: Fri, 12 Oct 2012 18:05:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3XdYmJ3rK4zR4J@mail.python.org> http://hg.python.org/cpython/rev/6e721c72683f changeset: 79703:6e721c72683f parent: 79700:d3d4737fa093 parent: 79702:de8787029fe4 user: Benjamin Peterson date: Fri Oct 12 12:05:09 2012 -0400 summary: merge 3.3 files: Doc/howto/functional.rst | 5 ++--- Doc/library/functions.rst | 25 +++++++++---------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -292,14 +292,13 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate -iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] - >>> dict(iter(L)) #doctest: +SKIP + >>> dict(iter(L)) {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} Files also support iteration by calling the :meth:`~io.TextIOBase.readline` diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,8 +122,6 @@ Without an argument, an array of size 0 is created. - See also :ref:`binaryseq` and :ref:`typebytearray`. - .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -137,8 +135,6 @@ Bytes objects can also be created with literals, see :ref:`strings`. - See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. - .. function:: callable(object) @@ -692,8 +688,6 @@ *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. - See also :ref:`typeiter`. - One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -714,7 +708,7 @@ :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq`. .. function:: locals() @@ -1088,7 +1082,7 @@ :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq`. .. function:: repr(object) @@ -1213,8 +1207,7 @@ .. function:: str(object='') str(object[, encoding[, errors]]) - Return a :ref:`string ` version of an object, using one of the - following modes: + Return a string version of an object, using one of the following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1237,9 +1230,11 @@ Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings and string methods, see the :ref:`textseq` - section. To output formatted strings, see the :ref:`string-formatting` - section. In addition, see the :ref:`stringservices` section. + For more information on strings see :ref:`typesseq` which describes sequence + functionality (strings are sequences), and also the string-specific methods + described in the :ref:`string-methods` section. To output formatted strings, + see the :ref:`string-formatting` section. In addition see the + :ref:`stringservices` section. .. function:: sum(iterable[, start]) @@ -1316,7 +1311,7 @@ :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq`. .. function:: type(object) @@ -1349,8 +1344,6 @@ ... >>> X = type('X', (object,), dict(a=1)) - See also :ref:`bltin-type-objects`. - .. function:: vars([object]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 12 22:02:21 2012 From: python-checkins at python.org (gregory.p.smith) Date: Fri, 12 Oct 2012 22:02:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fixes_Issue_?= =?utf-8?q?=2312268_for_the_io_module_-_File_readline=2C_readlines_and?= Message-ID: <3Xdg1n3K3NzR58@mail.python.org> http://hg.python.org/cpython/rev/751a91e332d9 changeset: 79704:751a91e332d9 branch: 2.7 parent: 79675:c0a2294de787 user: Gregory P. Smith date: Fri Oct 12 13:02:06 2012 -0700 summary: Fixes Issue #12268 for the io module - File readline, readlines and read or readall methods no longer lose data when an underlying read system call is interrupted within an io module object. IOError is no longer raised due to a read system call returning EINTR from within these methods. This is a backport of changeset 781b95159954 from 3.2. The earlier 2.7 changeset 67dc99a989cd already fixed this for the builtin python 2.x file object. files: Lib/test/test_file_eintr.py | 239 ++++++++++++++++++++++++ Misc/NEWS | 5 + Modules/_io/_iomodule.h | 5 + Modules/_io/bufferedio.c | 8 +- Modules/_io/fileio.c | 7 + Modules/_io/iobase.c | 21 +- Modules/_io/textio.c | 16 +- 7 files changed, 293 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_file_eintr.py b/Lib/test/test_file_eintr.py new file mode 100644 --- /dev/null +++ b/Lib/test/test_file_eintr.py @@ -0,0 +1,239 @@ +# Written to test interrupted system calls interfering with our many buffered +# IO implementations. http://bugs.python.org/issue12268 +# +# This tests the '_io' module. Similar tests for Python 2.x's older +# default file I/O implementation exist within test_file2k.py. +# +# It was suggested that this code could be merged into test_io and the tests +# made to work using the same method as the existing signal tests in test_io. +# I was unable to get single process tests using alarm or setitimer that way +# to reproduce the EINTR problems. This process based test suite reproduces +# the problems prior to the issue12268 patch reliably on Linux and OSX. +# - gregory.p.smith + +import os +import select +import signal +import subprocess +import sys +from test.test_support import run_unittest +import time +import unittest + +# Test import all of the things we're about to try testing up front. +from _io import FileIO + + + at unittest.skipUnless(os.name == 'posix', 'tests requires a posix system.') +class TestFileIOSignalInterrupt(unittest.TestCase): + def setUp(self): + self._process = None + + def tearDown(self): + if self._process and self._process.poll() is None: + try: + self._process.kill() + except OSError: + pass + + def _generate_infile_setup_code(self): + """Returns the infile = ... line of code for the reader process. + + subclasseses should override this to test different IO objects. + """ + return ('import _io ;' + 'infile = _io.FileIO(sys.stdin.fileno(), "rb")') + + def fail_with_process_info(self, why, stdout=b'', stderr=b'', + communicate=True): + """A common way to cleanup and fail with useful debug output. + + Kills the process if it is still running, collects remaining output + and fails the test with an error message including the output. + + Args: + why: Text to go after "Error from IO process" in the message. + stdout, stderr: standard output and error from the process so + far to include in the error message. + communicate: bool, when True we call communicate() on the process + after killing it to gather additional output. + """ + if self._process.poll() is None: + time.sleep(0.1) # give it time to finish printing the error. + try: + self._process.terminate() # Ensure it dies. + except OSError: + pass + if communicate: + stdout_end, stderr_end = self._process.communicate() + stdout += stdout_end + stderr += stderr_end + self.fail('Error from IO process %s:\nSTDOUT:\n%sSTDERR:\n%s\n' % + (why, stdout.decode(), stderr.decode())) + + def _test_reading(self, data_to_write, read_and_verify_code): + """Generic buffered read method test harness to validate EINTR behavior. + + Also validates that Python signal handlers are run during the read. + + Args: + data_to_write: String to write to the child process for reading + before sending it a signal, confirming the signal was handled, + writing a final newline and closing the infile pipe. + read_and_verify_code: Single "line" of code to read from a file + object named 'infile' and validate the result. This will be + executed as part of a python subprocess fed data_to_write. + """ + infile_setup_code = self._generate_infile_setup_code() + # Total pipe IO in this function is smaller than the minimum posix OS + # pipe buffer size of 512 bytes. No writer should block. + assert len(data_to_write) < 512, 'data_to_write must fit in pipe buf.' + + # Start a subprocess to call our read method while handling a signal. + self._process = subprocess.Popen( + [sys.executable, '-u', '-c', + 'import io, signal, sys ;' + 'signal.signal(signal.SIGINT, ' + 'lambda s, f: sys.stderr.write("$\\n")) ;' + + infile_setup_code + ' ;' + + 'sys.stderr.write("Worm Sign!\\n") ;' + + read_and_verify_code + ' ;' + + 'infile.close()' + ], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + # Wait for the signal handler to be installed. + worm_sign = self._process.stderr.read(len(b'Worm Sign!\n')) + if worm_sign != b'Worm Sign!\n': # See also, Dune by Frank Herbert. + self.fail_with_process_info('while awaiting a sign', + stderr=worm_sign) + self._process.stdin.write(data_to_write) + + signals_sent = 0 + rlist = [] + # We don't know when the read_and_verify_code in our child is actually + # executing within the read system call we want to interrupt. This + # loop waits for a bit before sending the first signal to increase + # the likelihood of that. Implementations without correct EINTR + # and signal handling usually fail this test. + while not rlist: + rlist, _, _ = select.select([self._process.stderr], (), (), 0.05) + self._process.send_signal(signal.SIGINT) + signals_sent += 1 + if signals_sent > 200: + self._process.kill() + self.fail('reader process failed to handle our signals.') + # This assumes anything unexpected that writes to stderr will also + # write a newline. That is true of the traceback printing code. + signal_line = self._process.stderr.readline() + if signal_line != b'$\n': + self.fail_with_process_info('while awaiting signal', + stderr=signal_line) + + # We append a newline to our input so that a readline call can + # end on its own before the EOF is seen and so that we're testing + # the read call that was interrupted by a signal before the end of + # the data stream has been reached. + stdout, stderr = self._process.communicate(input=b'\n') + if self._process.returncode: + self.fail_with_process_info( + 'exited rc=%d' % self._process.returncode, + stdout, stderr, communicate=False) + # PASS! + + # String format for the read_and_verify_code used by read methods. + _READING_CODE_TEMPLATE = ( + 'got = infile.{read_method_name}() ;' + 'expected = {expected!r} ;' + 'assert got == expected, (' + '"{read_method_name} returned wrong data.\\n"' + '"got data %r\\nexpected %r" % (got, expected))' + ) + + def test_readline(self): + """readline() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello, world!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='readline', + expected=b'hello, world!\n')) + + def test_readlines(self): + """readlines() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello\nworld!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='readlines', + expected=[b'hello\n', b'world!\n'])) + + def test_readall(self): + """readall() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello\nworld!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='readall', + expected=b'hello\nworld!\n')) + # read() is the same thing as readall(). + self._test_reading( + data_to_write=b'hello\nworld!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='read', + expected=b'hello\nworld!\n')) + + +class TestBufferedIOSignalInterrupt(TestFileIOSignalInterrupt): + def _generate_infile_setup_code(self): + """Returns the infile = ... line of code to make a BufferedReader.""" + return ('infile = io.open(sys.stdin.fileno(), "rb") ;' + 'import _io ;assert isinstance(infile, _io.BufferedReader)') + + def test_readall(self): + """BufferedReader.read() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello\nworld!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='read', + expected=b'hello\nworld!\n')) + + +class TestTextIOSignalInterrupt(TestFileIOSignalInterrupt): + def _generate_infile_setup_code(self): + """Returns the infile = ... line of code to make a TextIOWrapper.""" + return ('infile = io.open(sys.stdin.fileno(), "rt", newline=None) ;' + 'import _io ;assert isinstance(infile, _io.TextIOWrapper)') + + def test_readline(self): + """readline() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello, world!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='readline', + expected='hello, world!\n')) + + def test_readlines(self): + """readlines() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello\r\nworld!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='readlines', + expected=['hello\n', 'world!\n'])) + + def test_readall(self): + """read() must handle signals and not lose data.""" + self._test_reading( + data_to_write=b'hello\nworld!', + read_and_verify_code=self._READING_CODE_TEMPLATE.format( + read_method_name='read', + expected="hello\nworld!\n")) + + +def test_main(): + test_cases = [ + tc for tc in globals().values() + if isinstance(tc, type) and issubclass(tc, unittest.TestCase)] + run_unittest(*test_cases) + + +if __name__ == '__main__': + test_main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -414,6 +414,11 @@ Extension Modules ----------------- +- Issue #12268: File readline, readlines and read or readall methods + no longer lose data when an underlying read system call is interrupted + within an io module object. IOError is no longer raised due to a read + system call returning EINTR from within these methods. + - Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD() method doesn't require an argument again. diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -57,6 +57,11 @@ int translated, int universal, PyObject *readnl, Py_UNICODE *start, Py_UNICODE *end, Py_ssize_t *consumed); +/* Return 1 if an EnvironmentError with errno == EINTR is set (and then + clears the error indicator), 0 otherwise. + Should only be called when PyErr_Occurred() is true. +*/ +extern int _PyIO_trap_eintr(void); #define DEFAULT_BUFFER_SIZE (8 * 1024) /* bytes */ diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -710,8 +710,8 @@ clears the error indicator), 0 otherwise. Should only be called when PyErr_Occurred() is true. */ -static int -_trap_eintr(void) +int +_PyIO_trap_eintr(void) { static PyObject *eintr_int = NULL; PyObject *typ, *val, *tb; @@ -1296,7 +1296,7 @@ */ do { res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readinto, memobj, NULL); - } while (res == NULL && _trap_eintr()); + } while (res == NULL && _PyIO_trap_eintr()); Py_DECREF(memobj); if (res == NULL) return -1; @@ -1723,7 +1723,7 @@ errno = 0; res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_write, memobj, NULL); errnum = errno; - } while (res == NULL && _trap_eintr()); + } while (res == NULL && _PyIO_trap_eintr()); Py_DECREF(memobj); if (res == NULL) return -1; diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -570,6 +570,13 @@ if (n == 0) break; if (n < 0) { + if (errno == EINTR) { + if (PyErr_CheckSignals()) { + Py_DECREF(result); + return NULL; + } + continue; + } if (total > 0) break; if (errno == EAGAIN) { diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -468,8 +468,14 @@ if (has_peek) { PyObject *readahead = PyObject_CallMethod(self, "peek", "i", 1); - if (readahead == NULL) + if (readahead == NULL) { + /* NOTE: PyErr_SetFromErrno() calls PyErr_CheckSignals() + when EINTR occurs so we needn't do it ourselves. */ + if (_PyIO_trap_eintr()) { + continue; + } goto fail; + } if (!PyBytes_Check(readahead)) { PyErr_Format(PyExc_IOError, "peek() should have returned a bytes object, " @@ -502,8 +508,14 @@ } b = PyObject_CallMethod(self, "read", "n", nreadahead); - if (b == NULL) + if (b == NULL) { + /* NOTE: PyErr_SetFromErrno() calls PyErr_CheckSignals() + when EINTR occurs so we needn't do it ourselves. */ + if (_PyIO_trap_eintr()) { + continue; + } goto fail; + } if (!PyBytes_Check(b)) { PyErr_Format(PyExc_IOError, "read() should have returned a bytes object, " @@ -811,6 +823,11 @@ PyObject *data = PyObject_CallMethod(self, "read", "i", DEFAULT_BUFFER_SIZE); if (!data) { + /* NOTE: PyErr_SetFromErrno() calls PyErr_CheckSignals() + when EINTR occurs so we needn't do it ourselves. */ + if (_PyIO_trap_eintr()) { + continue; + } Py_DECREF(chunks); return NULL; } diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1518,8 +1518,14 @@ /* Keep reading chunks until we have n characters to return */ while (remaining > 0) { res = textiowrapper_read_chunk(self); - if (res < 0) + if (res < 0) { + /* NOTE: PyErr_SetFromErrno() calls PyErr_CheckSignals() + when EINTR occurs so we needn't do it ourselves. */ + if (_PyIO_trap_eintr()) { + continue; + } goto fail; + } if (res == 0) /* EOF */ break; if (chunks == NULL) { @@ -1678,8 +1684,14 @@ while (!self->decoded_chars || !PyUnicode_GET_SIZE(self->decoded_chars)) { res = textiowrapper_read_chunk(self); - if (res < 0) + if (res < 0) { + /* NOTE: PyErr_SetFromErrno() calls PyErr_CheckSignals() + when EINTR occurs so we needn't do it ourselves. */ + if (_PyIO_trap_eintr()) { + continue; + } goto error; + } if (res == 0) break; } -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Sat Oct 13 02:47:35 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Fri, 12 Oct 2012 17:47:35 -0700 Subject: [Python-checkins] cpython (merge 3.3 -> default): merge 3.3 In-Reply-To: <3XdYmJ3rK4zR4J@mail.python.org> References: <3XdYmJ3rK4zR4J@mail.python.org> Message-ID: On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson wrote: > http://hg.python.org/cpython/rev/6e721c72683f > changeset: 79703:6e721c72683f > parent: 79700:d3d4737fa093 > parent: 79702:de8787029fe4 > user: Benjamin Peterson > date: Fri Oct 12 12:05:09 2012 -0400 > summary: > merge 3.3 It looks like this check-in reverted previous valid work. --Chris > > files: > Doc/howto/functional.rst | 5 ++--- > Doc/library/functions.rst | 25 +++++++++---------------- > 2 files changed, 11 insertions(+), 19 deletions(-) > > > diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst > --- a/Doc/howto/functional.rst > +++ b/Doc/howto/functional.rst > @@ -292,14 +292,13 @@ > Applying :func:`iter` to a dictionary always loops over the keys, but > dictionaries have methods that return other iterators. If you want to iterate > over values or key/value pairs, you can explicitly call the > -:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate > -iterator. > +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. > > The :func:`dict` constructor can accept an iterator that returns a finite stream > of ``(key, value)`` tuples: > > >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] > - >>> dict(iter(L)) #doctest: +SKIP > + >>> dict(iter(L)) > {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} > > Files also support iteration by calling the :meth:`~io.TextIOBase.readline` > diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst > --- a/Doc/library/functions.rst > +++ b/Doc/library/functions.rst > @@ -122,8 +122,6 @@ > > Without an argument, an array of size 0 is created. > > - See also :ref:`binaryseq` and :ref:`typebytearray`. > - > > .. _func-bytes: > .. function:: bytes([source[, encoding[, errors]]]) > @@ -137,8 +135,6 @@ > > Bytes objects can also be created with literals, see :ref:`strings`. > > - See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. > - > > .. function:: callable(object) > > @@ -692,8 +688,6 @@ > *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will > be returned. > > - See also :ref:`typeiter`. > - > One useful application of the second form of :func:`iter` is to read lines of > a file until a certain line is reached. The following example reads a file > until the :meth:`readline` method returns an empty string:: > @@ -714,7 +708,7 @@ > :noindex: > > Rather than being a function, :class:`list` is actually a mutable > - sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. > + sequence type, as documented in :ref:`typesseq`. > > > .. function:: locals() > @@ -1088,7 +1082,7 @@ > :noindex: > > Rather than being a function, :class:`range` is actually an immutable > - sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. > + sequence type, as documented in :ref:`typesseq`. > > > .. function:: repr(object) > @@ -1213,8 +1207,7 @@ > .. function:: str(object='') > str(object[, encoding[, errors]]) > > - Return a :ref:`string ` version of an object, using one of the > - following modes: > + Return a string version of an object, using one of the following modes: > > If *encoding* and/or *errors* are given, :func:`str` will decode the > *object* which can either be a byte string or a character buffer using > @@ -1237,9 +1230,11 @@ > Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` > special method. > > - For more information on strings and string methods, see the :ref:`textseq` > - section. To output formatted strings, see the :ref:`string-formatting` > - section. In addition, see the :ref:`stringservices` section. > + For more information on strings see :ref:`typesseq` which describes sequence > + functionality (strings are sequences), and also the string-specific methods > + described in the :ref:`string-methods` section. To output formatted strings, > + see the :ref:`string-formatting` section. In addition see the > + :ref:`stringservices` section. > > > .. function:: sum(iterable[, start]) > @@ -1316,7 +1311,7 @@ > :noindex: > > Rather than being a function, :class:`tuple` is actually an immutable > - sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. > + sequence type, as documented in :ref:`typesseq`. > > > .. function:: type(object) > @@ -1349,8 +1344,6 @@ > ... > >>> X = type('X', (object,), dict(a=1)) > > - See also :ref:`bltin-type-objects`. > - > > .. function:: vars([object]) > > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From chris.jerdonek at gmail.com Sat Oct 13 03:25:55 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Fri, 12 Oct 2012 18:25:55 -0700 Subject: [Python-checkins] cpython (merge 3.3 -> 3.3): merge heads In-Reply-To: <3XdYmG6jxSzR3X@mail.python.org> References: <3XdYmG6jxSzR3X@mail.python.org> Message-ID: On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson wrote: > http://hg.python.org/cpython/rev/de8787029fe4 > changeset: 79702:de8787029fe4 > branch: 3.3 > parent: 79701:d4ab5859721e > parent: 79690:0cddf0bd19f8 It looks like this 3.3 check-in also reverted previous valid work. The following command shows the diff from the "mainline", which isn't visible in the e-mail contents below: hg diff -r 0cddf0bd19f8 -r de8787029fe4 It's hard for me to piece together exactly what happened, or else I would try to fix it myself. --Chris > user: Benjamin Peterson > date: Fri Oct 12 12:05:01 2012 -0400 > summary: > merge heads > > files: > Doc/howto/unicode.rst | 2 +- > Doc/library/exceptions.rst | 4 ++-- > Doc/library/stdtypes.rst | 8 ++++---- > Doc/library/string.rst | 2 +- > Doc/tutorial/introduction.rst | 2 +- > Misc/NEWS | 2 ++ > 6 files changed, 11 insertions(+), 9 deletions(-) > > > diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst > --- a/Doc/howto/unicode.rst > +++ b/Doc/howto/unicode.rst > @@ -414,7 +414,7 @@ > ---------- > > The ``str`` type is described in the Python library reference at > -:ref:`typesseq`. > +:ref:`textseq`. > > The documentation for the :mod:`unicodedata` module. > > diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst > --- a/Doc/library/exceptions.rst > +++ b/Doc/library/exceptions.rst > @@ -275,8 +275,8 @@ > .. exception:: StopIteration > > Raised by built-in function :func:`next` and an :term:`iterator`\'s > - :meth:`__next__` method to signal that there are no further items to be > - produced by the iterator. > + :meth:`~iterator.__next__` method to signal that there are no further > + items produced by the iterator. > > The exception object has a single attribute :attr:`value`, which is > given as an argument when constructing the exception, and defaults > diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst > --- a/Doc/library/stdtypes.rst > +++ b/Doc/library/stdtypes.rst > @@ -1358,8 +1358,8 @@ > object: io.StringIO > > > -Textual data in Python is handled with :class:`str` objects, which are > -immutable sequences of Unicode code points. String literals are > +Textual data in Python is handled with ``str`` objects, which are immutable > +:ref:`sequences ` of Unicode code points. String literals are > written in a variety of ways: > > * Single quotes: ``'allows embedded "double" quotes'`` > @@ -1377,8 +1377,8 @@ > including supported escape sequences, and the ``r`` ("raw") prefix that > disables most escape sequence processing. > > -Strings may also be created from other objects with the :ref:`str ` > -built-in. > +Strings may also be created from other objects with the built-in > +function :func:`str`. > > Since there is no separate "character" type, indexing a string produces > strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``. > diff --git a/Doc/library/string.rst b/Doc/library/string.rst > --- a/Doc/library/string.rst > +++ b/Doc/library/string.rst > @@ -10,7 +10,7 @@ > > .. seealso:: > > - :ref:`typesseq` > + :ref:`textseq` > > :ref:`string-methods` > > diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst > --- a/Doc/tutorial/introduction.rst > +++ b/Doc/tutorial/introduction.rst > @@ -390,7 +390,7 @@ > > .. seealso:: > > - :ref:`typesseq` > + :ref:`textseq` > Strings are examples of *sequence types*, and support the common > operations supported by such types. > > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -41,6 +41,8 @@ > Library > ------- > > +- Issue #16176: Properly identify Windows 8 via platform.platform() > + > - Issue #16114: The subprocess module no longer provides a misleading error > message stating that args[0] did not exist when either the cwd or executable > keyword arguments specified a path that did not exist. > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From python-checkins at python.org Sat Oct 13 04:27:11 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sat, 13 Oct 2012 04:27:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_lzma_module=3A_Rewrap_docs?= =?utf-8?q?trings_at_72_columns=2C_as_per_PEP_8=2E?= Message-ID: <3XdqYq3cR1zR5f@mail.python.org> http://hg.python.org/cpython/rev/c47a44e4002b changeset: 79705:c47a44e4002b parent: 79703:6e721c72683f user: Nadeem Vawda date: Sat Oct 13 04:26:49 2012 +0200 summary: lzma module: Rewrap docstrings at 72 columns, as per PEP 8. files: Lib/lzma.py | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Lib/lzma.py b/Lib/lzma.py --- a/Lib/lzma.py +++ b/Lib/lzma.py @@ -55,7 +55,7 @@ be an existing file object to read from or write to. mode can be "r" for reading (default), "w" for (over)writing, or - "a" for appending. These can equivalently be given as "rb", "wb", + "a" for appending. These can equivalently be given as "rb", "wb" and "ab" respectively. format specifies the container format to use for the file. @@ -381,23 +381,24 @@ encoding=None, errors=None, newline=None): """Open an LZMA-compressed file in binary or text mode. - filename can be either an actual file name (given as a str or bytes object), - in which case the named file is opened, or it can be an existing file object - to read from or write to. + filename can be either an actual file name (given as a str or bytes + object), in which case the named file is opened, or it can be an + existing file object to read from or write to. - The mode argument can be "r", "rb" (default), "w", "wb", "a", or "ab" for - binary mode, or "rt", "wt" or "at" for text mode. + The mode argument can be "r", "rb" (default), "w", "wb", "a" or "ab" + for binary mode, or "rt", "wt" or "at" for text mode. - The format, check, preset and filters arguments specify the compression - settings, as for LZMACompressor, LZMADecompressor and LZMAFile. + The format, check, preset and filters arguments specify the + compression settings, as for LZMACompressor, LZMADecompressor and + LZMAFile. - For binary mode, this function is equivalent to the LZMAFile constructor: - LZMAFile(filename, mode, ...). In this case, the encoding, errors and - newline arguments must not be provided. + For binary mode, this function is equivalent to the LZMAFile + constructor: LZMAFile(filename, mode, ...). In this case, the + encoding, errors and newline arguments must not be provided. For text mode, a LZMAFile object is created, and wrapped in an - io.TextIOWrapper instance with the specified encoding, error handling - behavior, and line ending(s). + io.TextIOWrapper instance with the specified encoding, error + handling behavior, and line ending(s). """ if "t" in mode: @@ -427,7 +428,7 @@ Refer to LZMACompressor's docstring for a description of the optional arguments *format*, *check*, *preset* and *filters*. - For incremental compression, use an LZMACompressor object instead. + For incremental compression, use an LZMACompressor instead. """ comp = LZMACompressor(format, check, preset, filters) return comp.compress(data) + comp.flush() @@ -439,7 +440,7 @@ Refer to LZMADecompressor's docstring for a description of the optional arguments *format*, *check* and *filters*. - For incremental decompression, use a LZMADecompressor object instead. + For incremental decompression, use an LZMADecompressor instead. """ results = [] while True: -- Repository URL: http://hg.python.org/cpython From benjamin at python.org Sat Oct 13 04:40:55 2012 From: benjamin at python.org (Benjamin Peterson) Date: Fri, 12 Oct 2012 22:40:55 -0400 Subject: [Python-checkins] cpython (merge 3.3 -> 3.3): merge heads In-Reply-To: References: <3XdYmG6jxSzR3X@mail.python.org> Message-ID: 2012/10/12 Chris Jerdonek : > On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson > wrote: >> http://hg.python.org/cpython/rev/de8787029fe4 >> changeset: 79702:de8787029fe4 >> branch: 3.3 >> parent: 79701:d4ab5859721e >> parent: 79690:0cddf0bd19f8 > > It looks like this 3.3 check-in also reverted previous valid work. > The following command shows the diff from the "mainline", which isn't > visible in the e-mail contents below: > > hg diff -r 0cddf0bd19f8 -r de8787029fe4 > > It's hard for me to piece together exactly what happened, or else I > would try to fix it myself. Sorry about that. I merged 3.2 -> default instead of 3.2 -> 3.3 -> default and these were my attempts to fix it. -- Regards, Benjamin From python-checkins at python.org Sat Oct 13 04:44:41 2012 From: python-checkins at python.org (raymond.hettinger) Date: Sat, 13 Oct 2012 04:44:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_String_excepti?= =?utf-8?q?ons_aren=27t_just_deprecated=2C_they_are_gone=2E?= Message-ID: <3Xdqy149PzzR1s@mail.python.org> http://hg.python.org/cpython/rev/b6c8ba7538a2 changeset: 79706:b6c8ba7538a2 branch: 2.7 parent: 79704:751a91e332d9 user: Raymond Hettinger date: Fri Oct 12 19:44:35 2012 -0700 summary: String exceptions aren't just deprecated, they are gone. files: Doc/reference/compound_stmts.rst | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -238,10 +238,7 @@ expression, that expression is evaluated, and the clause matches the exception if the resulting object is "compatible" with the exception. An object is compatible with an exception if it is the class or a base class of the exception -object, a tuple containing an item compatible with the exception, or, in the -(deprecated) case of string exceptions, is the raised string itself (note that -the object identities must match, i.e. it must be the same string object, not -just a string with the same value). +object, or a tuple containing an item compatible with the exception. If no except clause matches the exception, the search for an exception handler continues in the surrounding code and on the invocation stack. [#]_ -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Sat Oct 13 05:22:16 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Fri, 12 Oct 2012 20:22:16 -0700 Subject: [Python-checkins] cpython (merge 3.3 -> 3.3): merge heads In-Reply-To: References: <3XdYmG6jxSzR3X@mail.python.org> Message-ID: On Fri, Oct 12, 2012 at 7:40 PM, Benjamin Peterson wrote: > 2012/10/12 Chris Jerdonek : >> On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson >> wrote: >>> http://hg.python.org/cpython/rev/de8787029fe4 >>> changeset: 79702:de8787029fe4 >>> branch: 3.3 >>> parent: 79701:d4ab5859721e >>> parent: 79690:0cddf0bd19f8 >> >> It looks like this 3.3 check-in also reverted previous valid work. >> The following command shows the diff from the "mainline", which isn't >> visible in the e-mail contents below: >> >> hg diff -r 0cddf0bd19f8 -r de8787029fe4 >> >> It's hard for me to piece together exactly what happened, or else I >> would try to fix it myself. > > Sorry about that. I merged 3.2 -> default instead of 3.2 -> 3.3 -> > default and these were my attempts to fix it. Are you already fixing it? If not, it looks like I could fix it. I'll start on that.. --Chris > > > -- > Regards, > Benjamin > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins From python-checkins at python.org Sat Oct 13 05:33:50 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sat, 13 Oct 2012 05:33:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Undo_changes_a?= =?utf-8?q?ccidentally_reverted_in_de8787029fe4=2E?= Message-ID: <3Xds2k5M1jzR6M@mail.python.org> http://hg.python.org/cpython/rev/95f7481fc9f1 changeset: 79707:95f7481fc9f1 branch: 3.3 parent: 79702:de8787029fe4 user: Chris Jerdonek date: Fri Oct 12 20:28:26 2012 -0700 summary: Undo changes accidentally reverted in de8787029fe4. files: Doc/howto/functional.rst | 5 +++-- Doc/library/functions.rst | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -292,13 +292,14 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate +iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] - >>> dict(iter(L)) + >>> dict(iter(L)) #doctest: +SKIP {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} Files also support iteration by calling the :meth:`~io.TextIOBase.readline` diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,6 +122,8 @@ Without an argument, an array of size 0 is created. + See also :ref:`binaryseq` and :ref:`typebytearray`. + .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -135,6 +137,8 @@ Bytes objects can also be created with literals, see :ref:`strings`. + See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. + .. function:: callable(object) @@ -688,6 +692,8 @@ *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. + See also :ref:`typeiter`. + One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -708,7 +714,7 @@ :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. .. function:: locals() @@ -1082,7 +1088,7 @@ :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. .. function:: repr(object) @@ -1207,7 +1213,8 @@ .. function:: str(object='') str(object[, encoding[, errors]]) - Return a string version of an object, using one of the following modes: + Return a :ref:`string ` version of an object, using one of the + following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1230,11 +1237,9 @@ Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings see :ref:`typesseq` which describes sequence - functionality (strings are sequences), and also the string-specific methods - described in the :ref:`string-methods` section. To output formatted strings, - see the :ref:`string-formatting` section. In addition see the - :ref:`stringservices` section. + For more information on strings and string methods, see the :ref:`textseq` + section. To output formatted strings, see the :ref:`string-formatting` + section. In addition, see the :ref:`stringservices` section. .. function:: sum(iterable[, start]) @@ -1311,7 +1316,7 @@ :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. .. function:: type(object) @@ -1344,6 +1349,8 @@ ... >>> X = type('X', (object,), dict(a=1)) + See also :ref:`bltin-type-objects`. + .. function:: vars([object]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 13 05:33:52 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sat, 13 Oct 2012 05:33:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_Undo_changes_accidentally_reverted_i?= =?utf-8?q?n_de8787029fe4=2E?= Message-ID: <3Xds2m21h8zR7b@mail.python.org> http://hg.python.org/cpython/rev/49ff2fa464e0 changeset: 79708:49ff2fa464e0 parent: 79705:c47a44e4002b parent: 79707:95f7481fc9f1 user: Chris Jerdonek date: Fri Oct 12 20:31:50 2012 -0700 summary: Merge from 3.3: Undo changes accidentally reverted in de8787029fe4. files: Doc/howto/functional.rst | 5 +++-- Doc/library/functions.rst | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -292,13 +292,14 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate +iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] - >>> dict(iter(L)) + >>> dict(iter(L)) #doctest: +SKIP {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} Files also support iteration by calling the :meth:`~io.TextIOBase.readline` diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,6 +122,8 @@ Without an argument, an array of size 0 is created. + See also :ref:`binaryseq` and :ref:`typebytearray`. + .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -135,6 +137,8 @@ Bytes objects can also be created with literals, see :ref:`strings`. + See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. + .. function:: callable(object) @@ -688,6 +692,8 @@ *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. + See also :ref:`typeiter`. + One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -708,7 +714,7 @@ :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. .. function:: locals() @@ -1082,7 +1088,7 @@ :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. .. function:: repr(object) @@ -1207,7 +1213,8 @@ .. function:: str(object='') str(object[, encoding[, errors]]) - Return a string version of an object, using one of the following modes: + Return a :ref:`string ` version of an object, using one of the + following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1230,11 +1237,9 @@ Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings see :ref:`typesseq` which describes sequence - functionality (strings are sequences), and also the string-specific methods - described in the :ref:`string-methods` section. To output formatted strings, - see the :ref:`string-formatting` section. In addition see the - :ref:`stringservices` section. + For more information on strings and string methods, see the :ref:`textseq` + section. To output formatted strings, see the :ref:`string-formatting` + section. In addition, see the :ref:`stringservices` section. .. function:: sum(iterable[, start]) @@ -1311,7 +1316,7 @@ :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. .. function:: type(object) @@ -1344,6 +1349,8 @@ ... >>> X = type('X', (object,), dict(a=1)) + See also :ref:`bltin-type-objects`. + .. function:: vars([object]) -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Sat Oct 13 05:44:09 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Fri, 12 Oct 2012 20:44:09 -0700 Subject: [Python-checkins] cpython (merge 3.3 -> 3.3): merge heads In-Reply-To: References: <3XdYmG6jxSzR3X@mail.python.org> Message-ID: On Fri, Oct 12, 2012 at 8:22 PM, Chris Jerdonek wrote: > On Fri, Oct 12, 2012 at 7:40 PM, Benjamin Peterson wrote: >> 2012/10/12 Chris Jerdonek : >>> On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson >>> wrote: >>>> http://hg.python.org/cpython/rev/de8787029fe4 >>>> changeset: 79702:de8787029fe4 >>>> branch: 3.3 >>>> parent: 79701:d4ab5859721e >>>> parent: 79690:0cddf0bd19f8 >>> >>> It looks like this 3.3 check-in also reverted previous valid work. >>> The following command shows the diff from the "mainline", which isn't >>> visible in the e-mail contents below: >>> >>> hg diff -r 0cddf0bd19f8 -r de8787029fe4 >>> >>> It's hard for me to piece together exactly what happened, or else I >>> would try to fix it myself. >> >> Sorry about that. I merged 3.2 -> default instead of 3.2 -> 3.3 -> >> default and these were my attempts to fix it. > > Are you already fixing it? If not, it looks like I could fix it. > I'll start on that.. Okay, I believe it's fixed now. I also did a sanity check on the default branch by comparing the tip with the default branch prior to those merges. The only thing I didn't check is whether you have any changes in 3.2 or 3.3 that need to be merged to default. --Chris From solipsis at pitrou.net Sat Oct 13 05:55:58 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sat, 13 Oct 2012 05:55:58 +0200 Subject: [Python-checkins] Daily reference leaks (6e721c72683f): sum=0 Message-ID: results for 6e721c72683f on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogW_Dqz8', '-x'] From benjamin at python.org Sat Oct 13 07:00:30 2012 From: benjamin at python.org (Benjamin Peterson) Date: Sat, 13 Oct 2012 01:00:30 -0400 Subject: [Python-checkins] [Python-Dev] cpython (merge 3.3 -> 3.3): merge heads In-Reply-To: References: <3XdYmG6jxSzR3X@mail.python.org> Message-ID: 2012/10/12 Chris Jerdonek : > On Fri, Oct 12, 2012 at 8:22 PM, Chris Jerdonek > wrote: >> On Fri, Oct 12, 2012 at 7:40 PM, Benjamin Peterson wrote: >>> 2012/10/12 Chris Jerdonek : >>>> On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson >>>> wrote: >>>>> http://hg.python.org/cpython/rev/de8787029fe4 >>>>> changeset: 79702:de8787029fe4 >>>>> branch: 3.3 >>>>> parent: 79701:d4ab5859721e >>>>> parent: 79690:0cddf0bd19f8 >>>> >>>> It looks like this 3.3 check-in also reverted previous valid work. >>>> The following command shows the diff from the "mainline", which isn't >>>> visible in the e-mail contents below: >>>> >>>> hg diff -r 0cddf0bd19f8 -r de8787029fe4 >>>> >>>> It's hard for me to piece together exactly what happened, or else I >>>> would try to fix it myself. >>> >>> Sorry about that. I merged 3.2 -> default instead of 3.2 -> 3.3 -> >>> default and these were my attempts to fix it. >> >> Are you already fixing it? If not, it looks like I could fix it. >> I'll start on that.. > > Okay, I believe it's fixed now. I also did a sanity check on the > default branch by comparing the tip with the default branch prior to > those merges. Thanks for looking into that. > > The only thing I didn't check is whether you have any changes in 3.2 > or 3.3 that need to be merged to default. Everything looks okay to me. -- Regards, Benjamin From python-checkins at python.org Sat Oct 13 12:30:36 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sat, 13 Oct 2012 12:30:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjA2?= =?utf-8?q?=3A_Improve_the_documentation_of_the_dict_constructor=2E?= Message-ID: <3Xf2Hc0S4QzPLh@mail.python.org> http://hg.python.org/cpython/rev/ed6da2a8361c changeset: 79709:ed6da2a8361c branch: 3.2 parent: 79699:da1d2283e31f user: Chris Jerdonek date: Sat Oct 13 03:22:33 2012 -0700 summary: Issue #16206: Improve the documentation of the dict constructor. This change includes replacing the single-line signature documentation with a more complete multiple-line signature. files: Doc/library/functions.rst | 13 +++-- Doc/library/stdtypes.rst | 58 +++++++++++++++----------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -266,14 +266,17 @@ .. _func-dict: -.. function:: dict([arg]) +.. function:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) :noindex: - Create a new data dictionary, optionally with items taken from *arg*. - The dictionary type is described in :ref:`typesmapping`. + Create a new dictionary. The :class:`dict` object is the dictionary class. + See :class:`dict` and :ref:`typesmapping` for documentation about this + class. - For other containers see the built in :class:`list`, :class:`set`, and - :class:`tuple` classes, and the :mod:`collections` module. + For other containers see the built-in :class:`list`, :class:`set`, and + :class:`tuple` classes, as well as the :mod:`collections` module. .. function:: dir([object]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2114,33 +2114,41 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict([arg]) - - Return a new dictionary initialized from an optional positional argument or - from a set of keyword arguments. If no arguments are given, return a new - empty dictionary. If the positional argument *arg* is a mapping object, - return a dictionary mapping the same keys to the same values as does the - mapping object. Otherwise the positional argument must be a sequence, a - container that supports iteration, or an iterator object. The elements of - the argument must each also be of one of those kinds, and each must in turn - contain exactly two objects. The first is used as a key in the new - dictionary, and the second as the key's value. If a given key is seen more - than once, the last value associated with it is retained in the new +.. class:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) + + Return a new dictionary initialized from an optional positional argument + and a possibly empty set of keyword arguments. + + If no positional argument is given, an empty dictionary is created. + If a positional argument is given and it is a mapping object, a dictionary + is created with the same key-value pairs as the mapping object. Otherwise, + the positional argument must be an :term:`iterator` object. Each item in + the iterable must itself be an iterator with exactly two objects. The + first object of each item becomes a key in the new dictionary, and the + second object the corresponding value. If a key occurs more than once, the + last value for that key becomes the corresponding value in the new dictionary. - If keyword arguments are given, the keywords themselves with their associated - values are added as items to the dictionary. If a key is specified both in - the positional argument and as a keyword argument, the value associated with - the keyword is retained in the dictionary. For example, these all return a - dictionary equal to ``{"one": 1, "two": 2}``: - - * ``dict(one=1, two=2)`` - * ``dict({'one': 1, 'two': 2})`` - * ``dict(zip(('one', 'two'), (1, 2)))`` - * ``dict([['two', 2], ['one', 1]])`` - - The first example only works for keys that are valid Python identifiers; the - others work with any valid keys. + If keyword arguments are given, the keyword arguments and their values are + added to the dictionary created from the positional argument. If a key + being added is already present, the value from the keyword argument + replaces the value from the positional argument. + + To illustrate, the following examples all return a dictionary equal to + ``{"one": 1, "two": 2}``:: + + >>> a = dict(one=1, two=2) + >>> b = dict({'one': 1, 'two': 2}) + >>> c = dict(zip(('one', 'two'), (1, 2))) + >>> d = dict([['two', 2], ['one', 1]]) + >>> e = {"one": 1, "two": 2} + >>> a == b == c == d == e + True + + Providing keyword arguments as in the first example only works for keys that + are valid Python identifiers. Otherwise, any valid keys can be used. These are the operations that dictionaries support (and therefore, custom -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 13 12:30:37 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sat, 13 Oct 2012 12:30:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316206=3A_Merge_dict_documentation_improvements_from_3?= =?utf-8?b?LjIu?= Message-ID: <3Xf2Hd49q6zQLs@mail.python.org> http://hg.python.org/cpython/rev/02de13d69149 changeset: 79710:02de13d69149 branch: 3.3 parent: 79707:95f7481fc9f1 parent: 79709:ed6da2a8361c user: Chris Jerdonek date: Sat Oct 13 03:25:18 2012 -0700 summary: Issue #16206: Merge dict documentation improvements from 3.2. Improve the documentation of the dict constructor. This change includes replacing the single-line signature documentation with a more complete multiple-line signature. files: Doc/library/functions.rst | 13 +++-- Doc/library/stdtypes.rst | 58 +++++++++++++++----------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -271,14 +271,17 @@ .. _func-dict: -.. function:: dict([arg]) +.. function:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) :noindex: - Create a new data dictionary, optionally with items taken from *arg*. - The dictionary type is described in :ref:`typesmapping`. + Create a new dictionary. The :class:`dict` object is the dictionary class. + See :class:`dict` and :ref:`typesmapping` for documentation about this + class. - For other containers see the built in :class:`list`, :class:`set`, and - :class:`tuple` classes, and the :mod:`collections` module. + For other containers see the built-in :class:`list`, :class:`set`, and + :class:`tuple` classes, as well as the :mod:`collections` module. .. function:: dir([object]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2953,33 +2953,41 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict([arg]) - - Return a new dictionary initialized from an optional positional argument or - from a set of keyword arguments. If no arguments are given, return a new - empty dictionary. If the positional argument *arg* is a mapping object, - return a dictionary mapping the same keys to the same values as does the - mapping object. Otherwise the positional argument must be a sequence, a - container that supports iteration, or an iterator object. The elements of - the argument must each also be of one of those kinds, and each must in turn - contain exactly two objects. The first is used as a key in the new - dictionary, and the second as the key's value. If a given key is seen more - than once, the last value associated with it is retained in the new +.. class:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) + + Return a new dictionary initialized from an optional positional argument + and a possibly empty set of keyword arguments. + + If no positional argument is given, an empty dictionary is created. + If a positional argument is given and it is a mapping object, a dictionary + is created with the same key-value pairs as the mapping object. Otherwise, + the positional argument must be an :term:`iterator` object. Each item in + the iterable must itself be an iterator with exactly two objects. The + first object of each item becomes a key in the new dictionary, and the + second object the corresponding value. If a key occurs more than once, the + last value for that key becomes the corresponding value in the new dictionary. - If keyword arguments are given, the keywords themselves with their associated - values are added as items to the dictionary. If a key is specified both in - the positional argument and as a keyword argument, the value associated with - the keyword is retained in the dictionary. For example, these all return a - dictionary equal to ``{"one": 1, "two": 2}``: - - * ``dict(one=1, two=2)`` - * ``dict({'one': 1, 'two': 2})`` - * ``dict(zip(('one', 'two'), (1, 2)))`` - * ``dict([['two', 2], ['one', 1]])`` - - The first example only works for keys that are valid Python identifiers; the - others work with any valid keys. + If keyword arguments are given, the keyword arguments and their values are + added to the dictionary created from the positional argument. If a key + being added is already present, the value from the keyword argument + replaces the value from the positional argument. + + To illustrate, the following examples all return a dictionary equal to + ``{"one": 1, "two": 2}``:: + + >>> a = dict(one=1, two=2) + >>> b = dict({'one': 1, 'two': 2}) + >>> c = dict(zip(('one', 'two'), (1, 2))) + >>> d = dict([['two', 2], ['one', 1]]) + >>> e = {"one": 1, "two": 2} + >>> a == b == c == d == e + True + + Providing keyword arguments as in the first example only works for keys that + are valid Python identifiers. Otherwise, any valid keys can be used. These are the operations that dictionaries support (and therefore, custom -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 13 12:30:39 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sat, 13 Oct 2012 12:30:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316206=3A_Merge_dict_documentation_improvements_?= =?utf-8?b?ZnJvbSAzLjMu?= Message-ID: <3Xf2Hg0S99zQnx@mail.python.org> http://hg.python.org/cpython/rev/392e09ba9feb changeset: 79711:392e09ba9feb parent: 79708:49ff2fa464e0 parent: 79710:02de13d69149 user: Chris Jerdonek date: Sat Oct 13 03:26:10 2012 -0700 summary: Issue #16206: Merge dict documentation improvements from 3.3. Improve the documentation of the dict constructor. This change includes replacing the single-line signature documentation with a more complete multiple-line signature. files: Doc/library/functions.rst | 13 +++-- Doc/library/stdtypes.rst | 58 +++++++++++++++----------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -271,14 +271,17 @@ .. _func-dict: -.. function:: dict([arg]) +.. function:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) :noindex: - Create a new data dictionary, optionally with items taken from *arg*. - The dictionary type is described in :ref:`typesmapping`. + Create a new dictionary. The :class:`dict` object is the dictionary class. + See :class:`dict` and :ref:`typesmapping` for documentation about this + class. - For other containers see the built in :class:`list`, :class:`set`, and - :class:`tuple` classes, and the :mod:`collections` module. + For other containers see the built-in :class:`list`, :class:`set`, and + :class:`tuple` classes, as well as the :mod:`collections` module. .. function:: dir([object]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2953,33 +2953,41 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict([arg]) - - Return a new dictionary initialized from an optional positional argument or - from a set of keyword arguments. If no arguments are given, return a new - empty dictionary. If the positional argument *arg* is a mapping object, - return a dictionary mapping the same keys to the same values as does the - mapping object. Otherwise the positional argument must be a sequence, a - container that supports iteration, or an iterator object. The elements of - the argument must each also be of one of those kinds, and each must in turn - contain exactly two objects. The first is used as a key in the new - dictionary, and the second as the key's value. If a given key is seen more - than once, the last value associated with it is retained in the new +.. class:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) + + Return a new dictionary initialized from an optional positional argument + and a possibly empty set of keyword arguments. + + If no positional argument is given, an empty dictionary is created. + If a positional argument is given and it is a mapping object, a dictionary + is created with the same key-value pairs as the mapping object. Otherwise, + the positional argument must be an :term:`iterator` object. Each item in + the iterable must itself be an iterator with exactly two objects. The + first object of each item becomes a key in the new dictionary, and the + second object the corresponding value. If a key occurs more than once, the + last value for that key becomes the corresponding value in the new dictionary. - If keyword arguments are given, the keywords themselves with their associated - values are added as items to the dictionary. If a key is specified both in - the positional argument and as a keyword argument, the value associated with - the keyword is retained in the dictionary. For example, these all return a - dictionary equal to ``{"one": 1, "two": 2}``: - - * ``dict(one=1, two=2)`` - * ``dict({'one': 1, 'two': 2})`` - * ``dict(zip(('one', 'two'), (1, 2)))`` - * ``dict([['two', 2], ['one', 1]])`` - - The first example only works for keys that are valid Python identifiers; the - others work with any valid keys. + If keyword arguments are given, the keyword arguments and their values are + added to the dictionary created from the positional argument. If a key + being added is already present, the value from the keyword argument + replaces the value from the positional argument. + + To illustrate, the following examples all return a dictionary equal to + ``{"one": 1, "two": 2}``:: + + >>> a = dict(one=1, two=2) + >>> b = dict({'one': 1, 'two': 2}) + >>> c = dict(zip(('one', 'two'), (1, 2))) + >>> d = dict([['two', 2], ['one', 1]]) + >>> e = {"one": 1, "two": 2} + >>> a == b == c == d == e + True + + Providing keyword arguments as in the first example only works for keys that + are valid Python identifiers. Otherwise, any valid keys can be used. These are the operations that dictionaries support (and therefore, custom -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 13 12:50:22 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sat, 13 Oct 2012 12:50:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjA2?= =?utf-8?q?=3A_Backport_dict_documentation_improvements_from_3=2E2=2E?= Message-ID: <3Xf2kQ6pB9zPQr@mail.python.org> http://hg.python.org/cpython/rev/5fc6f47974db changeset: 79712:5fc6f47974db branch: 2.7 parent: 79706:b6c8ba7538a2 user: Chris Jerdonek date: Sat Oct 13 03:49:30 2012 -0700 summary: Issue #16206: Backport dict documentation improvements from 3.2. Improve the documentation of the dict constructor. This change includes replacing the single-line signature documentation with a more complete multiple-line signature. files: Doc/library/functions.rst | 13 +++-- Doc/library/stdtypes.rst | 61 +++++++++++++++----------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -275,14 +275,17 @@ .. _func-dict: -.. function:: dict([arg]) +.. function:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) :noindex: - Create a new data dictionary, optionally with items taken from *arg*. - The dictionary type is described in :ref:`typesmapping`. + Create a new dictionary. The :class:`dict` object is the dictionary class. + See :class:`dict` and :ref:`typesmapping` for documentation about this + class. - For other containers see the built in :class:`list`, :class:`set`, and - :class:`tuple` classes, and the :mod:`collections` module. + For other containers see the built-in :class:`list`, :class:`set`, and + :class:`tuple` classes, as well as the :mod:`collections` module. .. function:: dir([object]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1956,32 +1956,41 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict([arg]) - - Return a new dictionary initialized from an optional positional argument or from - a set of keyword arguments. If no arguments are given, return a new empty - dictionary. If the positional argument *arg* is a mapping object, return a - dictionary mapping the same keys to the same values as does the mapping object. - Otherwise the positional argument must be a sequence, a container that supports - iteration, or an iterator object. The elements of the argument must each also - be of one of those kinds, and each must in turn contain exactly two objects. - The first is used as a key in the new dictionary, and the second as the key's - value. If a given key is seen more than once, the last value associated with it - is retained in the new dictionary. - - If keyword arguments are given, the keywords themselves with their associated - values are added as items to the dictionary. If a key is specified both in the - positional argument and as a keyword argument, the value associated with the - keyword is retained in the dictionary. For example, these all return a - dictionary equal to ``{"one": 1, "two": 2}``: - - * ``dict(one=1, two=2)`` - * ``dict({'one': 1, 'two': 2})`` - * ``dict(zip(('one', 'two'), (1, 2)))`` - * ``dict([['two', 2], ['one', 1]])`` - - The first example only works for keys that are valid Python - identifiers; the others work with any valid keys. +.. class:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) + + Return a new dictionary initialized from an optional positional argument + and a possibly empty set of keyword arguments. + + If no positional argument is given, an empty dictionary is created. + If a positional argument is given and it is a mapping object, a dictionary + is created with the same key-value pairs as the mapping object. Otherwise, + the positional argument must be an :term:`iterator` object. Each item in + the iterable must itself be an iterator with exactly two objects. The + first object of each item becomes a key in the new dictionary, and the + second object the corresponding value. If a key occurs more than once, the + last value for that key becomes the corresponding value in the new + dictionary. + + If keyword arguments are given, the keyword arguments and their values are + added to the dictionary created from the positional argument. If a key + being added is already present, the value from the keyword argument + replaces the value from the positional argument. + + To illustrate, the following examples all return a dictionary equal to + ``{"one": 1, "two": 2}``:: + + >>> a = dict(one=1, two=2) + >>> b = dict({'one': 1, 'two': 2}) + >>> c = dict(zip(('one', 'two'), (1, 2))) + >>> d = dict([['two', 2], ['one', 1]]) + >>> e = {"one": 1, "two": 2} + >>> a == b == c == d == e + True + + Providing keyword arguments as in the first example only works for keys that + are valid Python identifiers. Otherwise, any valid keys can be used. .. versionadded:: 2.2 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 13 17:58:52 2012 From: python-checkins at python.org (benjamin.peterson) Date: Sat, 13 Oct 2012 17:58:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_When_not_optimized_functio?= =?utf-8?q?n_stack_sizes_are_much_larger_and_may_cause_this_test?= Message-ID: <3Xf9ZN2RsPzQwG@mail.python.org> http://hg.python.org/cpython/rev/8c68e1c08aad changeset: 79713:8c68e1c08aad parent: 79703:6e721c72683f user: Benjamin Peterson date: Sat Oct 13 11:46:44 2012 -0400 summary: When not optimized function stack sizes are much larger and may cause this test to fail. files: Lib/test/test_threading.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -753,7 +753,8 @@ lock = threading.Lock() self.assertRaises(RuntimeError, lock.release) - @unittest.skipUnless(sys.platform == 'darwin', 'test macosx problem') + @unittest.skipUnless(sys.platform == 'darwin' and test.support.python_is_optimized(), + 'test macosx problem') def test_recursion_limit(self): # Issue 9670 # test that excessive recursion within a non-main thread causes -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 13 17:58:53 2012 From: python-checkins at python.org (benjamin.peterson) Date: Sat, 13 Oct 2012 17:58:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge_heads?= Message-ID: <3Xf9ZP60RXzQwG@mail.python.org> http://hg.python.org/cpython/rev/51ce9830d85a changeset: 79714:51ce9830d85a parent: 79713:8c68e1c08aad parent: 79711:392e09ba9feb user: Benjamin Peterson date: Sat Oct 13 11:58:23 2012 -0400 summary: merge heads files: Doc/howto/functional.rst | 5 +- Doc/library/functions.rst | 38 +++++++++++------ Doc/library/stdtypes.rst | 58 +++++++++++++++----------- Lib/lzma.py | 31 +++++++------ 4 files changed, 76 insertions(+), 56 deletions(-) diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -292,13 +292,14 @@ Applying :func:`iter` to a dictionary always loops over the keys, but dictionaries have methods that return other iterators. If you want to iterate over values or key/value pairs, you can explicitly call the -:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator. +:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate +iterator. The :func:`dict` constructor can accept an iterator that returns a finite stream of ``(key, value)`` tuples: >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')] - >>> dict(iter(L)) + >>> dict(iter(L)) #doctest: +SKIP {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'} Files also support iteration by calling the :meth:`~io.TextIOBase.readline` diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,6 +122,8 @@ Without an argument, an array of size 0 is created. + See also :ref:`binaryseq` and :ref:`typebytearray`. + .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -135,6 +137,8 @@ Bytes objects can also be created with literals, see :ref:`strings`. + See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. + .. function:: callable(object) @@ -267,14 +271,17 @@ .. _func-dict: -.. function:: dict([arg]) +.. function:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) :noindex: - Create a new data dictionary, optionally with items taken from *arg*. - The dictionary type is described in :ref:`typesmapping`. + Create a new dictionary. The :class:`dict` object is the dictionary class. + See :class:`dict` and :ref:`typesmapping` for documentation about this + class. - For other containers see the built in :class:`list`, :class:`set`, and - :class:`tuple` classes, and the :mod:`collections` module. + For other containers see the built-in :class:`list`, :class:`set`, and + :class:`tuple` classes, as well as the :mod:`collections` module. .. function:: dir([object]) @@ -688,6 +695,8 @@ *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. + See also :ref:`typeiter`. + One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -708,7 +717,7 @@ :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. .. function:: locals() @@ -1082,7 +1091,7 @@ :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. .. function:: repr(object) @@ -1207,7 +1216,8 @@ .. function:: str(object='') str(object[, encoding[, errors]]) - Return a string version of an object, using one of the following modes: + Return a :ref:`string ` version of an object, using one of the + following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1230,11 +1240,9 @@ Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings see :ref:`typesseq` which describes sequence - functionality (strings are sequences), and also the string-specific methods - described in the :ref:`string-methods` section. To output formatted strings, - see the :ref:`string-formatting` section. In addition see the - :ref:`stringservices` section. + For more information on strings and string methods, see the :ref:`textseq` + section. To output formatted strings, see the :ref:`string-formatting` + section. In addition, see the :ref:`stringservices` section. .. function:: sum(iterable[, start]) @@ -1311,7 +1319,7 @@ :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. .. function:: type(object) @@ -1344,6 +1352,8 @@ ... >>> X = type('X', (object,), dict(a=1)) + See also :ref:`bltin-type-objects`. + .. function:: vars([object]) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2953,33 +2953,41 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict([arg]) - - Return a new dictionary initialized from an optional positional argument or - from a set of keyword arguments. If no arguments are given, return a new - empty dictionary. If the positional argument *arg* is a mapping object, - return a dictionary mapping the same keys to the same values as does the - mapping object. Otherwise the positional argument must be a sequence, a - container that supports iteration, or an iterator object. The elements of - the argument must each also be of one of those kinds, and each must in turn - contain exactly two objects. The first is used as a key in the new - dictionary, and the second as the key's value. If a given key is seen more - than once, the last value associated with it is retained in the new +.. class:: dict(**kwarg) + dict(mapping, **kwarg) + dict(iterable, **kwarg) + + Return a new dictionary initialized from an optional positional argument + and a possibly empty set of keyword arguments. + + If no positional argument is given, an empty dictionary is created. + If a positional argument is given and it is a mapping object, a dictionary + is created with the same key-value pairs as the mapping object. Otherwise, + the positional argument must be an :term:`iterator` object. Each item in + the iterable must itself be an iterator with exactly two objects. The + first object of each item becomes a key in the new dictionary, and the + second object the corresponding value. If a key occurs more than once, the + last value for that key becomes the corresponding value in the new dictionary. - If keyword arguments are given, the keywords themselves with their associated - values are added as items to the dictionary. If a key is specified both in - the positional argument and as a keyword argument, the value associated with - the keyword is retained in the dictionary. For example, these all return a - dictionary equal to ``{"one": 1, "two": 2}``: - - * ``dict(one=1, two=2)`` - * ``dict({'one': 1, 'two': 2})`` - * ``dict(zip(('one', 'two'), (1, 2)))`` - * ``dict([['two', 2], ['one', 1]])`` - - The first example only works for keys that are valid Python identifiers; the - others work with any valid keys. + If keyword arguments are given, the keyword arguments and their values are + added to the dictionary created from the positional argument. If a key + being added is already present, the value from the keyword argument + replaces the value from the positional argument. + + To illustrate, the following examples all return a dictionary equal to + ``{"one": 1, "two": 2}``:: + + >>> a = dict(one=1, two=2) + >>> b = dict({'one': 1, 'two': 2}) + >>> c = dict(zip(('one', 'two'), (1, 2))) + >>> d = dict([['two', 2], ['one', 1]]) + >>> e = {"one": 1, "two": 2} + >>> a == b == c == d == e + True + + Providing keyword arguments as in the first example only works for keys that + are valid Python identifiers. Otherwise, any valid keys can be used. These are the operations that dictionaries support (and therefore, custom diff --git a/Lib/lzma.py b/Lib/lzma.py --- a/Lib/lzma.py +++ b/Lib/lzma.py @@ -55,7 +55,7 @@ be an existing file object to read from or write to. mode can be "r" for reading (default), "w" for (over)writing, or - "a" for appending. These can equivalently be given as "rb", "wb", + "a" for appending. These can equivalently be given as "rb", "wb" and "ab" respectively. format specifies the container format to use for the file. @@ -381,23 +381,24 @@ encoding=None, errors=None, newline=None): """Open an LZMA-compressed file in binary or text mode. - filename can be either an actual file name (given as a str or bytes object), - in which case the named file is opened, or it can be an existing file object - to read from or write to. + filename can be either an actual file name (given as a str or bytes + object), in which case the named file is opened, or it can be an + existing file object to read from or write to. - The mode argument can be "r", "rb" (default), "w", "wb", "a", or "ab" for - binary mode, or "rt", "wt" or "at" for text mode. + The mode argument can be "r", "rb" (default), "w", "wb", "a" or "ab" + for binary mode, or "rt", "wt" or "at" for text mode. - The format, check, preset and filters arguments specify the compression - settings, as for LZMACompressor, LZMADecompressor and LZMAFile. + The format, check, preset and filters arguments specify the + compression settings, as for LZMACompressor, LZMADecompressor and + LZMAFile. - For binary mode, this function is equivalent to the LZMAFile constructor: - LZMAFile(filename, mode, ...). In this case, the encoding, errors and - newline arguments must not be provided. + For binary mode, this function is equivalent to the LZMAFile + constructor: LZMAFile(filename, mode, ...). In this case, the + encoding, errors and newline arguments must not be provided. For text mode, a LZMAFile object is created, and wrapped in an - io.TextIOWrapper instance with the specified encoding, error handling - behavior, and line ending(s). + io.TextIOWrapper instance with the specified encoding, error + handling behavior, and line ending(s). """ if "t" in mode: @@ -427,7 +428,7 @@ Refer to LZMACompressor's docstring for a description of the optional arguments *format*, *check*, *preset* and *filters*. - For incremental compression, use an LZMACompressor object instead. + For incremental compression, use an LZMACompressor instead. """ comp = LZMACompressor(format, check, preset, filters) return comp.compress(data) + comp.flush() @@ -439,7 +440,7 @@ Refer to LZMADecompressor's docstring for a description of the optional arguments *format*, *check* and *filters*. - For incremental decompression, use a LZMADecompressor object instead. + For incremental decompression, use an LZMADecompressor instead. """ results = [] while True: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 00:59:37 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 14 Oct 2012 00:59:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Keccak=3A_fromBytesToWord?= =?utf-8?q?=28=29_and_fromWordToBytes=28=29_are_required_on_64bit_big?= Message-ID: <3XfLvs5sy3zR7W@mail.python.org> http://hg.python.org/cpython/rev/3465ef48d0f5 changeset: 79715:3465ef48d0f5 user: Christian Heimes date: Sun Oct 14 00:59:29 2012 +0200 summary: Keccak: fromBytesToWord() and fromWordToBytes() are required on 64bit big endian platforms files: Modules/_sha3/keccak/KeccakF-1600-opt64.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64.c b/Modules/_sha3/keccak/KeccakF-1600-opt64.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt64.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt64.c @@ -324,7 +324,7 @@ KeccakPermutationOnWords((UINT64*)state); } -/* +#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) static void fromBytesToWord(UINT64 *word, const UINT8 *bytes) { unsigned int i; @@ -333,7 +333,8 @@ for(i=0; i<(64/8); i++) *word |= (UINT64)(bytes[i]) << (8*i); } -*/ +#endif + #ifdef ProvideFast576 static void KeccakAbsorb576bits(unsigned char *state, const unsigned char *data) @@ -445,7 +446,7 @@ #endif } -/* +#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) static void fromWordToBytes(UINT8 *bytes, const UINT64 word) { unsigned int i; @@ -453,7 +454,8 @@ for(i=0; i<(64/8); i++) bytes[i] = (word >> (8*i)) & 0xFF; } -*/ +#endif + #ifdef ProvideFast1024 static void KeccakExtract1024bits(const unsigned char *state, unsigned char *data) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 01:48:55 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 14 Oct 2012 01:48:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Clean_up_some_warnings_in_?= =?utf-8?q?test_suite_output=2E?= Message-ID: <3XfN0l3j7XzR8l@mail.python.org> http://hg.python.org/cpython/rev/267a4d4d9d65 changeset: 79716:267a4d4d9d65 user: Nadeem Vawda date: Sun Oct 14 01:42:32 2012 +0200 summary: Clean up some warnings in test suite output. files: Lib/test/test_exceptions.py | 9 +++++---- Lib/test/test_importlib/import_/test_fromlist.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -8,7 +8,7 @@ import errno from test.support import (TESTFN, unlink, run_unittest, captured_output, - gc_collect, cpython_only, no_tracing) + check_warnings, gc_collect, cpython_only, no_tracing) class NaiveException(Exception): def __init__(self, x): @@ -939,9 +939,10 @@ def test_non_str_argument(self): # Issue #15778 - arg = b'abc' - exc = ImportError(arg) - self.assertEqual(str(arg), str(exc)) + with check_warnings(('', BytesWarning), quiet=True): + arg = b'abc' + exc = ImportError(arg) + self.assertEqual(str(arg), str(exc)) def test_main(): diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -80,7 +80,7 @@ with util.import_state(meta_path=[importer]): with self.assertRaises(ImportError) as exc: import_util.import_('pkg', fromlist=['mod']) - self.assertEquals('i_do_not_exist', exc.exception.name) + self.assertEqual('i_do_not_exist', exc.exception.name) def test_empty_string(self): with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 02:53:51 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 14 Oct 2012 02:53:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Force_32bit_Keccak_impleme?= =?utf-8?q?ntation_on_SPARC=2E_It_look_like_the_Solaris_CC?= Message-ID: <3XfPRg5BPZzR8T@mail.python.org> http://hg.python.org/cpython/rev/b397b0c08f69 changeset: 79717:b397b0c08f69 parent: 79715:3465ef48d0f5 user: Christian Heimes date: Sun Oct 14 02:52:01 2012 +0200 summary: Force 32bit Keccak implementation on SPARC. It look like the Solaris CC compiler doesn't like the address alignment. files: Modules/_sha3/sha3module.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -95,21 +95,27 @@ * * *************************************************************************/ -#if SIZEOF_VOID_P == 8 && defined(PY_UINT64_T) - /* 64bit platforms with unsigned int64 */ - #define KeccakImplementation 64 +#ifdef __sparc + /* On SPARC with Solaris CC opt64 fails with 'invalid address alignment' */ + #define KeccakOpt 32 +#elif SIZEOF_VOID_P == 8 + #define KeccakOpt 64 +#elif SIZEOF_VOID_P == 4 + #define KeccakOpt 32 +#endif + +#if KeccakOpt == 64 && defined(PY_UINT64_T) + /* 64bit platforms with unsigned int64 */ #define Unrolling 24 #define UseBebigokimisa typedef PY_UINT64_T UINT64; -#elif SIZEOF_VOID_P == 4 && defined(PY_UINT64_T) +#elif KeccakOpt == 32 && defined(PY_UINT64_T) /* 32bit platforms with unsigned int64 */ - #define KeccakImplementation 32 #define Unrolling 2 #define UseSchedule 3 typedef PY_UINT64_T UINT64; #else /* 32 or 64bit platforms without unsigned int64 */ - #define KeccakImplementation 32 #define Unrolling 2 #define UseSchedule 3 #define UseInterleaveTables @@ -125,9 +131,9 @@ #include "keccak/KeccakNISTInterface.h" #include "keccak/KeccakNISTInterface.c" #include "keccak/KeccakSponge.c" -#if KeccakImplementation == 64 +#if KeccakOpt == 64 #include "keccak/KeccakF-1600-opt64.c" -#elif KeccakImplementation == 32 +#elif KeccakOpt == 32 #include "keccak/KeccakF-1600-opt32.c" #endif -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 02:53:53 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 14 Oct 2012 02:53:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge?= Message-ID: <3XfPRj0F6xzR8W@mail.python.org> http://hg.python.org/cpython/rev/51ae37850e85 changeset: 79718:51ae37850e85 parent: 79717:b397b0c08f69 parent: 79716:267a4d4d9d65 user: Christian Heimes date: Sun Oct 14 02:53:40 2012 +0200 summary: merge files: Lib/test/test_exceptions.py | 9 +++++---- Lib/test/test_importlib/import_/test_fromlist.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -8,7 +8,7 @@ import errno from test.support import (TESTFN, unlink, run_unittest, captured_output, - gc_collect, cpython_only, no_tracing) + check_warnings, gc_collect, cpython_only, no_tracing) class NaiveException(Exception): def __init__(self, x): @@ -939,9 +939,10 @@ def test_non_str_argument(self): # Issue #15778 - arg = b'abc' - exc = ImportError(arg) - self.assertEqual(str(arg), str(exc)) + with check_warnings(('', BytesWarning), quiet=True): + arg = b'abc' + exc = ImportError(arg) + self.assertEqual(str(arg), str(exc)) def test_main(): diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -80,7 +80,7 @@ with util.import_state(meta_path=[importer]): with self.assertRaises(ImportError) as exc: import_util.import_('pkg', fromlist=['mod']) - self.assertEquals('i_do_not_exist', exc.exception.name) + self.assertEqual('i_do_not_exist', exc.exception.name) def test_empty_string(self): with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 04:19:59 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 14 Oct 2012 04:19:59 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_get_64bit_platforms_withou?= =?utf-8?q?t_uint64_right_again?= Message-ID: <3XfRM362B1zM3Z@mail.python.org> http://hg.python.org/cpython/rev/568312ea04fa changeset: 79719:568312ea04fa user: Christian Heimes date: Sun Oct 14 04:17:50 2012 +0200 summary: get 64bit platforms without uint64 right again files: Modules/_sha3/sha3module.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -98,9 +98,11 @@ #ifdef __sparc /* On SPARC with Solaris CC opt64 fails with 'invalid address alignment' */ #define KeccakOpt 32 -#elif SIZEOF_VOID_P == 8 +#elif SIZEOF_VOID_P == 8 && defined(PY_UINT64_T) + /* opt64 works only for 64bit platforms with unsigned int64 */ #define KeccakOpt 64 -#elif SIZEOF_VOID_P == 4 +#else + /* opt32 is used for the remaining 32 and 64bit platforms */ #define KeccakOpt 32 #endif @@ -109,7 +111,7 @@ #define Unrolling 24 #define UseBebigokimisa typedef PY_UINT64_T UINT64; -#elif KeccakOpt == 32 && defined(PY_UINT64_T) +#elif KeccakOpt == 32 && defined(PY_UINT64_T) /* 32bit platforms with unsigned int64 */ #define Unrolling 2 #define UseSchedule 3 -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Sun Oct 14 05:58:08 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sun, 14 Oct 2012 05:58:08 +0200 Subject: [Python-checkins] Daily reference leaks (51ae37850e85): sum=0 Message-ID: results for 51ae37850e85 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogwAiEel', '-x'] From python-checkins at python.org Sun Oct 14 14:36:28 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 14 Oct 2012 14:36:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Update_comment=3A_SPARC_re?= =?utf-8?q?quires_proper_alignment?= Message-ID: <3Xfj2N44kNzQtx@mail.python.org> http://hg.python.org/cpython/rev/3cfe50908fbd changeset: 79720:3cfe50908fbd user: Christian Heimes date: Sun Oct 14 14:36:09 2012 +0200 summary: Update comment: SPARC requires proper alignment files: Modules/_sha3/sha3module.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -96,7 +96,8 @@ * *************************************************************************/ #ifdef __sparc - /* On SPARC with Solaris CC opt64 fails with 'invalid address alignment' */ + /* opt64 uses un-aligned memory access that causes a BUS error with msg + * 'invalid address alignment' on SPARC. */ #define KeccakOpt 32 #elif SIZEOF_VOID_P == 8 && defined(PY_UINT64_T) /* opt64 works only for 64bit platforms with unsigned int64 */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 15:54:49 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 14 Oct 2012 15:54:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315721=3A_make_=5F?= =?utf-8?q?tkinter_module_pep384_compatible=2E?= Message-ID: <3Xfkmn0GvCzR3M@mail.python.org> http://hg.python.org/cpython/rev/bf9d118779f5 changeset: 79721:bf9d118779f5 user: Andrew Svetlov date: Sun Oct 14 16:54:35 2012 +0300 summary: Issue #15721: make _tkinter module pep384 compatible. files: Modules/_tkinter.c | 284 +++++++++++++++++--------------- 1 files changed, 147 insertions(+), 137 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -230,7 +230,7 @@ /**** Tkapp Object Declaration ****/ -static PyTypeObject Tkapp_Type; +static PyObject *Tkapp_Type; typedef struct { PyObject_HEAD @@ -250,7 +250,6 @@ Tcl_ObjType *StringType; } TkappObject; -#define Tkapp_Check(v) (Py_TYPE(v) == &Tkapp_Type) #define Tkapp_Interp(v) (((TkappObject *) (v))->interp) #define Tkapp_Result(v) Tcl_GetStringResult(Tkapp_Interp(v)) @@ -487,7 +486,7 @@ TkappObject *v; char *argv0; - v = PyObject_New(TkappObject, &Tkapp_Type); + v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type); if (v == NULL) return NULL; @@ -637,14 +636,14 @@ PyObject *string; /* This cannot cause cycles. */ } PyTclObject; -static PyTypeObject PyTclObject_Type; -#define PyTclObject_Check(v) ((v)->ob_type == &PyTclObject_Type) +static PyObject *PyTclObject_Type; +#define PyTclObject_Check(v) ((v)->ob_type == (PyTypeObject *) PyTclObject_Type) static PyObject * newPyTclObject(Tcl_Obj *arg) { PyTclObject *self; - self = PyObject_New(PyTclObject, &PyTclObject_Type); + self = PyObject_New(PyTclObject, (PyTypeObject *) PyTclObject_Type); if (self == NULL) return NULL; Tcl_IncrRefCount(arg); @@ -778,50 +777,25 @@ {0}, }; -static PyTypeObject PyTclObject_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "_tkinter.Tcl_Obj", /*tp_name*/ - sizeof(PyTclObject), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - /* methods */ - (destructor)PyTclObject_dealloc,/*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_reserved*/ - (reprfunc)PyTclObject_repr, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash*/ - 0, /*tp_call*/ - (reprfunc)PyTclObject_str, /*tp_str*/ - PyObject_GenericGetAttr, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - 0, /*tp_doc*/ - 0, /*tp_traverse*/ - 0, /*tp_clear*/ - PyTclObject_richcompare, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ - 0, /*tp_iternext*/ - 0, /*tp_methods*/ - 0, /*tp_members*/ - PyTclObject_getsetlist, /*tp_getset*/ - 0, /*tp_base*/ - 0, /*tp_dict*/ - 0, /*tp_descr_get*/ - 0, /*tp_descr_set*/ - 0, /*tp_dictoffset*/ - 0, /*tp_init*/ - 0, /*tp_alloc*/ - 0, /*tp_new*/ - 0, /*tp_free*/ - 0, /*tp_is_gc*/ +static PyType_Slot PyTclObject_Type_slots[] = { + {Py_tp_dealloc, (destructor)PyTclObject_dealloc}, + {Py_tp_repr, (reprfunc)PyTclObject_repr}, + {Py_tp_str, (reprfunc)PyTclObject_str}, + {Py_tp_getattro, NULL}, + {Py_tp_richcompare, PyTclObject_richcompare}, + {Py_tp_getset, PyTclObject_getsetlist}, + {0, 0} }; +static PyType_Spec PyTclObject_Type_spec = { + "_tkinter.Tcl_Obj", + sizeof(PyTclObject), + 0, + Py_TPFLAGS_DEFAULT, + PyTclObject_Type_slots, +}; + + static Tcl_Obj* AsObj(PyObject *value) { @@ -2150,7 +2124,7 @@ /**** Tktt Object (timer token) ****/ -static PyTypeObject Tktt_Type; +static PyObject *Tktt_Type; typedef struct { PyObject_HEAD @@ -2189,7 +2163,7 @@ { TkttObject *v; - v = PyObject_New(TkttObject, &Tktt_Type); + v = PyObject_New(TkttObject, (PyTypeObject *) Tktt_Type); if (v == NULL) return NULL; @@ -2222,38 +2196,20 @@ v->func == NULL ? ", handler deleted" : ""); } -static PyTypeObject Tktt_Type = -{ - PyVarObject_HEAD_INIT(NULL, 0) - "tktimertoken", /*tp_name */ - sizeof(TkttObject), /*tp_basicsize */ - 0, /*tp_itemsize */ - Tktt_Dealloc, /*tp_dealloc */ - 0, /*tp_print */ - 0, /*tp_getattr */ - 0, /*tp_setattr */ - 0, /*tp_reserved */ - Tktt_Repr, /*tp_repr */ - 0, /*tp_as_number */ - 0, /*tp_as_sequence */ - 0, /*tp_as_mapping */ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - 0, /*tp_doc*/ - 0, /*tp_traverse*/ - 0, /*tp_clear*/ - 0, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ - 0, /*tp_iternext*/ - Tktt_methods, /*tp_methods*/ +static PyType_Slot Tktt_Type_slots[] = { + {Py_tp_dealloc, Tktt_Dealloc}, + {Py_tp_repr, Tktt_Repr}, + {Py_tp_methods, Tktt_methods}, + {0, 0} }; +static PyType_Spec Tktt_Type_spec = { + "tktimertoken", + sizeof(TkttObject), + 0, + Py_TPFLAGS_DEFAULT, + Tktt_Type_slots, +}; /** Timer Handler **/ @@ -2541,36 +2497,19 @@ DisableEventHook(); } -static PyTypeObject Tkapp_Type = -{ - PyVarObject_HEAD_INIT(NULL, 0) - "tkapp", /*tp_name */ - sizeof(TkappObject), /*tp_basicsize */ - 0, /*tp_itemsize */ - Tkapp_Dealloc, /*tp_dealloc */ - 0, /*tp_print */ - 0, /*tp_getattr */ - 0, /*tp_setattr */ - 0, /*tp_reserved */ - 0, /*tp_repr */ - 0, /*tp_as_number */ - 0, /*tp_as_sequence */ - 0, /*tp_as_mapping */ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - 0, /*tp_doc*/ - 0, /*tp_traverse*/ - 0, /*tp_clear*/ - 0, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ - 0, /*tp_iternext*/ - Tkapp_methods, /*tp_methods*/ +static PyType_Slot Tkapp_Type_slots[] = { + {Py_tp_dealloc, Tkapp_Dealloc}, + {Py_tp_methods, Tkapp_methods}, + {0, 0} +}; + + +static PyType_Spec Tkapp_Type_spec = { + "tkapp", + sizeof(TkappObject), + 0, + Py_TPFLAGS_DEFAULT, + Tkapp_Type_slots, }; @@ -2874,45 +2813,116 @@ PyMODINIT_FUNC PyInit__tkinter(void) { - PyObject *m, *uexe, *cexe; - - if (PyType_Ready(&Tkapp_Type) < 0) - return NULL; + PyObject *m, *uexe, *cexe, *o; + + /* Due to cross platform compiler issues the slots must be filled + * here. It's required for portability to Windows without requiring + * C++. See xxxlimited.c*/ + PyTclObject_Type_slots[3].pfunc = PyObject_GenericGetAttr; #ifdef WITH_THREAD tcl_lock = PyThread_allocate_lock(); + if (tcl_lock == NULL) + return NULL; #endif m = PyModule_Create(&_tkintermodule); if (m == NULL) return NULL; - Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL); - Py_INCREF(Tkinter_TclError); - PyModule_AddObject(m, "TclError", Tkinter_TclError); - - PyModule_AddIntConstant(m, "READABLE", TCL_READABLE); - PyModule_AddIntConstant(m, "WRITABLE", TCL_WRITABLE); - PyModule_AddIntConstant(m, "EXCEPTION", TCL_EXCEPTION); - PyModule_AddIntConstant(m, "WINDOW_EVENTS", TCL_WINDOW_EVENTS); - PyModule_AddIntConstant(m, "FILE_EVENTS", TCL_FILE_EVENTS); - PyModule_AddIntConstant(m, "TIMER_EVENTS", TCL_TIMER_EVENTS); - PyModule_AddIntConstant(m, "IDLE_EVENTS", TCL_IDLE_EVENTS); - PyModule_AddIntConstant(m, "ALL_EVENTS", TCL_ALL_EVENTS); - PyModule_AddIntConstant(m, "DONT_WAIT", TCL_DONT_WAIT); - PyModule_AddStringConstant(m, "TK_VERSION", TK_VERSION); - PyModule_AddStringConstant(m, "TCL_VERSION", TCL_VERSION); - - PyModule_AddObject(m, "TkappType", (PyObject *)&Tkapp_Type); - - if (PyType_Ready(&Tktt_Type) < 0) { + o = PyErr_NewException("_tkinter.TclError", NULL, NULL); + if (o == NULL) { Py_DECREF(m); return NULL; } - PyModule_AddObject(m, "TkttType", (PyObject *)&Tktt_Type); - - Py_TYPE(&PyTclObject_Type) = &PyType_Type; - PyModule_AddObject(m, "Tcl_Obj", (PyObject *)&PyTclObject_Type); + Py_INCREF(o); + if (PyModule_AddObject(m, "TclError", o)) { + Py_DECREF(o); + Py_DECREF(m); + return NULL; + } + Tkinter_TclError = o; + + if (PyModule_AddIntConstant(m, "READABLE", TCL_READABLE)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "WRITABLE", TCL_WRITABLE)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "EXCEPTION", TCL_EXCEPTION)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "WINDOW_EVENTS", TCL_WINDOW_EVENTS)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "FILE_EVENTS", TCL_FILE_EVENTS)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "TIMER_EVENTS", TCL_TIMER_EVENTS)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "IDLE_EVENTS", TCL_IDLE_EVENTS)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "ALL_EVENTS", TCL_ALL_EVENTS)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddIntConstant(m, "DONT_WAIT", TCL_DONT_WAIT)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddStringConstant(m, "TK_VERSION", TK_VERSION)) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddStringConstant(m, "TCL_VERSION", TCL_VERSION)) { + Py_DECREF(m); + return NULL; + } + + o = PyType_FromSpec(&Tkapp_Type_spec); + if (o == NULL) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddObject(m, "TkappType", o)) { + Py_DECREF(o); + Py_DECREF(m); + return NULL; + } + Tkapp_Type = o; + + o = PyType_FromSpec(&Tktt_Type_spec); + if (o == NULL) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddObject(m, "TkttType", o)) { + Py_DECREF(o); + Py_DECREF(m); + return NULL; + } + Tktt_Type = o; + + o = PyType_FromSpec(&PyTclObject_Type_spec); + if (o == NULL) { + Py_DECREF(m); + return NULL; + } + if (PyModule_AddObject(m, "Tcl_Obj", o)) { + Py_DECREF(o); + Py_DECREF(m); + return NULL; + } + PyTclObject_Type = o; #ifdef TK_AQUA /* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 14 22:16:39 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 14 Oct 2012 22:16:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316234=3A_Modify_s?= =?utf-8?q?ha3=27s_block=5Fsize_method_to_return_NotImplemented=2E?= Message-ID: <3XfvFM1slxzR2F@mail.python.org> http://hg.python.org/cpython/rev/40a1652349e9 changeset: 79722:40a1652349e9 user: Christian Heimes date: Sun Oct 14 22:16:27 2012 +0200 summary: Issue #16234: Modify sha3's block_size method to return NotImplemented. This makes the sha3 types unusable from the hmac module. HMAC-SHA3 hasn't been specified yet. files: Modules/_sha3/sha3module.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -140,7 +140,7 @@ #include "keccak/KeccakF-1600-opt32.c" #endif -#define SHA3_BLOCKSIZE 200 /* 1600 bits */ +/* #define SHA3_BLOCKSIZE 200 // 1600 bits */ #define SHA3_MAX_DIGESTSIZE 64 /* 512 bits */ #define SHA3_state hashState #define SHA3_init Init @@ -367,7 +367,11 @@ static PyObject * SHA3_get_block_size(SHA3object *self, void *closure) { - return PyLong_FromLong(SHA3_BLOCKSIZE); + /* HMAC-SHA3 hasn't been specified yet and no official test vectors are + * available. Thus block_size returns NotImplemented to prevent people + * from using SHA3 with the hmac module. + */ + Py_RETURN_NOTIMPLEMENTED; } static PyObject * -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Mon Oct 15 05:58:38 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Mon, 15 Oct 2012 05:58:38 +0200 Subject: [Python-checkins] Daily reference leaks (40a1652349e9): sum=2 Message-ID: results for 40a1652349e9 on branch "default" -------------------------------------------- test_dbm leaked [2, 0, 0] references, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogulprVx', '-x'] From python-checkins at python.org Mon Oct 15 16:57:47 2012 From: python-checkins at python.org (giampaolo.rodola) Date: Mon, 15 Oct 2012 16:57:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_logging=27s_SocketHandler?= =?utf-8?q?=3A_get_rid_of_some_legacy_code_and_use_the_newer?= Message-ID: <3XgN6z310rzRC3@mail.python.org> http://hg.python.org/cpython/rev/d3c7ebdc71bb changeset: 79723:d3c7ebdc71bb user: Giampaolo Rodola' date: Mon Oct 15 16:57:37 2012 +0200 summary: logging's SocketHandler: get rid of some legacy code and use the newer socket.create_connection() utility function files: Lib/logging/handlers.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -496,15 +496,7 @@ A factory method which allows subclasses to define the precise type of socket they want. """ - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if hasattr(s, 'settimeout'): - s.settimeout(timeout) - try: - s.connect((self.host, self.port)) - return s - except socket.error: - s.close() - raise + return socket.create_connection((self.host, self.port), timeout=timeout) def createSocket(self): """ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 02:13:04 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 16 Oct 2012 02:13:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjI3?= =?utf-8?q?=3A_Add_to_2=2Ex_Unicode_HOWTO_a_link_to_the_Python_3_version?= =?utf-8?q?=2E?= Message-ID: <3XgcRh2Y2pzR7k@mail.python.org> http://hg.python.org/cpython/rev/c59884f4bc8d changeset: 79724:c59884f4bc8d branch: 2.7 parent: 79712:5fc6f47974db user: Chris Jerdonek date: Mon Oct 15 17:12:17 2012 -0700 summary: Issue #16227: Add to 2.x Unicode HOWTO a link to the Python 3 version. files: Doc/howto/unicode.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -6,8 +6,8 @@ This HOWTO discusses Python 2.x's support for Unicode, and explains various problems that people commonly encounter when trying to work -with Unicode. (This HOWTO has not yet been updated to cover the 3.x -versions of Python.) +with Unicode. For the Python 3 version, see +. Introduction to Unicode ======================= -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 02:38:26 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 16 Oct 2012 02:38:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogZG9uJ3QgZXhwZWN0?= =?utf-8?q?_warnings_from_doctests_if_they_can=27t_run?= Message-ID: <3Xgd0y4fQxzNmb@mail.python.org> http://hg.python.org/cpython/rev/d39f4a92d823 changeset: 79725:d39f4a92d823 branch: 2.7 user: Benjamin Peterson date: Mon Oct 15 20:38:21 2012 -0400 summary: don't expect warnings from doctests if they can't run files: Lib/test/test_doctest.py | 4 +++- Lib/test/test_zipimport_support.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -2673,7 +2673,9 @@ from test import test_doctest # Ignore all warnings about the use of class Tester in this module. - deprecations = [("class Tester is deprecated", DeprecationWarning)] + deprecations = [] + if __debug__: + deprecations.append(("class Tester is deprecated", DeprecationWarning)) if sys.py3kwarning: deprecations += [("backquote not supported", SyntaxWarning), ("execfile.. not supported", DeprecationWarning)] diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py --- a/Lib/test/test_zipimport_support.py +++ b/Lib/test/test_zipimport_support.py @@ -179,9 +179,10 @@ test_zipped_doctest.test_unittest_reportflags, ] # Needed for test_DocTestParser and test_debug - deprecations = [ + deprecations = [] + if __debug__: # Ignore all warnings about the use of class Tester in this module. - ("class Tester is deprecated", DeprecationWarning)] + depcreations.append(("class Tester is deprecated", DeprecationWarning)) if sys.py3kwarning: deprecations += [ ("backquote not supported", SyntaxWarning), -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Tue Oct 16 03:09:53 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Mon, 15 Oct 2012 18:09:53 -0700 Subject: [Python-checkins] cpython (2.7): don't expect warnings from doctests if they can't run In-Reply-To: <3Xgd0y4fQxzNmb@mail.python.org> References: <3Xgd0y4fQxzNmb@mail.python.org> Message-ID: On Mon, Oct 15, 2012 at 5:38 PM, benjamin.peterson wrote: > http://hg.python.org/cpython/rev/d39f4a92d823 > changeset: 79725:d39f4a92d823 > branch: 2.7 > user: Benjamin Peterson > date: Mon Oct 15 20:38:21 2012 -0400 > summary: > don't expect warnings from doctests if they can't run > - ("class Tester is deprecated", DeprecationWarning)] > + depcreations.append(("class Tester is deprecated", DeprecationWarning)) There is a typo here. --Chris From python-checkins at python.org Tue Oct 16 04:23:02 2012 From: python-checkins at python.org (daniel.holth) Date: Tue, 16 Oct 2012 04:23:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_bye_sysconfig=2Eget=5Fpaths?= Message-ID: <3XggKf2myjzLrc@mail.python.org> http://hg.python.org/peps/rev/29c3c4ed67c6 changeset: 4553:29c3c4ed67c6 user: Daniel Holth date: Mon Oct 15 22:22:51 2012 -0400 summary: bye sysconfig.get_paths files: pep-0427.txt | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -75,9 +75,10 @@ there is data) ``distribution-1.0.data/``. b. Move each subtree of ``distribution-1.0.data/`` onto its destination path. Each subdirectory of ``distribution-1.0.data/`` - is a key into ``sysconfig.get_paths()``, such as - ``distribution-1.0.data/(config|purelib|platlib|scripts)``. See - http://docs.python.org/dev/packaging/setupcfg.html#resources. + is a key into a dict of destination directories, such as + ``distribution-1.0.data/(purelib|platlib|headers|scripts|data)``. + The initially supported paths are taken from + ``distutils.command.install``. c. If applicable, update scripts starting with ``#!python`` to point to the correct interpreter. d. Update ``distribution-1.0.dist.info/RECORD`` with the installed @@ -167,7 +168,7 @@ #. If a .whl contains scripts, both purelib and platlib, or any other files that are not installed on ``sys.path``, they are found in ``{distribution}-{version}.data/{key}``, where ``{key}`` is an - index into ``sysconfig.get_paths()``. + index into a dictionary of install paths. #. Wheel, being an installation format that is intended to work across multiple versions of Python, does not generally include .pyc files. #. Wheel does not contain setup.py or setup.cfg. @@ -209,11 +210,10 @@ distribution-1.0.data/ -The .data directory contains subdirectories named after the keys of -``sysconfig.get_paths()``, and those subdirectories contain the -scripts, headers, documentation and so forth from the distribution. -During installation the contents of these subdirectories are moved -onto their destination paths. +The .data directory contains subdirectories and those subdirectories +contain the scripts, headers, documentation and so forth from the +distribution. During installation the contents of these subdirectories +are moved onto their destination paths. Signed wheel files -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Tue Oct 16 04:29:07 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 16 Oct 2012 04:29:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_fix_typo?= Message-ID: <3XggSg60bSzR6V@mail.python.org> http://hg.python.org/cpython/rev/1fed09277e73 changeset: 79726:1fed09277e73 branch: 2.7 user: Benjamin Peterson date: Mon Oct 15 22:29:02 2012 -0400 summary: fix typo files: Lib/test/test_zipimport_support.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py --- a/Lib/test/test_zipimport_support.py +++ b/Lib/test/test_zipimport_support.py @@ -182,7 +182,7 @@ deprecations = [] if __debug__: # Ignore all warnings about the use of class Tester in this module. - depcreations.append(("class Tester is deprecated", DeprecationWarning)) + deprecations.append(("class Tester is deprecated", DeprecationWarning)) if sys.py3kwarning: deprecations += [ ("backquote not supported", SyntaxWarning), -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 04:51:36 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 16 Oct 2012 04:51:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjI1?= =?utf-8?q?=3A_Add_additional_note_to_tutorial_about_changing_sequence_whi?= =?utf-8?q?le?= Message-ID: <3Xggyc2xX1zQqT@mail.python.org> http://hg.python.org/cpython/rev/1f1bf6a3abbc changeset: 79727:1f1bf6a3abbc branch: 3.2 parent: 79709:ed6da2a8361c user: Chris Jerdonek date: Mon Oct 15 19:44:47 2012 -0700 summary: Issue #16225: Add additional note to tutorial about changing sequence while looping. files: Doc/tutorial/controlflow.rst | 22 ++++++++++---------- Doc/tutorial/datastructures.rst | 13 ++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -58,24 +58,24 @@ :: >>> # Measure some strings: - ... a = ['cat', 'window', 'defenestrate'] - >>> for x in a: - ... print(x, len(x)) + ... words = ['cat', 'window', 'defenestrate'] + >>> for w in words: + ... print(w, len(w)) ... cat 3 window 6 defenestrate 12 -It is not safe to modify the sequence being iterated over in the loop (this can -only happen for mutable sequence types, such as lists). If you need to modify -the list you are iterating over (for example, to duplicate selected items) you -must iterate over a copy. The slice notation makes this particularly -convenient:: +If you need to modify the sequence you are iterating over while inside the loop +(for example to duplicate selected items), it is recommended that you first +make a copy. Iterating over a sequence does not implicitly make a copy. The +slice notation makes this especially convenient:: - >>> for x in a[:]: # make a slice copy of the entire list - ... if len(x) > 6: a.insert(0, x) + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) ... - >>> a + >>> words ['defenestrate', 'cat', 'window', 'defenestrate'] diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -584,6 +584,19 @@ orange pear +To change a sequence you are iterating over while inside the loop (for +example to duplicate certain items), it is recommended that you first make +a copy. Looping over a sequence does not implicitly make a copy. The slice +notation makes this especially convenient:: + + >>> words = ['cat', 'window', 'defenestrate'] + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) + ... + >>> words + ['defenestrate', 'cat', 'window', 'defenestrate'] + .. _tut-conditions: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 04:51:37 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 16 Oct 2012 04:51:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316225=3A_Merge_from_3=2E2=3A_Add_additional_note_to_t?= =?utf-8?q?utorial_about_looping=2E?= Message-ID: <3Xggyd5Bb1zR61@mail.python.org> http://hg.python.org/cpython/rev/8cb14494d33c changeset: 79728:8cb14494d33c branch: 3.3 parent: 79710:02de13d69149 parent: 79727:1f1bf6a3abbc user: Chris Jerdonek date: Mon Oct 15 19:46:34 2012 -0700 summary: Issue #16225: Merge from 3.2: Add additional note to tutorial about looping. files: Doc/tutorial/controlflow.rst | 22 ++++++++++---------- Doc/tutorial/datastructures.rst | 13 ++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -58,24 +58,24 @@ :: >>> # Measure some strings: - ... a = ['cat', 'window', 'defenestrate'] - >>> for x in a: - ... print(x, len(x)) + ... words = ['cat', 'window', 'defenestrate'] + >>> for w in words: + ... print(w, len(w)) ... cat 3 window 6 defenestrate 12 -It is not safe to modify the sequence being iterated over in the loop (this can -only happen for mutable sequence types, such as lists). If you need to modify -the list you are iterating over (for example, to duplicate selected items) you -must iterate over a copy. The slice notation makes this particularly -convenient:: +If you need to modify the sequence you are iterating over while inside the loop +(for example to duplicate selected items), it is recommended that you first +make a copy. Iterating over a sequence does not implicitly make a copy. The +slice notation makes this especially convenient:: - >>> for x in a[:]: # make a slice copy of the entire list - ... if len(x) > 6: a.insert(0, x) + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) ... - >>> a + >>> words ['defenestrate', 'cat', 'window', 'defenestrate'] diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -589,6 +589,19 @@ orange pear +To change a sequence you are iterating over while inside the loop (for +example to duplicate certain items), it is recommended that you first make +a copy. Looping over a sequence does not implicitly make a copy. The slice +notation makes this especially convenient:: + + >>> words = ['cat', 'window', 'defenestrate'] + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) + ... + >>> words + ['defenestrate', 'cat', 'window', 'defenestrate'] + .. _tut-conditions: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 04:51:39 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 16 Oct 2012 04:51:39 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316225=3A_Merge_from_3=2E3=3A_Add_additional_not?= =?utf-8?q?e_to_tutorial_about_looping=2E?= Message-ID: <3Xggyg0CQBzR6V@mail.python.org> http://hg.python.org/cpython/rev/e0a407d41af5 changeset: 79729:e0a407d41af5 parent: 79723:d3c7ebdc71bb parent: 79728:8cb14494d33c user: Chris Jerdonek date: Mon Oct 15 19:47:32 2012 -0700 summary: Issue #16225: Merge from 3.3: Add additional note to tutorial about looping. files: Doc/tutorial/controlflow.rst | 22 ++++++++++---------- Doc/tutorial/datastructures.rst | 13 ++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -58,24 +58,24 @@ :: >>> # Measure some strings: - ... a = ['cat', 'window', 'defenestrate'] - >>> for x in a: - ... print(x, len(x)) + ... words = ['cat', 'window', 'defenestrate'] + >>> for w in words: + ... print(w, len(w)) ... cat 3 window 6 defenestrate 12 -It is not safe to modify the sequence being iterated over in the loop (this can -only happen for mutable sequence types, such as lists). If you need to modify -the list you are iterating over (for example, to duplicate selected items) you -must iterate over a copy. The slice notation makes this particularly -convenient:: +If you need to modify the sequence you are iterating over while inside the loop +(for example to duplicate selected items), it is recommended that you first +make a copy. Iterating over a sequence does not implicitly make a copy. The +slice notation makes this especially convenient:: - >>> for x in a[:]: # make a slice copy of the entire list - ... if len(x) > 6: a.insert(0, x) + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) ... - >>> a + >>> words ['defenestrate', 'cat', 'window', 'defenestrate'] diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -589,6 +589,19 @@ orange pear +To change a sequence you are iterating over while inside the loop (for +example to duplicate certain items), it is recommended that you first make +a copy. Looping over a sequence does not implicitly make a copy. The slice +notation makes this especially convenient:: + + >>> words = ['cat', 'window', 'defenestrate'] + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) + ... + >>> words + ['defenestrate', 'cat', 'window', 'defenestrate'] + .. _tut-conditions: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 05:02:25 2012 From: python-checkins at python.org (chris.jerdonek) Date: Tue, 16 Oct 2012 05:02:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjI1?= =?utf-8?q?=3A_Backport_from_3=2E2=3A_Add_additional_note_to_tutorial_abou?= =?utf-8?q?t_looping=2E?= Message-ID: <3XghC56wTFzR6X@mail.python.org> http://hg.python.org/cpython/rev/dc006b6212e7 changeset: 79730:dc006b6212e7 branch: 2.7 parent: 79726:1fed09277e73 user: Chris Jerdonek date: Mon Oct 15 20:01:38 2012 -0700 summary: Issue #16225: Backport from 3.2: Add additional note to tutorial about looping. files: Doc/tutorial/controlflow.rst | 22 ++++++++++---------- Doc/tutorial/datastructures.rst | 13 ++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -59,24 +59,24 @@ :: >>> # Measure some strings: - ... a = ['cat', 'window', 'defenestrate'] - >>> for x in a: - ... print x, len(x) + ... words = ['cat', 'window', 'defenestrate'] + >>> for w in words: + ... print w, len(w) ... cat 3 window 6 defenestrate 12 -It is not safe to modify the sequence being iterated over in the loop (this can -only happen for mutable sequence types, such as lists). If you need to modify -the list you are iterating over (for example, to duplicate selected items) you -must iterate over a copy. The slice notation makes this particularly -convenient:: +If you need to modify the sequence you are iterating over while inside the loop +(for example to duplicate selected items), it is recommended that you first +make a copy. Iterating over a sequence does not implicitly make a copy. The +slice notation makes this especially convenient:: - >>> for x in a[:]: # make a slice copy of the entire list - ... if len(x) > 6: a.insert(0, x) + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) ... - >>> a + >>> words ['defenestrate', 'cat', 'window', 'defenestrate'] diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -645,6 +645,19 @@ gallahad the pure robin the brave +To change a sequence you are iterating over while inside the loop (for +example to duplicate certain items), it is recommended that you first make +a copy. Looping over a sequence does not implicitly make a copy. The slice +notation makes this especially convenient:: + + >>> words = ['cat', 'window', 'defenestrate'] + >>> for w in words[:]: # Loop over a slice copy of the entire list. + ... if len(w) > 6: + ... words.insert(0, w) + ... + >>> words + ['defenestrate', 'cat', 'window', 'defenestrate'] + .. _tut-conditions: -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Tue Oct 16 05:56:22 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Tue, 16 Oct 2012 05:56:22 +0200 Subject: [Python-checkins] Daily reference leaks (d3c7ebdc71bb): sum=1 Message-ID: results for d3c7ebdc71bb on branch "default" -------------------------------------------- test_buffer leaked [0, 1, 0] references, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogqqa901', '-x'] From python-checkins at python.org Tue Oct 16 11:33:49 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 16 Oct 2012 11:33:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjQ0?= =?utf-8?q?=3A_Remove_file_mode_overrides=2E?= Message-ID: <3Xgrtj0q29zR6S@mail.python.org> http://hg.python.org/cpython/rev/6fcfe701502b changeset: 79731:6fcfe701502b branch: 2.7 user: Vinay Sajip date: Tue Oct 16 10:27:00 2012 +0100 summary: Issue #16244: Remove file mode overrides. files: Lib/logging/handlers.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -139,7 +139,6 @@ os.remove(dfn) os.rename(self.baseFilename, dfn) #print "%s -> %s" % (self.baseFilename, dfn) - self.mode = 'w' self.stream = self._open() def shouldRollover(self, record): @@ -354,7 +353,6 @@ for s in self.getFilesToDelete(): os.remove(s) #print "%s -> %s" % (self.baseFilename, dfn) - self.mode = 'w' self.stream = self._open() newRolloverAt = self.computeRollover(currentTime) while newRolloverAt <= currentTime: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 11:33:50 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 16 Oct 2012 11:33:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjQ0?= =?utf-8?q?=3A_Remove_file_mode_overrides=2E?= Message-ID: <3Xgrtk37TSzLs8@mail.python.org> http://hg.python.org/cpython/rev/5e770555be62 changeset: 79732:5e770555be62 branch: 3.2 parent: 79727:1f1bf6a3abbc user: Vinay Sajip date: Tue Oct 16 10:28:31 2012 +0100 summary: Issue #16244: Remove file mode overrides. files: Lib/logging/handlers.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -137,7 +137,6 @@ if os.path.exists(dfn): os.remove(dfn) os.rename(self.baseFilename, dfn) - self.mode = 'w' self.stream = self._open() def shouldRollover(self, record): @@ -345,7 +344,6 @@ if self.backupCount > 0: for s in self.getFilesToDelete(): os.remove(s) - self.mode = 'w' self.stream = self._open() newRolloverAt = self.computeRollover(currentTime) while newRolloverAt <= currentTime: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 11:33:51 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 16 Oct 2012 11:33:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316244=3A_Merged_change_from_3=2E2=2E?= Message-ID: <3Xgrtl5FKyzR6N@mail.python.org> http://hg.python.org/cpython/rev/4f1287be26a6 changeset: 79733:4f1287be26a6 branch: 3.3 parent: 79728:8cb14494d33c parent: 79732:5e770555be62 user: Vinay Sajip date: Tue Oct 16 10:32:13 2012 +0100 summary: Issue #16244: Merged change from 3.2. files: Lib/logging/handlers.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -172,7 +172,6 @@ if os.path.exists(dfn): os.remove(dfn) self.rotate(self.baseFilename, dfn) - self.mode = 'w' self.stream = self._open() def shouldRollover(self, record): @@ -381,7 +380,6 @@ if self.backupCount > 0: for s in self.getFilesToDelete(): os.remove(s) - self.mode = 'w' self.stream = self._open() newRolloverAt = self.computeRollover(currentTime) while newRolloverAt <= currentTime: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 11:33:53 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 16 Oct 2012 11:33:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Closes_=2316244=3A_Merged_change_from_3=2E3=2E?= Message-ID: <3Xgrtn0xThzP7r@mail.python.org> http://hg.python.org/cpython/rev/c20b0b5590db changeset: 79734:c20b0b5590db parent: 79729:e0a407d41af5 parent: 79733:4f1287be26a6 user: Vinay Sajip date: Tue Oct 16 10:33:30 2012 +0100 summary: Closes #16244: Merged change from 3.3. files: Lib/logging/handlers.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -170,7 +170,6 @@ if os.path.exists(dfn): os.remove(dfn) self.rotate(self.baseFilename, dfn) - self.mode = 'w' self.stream = self._open() def shouldRollover(self, record): @@ -379,7 +378,6 @@ if self.backupCount > 0: for s in self.getFilesToDelete(): os.remove(s) - self.mode = 'w' self.stream = self._open() newRolloverAt = self.computeRollover(currentTime) while newRolloverAt <= currentTime: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 12:15:50 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 12:15:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1OTM2?= =?utf-8?q?=3A_Add_link_from_os=2Eurandom_to_random=2ESystemRandom?= Message-ID: <3XgsqB5ThlzR64@mail.python.org> http://hg.python.org/cpython/rev/0a0b890508d3 changeset: 79735:0a0b890508d3 branch: 3.3 parent: 79733:4f1287be26a6 user: Andrew Svetlov date: Tue Oct 16 13:15:06 2012 +0300 summary: Issue #15936: Add link from os.urandom to random.SystemRandom files: Doc/library/os.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3309,3 +3309,6 @@ though its exact quality depends on the OS implementation. On a Unix-like system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. + + For easy to use interface to system randomness please see + :class:`random.SystemRandom`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 12:15:52 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 12:15:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315936=3A_Add_link_from_os=2Eurandom_to_ra?= =?utf-8?q?ndom=2ESystemRandom?= Message-ID: <3XgsqD0X10zR5R@mail.python.org> http://hg.python.org/cpython/rev/34c2bb737364 changeset: 79736:34c2bb737364 parent: 79734:c20b0b5590db parent: 79735:0a0b890508d3 user: Andrew Svetlov date: Tue Oct 16 13:15:35 2012 +0300 summary: Merge issue #15936: Add link from os.urandom to random.SystemRandom files: Doc/library/os.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3309,3 +3309,6 @@ though its exact quality depends on the OS implementation. On a Unix-like system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. + + For easy to use interface to system randomness please see + :class:`random.SystemRandom`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 12:23:25 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 12:23:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1OTM2?= =?utf-8?q?=3A_Add_link_from_os=2Eurandom_to_random=2ESystemRandom?= Message-ID: <3Xgszx68ckzR5c@mail.python.org> http://hg.python.org/cpython/rev/2bff4969b65b changeset: 79737:2bff4969b65b branch: 2.7 parent: 79731:6fcfe701502b user: Andrew Svetlov date: Tue Oct 16 13:23:15 2012 +0300 summary: Issue #15936: Add link from os.urandom to random.SystemRandom files: Doc/library/os.rst | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2506,5 +2506,7 @@ system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. + For easy to use interface to system randomness please see + :class:`random.SystemRandom`. + .. versionadded:: 2.4 - -- Repository URL: http://hg.python.org/cpython From hs at ox.cx Tue Oct 16 12:23:37 2012 From: hs at ox.cx (Hynek Schlawack) Date: Tue, 16 Oct 2012 12:23:37 +0200 Subject: [Python-checkins] cpython (merge 3.3 -> default): Merge issue #15936: Add link from os.urandom to random.SystemRandom In-Reply-To: <3XgsqD0X10zR5R@mail.python.org> References: <3XgsqD0X10zR5R@mail.python.org> Message-ID: Am 16.10.2012 um 12:15 schrieb andrew.svetlov : > + For easy to use interface to system randomness please see > + :class:`random.SystemRandom`. Is it just my non-native speaker ears, or should there be an ?an? before ?easy?? From andrew.svetlov at gmail.com Tue Oct 16 12:28:13 2012 From: andrew.svetlov at gmail.com (Andrew Svetlov) Date: Tue, 16 Oct 2012 13:28:13 +0300 Subject: [Python-checkins] cpython (merge 3.3 -> default): Merge issue #15936: Add link from os.urandom to random.SystemRandom In-Reply-To: References: <3XgsqD0X10zR5R@mail.python.org> Message-ID: I dont feel anything wrong with it, but I'm also not native speaker. On Tue, Oct 16, 2012 at 1:23 PM, Hynek Schlawack wrote: > Am 16.10.2012 um 12:15 schrieb andrew.svetlov : > >> + For easy to use interface to system randomness please see >> + :class:`random.SystemRandom`. > > Is it just my non-native speaker ears, or should there be an ?an? before ?easy?? > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins -- Thanks, Andrew Svetlov From python-checkins at python.org Tue Oct 16 12:53:05 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 12:53:05 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1OTM2?= =?utf-8?q?=3A_Reformat_text_for_os=2Erandom_to_follow_Larry_Hastings_sugg?= =?utf-8?q?estion?= Message-ID: <3Xgtf94VxjzR1n@mail.python.org> http://hg.python.org/cpython/rev/c1f27cf0cc9d changeset: 79738:c1f27cf0cc9d branch: 2.7 user: Andrew Svetlov date: Tue Oct 16 13:51:26 2012 +0300 summary: Issue #15936: Reformat text for os.random to follow Larry Hastings suggestion files: Doc/library/os.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2506,7 +2506,7 @@ system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. - For easy to use interface to system randomness please see - :class:`random.SystemRandom`. + For an easy-to-use interface to the random number generator + provided by your platform, please see :class:`random.SystemRandom`. .. versionadded:: 2.4 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 12:53:06 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 12:53:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1OTM2?= =?utf-8?q?=3A_Reformat_text_for_os=2Erandom_to_follow_Larry_Hastings_sugg?= =?utf-8?q?estion?= Message-ID: <3XgtfB6dxMzR62@mail.python.org> http://hg.python.org/cpython/rev/da8155ccf70b changeset: 79739:da8155ccf70b branch: 3.3 parent: 79735:0a0b890508d3 user: Andrew Svetlov date: Tue Oct 16 13:52:25 2012 +0300 summary: Issue #15936: Reformat text for os.random to follow Larry Hastings suggestion files: Doc/library/os.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3310,5 +3310,5 @@ system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. - For easy to use interface to system randomness please see - :class:`random.SystemRandom`. + For an easy-to-use interface to the random number generator + provided by your platform, please see :class:`random.SystemRandom`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 12:53:08 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 12:53:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315936=3A_Reformat_text_for_os=2Erandom_to?= =?utf-8?q?_follow_Larry_Hastings?= Message-ID: <3XgtfD1fJdzR7M@mail.python.org> http://hg.python.org/cpython/rev/bd3647e9ac62 changeset: 79740:bd3647e9ac62 parent: 79736:34c2bb737364 parent: 79739:da8155ccf70b user: Andrew Svetlov date: Tue Oct 16 13:52:53 2012 +0300 summary: Merge issue #15936: Reformat text for os.random to follow Larry Hastings suggestion files: Doc/library/os.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3310,5 +3310,5 @@ system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. - For easy to use interface to system randomness please see - :class:`random.SystemRandom`. + For an easy-to-use interface to the random number generator + provided by your platform, please see :class:`random.SystemRandom`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 13:49:15 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 13:49:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1ODMz?= =?utf-8?q?=3A_don=27t_raise_an_exception_if_importlib_can=27t_write_byte-?= =?utf-8?q?compiled?= Message-ID: <3Xgvtz2BrvzR7B@mail.python.org> http://hg.python.org/cpython/rev/53ce30b62de2 changeset: 79741:53ce30b62de2 branch: 3.3 parent: 79735:0a0b890508d3 user: Trent Nelson date: Tue Oct 16 07:47:34 2012 -0400 summary: Issue #15833: don't raise an exception if importlib can't write byte-compiled files. This fixes a regression introduced by 3.3. Patch by Charles-Fran?ois Natali. files: Lib/importlib/_bootstrap.py | 14 +- Misc/NEWS | 4 + Python/importlib.h | 3750 +++++++++++----------- 3 files changed, 1889 insertions(+), 1879 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1066,17 +1066,17 @@ except FileExistsError: # Probably another Python process already created the dir. continue - except PermissionError: - # If can't get proper access, then just forget about writing - # the data. + except OSError as exc: + # Could be a permission error, read-only filesystem: just forget + # about writing the data. + _verbose_message('could not create {!r}: {!r}', parent, exc) return try: _write_atomic(path, data, _mode) _verbose_message('created {!r}', path) - except (PermissionError, FileExistsError): - # Don't worry if you can't write bytecode or someone is writing - # it at the same time. - pass + except OSError as exc: + # Same as above: just don't write the bytecode. + _verbose_message('could not create {!r}: {!r}', path, exc) class SourcelessFileLoader(FileLoader, _LoaderBasics): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -127,6 +127,10 @@ Build ----- +- Issue #15833: Fix a regression in 3.3 that resulted in exceptions being + raised if importlib failed to write byte-compiled files. This affected + attempts to build Python out-of-tree from a read-only source directory. + - Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError after 2801bf875a24 (see #15801). diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 13:49:16 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 13:49:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_Merge_heads=2E?= Message-ID: <3Xgvv04QCMzR5G@mail.python.org> http://hg.python.org/cpython/rev/0f56aa8e1046 changeset: 79742:0f56aa8e1046 branch: 3.3 parent: 79741:53ce30b62de2 parent: 79739:da8155ccf70b user: Trent Nelson date: Tue Oct 16 07:48:34 2012 -0400 summary: Merge heads. files: Doc/library/os.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3310,5 +3310,5 @@ system this will query /dev/urandom, and on Windows it will use CryptGenRandom. If a randomness source is not found, :exc:`NotImplementedError` will be raised. - For easy to use interface to system randomness please see - :class:`random.SystemRandom`. + For an easy-to-use interface to the random number generator + provided by your platform, please see :class:`random.SystemRandom`. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:03:58 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:03:58 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315833=3A_don=27t_raise_an_exception_if_im?= =?utf-8?q?portlib_can=27t_write?= Message-ID: <3XgwCy3PJXzLs8@mail.python.org> http://hg.python.org/cpython/rev/36b2ca7dc893 changeset: 79743:36b2ca7dc893 parent: 79740:bd3647e9ac62 parent: 79742:0f56aa8e1046 user: Trent Nelson date: Tue Oct 16 08:03:21 2012 -0400 summary: Merge issue #15833: don't raise an exception if importlib can't write byte-compiled files. This fixes a regression introduced by 3.3. Patch by Charles-Fran?ois Natali. files: Lib/importlib/_bootstrap.py | 14 +- Misc/NEWS | 4 + Python/importlib.h | 3699 +++++++++++----------- 3 files changed, 1864 insertions(+), 1853 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1066,17 +1066,17 @@ except FileExistsError: # Probably another Python process already created the dir. continue - except PermissionError: - # If can't get proper access, then just forget about writing - # the data. + except OSError as exc: + # Could be a permission error, read-only filesystem: just forget + # about writing the data. + _verbose_message('could not create {!r}: {!r}', parent, exc) return try: _write_atomic(path, data, _mode) _verbose_message('created {!r}', path) - except (PermissionError, FileExistsError): - # Don't worry if you can't write bytecode or someone is writing - # it at the same time. - pass + except OSError as exc: + # Same as above: just don't write the bytecode. + _verbose_message('could not create {!r}: {!r}', path, exc) class SourcelessFileLoader(FileLoader, _LoaderBasics): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -158,6 +158,10 @@ Build ----- +- Issue #15833: Fix a regression in 3.3 that resulted in exceptions being + raised if importlib failed to write byte-compiled files. This affected + attempts to build Python out-of-tree from a read-only source directory. + - Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError after 2801bf875a24 (see #15801). diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:17:47 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:17:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1Mjk4?= =?utf-8?q?=3A_ensure_=5Fsysconfigdata_is_generated_in_build_directory=2C?= Message-ID: <3XgwWv1S2VzPTG@mail.python.org> http://hg.python.org/cpython/rev/24d52d3060e8 changeset: 79744:24d52d3060e8 branch: 3.3 parent: 79742:0f56aa8e1046 user: Trent Nelson date: Tue Oct 16 08:13:12 2012 -0400 summary: Issue #15298: ensure _sysconfigdata is generated in build directory, not source directory. Patch by Richard Oudkerk (sbt). files: Lib/sysconfig.py | 11 ++++++++++- Makefile.pre.in | 24 +++++++++++++----------- Misc/NEWS | 7 +++++-- setup.py | 14 -------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -390,13 +390,22 @@ if _PYTHON_BUILD: vars['LDSHARED'] = vars['BLDSHARED'] - destfile = os.path.join(os.path.dirname(__file__), '_sysconfigdata.py') + pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + if hasattr(sys, "gettotalrefcount"): + pybuilddir += '-pydebug' + os.makedirs(pybuilddir, exist_ok=True) + destfile = os.path.join(pybuilddir, '_sysconfigdata.py') + with open(destfile, 'w', encoding='utf8') as f: f.write('# system configuration generated and used by' ' the sysconfig module\n') f.write('build_time_vars = ') pprint.pprint(vars, stream=f) + # Create file used for sys.path fixup -- see Modules/getpath.c + with open('pybuilddir.txt', 'w', encoding='ascii') as f: + f.write(pybuilddir) + def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -410,8 +410,6 @@ Objects/unicodectype.o \ Objects/weakrefobject.o -SYSCONFIGDATA=$(srcdir)/Lib/_sysconfigdata.py - ########################################################################## # objects that get linked into the Python library LIBRARY_OBJS_OMIT_FROZEN= \ @@ -432,7 +430,7 @@ # Default target all: build_all -build_all: $(BUILDPYTHON) $(SYSCONFIGDATA) oldsharedmods sharedmods gdbhooks Modules/_testembed +build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks Modules/_testembed # Compile a binary with gcc profile guided optimization. profile-opt: @@ -466,17 +464,19 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -platform: $(BUILDPYTHON) $(SYSCONFIGDATA) +platform: $(BUILDPYTHON) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform -# Generate the sysconfig build-time data -$(SYSCONFIGDATA): $(BUILDPYTHON) +# Create build directory and generate the sysconfig build-time data there. +# pybuilddir.txt contains the name of the build dir and is used for +# sys.path fixup -- see Modules/getpath.c. +pybuilddir.txt: $(BUILDPYTHON) $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars # Build the shared modules # MAKEFLAGS are sorted and normalized. Under GNU make the 's' for # -s, --silent or --quiet is always the first char. -sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA) +sharedmods: $(BUILDPYTHON) pybuilddir.txt @case "$$MAKEFLAGS" in \ s*) quiet="-q";; \ *) quiet="";; \ @@ -1043,7 +1043,7 @@ else true; \ fi; \ done - @for i in $(srcdir)/Lib/*.py ; \ + @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py; \ do \ if test -x $$i; then \ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ @@ -1203,6 +1203,8 @@ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py + -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the @@ -1348,9 +1350,10 @@ find . -name '*.s[ol]' -exec rm -f {} ';' find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' find build -name 'fficonfig.h' -exec rm -f {} ';' || true - find build -name 'fficonfig.py' -exec rm -f {} ';' || true + find build -name '*.py' -exec rm -f {} ';' || true + find build -name '*.py[co]' -exec rm -f {} ';' || true + -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle - -rm -f $(SYSCONFIGDATA) -rm -f Modules/_testembed Modules/_freeze_importlib profile-removal: @@ -1374,7 +1377,6 @@ Modules/Setup Modules/Setup.local Modules/Setup.config \ Modules/ld_so_aix Modules/python.exp Misc/python.pc -rm -f python*-gdb.py - -rm -f pybuilddir.txt find $(srcdir) '(' -name '*.fdc' -o -name '*~' \ -o -name '[@,#]*' -o -name '*.old' \ -o -name '*.orig' -o -name '*.rej' \ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -127,6 +127,9 @@ Build ----- +- Issue #15298: ensure _sysconfigdata is generated in build directory, not + source directory. + - Issue #15833: Fix a regression in 3.3 that resulted in exceptions being raised if importlib failed to write byte-compiled files. This affected attempts to build Python out-of-tree from a read-only source directory. @@ -134,8 +137,8 @@ - Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError after 2801bf875a24 (see #15801). -- Issue #15819: Make sure we can build Python out-of-tree from a readonly source - directory. (Somewhat related to issue #9860.) +- Issue #15819: Make sure we can build Python out-of-tree from a read-only + source directory. (Somewhat related to issue #9860.) Documentation ------------- diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -33,10 +33,6 @@ # This global variable is used to hold the list of modules to be disabled. disabled_module_list = [] -# File which contains the directory for shared mods (for sys.path fixup -# when running from the build dir, see Modules/getpath.c) -_BUILDDIR_COOKIE = "pybuilddir.txt" - def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (after any relative directories) if: @@ -252,16 +248,6 @@ args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags self.compiler.set_executables(**args) - # Not only do we write the builddir cookie, but we manually install - # the shared modules directory if it isn't already in sys.path. - # Otherwise trying to import the extensions after building them - # will fail. - with open(_BUILDDIR_COOKIE, "wb") as f: - f.write(self.build_lib.encode('utf-8', 'surrogateescape')) - abs_build_lib = os.path.join(os.getcwd(), self.build_lib) - if abs_build_lib not in sys.path: - sys.path.append(abs_build_lib) - build_ext.build_extensions(self) longest = max([len(e.name) for e in self.extensions]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:17:48 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:17:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315298=3A_ensure_=5Fsysconfigdata_is_gener?= =?utf-8?q?ated_in_build_directory=2C?= Message-ID: <3XgwWw4yVTzR8d@mail.python.org> http://hg.python.org/cpython/rev/f85c3f4d9b98 changeset: 79745:f85c3f4d9b98 parent: 79743:36b2ca7dc893 parent: 79744:24d52d3060e8 user: Trent Nelson date: Tue Oct 16 08:17:11 2012 -0400 summary: Merge issue #15298: ensure _sysconfigdata is generated in build directory, not source directory. Patch by: Richard Oudkerk (sbt). files: Lib/sysconfig.py | 11 ++++++++++- Makefile.pre.in | 24 +++++++++++++----------- Misc/NEWS | 7 +++++-- setup.py | 14 -------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -371,13 +371,22 @@ if _PYTHON_BUILD: vars['LDSHARED'] = vars['BLDSHARED'] - destfile = os.path.join(os.path.dirname(__file__), '_sysconfigdata.py') + pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + if hasattr(sys, "gettotalrefcount"): + pybuilddir += '-pydebug' + os.makedirs(pybuilddir, exist_ok=True) + destfile = os.path.join(pybuilddir, '_sysconfigdata.py') + with open(destfile, 'w', encoding='utf8') as f: f.write('# system configuration generated and used by' ' the sysconfig module\n') f.write('build_time_vars = ') pprint.pprint(vars, stream=f) + # Create file used for sys.path fixup -- see Modules/getpath.c + with open('pybuilddir.txt', 'w', encoding='ascii') as f: + f.write(pybuilddir) + def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -410,8 +410,6 @@ Objects/unicodectype.o \ Objects/weakrefobject.o -SYSCONFIGDATA=$(srcdir)/Lib/_sysconfigdata.py - ########################################################################## # objects that get linked into the Python library LIBRARY_OBJS_OMIT_FROZEN= \ @@ -432,7 +430,7 @@ # Default target all: build_all -build_all: $(BUILDPYTHON) $(SYSCONFIGDATA) oldsharedmods sharedmods gdbhooks Modules/_testembed +build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks Modules/_testembed # Compile a binary with gcc profile guided optimization. profile-opt: @@ -466,17 +464,19 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -platform: $(BUILDPYTHON) $(SYSCONFIGDATA) +platform: $(BUILDPYTHON) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform -# Generate the sysconfig build-time data -$(SYSCONFIGDATA): $(BUILDPYTHON) +# Create build directory and generate the sysconfig build-time data there. +# pybuilddir.txt contains the name of the build dir and is used for +# sys.path fixup -- see Modules/getpath.c. +pybuilddir.txt: $(BUILDPYTHON) $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars # Build the shared modules # MAKEFLAGS are sorted and normalized. Under GNU make the 's' for # -s, --silent or --quiet is always the first char. -sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA) +sharedmods: $(BUILDPYTHON) pybuilddir.txt @case "$$MAKEFLAGS" in \ s*) quiet="-q";; \ *) quiet="";; \ @@ -1043,7 +1043,7 @@ else true; \ fi; \ done - @for i in $(srcdir)/Lib/*.py ; \ + @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py; \ do \ if test -x $$i; then \ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ @@ -1203,6 +1203,8 @@ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py + -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the @@ -1348,9 +1350,10 @@ find . -name '*.s[ol]' -exec rm -f {} ';' find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' find build -name 'fficonfig.h' -exec rm -f {} ';' || true - find build -name 'fficonfig.py' -exec rm -f {} ';' || true + find build -name '*.py' -exec rm -f {} ';' || true + find build -name '*.py[co]' -exec rm -f {} ';' || true + -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle - -rm -f $(SYSCONFIGDATA) -rm -f Modules/_testembed Modules/_freeze_importlib profile-removal: @@ -1374,7 +1377,6 @@ Modules/Setup Modules/Setup.local Modules/Setup.config \ Modules/ld_so_aix Modules/python.exp Misc/python.pc -rm -f python*-gdb.py - -rm -f pybuilddir.txt find $(srcdir) '(' -name '*.fdc' -o -name '*~' \ -o -name '[@,#]*' -o -name '*.old' \ -o -name '*.orig' -o -name '*.rej' \ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -158,6 +158,9 @@ Build ----- +- Issue #15298: ensure _sysconfigdata is generated in build directory, not + source directory. + - Issue #15833: Fix a regression in 3.3 that resulted in exceptions being raised if importlib failed to write byte-compiled files. This affected attempts to build Python out-of-tree from a read-only source directory. @@ -167,8 +170,8 @@ - Issue #16135: Remove OS/2 support. -- Issue #15819: Make sure we can build Python out-of-tree from a readonly source - directory. (Somewhat related to Issue #9860.) +- Issue #15819: Make sure we can build Python out-of-tree from a read-only + source directory. (Somewhat related to issue #9860.) Documentation ------------- diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -33,10 +33,6 @@ # This global variable is used to hold the list of modules to be disabled. disabled_module_list = [] -# File which contains the directory for shared mods (for sys.path fixup -# when running from the build dir, see Modules/getpath.c) -_BUILDDIR_COOKIE = "pybuilddir.txt" - def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (after any relative directories) if: @@ -252,16 +248,6 @@ args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags self.compiler.set_executables(**args) - # Not only do we write the builddir cookie, but we manually install - # the shared modules directory if it isn't already in sys.path. - # Otherwise trying to import the extensions after building them - # will fail. - with open(_BUILDDIR_COOKIE, "wb") as f: - f.write(self.build_lib.encode('utf-8', 'surrogateescape')) - abs_build_lib = os.path.join(os.getcwd(), self.build_lib) - if abs_build_lib not in sys.path: - sys.path.append(abs_build_lib) - build_ext.build_extensions(self) longest = max([len(e.name) for e in self.extensions]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:51:21 2012 From: python-checkins at python.org (nick.coghlan) Date: Tue, 16 Oct 2012 14:51:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Tweak_the_thre?= =?utf-8?q?aded_example_in_concurrent=2Efutures?= Message-ID: <3XgxGd4q4yzR5q@mail.python.org> http://hg.python.org/cpython/rev/a3f27289ec68 changeset: 79746:a3f27289ec68 branch: 3.3 parent: 79744:24d52d3060e8 user: Nick Coghlan date: Tue Oct 16 22:50:04 2012 +1000 summary: Tweak the threaded example in concurrent.futures files: Doc/library/concurrent.futures.rst | 25 ++++++++++------- Misc/NEWS | 3 ++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -136,20 +136,25 @@ 'http://www.bbc.co.uk/', 'http://some-made-up-domain.com/'] + # Retrieve a single page and report the url and contents def load_url(url, timeout): - return urllib.request.urlopen(url, timeout=timeout).read() + conn = urllib.request.urlopen(url, timeout=timeout) + return conn.readall() + # We can use a with statement to ensure threads are cleaned up promptly with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: - future_to_url = dict((executor.submit(load_url, url, 60), url) - for url in URLS) - - for future in concurrent.futures.as_completed(future_to_url): - url = future_to_url[future] - if future.exception() is not None: - print('%r generated an exception: %s' % (url, - future.exception())) + # Start the load operations and mark each future with its URL + load_urls = [executor.submit(load_url, url, 60) for url in URLS] + for future, url in zip(load_urls, URLS): + future.url = url + for future in concurrent.futures.as_completed(load_urls): + url = future.url + try: + data = future.result() + except Exception as exc: + print('%r generated an exception: %s' % (url, exc)) else: - print('%r page is %d bytes' % (url, len(future.result()))) + print('%r page is %d bytes' % (url, len(data))) ProcessPoolExecutor diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,9 @@ Documentation ------------- +- Additional comments and some style changes in the concurrent.futures URL + retrieval example + - Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:51:22 2012 From: python-checkins at python.org (nick.coghlan) Date: Tue, 16 Oct 2012 14:51:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_concurrent=2Efutures_example_changes_from_3=2E3?= Message-ID: <3XgxGf75FXzR5s@mail.python.org> http://hg.python.org/cpython/rev/f2a739d6fc86 changeset: 79747:f2a739d6fc86 parent: 79745:f85c3f4d9b98 parent: 79746:a3f27289ec68 user: Nick Coghlan date: Tue Oct 16 22:51:11 2012 +1000 summary: Merge concurrent.futures example changes from 3.3 files: Doc/library/concurrent.futures.rst | 25 ++++++++++------- Misc/NEWS | 3 ++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -136,20 +136,25 @@ 'http://www.bbc.co.uk/', 'http://some-made-up-domain.com/'] + # Retrieve a single page and report the url and contents def load_url(url, timeout): - return urllib.request.urlopen(url, timeout=timeout).read() + conn = urllib.request.urlopen(url, timeout=timeout) + return conn.readall() + # We can use a with statement to ensure threads are cleaned up promptly with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: - future_to_url = dict((executor.submit(load_url, url, 60), url) - for url in URLS) - - for future in concurrent.futures.as_completed(future_to_url): - url = future_to_url[future] - if future.exception() is not None: - print('%r generated an exception: %s' % (url, - future.exception())) + # Start the load operations and mark each future with its URL + load_urls = [executor.submit(load_url, url, 60) for url in URLS] + for future, url in zip(load_urls, URLS): + future.url = url + for future in concurrent.futures.as_completed(load_urls): + url = future.url + try: + data = future.result() + except Exception as exc: + print('%r generated an exception: %s' % (url, exc)) else: - print('%r page is %d bytes' % (url, len(future.result()))) + print('%r page is %d bytes' % (url, len(data))) ProcessPoolExecutor diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -176,6 +176,9 @@ Documentation ------------- +- Additional comments and some style changes in the concurrent.futures URL + retrieval example + - Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:57:25 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:57:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODE5?= =?utf-8?q?=3A_additional_fixes_for_out-of-tree_builds_from_read-only_src?= =?utf-8?q?=2E?= Message-ID: <3XgxPd5XHpzR6w@mail.python.org> http://hg.python.org/cpython/rev/617591e7d708 changeset: 79748:617591e7d708 branch: 3.2 parent: 79732:5e770555be62 user: Trent Nelson date: Tue Oct 16 08:41:32 2012 -0400 summary: Issue #15819: additional fixes for out-of-tree builds from read-only src. Specifically, make sure the 'Object', 'Python' and 'Include' directories in the build directory take precedence over the source directory if we're an out-of-tree build. Fix typeslots.inc so that it gets generated into the build directory. files: Makefile.pre.in | 13 ++++++++----- configure | 20 ++++++++++++++++++++ configure.ac | 18 ++++++++++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,6 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ +BUILDDIR= @BUILDDIR@ + CC= @CC@ CXX= @CXX@ @@ -66,6 +68,7 @@ # Compiler options OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ +BASECPPFLAGS= @BASECPPFLAGS@ CONFIGURE_CFLAGS= @CFLAGS@ CONFIGURE_CPPFLAGS= @CPPFLAGS@ CONFIGURE_LDFLAGS= @LDFLAGS@ @@ -76,7 +79,7 @@ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables -PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ @@ -282,7 +285,7 @@ # Python OPCODETARGETS_H= \ - $(srcdir)/Python/opcode_targets.h + Python/opcode_targets.h OPCODETARGETGEN= \ $(srcdir)/Python/makeopcodetargets.py @@ -663,9 +666,9 @@ $(BYTESTR_DEPS) \ $(srcdir)/Objects/stringlib/formatter.h -Objects/typeobject.o: $(srcdir)/Objects/typeslots.inc -$(srcdir)/Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py - $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > $(srcdir)/Objects/typeslots.inc +Objects/typeobject.o: Objects/typeslots.inc +Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py + $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc ############################################################################ # Header files diff --git a/configure b/configure --- a/configure +++ b/configure @@ -651,6 +651,8 @@ HGBRANCH HGTAG HGVERSION +BASECPPFLAGS +BUILDDIR SVNVERSION ARFLAGS AR @@ -5205,6 +5207,24 @@ SVNVERSION="echo Unversioned directory" fi +BUILDDIR="`pwd`" + + +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree, we need to make sure the following + # resources get picked up before their $srcdir counterparts. + # Objects/ -> typeslots.inc + # Include/ -> Python-ast.h, graminit.h + # Python/ -> importlib.h + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IObjects -IInclude -IPython" +else + BASECPPFLAGS="" +fi + diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -830,6 +830,24 @@ SVNVERSION="echo Unversioned directory" fi +BUILDDIR="`pwd`" +AC_SUBST(BUILDDIR) +AC_SUBST(BASECPPFLAGS) +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree, we need to make sure the following + # resources get picked up before their $srcdir counterparts. + # Objects/ -> typeslots.inc + # Include/ -> Python-ast.h, graminit.h + # Python/ -> importlib.h + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IObjects -IInclude -IPython" +else + BASECPPFLAGS="" +fi + AC_SUBST(HGVERSION) AC_SUBST(HGTAG) AC_SUBST(HGBRANCH) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:57:27 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:57:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2315819=3A_additional_fixes_for_out-of-tree_build?= =?utf-8?q?s_from_read-only_src=2E?= Message-ID: <3XgxPg1v7VzR1X@mail.python.org> http://hg.python.org/cpython/rev/abb00e23681a changeset: 79749:abb00e23681a branch: 3.3 parent: 79744:24d52d3060e8 parent: 79748:617591e7d708 user: Trent Nelson date: Tue Oct 16 08:51:24 2012 -0400 summary: Merge issue #15819: additional fixes for out-of-tree builds from read-only src. Specifically, make sure the 'Object', 'Python' and 'Include' directories in the build directory take precedence over the source directory if we're an out-of-tree build. Fix typeslots.inc so that it gets generated into the build directory. In addition, for 3.3, make sure importlib.h gets generated into the build directory. files: Makefile.pre.in | 15 +++++++++------ configure | 20 ++++++++++++++++++++ configure.ac | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,6 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ +BUILDDIR= @BUILDDIR@ + CC= @CC@ CXX= @CXX@ @@ -66,6 +68,7 @@ # Compiler options OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ +BASECPPFLAGS= @BASECPPFLAGS@ CONFIGURE_CFLAGS= @CFLAGS@ CONFIGURE_CPPFLAGS= @CPPFLAGS@ CONFIGURE_LDFLAGS= @LDFLAGS@ @@ -76,7 +79,7 @@ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables -PY_CPPFLAGS= -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ @@ -310,7 +313,7 @@ # Python OPCODETARGETS_H= \ - $(srcdir)/Python/opcode_targets.h + Python/opcode_targets.h OPCODETARGETGEN= \ $(srcdir)/Python/makeopcodetargets.py @@ -725,11 +728,11 @@ Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \ $(BYTESTR_DEPS) -Python/frozen.o: $(srcdir)/Python/importlib.h +Python/frozen.o: Python/importlib.h -Objects/typeobject.o: $(srcdir)/Objects/typeslots.inc -$(srcdir)/Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py - $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > $(srcdir)/Objects/typeslots.inc +Objects/typeobject.o: Objects/typeslots.inc +Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py + $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc ############################################################################ # Header files diff --git a/configure b/configure --- a/configure +++ b/configure @@ -714,6 +714,8 @@ HGBRANCH HGTAG HGVERSION +BASECPPFLAGS +BUILDDIR target_alias host_alias build_alias @@ -2719,6 +2721,24 @@ +BUILDDIR="`pwd`" + + +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree, we need to make sure the following + # resources get picked up before their $srcdir counterparts. + # Objects/ -> typeslots.inc + # Include/ -> Python-ast.h, graminit.h + # Python/ -> importlib.h + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IObjects -IInclude -IPython" +else + BASECPPFLAGS="" +fi + diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,24 @@ AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) +BUILDDIR="`pwd`" +AC_SUBST(BUILDDIR) +AC_SUBST(BASECPPFLAGS) +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree, we need to make sure the following + # resources get picked up before their $srcdir counterparts. + # Objects/ -> typeslots.inc + # Include/ -> Python-ast.h, graminit.h + # Python/ -> importlib.h + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IObjects -IInclude -IPython" +else + BASECPPFLAGS="" +fi + AC_SUBST(HGVERSION) AC_SUBST(HGTAG) AC_SUBST(HGBRANCH) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:57:28 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:57:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315819=3A_additional_fixes_for_out-of-tree?= =?utf-8?q?_builds_from_read-only_src=2E?= Message-ID: <3XgxPh5WP5zR8x@mail.python.org> http://hg.python.org/cpython/rev/3420fbd87646 changeset: 79750:3420fbd87646 parent: 79745:f85c3f4d9b98 parent: 79749:abb00e23681a user: Trent Nelson date: Tue Oct 16 08:53:13 2012 -0400 summary: Merge issue #15819: additional fixes for out-of-tree builds from read-only src. Specifically, make sure the 'Object', 'Python' and 'Include' directories in the build directory take precedence over the source directory if we're an out-of-tree build. Fix typeslots.inc so that it gets generated into the build directory. In addition, for 3.3, make sure importlib.h gets generated into the build directory. files: Makefile.pre.in | 15 +++++++++------ configure | 20 ++++++++++++++++++++ configure.ac | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,6 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ +BUILDDIR= @BUILDDIR@ + CC= @CC@ CXX= @CXX@ @@ -66,6 +68,7 @@ # Compiler options OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ +BASECPPFLAGS= @BASECPPFLAGS@ CONFIGURE_CFLAGS= @CFLAGS@ CONFIGURE_CPPFLAGS= @CPPFLAGS@ CONFIGURE_LDFLAGS= @LDFLAGS@ @@ -76,7 +79,7 @@ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables -PY_CPPFLAGS= -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ @@ -310,7 +313,7 @@ # Python OPCODETARGETS_H= \ - $(srcdir)/Python/opcode_targets.h + Python/opcode_targets.h OPCODETARGETGEN= \ $(srcdir)/Python/makeopcodetargets.py @@ -725,11 +728,11 @@ Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \ $(BYTESTR_DEPS) -Python/frozen.o: $(srcdir)/Python/importlib.h +Python/frozen.o: Python/importlib.h -Objects/typeobject.o: $(srcdir)/Objects/typeslots.inc -$(srcdir)/Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py - $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > $(srcdir)/Objects/typeslots.inc +Objects/typeobject.o: Objects/typeslots.inc +Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py + $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc ############################################################################ # Header files diff --git a/configure b/configure --- a/configure +++ b/configure @@ -714,6 +714,8 @@ HGBRANCH HGTAG HGVERSION +BASECPPFLAGS +BUILDDIR target_alias host_alias build_alias @@ -2719,6 +2721,24 @@ +BUILDDIR="`pwd`" + + +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree, we need to make sure the following + # resources get picked up before their $srcdir counterparts. + # Objects/ -> typeslots.inc + # Include/ -> Python-ast.h, graminit.h + # Python/ -> importlib.h + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IObjects -IInclude -IPython" +else + BASECPPFLAGS="" +fi + diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,24 @@ AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) +BUILDDIR="`pwd`" +AC_SUBST(BUILDDIR) +AC_SUBST(BASECPPFLAGS) +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree, we need to make sure the following + # resources get picked up before their $srcdir counterparts. + # Objects/ -> typeslots.inc + # Include/ -> Python-ast.h, graminit.h + # Python/ -> importlib.h + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IObjects -IInclude -IPython" +else + BASECPPFLAGS="" +fi + AC_SUBST(HGVERSION) AC_SUBST(HGTAG) AC_SUBST(HGBRANCH) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:57:30 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:57:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_Merge_heads=2E?= Message-ID: <3XgxPk0gH4zR9D@mail.python.org> http://hg.python.org/cpython/rev/903c276b814a changeset: 79751:903c276b814a branch: 3.3 parent: 79749:abb00e23681a parent: 79746:a3f27289ec68 user: Trent Nelson date: Tue Oct 16 08:56:41 2012 -0400 summary: Merge heads. files: Doc/library/concurrent.futures.rst | 25 ++++++++++------- Misc/NEWS | 3 ++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -136,20 +136,25 @@ 'http://www.bbc.co.uk/', 'http://some-made-up-domain.com/'] + # Retrieve a single page and report the url and contents def load_url(url, timeout): - return urllib.request.urlopen(url, timeout=timeout).read() + conn = urllib.request.urlopen(url, timeout=timeout) + return conn.readall() + # We can use a with statement to ensure threads are cleaned up promptly with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: - future_to_url = dict((executor.submit(load_url, url, 60), url) - for url in URLS) - - for future in concurrent.futures.as_completed(future_to_url): - url = future_to_url[future] - if future.exception() is not None: - print('%r generated an exception: %s' % (url, - future.exception())) + # Start the load operations and mark each future with its URL + load_urls = [executor.submit(load_url, url, 60) for url in URLS] + for future, url in zip(load_urls, URLS): + future.url = url + for future in concurrent.futures.as_completed(load_urls): + url = future.url + try: + data = future.result() + except Exception as exc: + print('%r generated an exception: %s' % (url, exc)) else: - print('%r page is %d bytes' % (url, len(future.result()))) + print('%r page is %d bytes' % (url, len(data))) ProcessPoolExecutor diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,9 @@ Documentation ------------- +- Additional comments and some style changes in the concurrent.futures URL + retrieval example + - Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 14:57:31 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 14:57:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgaGVhZHMu?= Message-ID: <3XgxPl2t4nzR9X@mail.python.org> http://hg.python.org/cpython/rev/cf39cb2b5009 changeset: 79752:cf39cb2b5009 parent: 79750:3420fbd87646 parent: 79747:f2a739d6fc86 user: Trent Nelson date: Tue Oct 16 08:56:46 2012 -0400 summary: Merge heads. files: Doc/library/concurrent.futures.rst | 25 ++++++++++------- Misc/NEWS | 3 ++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -136,20 +136,25 @@ 'http://www.bbc.co.uk/', 'http://some-made-up-domain.com/'] + # Retrieve a single page and report the url and contents def load_url(url, timeout): - return urllib.request.urlopen(url, timeout=timeout).read() + conn = urllib.request.urlopen(url, timeout=timeout) + return conn.readall() + # We can use a with statement to ensure threads are cleaned up promptly with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: - future_to_url = dict((executor.submit(load_url, url, 60), url) - for url in URLS) - - for future in concurrent.futures.as_completed(future_to_url): - url = future_to_url[future] - if future.exception() is not None: - print('%r generated an exception: %s' % (url, - future.exception())) + # Start the load operations and mark each future with its URL + load_urls = [executor.submit(load_url, url, 60) for url in URLS] + for future, url in zip(load_urls, URLS): + future.url = url + for future in concurrent.futures.as_completed(load_urls): + url = future.url + try: + data = future.result() + except Exception as exc: + print('%r generated an exception: %s' % (url, exc)) else: - print('%r page is %d bytes' % (url, len(future.result()))) + print('%r page is %d bytes' % (url, len(data))) ProcessPoolExecutor diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -176,6 +176,9 @@ Documentation ------------- +- Additional comments and some style changes in the concurrent.futures URL + retrieval example + - Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 15:14:47 2012 From: python-checkins at python.org (nick.coghlan) Date: Tue, 16 Oct 2012 15:14:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_A_dict_compreh?= =?utf-8?q?ension_is_much_prettier_=28thanks_Antoine=29?= Message-ID: <3Xgxng5ztczR8K@mail.python.org> http://hg.python.org/cpython/rev/1280b38fe583 changeset: 79753:1280b38fe583 branch: 3.3 parent: 79751:903c276b814a user: Nick Coghlan date: Tue Oct 16 23:14:03 2012 +1000 summary: A dict comprehension is much prettier (thanks Antoine) files: Doc/library/concurrent.futures.rst | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -144,11 +144,9 @@ # We can use a with statement to ensure threads are cleaned up promptly with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: # Start the load operations and mark each future with its URL - load_urls = [executor.submit(load_url, url, 60) for url in URLS] - for future, url in zip(load_urls, URLS): - future.url = url - for future in concurrent.futures.as_completed(load_urls): - url = future.url + future_to_url = {executor.submit(load_url, url, 60):url for url in URLS} + for future in concurrent.futures.as_completed(future_to_url): + url = future_to_url[url] try: data = future.result() except Exception as exc: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 15:14:49 2012 From: python-checkins at python.org (nick.coghlan) Date: Tue, 16 Oct 2012 15:14:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_concurrent=2Efutures_dict_comp_tweak_from_3=2E3?= Message-ID: <3Xgxnj13l0zR9g@mail.python.org> http://hg.python.org/cpython/rev/267d6d032652 changeset: 79754:267d6d032652 parent: 79752:cf39cb2b5009 parent: 79753:1280b38fe583 user: Nick Coghlan date: Tue Oct 16 23:14:38 2012 +1000 summary: Merge concurrent.futures dict comp tweak from 3.3 files: Doc/library/concurrent.futures.rst | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -144,11 +144,9 @@ # We can use a with statement to ensure threads are cleaned up promptly with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: # Start the load operations and mark each future with its URL - load_urls = [executor.submit(load_url, url, 60) for url in URLS] - for future, url in zip(load_urls, URLS): - future.url = url - for future in concurrent.futures.as_completed(load_urls): - url = future.url + future_to_url = {executor.submit(load_url, url, 60):url for url in URLS} + for future in concurrent.futures.as_completed(future_to_url): + url = future_to_url[url] try: data = future.result() except Exception as exc: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 15:43:20 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 15:43:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1ODE5?= =?utf-8?q?=3A_additional_fixes_for_out-of-tree_builds_from_read-only_src?= =?utf-8?q?=2E?= Message-ID: <3XgyQc6QpYzR9W@mail.python.org> http://hg.python.org/cpython/rev/e0a2b14a3cf9 changeset: 79755:e0a2b14a3cf9 branch: 2.7 parent: 79738:c1f27cf0cc9d user: Trent Nelson date: Tue Oct 16 09:42:45 2012 -0400 summary: Issue #15819: additional fixes for out-of-tree builds from read-only src. Unlike 3.2, 3.3 and 3.x, which add "-IObjects -IPython -IInclude" to BASECPPFLAGS when building out-of-tree, 2.7 only needs to add -IInclude (for Python-ast.h and graminit.h). files: Makefile.pre.in | 1 + configure | 18 ++++++++++++++++++ configure.ac | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,6 +27,7 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ +BUILDDIR= @BUILDDIR@ CC= @CC@ CXX= @CXX@ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -648,6 +648,8 @@ HGBRANCH HGTAG HGVERSION +BASECPPFLAGS +BUILDDIR SVNVERSION ARFLAGS AR @@ -5175,6 +5177,22 @@ SVNVERSION="echo Unversioned directory" fi +BUILDDIR="`pwd`" + + +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree make sure Include (in the current dir) + # gets picked up before its $srcdir counterpart in order for Python-ast.h + # and graminit.h to get picked up from the correct directory. + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IInclude" +else + BASECPPFLAGS="" +fi + diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -854,6 +854,22 @@ SVNVERSION="echo Unversioned directory" fi +BUILDDIR="`pwd`" +AC_SUBST(BUILDDIR) +AC_SUBST(BASECPPFLAGS) +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree make sure Include (in the current dir) + # gets picked up before its $srcdir counterpart in order for Python-ast.h + # and graminit.h to get picked up from the correct directory. + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IInclude" +else + BASECPPFLAGS="" +fi + AC_SUBST(HGVERSION) AC_SUBST(HGTAG) AC_SUBST(HGBRANCH) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 15:52:06 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 16 Oct 2012 15:52:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_only_run_docte?= =?utf-8?q?sts_when_=5F=5Fdoc=5F=5F_is_around?= Message-ID: <3Xgyck6jhlzLwb@mail.python.org> http://hg.python.org/cpython/rev/a7d8c28280c0 changeset: 79756:a7d8c28280c0 branch: 2.7 parent: 79738:c1f27cf0cc9d user: Benjamin Peterson date: Tue Oct 16 09:51:46 2012 -0400 summary: only run doctests when __doc__ is around files: Lib/test/test_cookie.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py --- a/Lib/test/test_cookie.py +++ b/Lib/test/test_cookie.py @@ -90,9 +90,10 @@ def test_main(): run_unittest(CookieTests) - with check_warnings(('.+Cookie class is insecure; do not use it', - DeprecationWarning)): - run_doctest(Cookie) + if Cookie.__doc__ is not None: + with check_warnings(('.+Cookie class is insecure; do not use it', + DeprecationWarning)): + run_doctest(Cookie) if __name__ == '__main__': test_main() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 15:52:08 2012 From: python-checkins at python.org (benjamin.peterson) Date: Tue, 16 Oct 2012 15:52:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?= =?utf-8?q?_merge_heads?= Message-ID: <3Xgycm24GnzR8Y@mail.python.org> http://hg.python.org/cpython/rev/ad0efab568ec changeset: 79757:ad0efab568ec branch: 2.7 parent: 79756:a7d8c28280c0 parent: 79755:e0a2b14a3cf9 user: Benjamin Peterson date: Tue Oct 16 09:52:02 2012 -0400 summary: merge heads files: Makefile.pre.in | 1 + configure | 18 ++++++++++++++++++ configure.ac | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,6 +27,7 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ +BUILDDIR= @BUILDDIR@ CC= @CC@ CXX= @CXX@ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -648,6 +648,8 @@ HGBRANCH HGTAG HGVERSION +BASECPPFLAGS +BUILDDIR SVNVERSION ARFLAGS AR @@ -5175,6 +5177,22 @@ SVNVERSION="echo Unversioned directory" fi +BUILDDIR="`pwd`" + + +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree make sure Include (in the current dir) + # gets picked up before its $srcdir counterpart in order for Python-ast.h + # and graminit.h to get picked up from the correct directory. + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IInclude" +else + BASECPPFLAGS="" +fi + diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -854,6 +854,22 @@ SVNVERSION="echo Unversioned directory" fi +BUILDDIR="`pwd`" +AC_SUBST(BUILDDIR) +AC_SUBST(BASECPPFLAGS) +if test "$srcdir" != "$BUILDDIR"; then + # If we're building out-of-tree make sure Include (in the current dir) + # gets picked up before its $srcdir counterpart in order for Python-ast.h + # and graminit.h to get picked up from the correct directory. + # (A side effect of this is that these resources will automatically be + # regenerated when building out-of-tree, regardless of whether or not + # the $srcdir counterpart is up-to-date. This is an acceptable trade + # off.) + BASECPPFLAGS="-IInclude" +else + BASECPPFLAGS="" +fi + AC_SUBST(HGVERSION) AC_SUBST(HGTAG) AC_SUBST(HGBRANCH) -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Tue Oct 16 16:35:25 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Tue, 16 Oct 2012 07:35:25 -0700 Subject: [Python-checkins] cpython (3.3): Tweak the threaded example in concurrent.futures In-Reply-To: <3XgxGd4q4yzR5q@mail.python.org> References: <3XgxGd4q4yzR5q@mail.python.org> Message-ID: On Tue, Oct 16, 2012 at 5:51 AM, nick.coghlan wrote: > http://hg.python.org/cpython/rev/a3f27289ec68 > changeset: 79746:a3f27289ec68 > branch: 3.3 > + except Exception as exc: > + print('%r generated an exception: %s' % (url, exc)) > else: > - print('%r page is %d bytes' % (url, len(future.result()))) > + print('%r page is %d bytes' % (url, len(data))) I'm not suggesting this particular example be changed, but going forward should we prefer the newer str.format() approach to formatting? http://docs.python.org/dev/library/stdtypes.html#printf-style-string-formatting I've also seen references in the docs to the "old %-style formatting," but maybe old is meant more in the sense of having been around longer than discouraged. --Chris From python-checkins at python.org Tue Oct 16 17:11:26 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 17:11:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1ODE5?= =?utf-8?q?=3A_tweak_logic_in_previous_commit_=28e0a2b14a3cf9=29=2E?= Message-ID: <3Xh0NG2fXxzR7M@mail.python.org> http://hg.python.org/cpython/rev/c35db4960d1c changeset: 79758:c35db4960d1c branch: 2.7 parent: 79755:e0a2b14a3cf9 user: Trent Nelson date: Tue Oct 16 10:52:35 2012 -0400 summary: Issue #15819: tweak logic in previous commit (e0a2b14a3cf9). files: configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -5180,7 +5180,7 @@ BUILDDIR="`pwd`" -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree make sure Include (in the current dir) # gets picked up before its $srcdir counterpart in order for Python-ast.h # and graminit.h to get picked up from the correct directory. diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -857,7 +857,7 @@ BUILDDIR="`pwd`" AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree make sure Include (in the current dir) # gets picked up before its $srcdir counterpart in order for Python-ast.h # and graminit.h to get picked up from the correct directory. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 17:11:27 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 17:11:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODE5?= =?utf-8?q?=3A_tweak_logic_in_previous_commit_=28617591e7d708=29=2E?= Message-ID: <3Xh0NH5378zR98@mail.python.org> http://hg.python.org/cpython/rev/5707c8a36cc0 changeset: 79759:5707c8a36cc0 branch: 3.2 parent: 79748:617591e7d708 user: Trent Nelson date: Tue Oct 16 11:04:04 2012 -0400 summary: Issue #15819: tweak logic in previous commit (617591e7d708). files: configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -5210,7 +5210,7 @@ BUILDDIR="`pwd`" -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -833,7 +833,7 @@ BUILDDIR="`pwd`" AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 17:11:29 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 17:11:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2315819=3A_tweak_logic_in_previous_commit=2E?= Message-ID: <3Xh0NK0P5LzR8w@mail.python.org> http://hg.python.org/cpython/rev/85863c4a93db changeset: 79760:85863c4a93db branch: 3.3 parent: 79753:1280b38fe583 parent: 79759:5707c8a36cc0 user: Trent Nelson date: Tue Oct 16 11:07:31 2012 -0400 summary: Merge issue #15819: tweak logic in previous commit. files: configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -2724,7 +2724,7 @@ BUILDDIR="`pwd`" -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ BUILDDIR="`pwd`" AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 17:11:30 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 17:11:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315819=3A_tweak_logic_in_previous_commit?= =?utf-8?q?=2E?= Message-ID: <3Xh0NL2td3zR8w@mail.python.org> http://hg.python.org/cpython/rev/d282018bff10 changeset: 79761:d282018bff10 parent: 79754:267d6d032652 parent: 79760:85863c4a93db user: Trent Nelson date: Tue Oct 16 11:09:31 2012 -0400 summary: Merge issue #15819: tweak logic in previous commit. files: configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -2724,7 +2724,7 @@ BUILDDIR="`pwd`" -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ BUILDDIR="`pwd`" AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 17:11:31 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 17:11:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?= =?utf-8?q?_Merge_heads=2E?= Message-ID: <3Xh0NM57KkzR8p@mail.python.org> http://hg.python.org/cpython/rev/66ac8951fa86 changeset: 79762:66ac8951fa86 branch: 2.7 parent: 79758:c35db4960d1c parent: 79757:ad0efab568ec user: Trent Nelson date: Tue Oct 16 11:10:40 2012 -0400 summary: Merge heads. files: Lib/test/test_cookie.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py --- a/Lib/test/test_cookie.py +++ b/Lib/test/test_cookie.py @@ -90,9 +90,10 @@ def test_main(): run_unittest(CookieTests) - with check_warnings(('.+Cookie class is insecure; do not use it', - DeprecationWarning)): - run_doctest(Cookie) + if Cookie.__doc__ is not None: + with check_warnings(('.+Cookie class is insecure; do not use it', + DeprecationWarning)): + run_doctest(Cookie) if __name__ == '__main__': test_main() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 17:52:06 2012 From: python-checkins at python.org (trent.nelson) Date: Tue, 16 Oct 2012 17:52:06 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Bump_autoconf_from_2=2E68_?= =?utf-8?q?to_2=2E69=2E?= Message-ID: <3Xh1HB0QR6zR2f@mail.python.org> http://hg.python.org/cpython/rev/74b95194ba86 changeset: 79763:74b95194ba86 parent: 79761:d282018bff10 user: Trent Nelson date: Tue Oct 16 11:51:08 2012 -0400 summary: Bump autoconf from 2.68 to 2.69. files: configure | 289 ++++++++++++++++++++++------------------- 1 files changed, 152 insertions(+), 137 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for python 3.4. +# Generated by GNU Autoconf 2.69 for python 3.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1251,8 +1271,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1542,9 +1560,9 @@ if $ac_init_version; then cat <<\_ACEOF python configure 3.4 -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1620,7 +1638,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1918,7 +1936,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1972,7 +1991,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1988,7 +2008,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2038,7 +2059,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2054,7 +2076,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2080,7 +2103,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2096,7 +2120,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2130,7 +2155,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2373,7 +2399,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by python $as_me 3.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2761,7 +2787,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAS_HG="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3550,7 +3576,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3590,7 +3616,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3643,7 +3669,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3684,7 +3710,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3742,7 +3768,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3786,7 +3812,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4232,8 +4258,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4373,7 +4398,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4416,7 +4441,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4471,7 +4496,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4514,7 +4539,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4569,7 +4594,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4612,7 +4637,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4675,7 +4700,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4719,7 +4744,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4962,7 +4987,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5028,7 +5053,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5235,8 +5260,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5632,7 +5657,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5672,7 +5697,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5727,7 +5752,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5771,7 +5796,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5835,7 +5860,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5879,7 +5904,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_READELF="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5943,7 +5968,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAS_PYTHON="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6016,7 +6041,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -6085,7 +6110,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -8980,7 +9005,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9023,7 +9048,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10630,7 +10655,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TRUE="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12067,7 +12092,8 @@ main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -12098,11 +12124,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -12119,8 +12145,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -12136,10 +12163,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -15471,16 +15498,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -15540,28 +15567,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -15583,7 +15598,7 @@ # values after options handling. ac_log=" This file was extended by python $as_me 3.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15645,10 +15660,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ python config.status 3.4 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15738,7 +15753,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 20:51:24 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 16 Oct 2012 20:51:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogRml4IHR5cG8u?= Message-ID: <3Xh5G40ck2zQv4@mail.python.org> http://hg.python.org/cpython/rev/021048641f39 changeset: 79764:021048641f39 branch: 3.3 parent: 79760:85863c4a93db user: Ezio Melotti date: Tue Oct 16 21:50:33 2012 +0300 summary: Fix typo. files: Doc/whatsnew/3.3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -112,7 +112,7 @@ This PEP adds the :mod:`venv` module for programmatic access, and the :ref:`pyvenv ` script for command-line access and -administration. The Python interpreter checks for a ``pvenv.cfg``, +administration. The Python interpreter checks for a ``pyvenv.cfg``, file whose existence signals the base of a virtual environment's directory tree. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 20:51:25 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 16 Oct 2012 20:51:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_typo_fix=2E?= Message-ID: <3Xh5G52yRZzQv4@mail.python.org> http://hg.python.org/cpython/rev/f0258a588134 changeset: 79765:f0258a588134 parent: 79763:74b95194ba86 parent: 79764:021048641f39 user: Ezio Melotti date: Tue Oct 16 21:51:06 2012 +0300 summary: Merge typo fix. files: Doc/whatsnew/3.3.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -112,7 +112,7 @@ This PEP adds the :mod:`venv` module for programmatic access, and the :ref:`pyvenv ` script for command-line access and -administration. The Python interpreter checks for a ``pvenv.cfg``, +administration. The Python interpreter checks for a ``pyvenv.cfg``, file whose existence signals the base of a virtual environment's directory tree. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 21:09:18 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 21:09:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315958=3A_bytes=2E?= =?utf-8?q?join_and_bytearray=2Ejoin_now_accept_arbitrary_buffer_objects?= =?utf-8?q?=2E?= Message-ID: <3Xh5fk2Vd6zR59@mail.python.org> http://hg.python.org/cpython/rev/16285c1b4dda changeset: 79766:16285c1b4dda user: Antoine Pitrou date: Tue Oct 16 21:07:23 2012 +0200 summary: Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer objects. files: Lib/test/test_bytes.py | 23 ++++- Misc/NEWS | 3 + Objects/bytearrayobject.c | 70 +-------------- Objects/bytesobject.c | 105 +++------------------- Objects/stringlib/join.h | 122 ++++++++++++++++++++++++++ 5 files changed, 165 insertions(+), 158 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -288,8 +288,22 @@ self.assertEqual(self.type2test(b"").join(lst), b"abc") self.assertEqual(self.type2test(b"").join(tuple(lst)), b"abc") self.assertEqual(self.type2test(b"").join(iter(lst)), b"abc") - self.assertEqual(self.type2test(b".").join([b"ab", b"cd"]), b"ab.cd") - # XXX more... + dot_join = self.type2test(b".:").join + self.assertEqual(dot_join([b"ab", b"cd"]), b"ab.:cd") + self.assertEqual(dot_join([memoryview(b"ab"), b"cd"]), b"ab.:cd") + self.assertEqual(dot_join([b"ab", memoryview(b"cd")]), b"ab.:cd") + self.assertEqual(dot_join([bytearray(b"ab"), b"cd"]), b"ab.:cd") + self.assertEqual(dot_join([b"ab", bytearray(b"cd")]), b"ab.:cd") + # Stress it with many items + seq = [b"abc"] * 1000 + expected = b"abc" + b".:abc" * 999 + self.assertEqual(dot_join(seq), expected) + # Error handling and cleanup when some item in the middle of the + # sequence has the wrong type. + with self.assertRaises(TypeError): + dot_join([bytearray(b"ab"), "cd", b"ef"]) + with self.assertRaises(TypeError): + dot_join([memoryview(b"ab"), "cd", b"ef"]) def test_count(self): b = self.type2test(b'mississippi') @@ -1249,6 +1263,11 @@ self.assertEqual(val, newval) self.assertTrue(val is not newval, expr+' returned val on a mutable object') + sep = self.marshal(b'') + newval = sep.join([val]) + self.assertEqual(val, newval) + self.assertIsNot(val, newval) + class FixedStringTest(test.string_tests.BaseTest): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer + objects. + - Issue #14783: Improve int() docstring and switch docstrings for str(), range(), and slice() to use multi-line signatures. diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1032,6 +1032,7 @@ #define FASTSEARCH fastsearch #define STRINGLIB(F) stringlib_##F #define STRINGLIB_CHAR char +#define STRINGLIB_SIZEOF_CHAR 1 #define STRINGLIB_LEN PyByteArray_GET_SIZE #define STRINGLIB_STR PyByteArray_AS_STRING #define STRINGLIB_NEW PyByteArray_FromStringAndSize @@ -1043,6 +1044,7 @@ #include "stringlib/fastsearch.h" #include "stringlib/count.h" #include "stringlib/find.h" +#include "stringlib/join.h" #include "stringlib/partition.h" #include "stringlib/split.h" #include "stringlib/ctype.h" @@ -2569,73 +2571,9 @@ in between each pair, and return the result as a new bytearray."); static PyObject * -bytearray_join(PyByteArrayObject *self, PyObject *it) +bytearray_join(PyObject *self, PyObject *iterable) { - PyObject *seq; - Py_ssize_t mysize = Py_SIZE(self); - Py_ssize_t i; - Py_ssize_t n; - PyObject **items; - Py_ssize_t totalsize = 0; - PyObject *result; - char *dest; - - seq = PySequence_Fast(it, "can only join an iterable"); - if (seq == NULL) - return NULL; - n = PySequence_Fast_GET_SIZE(seq); - items = PySequence_Fast_ITEMS(seq); - - /* Compute the total size, and check that they are all bytes */ - /* XXX Shouldn't we use _getbuffer() on these items instead? */ - for (i = 0; i < n; i++) { - PyObject *obj = items[i]; - if (!PyByteArray_Check(obj) && !PyBytes_Check(obj)) { - PyErr_Format(PyExc_TypeError, - "can only join an iterable of bytes " - "(item %ld has type '%.100s')", - /* XXX %ld isn't right on Win64 */ - (long)i, Py_TYPE(obj)->tp_name); - goto error; - } - if (i > 0) - totalsize += mysize; - totalsize += Py_SIZE(obj); - if (totalsize < 0) { - PyErr_NoMemory(); - goto error; - } - } - - /* Allocate the result, and copy the bytes */ - result = PyByteArray_FromStringAndSize(NULL, totalsize); - if (result == NULL) - goto error; - dest = PyByteArray_AS_STRING(result); - for (i = 0; i < n; i++) { - PyObject *obj = items[i]; - Py_ssize_t size = Py_SIZE(obj); - char *buf; - if (PyByteArray_Check(obj)) - buf = PyByteArray_AS_STRING(obj); - else - buf = PyBytes_AS_STRING(obj); - if (i) { - memcpy(dest, self->ob_bytes, mysize); - dest += mysize; - } - memcpy(dest, buf, size); - dest += size; - } - - /* Done */ - Py_DECREF(seq); - return result; - - /* Error handling */ - error: - Py_DECREF(seq); - return NULL; + return stringlib_bytes_join(self, iterable); } PyDoc_STRVAR(splitlines__doc__, diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -10,9 +10,18 @@ static Py_ssize_t _getbuffer(PyObject *obj, Py_buffer *view) { - PyBufferProcs *buffer = Py_TYPE(obj)->tp_as_buffer; + PyBufferProcs *bufferprocs; + if (PyBytes_CheckExact(obj)) { + /* Fast path, e.g. for .join() of many bytes objects */ + Py_INCREF(obj); + view->obj = obj; + view->buf = PyBytes_AS_STRING(obj); + view->len = PyBytes_GET_SIZE(obj); + return view->len; + } - if (buffer == NULL || buffer->bf_getbuffer == NULL) + bufferprocs = Py_TYPE(obj)->tp_as_buffer; + if (bufferprocs == NULL || bufferprocs->bf_getbuffer == NULL) { PyErr_Format(PyExc_TypeError, "Type %.100s doesn't support the buffer API", @@ -20,7 +29,7 @@ return -1; } - if (buffer->bf_getbuffer(obj, view, PyBUF_SIMPLE) < 0) + if (bufferprocs->bf_getbuffer(obj, view, PyBUF_SIMPLE) < 0) return -1; return view->len; } @@ -555,6 +564,7 @@ #include "stringlib/fastsearch.h" #include "stringlib/count.h" #include "stringlib/find.h" +#include "stringlib/join.h" #include "stringlib/partition.h" #include "stringlib/split.h" #include "stringlib/ctype.h" @@ -1107,94 +1117,9 @@ Example: b'.'.join([b'ab', b'pq', b'rs']) -> b'ab.pq.rs'."); static PyObject * -bytes_join(PyObject *self, PyObject *orig) +bytes_join(PyObject *self, PyObject *iterable) { - char *sep = PyBytes_AS_STRING(self); - const Py_ssize_t seplen = PyBytes_GET_SIZE(self); - PyObject *res = NULL; - char *p; - Py_ssize_t seqlen = 0; - size_t sz = 0; - Py_ssize_t i; - PyObject *seq, *item; - - seq = PySequence_Fast(orig, ""); - if (seq == NULL) { - return NULL; - } - - seqlen = PySequence_Size(seq); - if (seqlen == 0) { - Py_DECREF(seq); - return PyBytes_FromString(""); - } - if (seqlen == 1) { - item = PySequence_Fast_GET_ITEM(seq, 0); - if (PyBytes_CheckExact(item)) { - Py_INCREF(item); - Py_DECREF(seq); - return item; - } - } - - /* There are at least two things to join, or else we have a subclass - * of the builtin types in the sequence. - * Do a pre-pass to figure out the total amount of space we'll - * need (sz), and see whether all argument are bytes. - */ - /* XXX Shouldn't we use _getbuffer() on these items instead? */ - for (i = 0; i < seqlen; i++) { - const size_t old_sz = sz; - item = PySequence_Fast_GET_ITEM(seq, i); - if (!PyBytes_Check(item) && !PyByteArray_Check(item)) { - PyErr_Format(PyExc_TypeError, - "sequence item %zd: expected bytes," - " %.80s found", - i, Py_TYPE(item)->tp_name); - Py_DECREF(seq); - return NULL; - } - sz += Py_SIZE(item); - if (i != 0) - sz += seplen; - if (sz < old_sz || sz > PY_SSIZE_T_MAX) { - PyErr_SetString(PyExc_OverflowError, - "join() result is too long for bytes"); - Py_DECREF(seq); - return NULL; - } - } - - /* Allocate result space. */ - res = PyBytes_FromStringAndSize((char*)NULL, sz); - if (res == NULL) { - Py_DECREF(seq); - return NULL; - } - - /* Catenate everything. */ - /* I'm not worried about a PyByteArray item growing because there's - nowhere in this function where we release the GIL. */ - p = PyBytes_AS_STRING(res); - for (i = 0; i < seqlen; ++i) { - size_t n; - char *q; - if (i) { - Py_MEMCPY(p, sep, seplen); - p += seplen; - } - item = PySequence_Fast_GET_ITEM(seq, i); - n = Py_SIZE(item); - if (PyBytes_Check(item)) - q = PyBytes_AS_STRING(item); - else - q = PyByteArray_AS_STRING(item); - Py_MEMCPY(p, q, n); - p += n; - } - - Py_DECREF(seq); - return res; + return stringlib_bytes_join(self, iterable); } PyObject * diff --git a/Objects/stringlib/join.h b/Objects/stringlib/join.h new file mode 100644 --- /dev/null +++ b/Objects/stringlib/join.h @@ -0,0 +1,122 @@ +/* stringlib: bytes joining implementation */ + +#if STRINGLIB_SIZEOF_CHAR != 1 +#error join.h only compatible with byte-wise strings +#endif + +Py_LOCAL_INLINE(PyObject *) +STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable) +{ + char *sepstr = STRINGLIB_STR(sep); + const Py_ssize_t seplen = STRINGLIB_LEN(sep); + PyObject *res = NULL; + char *p; + Py_ssize_t seqlen = 0; + Py_ssize_t sz = 0; + Py_ssize_t i, nbufs; + PyObject *seq, *item; + Py_buffer *buffers = NULL; +#define NB_STATIC_BUFFERS 10 + Py_buffer static_buffers[NB_STATIC_BUFFERS]; + + seq = PySequence_Fast(iterable, "can only join an iterable"); + if (seq == NULL) { + return NULL; + } + + seqlen = PySequence_Fast_GET_SIZE(seq); + if (seqlen == 0) { + Py_DECREF(seq); + return STRINGLIB_NEW(NULL, 0); + } +#ifndef STRINGLIB_MUTABLE + if (seqlen == 1) { + item = PySequence_Fast_GET_ITEM(seq, 0); + if (STRINGLIB_CHECK_EXACT(item)) { + Py_INCREF(item); + Py_DECREF(seq); + return item; + } + } +#endif + if (seqlen > NB_STATIC_BUFFERS) { + buffers = PyMem_NEW(Py_buffer, seqlen); + if (buffers == NULL) { + Py_DECREF(seq); + return NULL; + } + } + else { + buffers = static_buffers; + } + + /* Here is the general case. Do a pre-pass to figure out the total + * amount of space we'll need (sz), and see whether all arguments are + * buffer-compatible. + */ + for (i = 0, nbufs = 0; i < seqlen; i++) { + Py_ssize_t itemlen; + item = PySequence_Fast_GET_ITEM(seq, i); + if (_getbuffer(item, &buffers[i]) < 0) { + PyErr_Format(PyExc_TypeError, + "sequence item %zd: expected bytes, bytearray, " + "or an object with the buffer interface, %.80s found", + i, Py_TYPE(item)->tp_name); + goto error; + } + nbufs = i + 1; /* for error cleanup */ + itemlen = buffers[i].len; + if (itemlen > PY_SSIZE_T_MAX - sz) { + PyErr_SetString(PyExc_OverflowError, + "join() result is too long"); + goto error; + } + sz += itemlen; + if (i != 0) { + if (seplen > PY_SSIZE_T_MAX - sz) { + PyErr_SetString(PyExc_OverflowError, + "join() result is too long"); + goto error; + } + sz += seplen; + } + if (seqlen != PySequence_Fast_GET_SIZE(seq)) { + PyErr_SetString(PyExc_RuntimeError, + "sequence changed size during iteration"); + goto error; + } + } + + /* Allocate result space. */ + res = STRINGLIB_NEW(NULL, sz); + if (res == NULL) + goto error; + + /* Catenate everything. */ + p = STRINGLIB_STR(res); + for (i = 0; i < nbufs; i++) { + Py_ssize_t n; + char *q; + if (i) { + Py_MEMCPY(p, sepstr, seplen); + p += seplen; + } + n = buffers[i].len; + q = buffers[i].buf; + Py_MEMCPY(p, q, n); + p += n; + } + goto done; + +error: + res = NULL; +done: + Py_DECREF(seq); + for (i = 0; i < nbufs; i++) + PyBuffer_Release(&buffers[i]); + if (buffers != static_buffers) + PyMem_FREE(buffers); + return res; +} + +#undef NB_STATIC_BUFFERS -- Repository URL: http://hg.python.org/cpython From tjreedy at udel.edu Tue Oct 16 20:25:31 2012 From: tjreedy at udel.edu (Terry Reedy) Date: Tue, 16 Oct 2012 14:25:31 -0400 Subject: [Python-checkins] cpython (merge 3.3 -> default): Merge issue #15936: Add link from os.urandom to random.SystemRandom In-Reply-To: References: <3XgsqD0X10zR5R@mail.python.org> Message-ID: <507DA69B.8000003@udel.edu> On 10/16/2012 6:28 AM, Andrew Svetlov wrote: > I dont feel anything wrong with it, but I'm also not native speaker. > > On Tue, Oct 16, 2012 at 1:23 PM, Hynek Schlawack wrote: >> Am 16.10.2012 um 12:15 schrieb andrew.svetlov : >> >>> + For easy to use interface to system randomness please see >>> + :class:`random.SystemRandom`. >> >> Is it just my non-native speaker ears, or should there be an ?an? before ?easy?? Yes, definitely. From python-checkins at python.org Tue Oct 16 21:50:43 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 16 Oct 2012 21:50:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Reformat_=5Ftkinter_code_t?= =?utf-8?q?o_follow_PEP7?= Message-ID: <3Xh6ZW1jVszQqT@mail.python.org> http://hg.python.org/cpython/rev/4c0d38670f41 changeset: 79767:4c0d38670f41 user: Andrew Svetlov date: Tue Oct 16 22:50:34 2012 +0300 summary: Reformat _tkinter code to follow PEP7 files: Modules/_tkinter.c | 128 ++++++++++++++++++-------------- 1 files changed, 72 insertions(+), 56 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -125,52 +125,60 @@ /* The threading situation is complicated. Tcl is not thread-safe, except when configured with --enable-threads. - So we need to use a lock around all uses of Tcl. Previously, the Python - interpreter lock was used for this. However, this causes problems when - other Python threads need to run while Tcl is blocked waiting for events. - - To solve this problem, a separate lock for Tcl is introduced. Holding it - is incompatible with holding Python's interpreter lock. The following four - macros manipulate both locks together. - - ENTER_TCL and LEAVE_TCL are brackets, just like Py_BEGIN_ALLOW_THREADS and - Py_END_ALLOW_THREADS. They should be used whenever a call into Tcl is made - that could call an event handler, or otherwise affect the state of a Tcl - interpreter. These assume that the surrounding code has the Python - interpreter lock; inside the brackets, the Python interpreter lock has been - released and the lock for Tcl has been acquired. - - Sometimes, it is necessary to have both the Python lock and the Tcl lock. - (For example, when transferring data from the Tcl interpreter result to a - Python string object.) This can be done by using different macros to close - the ENTER_TCL block: ENTER_OVERLAP reacquires the Python lock (and restores - the thread state) but doesn't release the Tcl lock; LEAVE_OVERLAP_TCL - releases the Tcl lock. + + So we need to use a lock around all uses of Tcl. Previously, the + Python interpreter lock was used for this. However, this causes + problems when other Python threads need to run while Tcl is blocked + waiting for events. + + To solve this problem, a separate lock for Tcl is introduced. + Holding it is incompatible with holding Python's interpreter lock. + The following four macros manipulate both locks together. + + ENTER_TCL and LEAVE_TCL are brackets, just like + Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS. They should be + used whenever a call into Tcl is made that could call an event + handler, or otherwise affect the state of a Tcl interpreter. These + assume that the surrounding code has the Python interpreter lock; + inside the brackets, the Python interpreter lock has been released + and the lock for Tcl has been acquired. + + Sometimes, it is necessary to have both the Python lock and the Tcl + lock. (For example, when transferring data from the Tcl + interpreter result to a Python string object.) This can be done by + using different macros to close the ENTER_TCL block: ENTER_OVERLAP + reacquires the Python lock (and restores the thread state) but + doesn't release the Tcl lock; LEAVE_OVERLAP_TCL releases the Tcl + lock. By contrast, ENTER_PYTHON and LEAVE_PYTHON are used in Tcl event - handlers when the handler needs to use Python. Such event handlers are - entered while the lock for Tcl is held; the event handler presumably needs - to use Python. ENTER_PYTHON releases the lock for Tcl and acquires - the Python interpreter lock, restoring the appropriate thread state, and - LEAVE_PYTHON releases the Python interpreter lock and re-acquires the lock - for Tcl. It is okay for ENTER_TCL/LEAVE_TCL pairs to be contained inside - the code between ENTER_PYTHON and LEAVE_PYTHON. - - These locks expand to several statements and brackets; they should not be - used in branches of if statements and the like. - - If Tcl is threaded, this approach won't work anymore. The Tcl interpreter is - only valid in the thread that created it, and all Tk activity must happen in this - thread, also. That means that the mainloop must be invoked in the thread that - created the interpreter. Invoking commands from other threads is possible; - _tkinter will queue an event for the interpreter thread, which will then - execute the command and pass back the result. If the main thread is not in the - mainloop, and invoking commands causes an exception; if the main loop is running - but not processing events, the command invocation will block. - - In addition, for a threaded Tcl, a single global tcl_tstate won't be sufficient - anymore, since multiple Tcl interpreters may simultaneously dispatch in different - threads. So we use the Tcl TLS API. + handlers when the handler needs to use Python. Such event handlers + are entered while the lock for Tcl is held; the event handler + presumably needs to use Python. ENTER_PYTHON releases the lock for + Tcl and acquires the Python interpreter lock, restoring the + appropriate thread state, and LEAVE_PYTHON releases the Python + interpreter lock and re-acquires the lock for Tcl. It is okay for + ENTER_TCL/LEAVE_TCL pairs to be contained inside the code between + ENTER_PYTHON and LEAVE_PYTHON. + + These locks expand to several statements and brackets; they should + not be used in branches of if statements and the like. + + If Tcl is threaded, this approach won't work anymore. The Tcl + interpreter is only valid in the thread that created it, and all Tk + activity must happen in this thread, also. That means that the + mainloop must be invoked in the thread that created the + interpreter. Invoking commands from other threads is possible; + _tkinter will queue an event for the interpreter thread, which will + then execute the command and pass back the result. If the main + thread is not in the mainloop, and invoking commands causes an + exception; if the main loop is running but not processing events, + the command invocation will block. + + In addition, for a threaded Tcl, a single global tcl_tstate won't + be sufficient anymore, since multiple Tcl interpreters may + simultaneously dispatch in different threads. So we use the Tcl TLS + API. */ @@ -179,7 +187,8 @@ #ifdef TCL_THREADS static Tcl_ThreadDataKey state_key; typedef PyThreadState *ThreadSpecificData; -#define tcl_tstate (*(PyThreadState**)Tcl_GetThreadData(&state_key, sizeof(PyThreadState*))) +#define tcl_tstate \ + (*(PyThreadState**)Tcl_GetThreadData(&state_key, sizeof(PyThreadState*))) #else static PyThreadState *tcl_tstate = NULL; #endif @@ -189,7 +198,8 @@ if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); tcl_tstate = tstate; #define LEAVE_TCL \ - tcl_tstate = NULL; if(tcl_lock)PyThread_release_lock(tcl_lock); Py_END_ALLOW_THREADS} + tcl_tstate = NULL; \ + if(tcl_lock)PyThread_release_lock(tcl_lock); Py_END_ALLOW_THREADS} #define ENTER_OVERLAP \ Py_END_ALLOW_THREADS @@ -199,7 +209,8 @@ #define ENTER_PYTHON \ { PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; \ - if(tcl_lock)PyThread_release_lock(tcl_lock); PyEval_RestoreThread((tstate)); } + if(tcl_lock) \ + PyThread_release_lock(tcl_lock); PyEval_RestoreThread((tstate)); } #define LEAVE_PYTHON \ { PyThreadState *tstate = PyEval_SaveThread(); \ @@ -208,7 +219,8 @@ #define CHECK_TCL_APPARTMENT \ if (((TkappObject *)self)->threaded && \ ((TkappObject *)self)->thread_id != Tcl_GetCurrentThread()) { \ - PyErr_SetString(PyExc_RuntimeError, "Calling Tcl from different appartment"); \ + PyErr_SetString(PyExc_RuntimeError, \ + "Calling Tcl from different appartment"); \ return 0; \ } @@ -367,9 +379,9 @@ return v; } -/* In some cases, Tcl will still return strings that are supposed to be - lists. SplitObj walks through a nested tuple, finding string objects that - need to be split. */ +/* In some cases, Tcl will still return strings that are supposed to + be lists. SplitObj walks through a nested tuple, finding string + objects that need to be split. */ static PyObject * SplitObj(PyObject *arg) @@ -499,7 +511,8 @@ #ifndef TCL_THREADS if (v->threaded) { - PyErr_SetString(PyExc_RuntimeError, "Tcl is threaded but _tkinter is not"); + PyErr_SetString(PyExc_RuntimeError, + "Tcl is threaded but _tkinter is not"); Py_DECREF(v); return 0; } @@ -1479,7 +1492,8 @@ tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags); ENTER_OVERLAP if (tres == NULL) { - PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self))); + PyErr_SetString(Tkinter_TclError, + Tcl_GetStringResult(Tkapp_Interp(self))); } else { if (((TkappObject*)self)->wantobjects) { res = FromObj(self, tres); @@ -1538,7 +1552,8 @@ static PyObject * Tkapp_GlobalUnsetVar(PyObject *self, PyObject *args) { - return var_invoke(UnsetVar, self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY); + return var_invoke(UnsetVar, self, args, + TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY); } @@ -2407,7 +2422,8 @@ } if (_tk_exists == NULL || strcmp(_tk_exists, "1") != 0) { if (Tk_Init(interp) == TCL_ERROR) { - PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self))); + PyErr_SetString(Tkinter_TclError, + Tcl_GetStringResult(Tkapp_Interp(self))); #ifdef TKINTER_PROTECT_LOADTK tk_load_failed = 1; #endif @@ -2649,7 +2665,7 @@ return NULL; return (PyObject *) Tkapp_New(screenName, className, - interactive, wantobjects, wantTk, + interactive, wantobjects, wantTk, sync, use); } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 23:08:16 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 23:08:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Add_tests_for_?= =?utf-8?q?the_writelines=28=29_method_of_file_objects=2E?= Message-ID: <3Xh8J00bSXzQxT@mail.python.org> http://hg.python.org/cpython/rev/d819a095a397 changeset: 79768:d819a095a397 branch: 3.2 parent: 79759:5707c8a36cc0 user: Antoine Pitrou date: Tue Oct 16 22:57:11 2012 +0200 summary: Add tests for the writelines() method of file objects. Original patch by Felipe Cruz. files: Lib/test/test_fileio.py | 22 ++++++++++++++++++++++ Lib/test/test_io.py | 25 ++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -9,6 +9,7 @@ from functools import wraps from test.support import TESTFN, check_warnings, run_unittest, make_bad_fd +from collections import UserList from _io import FileIO as _FileIO @@ -67,6 +68,27 @@ n = self.f.readinto(a) self.assertEqual(array('b', [1, 2]), a[:n]) + def testWritelinesList(self): + l = [b'123', b'456'] + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesUserList(self): + l = UserList([b'123', b'456']) + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesError(self): + self.assertRaises(TypeError, self.f.writelines, [1, 2, 3]) + self.assertRaises(TypeError, self.f.writelines, None) + self.assertRaises(TypeError, self.f.writelines, "abc") + def test_none_args(self): self.f.write(b"hi\nbye\nabc") self.f.close() diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -32,7 +32,7 @@ import warnings import pickle from itertools import cycle, count -from collections import deque +from collections import deque, UserList from test import support import codecs @@ -1177,6 +1177,29 @@ bufio.flush() self.assertEqual(b"abc", writer._write_stack[0]) + def test_writelines(self): + l = [b'ab', b'cd', b'ef'] + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_userlist(self): + l = UserList([b'ab', b'cd', b'ef']) + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_error(self): + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + self.assertRaises(TypeError, bufio.writelines, [1, 2, 3]) + self.assertRaises(TypeError, bufio.writelines, None) + self.assertRaises(TypeError, bufio.writelines, 'abc') + def test_destructor(self): writer = self.MockRawIO() bufio = self.tp(writer, 8) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 23:08:17 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 23:08:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Also_add_tests?= =?utf-8?q?_for_TextIOWrapper=2Ewritelines=28=29_=28issue_=2315744=29=2E?= Message-ID: <3Xh8J12rg1zR3D@mail.python.org> http://hg.python.org/cpython/rev/4c204a61bd79 changeset: 79769:4c204a61bd79 branch: 3.2 user: Antoine Pitrou date: Tue Oct 16 23:02:27 2012 +0200 summary: Also add tests for TextIOWrapper.writelines() (issue #15744). files: Lib/test/test_io.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -2287,6 +2287,28 @@ reads += c self.assertEqual(reads, "A"*127+"\nB") + def test_writelines(self): + l = ['ab', 'cd', 'ef'] + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_userlist(self): + l = UserList(['ab', 'cd', 'ef']) + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_error(self): + txt = self.TextIOWrapper(self.BytesIO()) + self.assertRaises(TypeError, txt.writelines, [1, 2, 3]) + self.assertRaises(TypeError, txt.writelines, None) + self.assertRaises(TypeError, txt.writelines, b'abc') + def test_issue1395_1(self): txt = self.TextIOWrapper(self.BytesIO(self.testdata), encoding="ascii") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 23:08:18 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 23:08:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_for_issue_=2315744=3A_add_tests_for_the_writelines=28=29?= =?utf-8?q?_method_of_file_objects=2E?= Message-ID: <3Xh8J26BVwzR45@mail.python.org> http://hg.python.org/cpython/rev/2efcaec45697 changeset: 79770:2efcaec45697 branch: 3.3 parent: 79764:021048641f39 parent: 79769:4c204a61bd79 user: Antoine Pitrou date: Tue Oct 16 23:05:01 2012 +0200 summary: Merge for issue #15744: add tests for the writelines() method of file objects. files: Lib/test/test_fileio.py | 22 +++++++++++++ Lib/test/test_io.py | 47 ++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -10,6 +10,7 @@ from functools import wraps from test.support import TESTFN, check_warnings, run_unittest, make_bad_fd +from collections import UserList from _io import FileIO as _FileIO @@ -68,6 +69,27 @@ n = self.f.readinto(a) self.assertEqual(array('b', [1, 2]), a[:n]) + def testWritelinesList(self): + l = [b'123', b'456'] + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesUserList(self): + l = UserList([b'123', b'456']) + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesError(self): + self.assertRaises(TypeError, self.f.writelines, [1, 2, 3]) + self.assertRaises(TypeError, self.f.writelines, None) + self.assertRaises(TypeError, self.f.writelines, "abc") + def test_none_args(self): self.f.write(b"hi\nbye\nabc") self.f.close() diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -32,7 +32,7 @@ import unittest import warnings import weakref -from collections import deque +from collections import deque, UserList from itertools import cycle, count from test import support @@ -1193,6 +1193,29 @@ bufio.flush() self.assertEqual(b"abc", writer._write_stack[0]) + def test_writelines(self): + l = [b'ab', b'cd', b'ef'] + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_userlist(self): + l = UserList([b'ab', b'cd', b'ef']) + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_error(self): + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + self.assertRaises(TypeError, bufio.writelines, [1, 2, 3]) + self.assertRaises(TypeError, bufio.writelines, None) + self.assertRaises(TypeError, bufio.writelines, 'abc') + def test_destructor(self): writer = self.MockRawIO() bufio = self.tp(writer, 8) @@ -2296,6 +2319,28 @@ reads += c self.assertEqual(reads, "A"*127+"\nB") + def test_writelines(self): + l = ['ab', 'cd', 'ef'] + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_userlist(self): + l = UserList(['ab', 'cd', 'ef']) + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_error(self): + txt = self.TextIOWrapper(self.BytesIO()) + self.assertRaises(TypeError, txt.writelines, [1, 2, 3]) + self.assertRaises(TypeError, txt.writelines, None) + self.assertRaises(TypeError, txt.writelines, b'abc') + def test_issue1395_1(self): txt = self.TextIOWrapper(self.BytesIO(self.testdata), encoding="ascii") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 23:08:20 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 23:08:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_for_issue_=2315744=3A_add_tests_for_the_writelines?= =?utf-8?q?=28=29_method_of_file_objects=2E?= Message-ID: <3Xh8J42dd4zQyg@mail.python.org> http://hg.python.org/cpython/rev/e526d67016f0 changeset: 79771:e526d67016f0 parent: 79767:4c0d38670f41 parent: 79770:2efcaec45697 user: Antoine Pitrou date: Tue Oct 16 23:06:17 2012 +0200 summary: Merge for issue #15744: add tests for the writelines() method of file objects. files: Lib/test/test_fileio.py | 22 +++++++++++++ Lib/test/test_io.py | 47 ++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -10,6 +10,7 @@ from functools import wraps from test.support import TESTFN, check_warnings, run_unittest, make_bad_fd +from collections import UserList from _io import FileIO as _FileIO @@ -68,6 +69,27 @@ n = self.f.readinto(a) self.assertEqual(array('b', [1, 2]), a[:n]) + def testWritelinesList(self): + l = [b'123', b'456'] + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesUserList(self): + l = UserList([b'123', b'456']) + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesError(self): + self.assertRaises(TypeError, self.f.writelines, [1, 2, 3]) + self.assertRaises(TypeError, self.f.writelines, None) + self.assertRaises(TypeError, self.f.writelines, "abc") + def test_none_args(self): self.f.write(b"hi\nbye\nabc") self.f.close() diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -32,7 +32,7 @@ import unittest import warnings import weakref -from collections import deque +from collections import deque, UserList from itertools import cycle, count from test import support @@ -1201,6 +1201,29 @@ bufio.flush() self.assertEqual(b"abc", writer._write_stack[0]) + def test_writelines(self): + l = [b'ab', b'cd', b'ef'] + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_userlist(self): + l = UserList([b'ab', b'cd', b'ef']) + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_error(self): + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + self.assertRaises(TypeError, bufio.writelines, [1, 2, 3]) + self.assertRaises(TypeError, bufio.writelines, None) + self.assertRaises(TypeError, bufio.writelines, 'abc') + def test_destructor(self): writer = self.MockRawIO() bufio = self.tp(writer, 8) @@ -2304,6 +2327,28 @@ reads += c self.assertEqual(reads, "A"*127+"\nB") + def test_writelines(self): + l = ['ab', 'cd', 'ef'] + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_userlist(self): + l = UserList(['ab', 'cd', 'ef']) + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_error(self): + txt = self.TextIOWrapper(self.BytesIO()) + self.assertRaises(TypeError, txt.writelines, [1, 2, 3]) + self.assertRaises(TypeError, txt.writelines, None) + self.assertRaises(TypeError, txt.writelines, b'abc') + def test_issue1395_1(self): txt = self.TextIOWrapper(self.BytesIO(self.testdata), encoding="ascii") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 23:14:59 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 23:14:59 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Add_tests_for_?= =?utf-8?q?the_writelines=28=29_method_of_file_objects=2E?= Message-ID: <3Xh8Rl4lNdzR3D@mail.python.org> http://hg.python.org/cpython/rev/2f314971e164 changeset: 79772:2f314971e164 branch: 2.7 parent: 79762:66ac8951fa86 user: Antoine Pitrou date: Tue Oct 16 22:57:11 2012 +0200 summary: Add tests for the writelines() method of file objects. Original patch by Felipe Cruz. files: Lib/test/test_fileio.py | 21 +++++++++++++++++++++ Lib/test/test_io.py | 23 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -9,6 +9,7 @@ from array import array from weakref import proxy from functools import wraps +from UserList import UserList from test.test_support import TESTFN, check_warnings, run_unittest, make_bad_fd from test.test_support import py3k_bytes as bytes @@ -71,6 +72,26 @@ n = self.f.readinto(a) self.assertEqual(array(b'b', [1, 2]), a[:n]) + def testWritelinesList(self): + l = [b'123', b'456'] + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesUserList(self): + l = UserList([b'123', b'456']) + self.f.writelines(l) + self.f.close() + self.f = _FileIO(TESTFN, 'rb') + buf = self.f.read() + self.assertEqual(buf, b'123456') + + def testWritelinesError(self): + self.assertRaises(TypeError, self.f.writelines, [1, 2, 3]) + self.assertRaises(TypeError, self.f.writelines, None) + def test_none_args(self): self.f.write(b"hi\nbye\nabc") self.f.close() diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -34,6 +34,7 @@ import errno from itertools import cycle, count from collections import deque +from UserList import UserList from test import test_support as support import codecs @@ -1126,6 +1127,28 @@ bufio.flush() self.assertEqual(b"abc", writer._write_stack[0]) + def test_writelines(self): + l = [b'ab', b'cd', b'ef'] + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_userlist(self): + l = UserList([b'ab', b'cd', b'ef']) + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + bufio.writelines(l) + bufio.flush() + self.assertEqual(b''.join(writer._write_stack), b'abcdef') + + def test_writelines_error(self): + writer = self.MockRawIO() + bufio = self.tp(writer, 8) + self.assertRaises(TypeError, bufio.writelines, [1, 2, 3]) + self.assertRaises(TypeError, bufio.writelines, None) + def test_destructor(self): writer = self.MockRawIO() bufio = self.tp(writer, 8) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 16 23:15:00 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 16 Oct 2012 23:15:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Also_add_tests?= =?utf-8?q?_for_TextIOWrapper=2Ewritelines=28=29_=28issue_=2315744=29=2E?= Message-ID: <3Xh8Rm6yQlzR5M@mail.python.org> http://hg.python.org/cpython/rev/5b062bb56037 changeset: 79773:5b062bb56037 branch: 2.7 user: Antoine Pitrou date: Tue Oct 16 23:02:27 2012 +0200 summary: Also add tests for TextIOWrapper.writelines() (issue #15744). files: Lib/test/test_io.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -2233,6 +2233,28 @@ reads += c self.assertEqual(reads, "A"*127+"\nB") + def test_writelines(self): + l = ['ab', 'cd', 'ef'] + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_userlist(self): + l = UserList(['ab', 'cd', 'ef']) + buf = self.BytesIO() + txt = self.TextIOWrapper(buf) + txt.writelines(l) + txt.flush() + self.assertEqual(buf.getvalue(), b'abcdef') + + def test_writelines_error(self): + txt = self.TextIOWrapper(self.BytesIO()) + self.assertRaises(TypeError, txt.writelines, [1, 2, 3]) + self.assertRaises(TypeError, txt.writelines, None) + self.assertRaises(TypeError, txt.writelines, b'abc') + def test_issue1395_1(self): txt = self.TextIOWrapper(self.BytesIO(self.testdata), encoding="ascii") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 03:54:20 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 17 Oct 2012 03:54:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_A_couple_more_?= =?utf-8?q?whatsnew_updates=2E?= Message-ID: <3XhGf419FmzR40@mail.python.org> http://hg.python.org/cpython/rev/2621830cb241 changeset: 79774:2621830cb241 branch: 3.3 parent: 79770:2efcaec45697 user: R David Murray date: Tue Oct 16 21:52:24 2012 -0400 summary: A couple more whatsnew updates. files: Doc/whatsnew/3.3.rst | 14 ++++++++++++++ Misc/NEWS | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -796,6 +796,10 @@ (Contributed by Petri Lehtinen in :issue:`12170`) +* The ``rjust()``, ``ljust()``, and ``center()`` methods of :class:`bytes` + and :class:`bytearray` now accept a :class:`bytearray` for the ``fill`` + argument. (Contributed by Petri Lehtinen in :issue:`12380`.) + * New methods have been added to :class:`list` and :class:`bytearray`: ``copy()`` and ``clear()`` (:issue:`10516`). Consequently, :class:`~collections.abc.MutableSequence` now also defines a @@ -2192,6 +2196,9 @@ * :c:macro:`PyUnicode_READ`, :c:macro:`PyUnicode_READ_CHAR`, :c:macro:`PyUnicode_WRITE` * :c:macro:`PyUnicode_MAX_CHAR_VALUE` +* :c:macro:`PyArg_ParseTuple` now accepts a :class:`bytearray` for the ``c`` + format (:issue:`12380`). + Deprecated @@ -2211,6 +2218,8 @@ Deprecated Python modules, functions and methods ------------------------------------------------ +* Passing a non-empty string to ``object.__format__()`` is deprecated, and + will produce a :exc:`TypeError` in Python 3.4 (:issue:`9856`). * The ``unicode_internal`` codec has been deprecated because of the :pep:`393`, use UTF-8, UTF-16 (``utf-16-le`` or ``utf-16-be``), or UTF-32 (``utf-32-le`` or ``utf-32-be``) @@ -2438,6 +2447,11 @@ factory functions by subclassing the private classes will need to change to subclass the now-public classes. +* The undocumented debugging machinery in the threading module has been + removed, simplifying the code. This should have no effect on production + code, but is mentioned here in case any application debug frameworks were + interacting with it (:issue:`13550`). + Porting C code -------------- diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2363,7 +2363,7 @@ - Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and sys.stdin uses universal newline (replace '\r\n' by '\n'). -- issue #11828: startswith and endswith don't accept None as slice index. +- Issue #11828: startswith and endswith now accept None as slice index. Patch by Torsten Becker. - Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 03:54:21 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 17 Oct 2012 03:54:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_A_couple_more_whatsnew_updates=2E?= Message-ID: <3XhGf53q7PzR2c@mail.python.org> http://hg.python.org/cpython/rev/055d3ff891ad changeset: 79775:055d3ff891ad parent: 79771:e526d67016f0 parent: 79774:2621830cb241 user: R David Murray date: Tue Oct 16 21:54:12 2012 -0400 summary: Merge: A couple more whatsnew updates. files: Doc/whatsnew/3.3.rst | 14 ++++++++++++++ Misc/HISTORY | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -796,6 +796,10 @@ (Contributed by Petri Lehtinen in :issue:`12170`) +* The ``rjust()``, ``ljust()``, and ``center()`` methods of :class:`bytes` + and :class:`bytearray` now accept a :class:`bytearray` for the ``fill`` + argument. (Contributed by Petri Lehtinen in :issue:`12380`.) + * New methods have been added to :class:`list` and :class:`bytearray`: ``copy()`` and ``clear()`` (:issue:`10516`). Consequently, :class:`~collections.abc.MutableSequence` now also defines a @@ -2192,6 +2196,9 @@ * :c:macro:`PyUnicode_READ`, :c:macro:`PyUnicode_READ_CHAR`, :c:macro:`PyUnicode_WRITE` * :c:macro:`PyUnicode_MAX_CHAR_VALUE` +* :c:macro:`PyArg_ParseTuple` now accepts a :class:`bytearray` for the ``c`` + format (:issue:`12380`). + Deprecated @@ -2211,6 +2218,8 @@ Deprecated Python modules, functions and methods ------------------------------------------------ +* Passing a non-empty string to ``object.__format__()`` is deprecated, and + will produce a :exc:`TypeError` in Python 3.4 (:issue:`9856`). * The ``unicode_internal`` codec has been deprecated because of the :pep:`393`, use UTF-8, UTF-16 (``utf-16-le`` or ``utf-16-be``), or UTF-32 (``utf-32-le`` or ``utf-32-be``) @@ -2438,6 +2447,11 @@ factory functions by subclassing the private classes will need to change to subclass the now-public classes. +* The undocumented debugging machinery in the threading module has been + removed, simplifying the code. This should have no effect on production + code, but is mentioned here in case any application debug frameworks were + interacting with it (:issue:`13550`). + Porting C code -------------- diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -2208,7 +2208,7 @@ - Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and sys.stdin uses universal newline (replace '\r\n' by '\n'). -- issue #11828: startswith and endswith don't accept None as slice index. +- Issue #11828: startswith and endswith now accept None as slice index. Patch by Torsten Becker. - Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Wed Oct 17 05:56:02 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Wed, 17 Oct 2012 05:56:02 +0200 Subject: [Python-checkins] Daily reference leaks (e526d67016f0): sum=0 Message-ID: results for e526d67016f0 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogvAb7jn', '-x'] From python-checkins at python.org Wed Oct 17 07:57:19 2012 From: python-checkins at python.org (eric.snow) Date: Wed, 17 Oct 2012 07:57:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogQ2xvc2UgIzE2MTYw?= =?utf-8?q?=3A_Subclass_support_now_works_for_types=2ESimpleNamespace=2E__?= =?utf-8?q?Thanks_to?= Message-ID: <3XhN2R1bbPzPY3@mail.python.org> http://hg.python.org/cpython/rev/c5124145e79e changeset: 79776:c5124145e79e branch: 3.3 parent: 79774:2621830cb241 user: Eric Snow date: Tue Oct 16 22:35:38 2012 -0700 summary: Close #16160: Subclass support now works for types.SimpleNamespace. Thanks to RDM for noticing. files: Lib/test/test_types.py | 9 +++++++++ Misc/NEWS | 2 ++ Objects/namespaceobject.c | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -1135,6 +1135,15 @@ with self.assertRaises(TypeError): ns['spam'] + def test_subclass(self): + class Spam(types.SimpleNamespace): + pass + + spam = Spam(ham=8, eggs=9) + + self.assertIs(type(spam), Spam) + self.assertEqual(vars(spam), {'ham': 8, 'eggs': 9}) + def test_main(): run_unittest(TypesTests, MappingProxyTests, ClassCreationTests, diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,8 @@ - Issue #14783: Improve int() docstring and switch docstrings for str(), range(), and slice() to use multi-line signatures. +- Issue #16160: Subclass support now works for types.SimpleNamespace. + - Issue #15379: Fix passing of non-BMP characters as integers for the charmap decoder (already working as unicode strings). Patch by Serhiy Storchaka. diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -21,19 +21,19 @@ static PyObject * namespace_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - _PyNamespaceObject *ns; - ns = PyObject_GC_New(_PyNamespaceObject, &_PyNamespace_Type); - if (ns == NULL) - return NULL; + PyObject *self; - ns->ns_dict = PyDict_New(); - if (ns->ns_dict == NULL) { - Py_DECREF(ns); - return NULL; + assert(type != NULL && type->tp_alloc != NULL); + self = type->tp_alloc(type, 0); + if (self != NULL) { + _PyNamespaceObject *ns = (_PyNamespaceObject *)self; + ns->ns_dict = PyDict_New(); + if (ns->ns_dict == NULL) { + Py_DECREF(ns); + return NULL; + } } - - PyObject_GC_Track(ns); - return (PyObject *)ns; + return self; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 07:57:20 2012 From: python-checkins at python.org (eric.snow) Date: Wed, 17 Oct 2012 07:57:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_for_issue_=2316160=3A_Subclass_support_now_works_f?= =?utf-8?q?or_types=2ESimpleNamespace=2E?= Message-ID: <3XhN2S46VvzR5M@mail.python.org> http://hg.python.org/cpython/rev/47b9732696eb changeset: 79777:47b9732696eb parent: 79775:055d3ff891ad parent: 79776:c5124145e79e user: Eric Snow date: Tue Oct 16 22:45:49 2012 -0700 summary: merge for issue #16160: Subclass support now works for types.SimpleNamespace. files: Lib/test/test_types.py | 9 +++++++++ Misc/NEWS | 2 ++ Objects/namespaceobject.c | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -1135,6 +1135,15 @@ with self.assertRaises(TypeError): ns['spam'] + def test_subclass(self): + class Spam(types.SimpleNamespace): + pass + + spam = Spam(ham=8, eggs=9) + + self.assertIs(type(spam), Spam) + self.assertEqual(vars(spam), {'ham': 8, 'eggs': 9}) + def test_main(): run_unittest(TypesTests, MappingProxyTests, ClassCreationTests, diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,8 @@ - Issue #14783: Improve int() docstring and switch docstrings for str(), range(), and slice() to use multi-line signatures. +- Issue #16160: Subclass support now works for types.SimpleNamespace. + - Upgrade Unicode data (UCD) to version 6.2. - Issue #15379: Fix passing of non-BMP characters as integers for the charmap diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -21,19 +21,19 @@ static PyObject * namespace_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - _PyNamespaceObject *ns; - ns = PyObject_GC_New(_PyNamespaceObject, &_PyNamespace_Type); - if (ns == NULL) - return NULL; + PyObject *self; - ns->ns_dict = PyDict_New(); - if (ns->ns_dict == NULL) { - Py_DECREF(ns); - return NULL; + assert(type != NULL && type->tp_alloc != NULL); + self = type->tp_alloc(type, 0); + if (self != NULL) { + _PyNamespaceObject *ns = (_PyNamespaceObject *)self; + ns->ns_dict = PyDict_New(); + if (ns->ns_dict == NULL) { + Py_DECREF(ns); + return NULL; + } } - - PyObject_GC_Track(ns); - return (PyObject *)ns; + return self; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 10:25:00 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 10:25:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1Mjk4?= =?utf-8?q?=3A_fix_an_OS_X_bootstrap_issue_with_=5Fsysconfigdata=2Epy=2E?= Message-ID: <3XhRJr473MzQqn@mail.python.org> http://hg.python.org/cpython/rev/66959d419369 changeset: 79778:66959d419369 branch: 3.3 parent: 79776:c5124145e79e user: Trent Nelson date: Wed Oct 17 04:23:50 2012 -0400 summary: Issue #15298: fix an OS X bootstrap issue with _sysconfigdata.py. Reported by: Ned Deily. files: Lib/sysconfig.py | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -390,18 +390,31 @@ if _PYTHON_BUILD: vars['LDSHARED'] = vars['BLDSHARED'] - pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) - if hasattr(sys, "gettotalrefcount"): - pybuilddir += '-pydebug' - os.makedirs(pybuilddir, exist_ok=True) - destfile = os.path.join(pybuilddir, '_sysconfigdata.py') - + # There's a chicken-and-egg situation on OS X with regards to the + # _sysconfigdata module after the changes introduced by #15298: + # get_config_vars() is called by get_platform() as part of the + # `make pybuilddir.txt` target -- which is a precursor to the + # _sysconfigdata.py module being constructed. Unfortunately, + # get_config_vars() eventually calls _init_posix(), which attempts + # to import _sysconfigdata, which we won't have built yet. So, + # write out _sysconfigdata.py to the current directory first, + # then call get_platform() to get the pybuilddir, then move it. + destfile = '_sysconfigdata.py' with open(destfile, 'w', encoding='utf8') as f: f.write('# system configuration generated and used by' ' the sysconfig module\n') f.write('build_time_vars = ') pprint.pprint(vars, stream=f) + pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + if hasattr(sys, "gettotalrefcount"): + pybuilddir += '-pydebug' + os.makedirs(pybuilddir, exist_ok=True) + target = os.path.join(pybuilddir, destfile) + + # Relocate _sysconfigdata.py into its final home. + os.rename(destfile, target) + # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='ascii') as f: f.write(pybuilddir) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 10:25:01 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 10:25:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315298=3A_fix_an_OS_X_bootstrap_issue_with?= =?utf-8?q?_=5Fsysconfigdata=2Epy=2E?= Message-ID: <3XhRJs6FCszR1X@mail.python.org> http://hg.python.org/cpython/rev/429774e8d9f9 changeset: 79779:429774e8d9f9 parent: 79777:47b9732696eb parent: 79778:66959d419369 user: Trent Nelson date: Wed Oct 17 04:24:44 2012 -0400 summary: Merge issue #15298: fix an OS X bootstrap issue with _sysconfigdata.py. files: Lib/sysconfig.py | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -371,18 +371,31 @@ if _PYTHON_BUILD: vars['LDSHARED'] = vars['BLDSHARED'] - pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) - if hasattr(sys, "gettotalrefcount"): - pybuilddir += '-pydebug' - os.makedirs(pybuilddir, exist_ok=True) - destfile = os.path.join(pybuilddir, '_sysconfigdata.py') - + # There's a chicken-and-egg situation on OS X with regards to the + # _sysconfigdata module after the changes introduced by #15298: + # get_config_vars() is called by get_platform() as part of the + # `make pybuilddir.txt` target -- which is a precursor to the + # _sysconfigdata.py module being constructed. Unfortunately, + # get_config_vars() eventually calls _init_posix(), which attempts + # to import _sysconfigdata, which we won't have built yet. So, + # write out _sysconfigdata.py to the current directory first, + # then call get_platform() to get the pybuilddir, then move it. + destfile = '_sysconfigdata.py' with open(destfile, 'w', encoding='utf8') as f: f.write('# system configuration generated and used by' ' the sysconfig module\n') f.write('build_time_vars = ') pprint.pprint(vars, stream=f) + pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + if hasattr(sys, "gettotalrefcount"): + pybuilddir += '-pydebug' + os.makedirs(pybuilddir, exist_ok=True) + target = os.path.join(pybuilddir, destfile) + + # Relocate _sysconfigdata.py into its final home. + os.rename(destfile, target) + # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='ascii') as f: f.write(pybuilddir) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 10:49:45 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 10:49:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1ODE5?= =?utf-8?q?=3A_use_standard_autoconf_preset_output_variables=2E?= Message-ID: <3XhRsP12vVzMBv@mail.python.org> http://hg.python.org/cpython/rev/7e879a453bb3 changeset: 79780:7e879a453bb3 branch: 2.7 parent: 79773:5b062bb56037 user: Trent Nelson date: Wed Oct 17 04:32:49 2012 -0400 summary: Issue #15819: use standard autoconf preset output variables. Reported by: Roumen Petrov files: Makefile.pre.in | 3 ++- configure | 7 ++----- configure.ac | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,7 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ -BUILDDIR= @BUILDDIR@ +abs_srcdir= @abs_srcdir@ +abs_builddir= @abs_builddir@ CC= @CC@ CXX= @CXX@ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -649,7 +649,6 @@ HGTAG HGVERSION BASECPPFLAGS -BUILDDIR SVNVERSION ARFLAGS AR @@ -5177,10 +5176,8 @@ SVNVERSION="echo Unversioned directory" fi -BUILDDIR="`pwd`" - - -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then + +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree make sure Include (in the current dir) # gets picked up before its $srcdir counterpart in order for Python-ast.h # and graminit.h to get picked up from the correct directory. diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -854,10 +854,8 @@ SVNVERSION="echo Unversioned directory" fi -BUILDDIR="`pwd`" -AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree make sure Include (in the current dir) # gets picked up before its $srcdir counterpart in order for Python-ast.h # and graminit.h to get picked up from the correct directory. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 10:49:46 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 10:49:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODE5?= =?utf-8?q?=3A_use_standard_autoconf_preset_output_variables=2E?= Message-ID: <3XhRsQ3MXKzPTL@mail.python.org> http://hg.python.org/cpython/rev/65b3c41052b6 changeset: 79781:65b3c41052b6 branch: 3.2 parent: 79769:4c204a61bd79 user: Trent Nelson date: Wed Oct 17 04:45:30 2012 -0400 summary: Issue #15819: use standard autoconf preset output variables. Reported by: Roumen Petrov files: Makefile.pre.in | 3 ++- configure | 7 ++----- configure.ac | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,7 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ -BUILDDIR= @BUILDDIR@ +abs_srcdir= @abs_srcdir@ +abs_builddir= @abs_builddir@ CC= @CC@ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -652,7 +652,6 @@ HGTAG HGVERSION BASECPPFLAGS -BUILDDIR SVNVERSION ARFLAGS AR @@ -5207,10 +5206,8 @@ SVNVERSION="echo Unversioned directory" fi -BUILDDIR="`pwd`" - - -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then + +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -830,10 +830,8 @@ SVNVERSION="echo Unversioned directory" fi -BUILDDIR="`pwd`" -AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 10:49:47 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 10:49:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2315819=3A_use_standard_autoconf_preset_output_variable?= =?utf-8?q?s=2E?= Message-ID: <3XhRsR5mRgzR2T@mail.python.org> http://hg.python.org/cpython/rev/b78e97b84f35 changeset: 79782:b78e97b84f35 branch: 3.3 parent: 79778:66959d419369 parent: 79781:65b3c41052b6 user: Trent Nelson date: Wed Oct 17 04:47:31 2012 -0400 summary: Issue #15819: use standard autoconf preset output variables. Reported by: Roumen Petrov files: Makefile.pre.in | 3 ++- configure | 7 ++----- configure.ac | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,7 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ -BUILDDIR= @BUILDDIR@ +abs_srcdir= @abs_srcdir@ +abs_builddir= @abs_builddir@ CC= @CC@ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -715,7 +715,6 @@ HGTAG HGVERSION BASECPPFLAGS -BUILDDIR target_alias host_alias build_alias @@ -2721,10 +2720,8 @@ -BUILDDIR="`pwd`" - - -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then + +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -9,10 +9,8 @@ AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) -BUILDDIR="`pwd`" -AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 10:49:49 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 10:49:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2315819=3A_use_standard_autoconf_preset_output_va?= =?utf-8?q?riables=2E?= Message-ID: <3XhRsT1bmZzR1T@mail.python.org> http://hg.python.org/cpython/rev/f9eb516bea88 changeset: 79783:f9eb516bea88 parent: 79779:429774e8d9f9 parent: 79782:b78e97b84f35 user: Trent Nelson date: Wed Oct 17 04:49:26 2012 -0400 summary: Issue #15819: use standard autoconf preset output variables. Reported by: Roumen Petrov files: Makefile.pre.in | 3 ++- configure | 7 ++----- configure.ac | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,7 +27,8 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ -BUILDDIR= @BUILDDIR@ +abs_srcdir= @abs_srcdir@ +abs_builddir= @abs_builddir@ CC= @CC@ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -735,7 +735,6 @@ HGTAG HGVERSION BASECPPFLAGS -BUILDDIR target_alias host_alias build_alias @@ -2747,10 +2746,8 @@ -BUILDDIR="`pwd`" - - -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then + +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -9,10 +9,8 @@ AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) -BUILDDIR="`pwd`" -AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then +if test "$abs_srcdir" != "$abs_builddir"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 12:16:15 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 12:16:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjU3?= =?utf-8?q?=3A_make_test=5Fcreate=5Fconnection=28=29_handle_ENETUNREACH=2E?= Message-ID: <3XhTnC6JghzM1p@mail.python.org> http://hg.python.org/cpython/rev/b5fa9d8603b6 changeset: 79784:b5fa9d8603b6 branch: 3.2 parent: 79781:65b3c41052b6 user: Trent Nelson date: Wed Oct 17 06:15:15 2012 -0400 summary: Issue #16257: make test_create_connection() handle ENETUNREACH. files: Lib/test/test_socket.py | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1638,7 +1638,26 @@ port = support.find_unused_port() with self.assertRaises(socket.error) as cm: socket.create_connection((HOST, port)) - self.assertEqual(cm.exception.errno, errno.ECONNREFUSED) + + # Issue #16257: create_connection() calls getaddrinfo() against + # 'localhost'. This may result in an IPV6 addr being returned + # as well as an IPV4 one: + # >>> socket.getaddrinfo('localhost', port, 0, SOCK_STREAM) + # >>> [(2, 2, 0, '', ('127.0.0.1', 41230)), + # (26, 2, 0, '', ('::1', 41230, 0, 0))] + # + # create_connection() enumerates through all the addresses returned + # and if it doesn't successfully bind to any of them, it propagates + # the last exception it encountered. + # + # On Solaris, ENETUNREACH is returned in this circumstance instead + # of ECONNREFUSED. So, if that errno exists, add it to our list of + # expected errnos. + expected_errnos = [ errno.ECONNREFUSED, ] + if hasattr(errno, 'ENETUNREACH'): + expected_errnos.append(errno.ENETUNREACH) + + self.assertIn(cm.exception.errno, expected_errnos) def test_create_connection_timeout(self): # Issue #9792: create_connection() should not recast timeout errors -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 12:16:17 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 12:16:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316257=3A_make_test=5Fcreate=5Fconnection=28=29_handle?= =?utf-8?q?_ENETUNREACH=2E?= Message-ID: <3XhTnF1ft7zR0W@mail.python.org> http://hg.python.org/cpython/rev/6a938ce6315c changeset: 79785:6a938ce6315c branch: 3.3 parent: 79782:b78e97b84f35 parent: 79784:b5fa9d8603b6 user: Trent Nelson date: Wed Oct 17 06:15:40 2012 -0400 summary: Issue #16257: make test_create_connection() handle ENETUNREACH. files: Lib/test/test_socket.py | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4109,7 +4109,26 @@ port = support.find_unused_port() with self.assertRaises(socket.error) as cm: socket.create_connection((HOST, port)) - self.assertEqual(cm.exception.errno, errno.ECONNREFUSED) + + # Issue #16257: create_connection() calls getaddrinfo() against + # 'localhost'. This may result in an IPV6 addr being returned + # as well as an IPV4 one: + # >>> socket.getaddrinfo('localhost', port, 0, SOCK_STREAM) + # >>> [(2, 2, 0, '', ('127.0.0.1', 41230)), + # (26, 2, 0, '', ('::1', 41230, 0, 0))] + # + # create_connection() enumerates through all the addresses returned + # and if it doesn't successfully bind to any of them, it propagates + # the last exception it encountered. + # + # On Solaris, ENETUNREACH is returned in this circumstance instead + # of ECONNREFUSED. So, if that errno exists, add it to our list of + # expected errnos. + expected_errnos = [ errno.ECONNREFUSED, ] + if hasattr(errno, 'ENETUNREACH'): + expected_errnos.append(errno.ENETUNREACH) + + self.assertIn(cm.exception.errno, expected_errnos) def test_create_connection_timeout(self): # Issue #9792: create_connection() should not recast timeout errors -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 12:16:18 2012 From: python-checkins at python.org (trent.nelson) Date: Wed, 17 Oct 2012 12:16:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316257=3A_make_test=5Fcreate=5Fconnection=28=29_?= =?utf-8?q?handle_ENETUNREACH=2E?= Message-ID: <3XhTnG3ql9zR31@mail.python.org> http://hg.python.org/cpython/rev/37a59bd23578 changeset: 79786:37a59bd23578 parent: 79783:f9eb516bea88 parent: 79785:6a938ce6315c user: Trent Nelson date: Wed Oct 17 06:16:02 2012 -0400 summary: Issue #16257: make test_create_connection() handle ENETUNREACH. files: Lib/test/test_socket.py | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4109,7 +4109,26 @@ port = support.find_unused_port() with self.assertRaises(socket.error) as cm: socket.create_connection((HOST, port)) - self.assertEqual(cm.exception.errno, errno.ECONNREFUSED) + + # Issue #16257: create_connection() calls getaddrinfo() against + # 'localhost'. This may result in an IPV6 addr being returned + # as well as an IPV4 one: + # >>> socket.getaddrinfo('localhost', port, 0, SOCK_STREAM) + # >>> [(2, 2, 0, '', ('127.0.0.1', 41230)), + # (26, 2, 0, '', ('::1', 41230, 0, 0))] + # + # create_connection() enumerates through all the addresses returned + # and if it doesn't successfully bind to any of them, it propagates + # the last exception it encountered. + # + # On Solaris, ENETUNREACH is returned in this circumstance instead + # of ECONNREFUSED. So, if that errno exists, add it to our list of + # expected errnos. + expected_errnos = [ errno.ECONNREFUSED, ] + if hasattr(errno, 'ENETUNREACH'): + expected_errnos.append(errno.ENETUNREACH) + + self.assertIn(cm.exception.errno, expected_errnos) def test_create_connection_timeout(self): # Issue #9792: create_connection() should not recast timeout errors -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 13:24:37 2012 From: python-checkins at python.org (giampaolo.rodola) Date: Wed, 17 Oct 2012 13:24:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_test=5Flogging=2Epy=3A_whe?= =?utf-8?q?re_needed_use_unittest=27s_assertGreater=2C_assertLesser=2C?= Message-ID: <3XhWJ54WL8zQr9@mail.python.org> http://hg.python.org/cpython/rev/240fa6e93925 changeset: 79787:240fa6e93925 user: Giampaolo Rodola' date: Wed Oct 17 13:24:27 2012 +0200 summary: test_logging.py: where needed use unittest's assertGreater, assertLesser, assertIs rather than assertTrue (also in order to debug issue 16264) files: Lib/test/test_logging.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1450,7 +1450,7 @@ self.root_logger.exception('Never sent') self.root_logger.error('Never sent, either') now = time.time() - self.assertTrue(self.sock_hdlr.retryTime > now) + self.assertGreater(self.sock_hdlr.retryTime, now) time.sleep(self.sock_hdlr.retryTime - now + 0.001) self.root_logger.error('Nor this') @@ -1776,7 +1776,7 @@ logger.removeHandler(h) s = stream.getvalue() h.close() - self.assertTrue(s.find("UserWarning: I'm warning you...\n") > 0) + self.assertGreater(s.find("UserWarning: I'm warning you...\n"), 0) #See if an explicit file uses the original implementation a_file = io.StringIO() @@ -2801,14 +2801,14 @@ l2 = logging.getLogger('def.ghi') c1 = r.getChild('xyz') c2 = r.getChild('uvw.xyz') - self.assertTrue(c1 is logging.getLogger('xyz')) - self.assertTrue(c2 is logging.getLogger('uvw.xyz')) + self.assertIs(c1, logging.getLogger('xyz')) + self.assertIs(c2, logging.getLogger('uvw.xyz')) c1 = l1.getChild('def') c2 = c1.getChild('ghi') c3 = l1.getChild('def.ghi') - self.assertTrue(c1 is logging.getLogger('abc.def')) - self.assertTrue(c2 is logging.getLogger('abc.def.ghi')) - self.assertTrue(c2 is c3) + self.assertIs(c1, logging.getLogger('abc.def')) + self.assertIs(c2, logging.getLogger('abc.def.ghi')) + self.assertIs(c2, c3) class DerivedLogRecord(logging.LogRecord): @@ -3889,7 +3889,7 @@ h.handle(r) h.close() # Now see if the event is recorded - self.assertTrue(num_recs < win32evtlog.GetNumberOfEventLogRecords(elh)) + self.assertLess(num_recs, win32evtlog.GetNumberOfEventLogRecords(elh)) flags = win32evtlog.EVENTLOG_BACKWARDS_READ | \ win32evtlog.EVENTLOG_SEQUENTIAL_READ found = False -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 15:47:52 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 15:47:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjY1?= =?utf-8?q?=3A_Fix_collapsing_of_code_sample_in_tutorial=2E?= Message-ID: <3XhZTN1N46zM06@mail.python.org> http://hg.python.org/cpython/rev/a0fba0382ae0 changeset: 79788:a0fba0382ae0 branch: 3.2 parent: 79784:b5fa9d8603b6 user: Andrew Svetlov date: Wed Oct 17 16:41:28 2012 +0300 summary: Issue #16265: Fix collapsing of code sample in tutorial. Thanks to Yongzhi Pan from docs@ files: Doc/tutorial/inputoutput.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -184,7 +184,7 @@ >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' - 'Dcab: {0[Dcab]:d}'.format(table)) + ... 'Dcab: {0[Dcab]:d}'.format(table)) Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 15:47:53 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 15:47:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2316265=3A_Fix_collapsing_of_code_sample_in_tutor?= =?utf-8?q?ial=2E?= Message-ID: <3XhZTP3mf9zR2t@mail.python.org> http://hg.python.org/cpython/rev/7c0de8be4eaf changeset: 79789:7c0de8be4eaf branch: 3.3 parent: 79785:6a938ce6315c parent: 79788:a0fba0382ae0 user: Andrew Svetlov date: Wed Oct 17 16:46:00 2012 +0300 summary: Merge issue #16265: Fix collapsing of code sample in tutorial. Thanks to Yongzhi Pan from docs@ files: Doc/tutorial/inputoutput.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -184,7 +184,7 @@ >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' - 'Dcab: {0[Dcab]:d}'.format(table)) + ... 'Dcab: {0[Dcab]:d}'.format(table)) Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 15:47:54 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 15:47:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316265=3A_Fix_collapsing_of_code_sample_in?= =?utf-8?q?_tutorial=2E?= Message-ID: <3XhZTQ61vGzM06@mail.python.org> http://hg.python.org/cpython/rev/c8a11e9a0217 changeset: 79790:c8a11e9a0217 parent: 79787:240fa6e93925 parent: 79789:7c0de8be4eaf user: Andrew Svetlov date: Wed Oct 17 16:46:50 2012 +0300 summary: Merge issue #16265: Fix collapsing of code sample in tutorial. Thanks to Yongzhi Pan from docs@ files: Doc/tutorial/inputoutput.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -184,7 +184,7 @@ >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' - 'Dcab: {0[Dcab]:d}'.format(table)) + ... 'Dcab: {0[Dcab]:d}'.format(table)) Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:16:46 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 17 Oct 2012 16:16:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1Mzc4?= =?utf-8?q?=3A_Fix_Tools/unicode/comparecodecs=2Epy=2E__Patch_by_Serhiy_St?= =?utf-8?q?orchaka=2E?= Message-ID: <3Xhb6k4QtpzR5Y@mail.python.org> http://hg.python.org/cpython/rev/98f64cbed2ac changeset: 79791:98f64cbed2ac branch: 3.2 parent: 79788:a0fba0382ae0 user: Antoine Pitrou date: Wed Oct 17 16:12:30 2012 +0200 summary: Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. files: Misc/NEWS | 2 ++ Tools/unicode/comparecodecs.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -666,6 +666,8 @@ Tools/Demos ----------- +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + - Issue #14695: Fix missing support for starred assignments in Tools/parser/unparse.py. diff --git a/Tools/unicode/comparecodecs.py b/Tools/unicode/comparecodecs.py --- a/Tools/unicode/comparecodecs.py +++ b/Tools/unicode/comparecodecs.py @@ -30,7 +30,7 @@ mismatch += 1 # Check decoding for i in range(256): - c = chr(i) + c = bytes([i]) try: u1 = c.decode(encoding1) except UnicodeError: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:16:47 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 17 Oct 2012 16:16:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2315378=3A_Fix_Tools/unicode/comparecodecs=2Epy=2E__Pat?= =?utf-8?q?ch_by_Serhiy_Storchaka=2E?= Message-ID: <3Xhb6l6cj4zR4L@mail.python.org> http://hg.python.org/cpython/rev/f281d7700339 changeset: 79792:f281d7700339 branch: 3.3 parent: 79789:7c0de8be4eaf parent: 79791:98f64cbed2ac user: Antoine Pitrou date: Wed Oct 17 16:13:55 2012 +0200 summary: Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. files: Misc/NEWS | 2 ++ Tools/unicode/comparecodecs.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -168,6 +168,8 @@ Tools/Demos ----------- +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + What's New in Python 3.3.0? =========================== diff --git a/Tools/unicode/comparecodecs.py b/Tools/unicode/comparecodecs.py --- a/Tools/unicode/comparecodecs.py +++ b/Tools/unicode/comparecodecs.py @@ -30,7 +30,7 @@ mismatch += 1 # Check decoding for i in range(256): - c = chr(i) + c = bytes([i]) try: u1 = c.decode(encoding1) except UnicodeError: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:16:49 2012 From: python-checkins at python.org (antoine.pitrou) Date: Wed, 17 Oct 2012 16:16:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2315378=3A_Fix_Tools/unicode/comparecodecs=2Epy?= =?utf-8?q?=2E__Patch_by_Serhiy_Storchaka=2E?= Message-ID: <3Xhb6n1f1JzR4L@mail.python.org> http://hg.python.org/cpython/rev/ae1f84fd143e changeset: 79793:ae1f84fd143e parent: 79790:c8a11e9a0217 parent: 79792:f281d7700339 user: Antoine Pitrou date: Wed Oct 17 16:14:40 2012 +0200 summary: Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. files: Misc/NEWS | 2 ++ Tools/unicode/comparecodecs.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -207,5 +207,7 @@ Tools/Demos ----------- +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + **(For information about older versions, consult the HISTORY file.)** diff --git a/Tools/unicode/comparecodecs.py b/Tools/unicode/comparecodecs.py --- a/Tools/unicode/comparecodecs.py +++ b/Tools/unicode/comparecodecs.py @@ -30,7 +30,7 @@ mismatch += 1 # Check decoding for i in range(256): - c = chr(i) + c = bytes([i]) try: u1 = c.decode(encoding1) except UnicodeError: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:42 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzk1ODM6?= =?utf-8?q?_Document_startup_option/environment_interaction=2E?= Message-ID: <3XhbVG4PRRzR6h@mail.python.org> http://hg.python.org/cpython/rev/2f812212599b changeset: 79794:2f812212599b branch: 2.7 parent: 79780:7e879a453bb3 user: Andrew Svetlov date: Wed Oct 17 17:14:28 2012 +0300 summary: Issue #9583: Document startup option/environment interaction. Patch by Todd Rovito. files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -442,7 +442,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -638,4 +641,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -832,6 +832,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:43 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzk1ODM6?= =?utf-8?q?_Document_startup_option/environment_interaction=2E?= Message-ID: <3XhbVH6TpCzR6c@mail.python.org> http://hg.python.org/cpython/rev/a8052ad9752b changeset: 79795:a8052ad9752b branch: 3.2 parent: 79788:a0fba0382ae0 user: Andrew Svetlov date: Wed Oct 17 17:15:43 2012 +0300 summary: Issue #9583: Document startup option/environment interaction. Patch by Todd Rovito. files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -379,7 +379,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -570,4 +573,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -901,6 +901,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:45 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=239583=3A_Document_startup_option/environment_int?= =?utf-8?q?eraction=2E?= Message-ID: <3XhbVK1TcwzR6j@mail.python.org> http://hg.python.org/cpython/rev/f0bb61cbc046 changeset: 79796:f0bb61cbc046 branch: 3.3 parent: 79789:7c0de8be4eaf parent: 79795:a8052ad9752b user: Andrew Svetlov date: Wed Oct 17 17:16:19 2012 +0300 summary: Merge issue #9583: Document startup option/environment interaction. Patch by Todd Rovito. files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -997,6 +997,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:46 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=239583=3A_Document_startup_option/environme?= =?utf-8?q?nt_interaction=2E?= Message-ID: <3XhbVL3wLjzR16@mail.python.org> http://hg.python.org/cpython/rev/def0e0bb06ef changeset: 79797:def0e0bb06ef parent: 79790:c8a11e9a0217 parent: 79796:f0bb61cbc046 user: Andrew Svetlov date: Wed Oct 17 17:16:45 2012 +0300 summary: Merge issue #9583: Document startup option/environment interaction. Patch by Todd Rovito. files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -997,6 +997,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:47 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_null_merge?= Message-ID: <3XhbVM67d5zR6c@mail.python.org> http://hg.python.org/cpython/rev/16493102f9b1 changeset: 79798:16493102f9b1 branch: 3.2 parent: 79791:98f64cbed2ac parent: 79795:a8052ad9752b user: Andrew Svetlov date: Wed Oct 17 17:20:46 2012 +0300 summary: null merge files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -379,7 +379,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -570,4 +573,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -901,6 +901,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:49 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_null_merge?= Message-ID: <3XhbVP1B2PzR6m@mail.python.org> http://hg.python.org/cpython/rev/89c0df755a83 changeset: 79799:89c0df755a83 branch: 3.3 parent: 79792:f281d7700339 parent: 79796:f0bb61cbc046 user: Andrew Svetlov date: Wed Oct 17 17:21:36 2012 +0300 summary: null merge files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -997,6 +997,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:50 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_null_merge?= Message-ID: <3XhbVQ3PTMzR6S@mail.python.org> http://hg.python.org/cpython/rev/544923fa9cf7 changeset: 79800:544923fa9cf7 parent: 79793:ae1f84fd143e parent: 79797:def0e0bb06ef user: Andrew Svetlov date: Wed Oct 17 17:26:48 2012 +0300 summary: null merge files: Doc/using/cmdline.rst | 6 ++++-- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -997,6 +997,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:51 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_heads?= Message-ID: <3XhbVR6vFXzR79@mail.python.org> http://hg.python.org/cpython/rev/c67f4fe3fdad changeset: 79801:c67f4fe3fdad branch: 3.3 parent: 79799:89c0df755a83 parent: 79798:16493102f9b1 user: Andrew Svetlov date: Wed Oct 17 17:29:20 2012 +0300 summary: merge heads files: Misc/NEWS | 318 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 318 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2429,6 +2429,324 @@ - Issue #8033: sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures. Initial patch by Philippe Devalkeneer. +Extension Modules +----------------- + +- Issue #15676: Now "mmap" check for empty files before doing the + offset check. Patch by Steven Willis. + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields + of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +Tests +----- + +- Issue #15304: Fix warning message when os.chdir() fails inside + test.support.temp_cwd(). Patch by Chris Jerdonek. + +- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch + by Serhiy Storchaka. + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected + tests in test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using + two external hosts that have been configured specifically for this type + of test. + +- Issue #15615: Add some tests for the json module's handling of invalid + input data. Patch by Kushal Das. + +- Issue #15496: Add directory removal helpers for tests on Windows. + Patch by Jeremy Kloth. + +- Issue #15467: Move helpers for __sizeof__ tests into test_support. + Patch by Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running + tests in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15230: Adopted a more systematic approach in the runpy tests + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14026: In test_cmd_line_script, check that sys.argv is populated + correctly for the various invocation approaches (Patch by Jason Yeo) + +- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging + message (Patch by Jason Yeo) + +- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing + a test failure in test_ssl. + +Build +----- + +- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after + 2801bf875a24 (see #15801). + +- Issue #11715: Fix multiarch detection without having Debian development + tools (dpkg-dev) installed. + +- Issue #15819: Make sure we can build Python out-of-tree from a readonly + source directory. (Somewhat related to Issue #9860.) + +- Issue #15822: Ensure 2to3 grammar pickles are properly installed. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14197: For OS X framework builds, ensure links to the shared + library are created with the proper ABI suffix. + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14437: Fix building the _io module under Cygwin. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +Documentation +------------- + +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd + argument. + +- Issue #15979: Improve timeit documentation. + +- Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + +- Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +- Issue #14674: Add a discussion of the json module's standard compliance. + Patch by Chris Rebert. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch + by Serhiy Storchaka. + +- Issue 15482: Properly document the default 'level' value for __import__() + while warning about using negative values. + +- Issue #15230: Clearly document some of the limitations of the runpy + module and nudge readers towards importlib when appropriate. + +- Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + +- Issue #8799: Fix and improve the threading.Condition documentation. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + +- Issue #14034: added the argparse tutorial. + +- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tools/Demos +----------- + +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + +- Issue #14695: Fix missing support for starred assignments in + Tools/parser/unparse.py. + + +What's New in Python 3.2.3? +=========================== + +*Release date: 10-Apr-2012* + +Build +----- + +- Issue #14387: Work around a problem building extension modules under Windows + by undefining ``small`` before use in the Python headers. + + +What's New in Python 3.2.3 release candidate 2? +=============================================== + +*Release date: 18-Mar-2012* + +Library +------- + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. + +Extension Modules +----------------- + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + + +What's New in Python 3.2.3 release candidate 1? +=============================================== + +*Release date: 24-Feb-2012* + +Core and Builtins +----------------- + +- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED + environment variable, to provide an opt-in way to protect against denial of + service attacks due to hash collisions within the dict and set types. Patch + by David Malcolm, based on work by Victor Stinner. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: + (lambda *, arg=GLOBAL_NAME: None) + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +Library +------- + - HTMLParser is now able to handle slashes in the start tag. - Issue #13641: Decoding functions in the base64 module now accept ASCII-only -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:33:54 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 17 Oct 2012 16:33:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_heads?= Message-ID: <3XhbVV2nJzzR7G@mail.python.org> http://hg.python.org/cpython/rev/943d3e289ab4 changeset: 79802:943d3e289ab4 parent: 79800:544923fa9cf7 parent: 79801:c67f4fe3fdad user: Andrew Svetlov date: Wed Oct 17 17:33:26 2012 +0300 summary: merge heads files: Misc/NEWS | 4416 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 4416 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -210,4 +210,4420 @@ - Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. +What's New in Python 3.3.0? +=========================== + +*Release date: 29-Sep-2012* + +Core and Builtins +----------------- + +- Issue #16046: Fix loading sourceless legacy .pyo files. + +- Issue #16060: Fix refcounting bug when `__trunc__()` returns an object whose + `__int__()` gives a non-integer. Patch by Serhiy Storchaka. + +Extension Modules +----------------- + +- Issue #16012: Fix a regression in pyexpat. The parser's `UseForeignDTD()` + method doesn't require an argument again. + + +What's New in Python 3.3.0 Release Candidate 3? +=============================================== + +*Release date: 23-Sep-2012* + +Core and Builtins +----------------- + +- Issue #15900: Fix reference leak in `PyUnicode_TranslateCharmap()`. + +- Issue #15926: Fix crash after multiple reinitializations of the interpreter. + +- Issue #15895: Fix FILE pointer leak in one error branch of + `PyRun_SimpleFileExFlags()` when filename points to a pyc/pyo file, closeit is + false an and set_main_loader() fails. + +- Fixes for a few crash and memory leak regressions found by Coverity. + +Library +------- + +- Issue #15882: Change `_decimal` to accept any coefficient tuple when + constructing infinities. This is done for backwards compatibility with + decimal.py: Infinity coefficients are undefined in _decimal (in accordance + with the specification). + +- Issue #15925: Fix a regression in `email.util` where the `parsedate()` and + `parsedate_tz()` functions did not return None anymore when the argument could + not be parsed. + +Extension Modules +----------------- + +- Issue #15973: Fix a segmentation fault when comparing datetime timezone + objects. + +- Issue #15977: Fix memory leak in Modules/_ssl.c when the function + _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann. + +- Issue #15969: `faulthandler` module: rename dump_tracebacks_later() to + dump_traceback_later() and cancel_dump_tracebacks_later() to + cancel_dump_traceback_later(). + +- _decimal module: use only C 89 style comments. + + +What's New in Python 3.3.0 Release Candidate 2? +=============================================== + +*Release date: 09-Sep-2012* + +Core and Builtins +----------------- + +- Issue #13992: The trashcan mechanism is now thread-safe. This eliminates + sporadic crashes in multi-thread programs when several long deallocator chains + ran concurrently and involved subclasses of built-in container types. + +- Issue #15784: Modify `OSError`.__str__() to better distinguish between errno + error numbers and Windows error numbers. + +- Issue #15781: Fix two small race conditions in import's module locking. + +Library +------- + +- Issue #15847: Fix a regression in argparse, which did not accept tuples as + argument lists anymore. + +- Issue #15828: Restore support for C extensions in `imp.load_module()`. + +- Issue #15340: Fix importing the random module when ``/dev/urandom`` cannot be + opened. This was a regression caused by the hash randomization patch. + +- Issue #10650: Deprecate the watchexp parameter of the `Decimal.quantize()` + method. + +- Issue #15785: Modify `window.get_wch()` API of the curses module: return a + character for most keys, and an integer for special keys, instead of always + returning an integer. So it is now possible to distinguish special keys like + keypad keys. + +- Issue #14223: Fix `window.addch()` of the curses module for special characters + like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now + calling the C function waddch()/mvwaddch() (as it was done in Python 3.2), + instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still + calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked + to libncursesw. + +Build +----- + +- Issue #15822: Really ensure 2to3 grammar pickles are properly installed + (replaces fixes for Issue #15645). + +Documentation +------------- + +- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted the + hashing of multi-dimensional memorviews and memoryviews with multi-byte item + formats. The intended restrictions have now been documented - they will be + correctly enforced in 3.3.1. + + +What's New in Python 3.3.0 Release Candidate 1? +=============================================== + +*Release date: 25-Aug-2012* + +Core and Builtins +----------------- + +- Issue #15573: memoryview comparisons are now performed by value with full + support for any valid struct module format definition. + +- Issue #15316: When an item in the fromlist for `__import__()` doesn't exist, + don't raise an error, but if an exception is raised as part of an import do + let that propagate. + +- Issue #15778: Ensure that ``str(ImportError(msg))`` returns a str even when + msg isn't a str. + +- Issue #2051: Source file permission bits are once again correctly copied to + the cached bytecode file. (The migration to importlib reintroduced this + problem because these was no regression test. A test has been added as part of + this patch) + +- Issue #15761: Fix crash when ``PYTHONEXECUTABLE`` is set on Mac OS X. + +- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. Patch by + Robin Schreiber. + +- Issue #15604: Update uses of `PyObject_IsTrue()` to check for and handle + errors correctly. Patch by Serhiy Storchaka. + +- Issue #14846: `importlib.FileFinder` now handles the case where the directory + being searched is removed after a previous import attempt. + +Library +------- + +- Issue #13370: Ensure that ctypes works on Mac OS X when Python is compiled + using the clang compiler. + +- Issue #13072: The array module's 'u' format code is now deprecated and will be + removed in Python 4.0. + +- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. + +- Issue #15776: Allow pyvenv to work in existing directory with --clean. + +- Issue #15249: email's BytesGenerator now correctly mangles From lines (when + requested) even if the body contains undecodable bytes. + +- Issue #15777: Fix a refleak in _posixsubprocess. + +- Issue ##665194: Update `email.utils.localtime` to use datetime.astimezone and + correctly handle historic changes in UTC offsets. + +- Issue #15199: Fix JavaScript's default MIME type to application/javascript. + Patch by Bohuslav Kabrda. + +- Issue #12643: `code.InteractiveConsole` now respects `sys.excepthook` when + displaying exceptions. Patch by Aaron Iles. + +- Issue #13579: `string.Formatter` now understands the 'a' conversion specifier. + +- Issue #15595: Fix ``subprocess.Popen(universal_newlines=True)`` for certain + locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. + +- Issue #15477: In cmath and math modules, add workaround for platforms whose + system-supplied log1p function doesn't respect signs of zeros. + +- Issue #15715: `importlib.__import__()` will silence an ImportError when the + use of fromlist leads to a failed import. + +- Issue #14669: Fix pickling of connections and sockets on Mac OS X by + sending/receiving an acknowledgment after file descriptor transfer. + TestPicklingConnection has been reenabled for Mac OS X. + +- Issue #11062: Fix adding a message from file to Babyl mailbox. + +- Issue #15646: Prevent equivalent of a fork bomb when using `multiprocessing` + on Windows without the ``if __name__ == '__main__'`` idiom. + +- Issue #15678: Fix IDLE menus when started from OS X command line (3.3.0b2 + regression). + +C API +----- + +Extension Modules +----------------- + +Tools/Demos +----------- + +Documentation +------------- + +- Issue #14674: Add a discussion of the `json` module's standard compliance. + Patch by Chris Rebert. + +- Create a 'Concurrent Execution' section in the docs, and split up the + 'Optional Operating System Services' section to use a more user-centric + classification scheme (splitting them across the new CE section, IPC and text + processing). Operating system limitatons can be reflected with the Sphinx + ``:platform:`` tag, it doesn't make sense as part of the Table of Contents. + +- Issue #4966: Bring the sequence docs up to date for the Py3k transition and + the many language enhancements since they were original written. + +- The "path importer" misnomer has been replaced with Eric Snow's + more-awkward-but-at-least-not-wrong suggestion of "path based finder" in the + import system reference docs. + +- Issue #15640: Document `importlib.abc.Finder` as deprecated. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +Tests +----- + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected tests in + test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using two + external hosts that have been configured specifically for this type of test. + +- Issue #15743: Remove the deprecated method usage in `urllib` tests. Patch by + Jeff Knupp. + +- Issue #15615: Add some tests for the `json` module's handling of invalid input + data. Patch by Kushal Das. + +Build +----- + +- Output lib files for PGO build into PGO directory. + +- Pick up 32-bit launcher from PGO directory on 64-bit PGO build. + +- Drop ``PC\python_nt.h`` as it's not used. Add input dependency on custom + build step. + +- Issue #15511: Drop explicit dependency on pythonxy.lib from _decimal amd64 + configuration. + +- Add missing PGI/PGO configurations for pywlauncher. + +- Issue #15645: Ensure 2to3 grammar pickles are properly installed. + + +What's New in Python 3.3.0 Beta 2? +================================== + +*Release date: 12-Aug-2012* + +Core and Builtins +----------------- + +- Issue #15568: Fix the return value of ``yield from`` when StopIteration is + raised by a custom iterator. + +- Issue #13119: `sys.stdout` and `sys.stderr` are now using "\r\n" newline on + Windows, as Python 2. + +- Issue #15534: Fix the fast-search function for non-ASCII Unicode strings. + +- Issue #15508: Fix the docstring for `__import__()` to have the proper default + value of 0 for 'level' and to not mention negative levels since they are not + supported. + +- Issue #15425: Eliminated traceback noise from more situations involving + importlib. + +- Issue #14578: Support modules registered in the Windows registry again. + +- Issue #15466: Stop using TYPE_INT64 in marshal, to make importlib.h (and other + byte code files) equal between 32-bit and 64-bit systems. + +- Issue #1692335: Move initial exception args assignment to + `BaseException.__new__()` to help pickling of naive subclasses. + +- Issue #12834: Fix `PyBuffer_ToContiguous()` for non-contiguous arrays. + +- Issue #15456: Fix code `__sizeof__()` after #12399 change. Patch by Serhiy + Storchaka. + +- Issue #15404: Refleak in PyMethodObject repr. + +- Issue #15394: An issue in `PyModule_Create()` that caused references to be + leaked on some error paths has been fixed. Patch by Julia Lawall. + +- Issue #15368: An issue that caused bytecode generation to be non-deterministic + has been fixed. + +- Issue #15202: Consistently use the name "follow_symlinks" for new parameters + in os and shutil functions. + +- Issue #15314: ``__main__.__loader__`` is now set correctly during interpreter + startup. + +- Issue #15111: When a module imported using 'from import' has an ImportError + inside itself, don't mask that fact behind a generic ImportError for the + module itself. + +- Issue #15293: Add GC support to the AST base node type. + +- Issue #15291: Fix a memory leak where AST nodes where not properly + deallocated. + +- Issue #15110: Fix the tracebacks generated by "import xxx" to not show the + importlib stack frames. + +- Issue #15020: The program name used to search for Python's path is now + "python3" under Unix, not "python". + +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + +- Issue #15033: Fix the exit status bug when modules invoked using -m swith, + return the proper failure return value (1). Patch contributed by Jeff Knupp. + +- Issue #15229: An `OSError` subclass whose __init__ doesn't call back + OSError.__init__ could produce incomplete instances, leading to crashes when + calling str() on them. + +- Issue 15307: Virtual environments now use symlinks with framework builds on + Mac OS X, like other POSIX builds. + +Library +------- + +- Issue #15424: Add a `__sizeof__()` implementation for array objects. Patch by + Ludwig H?hne. + +- Issue #15576: Allow extension modules to act as a package's __init__ module. + +- Issue #15502: Have `importlib.invalidate_caches()` work on `sys.meta_path` + instead of `sys.path_importer_cache`. + +- Issue #15163: Pydoc shouldn't list __loader__ as module data. + +- Issue #15471: Do not use mutable objects as defaults for + `importlib.__import__()`. + +- Issue #15559: To avoid a problematic failure mode when passed to the bytes + constructor, objects in the ipaddress module no longer implement `__index__()` + (they still implement `__int__()` as appropriate). + +- Issue #15546: Fix handling of pathological input data in the peek() and + read1() methods of the BZ2File, GzipFile and LZMAFile classes. + +- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog + ended with ``\``. Patch by Roger Serwy. + +- Issue #12655: Instead of requiring a custom type, `os.sched_getaffinity()` and + `os.sched_setaffinity()` now use regular sets of integers to represent the + CPUs a process is restricted to. + +- Issue #15538: Fix compilation of the `socket.getnameinfo()` / + `socket.getaddrinfo()` emulation code. Patch by Philipp Hagemeister. + +- Issue #15519: Properly expose WindowsRegistryFinder in importlib (and use the + correct term for it). Original patch by Eric Snow. + +- Issue #15502: Bring the importlib ABCs into line with the current state of the + import protocols given PEP 420. Original patch by Eric Snow. + +- Issue #15499: Launching a webbrowser in Unix used to sleep for a few seconds. + Original patch by Anton Barkovsky. + +- Issue #15463: The faulthandler module truncates strings to 500 characters, + instead of 100, to be able to display long file paths. + +- Issue #6056: Make `multiprocessing` use setblocking(True) on the sockets it + uses. Original patch by J Derek Wilson. + +- Issue #15364: Fix sysconfig.get_config_var('srcdir') to be an absolute path. + +- Issue #15041: Update "see also" list in tkinter documentation. + +- Issue #15413: `os.times()` had disappeared under Windows. + +- Issue #15402: An issue in the struct module that caused `sys.getsizeof()` to + return incorrect results for struct.Struct instances has been fixed. Initial + patch by Serhiy Storchaka. + +- Issue #15232: When mangle_from is True, `email.Generator` now correctly + mangles lines that start with 'From ' that occur in a MIME preamble or + epilogue. + +- Issue #15094: Incorrectly placed #endif in _tkinter.c. Patch by Serhiy + Storchaka. + +- Issue #13922: `argparse` no longer incorrectly strips '--'s that appear after + the first one. + +- Issue #12353: `argparse` now correctly handles null argument values. + +- Issue #10017, issue #14998: Fix TypeError using pprint on dictionaries with + user-defined types as keys or other unorderable keys. + +- Issue #15397: `inspect.getmodulename()` is now based directly on importlib via + a new `importlib.machinery.all_suffixes()` API. + +- Issue #14635: `telnetlib` will use poll() rather than select() when possible to + avoid failing due to the select() file descriptor limit. + +- Issue #15180: Clarify posixpath.join() error message when mixing str & bytes. + +- Issue #15343: pkgutil now includes an iter_importer_modules implementation for + importlib.machinery.FileFinder (similar to the way it already handled + zipimport.zipimporter). + +- Issue #15314: runpy now sets __main__.__loader__ correctly. + +- Issue #15357: The import emulation in pkgutil is now deprecated. pkgutil uses + importlib internally rather than the emulation. + +- Issue #15233: Python now guarantees that callables registered with the atexit + module will be called in a deterministic order. + +- Issue #15238: `shutil.copystat()` now copies Linux "extended attributes". + +- Issue #15230: runpy.run_path now correctly sets __package__ as described in + the documentation. + +- Issue #15315: Support VS 2010 in distutils cygwincompiler. + +- Issue #15294: Fix a regression in pkgutil.extend_path()'s handling of nested + namespace packages. + +- Issue #15056: `imp.cache_from_source()` and `imp.source_from_cache()` raise + NotImplementedError when `sys.implementation.cache_tag` is set to None. + +- Issue #15256: Grammatical mistake in exception raised by `imp.find_module()`. + +- Issue #5931: `wsgiref` environ variable SERVER_SOFTWARE will specify an + implementation specific term like CPython, Jython instead of generic "Python". + +- Issue #13248: Remove obsolete argument "max_buffer_size" of BufferedWriter and + BufferedRWPair, from the io module. + +- Issue #13248: Remove obsolete argument "version" of `argparse.ArgumentParser`. + +- Issue #14814: Implement more consistent ordering and sorting behaviour for + ipaddress objects. + +- Issue #14814: `ipaddress` network objects correctly return NotImplemented when + compared to arbitrary objects instead of raising TypeError. + +- Issue #14990: Correctly fail with SyntaxError on invalid encoding declaration. + +- Issue #14814: `ipaddress` now provides more informative error messages when + constructing instances directly (changes permitted during beta due to + provisional API status). + +- Issue #15247: `io.FileIO` now raises an error when given a file descriptor + pointing to a directory. + +- Issue #15261: Stop os.stat(fd) crashing on Windows when fd not open. + +- Issue #15166: Implement `imp.get_tag()` using `sys.implementation.cache_tag`. + +- Issue #15210: Catch KeyError when `importlib.__init__()` can't find + _frozen_importlib in sys.modules, not ImportError. + +- Issue #15030: `importlib.abc.PyPycLoader` now supports the new source size + header field in .pyc files. + +- Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on + flush(). + +- Issue #10571: Fix the "--sign" option of distutils' upload command. Patch by + Jakub Wilk. + +- Issue #9559: If messages were only added, a new file is no longer created and + renamed over the old file when flush() is called on an mbox, MMDF or Babyl + mailbox. + +- Issue 10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for + cryptographic purpose. + +- Issue #15184: Ensure consistent results of OS X configuration tailoring for + universal builds by factoring out common OS X-specific customizations from + sysconfig, distutils.sysconfig, distutils.util, and distutils.unixccompiler + into a new module _osx_support. + +C API +----- + +- Issue #15610: `PyImport_ImportModuleEx()` now uses a 'level' of 0 instead of -1. + +- Issue #15169, issue #14599: Strip out the C implementation of + `imp.source_from_cache()` used by PyImport_ExecCodeModuleWithPathnames() and + used the Python code instead. Leads to PyImport_ExecCodeModuleObject() to not + try to infer the source path from the bytecode path as + PyImport_ExecCodeModuleWithPathnames() does. + +Extension Modules +----------------- + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields of + type `ctypes.c_uint32` and width 32 to incorrectly be set has been fixed. + +- Issue #15194: Update libffi to the 3.0.11 release. + +Tools/Demos +----------- + +- Issue #15458: python-config gets a new option --configdir to print the $LIBPL + value. + +- Move importlib.test.benchmark to Tools/importbench. + +- Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been + enhanced to show information on more C frames relevant to CPython within the + "py-bt" and "py-bt-full" commands: + + * C frames that are waiting on the GIL + * C frames that are garbage-collecting + * C frames that are due to the invocation of a PyCFunction + +Documentation +------------- + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch by + Serhiy Storchaka. + +- Issue #15295: Reorganize and rewrite the documentation on the import system. + +- Issue #15230: Clearly document some of the limitations of the runpy module and + nudge readers towards importlib when appropriate. + +- Issue #15053: Copy Python 3.3 import lock change notice to all relevant + functions in imp instead of just at the top of the relevant section. + +- Issue #15288: Link to the term "loader" in notes in pkgutil about how things + won't work as expected in Python 3.3 and mark the requisite functions as + "changed" since they will no longer work with modules directly imported by + import itself. + +- Issue #13557: Clarify effect of giving two different namespaces to `exec()` or + `execfile()`. + +- Issue #15250: Document that `filecmp.dircmp()` compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tests +----- + +- Issue #15467: Move helpers for `__sizeof__()` tests into test_support. Patch + by Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running tests + in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15168: Move `importlib.test` to `test.test_importlib`. + +- Issue #15091: Reactivate a test on UNIX which was failing thanks to a + forgotten `importlib.invalidate_caches()` call. + +- Issue #15230: Adopted a more systematic approach in the runpy tests. + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- Issue #15284: Skip {send,recv}msg tests in test_socket when IPv6 is not + enabled. Patch by Brian Brazil. + +- Issue #15277: Fix a resource leak in support.py when IPv6 is disabled. Patch + by Brian Brazil. + +Build +----- + +- Issue #11715: Fix multiarch detection without having Debian development tools + (dpkg-dev) installed. + +- Issue #15037: Build OS X installers with local copy of ncurses 5.9 libraries + to avoid curses.unget_wch bug present in older versions of ncurses such as + those shipped with OS X. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. Also, for + OS X installers, ensure consistent sqlite3 behavior and feature availability + by building a local copy of libsqlite3 rather than depending on the wide range + of versions supplied with various OS X releases. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +- Issue #15431: Add _freeze_importlib project to regenerate importlib.h on + Windows. Patch by Kristj?n Valur J?nsson. + +- Issue #14197: For OS X framework builds, ensure links to the shared library + are created with the proper ABI suffix. + +- Issue #14330: For cross builds, don't use host python, use host search paths + for host compiler. + +- Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. + +- Issue #15268: Search curses.h in /usr/include/ncursesw. + + +What's New in Python 3.3.0 Beta 1? +================================== + +*Release date: 27-Jun-2012* + +Core and Builtins +----------------- + +- Fix a (most likely) very rare memory leak when calling main() and not being + able to decode a command-line argument. + +- Issue #14815: Use Py_ssize_t instead of long for the object hash, to + preserve all 64 bits of hash on Win64. + +- Issue #12268: File readline, readlines and read() or readall() methods + no longer lose data when an underlying read system call is interrupted. + IOError is no longer raised due to a read system call returning EINTR + from within these methods. + +- Issue #11626: Add _SizeT functions to stable ABI. + +- Issue #15146: Add PyType_FromSpecWithBases. Patch by Robin Schreiber. + +- Issue #15142: Fix reference leak when deallocating instances of types + created using PyType_FromSpec(). + +- Issue #15042: Add PyState_AddModule and PyState_RemoveModule. Add version + guard for Py_LIMITED_API additions. Patch by Robin Schreiber. + +- Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on + the work by Hirokazu Yamamoto. + +- Issue #15096: Removed support for ur'' as the raw notation isn't + compatible with Python 2.x's raw unicode strings. + +- Issue #13783: Generator objects now use the identifier APIs internally + +- Issue #14874: Restore charmap decoding speed to pre-PEP 393 levels. + Patch by Serhiy Storchaka. + +- Issue #15026: utf-16 encoding is now significantly faster (up to 10x). + Patch by Serhiy Storchaka. + +- Issue #11022: open() and io.TextIOWrapper are now calling + locale.getpreferredencoding(False) instead of locale.getpreferredencoding() + in text mode if the encoding is not specified. Don't change temporary the + locale encoding using locale.setlocale(), use the current locale encoding + instead of the user preferred encoding. + +- Issue #14673: Add Eric Snow's sys.implementation implementation. + +- Issue #15038: Optimize python Locks on Windows. + +Library +------- + +- Issue #9803: Don't close IDLE on saving if breakpoint is open. + Patch by Roger Serwy. + +- Issue #12288: Consider '0' and '0.0' as valid initialvalue + for tkinter SimpleDialog. + +- Issue #15512: Add a __sizeof__ implementation for parser. + Patch by Serhiy Storchaka. + +- Issue #15469: Add a __sizeof__ implementation for deque objects. + Patch by Serhiy Storchaka. + +- Issue #15489: Add a __sizeof__ implementation for BytesIO objects. + Patch by Serhiy Storchaka. + +- Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. + Patch by Serhiy Storchaka. + +- Issue #15514: Correct __sizeof__ support for cpu_set. + Patch by Serhiy Storchaka. + +- Issue #15187: Bugfix: remove temporary directories test_shutil was leaving + behind. + +- Issue #15177: Added dir_fd parameter to os.fwalk(). + +- Issue #15176: Clarified behavior, documentation, and implementation + of os.listdir(). + +- Issue #15061: Re-implemented hmac.compare_digest() in C to prevent further + timing analysis and to support all buffer protocol aware objects as well as + ASCII only str instances safely. + +- Issue #15164: Change return value of platform.uname() from a + plain tuple to a collections.namedtuple. + +- Support Mageia Linux in the platform module. + +- Issue #11678: Support Arch linux in the platform module. + +- Issue #15118: Change return value of os.uname() and os.times() from + plain tuples to immutable iterable objects with named attributes + (structseq objects). + +- Speed up _decimal by another 10-15% by caching the thread local context + that was last accessed. In the pi benchmark (64-bit platform, prec=9), + _decimal is now only 1.5x slower than float. + +- Remove the packaging module, which is not ready for prime time. + +- Issue #15154: Add "dir_fd" parameter to os.rmdir, remove "rmdir" + parameter from os.remove / os.unlink. + +- Issue #4489: Add a shutil.rmtree that isn't susceptible to symlink attacks. + It is used automatically on platforms supporting the necessary os.openat() + and os.unlinkat() functions. Main code by Martin von L?wis. + +- Issue #15156: HTMLParser now uses the new "html.entities.html5" dictionary. + +- Issue #11113: add a new "html5" dictionary containing the named character + references defined by the HTML5 standard and the equivalent Unicode + character(s) to the html.entities module. + +- Issue #15114: the strict mode of HTMLParser and the HTMLParseError exception + are deprecated now that the parser is able to parse invalid markup. + +- Issue #3665: \u and \U escapes are now supported in unicode regular + expressions. Patch by Serhiy Storchaka. + +- Issue #15153: Added inspect.getgeneratorlocals to simplify white box + testing of generator state updates + +- Issue #13062: Added inspect.getclosurevars to simplify testing stateful + closures + +- Issue #11024: Fixes and additional tests for Time2Internaldate. + +- Issue #14626: Large refactoring of functions / parameters in the os module. + Many functions now support "dir_fd" and "follow_symlinks" parameters; + some also support accepting an open file descriptor in place of of a path + string. Added os.support_* collections as LBYL helpers. Removed many + functions only previously seen in 3.3 alpha releases (often starting with + "f" or "l", or ending with "at"). Originally suggested by Serhiy Storchaka; + implemented by Larry Hastings. + +- Issue #15008: Implement PEP 362 "Signature Objects". + Patch by Yury Selivanov. + +- Issue: #15138: base64.urlsafe_{en,de}code() are now 3-4x faster. + +- Issue #444582: Add shutil.which, for finding programs on the system path. + Original patch by Erik Demaine, with later iterations by Jan Killian + and Brian Curtin. + +- Issue #14837: SSL errors now have ``library`` and ``reason`` attributes + describing precisely what happened and in which OpenSSL submodule. The + str() of a SSLError is also enhanced accordingly. + +- Issue #9527: datetime.astimezone() method will now supply a class + timezone instance corresponding to the system local timezone when + called with no arguments. + +- Issue #14653: email.utils.mktime_tz() no longer relies on system + mktime() when timezone offest is supplied. + +- Issue #14684: zlib.compressobj() and zlib.decompressobj() now support the use + of predefined compression dictionaries. Original patch by Sam Rushing. + +- Fix GzipFile's handling of filenames given as bytes objects. + +- Issue #14772: Return destination values from some shutil functions. + +- Issue #15064: Implement context manager protocol for multiprocessing types + +- Issue #15101: Make pool finalizer avoid joining current thread. + +- Issue #14657: The frozen instance of importlib used for bootstrap is now + also the module imported as importlib._bootstrap. + +- Issue #14055: Add __sizeof__ support to _elementtree. + +- Issue #15054: A bug in tokenize.tokenize that caused string literals + with 'b' prefixes to be incorrectly tokenized has been fixed. + Patch by Serhiy Storchaka. + +- Issue #15006: Allow equality comparison between naive and aware + time or datetime objects. + +- Issue #14982: Document that pkgutil's iteration functions require the + non-standard iter_modules() method to be defined by an importer (something + the importlib importers do not define). + +- Issue #15036: Mailbox no longer throws an error if a flush is done + between operations when removing or changing multiple items in mbox, + MMDF, or Babyl mailboxes. + +- Issue #14059: Implement multiprocessing.Barrier. + +- Issue #15061: The inappropriately named hmac.secure_compare has been + renamed to hmac.compare_digest, restricted to operating on bytes inputs + only and had its documentation updated to more accurately reflect both its + intent and its limitations + +- Issue #13841: Make child processes exit using sys.exit() on Windows. + +- Issue #14936: curses_panel was converted to PEP 3121 and PEP 384 API. + Patch by Robin Schreiber. + +- Issue #1667546: On platforms supporting tm_zone and tm_gmtoff fields + in struct tm, time.struct_time objects returned by time.gmtime(), + time.localtime() and time.strptime() functions now have tm_zone and + tm_gmtoff attributes. Original patch by Paul Boddie. + +- Rename adjusted attribute to adjustable in time.get_clock_info() result. + +- Issue #3518: Remove references to non-existent BaseManager.from_address() + method. + +- Issue #13857: Added textwrap.indent() function (initial patch by Ezra + Berch) + +- Issue #2736: Added datetime.timestamp() method. + +- Issue #13854: Make multiprocessing properly handle non-integer + non-string argument to SystemExit. + +- Issue #12157: Make pool.map() empty iterables correctly. Initial + patch by mouad. + +- Issue #11823: disassembly now shows argument counts on calls with keyword args. + +- Issue #14711: os.stat_float_times() has been deprecated. + +- LZMAFile now accepts the modes "rb"/"wb"/"ab" as synonyms of "r"/"w"/"a". + +- The bz2 and lzma modules now each contain an open() function, allowing + compressed files to readily be opened in text mode as well as binary mode. + +- BZ2File.__init__() and LZMAFile.__init__() now accept a file object as their + first argument, rather than requiring a separate "fileobj" argument. + +- gzip.open() now accepts file objects as well as filenames. + +- Issue #14992: os.makedirs(path, exist_ok=True) would raise an OSError + when the path existed and had the S_ISGID mode bit set when it was + not explicitly asked for. This is no longer an exception as mkdir + cannot control if the OS sets that bit for it or not. + +- Issue #14989: Make the CGI enable option to http.server available via command + line. + +- Issue #14987: Add a missing import statement to inspect. + +- Issue #1079: email.header.decode_header now correctly parses all the examples + in RFC2047. There is a necessary visible behavior change: the leading and/or + trailing whitespace on ASCII parts is now preserved. + +- Issue #14969: Better handling of exception chaining in contextlib.ExitStack + +- Issue #14962: Update text coloring in IDLE shell window after changing + options. Patch by Roger Serwy. + +- Issue #14963: Convert contextlib.ExitStack.__exit__ to use an iterative + algorithm (Patch by Alon Horev) + +- Issue #14785: Add sys._debugmallocstats() to help debug low-level memory + allocation issues + +- Issue #14443: Ensure that .py files are byte-compiled with the correct Python + executable within bdist_rpm even on older versions of RPM + +C-API +----- + +- Issue #13783: Inadvertent additions to the public C API in the PEP 380 + implementation have either been removed or marked as private interfaces. + +Extension Modules +----------------- + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +Documentation +------------- + +- Issue #15081: Document PyState_FindModule. + Patch by Robin Schreiber. + +- Issue #14814: Added first draft of ipaddress module API reference + +Tests +----- + +- Issue #14769: test_capi now has SkipitemTest, which cleverly checks + for "parity" between PyArg_ParseTuple() and the Python/getargs.c static + function skipitem() for all possible "format units". + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14963: Add test cases for exception handling behaviour + in contextlib.ExitStack (Initial patch by Alon Horev) + +Build +----- + +- Issue #13590: Improve support for OS X Xcode 4: + * Try to avoid building Python or extension modules with problematic + llvm-gcc compiler. + * Since Xcode 4 removes ppc support, extension module builds now + check for ppc compiler support and automatically remove ppc and + ppc64 archs when not available. + * Since Xcode 4 no longer install SDKs in default locations, + extension module builds now revert to using installed headers + and libs if the SDK used to build the interpreter is not + available. + * Update ./configure to use better defaults for universal builds; + in particular, --enable-universalsdk=yes uses the Xcode default + SDK and --with-universal-archs now defaults to "intel" if ppc + not available. + +- Issue #14225: Fix Unicode support for curses (#12567) on OS X + +- Issue #14928: Fix importlib bootstrap issues by using a custom executable + (Modules/_freeze_importlib) to build Python/importlib.h. + + +What's New in Python 3.3.0 Alpha 4? +=================================== + +*Release date: 31-May-2012* + +Core and Builtins +----------------- + +- Issue #14835: Make plistlib output empty arrays & dicts like OS X. + Patch by Sidney San Mart?n. + +- Issue #14744: Use the new _PyUnicodeWriter internal API to speed up + str%args and str.format(args). + +- Issue #14930: Make memoryview objects weakrefable. + +- Issue #14775: Fix a potential quadratic dict build-up due to the garbage + collector repeatedly trying to untrack dicts. + +- Issue #14857: fix regression in references to PEP 3135 implicit __class__ + closure variable (Reopens issue #12370) + +- Issue #14712 (PEP 405): Virtual environments. Implemented by Vinay Sajip. + +- Issue #14660 (PEP 420): Namespace packages. Implemented by Eric Smith. + +- Issue #14494: Fix __future__.py and its documentation to note that + absolute imports are the default behavior in 3.0 instead of 2.7. + Patch by Sven Marnach. + +- Issue #9260: A finer-grained import lock. Most of the import sequence + now uses per-module locks rather than the global import lock, eliminating + well-known issues with threads and imports. + +- Issue #14624: UTF-16 decoding is now 3x to 4x faster on various inputs. + Patch by Serhiy Storchaka. + +- asdl_seq and asdl_int_seq are now Py_ssize_t sized. + +- Issue #14133 (PEP 415): Implement suppression of __context__ display with an + attribute on BaseException. This replaces the original mechanism of PEP 409. + +- Issue #14417: Mutating a dict during lookup now restarts the lookup instead + of raising a RuntimeError (undoes issue #14205). + +- Issue #14738: Speed-up UTF-8 decoding on non-ASCII data. Patch by Serhiy + Storchaka. + +- Issue #14700: Fix two broken and undefined-behaviour-inducing overflow checks + in old-style string formatting. + +- Issue #14705: The PyArg_Parse() family of functions now support the 'p' format + unit, which accepts a "boolean predicate" argument. It converts any Python + value into an integer--0 if it is "false", and 1 otherwise. + +Library +------- + +- Issue #14690: Use monotonic clock instead of system clock in the sched, + subprocess and trace modules. + +- Issue #14958: Change IDLE systax highlighting to recognize all string and + byte literals supported in Python 3.3. + +- Issue #10997: Prevent a duplicate entry in IDLE's "Recent Files" menu. + +- Issue #14443: Tell rpmbuild to use the correct version of Python in + bdist_rpm. Initial patch by Ross Lagerwall. + +- Issue #14929: Stop Idle 3.x from closing on Unicode decode errors when + grepping. Patch by Roger Serwy. + +- Issue #12515: email now registers a defect if it gets to EOF while parsing + a MIME part without seeing the closing MIME boundary. + +- Issue #12510: Attempting to get invalid tooltip no longer closes Idle. + Other tooltipss have been corrected or improved and the number of tests + has been tripled. Original patch by Roger Serwy. + +- Issue #1672568: email now always decodes base64 payloads, adding padding and + ignoring non-base64-alphabet characters if needed, and registering defects + for any such problems. + +- Issue #14925: email now registers a defect when the parser decides that there + is a missing header/body separator line. MalformedHeaderDefect, which the + existing code would never actually generate, is deprecated. + +- Issue #10365: File open dialog now works instead of crashing even when + the parent window is closed before the dialog. Patch by Roger Serwy. + +- Issue #8739: Updated smtpd to support RFC 5321, and added support for the + RFC 1870 SIZE extension. + +- Issue #665194: Added a localtime function to email.utils to provide an + aware local datetime for use in setting Date headers. + +- Issue #12586: Added new provisional policies that implement convenient + unicode support for email headers. See What's New for details. + +- Issue #14731: Refactored email Policy framework to support full backward + compatibility with Python 3.2 by default yet allow for the introduction of + new features through new policies. Note that Policy.must_be_7bit is renamed + to cte_type. + +- Issue #14876: Use user-selected font for highlight configuration. + +- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals. + Have ascii characters in help. + +- Issue #14548: Make multiprocessing finalizers check pid before + running to cope with possibility of gc running just after fork. + +- Issue #14863: Update the documentation of os.fdopen() to reflect the + fact that it's only a thin wrapper around open() anymore. + +- Issue #14036: Add an additional check to validate that port in urlparse does + not go in illegal range and returns None. + +- Issue #14862: Add missing names to os.__all__ + +- Issue #14875: Use float('inf') instead of float('1e66666') in the json module. + +- Issue #13585: Added contextlib.ExitStack + +- PEP 3144, Issue #14814: Added the ipaddress module + +- Issue #14426: Correct the Date format in Expires attribute of Set-Cookie + Header in Cookie.py. + +- Issue #14588: The types module now provide new_class() and prepare_class() + functions to support PEP 3115 compliant dynamic class creation. Patch by + Daniel Urban and Nick Coghlan. + +- Issue #13152: Allow to specify a custom tabsize for expanding tabs in + textwrap. Patch by John Feuerstein. + +- Issue #14721: Send the correct 'Content-length: 0' header when the body is an + empty string ''. Initial Patch contributed by Arve Knudsen. + +- Issue #14072: Fix parsing of 'tel' URIs in urlparse by making the check for + ports stricter. + +- Issue #9374: Generic parsing of query and fragment portions of url for any + scheme. Supported both by RFC3986 and RFC2396. + +- Issue #14798: Fix the functions in pyclbr to raise an ImportError + when the first part of a dotted name is not a package. Patch by + Xavier de Gaye. + +- Issue #12098: multiprocessing on Windows now starts child processes + using the same sys.flags as the current process. Initial patch by + Sergey Mezentsev. + +- Issue #13031: Small speed-up for tarfile when unzipping tarfiles. + Patch by Justin Peel. + +- Issue #14780: urllib.request.urlopen() now has a ``cadefault`` argument + to use the default certificate store. Initial patch by James Oakley. + +- Issue #14829: Fix bisect and range() indexing with large indices + (>= 2 ** 32) under 64-bit Windows. + +- Issue #14732: The _csv module now uses PEP 3121 module initialization. + Patch by Robin Schreiber. + +- Issue #14809: Add HTTP status codes introduced by RFC 6585 to http.server + and http.client. Patch by EungJun Yi. + +- Issue #14777: tkinter may return undecoded UTF-8 bytes as a string when + accessing the Tk clipboard. Modify clipboad_get() to first request type + UTF8_STRING when no specific type is requested in an X11 windowing + environment, falling back to the current default type STRING if that fails. + Original patch by Thomas Kluyver. + +- Issue #14773: Fix os.fwalk() failing on dangling symlinks. + +- Issue #12541: Be lenient with quotes around Realm field of HTTP Basic + Authentation in urllib2. + +- Issue #14807: move undocumented tarfile.filemode() to stat.filemode() and add + doc entry. Add tarfile.filemode alias with deprecation warning. + +- Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects. + +- Issue #14532: Add a secure_compare() helper to the hmac module, to mitigate + timing attacks. Patch by Jon Oberheide. + +- Add importlib.util.resolve_name(). + +- Issue #14366: Support lzma compression in zip files. + Patch by Serhiy Storchaka. + +- Issue #13959: Introduce importlib.find_loader() and document + imp.find_module/load_module as deprecated. + +- Issue #14082: shutil.copy2() now copies extended attributes, if possible. + Patch by Hynek Schlawack. + +- Issue #13959: Make importlib.abc.FileLoader.load_module()/get_filename() and + importlib.machinery.ExtensionFileLoader.load_module() have their single + argument be optional. Allows for the replacement (and thus deprecation) of + imp.load_source()/load_package()/load_compiled(). + +- Issue #13959: imp.get_suffixes() has been deprecated in favour of the new + attributes on importlib.machinery: SOURCE_SUFFIXES, DEBUG_BYTECODE_SUFFIXES, + OPTIMIZED_BYTECODE_SUFFIXES, BYTECODE_SUFFIXES, and EXTENSION_SUFFIXES. This + led to an indirect deprecation of inspect.getmoduleinfo(). + +- Issue #14662: Prevent shutil failures on OS X when destination does not + support chflag operations. Patch by Hynek Schlawack. + +- Issue #14157: Fix time.strptime failing without a year on February 29th. + Patch by Hynek Schlawack. + +- Issue #14753: Make multiprocessing's handling of negative timeouts + the same as it was in Python 3.2. + +- Issue #14583: Fix importlib bug when a package's __init__.py would first + import one of its modules then raise an error. + +- Issue #14741: Fix missing support for Ellipsis ('...') in parser module. + +- Issue #14697: Fix missing support for set displays and set comprehensions in + parser module. + +- Issue #14701: Fix missing support for 'raise ... from' in parser module. + +- Add support for timeouts to the acquire() methods of + multiprocessing's lock/semaphore/condition proxies. + +- Issue #13989: Add support for text mode to gzip.open(). + +- Issue #14127: The os.stat() result object now provides three additional + fields: st_ctime_ns, st_mtime_ns, and st_atime_ns, providing those times as an + integer with nanosecond resolution. The functions os.utime(), os.lutimes(), + and os.futimes() now accept a new parameter, ns, which accepts mtime and atime + as integers with nanosecond resolution. + +- Issue #14127 and #10148: shutil.copystat now preserves exact mtime and atime + on filesystems providing nanosecond resolution. + +Tools/Demos +----------- + +- Issue #14695: Bring Tools/parser/unparse.py support up to date with + the Python 3.3 Grammar. + +Build +----- + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c. + +- Issue #14693: Under non-Windows platforms, hashlib's fallback modules are + always compiled, even if OpenSSL is present at build time. + +- Issue #13210: Windows build now uses VS2010, ported from VS2008. + +Documentation +------------- + +- Issue #14588: The language reference now accurately documents the Python 3 + class definition process. Patch by Nick Coghlan. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + + +What's New in Python 3.3.0 Alpha 3? +=================================== + +*Release date: 01-May-2012* + +Core and Builtins +----------------- + +- Issue #14699: Fix calling the classmethod descriptor directly. + +- Issue #14433: Prevent msvcrt crash in interactive prompt when stdin is closed. + +- Issue #14521: Make result of float('nan') and float('-nan') more consistent + across platforms. + +- Issue #14646: __import__() sets __loader__ if the loader did not. + +- Issue #14605: No longer have implicit entries in sys.meta_path. If + sys.meta_path is found to be empty, raise ImportWarning. + +- Issue #14605: No longer have implicit entries in sys.path_hooks. If + sys.path_hooks is found to be empty, a warning will be raised. None is now + inserted into sys.path_importer_cache if no finder was discovered. This also + means imp.NullImporter is no longer implicitly used. + +- Issue #13903: Implement PEP 412. Individual dictionary instances can now share + their keys with other dictionaries. Classes take advantage of this to share + their instance dictionary keys for improved memory and performance. + +- Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError + when repr() or str() is called on such an object. + +- Issue #14658: Fix binding a special method to a builtin implementation of a + special method with a different name. + +- Issue #14630: Fix a memory access bug for instances of a subclass of int + with value 0. + +- Issue #14339: Speed improvements to bin, oct and hex functions. Patch by + Serhiy Storchaka. + +- Issue #14098: New functions PyErr_GetExcInfo and PyErr_SetExcInfo. + Patch by Stefan Behnel. + +- Issue #14385: It is now possible to use a custom type for the __builtins__ + namespace, instead of a dict. It can be used for sandboxing for example. + Raise also a NameError instead of ImportError if __build_class__ name if not + found in __builtins__. + +- Issue #12599: Be more strict in accepting None compared to a false-like + object for importlib.util.module_for_loader and + importlib.machinery.PathFinder. + +- Issue #14612: Fix jumping around with blocks by setting f_lineno. + +- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in + globals raises a KeyError. + +- Issue #14607: Fix keyword-only arguments which started with ``__``. + +- Issue #10854: The ImportError raised when an extension module on Windows + fails to import now uses the new path and name attributes from + Issue #1559549. + +- Issue #13889: Check and (if necessary) set FPU control word before calling + any of the dtoa.c string <-> float conversion functions, on MSVC builds of + Python. This fixes issues when embedding Python in a Delphi app. + +- __import__() now matches PEP 328 and documentation by defaulting 'index' to 0 + instead of -1 and removing support for negative values. + +- Issue #2377: Make importlib the implementation of __import__(). + +- Issue #1559549: ImportError now has 'name' and 'path' attributes that are set + using keyword arguments to its constructor. They are currently not set by + import as they are meant for use by importlib. + +- Issue #14474: Save and restore exception state in thread.start_new_thread() + while writing error message if the thread leaves a unhandled exception. + +- Issue #13019: Fix potential reference leaks in bytearray.extend(). Patch + by Suman Saha. + +Library +------- + +- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'. + +- Issue #14371: Support bzip2 in zipfile module. Patch by Serhiy Storchaka. + +- Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running + step. Patch by Xavier de Gaye. + +- Issue #14696: Fix parser module to understand 'nonlocal' declarations. + +- Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near + the DST transition. Patch by Joe Peterson. + +- Issue #9154: Fix parser module to understand function annotations. + +- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the + client ip address instead client hostname. Patch by Charles-Fran?ois Natali. + +- Issue #14309: Deprecate time.clock(), use time.perf_counter() or + time.process_time() instead. + +- Issue #14428: Implement the PEP 418. Add time.get_clock_info(), + time.perf_counter() and time.process_time() functions, and rename + time.steady() to time.monotonic(). + +- Issue #14646: importlib.util.module_for_loader() now sets __loader__ and + __package__ (when possible). + +- Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a + test class that doesn't inherit from TestCase (i.e. a mixin). + +- Issue #4892: multiprocessing Connections can now be transferred over + multiprocessing Connections. Patch by Richard Oudkerk (sbt). + +- Issue #14160: TarFile.extractfile() failed to resolve symbolic links when + the links were not located in an archive subdirectory. + +- Issue #14638: pydoc now treats non-string __name__ values as if they + were missing, instead of raising an error. + +- Issue #13684: Fix httplib tunnel issue of infinite loops for certain sites + which send EOF without trailing \r\n. + +- Issue #14605: Add importlib.abc.FileLoader, importlib.machinery.(FileFinder, + SourceFileLoader, SourcelessFileLoader, ExtensionFileLoader). + +- Issue #13959: imp.cache_from_source()/source_from_cache() now follow + os.path.join()/split() semantics for path manipulation instead of its prior, + custom semantics of caring the right-most path separator forward in path + joining. + +- Issue #2193: Allow ":" character in Cookie NAME values. + +- Issue #14629: tokenizer.detect_encoding will specify the filename in the + SyntaxError exception if found at readline.__self__.name. + +- Issue #14629: Raise SyntaxError in tokenizer.detect_encoding if the + first two lines have non-UTF-8 characters without an encoding declaration. + +- Issue #14308: Fix an exception when a "dummy" thread is in the threading + module's active list after a fork(). + +- Issue #11750: The Windows API functions scattered in the _subprocess and + _multiprocessing.win32 modules now live in a single module "_winapi". + Patch by sbt. + +- Issue #14087: multiprocessing: add Condition.wait_for(). Patch by sbt. + +- Issue #14538: HTMLParser can now parse correctly start tags that contain + a bare '/'. + +- Issue #14452: SysLogHandler no longer inserts a UTF-8 BOM into the message. + +- Issue #14386: Expose the dict_proxy internal type as types.MappingProxyType. + +- Issue #13959: Make imp.reload() always use a module's __loader__ to perform + the reload. + +- Issue #13959: Add imp.py and rename the built-in module to _imp, allowing for + re-implementing parts of the module in pure Python. + +- Issue #13496: Fix potential overflow in bisect.bisect algorithm when applied + to a collection of size > sys.maxsize / 2. + +- Have importlib take advantage of ImportError's new 'name' and 'path' + attributes. + +- Issue #14399: zipfile now recognizes that the archive has been modified even + if only the comment is changed. In addition, the TypeError that results from + trying to set a non-binary value as a comment is now now raised at the time + the comment is set rather than at the time the zipfile is written. + +- trace.CoverageResults.is_ignored_filename() now ignores any name that starts + with "<" and ends with ">" instead of special-casing "" and + ". + +- IDLE can be launched as python -m idlelib + +- Issue #14295: Add unittest.mock + +- Issue #7652: Add --with-system-libmpdec option to configure for linking + the _decimal module against an installed libmpdec. + +- Issue #14380: MIMEText now defaults to utf-8 when passed non-ASCII unicode + with no charset specified. + +- Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on + OSX; avoid to call handle_connect in case of a disconnected socket which + was not meant to connect. + +- Issue #14204: The ssl module now has support for the Next Protocol + Negotiation extension, if available in the underlying OpenSSL library. + Patch by Colin Marc. + +- Issue #3035: Unused functions from tkinter are marked as pending deprecated. + +- Issue #12757: Fix the skipping of doctests when python is run with -OO so + that it works in unittest's verbose mode as well as non-verbose mode. + +- Issue #7652: Integrate the decimal floating point libmpdec library to speed + up the decimal module. Performance gains of the new C implementation are + between 10x and 100x, depending on the application. + +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)) (Patch by Guilherme Polo) + +- Issue #14269: SMTPD now conforms to the RFC and requires a HELO command + before MAIL, RCPT, or DATA. + +- Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr + attribute. + +- Issue #14344: fixed the repr of email.policy objects. + +- Issue #11686: Added missing entries to email package __all__ lists + (mostly the new Bytes classes). + +- Issue #14335: multiprocessing's custom Pickler subclass now inherits from + the C-accelerated implementation. Patch by sbt. + +- Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem. + +- Issue #11199: Fix the with urllib which hangs on particular ftp urls. + +- Improve the memory utilization and speed of functools.lru_cache. + +- Issue #14222: Use the new time.steady() function instead of time.time() for + timeout in queue and threading modules to not be affected of system time + update. + +- Issue #13248: Remove lib2to3.pytree.Base.get_prefix/set_prefix. + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + +- Issue #14200: Idle shell crash on printing non-BMP unicode character. + +- Issue #12818: format address no longer needlessly \ escapes ()s in names when + the name ends up being quoted. + +- Issue #14062: BytesGenerator now correctly folds Header objects, + including using linesep when folding. + +- Issue #13839: When invoked on the command-line, the pstats module now + accepts several filenames of profile stat files and merges them all. + Patch by Matt Joiner. + +- Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers + instead of raising an error. This fixes a regression relative to 2.7. + +- Issue #989712: Support using Tk without a mainloop. + +- Issue #5219: Prevent event handler cascade in IDLE. + +- Issue #3835: Refuse to use unthreaded Tcl in threaded Python. + +- Issue #2843: Add new Tk API to Tkinter. + +- Issue #14184: Increase the default stack size for secondary threads on + Mac OS X to avoid interpreter crashes when using threads on 10.7. + +- Issue #14180: datetime.date.fromtimestamp(), + datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() + now raise an OSError instead of ValueError if localtime() or gmtime() failed. + +- Issue #14180: time.ctime(), gmtime(), time.localtime(), + datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and + datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of + a ValueError, if the timestamp does not fit in time_t. + +- Issue #14180: datetime.datetime.fromtimestamp() and + datetime.datetime.utcfromtimestamp() now round microseconds towards zero + instead of rounding to nearest with ties going away from zero. + +- Issue #10543: Fix unittest test discovery with Jython bytecode files. + +- Issue #1178863: Separate initialisation from setting when initializing + Tkinter.Variables; harmonize exceptions to ValueError; only delete variables + that have not been deleted; assert that variable names are strings. + +- Issue #14104: Implement time.monotonic() on Mac OS X, patch written by + Nicholas Riley. + +- Issue #13394: the aifc module now uses warnings.warn() to signal warnings. + +- Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under + Windows when the child process has already exited. + +- Issue #14223: curses.addch() is no more limited to the range 0-255 when the + Python curses is not linked to libncursesw. It was a regression introduced + in Python 3.3a1. + +- Issue #14168: Check for presence of Element._attrs in minidom before + accessing it. + +- Issue #12328: Fix multiprocessing's use of overlapped I/O on Windows. + Also, add a multiprocessing.connection.wait(rlist, timeout=None) function + for polling multiple objects at once. Patch by sbt. + +- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end, + data or close method) for the Python implementation as well. + Drop the no-op TreeBuilder().xml() method from the C implementation. + +- Issue #14210: pdb now has tab-completion not only for command names, but + also for their arguments, wherever possible. + +- Issue #14310: Sockets can now be with other processes on Windows using + the api socket.socket.share() and socket.fromshare(). + +- Issue #10576: The gc module now has a 'callbacks' member that will get + called when garbage collection takes place. + +Build +----- + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14321: Do not run pgen during the build if files are up to date. + +Documentation +------------- + +- Issue #14034: added the argparse tutorial. + +- Issue #14324: Fix configure tests for cross builds. + +- Issue #14327: Call AC_CANONICAL_HOST in configure.ac and check in + config.{guess,sub}. Don't use uname calls for cross builds. + +Extension Modules +----------------- + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +- Issue #14259: The finditer() method of re objects did not take any + keyword arguments, contrary to the documentation. + +- Issue #10142: Support for SEEK_HOLE/SEEK_DATA (for example, under ZFS). + +Tests +----- + +- Issue #14442: Add missing errno import in test_smtplib. + +- Issue #8315: (partial fix) python -m unittest test.test_email now works. + + +What's New in Python 3.3.0 Alpha 1? +=================================== + +*Release date: 05-Mar-2012* + +Core and Builtins +----------------- + +- Issue #14172: Fix reference leak when marshalling a buffer-like object + (other than a bytes object). + +- Issue #13521: dict.setdefault() now does only one lookup for the given key, + making it "atomic" for many purposes. Patch by Filip Gruszczy?ski. + +- PEP 409, Issue #6210: "raise X from None" is now supported as a means of + suppressing the display of the chained exception context. The chained + context still remains available as the __context__ attribute. + +- Issue #10181: New memoryview implementation fixes multiple ownership + and lifetime issues of dynamically allocated Py_buffer members (#9990) + as well as crashes (#8305, #7433). Many new features have been added + (See whatsnew/3.3), and the documentation has been updated extensively. + The ndarray test object from _testbuffer.c implements all aspects of + PEP-3118, so further development towards the complete implementation + of the PEP can proceed in a test-driven manner. + + Thanks to Nick Coghlan, Antoine Pitrou and Pauli Virtanen for review + and many ideas. + +- Issue #12834: Fix incorrect results of memoryview.tobytes() for + non-contiguous arrays. + +- Issue #5231: Introduce memoryview.cast() method that allows changing + format and shape without making a copy of the underlying memory. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Upgrade Unicode data to Unicode 6.1. + +- Issue #14040: Remove rarely used file name suffixes for C extensions + (under POSIX mainly). + +- Issue #14051: Allow arbitrary attributes to be set of classmethod and + staticmethod. + +- Issue #13703: oCERT-2011-003: Randomize hashes of str and bytes to protect + against denial of service attacks due to hash collisions within the dict and + set types. Patch by David Malcolm, based on work by Victor Stinner. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Issue #12705: A SyntaxError exception is now raised when attempting to + compile multiple statements as a single interactive statement. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Issue #13752: Add a casefold() method to str. + +- Issue #13761: Add a "flush" keyword argument to the print() function, + used to ensure flushing the output stream. + +- Issue #13645: pyc files now contain the size of the corresponding source + code, to avoid timestamp collisions (especially on filesystems with a low + timestamp resolution) when checking for freshness of the bytecode. + +- PEP 380, Issue #11682: Add "yield from " to support easy delegation to + subgenerators (initial patch by Greg Ewing, integration into 3.3 by + Renaud Blanch, Ryan Kelly, Zbigniew J?drzejewski-Szmek and Nick Coghlan) + +- Issue #13748: Raw bytes literals can now be written with the ``rb`` prefix + as well as ``br``. + +- Issue #12736: Use full unicode case mappings for upper, lower, and title case. + +- Issue #12760: Add a create mode to open(). Patch by David Townshend. + +- Issue #13738: Simplify implementation of bytes.lower() and bytes.upper(). + +- Issue #13577: Built-in methods and functions now have a __qualname__. + Patch by sbt. + +- Issue #6695: Full garbage collection runs now clear the freelist of set + objects. Initial patch by Matthias Troffaes. + +- Fix OSError.__init__ and OSError.__new__ so that each of them can be + overriden and take additional arguments (followup to issue #12555). + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #13503: Use a more efficient reduction format for bytearrays with + pickle protocol >= 3. The old reduction format is kept with older protocols + in order to allow unpickling under Python 2. Patch by Irmen de Jong. + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #11849: Ensure that free()d memory arenas are really released + on POSIX systems supporting anonymous memory mappings. Patch by + Charles-Fran?ois Natali. + +- Issue #13452: PyUnicode_EncodeDecimal() doesn't support error handlers + different than "strict" anymore. The caller was unable to compute the + size of the output buffer: it depends on the error handler. + +- PEP 3155 / issue #13448: Qualified name for classes and functions. + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13411: memoryview objects are now hashable when the underlying + object is hashable. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #10227: Add an allocation cache for a single slice object. Patch by + Stefan Behnel. + +- Issue #13393: BufferedReader.read1() now asks the full requested size to + the raw stream instead of limiting itself to the buffer size. + +- Issue #13392: Writing a pyc file should now be atomic under Windows as well. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13389: Full garbage collection passes now clear the freelists for + list and dict objects. They already cleared other freelists in the + interpreter. + +- Issue #13327: Remove the need for an explicit None as the second argument + to os.utime, os.lutimes, os.futimes, os.futimens, os.futimesat, in + order to update to the current time. Also added keyword argument + handling to os.utimensat in order to remove the need for explicit None. + +- Issue #13350: Simplify some C code by replacing most usages of + PyUnicode_Format by PyUnicode_FromFormat. + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #9896: Add start, stop, and step attributes to range objects. + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: ``lambda *, + arg=GLOBAL_NAME: None`` + +- Issue #12797: Added custom opener parameter to builtin open() and + FileIO.open(). + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #13201: Define '==' and '!=' to compare range objects based on + the sequence of values they define (instead of comparing based on + object identity). + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12753: Add support for Unicode name aliases and named sequences. + Both ``unicodedata.lookup()`` and '\N{...}' now resolve aliases, + and ``unicodedata.lookup()`` resolves named sequences too. + +- Issue #12170: The count(), find(), rfind(), index() and rindex() methods + of bytes and bytearray objects now accept an integer between 0 and 255 + as their first argument. Patch by Petri Lehtinen. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #12281: Rewrite the MBCS codec to handle correctly replace and ignore + error handlers on all Windows versions. The MBCS codec is now supporting all + error handlers, instead of only replace to encode and ignore to decode. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #13146: Writing a pyc file is now atomic under POSIX. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. + +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() + and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to + the current locale encoding. + +- Add internal API for static strings (_Py_identifier et al.). + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- PEP 393: flexible string representation. Thanks to Torsten Becker for the + initial implementation, and Victor Stinner for various bug fixes. + +- Issue #14081: The 'sep' and 'maxsplit' parameter to str.split, bytes.split, + and bytearray.split may now be passed as keyword arguments. + +- Issue #13012: The 'keepends' parameter to str.splitlines may now be passed + as a keyword argument: "my_string.splitlines(keepends=True)". The same + change also applies to bytes.splitlines and bytearray.splitlines. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12904: os.utime, os.futimes, os.lutimes, and os.futimesat now write + atime and mtime with nanosecond precision on modern POSIX platforms. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12773: Make __doc__ mutable on user-defined classes. + +- Issue #12766: Raise a ValueError when creating a class with a class variable + that conflicts with a name in __slots__. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +- Issue #12732: In narrow unicode builds, allow Unicode identifiers which fall + outside the BMP. + +- Issue #12575: Validate user-generated AST before it is compiled. + +- Make type(None), type(Ellipsis), and type(NotImplemented) callable. They + return the respective singleton instances. + +- Forbid summing bytes with sum(). + +- Verify the types of AST strings and identifiers provided by the user before + compiling them. + +- Issue #12647: The None object now has a __bool__() method that returns False. + Formerly, bool(None) returned False only because of special case logic + in PyObject_IsTrue(). + +- Issue #12579: str.format_map() now raises a ValueError if used on a + format string that contains positional fields. Initial patch by + Julian Berman. + +- Issue #10271: Allow warnings.showwarning() be any callable. + +- Issue #11627: Fix segfault when __new__ on a exception returns a + non-exception class. + +- Issue #12149: Update the method cache after a type's dictionary gets + cleared by the garbage collector. This fixes a segfault when an instance + and its type get caught in a reference cycle, and the instance's + deallocator calls one of the methods on the type (e.g. when subclassing + IOBase). Diagnosis and patch by Davide Rizzo. + +- Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows. + +- Issue #9642: Uniformize the tests on the availability of the mbcs codec, add + a new HAVE_MBCS define. + +- Issue #9642: Fix filesystem encoding initialization: use the ANSI code page + on Windows if the mbcs codec is not available, and fail with a fatal error if + we cannot get the locale encoding (if nl_langinfo(CODESET) is not available) + instead of using UTF-8. + +- When a generator yields, do not retain the caller's exception state on the + generator. + +- Issue #12475: Prevent generators from leaking their exception state into the + caller's frame as they return for the last time. + +- Issue #12291: You can now load multiple marshalled objects from a stream, + with other data interleaved between marshalled objects. + +- Issue #12356: When required positional or keyword-only arguments are not + given, produce a informative error message which includes the name(s) of the + missing arguments. + +- Issue #12370: Fix super with no arguments when __class__ is overriden in the + class body. + +- Issue #12084: os.stat on Windows now works properly with relative symbolic + links when called from any directory. + +- Loosen type restrictions on the __dir__ method. __dir__ can now return any + sequence, which will be converted to a list and sorted by dir(). + +- Issue #12265: Make error messages produced by passing an invalid set of + arguments to a function more informative. + +- Issue #12225: Still allow Python to build if Python is not in its hg repo or + mercurial is not installed. + +- Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix + the following case: sys.stdin.read() stopped with CTRL+d (end of file), + raw_input() interrupted by CTRL+c. + +- Issue #12216: Allow unexpected EOF errors to happen on any line of the file. + +- Issue #12199: The TryExcept and TryFinally and AST nodes have been unified + into a Try node. + +- Issue #9670: Increase the default stack size for secondary threads on + Mac OS X and FreeBSD to reduce the chances of a crash instead of a + "maximum recursion depth" RuntimeError exception. + (patch by Ronald Oussoren) + +- Issue #12106: The use of the multiple-with shorthand syntax is now reflected + in the AST. + +- Issue #12190: Try to use the same filename object when compiling unmarshalling + a code objects in the same file. + +- Issue #12166: Move implementations of dir() specialized for various types into + the __dir__() methods of those types. + +- Issue #5715: In socketserver, close the server socket in the child process. + +- Correct lookup of __dir__ on objects. Among other things, this causes errors + besides AttributeError found on lookup to be propagated. + +- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal + module. Patch written by Charles-Fran?ois Natali. + +- Issue #1746656: Added the if_nameindex, if_indextoname, if_nametoindex + methods to the socket module. + +- Issue #12044: Fixed subprocess.Popen when used as a context manager to + wait for the process to end when exiting the context to avoid unintentionally + leaving zombie processes around. + +- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, + clear the end-of-file indicator after CTRL+d. + +- Issue #1856: Avoid crashes and lockups when daemon threads run while the + interpreter is shutting down; instead, these threads are now killed when + they try to take the GIL. + +- Issue #9756: When calling a method descriptor or a slot wrapper descriptor, + the check of the object type doesn't read the __class__ attribute anymore. + Fix a crash if a class override its __class__ attribute (e.g. a proxy of the + str type). Patch written by Andreas St?hrk. + +- Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* + APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch + by Charles-Fran?ois Natali. + +- Issue #10914: Initialize correctly the filesystem codec when creating a new + subinterpreter to fix a bootstrap issue with codecs implemented in Python, as + the ISO-8859-15 codec. + +- Issue #11918: OS/2 and VMS are no more supported because of the lack of + maintainer. + +- Issue #6780: fix starts/endswith error message to mention that tuples are + accepted too. + +- Issue #5057: fix a bug in the peepholer that led to non-portable pyc files + between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP + chars (e.g. "\U00012345"[0]). + +- Issue #11845: Fix typo in rangeobject.c that caused a crash in + compute_slice_indices. Patch by Daniel Urban. + +- Issue #5673: Added a `timeout` keyword argument to subprocess.Popen.wait, + subprocess.Popen.communicated, subprocess.call, subprocess.check_call, and + subprocess.check_output. If the blocking operation takes more than `timeout` + seconds, the `subprocess.TimeoutExpired` exception is raised. + +- Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted + (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch + written by Charles-Francois Natali. + +- Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. + +- Issue #10785: Store the filename as Unicode in the Python parser. + +- Issue #11619: _PyImport_LoadDynamicModule() doesn't encode the path to bytes + on Windows. + +- Issue #10998: Remove mentions of -Q, sys.flags.division_warning and + Py_DivisionWarningFlag left over from Python 2. + +- Issue #11244: Remove an unnecessary peepholer check that was preventing + negative zeros from being constant-folded properly. + +- Issue #11395: io.FileIO().write() clamps the data length to 32,767 bytes on + Windows if the file is a TTY to workaround a Windows bug. The Windows console + returns an error (12: not enough space error) on writing into stdout if + stdout mode is binary and the length is greater than 66,000 bytes (or less, + depending on heap usage). + +- Issue #11320: fix bogus memory management in Modules/getpath.c, leading to + a possible crash when calling Py_SetPath(). + +- Issue #11432: A bug was introduced in subprocess.Popen on posix systems with + 3.2.0 where the stdout or stderr file descriptor being the same as the stdin + file descriptor would raise an exception. webbrowser.open would fail. fixed. + +- Issue #9856: Change object.__format__ with a non-empty format string + to be a DeprecationWarning. In 3.2 it was a PendingDeprecationWarning. + In 3.4 it will be a TypeError. + +- Issue #11244: The peephole optimizer is now able to constant-fold + arbitrarily complex expressions. This also fixes a 3.2 regression where + operations involving negative numbers were not constant-folded. + +- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when + there are many tags (e.g. when using mq). Patch by Nadeem Vawda. + +- Issue #11335: Fixed a memory leak in list.sort when the key function + throws an exception. + +- Issue #8923: When a string is encoded to UTF-8 in strict mode, the result is + cached into the object. Examples: str.encode(), str.encode('utf-8'), + PyUnicode_AsUTF8String() and PyUnicode_AsEncodedString(unicode, "utf-8", + NULL). + +- Issue #10831: PyUnicode_FromFormat() supports %li, %lli and %zi formats. + +- Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse + the format string in the 3 steps, fix crashs on invalid format strings. + +- Issue #13007: whichdb should recognize gdbm 1.9 magic numbers. + +- Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from + UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode). + Patch written by Ray Allen. + +- Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with + a buffer struct having a NULL data pointer. + +- Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and + sys.stdin uses universal newline (replace '\r\n' by '\n'). + +- Issue #11828: startswith and endswith now accept None as slice index. + Patch by Torsten Becker. + +- Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on + narrow build. + +- Issue #11168: Remove filename debug variable from PyEval_EvalFrameEx(). + It encoded the Unicode filename to UTF-8, but the encoding fails on + undecodable filename (on surrogate characters) which raises an unexpected + UnicodeEncodeError on recursion limit. + +- Issue #11187: Remove bootstrap code (use ASCII) of + PyUnicode_AsEncodedString(), it was replaced by a better fallback (use the + locale encoding) in PyUnicode_EncodeFSDefault(). + +- Check for NULL result in PyType_FromSpec. + +- Issue #10516: New copy() and clear() methods for lists and bytearrays. + +- Issue #11386: bytearray.pop() now throws IndexError when the bytearray is + empty, instead of OverflowError. + +- Issue #12380: The rjust, ljust and center methods of bytes and bytearray + now accept a bytearray argument. + +Library +------- + +- Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly + return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been + fixed. + +- Issue #14166: Pickler objects now have an optional ``dispatch_table`` + attribute which allows to set custom per-pickler reduction functions. + Patch by sbt. + +- Issue #14177: marshal.loads() now raises TypeError when given an unicode + string. Patch by Guilherme Gon?alves. + +- Issue #13550: Remove the debug machinery from the threading module: remove + verbose arguments from all threading classes and functions. + +- Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary, + WeakValueDictionary) to return a better approximation when some objects + are dead or dying. Moreover, the implementation is now O(1) rather than + O(n). + +- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode. + Patch by Mikhail Novikov. + +- Issue #11841: Fix comparison bug with 'rc' versions in packaging.version. + Patch by Filip Gruszczy?ski. + +- Issue #13447: Add a test file to host regression tests for bugs in the + scripts found in the Tools directory. + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. Also fixed in packaging. + +- Issue #8033: sqlite3: Fix 64-bit integer handling in user functions + on 32-bit architectures. Initial patch by Philippe Devalkeneer. + +Extension Modules +----------------- + +- Issue #15676: Now "mmap" check for empty files before doing the + offset check. Patch by Steven Willis. + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields + of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +Tests +----- + +- Issue #15304: Fix warning message when os.chdir() fails inside + test.support.temp_cwd(). Patch by Chris Jerdonek. + +- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch + by Serhiy Storchaka. + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected + tests in test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using + two external hosts that have been configured specifically for this type + of test. + +- Issue #15615: Add some tests for the json module's handling of invalid + input data. Patch by Kushal Das. + +- Issue #15496: Add directory removal helpers for tests on Windows. + Patch by Jeremy Kloth. + +- Issue #15467: Move helpers for __sizeof__ tests into test_support. + Patch by Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running + tests in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15230: Adopted a more systematic approach in the runpy tests + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14026: In test_cmd_line_script, check that sys.argv is populated + correctly for the various invocation approaches (Patch by Jason Yeo) + +- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging + message (Patch by Jason Yeo) + +- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing + a test failure in test_ssl. + +Build +----- + +- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after + 2801bf875a24 (see #15801). + +- Issue #11715: Fix multiarch detection without having Debian development + tools (dpkg-dev) installed. + +- Issue #15819: Make sure we can build Python out-of-tree from a readonly + source directory. (Somewhat related to Issue #9860.) + +- Issue #15822: Ensure 2to3 grammar pickles are properly installed. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14197: For OS X framework builds, ensure links to the shared + library are created with the proper ABI suffix. + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14437: Fix building the _io module under Cygwin. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +Documentation +------------- + +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd + argument. + +- Issue #15979: Improve timeit documentation. + +- Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + +- Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +- Issue #14674: Add a discussion of the json module's standard compliance. + Patch by Chris Rebert. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch + by Serhiy Storchaka. + +- Issue 15482: Properly document the default 'level' value for __import__() + while warning about using negative values. + +- Issue #15230: Clearly document some of the limitations of the runpy + module and nudge readers towards importlib when appropriate. + +- Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + +- Issue #8799: Fix and improve the threading.Condition documentation. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + +- Issue #14034: added the argparse tutorial. + +- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tools/Demos +----------- + +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + +- Issue #14695: Fix missing support for starred assignments in + Tools/parser/unparse.py. + + +What's New in Python 3.2.3? +=========================== + +*Release date: 10-Apr-2012* + +Build +----- + +- Issue #14387: Work around a problem building extension modules under Windows + by undefining ``small`` before use in the Python headers. + + +What's New in Python 3.2.3 release candidate 2? +=============================================== + +*Release date: 18-Mar-2012* + +Library +------- + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. + +Extension Modules +----------------- + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + + +What's New in Python 3.2.3 release candidate 1? +=============================================== + +*Release date: 24-Feb-2012* + +Core and Builtins +----------------- + +- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED + environment variable, to provide an opt-in way to protect against denial of + service attacks due to hash collisions within the dict and set types. Patch + by David Malcolm, based on work by Victor Stinner. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: + (lambda *, arg=GLOBAL_NAME: None) + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +Library +------- + +- HTMLParser is now able to handle slashes in the start tag. + +- Issue #13641: Decoding functions in the base64 module now accept ASCII-only + unicode strings. Patch by Catalin Iacob. + +- Issue #14043: Speed up importlib's _FileFinder by at least 8x, and add a + new importlib.invalidate_caches() function. + +- Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in + SimpleXMLRPCServer upon malformed POST request. + +- Issue #13961: Move importlib over to using os.replace() for atomic renaming. + +- Do away with ambiguous level values (as suggested by PEP 328) in + importlib.__import__() by raising ValueError when level < 0. + +- Issue #2489: pty.spawn could consume 100% cpu when it encountered an EOF. + +- Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). + +- Issue #13777: Add PF_SYSTEM sockets on OS X. + Patch by Michael Goderbauer. + +- Issue #13015: Fix a possible reference leak in defaultdict.__repr__. + Patch by Suman Saha. + +- Issue #1326113: distutils' and packaging's build_ext commands option now + correctly parses multiple values (separated by whitespace or commas) given + to their --libraries option. + +- Issue #10287: nntplib now queries the server's CAPABILITIES first before + sending MODE READER, and only sends it if not already in READER mode. + Patch by Hynek Schlawack. + +- Issue #13993: HTMLParser is now able to handle broken end tags when + strict=False. + +- Issue #13930: lib2to3 now supports writing converted output files to another + directory tree as well as copying unchanged files and altering the file + suffix. + +- Issue #9750: Fix sqlite3.Connection.iterdump on tables and fields + with a name that is a keyword or contains quotes. Patch by Marko + Kohtala. + +- Issue #10287: nntplib now queries the server's CAPABILITIES again after + authenticating (since the result may change, according to RFC 4643). + Patch by Hynek Schlawack. + +- Issue #13989: Document that GzipFile does not support text mode, and give a + more helpful error message when opened with an invalid mode string. + +- Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building + Distutils-based packages with C extension modules may fail because + Apple has removed gcc-4.2, the version used to build python.org + 64-bit/32-bit Pythons. If the user does not explicitly override + the default C compiler by setting the CC environment variable, + Distutils will now attempt to compile extension modules with clang + if gcc-4.2 is required but not found. Also as a convenience, if + the user does explicitly set CC, substitute its value as the default + compiler in the Distutils LDSHARED configuration variable for OS X. + (Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u + SDK, neither of which are available in Xcode 4. This change does not + attempt to override settings to support their use with Xcode 4.) + +- Issue #13960: HTMLParser is now able to handle broken comments when + strict=False. + +- Issue #13921: Undocument and clean up sqlite3.OptimizedUnicode, + which is obsolete in Python 3.x. It's now aliased to str for + backwards compatibility. + +- When '' is a path (e.g. in sys.path), make sure __file__ uses the current + working directory instead of '' in importlib. + +- Issue #13609: Add two functions to query the terminal size: + os.get_terminal_size (low level) and shutil.get_terminal_size (high level). + Patch by Zbigniew J?drzejewski-Szmek. + +- Issue #13845: On Windows, time.time() now uses GetSystemTimeAsFileTime() + instead of ftime() to have a resolution of 100 ns instead of 1 ms (the clock + accuracy is between 0.5 ms and 15 ms). + +- Issue #13846: Add time.monotonic(), monotonic clock. + +- Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on + Connection sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to + make sure two listeners can't bind to the same socket/pipe (or any existing + socket/pipe). + +- Issue #10811: Fix recursive usage of cursors. Instead of crashing, + raise a ProgrammingError now. + +- Issue #10881: Fix test_site failure with OS X framework builds. + +- Issue #964437: Make IDLE help window non-modal. + Patch by Guilherme Polo and Roger Serwy. + +- Issue #13734: Add os.fwalk(), a directory walking function yielding file + descriptors. + +- Issue #2945: Make the distutils upload command aware of bdist_rpm products. + +- Issue #13712: pysetup create should not convert package_data to extra_files. + +- Issue #11805: package_data in setup.cfg should allow more than one value. + +- Issue #13933: IDLE auto-complete did not work with some imported + module, like hashlib. (Patch by Roger Serwy) + +- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared. + +- Issue #13676: Handle strings with embedded zeros correctly in sqlite3. + +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + +- Issue #8828: Add new function os.replace(), for cross-platform renaming + with overwriting. + +- Issue #13848: open() and the FileIO constructor now check for NUL + characters in the file name. Patch by Hynek Schlawack. + +- Issue #13806: The size check in audioop decompression functions was too + strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. + +- Issue #13812: When a multiprocessing Process child raises an exception, + flush stderr after printing the exception traceback. + +- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC + IV attack countermeasure. + +- Issue #13847: time.localtime() and time.gmtime() now raise an OSError instead + of ValueError on failure. time.ctime() and time.asctime() now raises an + OSError if localtime() failed. time.clock() now raises a RuntimeError if the + processor time used is not available or its value cannot be represented + +- Issue #13862: Fix spurious failure in test_zlib due to runtime/compile time + minor versions not matching. + +- Issue #12804: Fix test_socket and test_urllib2net failures when running tests + on a system without internet access. + +- Issue #13772: In os.symlink() under Windows, do not try to guess the link + target's type (file or directory). The detection was buggy and made the + call non-atomic (therefore prone to race conditions). + +- Issue #6631: Disallow relative file paths in urllib urlopen methods. + +- Issue #13722: Avoid silencing ImportErrors when initializing the codecs + registry. + +- Issue #13781: Fix GzipFile bug that caused an exception to be raised when + opening for writing using a fileobj returned by os.fdopen(). + +- Issue #13803: Under Solaris, distutils doesn't include bitness + in the directory name. + +- Issue #10278: Add time.wallclock() function, monotonic clock. + +- Issue #13809: Fix regression where bz2 module wouldn't work when threads are + disabled. Original patch by Amaury Forgeot d'Arc. + +- Issue #13589: Fix some serialization primitives in the aifc module. + Patch by Oleg Plakhotnyuk. + +- Issue #13642: Unquote before b64encoding user:password during Basic + Authentication. Patch contributed by Joonas Kuorilehto. + +- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow + tests. + +- Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. + The hang would occur when retrieving the result of a scheduled future after + the executor had been shut down. + +- Issue #13502: threading: Fix a race condition in Event.wait() that made it + return False when the event was set and cleared right after. + +- Issue #9993: When the source and destination are on different filesystems, + and the source is a symlink, shutil.move() now recreates a symlink on the + destination instead of copying the file contents. Patch by Jonathan Niehof + and Hynek Schlawack. + +- Issue #12926: Fix a bug in tarfile's link extraction. + +- Issue #13696: Fix the 302 Relative URL Redirection problem. + +- Issue #13636: Weak ciphers are now disabled by default in the ssl module + (except when SSLv2 is explicitly asked for). + +- Issue #12715: Add an optional symlinks argument to shutil functions + (copyfile, copymode, copystat, copy, copy2). When that parameter is + true, symlinks aren't dereferenced and the operation instead acts on the + symlink itself (or creates one, if relevant). Patch by Hynek Schlawack. + +- Add a flags parameter to select.epoll. + +- Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the + SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. + +- Issue #11006: Don't issue low level warning in subprocess when pipe2() fails. + +- Issue #13620: Support for Chrome browser in webbrowser. Patch contributed + by Arnaud Calmettes. + +- Issue #11829: Fix code execution holes in inspect.getattr_static for + metaclasses with metaclasses. Patch by Andreas St?hrk. + +- Issue #12708: Add starmap() and starmap_async() methods (similar to + itertools.starmap()) to multiprocessing.Pool. Patch by Hynek Schlawack. + +- Issue #1785: Fix inspect and pydoc with misbehaving descriptors. + +- Issue #13637: "a2b" functions in the binascii module now accept ASCII-only + unicode strings. + +- Issue #13634: Add support for querying and disabling SSL compression. + +- Issue #13627: Add support for SSL Elliptic Curve-based Diffie-Hellman + key exchange, through the SSLContext.set_ecdh_curve() method and the + ssl.OP_SINGLE_ECDH_USE option. + +- Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers + choose the cipher based on their own preferences, rather than on the + client's. + +- Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas + St?hrk. + +- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by + C?dric Krier. + +- Issue #11870: threading: Properly reinitialize threads internal locks and + condition variables to avoid deadlocks in child processes. + +- Issue #8035: urllib: Fix a bug where the client could remain stuck after a + redirection or an error. + +- Issue #13560: os.strerror() now uses the current locale encoding instead of + UTF-8. + +- Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem + encoding and the surrogateescape error handler, rather than UTF-8. Patch + by David Watson. + +- Issue #10350: Read and save errno before calling a function which might + overwrite it. Original patch by Hallvard B Furuseth. + +- Issue #11610: Introduce a more general way to declare abstract properties. + +- Issue #13591: A bug in importlib has been fixed that caused import_module + to load a module twice. + +- Issue #4625: If IDLE cannot write to its recent file or breakpoint files, + display a message popup and continue rather than crash. Original patch by + Roger Serwy. + +- Issue #13449 sched.scheduler.run() method has a new "blocking" parameter which + when set to False makes run() execute the scheduled events due to expire + soonest (if any) and then return. Patch by Giampaolo Rodol?. + +- Issue #8684 sched.scheduler class can be safely used in multi-threaded + environments. Patch by Josiah Carlson and Giampaolo Rodol?. + +- Alias resource.error to OSError ala PEP 3151. + +- Issue #5689: Add support for lzma compression to the tarfile module. + +- Issue #13248: Turn 3.2's PendingDeprecationWarning into 3.3's + DeprecationWarning. It covers 'cgi.escape', 'importlib.abc.PyLoader', + 'importlib.abc.PyPycLoader', 'nntplib.NNTP.xgtitle', 'nntplib.NNTP.xpath', + and private attributes of 'smtpd.SMTPChannel'. + +- Issue #5905, #13560: time.strftime() is now using the current locale + encoding, instead of UTF-8, if the wcsftime() function is not available. + +- Issue #8641: Update IDLE 3 syntax coloring to recognize b".." and not u"..". + Patch by Tal Einat. + +- Issue #13464: Add a readinto() method to http.client.HTTPResponse. Patch + by Jon Kuhn. + +- tarfile.py: Correctly detect bzip2 compressed streams with blocksizes + other than 900k. + +- Issue #13439: Fix many errors in turtle docstrings. + +- Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm. + Thanks to Per ?yvind Karlsen for the initial implementation. + +- Issue #13487: Make inspect.getmodule robust against changes done to + sys.modules while it is iterating over it. + +- Issue #12618: Fix a bug that prevented py_compile from creating byte + compiled files in the current directory. Initial patch by Sjoerd de Vries. + +- Issue #13444: When stdout has been closed explicitly, we should not attempt + to flush it at shutdown and print an error. + +- Issue #12567: The curses module uses Unicode functions for Unicode arguments + when it is linked to the ncurses library. It encodes also Unicode strings to + the locale encoding instead of UTF-8. + +- Issue #12856: Ensure child processes do not inherit the parent's random + seed for filename generation in the tempfile module. Patch by Brian + Harring. + +- Issue #9957: SpooledTemporaryFile.truncate() now accepts an optional size + parameter, as other file-like objects. Patch by Ryan Kelly. + +- Issue #13458: Fix a memory leak in the ssl module when decoding a + certificate with a subjectAltName. Patch by Robert Xiao. + +- Issue #13415: os.unsetenv() doesn't ignore errors anymore. + +- Issue #13245: sched.scheduler class constructor's timefunc and + delayfunct parameters are now optional. + scheduler.enter and scheduler.enterabs methods gained a new kwargs parameter. + Patch contributed by Chris Clark. + +- Issue #12328: Under Windows, refactor handling of Ctrl-C events and + make _multiprocessing.win32.WaitForMultipleObjects interruptible when + the wait_flag parameter is false. Patch by sbt. + +- Issue #13322: Fix BufferedWriter.write() to ensure that BlockingIOError is + raised when the wrapped raw file is non-blocking and the write would block. + Previous code assumed that the raw write() would raise BlockingIOError, but + RawIOBase.write() is defined to returned None when the call would block. + Patch by sbt. + +- Issue #13358: HTMLParser now calls handle_data only once for each CDATA. + +- Issue #4147: minidom's toprettyxml no longer adds whitespace around a text + node when it is the only child of an element. Initial patch by Dan + Kenigsberg. + +- Issue #13374: The Windows bytes API has been deprecated in the os module. Use + Unicode filenames instead of bytes filenames to not depend on the ANSI code + page anymore and to support any filename. + +- Issue #13297: Use bytes type to send and receive binary data through XMLRPC. + +- Issue #6397: Support "/dev/poll" polling objects in select module, + under Solaris & derivatives. + +- Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly + handles non-valid attributes, including adjacent and unquoted attributes. + +- Issue #13193: Fix distutils.filelist.FileList and packaging.manifest.Manifest + under Windows. + +- Issue #13384: Remove unnecessary __future__ import in Lib/random.py + +- Issue #13149: Speed up append-only StringIO objects. + +- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely + when called with a timeout. Patch by Arnaud Ysmal. + +- Issue #13254: Fix Maildir initialization so that maildir contents + are read correctly. + +- Issue #3067: locale.setlocale() now raises TypeError if the second + argument is an invalid iterable. Its documentation and docstring + were also updated. Initial patch by Jyrki Pulliainen. + +- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. + +- Issue #13339: Fix compile error in posixmodule.c due to missing semicolon. + Thanks to Robert Xiao. + +- Byte compilation in packaging is now isolated from the calling Python -B or + -O options, instead of being disallowed under -B or buggy under -O. + +- Issue #10570: curses.putp() and curses.tparm() are now expecting a byte + string, instead of a Unicode string. + +- Issue #13295: http.server now produces valid HTML 4.01 strict. + +- Issue #2892: preserve iterparse events in case of SyntaxError. + +- Issue #13287: urllib.request and urllib.error now contains an __all__ + attribute to expose only relevant classes and functions. Patch by Florent + Xicluna. + +- Issue #670664: Fix HTMLParser to correctly handle the content of + ```` and ````. + +- Issue #10817: Fix urlretrieve function to raise ContentTooShortError even + when reporthook is None. Patch by Jyrki Pulliainen. + +- Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + +- Fix the xmlrpc.client user agent to return something similar to + urllib.request user agent: "Python-xmlrpc/3.3". + +- Issue #13293: Better error message when trying to marshal bytes using + xmlrpc.client. + +- Issue #13291: NameError in xmlrpc package. + +- Issue #13258: Use callable() built-in in the standard library. + +- Issue #13273: fix a bug that prevented HTMLParser to properly detect some + tags when strict=False. + +- Issue #11183: Add finer-grained exceptions to the ssl module, so that + you don't have to inspect the exception's attributes in the common case. + +- Issue #13216: Add cp65001 codec, the Windows UTF-8 (CP_UTF8). + +- Issue #13226: Add RTLD_xxx constants to the os module. These constants can be + used with sys.setdlopenflags(). + +- Issue #10278: Add clock_getres(), clock_gettime() and CLOCK_xxx constants to + the time module. time.clock_gettime(time.CLOCK_MONOTONIC) provides a + monotonic clock + +- Issue #10332: multiprocessing: fix a race condition when a Pool is closed + before all tasks have completed. + +- Issue #13255: wrong docstrings in array module. + +- Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. + +- Issue #13235: Added DeprecationWarning to logging.warn() method and function. + +- Issue #9168: now smtpd is able to bind privileged port. + +- Issue #12529: fix cgi.parse_header issue on strings with double-quotes and + semicolons together. Patch by Ben Darnell and Petri Lehtinen. + +- Issue #13227: functools.lru_cache() now has a option to distinguish + calls with different argument types. + +- Issue #6090: zipfile raises a ValueError when a document with a timestamp + earlier than 1980 is provided. Patch contributed by Petri Lehtinen. + +- Issue #13150: sysconfig no longer parses the Makefile and config.h files + when imported, instead doing it at build time. This makes importing + sysconfig faster and reduces Python startup time by 20%. + +- Issue #12448: smtplib now flushes stdout while running ``python -m smtplib`` + in order to display the prompt correctly. + +- Issue #12454: The mailbox module is now using ASCII, instead of the locale + encoding, to read and write .mh_sequences files. + +- Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are + now available on Windows. + +- Issue #1673007: urllib.request now supports HEAD request via new method argument. + Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. + +- Issue #12386: packaging does not fail anymore when writing the RESOURCES + file. + +- Issue #13158: Fix decoding and encoding of GNU tar specific base-256 number + fields in tarfile. + +- Issue #13025: mimetypes is now reading MIME types using the UTF-8 encoding, + instead of the locale encoding. + +- Issue #10653: On Windows, use strftime() instead of wcsftime() because + wcsftime() doesn't format time zone correctly. + +- Issue #13150: The tokenize module doesn't compile large regular expressions + at startup anymore. + +- Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was + configured with different prefix and exec-prefix. + +- Issue #11254: Teach distutils and packaging to compile .pyc and .pyo files in + PEP 3147-compliant __pycache__ directories. + +- Issue #7367: Fix pkgutil.walk_paths to skip directories whose + contents cannot be read. + +- Issue #3163: The struct module gets new format characters 'n' and 'N' + supporting C integer types ``ssize_t`` and ``size_t``, respectively. + +- Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. + Reported and diagnosed by Thomas Kluyver. + +- Issue #13087: BufferedReader.seek() now always raises UnsupportedOperation + if the underlying raw stream is unseekable, even if the seek could be + satisfied using the internal buffer. Patch by John O'Connor. + +- Issue #7689: Allow pickling of dynamically created classes when their + metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig + Citro. + +- Issue #13034: When decoding some SSL certificates, the subjectAltName + extension could be unreported. + +- Issue #9871: Prevent IDLE 3 crash when given byte stings + with invalid hex escape sequences, like b'\x0'. + (Original patch by Claudiu Popa.) + +- Issue #12306: Expose the runtime version of the zlib C library as a constant, + ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff. + +- Issue #12959: Add collections.ChainMap to collections.__all__. + +- Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will + now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or + Download-URL field is present. + +- Issue #12567: Add curses.unget_wch() function. Push a character so the next + get_wch() will return it. + +- Issue #9561: distutils and packaging now writes egg-info files using UTF-8, + instead of the locale encoding. + +- Issue #8286: The distutils command sdist will print a warning message instead + of crashing when an invalid path is given in the manifest template. + +- Issue #12841: tarfile unnecessarily checked the existence of numerical user + and group ids on extraction. If one of them did not exist the respective id + of the current user (i.e. root) was used for the file and ownership + information was lost. + +- Issue #12888: Fix a bug in HTMLParser.unescape that prevented it to escape + more than 128 entities. Patch by Peter Otten. + +- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses. + +- Issue #12636: IDLE reads the coding cookie when executing a Python script. + +- Issue #12494: On error, call(), check_call(), check_output() and + getstatusoutput() functions of the subprocess module now kill the process, + read its status (to avoid zombis) and close pipes. + +- Issue #12720: Expose low-level Linux extended file attribute functions in os. + +- Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi + now respect a --skip-build option given to bdist. The packaging commands + were fixed too. + +- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in + the C pickle implementation. + +- Issue #11564: Avoid crashes when trying to pickle huge objects or containers + (more than 2**31 items). Instead, in most cases, an OverflowError is raised. + +- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is + greater than FD_SETSIZE. + +- Issue #12839: Fix crash in zlib module due to version mismatch. + Fix by Richard M. Tew. + +- Issue #9923: The mailcap module now correctly uses the platform path + separator for the MAILCAP environment variable on non-POSIX platforms. + +- Issue #12835: Follow up to #6560 that unconditionally prevents use of the + unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David + Watson. + +- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument + to be used if the private key is encrypted. Patch by Adam Simpkins. + +- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing + Pipe. + +- Issue #12811: tabnanny.check() now promptly closes checked files. Patch by + Anthony Briggs. + +- Issue #6560: The sendmsg/recvmsg API is now exposed by the socket module + when provided by the underlying platform, supporting processing of + ancillary data in pure Python code. Patch by David Watson and Heiko Wundram. + +- Issue #12326: On Linux, sys.platform doesn't contain the major version + anymore. It is now always 'linux', instead of 'linux2' or 'linux3' depending + on the Linux version used to build Python. + +- Issue #12213: Fix a buffering bug with interleaved reads and writes that + could appear on BufferedRandom streams. + +- Issue #12778: Reduce memory consumption when JSON-encoding a large + container of many small objects. + +- Issue #12650: Fix a race condition where a subprocess.Popen could leak + resources (FD/zombie) when killed at the wrong time. + +- Issue #12744: Fix inefficient representation of integers between 2**31 and + 2**63 on systems with a 64-bit C "long". + +- Issue #12646: Add an 'eof' attribute to zlib.Decompress, to make it easier to + detect truncated input streams. + +- Issue #11513: Fix exception handling ``tarfile.TarFile.gzopen()`` when + the file cannot be opened. + +- Issue #12687: Fix a possible buffering bug when unpickling text mode + (protocol 0, mostly) pickles. + +- Issue #10087: Fix the html output format of the calendar module. + +- Issue #12540: Prevent zombie IDLE processes on Windows due to changes + in os.kill(). + +- Issue #13121: add support for inplace math operators to collections.Counter. + +- Add support for unary plus and unary minus to collections.Counter. + +- Issue #12683: urlparse updated to include svn as schemes that uses relative + paths. (svn from 1.5 onwards support relative path). + +- Issue #12655: Expose functions from sched.h in the os module: sched_yield(), + sched_setscheduler(), sched_getscheduler(), sched_setparam(), + sched_get_min_priority(), sched_get_max_priority(), sched_rr_get_interval(), + sched_getaffinity(), sched_setaffinity(). + +- Add ThreadError to threading.__all__. + +- Issues #11104, #8688: Fix the behavior of distutils' sdist command with + manually-maintained MANIFEST files. + +- Issue #11281: smtplib.STMP gets source_address parameter, which adds the + ability to bind to specific source address on a machine with multiple + interfaces. Patch by Paulo Scardine. + +- Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow + symlinks: fix it. Patch by Petri Lehtinen. + +- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') + in Python code) now finds the doc of the method. + +- Issue #10968: Remove indirection in threading. The public names (Event, + Condition, etc.) used to be factory functions returning instances of hidden + classes (_Event, _Condition, etc.), because (if Guido recalls correctly) this + code pre-dates the ability to subclass extension types. It is now possible + to inherit from these classes, without having to import the private + underscored names like multiprocessing did. + +- Issue #9723: Add shlex.quote functions, to escape filenames and command + lines. + +- Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. + +- Issue #12514: Use try/finally to assure the timeit module restores garbage + collections when it is done. + +- Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is + given as a low fd, it gets overwritten. + +- Issue #12590: IDLE editor window now always displays the first line + when opening a long file. With Tk 8.5, the first line was hidden. + +- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates) + Connection:close header. + +- Issue #12102: Document that buffered files must be flushed before being used + with mmap. Patch by Steffen Daode Nurpmeso. + +- Issue #12560: Build libpython.so on OpenBSD. Patch by Stefan Sperling. + +- Issue #1813: Fix codec lookup under Turkish locales. + +- Issue #12591: Improve support of "universal newlines" in the subprocess + module: the piped streams can now be properly read from or written to. + +- Issue #12591: Allow io.TextIOWrapper to work with raw IO objects (without + a read1() method), and add a *write_through* parameter to mandate + unbuffered writes. + +- Issue #10883: Fix socket leaks in urllib.request when using FTP. + +- Issue #12592: Make Python build on OpenBSD 5 (and future major releases). + +- Issue #12372: POSIX semaphores are broken on AIX: don't use them. + +- Issue #12551: Provide a get_channel_binding() method on SSL sockets so as + to get channel binding data for the current SSL session (only the + "tls-unique" channel binding is implemented). This allows the implementation + of certain authentication mechanisms such as SCRAM-SHA-1-PLUS. Patch by + Jacek Konieczny. + +- Issue #665194: email.utils now has format_datetime and parsedate_to_datetime + functions, allowing for round tripping of RFC2822 format dates. + +- Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2 + directory, so that "import DLFCN" and other similar imports work on + Linux 3.0. + +- Issue #7484: smtplib no longer puts <> around addresses in VRFY and EXPN + commands; they aren't required and in fact postfix doesn't support that form. + +- Issue #12273: Remove ast.__version__. AST changes can be accounted for by + checking sys.version_info or sys._mercurial. + +- Silence spurious "broken pipe" tracebacks when shutting down a + ProcessPoolExecutor. + +- Fix potential resource leaks in concurrent.futures.ProcessPoolExecutor + by joining all queues and processes when shutdown() is called. + +- Issue #11603: Fix a crash when __str__ is rebound as __repr__. Patch by + Andreas St?hrk. + +- Issue #11321: Fix a crash with multiple imports of the _pickle module when + embedding Python. Patch by Andreas St?hrk. + +- Issue #6755: Add get_wch() method to curses.window class. Patch by I?igo + Serna. + +- Add cgi.closelog() function to close the log file. + +- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets. + +- Issue #4376: ctypes now supports nested structures in a endian different than + the parent structure. Patch by Vlad Riscutia. + +- Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a + TextIOWrapper to a huge value, not TypeError. + +- Issue #12504: Close file handles in a timely manner in packaging.database. + This fixes a bug with the remove (uninstall) feature on Windows. + +- Issues #12169 and #10510: Factor out code used by various packaging commands + to make HTTP POST requests, and make sure it uses CRLF. + +- Issue #12016: Multibyte CJK decoders now resynchronize faster. They only + ignore the first byte of an invalid byte sequence. For example, + b'\xff\n'.decode('gb2312', 'replace') gives '\ufffd\n' instead of '\ufffd'. + +- Issue #12459: time.sleep() now raises a ValueError if the sleep length is + negative, instead of an infinite sleep on Windows or raising an IOError on + Linux for example, to have the same behaviour on all platforms. + +- Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support + Python scripts using a encoding different than UTF-8 (read the coding cookie + of the script). + +- Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors + if the process has only one pipe. + +- Issue #12467: warnings: fix a race condition if a warning is emitted at + shutdown, if globals()['__file__'] is None. + +- Issue #12451: pydoc: importfile() now opens the Python script in binary mode, + instead of text mode using the locale encoding, to avoid encoding issues. + +- Issue #12451: runpy: run_path() now opens the Python script in binary mode, + instead of text mode using the locale encoding, to support other encodings + than UTF-8 (scripts using the coding cookie). + +- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead + of the text mode (using the locale encoding) to avoid encoding issues. + +- Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better + conformance to the RFCs: correctly handle Sender and Resent- headers. + +- Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by + the garbage collector while the Heap lock is held. + +- Issue #12462: time.sleep() now immediately calls the (Python) signal handler + if it is interrupted by a signal, instead of having to wait until the next + instruction. + +- Issue #12442: new shutil.disk_usage function, providing total, used and free + disk space statistics. + +- Issue #12451: The XInclude default loader of xml.etree now decodes files from + UTF-8 instead of the locale encoding if the encoding is not specified. It now + also opens XML files for the parser in binary mode instead of the text mode + to avoid encoding issues. + +- Issue #12451: doctest.debug_script() doesn't create a temporary file + anymore to avoid encoding issues. + +- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, + to read the Python script from the right encoding. + +- Issue #12451: distutils now opens the setup script in binary mode to read the + encoding cookie, instead of opening it in UTF-8. + +- Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to + check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the + interpreter process. This could cause failures in non-Distutils subprocesses + and was unreliable since tests or user programs could modify the interpreter + environment after Distutils set it. Instead, have Distutils set the the + deployment target only in the environment of each build subprocess. It is + still possible to globally override the default by setting + MACOSX_DEPLOYMENT_TARGET before launching the interpreter; its value must be + greater or equal to the default value, the value with which the interpreter + was built. Also, implement the same handling in packaging. + +- Issue #12422: In the copy module, don't store objects that are their own copy + in the memo dict. + +- Issue #12303: Add sigwaitinfo() and sigtimedwait() to the signal module. + +- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira + Kitada. + +- Issue #1874: email now detects and reports as a defect the presence of + any CTE other than 7bit, 8bit, or binary on a multipart. + +- Issue #12383: Fix subprocess module with env={}: don't copy the environment + variables, start with an empty environment. + +- Issue #11637: Fix support for importing packaging setup hooks from the + project directory. + +- Issue #6771: Moved the curses.wrapper function from the single-function + wrapper module into __init__, eliminating the module. Since __init__ was + already importing the function to curses.wrapper, there is no API change. + +- Issue #11584: email.header.decode_header no longer fails if the header + passed to it is a Header object, and Header/make_header no longer fail + if given binary unknown-8bit input. + +- Issue #11700: mailbox proxy object close methods can now be called multiple + times without error. + +- Issue #11767: Correct file descriptor leak in mailbox's __getitem__ method. + +- Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP + connection if its getresponse() method fails with a socket error. Patch + written by Ezio Melotti. + +- Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files. + Original patch by Erik Bray. + +- Issue #9284: Allow inspect.findsource() to find the source of doctest + functions. + +- Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a + compatibility helper for the distutils-packaging transition. Original patch + by Erik Bray. + +- Issue #12287: In ossaudiodev, check that the device isn't closed in several + methods. + +- Issue #12009: Fixed regression in netrc file comment handling. + +- Issue #12246: Warn and fail when trying to install a third-party project from + an uninstalled Python (built in a source checkout). Original patch by + Tshepang Lekhonkhobe. + +- Issue #10694: zipfile now ignores garbage at the end of a zipfile. + +- Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA. + +- Issue #10424: Argparse now includes the names of the missing required + arguments in the missing arguments error message. + +- Issue #12168: SysLogHandler now allows NUL termination to be controlled using + a new 'append_nul' attribute on the handler. + +- Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes + instead of os.stat. + +- Issue #12021: Make mmap's read() method argument optional. Patch by Petri + Lehtinen. + +- Issue #9205: concurrent.futures.ProcessPoolExecutor now detects killed + children and raises BrokenProcessPool in such a situation. Previously it + would reliably freeze/deadlock. + +- Issue #12040: Expose a new attribute ``sentinel`` on instances of + ``multiprocessing.Process``. Also, fix Process.join() to not use polling + anymore, when given a timeout. + +- Issue #11893: Remove obsolete internal wrapper class ``SSLFakeFile`` in the + smtplib module. Patch by Catalin Iacob. + +- Issue #12080: Fix a Decimal.power() case that took an unreasonably long time + to compute. + +- Issue #12221: Remove __version__ attributes from pyexpat, pickle, tarfile, + pydoc, tkinter, and xml.parsers.expat. This were useless version constants + left over from the Mercurial transition + +- Named tuples now work correctly with vars(). + +- Issue #12085: Fix an attribute error in subprocess.Popen destructor if the + constructor has failed, e.g. because of an undeclared keyword argument. Patch + written by Oleg Oshmyan. + +- Issue #12028: Make threading._get_ident() public, rename it to + threading.get_ident() and document it. This function was already used using + _thread.get_ident(). + +- Issue #12171: IncrementalEncoder.reset() of CJK codecs (multibytecodec) calls + encreset() instead of decreset(). + +- Issue #12218: Removed wsgiref.egg-info. + +- Issue #12196: Add pipe2() to the os module. + +- Issue #985064: Make plistlib more resilient to faulty input plists. + Patch by Mher Movsisyan. + +- Issue #1625: BZ2File and bz2.decompress() now support multi-stream files. + Initial patch by Nir Aides. + +- Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available. + +- Issue #12175: FileIO.readall() now only reads the file position and size + once. + +- Issue #12175: RawIOBase.readall() now returns None if read() returns None. + +- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError + if the file is closed. + +- Issue #11109: New service_action method for BaseServer, used by ForkingMixin + class for cleanup. Initial Patch by Justin Warkentin. + +- Issue #12045: Avoid duplicate execution of command in + ctypes.util._get_soname(). Patch by Sijin Joseph. + +- Issue #10818: Remove the Tk GUI and the serve() function of the pydoc module, + pydoc -g has been deprecated in Python 3.2 and it has a new enhanced web + server. + +- Issue #1441530: In imaplib, read the data in one chunk to speed up large + reads and simplify code. + +- Issue #12070: Fix the Makefile parser of the sysconfig module to handle + correctly references to "bogus variable" (e.g. "prefix=$/opt/python"). + +- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to + their encode() method anymore, but continue to call the reset() method if the + final argument is True. + +- Issue #12049: Add RAND_bytes() and RAND_pseudo_bytes() functions to the ssl + module. + +- Issue #6501: os.device_encoding() returns None on Windows if the application + has no console. + +- Issue #12105: Add O_CLOEXEC to the os module. + +- Issue #12079: Decimal('Infinity').fma(Decimal('0'), (3.91224318126786e+19+0j)) + now raises TypeError (reflecting the invalid type of the 3rd argument) rather + than Decimal.InvalidOperation. + +- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore + to be able to unload the module. + +- Add the packaging module, an improved fork of distutils (also known as + distutils2). + +- Issue #12065: connect_ex() on an SSL socket now returns the original errno + when the socket's timeout expires (it used to return None). + +- Issue #8809: The SMTP_SSL constructor and SMTP.starttls() now support + passing a ``context`` argument pointing to an ssl.SSLContext instance. + Patch by Kasun Herath. + +- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX + with Tk 8.5. + +- Issue #9516: Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET + is set in shell. + +- Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and + their incremental counterparts now raise OverflowError if given an input + larger than 4GB, instead of silently truncating the input and returning + an incorrect result. + +- Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail + attribute when called without a max_length argument. + +- Issue #12062: Fix a flushing bug when doing a certain type of I/O sequence + on a file opened in read+write mode (namely: reading, seeking a bit forward, + writing, then seeking before the previous write but still within buffered + data, and writing again). + +- Issue #9971: Write an optimized implementation of BufferedReader.readinto(). + Patch by John O'Connor. + +- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError. + With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused + IDLE to exit. Converted to valid Unicode null in PythonCmd(). + +- Issue #11799: urllib.request Authentication Handlers will raise a ValueError + when presented with an unsupported Authentication Scheme. Patch contributed + by Yuval Greenfield. + +- Issue #10419, #6011: build_scripts command of distutils handles correctly + non-ASCII path (path to the Python executable). Open and write the script in + binary mode, but ensure that the shebang is decodable from UTF-8 and from the + encoding of the script. + +- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in + order to accept exactly one connection. Patch by Daniel Evers. + +- Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, + instead of a RuntimeError: OSError has an errno attribute. + +- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which + manages the sending of headers to output stream and flushing the internal + headers buffer. Patch contribution by Andrew Schaaf + +- Issue #11743: Rewrite multiprocessing connection classes in pure Python. + +- Issue #11164: Stop trying to use _xmlplus in the xml module. + +- Issue #11888: Add log2 function to math module. Patch written by Mark + Dickinson. + +- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional. + +- Issue #8407: The signal handler writes the signal number as a single byte + instead of a nul byte into the wakeup file descriptor. So it is possible to + wait more than one signal and know which signals were raised. + +- Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to the + signal module. + +- Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch + by Kasun Herath. + +- Issue #12002: ftplib's abort() method raises TypeError. + +- Issue #11916: Add a number of MacOSX specific definitions to the errno module. + Patch by Pierre Carrier. + +- Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to + detect mtime changes by comparing to the system clock instead of to the + previous value of the mtime. + +- Issue #11072: added MLSD command (RFC-3659) support to ftplib. + +- Issue #8808: The IMAP4_SSL constructor now allows passing an SSLContext + parameter to control parameters of the secure channel. Patch by Sijin + Joseph. + +- ntpath.samefile failed to notice that "a.txt" and "A.TXT" refer to the same + file on Windows XP. As noticed in issue #10684. + +- Issue #12000: When a SSL certificate has a subjectAltName without any + dNSName entry, ssl.match_hostname() should use the subject's commonName. + Patch by Nicolas Bareil. + +- Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and + assertWarnsRegex now accept a keyword argument 'msg' when used as context + managers. Initial patch by Winston Ewert. + +- Issue #10684: shutil.move used to delete a folder on case insensitive + filesystems when the source and destination name where the same except + for the case. + +- Issue #11647: objects created using contextlib.contextmanager now support + more than one call to the function when used as a decorator. Initial patch + by Ysj Ray. + +- Issue #11930: Removed deprecated time.accept2dyear variable. + Removed year >= 1000 restriction from datetime.strftime. + +- logging: don't define QueueListener if Python has no thread support. + +- functools.cmp_to_key() now works with collections.Hashable(). + +- Issue #11277: mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X to get + around a mmap bug with sparse files. Patch written by Steffen Daode Nurpmeso. + +- Issue #8407: Add signal.pthread_sigmask() function to fetch and/or change the + signal mask of the calling thread. + +- Issue #11858: configparser.ExtendedInterpolation expected lower-case section + names. + +- Issue #11324: ConfigParser(interpolation=None) now works correctly. + +- Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch + by Charles-Fran?ois Natali. + +- Issue #11763: don't use difflib in TestCase.assertMultiLineEqual if the + strings are too long. + +- Issue #11236: getpass.getpass responds to ctrl-c or ctrl-z on terminal. + +- Issue #11856: Speed up parsing of JSON numbers. + +- Issue #11005: threading.RLock()._release_save() raises a RuntimeError if the + lock was not acquired. + +- Issue #11258: Speed up ctypes.util.find_library() under Linux by a factor + of 5 to 10. Initial patch by Jonas H. + +- Issue #11382: Trivial system calls, such as dup() or pipe(), needn't + release the GIL. Patch by Charles-Fran?ois Natali. + +- Issue #11223: Add threading._info() function providing informations about + the thread implementation. + +- Issue #11731: simplify/enhance email parser/generator API by introducing + policy objects. + +- Issue #11768: The signal handler of the signal module only calls + Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or + parallel calls. PyErr_SetInterrupt() writes also into the wake up file. + +- Issue #11492: fix several issues with header folding in the email package. + +- Issue #11852: Add missing imports and update tests. + +- Issue #11875: collections.OrderedDict's __reduce__ was temporarily + mutating the object instead of just working on a copy. + +- Issue #11467: Fix urlparse behavior when handling urls which contains scheme + specific part only digits. Patch by Santoso Wijaya. + +- collections.Counter().copy() now works correctly for subclasses. + +- Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. + Patch by Santoso Wijaya. + +- Issue #11684: complete email.parser bytes API by adding BytesHeaderParser. + +- The bz2 module now handles 4GiB+ input buffers correctly. + +- Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when + _json is not available. + +- Issue #11830: Remove unnecessary introspection code in the decimal module. + +- Issue #11703: urllib2.geturl() does not return correct url when the original + url contains #fragment. + +- Issue #10019: Fixed regression in json module where an indent of 0 stopped + adding newlines and acted instead like 'None'. + +- Issue #11186: pydoc ignores a module if its name contains a surrogate + character in the index of modules. + +- Issue #11815: Use a light-weight SimpleQueue for the result queue in + concurrent.futures.ProcessPoolExecutor. + +- Issue #5162: Treat services like frozen executables to allow child spawning + from multiprocessing.forking on Windows. + +- logging.basicConfig now supports an optional 'handlers' argument taking an + iterable of handlers to be added to the root logger. Additional parameter + checks were also added to basicConfig. + +- Issue #11814: Fix likely typo in multiprocessing.Pool._terminate(). + +- Issue #11747: Fix range formatting in difflib.context_diff() and + difflib.unified_diff(). + +- Issue #8428: Fix a race condition in multiprocessing.Pool when terminating + worker processes: new processes would be spawned while the pool is being + shut down. Patch by Charles-Fran?ois Natali. + +- Issue #2650: re.escape() no longer escapes the '_'. + +- Issue #11757: select.select() now raises ValueError when a negative timeout + is passed (previously, a select.error with EINVAL would be raised). Patch + by Charles-Fran?ois Natali. + +- Issue #7311: fix html.parser to accept non-ASCII attribute values. + +- Issue #11605: email.parser.BytesFeedParser was incorrectly converting + multipart subparts with an 8-bit CTE into unicode instead of preserving the + bytes. + +- Issue #1690608: email.util.formataddr is now RFC 2047 aware: it now has a + charset parameter that defaults to utf-8 and is used as the charset for RFC + 2047 encoding when the realname contains non-ASCII characters. + +- Issue #10963: Ensure that subprocess.communicate() never raises EPIPE. + +- Issue #10791: Implement missing method GzipFile.read1(), allowing GzipFile + to be wrapped in a TextIOWrapper. Patch by Nadeem Vawda. + +- Issue #11707: Added a fast C version of functools.cmp_to_key(). + Patch by Filip Gruszczy?ski. + +- Issue #11688: Add sqlite3.Connection.set_trace_callback(). Patch by + Torsten Landschoff. + +- Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve + private keys. + +- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept + file-like objects using a new ``fileobj`` constructor argument. Patch by + Nadeem Vawda. + +- unittest.TestCase.assertSameElements has been removed. + +- sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not + called yet: detect bootstrap (startup) issues earlier. + +- Issue #11393: Add the new faulthandler module. + +- Issue #11618: Fix the timeout logic in threading.Lock.acquire() under Windows. + +- Removed the 'strict' argument to email.parser.Parser, which has been + deprecated since Python 2.4. + +- Issue #11256: Fix inspect.getcallargs on functions that take only keyword + arguments. + +- Issue #11696: Fix ID generation in msilib. + +- itertools.accumulate now supports an optional *func* argument for + a user-supplied binary function. + +- Issue #11692: Remove unnecessary demo functions in subprocess module. + +- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when + trying to pack a negative (in-range) integer. + +- Issue #11675: multiprocessing.[Raw]Array objects created from an integer size + are now zeroed on creation. This matches the behaviour specified by the + documentation. + +- Issue #7639: Fix short file name generation in bdist_msi + +- Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459. + Patch by Ben Hayden. + +- Issue #11635: Don't use polling in worker threads and processes launched by + concurrent.futures. + +- Issue #6811: Allow importlib to change a code object's co_filename attribute + to match the path to where the source code currently is, not where the code + object originally came from. + +- Issue #8754: Have importlib use the repr of a module name in error messages. + +- Issue #11591: Prevent "import site" from modifying sys.path when python + was started with -S. + +- collections.namedtuple() now adds a _source attribute to the generated + class. This make the source more accessible than the outdated + "verbose" option which prints to stdout but doesn't make the source + string available. + +- Issue #11371: Mark getopt error messages as localizable. Patch by Filip + Gruszczy?ski. + +- Issue #11333: Add __slots__ to collections ABCs. + +- Issue #11628: cmp_to_key generated class should use __slots__. + +- Issue #11666: let help() display named tuple attributes and methods + that start with a leading underscore. + +- Issue #11662: Make urllib and urllib2 ignore redirections if the + scheme is not HTTP, HTTPS or FTP (CVE-2011-1521). + +- Issue #5537: Fix time2isoz() and time2netscape() functions of + httplib.cookiejar for expiration year greater than 2038 on 32-bit systems. + +- Issue #4391: Use proper gettext plural forms in optparse. + +- Issue #11127: Raise a TypeError when trying to pickle a socket object. + +- Issue #11563: Connection:close header is sent by requests using URLOpener + class which helps in closing of sockets after connection is over. Patch + contributions by Jeff McNeil and Nadeem Vawda. + +- Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates + unbuffered pipes, such that select() works properly on them. + +- Issue #5421: Fix misleading error message when one of socket.sendto()'s + arguments has the wrong type. Patch by Nikita Vetoshkin. + +- Issue #10812: Add some extra posix functions to the os module. + +- Issue #10979: unittest stdout buffering now works with class and module + setup and teardown. + +- Issue #11577: fix ResourceWarning triggered by improved binhex test coverage + +- Issue #11243: fix the parameter querying methods of Message to work if + the headers contain un-encoded non-ASCII data. + +- Issue #11401: fix handling of headers with no value; this fixes a regression + relative to Python2 and the result is now the same as it was in Python2. + +- Issue #9298: base64 bodies weren't being folded to line lengths less than 78, + which was a regression relative to Python2. Unlike Python2, the last line + of the folded body now ends with a carriage return. + +- Issue #11560: shutil.unpack_archive now correctly handles the format + parameter. Patch by Evan Dandrea. + +- Issue #5870: Add `subprocess.DEVNULL` constant. + +- Issue #11133: fix two cases where inspect.getattr_static can trigger code + execution. Patch by Andreas St?hrk. + +- Issue #11569: use absolute path to the sysctl command in multiprocessing to + ensure that it will be found regardless of the shell PATH. This ensures + that multiprocessing.cpu_count works on default installs of MacOSX. + +- Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is + not installed. Instead, the zipfile.ZIP_STORED compression is used to create + the ZipFile. Patch by Natalia B. Bidart. + +- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used + in a `with` statement. Contributed by Giampaolo Rodola. + +- Issue #11554: Fixed support for Japanese codecs; previously the body output + encoding was not done if euc-jp or shift-jis was specified as the charset. + +- Issue #11509: Significantly increase test coverage of fileinput. + Patch by Denver Coneybeare at PyCon 2011 Sprints. + +- Issue #11407: `TestCase.run` returns the result object used or created. + Contributed by Janathan Hartley. + +- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified + IP addresses in the proxy exception list. + +- Issue #11491: dbm.error is no longer raised when dbm.open is called with + the "n" as the flag argument and the file exists. The behavior matches + the documentation and general logic. + +- Issue #1162477: Postel Principle adjustment to email date parsing: handle the + fact that some non-compliant MUAs use '.' instead of ':' in time specs. + +- Issue #11131: Fix sign of zero in decimal.Decimal plus and minus + operations when the rounding mode is ROUND_FLOOR. + +- Issue #9935: Speed up pickling of instances of user-defined classes. + +- Issue #5622: Fix curses.wrapper to raise correct exception if curses + initialization fails. + +- Issue #11408: In threading.Lock.acquire(), only call gettimeofday() when + really necessary. Patch by Charles-Fran?ois Natali. + +- Issue #11391: Writing to a mmap object created with + ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a + TypeError. Patch by Charles-Fran?ois Natali. + +- Issue #9795: add context manager protocol support for nntplib.NNTP class. + +- Issue #11306: mailbox in certain cases adapts to an inability to open + certain files in read-write mode. Previously it detected this by + checking for EACCES, now it also checks for EROFS. + +- Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors + on accept(), send() and recv(). + +- Issue #11377: Deprecate platform.popen() and reimplement it with os.popen(). + +- Issue #8513: On UNIX, subprocess supports bytes command string. + +- Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. + +- Issue #11140: Lock.release() now raises a RuntimeError when attempting + to release an unacquired lock, as claimed in the threading documentation. + The _thread.error exception is now an alias of RuntimeError. Patch by + Filip Gruszczy?ski. Patch for _dummy_thread by Aymeric Augustin. + +- Issue #8594: ftplib now provides a source_address parameter to specify which + (address, port) to bind to before connecting. + +- Issue #11326: Add the missing connect_ex() implementation for SSL sockets, + and make it work for non-blocking connects. + +- Issue #11297: Add collections.ChainMap(). + +- Issue #10755: Add the posix.flistdir() function. Patch by Ross Lagerwall. + +- Issue #4761: Add the ``*at()`` family of functions (openat(), etc.) to the + posix module. Patch by Ross Lagerwall. + +- Issue #7322: Trying to read from a socket's file-like object after a timeout + occurred now raises an error instead of silently losing data. + +- Issue #11291: poplib.POP no longer suppresses errors on quit(). + +- Issue #11177: asyncore's create_socket() arguments can now be omitted. + +- Issue #6064: Add a ``daemon`` keyword argument to the threading.Thread + and multiprocessing.Process constructors in order to override the + default behaviour of inheriting the daemonic property from the current + thread/process. + +- Issue #10956: Buffered I/O classes retry reading or writing after a signal + has arrived and the handler returned successfully. + +- Issue #10784: New os.getpriority() and os.setpriority() functions. + +- Issue #11114: Fix catastrophic performance of tell() on text files (up + to 1000x faster in some cases). It is still one to two order of magnitudes + slower than binary tell(). + +- Issue #10882: Add os.sendfile function. + +- Issue #10868: Allow usage of the register method of an ABC as a class + decorator. + +- Issue #11224: Fixed a regression in tarfile that affected the file-like + objects returned by TarFile.extractfile() regarding performance, memory + consumption and failures with the stream interface. + +- Issue #10924: Adding salt and Modular Crypt Format to crypt library. + Moved old C wrapper to _crypt, and added a Python wrapper with + enhanced salt generation and simpler API for password generation. + +- Issue #11074: Make 'tokenize' so it can be reloaded. + +- Issue #11085: Moved collections abstract base classes into a separate + module called collections.abc, following the pattern used by importlib.abc. + For backwards compatibility, the names are imported into the collections + module. + +- Issue #4681: Allow mmap() to work on file sizes and offsets larger than + 4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for + 32-bit Windows. + +- Issue #11169: compileall module uses repr() to format filenames and paths to + escape surrogate characters and show spaces. + +- Issue #11089: Fix performance issue limiting the use of ConfigParser() + with large config files. + +- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers + larger than 4GB. Patch by Nadeem Vawda. + +- Issue #11388: Added a clear() method to MutableSequence + +- Issue #11174: Add argparse.MetavarTypeHelpFormatter, which uses type names + for the names of optional and positional arguments in help messages. + +- Issue #9348: Raise an early error if argparse nargs and metavar don't match. + +- Issue #8982: Improve the documentation for the argparse Namespace object. + +- Issue #9343: Document that argparse parent parsers must be configured before + their children. + +- Issue #9026: Fix order of argparse sub-commands in help messages. + +- Issue #9347: Fix formatting for tuples in argparse type= error messages. + +- Issue #12191: Added shutil.chown() to change user and/or group owner of a + given path also specifying their names. + +- Issue #13988: The _elementtree accelerator is used whenever available. + Now xml.etree.cElementTree becomes a deprecated alias to ElementTree. + +Build +----- + +- Issue #6807: Run msisupport.mak earlier. + +- Issue #10580: Minor grammar change in Windows installer. + +- Issue #13326: Clean __pycache__ directories correctly on OpenBSD. + +- PEP 393: the configure option --with-wide-unicode is removed. + +- Issue #12852: Set _XOPEN_SOURCE to 700, instead of 600, to get POSIX 2008 + functions on OpenBSD (e.g. fdopendir). + +- Issue #11863: Remove support for legacy systems deprecated in Python 3.2 + (following PEP 11). These systems are systems using Mach C Threads, + SunOS lightweight processes, GNU pth threads and IRIX threads. + +- Issue #8746: Correct faulty configure checks so that os.chflags() and + os.lchflags() are once again built on systems that support these + functions (BSD and OS X). Also add new stat file flags for OS X + (UF_HIDDEN and UF_COMPRESSED). + +- Issue #10645: Installing Python no longer creates a + Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory. + +- Do not accidentally include the directory containing sqlite.h twice when + building sqlite3. + +- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, + ensure "make install" creates symlinks in --prefix bin for the "-32" + files in the framework bin directory like the installer does. + +- Issue #11347: Use --no-as-needed when linking libpython3.so. + +- Issue #11411: Fix 'make DESTDIR=' with a relative destination. + +- Issue #11268: Prevent Mac OS X Installer failure if Documentation + package had previously been installed. + +- Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2. + + +IDLE +---- + +- Issue #11718: IDLE's open module dialog couldn't find the __init__.py + file in a package. + +Tools/Demos +----------- + +- Issue #14053: patchcheck.py ("make patchcheck") now works with MQ patches. + Patch by Francisco Mart?n Brugu?. + +- Issue #13930: 2to3 is now able to write its converted output files to another + directory tree as well as copying unchanged files and altering the file + suffix. See its new -o, -W and --add-suffix options. This makes it more + useful in many automated code translation workflows. + +- Issue #13628: python-gdb.py is now able to retrieve more frames in the Python + traceback if Python is optimized. + +- Issue #11996: libpython (gdb), replace "py-bt" command by "py-bt-full" and + add a smarter "py-bt" command printing a classic Python traceback. + +- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. + +- Issue #10639: reindent.py no longer converts newlines and will raise + an error if attempting to convert a file with mixed newlines. + "--newline" option added to specify new line character. + +Extension Modules +----------------- + +- Issue #13840: The error message produced by ctypes.create_string_buffer + when given a Unicode string has been fixed. + +- Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by + Vilmos Nebehaj. + +- Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. + +- Issue #13159: FileIO and BZ2Compressor/BZ2Decompressor now use a linear-time + buffer growth strategy instead of a quadratic-time one. + +- Issue #10141: socket: Add SocketCAN (PF_CAN) support. Initial patch by + Matthias Fuchs, updated by Tiago Gon?alves. + +- Issue #13070: Fix a crash when a TextIOWrapper caught in a reference cycle + would be finalized after the reference to its underlying BufferedRWPair's + writer got cleared by the GC. + +- Issue #12881: ctypes: Fix segfault with large structure field names. + +- Issue #13058: ossaudiodev: fix a file descriptor leak on error. Patch by + Thomas Jarosch. + +- Issue #13013: ctypes: Fix a reference leak in PyCArrayType_from_ctype. + Thanks to Suman Saha for finding the bug and providing a patch. + +- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that + file descriptor was actually received. + +- Issue #1172711: Add 'long long' support to the array module. + Initial patch by Oren Tirosh and Hirokazu Yamamoto. + +- Issue #12483: ctypes: Fix a crash when the destruction of a callback + object triggers the garbage collector. + +- Issue #12950: Fix passing file descriptors in multiprocessing, under + OpenIndiana/Illumos. + +- Issue #12764: Fix a crash in ctypes when the name of a Structure field is not + a string. + +- Issue #11241: subclasses of ctypes.Array can now be subclassed. + +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + +- Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper + signature. Without this, architectures where sizeof void* != sizeof int are + broken. Patch given by Hallvard B Furuseth. + +- Issue #12051: Fix segfault in json.dumps() while encoding highly-nested + objects using the C accelerations. + +- Issue #12017: Fix segfault in json.loads() while decoding highly-nested + objects using the C accelerations. + +- Issue #1838: Prevent segfault in ctypes, when _as_parameter_ on a class is set + to an instance of the class. + +Tests +----- + +- Issue #11689: Fix a variable scoping error in an sqlite3 test + +- Issue #13786: Remove unimplemented 'trace' long option from regrtest.py. + +- Issue #13725: Fix regrtest to recognize the documented -d flag. + Patch by Erno Tukia. + +- Issue #13304: Skip test case if user site-packages disabled (-s or + PYTHONNOUSERSITE). (Patch by Carl Meyer) + +- Issue #5661: Add a test for ECONNRESET/EPIPE handling to test_asyncore. Patch + by Xavier de Gaye. + +- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. + +- Re-enable lib2to3's test_parser.py tests, though with an expected failure + (see issue 13125). + +- Issue #12656: Add tests for IPv6 and Unix sockets to test_asyncore. + +- Issue #6484: Add unit tests for mailcap module (patch by Gregory Nofi) + +- Issue #11651: Improve the Makefile test targets to run more of the test suite + more quickly. The --multiprocess option is now enabled by default, reducing + the amount of time needed to run the tests. "make test" and "make quicktest" + now include some resource-intensive tests, but no longer run the test suite + twice to check for bugs in .pyc generation. Tools/scripts/run_test.py provides + an easy platform-independent way to run test suite with sensible defaults. + +- Issue #12331: The test suite for the packaging module can now run from an + installed Python. + +- Issue #12331: The test suite for lib2to3 can now run from an installed + Python. + +- Issue #12626: In regrtest, allow to filter tests using a glob filter + with the ``-m`` (or ``--match``) option. This works with all test cases + using the unittest module. This is useful with long test suites + such as test_io or test_subprocess. + +- Issue #12624: It is now possible to fail after the first failure when + running in verbose mode (``-v`` or ``-W``), by using the ``--failfast`` + (or ``-G``) option to regrtest. This is useful with long test suites + such as test_io or test_subprocess. + +- Issue #12587: Correct faulty test file and reference in test_tokenize. + (Patch by Robert Xiao) + +- Issue #12573: Add resource checks for dangling Thread and Process objects. + +- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64' + as the processor type on some Mac systems. + +- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary + failure in name resolution. + +- Issue #11812: Solve transient socket failure to connect to 'localhost' + in test_telnetlib.py. + +- Solved a potential deadlock in test_telnetlib.py. Related to issue #11812. + +- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and + an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder + Web site. + +- Avoid failing in test_urllibnet.test_bad_address when some overzealous + DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test + is now skipped instead. + +- Issue #12440: When testing whether some bits in SSLContext.options can be + reset, check the version of the OpenSSL headers Python was compiled against, + rather than the runtime version of the OpenSSL library. + +- Issue #11512: Add a test suite for the cgitb module. Patch by Robbie Clemons. + +- Issue #12497: Install test/data to prevent failures of the various codecmaps + tests. + +- Issue #12496: Install test/capath directory to prevent test_connect_capath + testcase failure in test_ssl. + +- Issue #12469: Run wakeup and pending signal tests in a subprocess to run the + test in a fresh process with only one thread and to not change signal + handling of the parent process. + +- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run + test_tk or test_ttk_guionly under a username that is not currently logged + in to the console windowserver (as may be the case under buildbot or ssh). + +- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. + +- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures + the output and displays it on failure instead. regrtest -v doesn't print the + error twice anymore if there is only one error. + +- Issue #12141: Install copies of template C module file so that + test_build_ext of test_distutils and test_command_build_ext of + test_packaging are no longer silently skipped when + run outside of a build directory. + +- Issue #8746: Add additional tests for os.chflags() and os.lchflags(). + Patch by Garrett Cooper. + +- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9 + 2.8 + on Mac OS X. (Patch by Ronald Oussoren) + +- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2, + iso2022_kr). + +- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch + written by Charles-Fran?ois Natali. + +- Issue #11614: import __hello__ prints "Hello World!". Patch written by + Andreas St?hrk. + +- Issue #5723: Improve json tests to be executed with and without accelerations. + +- Issue #12041: Make test_wait3 more robust. + +- Issue #11873: Change regex in test_compileall to fix occasional failures when + when the randomly generated temporary path happened to match the regex. + +- Issue #11958: Fix FTP tests for IPv6, bind to "::1" instead of "localhost". + Patch written by Charles-Francois Natali. + +- Issue #8407, #11859: Fix tests of test_io using threads and an alarm: use + pthread_sigmask() to ensure that the SIGALRM signal is received by the main + thread. + +- Issue #11811: Factor out detection of IPv6 support on the current host + and make it available as ``test.support.IPV6_ENABLED``. Patch by + Charles-Fran?ois Natali. + +- Issue #10914: Add a minimal embedding test to test_capi. + +- Issue #11223: Skip test_lock_acquire_interruption() and + test_rlock_acquire_interruption() of test_threadsignals if a thread lock is + implemented using a POSIX mutex and a POSIX condition variable. A POSIX + condition variable cannot be interrupted by a signal (e.g. on Linux, the + futex system call is restarted). + +- Issue #11790: Fix sporadic failures in test_multiprocessing.WithProcessesTestCondition. + +- Fix possible "file already exists" error when running the tests in parallel. + +- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows + platforms. Patch by Nadeem Vawda. + +- Issue #11727: Add a --timeout option to regrtest: if a test takes more than + TIMEOUT seconds, dumps the traceback of all threads and exits. + +- Issue #11653: fix -W with -j in regrtest. + +- The email test suite now lives in the Lib/test/test_email package. The test + harness code has also been modernized to allow use of new unittest features. + +- regrtest now discovers test packages as well as test modules. + +- Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov. + +- New test_crashers added to exercise the scripts in the Lib/test/crashers + directory and confirm they fail as expected + +- Issue #11578: added test for the timeit module. Patch by Michael Henry. + +- Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. + +- Issue #11505: improves test coverage of string.py, increases granularity of + string.Formatter tests. Initial patch by Alicia Arlen. + +- Issue #11548: Improve test coverage of the shutil module. Patch by + Evan Dandrea. + +- Issue #11554: Reactivated test_email_codecs. + +- Issue #11505: improves test coverage of string.py. Patch by Alicia + Arlen + +- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a + false positive if the last directory in the path is inaccessible. + +- Issue #11223: Fix test_threadsignals to fail, not hang, when the + non-semaphore implementation of locks is used under POSIX. + +- Issue #10911: Add tests on CGI with non-ASCII characters. Patch written by + Pierre Quentel. + +- Issue #9931: Fix hangs in GUI tests under Windows in certain conditions. + Patch by Hirokazu Yamamoto. + +- Issue #10512: Properly close sockets under test.test_cgi. + +- Issue #10992: Make tests pass under coverage. + +- Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due + to open door files. + +- Issue #10990: Prevent tests from clobbering a set trace function. + +C-API +----- + +- Add PyObject_GenericGetDict and PyObject_GeneriSetDict. They are generic + implementations for the getter and setter of a ``__dict__`` descriptor of C + types. + +- Issue #13727: Add 3 macros to access PyDateTime_Delta members: + PyDateTime_DELTA_GET_DAYS, PyDateTime_DELTA_GET_SECONDS, + PyDateTime_DELTA_GET_MICROSECONDS. + +- Issue #10542: Add 4 macros to work with surrogates: Py_UNICODE_IS_SURROGATE, + Py_UNICODE_IS_HIGH_SURROGATE, Py_UNICODE_IS_LOW_SURROGATE, + Py_UNICODE_JOIN_SURROGATES. + +- Issue #12724: Add Py_RETURN_NOTIMPLEMENTED macro for returning NotImplemented. + +- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with + Mercurial. + +- Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const + char *` instead of `char *`. + +- Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. + +Documentation +------------- + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issues #13491 and #13995: Fix many errors in sqlite3 documentation. + Initial patch for #13491 by Johannes Vogel. + +- Issue #13402: Document absoluteness of sys.executable. + +- Issue #13883: PYTHONCASEOK also works on OS X. + +- Issue #9021: Add an introduction to the copy module documentation. + +- Issue #6005: Examples in the socket library documentation use sendall, where + relevant, instead send method. + +- Issue #12798: Updated the mimetypes documentation. + +- Issue #12949: Document the kwonlyargcount argument for the PyCode_New + C API function. + +- Issue #13513: Fix io.IOBase documentation to correctly link to the + io.IOBase.readline method instead of the readline module. + +- Issue #13237: Reorganise subprocess documentation to emphasise convenience + functions and the most commonly needed arguments to Popen. + +- Issue #13141: Demonstrate recommended style for socketserver examples. + +- Issue #11818: Fix tempfile examples for Python 3. + + **(For information about older versions, consult the HISTORY file.)** -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 17 16:44:32 2012 From: python-checkins at python.org (larry.hastings) Date: Wed, 17 Oct 2012 16:44:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Added_PEP_429=2C_Release_Sche?= =?utf-8?q?dule_for_Python_3=2E4=2E?= Message-ID: <3Xhbkm404PzR6c@mail.python.org> http://hg.python.org/peps/rev/3fa9ed394f91 changeset: 4554:3fa9ed394f91 user: Larry Hastings date: Wed Oct 17 15:44:24 2012 +0100 summary: Added PEP 429, Release Schedule for Python 3.4. files: pep-0429.txt | 102 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/pep-0429.txt b/pep-0429.txt new file mode 100644 --- /dev/null +++ b/pep-0429.txt @@ -0,0 +1,102 @@ +PEP: 429 +Title: Python 3.4 Release Schedule +Version: $Revision$ +Last-Modified: $Date$ +Author: Larry Hastings +Status: Active +Type: Informational +Content-Type: text/x-rst +Created: 17-Oct-2012 +Python-Version: 3.4 + + +Abstract +======== + +This document describes the development and release schedule for +Python 3.4. The schedule primarily concerns itself with PEP-sized +items. + +.. Small features may be added up to the first beta + release. Bugs may be fixed until the final release, + which is planned for February 2014. + + +Release Manager and Crew +======================== + +- 3.4 Release Manager: Larry Hastings +- Windows installers: Martin v. L?wis +- Mac installers: Ronald Oussoren/Ned Deily +- Documentation: Georg Brandl + + +Release Schedule +================ + +The anticipated schedule: + +- 3.4.0 alpha 1: August 3, 2013 +- 3.4.0 alpha 2: August 31, 2013 +- 3.4.0 alpha 3: September 28, 2013 +- 3.4.0 alpha 4: October 19, 2013 +- 3.4.0 beta 1: November 23, 2013 + +(Beta 1 is also "feature freeze"--no new features beyond this point.) + +- 3.4.0 beta 2: January 4, 2014 +- 3.4.0 candidate 1: January 18, 2014 +- 3.4.0 candidate 2: February 1, 2014 +- 3.4.0 final: February 22, 2014 + +.. don't forget to update final date above as well + +Every release day listed here is the prospective day of tagging the release; +the actual availability of the release for download on python.org depends +on the schedules of the crew. + + +Features for 3.4 +================ + +Implemented / Final PEPs: + +* None so far + +Other final large-scale changes: + +* None so far + +Candidate PEPs: + +* PEP 395: Qualified Names for Modules +* PEP 3143: Standard daemon process library +* PEP 3154: Pickle protocol version 4 + +Other proposed large-scale changes: + +* New packaging libraries, possibly deprecating "distutils" +* Addition of the "regex" module +* Email version 6 +* A standard event-loop interface +* Breaking out standard library and docs into separate repos + +Deferred to post-3.4: + +* None so far + +Copyright +========= + +This document has been placed in the public domain. + + + +.. + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + coding: utf-8 + End: -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Wed Oct 17 23:52:30 2012 From: python-checkins at python.org (christian.heimes) Date: Wed, 17 Oct 2012 23:52:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316166=3A_Add_PY?= =?utf-8?q?=5FLITTLE=5FENDIAN_and_PY=5FBIG=5FENDIAN_macros_and_unified?= Message-ID: <3XhnDZ6RLCzPFf@mail.python.org> http://hg.python.org/cpython/rev/d2127cdec10e changeset: 79803:d2127cdec10e user: Christian Heimes date: Wed Oct 17 23:52:17 2012 +0200 summary: Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified endianess detection and handling. files: Include/pyport.h | 14 +++++++ Misc/NEWS | 3 + Modules/_io/textio.c | 18 +++------ Modules/_sha3/cleanup.py | 8 ++-- Modules/_sha3/keccak/KeccakF-1600-opt32.c | 2 +- Modules/_sha3/keccak/KeccakF-1600-opt64.c | 2 +- Modules/_sha3/sha3module.c | 13 ++++-- Modules/_struct.c | 21 +++++----- Modules/arraymodule.c | 7 +-- Modules/sha256module.c | 22 +++-------- Modules/sha512module.c | 22 +++-------- Objects/longobject.c | 8 +--- Objects/stringlib/codecs.h | 6 +- Objects/unicodeobject.c | 18 ++------ Python/sysmodule.c | 21 +++------- 15 files changed, 78 insertions(+), 107 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h --- a/Include/pyport.h +++ b/Include/pyport.h @@ -865,4 +865,18 @@ #endif #endif +/* + * Convenient macros to deal with endianess of the platform. WORDS_BIGENDIAN is + * detected by configure and defined in pyconfig.h. The code in pyconfig.h + * also also takes care of Apple's universal builds. + */ + +#ifdef WORDS_BIGENDIAN +#define PY_BIG_ENDIAN 1 +#define PY_LITTLE_ENDIAN 0 +#else +#define PY_BIG_ENDIAN 0 +#define PY_LITTLE_ENDIAN 1 +#endif + #endif /* Py_PYPORT_H */ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified + endianess detection and handling. + - Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer objects. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -747,7 +747,7 @@ { if (!self->encoding_start_of_stream) { /* Skip the BOM and use native byte ordering */ -#if defined(WORDS_BIGENDIAN) +#if PY_BIG_ENDIAN return utf16be_encode(self, text); #else return utf16le_encode(self, text); @@ -776,7 +776,7 @@ { if (!self->encoding_start_of_stream) { /* Skip the BOM and use native byte ordering */ -#if defined(WORDS_BIGENDIAN) +#if PY_BIG_ENDIAN return utf32be_encode(self, text); #else return utf32le_encode(self, text); @@ -1913,10 +1913,7 @@ #define COOKIE_BUF_LEN (sizeof(Py_off_t) + 3 * sizeof(int) + sizeof(char)) -#if defined(WORDS_BIGENDIAN) - -# define IS_LITTLE_ENDIAN 0 - +#if PY_BIG_ENDIAN /* We want the least significant byte of start_pos to also be the least significant byte of the cookie, which means that in big-endian mode we must copy the fields in reverse order. */ @@ -1928,9 +1925,6 @@ # define OFF_NEED_EOF 0 #else - -# define IS_LITTLE_ENDIAN 1 - /* Little-endian mode: the least significant byte of start_pos will naturally end up the least significant byte of the cookie. */ @@ -1951,7 +1945,7 @@ return -1; if (_PyLong_AsByteArray(cookieLong, buffer, sizeof(buffer), - IS_LITTLE_ENDIAN, 0) < 0) { + PY_LITTLE_ENDIAN, 0) < 0) { Py_DECREF(cookieLong); return -1; } @@ -1977,9 +1971,9 @@ memcpy(buffer + OFF_CHARS_TO_SKIP, &cookie->chars_to_skip, sizeof(cookie->chars_to_skip)); memcpy(buffer + OFF_NEED_EOF, &cookie->need_eof, sizeof(cookie->need_eof)); - return _PyLong_FromByteArray(buffer, sizeof(buffer), IS_LITTLE_ENDIAN, 0); + return _PyLong_FromByteArray(buffer, sizeof(buffer), + PY_LITTLE_ENDIAN, 0); } -#undef IS_LITTLE_ENDIAN static int _textiowrapper_decoder_setstate(textio *self, cookie_type *cookie) diff --git a/Modules/_sha3/cleanup.py b/Modules/_sha3/cleanup.py --- a/Modules/_sha3/cleanup.py +++ b/Modules/_sha3/cleanup.py @@ -32,10 +32,10 @@ if line.startswith("typedef unsigned long long int"): buf.append("/* %s */\n" % line.strip()) continue - ## remove #include "brg_endian.h" - #if "brg_endian.h" in line: - # buf.append("/* %s */\n" % line.strip()) - # continue + # remove #include "brg_endian.h" + if "brg_endian.h" in line: + buf.append("/* %s */\n" % line.strip()) + continue # transform C++ comments into ANSI C comments line = CPP1.sub(r"/* \1 */", line) line = CPP2.sub(r" /* \1 */", line) diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt32.c b/Modules/_sha3/keccak/KeccakF-1600-opt32.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt32.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt32.c @@ -12,7 +12,7 @@ */ #include -#include "brg_endian.h" +/* #include "brg_endian.h" */ #include "KeccakF-1600-opt32-settings.h" #include "KeccakF-1600-interface.h" diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64.c b/Modules/_sha3/keccak/KeccakF-1600-opt64.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt64.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt64.c @@ -12,7 +12,7 @@ */ #include -#include "brg_endian.h" +/* #include "brg_endian.h" */ #include "KeccakF-1600-opt64-settings.h" #include "KeccakF-1600-interface.h" diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -124,11 +124,14 @@ #define UseInterleaveTables #endif -/* replacement for brg_endian.h -#define IS_BIG_ENDIAN BIG_ENDIAN -#define IS_LITTLE_ENDIAN LITTLE_ENDIAN -#define PLATFORM_BYTE_ORDER BYTE_ORDER -*/ +/* replacement for brg_endian.h */ +#define IS_BIG_ENDIAN 4321 +#define IS_LITTLE_ENDIAN 1234 +#if PY_BIG_ENDIAN +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#else +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif /* inline all Keccak dependencies */ #include "keccak/KeccakNISTInterface.h" diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1199,12 +1199,11 @@ case '!': /* Network byte order is big-endian */ return bigendian_table; case '=': { /* Host byte order -- different from native in alignment! */ - int n = 1; - char *p = (char *) &n; - if (*p == 1) - return lilendian_table; - else - return bigendian_table; +#if PY_LITTLE_ENDIAN + return lilendian_table; +#else + return bigendian_table; +#endif } default: --*pfmt; /* Back out of pointer increment */ @@ -2088,13 +2087,13 @@ /* Check endian and swap in faster functions */ { - int one = 1; formatdef *native = native_table; formatdef *other, *ptr; - if ((int)*(unsigned char*)&one) - other = lilendian_table; - else - other = bigendian_table; +#if PY_LITTLE_ENDIAN + other = lilendian_table; +#else + other = bigendian_table; +#endif /* Scan through the native table, find a matching entry in the endian table and swap in the native implementations whenever possible diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -1664,11 +1664,8 @@ static enum machine_format_code typecode_to_mformat_code(char typecode) { -#ifdef WORDS_BIGENDIAN - const int is_big_endian = 1; -#else - const int is_big_endian = 0; -#endif + const int is_big_endian = PY_BIG_ENDIAN; + size_t intsize; int is_signed; diff --git a/Modules/sha256module.c b/Modules/sha256module.c --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -21,13 +21,6 @@ #include "hashlib.h" -/* Endianness testing and definitions */ -#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\ - if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;} - -#define PCT_LITTLE_ENDIAN 1 -#define PCT_BIG_ENDIAN 0 - /* Some useful types */ typedef unsigned char SHA_BYTE; @@ -50,7 +43,6 @@ SHA_INT32 digest[8]; /* Message digest */ SHA_INT32 count_lo, count_hi; /* 64-bit bit count */ SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */ - int Endianness; int local; /* unprocessed amount in data */ int digestsize; } SHAobject; @@ -58,13 +50,11 @@ /* When run on a little-endian CPU we need to perform byte reversal on an array of longwords. */ -static void longReverse(SHA_INT32 *buffer, int byteCount, int Endianness) +#if PY_LITTLE_ENDIAN +static void longReverse(SHA_INT32 *buffer, int byteCount) { SHA_INT32 value; - if ( Endianness == PCT_BIG_ENDIAN ) - return; - byteCount /= sizeof(*buffer); while (byteCount--) { value = *buffer; @@ -73,10 +63,10 @@ *buffer++ = ( value << 16 ) | ( value >> 16 ); } } +#endif static void SHAcopy(SHAobject *src, SHAobject *dest) { - dest->Endianness = src->Endianness; dest->local = src->local; dest->digestsize = src->digestsize; dest->count_lo = src->count_lo; @@ -131,7 +121,9 @@ SHA_INT32 S[8], W[64], t0, t1; memcpy(W, sha_info->data, sizeof(sha_info->data)); - longReverse(W, (int)sizeof(sha_info->data), sha_info->Endianness); +#if PY_LITTLE_ENDIAN + longReverse(W, (int)sizeof(sha_info->data)); +#endif for (i = 16; i < 64; ++i) { W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; @@ -228,7 +220,6 @@ static void sha_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = 0x6A09E667L; sha_info->digest[1] = 0xBB67AE85L; sha_info->digest[2] = 0x3C6EF372L; @@ -246,7 +237,6 @@ static void sha224_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = 0xc1059ed8L; sha_info->digest[1] = 0x367cd507L; sha_info->digest[2] = 0x3070dd17L; diff --git a/Modules/sha512module.c b/Modules/sha512module.c --- a/Modules/sha512module.c +++ b/Modules/sha512module.c @@ -22,13 +22,6 @@ #ifdef PY_LONG_LONG /* If no PY_LONG_LONG, don't compile anything! */ -/* Endianness testing and definitions */ -#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\ - if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;} - -#define PCT_LITTLE_ENDIAN 1 -#define PCT_BIG_ENDIAN 0 - /* Some useful types */ typedef unsigned char SHA_BYTE; @@ -52,7 +45,6 @@ SHA_INT64 digest[8]; /* Message digest */ SHA_INT32 count_lo, count_hi; /* 64-bit bit count */ SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */ - int Endianness; int local; /* unprocessed amount in data */ int digestsize; } SHAobject; @@ -60,13 +52,11 @@ /* When run on a little-endian CPU we need to perform byte reversal on an array of longwords. */ -static void longReverse(SHA_INT64 *buffer, int byteCount, int Endianness) +#if PY_LITTLE_ENDIAN +static void longReverse(SHA_INT64 *buffer, int byteCount) { SHA_INT64 value; - if ( Endianness == PCT_BIG_ENDIAN ) - return; - byteCount /= sizeof(*buffer); while (byteCount--) { value = *buffer; @@ -83,10 +73,10 @@ buffer++; } } +#endif static void SHAcopy(SHAobject *src, SHAobject *dest) { - dest->Endianness = src->Endianness; dest->local = src->local; dest->digestsize = src->digestsize; dest->count_lo = src->count_lo; @@ -141,7 +131,9 @@ SHA_INT64 S[8], W[80], t0, t1; memcpy(W, sha_info->data, sizeof(sha_info->data)); - longReverse(W, (int)sizeof(sha_info->data), sha_info->Endianness); +#if PY_LITTLE_ENDIAN + longReverse(W, (int)sizeof(sha_info->data)); +#endif for (i = 16; i < 80; ++i) { W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; @@ -254,7 +246,6 @@ static void sha512_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = Py_ULL(0x6a09e667f3bcc908); sha_info->digest[1] = Py_ULL(0xbb67ae8584caa73b); sha_info->digest[2] = Py_ULL(0x3c6ef372fe94f82b); @@ -272,7 +263,6 @@ static void sha384_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = Py_ULL(0xcbbb9d5dc1059ed8); sha_info->digest[1] = Py_ULL(0x629a292a367cd507); sha_info->digest[2] = Py_ULL(0x9159015a3070dd17); diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -988,7 +988,6 @@ * rewritten to use the newer PyLong_{As,From}ByteArray API. */ -#define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one #define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) /* Create a new long int object from a C PY_LONG_LONG int. */ @@ -1141,7 +1140,6 @@ { PyLongObject *v; PY_LONG_LONG bytes; - int one = 1; int res; if (vv == NULL) { @@ -1176,7 +1174,7 @@ case 1: return v->ob_digit[0]; } res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, - SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1); + SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 1); /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ if (res < 0) @@ -1193,7 +1191,6 @@ { PyLongObject *v; unsigned PY_LONG_LONG bytes; - int one = 1; int res; if (vv == NULL) { @@ -1212,7 +1209,7 @@ } res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, - SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0); + SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 0); /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ if (res < 0) @@ -1288,7 +1285,6 @@ return (unsigned PY_LONG_LONG)-1; } } -#undef IS_LITTLE_ENDIAN /* Get a C long long int from a long int object or any object that has an __int__ method. diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h --- a/Objects/stringlib/codecs.h +++ b/Objects/stringlib/codecs.h @@ -47,7 +47,7 @@ unsigned long value = *(unsigned long *) _s; if (value & ASCII_CHAR_MASK) break; -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN _p[0] = (STRINGLIB_CHAR)(value & 0xFFu); _p[1] = (STRINGLIB_CHAR)((value >> 8) & 0xFFu); _p[2] = (STRINGLIB_CHAR)((value >> 16) & 0xFFu); @@ -454,7 +454,7 @@ const unsigned char *q = *inptr; STRINGLIB_CHAR *p = dest + *outpos; /* Offsets from q for retrieving byte pairs in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int ihi = !!native_ordering, ilo = !native_ordering; #else int ihi = !native_ordering, ilo = !!native_ordering; @@ -485,7 +485,7 @@ block = SWAB(block); #endif } -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN # if SIZEOF_LONG == 4 p[0] = (STRINGLIB_CHAR)(block & 0xFFFFu); p[1] = (STRINGLIB_CHAR)(block >> 16); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -47,14 +47,6 @@ #include #endif -/* Endianness switches; defaults to little endian */ - -#ifdef WORDS_BIGENDIAN -# define BYTEORDER_IS_BIG_ENDIAN -#else -# define BYTEORDER_IS_LITTLE_ENDIAN -#endif - /* --- Globals ------------------------------------------------------------ The globals are initialized by the _PyUnicode_Init() API and should @@ -4813,7 +4805,7 @@ int bo = 0; /* assume native ordering by default */ const char *errmsg = ""; /* Offsets from q for retrieving bytes in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; #else int iorder[] = {3, 2, 1, 0}; @@ -4835,7 +4827,7 @@ if (size >= 4) { const Py_UCS4 bom = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | (q[iorder[1]] << 8) | q[iorder[0]]; -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN if (bom == 0x0000FEFF) { q += 4; bo = -1; @@ -4949,7 +4941,7 @@ unsigned char *p; Py_ssize_t nsize, i; /* Offsets from p for storing byte pairs in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; #else int iorder[] = {3, 2, 1, 0}; @@ -5092,7 +5084,7 @@ return unicode_empty; } -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN native_ordering = bo <= 0; #else native_ordering = bo >= 0; @@ -5209,7 +5201,7 @@ unsigned short *out; Py_ssize_t bytesize; Py_ssize_t pairs; -#ifdef WORDS_BIGENDIAN +#if PY_BIG_ENDIAN int native_ordering = byteorder >= 0; #else int native_ordering = byteorder <= 0; diff --git a/Python/sysmodule.c b/Python/sysmodule.c --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1561,7 +1561,6 @@ _PySys_Init(void) { PyObject *m, *v, *sysdict, *version_info; - char *s; m = PyModule_Create(&sysmodule); if (m == NULL) @@ -1638,20 +1637,14 @@ PyLong_FromLong(0x10FFFF)); SET_SYS_FROM_STRING("builtin_module_names", list_builtin_module_names()); - { - /* Assumes that longs are at least 2 bytes long. - Should be safe! */ - unsigned long number = 1; - char *value; +#if PY_BIG_ENDIAN + SET_SYS_FROM_STRING("byteorder", + PyUnicode_FromString("big")); +#else + SET_SYS_FROM_STRING("byteorder", + PyUnicode_FromString("little")); +#endif - s = (char *) &number; - if (s[0] == 0) - value = "big"; - else - value = "little"; - SET_SYS_FROM_STRING("byteorder", - PyUnicode_FromString(value)); - } #ifdef MS_COREDLL SET_SYS_FROM_STRING("dllhandle", PyLong_FromVoidPtr(PyWin_DLLhModule)); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 00:01:18 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 00:01:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRG9uJ3QgYWRkIC1P?= =?utf-8?q?PT=3AOlimit_to_CFLAGS_on_AIX=2C_SunOS=2C_HP-UX_or_IRIX=2E__It_b?= =?utf-8?q?reaks_them=2E?= Message-ID: <3XhnQk6XnczQnx@mail.python.org> http://hg.python.org/cpython/rev/0e54f02625e8 changeset: 79804:0e54f02625e8 branch: 2.7 parent: 79794:2f812212599b user: Trent Nelson date: Wed Oct 17 18:01:12 2012 -0400 summary: Don't add -OPT:Olimit to CFLAGS on AIX, SunOS, HP-UX or IRIX. It breaks them. files: configure | 5 +++++ configure.ac | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -5751,6 +5751,11 @@ # environment? Darwin*) ;; + # XXX thankfully this useless troublemaker of a flag has been + # eradicated in the 3.x line. For now, make sure it isn't picked + # up by any of our other platforms that use CC. + AIX*|SunOS*|HP-UX*|IRIX*) + ;; *) BASECFLAGS="$BASECFLAGS -OPT:Olimit=0" ;; diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1181,6 +1181,11 @@ # environment? Darwin*) ;; + # XXX thankfully this useless troublemaker of a flag has been + # eradicated in the 3.x line. For now, make sure it isn't picked + # up by any of our other platforms that use CC. + AIX*|SunOS*|HP-UX*|IRIX*) + ;; *) BASECFLAGS="$BASECFLAGS -OPT:Olimit=0" ;; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 00:08:53 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 00:08:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1Mjk4?= =?utf-8?q?=3A_refactor_previous_fix_from_66959d419369=2E?= Message-ID: <3XhnbT29bvzR0H@mail.python.org> http://hg.python.org/cpython/rev/1250498db562 changeset: 79805:1250498db562 branch: 3.3 parent: 79785:6a938ce6315c user: Trent Nelson date: Wed Oct 17 18:03:24 2012 -0400 summary: Issue #15298: refactor previous fix from 66959d419369. files: Lib/sysconfig.py | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -396,25 +396,30 @@ # `make pybuilddir.txt` target -- which is a precursor to the # _sysconfigdata.py module being constructed. Unfortunately, # get_config_vars() eventually calls _init_posix(), which attempts - # to import _sysconfigdata, which we won't have built yet. So, - # write out _sysconfigdata.py to the current directory first, - # then call get_platform() to get the pybuilddir, then move it. - destfile = '_sysconfigdata.py' + # to import _sysconfigdata, which we won't have built yet. In order + # for _init_posix() to work, if we're on Darwin, just mock up the + # _sysconfigdata module manually and populate it with the build vars. + # This is more than sufficient for ensuring the subsequent call to + # get_platform() succeeds. + name = '_sysconfigdata' + if 'darwin' in sys.platform: + import imp + module = imp.new_module(name) + module.build_time_vars = vars + sys.modules[name] = module + + pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + if hasattr(sys, "gettotalrefcount"): + pybuilddir += '-pydebug' + os.makedirs(pybuilddir, exist_ok=True) + destfile = os.path.join(pybuilddir, name + '.py') + with open(destfile, 'w', encoding='utf8') as f: f.write('# system configuration generated and used by' ' the sysconfig module\n') f.write('build_time_vars = ') pprint.pprint(vars, stream=f) - pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) - if hasattr(sys, "gettotalrefcount"): - pybuilddir += '-pydebug' - os.makedirs(pybuilddir, exist_ok=True) - target = os.path.join(pybuilddir, destfile) - - # Relocate _sysconfigdata.py into its final home. - os.rename(destfile, target) - # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='ascii') as f: f.write(pybuilddir) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 00:08:54 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 00:08:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2315298=2E?= Message-ID: <3XhnbV4Q3vzR03@mail.python.org> http://hg.python.org/cpython/rev/a0614e041bc8 changeset: 79806:a0614e041bc8 parent: 79787:240fa6e93925 parent: 79805:1250498db562 user: Trent Nelson date: Wed Oct 17 18:05:27 2012 -0400 summary: Merge issue #15298. files: Lib/sysconfig.py | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -377,25 +377,30 @@ # `make pybuilddir.txt` target -- which is a precursor to the # _sysconfigdata.py module being constructed. Unfortunately, # get_config_vars() eventually calls _init_posix(), which attempts - # to import _sysconfigdata, which we won't have built yet. So, - # write out _sysconfigdata.py to the current directory first, - # then call get_platform() to get the pybuilddir, then move it. - destfile = '_sysconfigdata.py' + # to import _sysconfigdata, which we won't have built yet. In order + # for _init_posix() to work, if we're on Darwin, just mock up the + # _sysconfigdata module manually and populate it with the build vars. + # This is more than sufficient for ensuring the subsequent call to + # get_platform() succeeds. + name = '_sysconfigdata' + if 'darwin' in sys.platform: + import imp + module = imp.new_module(name) + module.build_time_vars = vars + sys.modules[name] = module + + pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + if hasattr(sys, "gettotalrefcount"): + pybuilddir += '-pydebug' + os.makedirs(pybuilddir, exist_ok=True) + destfile = os.path.join(pybuilddir, name + '.py') + with open(destfile, 'w', encoding='utf8') as f: f.write('# system configuration generated and used by' ' the sysconfig module\n') f.write('build_time_vars = ') pprint.pprint(vars, stream=f) - pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) - if hasattr(sys, "gettotalrefcount"): - pybuilddir += '-pydebug' - os.makedirs(pybuilddir, exist_ok=True) - target = os.path.join(pybuilddir, destfile) - - # Relocate _sysconfigdata.py into its final home. - os.rename(destfile, target) - # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='ascii') as f: f.write(pybuilddir) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 00:08:56 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 00:08:56 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_Merge_heads=2E?= Message-ID: <3XhnbX0mflzR3M@mail.python.org> http://hg.python.org/cpython/rev/8a37a8adc87a changeset: 79807:8a37a8adc87a branch: 3.3 parent: 79805:1250498db562 parent: 79801:c67f4fe3fdad user: Trent Nelson date: Wed Oct 17 18:08:16 2012 -0400 summary: Merge heads. files: Doc/tutorial/inputoutput.rst | 2 +- Doc/using/cmdline.rst | 6 +- Misc/ACKS | 1 + Misc/NEWS | 320 +++++++++++++++++++++ Tools/unicode/comparecodecs.py | 2 +- 5 files changed, 327 insertions(+), 4 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -184,7 +184,7 @@ >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' - 'Dcab: {0[Dcab]:d}'.format(table)) + ... 'Dcab: {0[Dcab]:d}'.format(table)) Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -997,6 +997,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -168,6 +168,8 @@ Tools/Demos ----------- +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + What's New in Python 3.3.0? =========================== @@ -2427,6 +2429,324 @@ - Issue #8033: sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures. Initial patch by Philippe Devalkeneer. +Extension Modules +----------------- + +- Issue #15676: Now "mmap" check for empty files before doing the + offset check. Patch by Steven Willis. + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields + of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +Tests +----- + +- Issue #15304: Fix warning message when os.chdir() fails inside + test.support.temp_cwd(). Patch by Chris Jerdonek. + +- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch + by Serhiy Storchaka. + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected + tests in test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using + two external hosts that have been configured specifically for this type + of test. + +- Issue #15615: Add some tests for the json module's handling of invalid + input data. Patch by Kushal Das. + +- Issue #15496: Add directory removal helpers for tests on Windows. + Patch by Jeremy Kloth. + +- Issue #15467: Move helpers for __sizeof__ tests into test_support. + Patch by Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running + tests in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15230: Adopted a more systematic approach in the runpy tests + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14026: In test_cmd_line_script, check that sys.argv is populated + correctly for the various invocation approaches (Patch by Jason Yeo) + +- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging + message (Patch by Jason Yeo) + +- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing + a test failure in test_ssl. + +Build +----- + +- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after + 2801bf875a24 (see #15801). + +- Issue #11715: Fix multiarch detection without having Debian development + tools (dpkg-dev) installed. + +- Issue #15819: Make sure we can build Python out-of-tree from a readonly + source directory. (Somewhat related to Issue #9860.) + +- Issue #15822: Ensure 2to3 grammar pickles are properly installed. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14197: For OS X framework builds, ensure links to the shared + library are created with the proper ABI suffix. + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14437: Fix building the _io module under Cygwin. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +Documentation +------------- + +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd + argument. + +- Issue #15979: Improve timeit documentation. + +- Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + +- Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +- Issue #14674: Add a discussion of the json module's standard compliance. + Patch by Chris Rebert. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch + by Serhiy Storchaka. + +- Issue 15482: Properly document the default 'level' value for __import__() + while warning about using negative values. + +- Issue #15230: Clearly document some of the limitations of the runpy + module and nudge readers towards importlib when appropriate. + +- Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + +- Issue #8799: Fix and improve the threading.Condition documentation. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + +- Issue #14034: added the argparse tutorial. + +- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tools/Demos +----------- + +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + +- Issue #14695: Fix missing support for starred assignments in + Tools/parser/unparse.py. + + +What's New in Python 3.2.3? +=========================== + +*Release date: 10-Apr-2012* + +Build +----- + +- Issue #14387: Work around a problem building extension modules under Windows + by undefining ``small`` before use in the Python headers. + + +What's New in Python 3.2.3 release candidate 2? +=============================================== + +*Release date: 18-Mar-2012* + +Library +------- + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. + +Extension Modules +----------------- + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + + +What's New in Python 3.2.3 release candidate 1? +=============================================== + +*Release date: 24-Feb-2012* + +Core and Builtins +----------------- + +- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED + environment variable, to provide an opt-in way to protect against denial of + service attacks due to hash collisions within the dict and set types. Patch + by David Malcolm, based on work by Victor Stinner. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: + (lambda *, arg=GLOBAL_NAME: None) + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +Library +------- + - HTMLParser is now able to handle slashes in the start tag. - Issue #13641: Decoding functions in the base64 module now accept ASCII-only diff --git a/Tools/unicode/comparecodecs.py b/Tools/unicode/comparecodecs.py --- a/Tools/unicode/comparecodecs.py +++ b/Tools/unicode/comparecodecs.py @@ -30,7 +30,7 @@ mismatch += 1 # Check decoding for i in range(256): - c = chr(i) + c = bytes([i]) try: u1 = c.decode(encoding1) except UnicodeError: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 00:08:58 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 00:08:58 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgaGVhZHMu?= Message-ID: <3XhnbZ5lxNzR0h@mail.python.org> http://hg.python.org/cpython/rev/f6fcff683866 changeset: 79808:f6fcff683866 parent: 79806:a0614e041bc8 parent: 79803:d2127cdec10e user: Trent Nelson date: Wed Oct 17 18:08:40 2012 -0400 summary: Merge heads. files: Doc/tutorial/inputoutput.rst | 2 +- Doc/using/cmdline.rst | 6 +- Include/pyport.h | 14 + Misc/ACKS | 1 + Misc/NEWS | 4421 ++++++++++ Modules/_io/textio.c | 18 +- Modules/_sha3/cleanup.py | 8 +- Modules/_sha3/keccak/KeccakF-1600-opt32.c | 2 +- Modules/_sha3/keccak/KeccakF-1600-opt64.c | 2 +- Modules/_sha3/sha3module.c | 13 +- Modules/_struct.c | 21 +- Modules/arraymodule.c | 7 +- Modules/sha256module.c | 22 +- Modules/sha512module.c | 22 +- Objects/longobject.c | 8 +- Objects/stringlib/codecs.h | 6 +- Objects/unicodeobject.c | 18 +- Python/sysmodule.c | 21 +- Tools/unicode/comparecodecs.py | 2 +- 19 files changed, 4503 insertions(+), 111 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -184,7 +184,7 @@ >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' - 'Dcab: {0[Dcab]:d}'.format(table)) + ... 'Dcab: {0[Dcab]:d}'.format(table)) Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - diff --git a/Include/pyport.h b/Include/pyport.h --- a/Include/pyport.h +++ b/Include/pyport.h @@ -865,4 +865,18 @@ #endif #endif +/* + * Convenient macros to deal with endianess of the platform. WORDS_BIGENDIAN is + * detected by configure and defined in pyconfig.h. The code in pyconfig.h + * also also takes care of Apple's universal builds. + */ + +#ifdef WORDS_BIGENDIAN +#define PY_BIG_ENDIAN 1 +#define PY_LITTLE_ENDIAN 0 +#else +#define PY_BIG_ENDIAN 0 +#define PY_LITTLE_ENDIAN 1 +#endif + #endif /* Py_PYPORT_H */ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -997,6 +997,7 @@ Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified + endianess detection and handling. + - Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer objects. @@ -207,5 +210,4423 @@ Tools/Demos ----------- +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + + +What's New in Python 3.3.0? +=========================== + +*Release date: 29-Sep-2012* + +Core and Builtins +----------------- + +- Issue #16046: Fix loading sourceless legacy .pyo files. + +- Issue #16060: Fix refcounting bug when `__trunc__()` returns an object whose + `__int__()` gives a non-integer. Patch by Serhiy Storchaka. + +Extension Modules +----------------- + +- Issue #16012: Fix a regression in pyexpat. The parser's `UseForeignDTD()` + method doesn't require an argument again. + + +What's New in Python 3.3.0 Release Candidate 3? +=============================================== + +*Release date: 23-Sep-2012* + +Core and Builtins +----------------- + +- Issue #15900: Fix reference leak in `PyUnicode_TranslateCharmap()`. + +- Issue #15926: Fix crash after multiple reinitializations of the interpreter. + +- Issue #15895: Fix FILE pointer leak in one error branch of + `PyRun_SimpleFileExFlags()` when filename points to a pyc/pyo file, closeit is + false an and set_main_loader() fails. + +- Fixes for a few crash and memory leak regressions found by Coverity. + +Library +------- + +- Issue #15882: Change `_decimal` to accept any coefficient tuple when + constructing infinities. This is done for backwards compatibility with + decimal.py: Infinity coefficients are undefined in _decimal (in accordance + with the specification). + +- Issue #15925: Fix a regression in `email.util` where the `parsedate()` and + `parsedate_tz()` functions did not return None anymore when the argument could + not be parsed. + +Extension Modules +----------------- + +- Issue #15973: Fix a segmentation fault when comparing datetime timezone + objects. + +- Issue #15977: Fix memory leak in Modules/_ssl.c when the function + _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann. + +- Issue #15969: `faulthandler` module: rename dump_tracebacks_later() to + dump_traceback_later() and cancel_dump_tracebacks_later() to + cancel_dump_traceback_later(). + +- _decimal module: use only C 89 style comments. + + +What's New in Python 3.3.0 Release Candidate 2? +=============================================== + +*Release date: 09-Sep-2012* + +Core and Builtins +----------------- + +- Issue #13992: The trashcan mechanism is now thread-safe. This eliminates + sporadic crashes in multi-thread programs when several long deallocator chains + ran concurrently and involved subclasses of built-in container types. + +- Issue #15784: Modify `OSError`.__str__() to better distinguish between errno + error numbers and Windows error numbers. + +- Issue #15781: Fix two small race conditions in import's module locking. + +Library +------- + +- Issue #15847: Fix a regression in argparse, which did not accept tuples as + argument lists anymore. + +- Issue #15828: Restore support for C extensions in `imp.load_module()`. + +- Issue #15340: Fix importing the random module when ``/dev/urandom`` cannot be + opened. This was a regression caused by the hash randomization patch. + +- Issue #10650: Deprecate the watchexp parameter of the `Decimal.quantize()` + method. + +- Issue #15785: Modify `window.get_wch()` API of the curses module: return a + character for most keys, and an integer for special keys, instead of always + returning an integer. So it is now possible to distinguish special keys like + keypad keys. + +- Issue #14223: Fix `window.addch()` of the curses module for special characters + like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now + calling the C function waddch()/mvwaddch() (as it was done in Python 3.2), + instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still + calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked + to libncursesw. + +Build +----- + +- Issue #15822: Really ensure 2to3 grammar pickles are properly installed + (replaces fixes for Issue #15645). + +Documentation +------------- + +- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted the + hashing of multi-dimensional memorviews and memoryviews with multi-byte item + formats. The intended restrictions have now been documented - they will be + correctly enforced in 3.3.1. + + +What's New in Python 3.3.0 Release Candidate 1? +=============================================== + +*Release date: 25-Aug-2012* + +Core and Builtins +----------------- + +- Issue #15573: memoryview comparisons are now performed by value with full + support for any valid struct module format definition. + +- Issue #15316: When an item in the fromlist for `__import__()` doesn't exist, + don't raise an error, but if an exception is raised as part of an import do + let that propagate. + +- Issue #15778: Ensure that ``str(ImportError(msg))`` returns a str even when + msg isn't a str. + +- Issue #2051: Source file permission bits are once again correctly copied to + the cached bytecode file. (The migration to importlib reintroduced this + problem because these was no regression test. A test has been added as part of + this patch) + +- Issue #15761: Fix crash when ``PYTHONEXECUTABLE`` is set on Mac OS X. + +- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. Patch by + Robin Schreiber. + +- Issue #15604: Update uses of `PyObject_IsTrue()` to check for and handle + errors correctly. Patch by Serhiy Storchaka. + +- Issue #14846: `importlib.FileFinder` now handles the case where the directory + being searched is removed after a previous import attempt. + +Library +------- + +- Issue #13370: Ensure that ctypes works on Mac OS X when Python is compiled + using the clang compiler. + +- Issue #13072: The array module's 'u' format code is now deprecated and will be + removed in Python 4.0. + +- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. + +- Issue #15776: Allow pyvenv to work in existing directory with --clean. + +- Issue #15249: email's BytesGenerator now correctly mangles From lines (when + requested) even if the body contains undecodable bytes. + +- Issue #15777: Fix a refleak in _posixsubprocess. + +- Issue ##665194: Update `email.utils.localtime` to use datetime.astimezone and + correctly handle historic changes in UTC offsets. + +- Issue #15199: Fix JavaScript's default MIME type to application/javascript. + Patch by Bohuslav Kabrda. + +- Issue #12643: `code.InteractiveConsole` now respects `sys.excepthook` when + displaying exceptions. Patch by Aaron Iles. + +- Issue #13579: `string.Formatter` now understands the 'a' conversion specifier. + +- Issue #15595: Fix ``subprocess.Popen(universal_newlines=True)`` for certain + locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. + +- Issue #15477: In cmath and math modules, add workaround for platforms whose + system-supplied log1p function doesn't respect signs of zeros. + +- Issue #15715: `importlib.__import__()` will silence an ImportError when the + use of fromlist leads to a failed import. + +- Issue #14669: Fix pickling of connections and sockets on Mac OS X by + sending/receiving an acknowledgment after file descriptor transfer. + TestPicklingConnection has been reenabled for Mac OS X. + +- Issue #11062: Fix adding a message from file to Babyl mailbox. + +- Issue #15646: Prevent equivalent of a fork bomb when using `multiprocessing` + on Windows without the ``if __name__ == '__main__'`` idiom. + +- Issue #15678: Fix IDLE menus when started from OS X command line (3.3.0b2 + regression). + +C API +----- + +Extension Modules +----------------- + +Tools/Demos +----------- + +Documentation +------------- + +- Issue #14674: Add a discussion of the `json` module's standard compliance. + Patch by Chris Rebert. + +- Create a 'Concurrent Execution' section in the docs, and split up the + 'Optional Operating System Services' section to use a more user-centric + classification scheme (splitting them across the new CE section, IPC and text + processing). Operating system limitatons can be reflected with the Sphinx + ``:platform:`` tag, it doesn't make sense as part of the Table of Contents. + +- Issue #4966: Bring the sequence docs up to date for the Py3k transition and + the many language enhancements since they were original written. + +- The "path importer" misnomer has been replaced with Eric Snow's + more-awkward-but-at-least-not-wrong suggestion of "path based finder" in the + import system reference docs. + +- Issue #15640: Document `importlib.abc.Finder` as deprecated. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +Tests +----- + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected tests in + test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using two + external hosts that have been configured specifically for this type of test. + +- Issue #15743: Remove the deprecated method usage in `urllib` tests. Patch by + Jeff Knupp. + +- Issue #15615: Add some tests for the `json` module's handling of invalid input + data. Patch by Kushal Das. + +Build +----- + +- Output lib files for PGO build into PGO directory. + +- Pick up 32-bit launcher from PGO directory on 64-bit PGO build. + +- Drop ``PC\python_nt.h`` as it's not used. Add input dependency on custom + build step. + +- Issue #15511: Drop explicit dependency on pythonxy.lib from _decimal amd64 + configuration. + +- Add missing PGI/PGO configurations for pywlauncher. + +- Issue #15645: Ensure 2to3 grammar pickles are properly installed. + + +What's New in Python 3.3.0 Beta 2? +================================== + +*Release date: 12-Aug-2012* + +Core and Builtins +----------------- + +- Issue #15568: Fix the return value of ``yield from`` when StopIteration is + raised by a custom iterator. + +- Issue #13119: `sys.stdout` and `sys.stderr` are now using "\r\n" newline on + Windows, as Python 2. + +- Issue #15534: Fix the fast-search function for non-ASCII Unicode strings. + +- Issue #15508: Fix the docstring for `__import__()` to have the proper default + value of 0 for 'level' and to not mention negative levels since they are not + supported. + +- Issue #15425: Eliminated traceback noise from more situations involving + importlib. + +- Issue #14578: Support modules registered in the Windows registry again. + +- Issue #15466: Stop using TYPE_INT64 in marshal, to make importlib.h (and other + byte code files) equal between 32-bit and 64-bit systems. + +- Issue #1692335: Move initial exception args assignment to + `BaseException.__new__()` to help pickling of naive subclasses. + +- Issue #12834: Fix `PyBuffer_ToContiguous()` for non-contiguous arrays. + +- Issue #15456: Fix code `__sizeof__()` after #12399 change. Patch by Serhiy + Storchaka. + +- Issue #15404: Refleak in PyMethodObject repr. + +- Issue #15394: An issue in `PyModule_Create()` that caused references to be + leaked on some error paths has been fixed. Patch by Julia Lawall. + +- Issue #15368: An issue that caused bytecode generation to be non-deterministic + has been fixed. + +- Issue #15202: Consistently use the name "follow_symlinks" for new parameters + in os and shutil functions. + +- Issue #15314: ``__main__.__loader__`` is now set correctly during interpreter + startup. + +- Issue #15111: When a module imported using 'from import' has an ImportError + inside itself, don't mask that fact behind a generic ImportError for the + module itself. + +- Issue #15293: Add GC support to the AST base node type. + +- Issue #15291: Fix a memory leak where AST nodes where not properly + deallocated. + +- Issue #15110: Fix the tracebacks generated by "import xxx" to not show the + importlib stack frames. + +- Issue #15020: The program name used to search for Python's path is now + "python3" under Unix, not "python". + +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + +- Issue #15033: Fix the exit status bug when modules invoked using -m swith, + return the proper failure return value (1). Patch contributed by Jeff Knupp. + +- Issue #15229: An `OSError` subclass whose __init__ doesn't call back + OSError.__init__ could produce incomplete instances, leading to crashes when + calling str() on them. + +- Issue 15307: Virtual environments now use symlinks with framework builds on + Mac OS X, like other POSIX builds. + +Library +------- + +- Issue #15424: Add a `__sizeof__()` implementation for array objects. Patch by + Ludwig H?hne. + +- Issue #15576: Allow extension modules to act as a package's __init__ module. + +- Issue #15502: Have `importlib.invalidate_caches()` work on `sys.meta_path` + instead of `sys.path_importer_cache`. + +- Issue #15163: Pydoc shouldn't list __loader__ as module data. + +- Issue #15471: Do not use mutable objects as defaults for + `importlib.__import__()`. + +- Issue #15559: To avoid a problematic failure mode when passed to the bytes + constructor, objects in the ipaddress module no longer implement `__index__()` + (they still implement `__int__()` as appropriate). + +- Issue #15546: Fix handling of pathological input data in the peek() and + read1() methods of the BZ2File, GzipFile and LZMAFile classes. + +- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog + ended with ``\``. Patch by Roger Serwy. + +- Issue #12655: Instead of requiring a custom type, `os.sched_getaffinity()` and + `os.sched_setaffinity()` now use regular sets of integers to represent the + CPUs a process is restricted to. + +- Issue #15538: Fix compilation of the `socket.getnameinfo()` / + `socket.getaddrinfo()` emulation code. Patch by Philipp Hagemeister. + +- Issue #15519: Properly expose WindowsRegistryFinder in importlib (and use the + correct term for it). Original patch by Eric Snow. + +- Issue #15502: Bring the importlib ABCs into line with the current state of the + import protocols given PEP 420. Original patch by Eric Snow. + +- Issue #15499: Launching a webbrowser in Unix used to sleep for a few seconds. + Original patch by Anton Barkovsky. + +- Issue #15463: The faulthandler module truncates strings to 500 characters, + instead of 100, to be able to display long file paths. + +- Issue #6056: Make `multiprocessing` use setblocking(True) on the sockets it + uses. Original patch by J Derek Wilson. + +- Issue #15364: Fix sysconfig.get_config_var('srcdir') to be an absolute path. + +- Issue #15041: Update "see also" list in tkinter documentation. + +- Issue #15413: `os.times()` had disappeared under Windows. + +- Issue #15402: An issue in the struct module that caused `sys.getsizeof()` to + return incorrect results for struct.Struct instances has been fixed. Initial + patch by Serhiy Storchaka. + +- Issue #15232: When mangle_from is True, `email.Generator` now correctly + mangles lines that start with 'From ' that occur in a MIME preamble or + epilogue. + +- Issue #15094: Incorrectly placed #endif in _tkinter.c. Patch by Serhiy + Storchaka. + +- Issue #13922: `argparse` no longer incorrectly strips '--'s that appear after + the first one. + +- Issue #12353: `argparse` now correctly handles null argument values. + +- Issue #10017, issue #14998: Fix TypeError using pprint on dictionaries with + user-defined types as keys or other unorderable keys. + +- Issue #15397: `inspect.getmodulename()` is now based directly on importlib via + a new `importlib.machinery.all_suffixes()` API. + +- Issue #14635: `telnetlib` will use poll() rather than select() when possible to + avoid failing due to the select() file descriptor limit. + +- Issue #15180: Clarify posixpath.join() error message when mixing str & bytes. + +- Issue #15343: pkgutil now includes an iter_importer_modules implementation for + importlib.machinery.FileFinder (similar to the way it already handled + zipimport.zipimporter). + +- Issue #15314: runpy now sets __main__.__loader__ correctly. + +- Issue #15357: The import emulation in pkgutil is now deprecated. pkgutil uses + importlib internally rather than the emulation. + +- Issue #15233: Python now guarantees that callables registered with the atexit + module will be called in a deterministic order. + +- Issue #15238: `shutil.copystat()` now copies Linux "extended attributes". + +- Issue #15230: runpy.run_path now correctly sets __package__ as described in + the documentation. + +- Issue #15315: Support VS 2010 in distutils cygwincompiler. + +- Issue #15294: Fix a regression in pkgutil.extend_path()'s handling of nested + namespace packages. + +- Issue #15056: `imp.cache_from_source()` and `imp.source_from_cache()` raise + NotImplementedError when `sys.implementation.cache_tag` is set to None. + +- Issue #15256: Grammatical mistake in exception raised by `imp.find_module()`. + +- Issue #5931: `wsgiref` environ variable SERVER_SOFTWARE will specify an + implementation specific term like CPython, Jython instead of generic "Python". + +- Issue #13248: Remove obsolete argument "max_buffer_size" of BufferedWriter and + BufferedRWPair, from the io module. + +- Issue #13248: Remove obsolete argument "version" of `argparse.ArgumentParser`. + +- Issue #14814: Implement more consistent ordering and sorting behaviour for + ipaddress objects. + +- Issue #14814: `ipaddress` network objects correctly return NotImplemented when + compared to arbitrary objects instead of raising TypeError. + +- Issue #14990: Correctly fail with SyntaxError on invalid encoding declaration. + +- Issue #14814: `ipaddress` now provides more informative error messages when + constructing instances directly (changes permitted during beta due to + provisional API status). + +- Issue #15247: `io.FileIO` now raises an error when given a file descriptor + pointing to a directory. + +- Issue #15261: Stop os.stat(fd) crashing on Windows when fd not open. + +- Issue #15166: Implement `imp.get_tag()` using `sys.implementation.cache_tag`. + +- Issue #15210: Catch KeyError when `importlib.__init__()` can't find + _frozen_importlib in sys.modules, not ImportError. + +- Issue #15030: `importlib.abc.PyPycLoader` now supports the new source size + header field in .pyc files. + +- Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on + flush(). + +- Issue #10571: Fix the "--sign" option of distutils' upload command. Patch by + Jakub Wilk. + +- Issue #9559: If messages were only added, a new file is no longer created and + renamed over the old file when flush() is called on an mbox, MMDF or Babyl + mailbox. + +- Issue 10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for + cryptographic purpose. + +- Issue #15184: Ensure consistent results of OS X configuration tailoring for + universal builds by factoring out common OS X-specific customizations from + sysconfig, distutils.sysconfig, distutils.util, and distutils.unixccompiler + into a new module _osx_support. + +C API +----- + +- Issue #15610: `PyImport_ImportModuleEx()` now uses a 'level' of 0 instead of -1. + +- Issue #15169, issue #14599: Strip out the C implementation of + `imp.source_from_cache()` used by PyImport_ExecCodeModuleWithPathnames() and + used the Python code instead. Leads to PyImport_ExecCodeModuleObject() to not + try to infer the source path from the bytecode path as + PyImport_ExecCodeModuleWithPathnames() does. + +Extension Modules +----------------- + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields of + type `ctypes.c_uint32` and width 32 to incorrectly be set has been fixed. + +- Issue #15194: Update libffi to the 3.0.11 release. + +Tools/Demos +----------- + +- Issue #15458: python-config gets a new option --configdir to print the $LIBPL + value. + +- Move importlib.test.benchmark to Tools/importbench. + +- Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been + enhanced to show information on more C frames relevant to CPython within the + "py-bt" and "py-bt-full" commands: + + * C frames that are waiting on the GIL + * C frames that are garbage-collecting + * C frames that are due to the invocation of a PyCFunction + +Documentation +------------- + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch by + Serhiy Storchaka. + +- Issue #15295: Reorganize and rewrite the documentation on the import system. + +- Issue #15230: Clearly document some of the limitations of the runpy module and + nudge readers towards importlib when appropriate. + +- Issue #15053: Copy Python 3.3 import lock change notice to all relevant + functions in imp instead of just at the top of the relevant section. + +- Issue #15288: Link to the term "loader" in notes in pkgutil about how things + won't work as expected in Python 3.3 and mark the requisite functions as + "changed" since they will no longer work with modules directly imported by + import itself. + +- Issue #13557: Clarify effect of giving two different namespaces to `exec()` or + `execfile()`. + +- Issue #15250: Document that `filecmp.dircmp()` compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tests +----- + +- Issue #15467: Move helpers for `__sizeof__()` tests into test_support. Patch + by Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running tests + in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15168: Move `importlib.test` to `test.test_importlib`. + +- Issue #15091: Reactivate a test on UNIX which was failing thanks to a + forgotten `importlib.invalidate_caches()` call. + +- Issue #15230: Adopted a more systematic approach in the runpy tests. + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- Issue #15284: Skip {send,recv}msg tests in test_socket when IPv6 is not + enabled. Patch by Brian Brazil. + +- Issue #15277: Fix a resource leak in support.py when IPv6 is disabled. Patch + by Brian Brazil. + +Build +----- + +- Issue #11715: Fix multiarch detection without having Debian development tools + (dpkg-dev) installed. + +- Issue #15037: Build OS X installers with local copy of ncurses 5.9 libraries + to avoid curses.unget_wch bug present in older versions of ncurses such as + those shipped with OS X. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. Also, for + OS X installers, ensure consistent sqlite3 behavior and feature availability + by building a local copy of libsqlite3 rather than depending on the wide range + of versions supplied with various OS X releases. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +- Issue #15431: Add _freeze_importlib project to regenerate importlib.h on + Windows. Patch by Kristj?n Valur J?nsson. + +- Issue #14197: For OS X framework builds, ensure links to the shared library + are created with the proper ABI suffix. + +- Issue #14330: For cross builds, don't use host python, use host search paths + for host compiler. + +- Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. + +- Issue #15268: Search curses.h in /usr/include/ncursesw. + + +What's New in Python 3.3.0 Beta 1? +================================== + +*Release date: 27-Jun-2012* + +Core and Builtins +----------------- + +- Fix a (most likely) very rare memory leak when calling main() and not being + able to decode a command-line argument. + +- Issue #14815: Use Py_ssize_t instead of long for the object hash, to + preserve all 64 bits of hash on Win64. + +- Issue #12268: File readline, readlines and read() or readall() methods + no longer lose data when an underlying read system call is interrupted. + IOError is no longer raised due to a read system call returning EINTR + from within these methods. + +- Issue #11626: Add _SizeT functions to stable ABI. + +- Issue #15146: Add PyType_FromSpecWithBases. Patch by Robin Schreiber. + +- Issue #15142: Fix reference leak when deallocating instances of types + created using PyType_FromSpec(). + +- Issue #15042: Add PyState_AddModule and PyState_RemoveModule. Add version + guard for Py_LIMITED_API additions. Patch by Robin Schreiber. + +- Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on + the work by Hirokazu Yamamoto. + +- Issue #15096: Removed support for ur'' as the raw notation isn't + compatible with Python 2.x's raw unicode strings. + +- Issue #13783: Generator objects now use the identifier APIs internally + +- Issue #14874: Restore charmap decoding speed to pre-PEP 393 levels. + Patch by Serhiy Storchaka. + +- Issue #15026: utf-16 encoding is now significantly faster (up to 10x). + Patch by Serhiy Storchaka. + +- Issue #11022: open() and io.TextIOWrapper are now calling + locale.getpreferredencoding(False) instead of locale.getpreferredencoding() + in text mode if the encoding is not specified. Don't change temporary the + locale encoding using locale.setlocale(), use the current locale encoding + instead of the user preferred encoding. + +- Issue #14673: Add Eric Snow's sys.implementation implementation. + +- Issue #15038: Optimize python Locks on Windows. + +Library +------- + +- Issue #9803: Don't close IDLE on saving if breakpoint is open. + Patch by Roger Serwy. + +- Issue #12288: Consider '0' and '0.0' as valid initialvalue + for tkinter SimpleDialog. + +- Issue #15512: Add a __sizeof__ implementation for parser. + Patch by Serhiy Storchaka. + +- Issue #15469: Add a __sizeof__ implementation for deque objects. + Patch by Serhiy Storchaka. + +- Issue #15489: Add a __sizeof__ implementation for BytesIO objects. + Patch by Serhiy Storchaka. + +- Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. + Patch by Serhiy Storchaka. + +- Issue #15514: Correct __sizeof__ support for cpu_set. + Patch by Serhiy Storchaka. + +- Issue #15187: Bugfix: remove temporary directories test_shutil was leaving + behind. + +- Issue #15177: Added dir_fd parameter to os.fwalk(). + +- Issue #15176: Clarified behavior, documentation, and implementation + of os.listdir(). + +- Issue #15061: Re-implemented hmac.compare_digest() in C to prevent further + timing analysis and to support all buffer protocol aware objects as well as + ASCII only str instances safely. + +- Issue #15164: Change return value of platform.uname() from a + plain tuple to a collections.namedtuple. + +- Support Mageia Linux in the platform module. + +- Issue #11678: Support Arch linux in the platform module. + +- Issue #15118: Change return value of os.uname() and os.times() from + plain tuples to immutable iterable objects with named attributes + (structseq objects). + +- Speed up _decimal by another 10-15% by caching the thread local context + that was last accessed. In the pi benchmark (64-bit platform, prec=9), + _decimal is now only 1.5x slower than float. + +- Remove the packaging module, which is not ready for prime time. + +- Issue #15154: Add "dir_fd" parameter to os.rmdir, remove "rmdir" + parameter from os.remove / os.unlink. + +- Issue #4489: Add a shutil.rmtree that isn't susceptible to symlink attacks. + It is used automatically on platforms supporting the necessary os.openat() + and os.unlinkat() functions. Main code by Martin von L?wis. + +- Issue #15156: HTMLParser now uses the new "html.entities.html5" dictionary. + +- Issue #11113: add a new "html5" dictionary containing the named character + references defined by the HTML5 standard and the equivalent Unicode + character(s) to the html.entities module. + +- Issue #15114: the strict mode of HTMLParser and the HTMLParseError exception + are deprecated now that the parser is able to parse invalid markup. + +- Issue #3665: \u and \U escapes are now supported in unicode regular + expressions. Patch by Serhiy Storchaka. + +- Issue #15153: Added inspect.getgeneratorlocals to simplify white box + testing of generator state updates + +- Issue #13062: Added inspect.getclosurevars to simplify testing stateful + closures + +- Issue #11024: Fixes and additional tests for Time2Internaldate. + +- Issue #14626: Large refactoring of functions / parameters in the os module. + Many functions now support "dir_fd" and "follow_symlinks" parameters; + some also support accepting an open file descriptor in place of of a path + string. Added os.support_* collections as LBYL helpers. Removed many + functions only previously seen in 3.3 alpha releases (often starting with + "f" or "l", or ending with "at"). Originally suggested by Serhiy Storchaka; + implemented by Larry Hastings. + +- Issue #15008: Implement PEP 362 "Signature Objects". + Patch by Yury Selivanov. + +- Issue: #15138: base64.urlsafe_{en,de}code() are now 3-4x faster. + +- Issue #444582: Add shutil.which, for finding programs on the system path. + Original patch by Erik Demaine, with later iterations by Jan Killian + and Brian Curtin. + +- Issue #14837: SSL errors now have ``library`` and ``reason`` attributes + describing precisely what happened and in which OpenSSL submodule. The + str() of a SSLError is also enhanced accordingly. + +- Issue #9527: datetime.astimezone() method will now supply a class + timezone instance corresponding to the system local timezone when + called with no arguments. + +- Issue #14653: email.utils.mktime_tz() no longer relies on system + mktime() when timezone offest is supplied. + +- Issue #14684: zlib.compressobj() and zlib.decompressobj() now support the use + of predefined compression dictionaries. Original patch by Sam Rushing. + +- Fix GzipFile's handling of filenames given as bytes objects. + +- Issue #14772: Return destination values from some shutil functions. + +- Issue #15064: Implement context manager protocol for multiprocessing types + +- Issue #15101: Make pool finalizer avoid joining current thread. + +- Issue #14657: The frozen instance of importlib used for bootstrap is now + also the module imported as importlib._bootstrap. + +- Issue #14055: Add __sizeof__ support to _elementtree. + +- Issue #15054: A bug in tokenize.tokenize that caused string literals + with 'b' prefixes to be incorrectly tokenized has been fixed. + Patch by Serhiy Storchaka. + +- Issue #15006: Allow equality comparison between naive and aware + time or datetime objects. + +- Issue #14982: Document that pkgutil's iteration functions require the + non-standard iter_modules() method to be defined by an importer (something + the importlib importers do not define). + +- Issue #15036: Mailbox no longer throws an error if a flush is done + between operations when removing or changing multiple items in mbox, + MMDF, or Babyl mailboxes. + +- Issue #14059: Implement multiprocessing.Barrier. + +- Issue #15061: The inappropriately named hmac.secure_compare has been + renamed to hmac.compare_digest, restricted to operating on bytes inputs + only and had its documentation updated to more accurately reflect both its + intent and its limitations + +- Issue #13841: Make child processes exit using sys.exit() on Windows. + +- Issue #14936: curses_panel was converted to PEP 3121 and PEP 384 API. + Patch by Robin Schreiber. + +- Issue #1667546: On platforms supporting tm_zone and tm_gmtoff fields + in struct tm, time.struct_time objects returned by time.gmtime(), + time.localtime() and time.strptime() functions now have tm_zone and + tm_gmtoff attributes. Original patch by Paul Boddie. + +- Rename adjusted attribute to adjustable in time.get_clock_info() result. + +- Issue #3518: Remove references to non-existent BaseManager.from_address() + method. + +- Issue #13857: Added textwrap.indent() function (initial patch by Ezra + Berch) + +- Issue #2736: Added datetime.timestamp() method. + +- Issue #13854: Make multiprocessing properly handle non-integer + non-string argument to SystemExit. + +- Issue #12157: Make pool.map() empty iterables correctly. Initial + patch by mouad. + +- Issue #11823: disassembly now shows argument counts on calls with keyword args. + +- Issue #14711: os.stat_float_times() has been deprecated. + +- LZMAFile now accepts the modes "rb"/"wb"/"ab" as synonyms of "r"/"w"/"a". + +- The bz2 and lzma modules now each contain an open() function, allowing + compressed files to readily be opened in text mode as well as binary mode. + +- BZ2File.__init__() and LZMAFile.__init__() now accept a file object as their + first argument, rather than requiring a separate "fileobj" argument. + +- gzip.open() now accepts file objects as well as filenames. + +- Issue #14992: os.makedirs(path, exist_ok=True) would raise an OSError + when the path existed and had the S_ISGID mode bit set when it was + not explicitly asked for. This is no longer an exception as mkdir + cannot control if the OS sets that bit for it or not. + +- Issue #14989: Make the CGI enable option to http.server available via command + line. + +- Issue #14987: Add a missing import statement to inspect. + +- Issue #1079: email.header.decode_header now correctly parses all the examples + in RFC2047. There is a necessary visible behavior change: the leading and/or + trailing whitespace on ASCII parts is now preserved. + +- Issue #14969: Better handling of exception chaining in contextlib.ExitStack + +- Issue #14962: Update text coloring in IDLE shell window after changing + options. Patch by Roger Serwy. + +- Issue #14963: Convert contextlib.ExitStack.__exit__ to use an iterative + algorithm (Patch by Alon Horev) + +- Issue #14785: Add sys._debugmallocstats() to help debug low-level memory + allocation issues + +- Issue #14443: Ensure that .py files are byte-compiled with the correct Python + executable within bdist_rpm even on older versions of RPM + +C-API +----- + +- Issue #13783: Inadvertent additions to the public C API in the PEP 380 + implementation have either been removed or marked as private interfaces. + +Extension Modules +----------------- + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +Documentation +------------- + +- Issue #15081: Document PyState_FindModule. + Patch by Robin Schreiber. + +- Issue #14814: Added first draft of ipaddress module API reference + +Tests +----- + +- Issue #14769: test_capi now has SkipitemTest, which cleverly checks + for "parity" between PyArg_ParseTuple() and the Python/getargs.c static + function skipitem() for all possible "format units". + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14963: Add test cases for exception handling behaviour + in contextlib.ExitStack (Initial patch by Alon Horev) + +Build +----- + +- Issue #13590: Improve support for OS X Xcode 4: + * Try to avoid building Python or extension modules with problematic + llvm-gcc compiler. + * Since Xcode 4 removes ppc support, extension module builds now + check for ppc compiler support and automatically remove ppc and + ppc64 archs when not available. + * Since Xcode 4 no longer install SDKs in default locations, + extension module builds now revert to using installed headers + and libs if the SDK used to build the interpreter is not + available. + * Update ./configure to use better defaults for universal builds; + in particular, --enable-universalsdk=yes uses the Xcode default + SDK and --with-universal-archs now defaults to "intel" if ppc + not available. + +- Issue #14225: Fix Unicode support for curses (#12567) on OS X + +- Issue #14928: Fix importlib bootstrap issues by using a custom executable + (Modules/_freeze_importlib) to build Python/importlib.h. + + +What's New in Python 3.3.0 Alpha 4? +=================================== + +*Release date: 31-May-2012* + +Core and Builtins +----------------- + +- Issue #14835: Make plistlib output empty arrays & dicts like OS X. + Patch by Sidney San Mart?n. + +- Issue #14744: Use the new _PyUnicodeWriter internal API to speed up + str%args and str.format(args). + +- Issue #14930: Make memoryview objects weakrefable. + +- Issue #14775: Fix a potential quadratic dict build-up due to the garbage + collector repeatedly trying to untrack dicts. + +- Issue #14857: fix regression in references to PEP 3135 implicit __class__ + closure variable (Reopens issue #12370) + +- Issue #14712 (PEP 405): Virtual environments. Implemented by Vinay Sajip. + +- Issue #14660 (PEP 420): Namespace packages. Implemented by Eric Smith. + +- Issue #14494: Fix __future__.py and its documentation to note that + absolute imports are the default behavior in 3.0 instead of 2.7. + Patch by Sven Marnach. + +- Issue #9260: A finer-grained import lock. Most of the import sequence + now uses per-module locks rather than the global import lock, eliminating + well-known issues with threads and imports. + +- Issue #14624: UTF-16 decoding is now 3x to 4x faster on various inputs. + Patch by Serhiy Storchaka. + +- asdl_seq and asdl_int_seq are now Py_ssize_t sized. + +- Issue #14133 (PEP 415): Implement suppression of __context__ display with an + attribute on BaseException. This replaces the original mechanism of PEP 409. + +- Issue #14417: Mutating a dict during lookup now restarts the lookup instead + of raising a RuntimeError (undoes issue #14205). + +- Issue #14738: Speed-up UTF-8 decoding on non-ASCII data. Patch by Serhiy + Storchaka. + +- Issue #14700: Fix two broken and undefined-behaviour-inducing overflow checks + in old-style string formatting. + +- Issue #14705: The PyArg_Parse() family of functions now support the 'p' format + unit, which accepts a "boolean predicate" argument. It converts any Python + value into an integer--0 if it is "false", and 1 otherwise. + +Library +------- + +- Issue #14690: Use monotonic clock instead of system clock in the sched, + subprocess and trace modules. + +- Issue #14958: Change IDLE systax highlighting to recognize all string and + byte literals supported in Python 3.3. + +- Issue #10997: Prevent a duplicate entry in IDLE's "Recent Files" menu. + +- Issue #14443: Tell rpmbuild to use the correct version of Python in + bdist_rpm. Initial patch by Ross Lagerwall. + +- Issue #14929: Stop Idle 3.x from closing on Unicode decode errors when + grepping. Patch by Roger Serwy. + +- Issue #12515: email now registers a defect if it gets to EOF while parsing + a MIME part without seeing the closing MIME boundary. + +- Issue #12510: Attempting to get invalid tooltip no longer closes Idle. + Other tooltipss have been corrected or improved and the number of tests + has been tripled. Original patch by Roger Serwy. + +- Issue #1672568: email now always decodes base64 payloads, adding padding and + ignoring non-base64-alphabet characters if needed, and registering defects + for any such problems. + +- Issue #14925: email now registers a defect when the parser decides that there + is a missing header/body separator line. MalformedHeaderDefect, which the + existing code would never actually generate, is deprecated. + +- Issue #10365: File open dialog now works instead of crashing even when + the parent window is closed before the dialog. Patch by Roger Serwy. + +- Issue #8739: Updated smtpd to support RFC 5321, and added support for the + RFC 1870 SIZE extension. + +- Issue #665194: Added a localtime function to email.utils to provide an + aware local datetime for use in setting Date headers. + +- Issue #12586: Added new provisional policies that implement convenient + unicode support for email headers. See What's New for details. + +- Issue #14731: Refactored email Policy framework to support full backward + compatibility with Python 3.2 by default yet allow for the introduction of + new features through new policies. Note that Policy.must_be_7bit is renamed + to cte_type. + +- Issue #14876: Use user-selected font for highlight configuration. + +- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals. + Have ascii characters in help. + +- Issue #14548: Make multiprocessing finalizers check pid before + running to cope with possibility of gc running just after fork. + +- Issue #14863: Update the documentation of os.fdopen() to reflect the + fact that it's only a thin wrapper around open() anymore. + +- Issue #14036: Add an additional check to validate that port in urlparse does + not go in illegal range and returns None. + +- Issue #14862: Add missing names to os.__all__ + +- Issue #14875: Use float('inf') instead of float('1e66666') in the json module. + +- Issue #13585: Added contextlib.ExitStack + +- PEP 3144, Issue #14814: Added the ipaddress module + +- Issue #14426: Correct the Date format in Expires attribute of Set-Cookie + Header in Cookie.py. + +- Issue #14588: The types module now provide new_class() and prepare_class() + functions to support PEP 3115 compliant dynamic class creation. Patch by + Daniel Urban and Nick Coghlan. + +- Issue #13152: Allow to specify a custom tabsize for expanding tabs in + textwrap. Patch by John Feuerstein. + +- Issue #14721: Send the correct 'Content-length: 0' header when the body is an + empty string ''. Initial Patch contributed by Arve Knudsen. + +- Issue #14072: Fix parsing of 'tel' URIs in urlparse by making the check for + ports stricter. + +- Issue #9374: Generic parsing of query and fragment portions of url for any + scheme. Supported both by RFC3986 and RFC2396. + +- Issue #14798: Fix the functions in pyclbr to raise an ImportError + when the first part of a dotted name is not a package. Patch by + Xavier de Gaye. + +- Issue #12098: multiprocessing on Windows now starts child processes + using the same sys.flags as the current process. Initial patch by + Sergey Mezentsev. + +- Issue #13031: Small speed-up for tarfile when unzipping tarfiles. + Patch by Justin Peel. + +- Issue #14780: urllib.request.urlopen() now has a ``cadefault`` argument + to use the default certificate store. Initial patch by James Oakley. + +- Issue #14829: Fix bisect and range() indexing with large indices + (>= 2 ** 32) under 64-bit Windows. + +- Issue #14732: The _csv module now uses PEP 3121 module initialization. + Patch by Robin Schreiber. + +- Issue #14809: Add HTTP status codes introduced by RFC 6585 to http.server + and http.client. Patch by EungJun Yi. + +- Issue #14777: tkinter may return undecoded UTF-8 bytes as a string when + accessing the Tk clipboard. Modify clipboad_get() to first request type + UTF8_STRING when no specific type is requested in an X11 windowing + environment, falling back to the current default type STRING if that fails. + Original patch by Thomas Kluyver. + +- Issue #14773: Fix os.fwalk() failing on dangling symlinks. + +- Issue #12541: Be lenient with quotes around Realm field of HTTP Basic + Authentation in urllib2. + +- Issue #14807: move undocumented tarfile.filemode() to stat.filemode() and add + doc entry. Add tarfile.filemode alias with deprecation warning. + +- Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects. + +- Issue #14532: Add a secure_compare() helper to the hmac module, to mitigate + timing attacks. Patch by Jon Oberheide. + +- Add importlib.util.resolve_name(). + +- Issue #14366: Support lzma compression in zip files. + Patch by Serhiy Storchaka. + +- Issue #13959: Introduce importlib.find_loader() and document + imp.find_module/load_module as deprecated. + +- Issue #14082: shutil.copy2() now copies extended attributes, if possible. + Patch by Hynek Schlawack. + +- Issue #13959: Make importlib.abc.FileLoader.load_module()/get_filename() and + importlib.machinery.ExtensionFileLoader.load_module() have their single + argument be optional. Allows for the replacement (and thus deprecation) of + imp.load_source()/load_package()/load_compiled(). + +- Issue #13959: imp.get_suffixes() has been deprecated in favour of the new + attributes on importlib.machinery: SOURCE_SUFFIXES, DEBUG_BYTECODE_SUFFIXES, + OPTIMIZED_BYTECODE_SUFFIXES, BYTECODE_SUFFIXES, and EXTENSION_SUFFIXES. This + led to an indirect deprecation of inspect.getmoduleinfo(). + +- Issue #14662: Prevent shutil failures on OS X when destination does not + support chflag operations. Patch by Hynek Schlawack. + +- Issue #14157: Fix time.strptime failing without a year on February 29th. + Patch by Hynek Schlawack. + +- Issue #14753: Make multiprocessing's handling of negative timeouts + the same as it was in Python 3.2. + +- Issue #14583: Fix importlib bug when a package's __init__.py would first + import one of its modules then raise an error. + +- Issue #14741: Fix missing support for Ellipsis ('...') in parser module. + +- Issue #14697: Fix missing support for set displays and set comprehensions in + parser module. + +- Issue #14701: Fix missing support for 'raise ... from' in parser module. + +- Add support for timeouts to the acquire() methods of + multiprocessing's lock/semaphore/condition proxies. + +- Issue #13989: Add support for text mode to gzip.open(). + +- Issue #14127: The os.stat() result object now provides three additional + fields: st_ctime_ns, st_mtime_ns, and st_atime_ns, providing those times as an + integer with nanosecond resolution. The functions os.utime(), os.lutimes(), + and os.futimes() now accept a new parameter, ns, which accepts mtime and atime + as integers with nanosecond resolution. + +- Issue #14127 and #10148: shutil.copystat now preserves exact mtime and atime + on filesystems providing nanosecond resolution. + +Tools/Demos +----------- + +- Issue #14695: Bring Tools/parser/unparse.py support up to date with + the Python 3.3 Grammar. + +Build +----- + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c. + +- Issue #14693: Under non-Windows platforms, hashlib's fallback modules are + always compiled, even if OpenSSL is present at build time. + +- Issue #13210: Windows build now uses VS2010, ported from VS2008. + +Documentation +------------- + +- Issue #14588: The language reference now accurately documents the Python 3 + class definition process. Patch by Nick Coghlan. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + + +What's New in Python 3.3.0 Alpha 3? +=================================== + +*Release date: 01-May-2012* + +Core and Builtins +----------------- + +- Issue #14699: Fix calling the classmethod descriptor directly. + +- Issue #14433: Prevent msvcrt crash in interactive prompt when stdin is closed. + +- Issue #14521: Make result of float('nan') and float('-nan') more consistent + across platforms. + +- Issue #14646: __import__() sets __loader__ if the loader did not. + +- Issue #14605: No longer have implicit entries in sys.meta_path. If + sys.meta_path is found to be empty, raise ImportWarning. + +- Issue #14605: No longer have implicit entries in sys.path_hooks. If + sys.path_hooks is found to be empty, a warning will be raised. None is now + inserted into sys.path_importer_cache if no finder was discovered. This also + means imp.NullImporter is no longer implicitly used. + +- Issue #13903: Implement PEP 412. Individual dictionary instances can now share + their keys with other dictionaries. Classes take advantage of this to share + their instance dictionary keys for improved memory and performance. + +- Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError + when repr() or str() is called on such an object. + +- Issue #14658: Fix binding a special method to a builtin implementation of a + special method with a different name. + +- Issue #14630: Fix a memory access bug for instances of a subclass of int + with value 0. + +- Issue #14339: Speed improvements to bin, oct and hex functions. Patch by + Serhiy Storchaka. + +- Issue #14098: New functions PyErr_GetExcInfo and PyErr_SetExcInfo. + Patch by Stefan Behnel. + +- Issue #14385: It is now possible to use a custom type for the __builtins__ + namespace, instead of a dict. It can be used for sandboxing for example. + Raise also a NameError instead of ImportError if __build_class__ name if not + found in __builtins__. + +- Issue #12599: Be more strict in accepting None compared to a false-like + object for importlib.util.module_for_loader and + importlib.machinery.PathFinder. + +- Issue #14612: Fix jumping around with blocks by setting f_lineno. + +- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in + globals raises a KeyError. + +- Issue #14607: Fix keyword-only arguments which started with ``__``. + +- Issue #10854: The ImportError raised when an extension module on Windows + fails to import now uses the new path and name attributes from + Issue #1559549. + +- Issue #13889: Check and (if necessary) set FPU control word before calling + any of the dtoa.c string <-> float conversion functions, on MSVC builds of + Python. This fixes issues when embedding Python in a Delphi app. + +- __import__() now matches PEP 328 and documentation by defaulting 'index' to 0 + instead of -1 and removing support for negative values. + +- Issue #2377: Make importlib the implementation of __import__(). + +- Issue #1559549: ImportError now has 'name' and 'path' attributes that are set + using keyword arguments to its constructor. They are currently not set by + import as they are meant for use by importlib. + +- Issue #14474: Save and restore exception state in thread.start_new_thread() + while writing error message if the thread leaves a unhandled exception. + +- Issue #13019: Fix potential reference leaks in bytearray.extend(). Patch + by Suman Saha. + +Library +------- + +- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'. + +- Issue #14371: Support bzip2 in zipfile module. Patch by Serhiy Storchaka. + +- Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running + step. Patch by Xavier de Gaye. + +- Issue #14696: Fix parser module to understand 'nonlocal' declarations. + +- Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near + the DST transition. Patch by Joe Peterson. + +- Issue #9154: Fix parser module to understand function annotations. + +- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the + client ip address instead client hostname. Patch by Charles-Fran?ois Natali. + +- Issue #14309: Deprecate time.clock(), use time.perf_counter() or + time.process_time() instead. + +- Issue #14428: Implement the PEP 418. Add time.get_clock_info(), + time.perf_counter() and time.process_time() functions, and rename + time.steady() to time.monotonic(). + +- Issue #14646: importlib.util.module_for_loader() now sets __loader__ and + __package__ (when possible). + +- Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a + test class that doesn't inherit from TestCase (i.e. a mixin). + +- Issue #4892: multiprocessing Connections can now be transferred over + multiprocessing Connections. Patch by Richard Oudkerk (sbt). + +- Issue #14160: TarFile.extractfile() failed to resolve symbolic links when + the links were not located in an archive subdirectory. + +- Issue #14638: pydoc now treats non-string __name__ values as if they + were missing, instead of raising an error. + +- Issue #13684: Fix httplib tunnel issue of infinite loops for certain sites + which send EOF without trailing \r\n. + +- Issue #14605: Add importlib.abc.FileLoader, importlib.machinery.(FileFinder, + SourceFileLoader, SourcelessFileLoader, ExtensionFileLoader). + +- Issue #13959: imp.cache_from_source()/source_from_cache() now follow + os.path.join()/split() semantics for path manipulation instead of its prior, + custom semantics of caring the right-most path separator forward in path + joining. + +- Issue #2193: Allow ":" character in Cookie NAME values. + +- Issue #14629: tokenizer.detect_encoding will specify the filename in the + SyntaxError exception if found at readline.__self__.name. + +- Issue #14629: Raise SyntaxError in tokenizer.detect_encoding if the + first two lines have non-UTF-8 characters without an encoding declaration. + +- Issue #14308: Fix an exception when a "dummy" thread is in the threading + module's active list after a fork(). + +- Issue #11750: The Windows API functions scattered in the _subprocess and + _multiprocessing.win32 modules now live in a single module "_winapi". + Patch by sbt. + +- Issue #14087: multiprocessing: add Condition.wait_for(). Patch by sbt. + +- Issue #14538: HTMLParser can now parse correctly start tags that contain + a bare '/'. + +- Issue #14452: SysLogHandler no longer inserts a UTF-8 BOM into the message. + +- Issue #14386: Expose the dict_proxy internal type as types.MappingProxyType. + +- Issue #13959: Make imp.reload() always use a module's __loader__ to perform + the reload. + +- Issue #13959: Add imp.py and rename the built-in module to _imp, allowing for + re-implementing parts of the module in pure Python. + +- Issue #13496: Fix potential overflow in bisect.bisect algorithm when applied + to a collection of size > sys.maxsize / 2. + +- Have importlib take advantage of ImportError's new 'name' and 'path' + attributes. + +- Issue #14399: zipfile now recognizes that the archive has been modified even + if only the comment is changed. In addition, the TypeError that results from + trying to set a non-binary value as a comment is now now raised at the time + the comment is set rather than at the time the zipfile is written. + +- trace.CoverageResults.is_ignored_filename() now ignores any name that starts + with "<" and ends with ">" instead of special-casing "" and + ". + +- IDLE can be launched as python -m idlelib + +- Issue #14295: Add unittest.mock + +- Issue #7652: Add --with-system-libmpdec option to configure for linking + the _decimal module against an installed libmpdec. + +- Issue #14380: MIMEText now defaults to utf-8 when passed non-ASCII unicode + with no charset specified. + +- Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on + OSX; avoid to call handle_connect in case of a disconnected socket which + was not meant to connect. + +- Issue #14204: The ssl module now has support for the Next Protocol + Negotiation extension, if available in the underlying OpenSSL library. + Patch by Colin Marc. + +- Issue #3035: Unused functions from tkinter are marked as pending deprecated. + +- Issue #12757: Fix the skipping of doctests when python is run with -OO so + that it works in unittest's verbose mode as well as non-verbose mode. + +- Issue #7652: Integrate the decimal floating point libmpdec library to speed + up the decimal module. Performance gains of the new C implementation are + between 10x and 100x, depending on the application. + +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)) (Patch by Guilherme Polo) + +- Issue #14269: SMTPD now conforms to the RFC and requires a HELO command + before MAIL, RCPT, or DATA. + +- Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr + attribute. + +- Issue #14344: fixed the repr of email.policy objects. + +- Issue #11686: Added missing entries to email package __all__ lists + (mostly the new Bytes classes). + +- Issue #14335: multiprocessing's custom Pickler subclass now inherits from + the C-accelerated implementation. Patch by sbt. + +- Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem. + +- Issue #11199: Fix the with urllib which hangs on particular ftp urls. + +- Improve the memory utilization and speed of functools.lru_cache. + +- Issue #14222: Use the new time.steady() function instead of time.time() for + timeout in queue and threading modules to not be affected of system time + update. + +- Issue #13248: Remove lib2to3.pytree.Base.get_prefix/set_prefix. + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + +- Issue #14200: Idle shell crash on printing non-BMP unicode character. + +- Issue #12818: format address no longer needlessly \ escapes ()s in names when + the name ends up being quoted. + +- Issue #14062: BytesGenerator now correctly folds Header objects, + including using linesep when folding. + +- Issue #13839: When invoked on the command-line, the pstats module now + accepts several filenames of profile stat files and merges them all. + Patch by Matt Joiner. + +- Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers + instead of raising an error. This fixes a regression relative to 2.7. + +- Issue #989712: Support using Tk without a mainloop. + +- Issue #5219: Prevent event handler cascade in IDLE. + +- Issue #3835: Refuse to use unthreaded Tcl in threaded Python. + +- Issue #2843: Add new Tk API to Tkinter. + +- Issue #14184: Increase the default stack size for secondary threads on + Mac OS X to avoid interpreter crashes when using threads on 10.7. + +- Issue #14180: datetime.date.fromtimestamp(), + datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() + now raise an OSError instead of ValueError if localtime() or gmtime() failed. + +- Issue #14180: time.ctime(), gmtime(), time.localtime(), + datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and + datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of + a ValueError, if the timestamp does not fit in time_t. + +- Issue #14180: datetime.datetime.fromtimestamp() and + datetime.datetime.utcfromtimestamp() now round microseconds towards zero + instead of rounding to nearest with ties going away from zero. + +- Issue #10543: Fix unittest test discovery with Jython bytecode files. + +- Issue #1178863: Separate initialisation from setting when initializing + Tkinter.Variables; harmonize exceptions to ValueError; only delete variables + that have not been deleted; assert that variable names are strings. + +- Issue #14104: Implement time.monotonic() on Mac OS X, patch written by + Nicholas Riley. + +- Issue #13394: the aifc module now uses warnings.warn() to signal warnings. + +- Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under + Windows when the child process has already exited. + +- Issue #14223: curses.addch() is no more limited to the range 0-255 when the + Python curses is not linked to libncursesw. It was a regression introduced + in Python 3.3a1. + +- Issue #14168: Check for presence of Element._attrs in minidom before + accessing it. + +- Issue #12328: Fix multiprocessing's use of overlapped I/O on Windows. + Also, add a multiprocessing.connection.wait(rlist, timeout=None) function + for polling multiple objects at once. Patch by sbt. + +- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end, + data or close method) for the Python implementation as well. + Drop the no-op TreeBuilder().xml() method from the C implementation. + +- Issue #14210: pdb now has tab-completion not only for command names, but + also for their arguments, wherever possible. + +- Issue #14310: Sockets can now be with other processes on Windows using + the api socket.socket.share() and socket.fromshare(). + +- Issue #10576: The gc module now has a 'callbacks' member that will get + called when garbage collection takes place. + +Build +----- + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14321: Do not run pgen during the build if files are up to date. + +Documentation +------------- + +- Issue #14034: added the argparse tutorial. + +- Issue #14324: Fix configure tests for cross builds. + +- Issue #14327: Call AC_CANONICAL_HOST in configure.ac and check in + config.{guess,sub}. Don't use uname calls for cross builds. + +Extension Modules +----------------- + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +- Issue #14259: The finditer() method of re objects did not take any + keyword arguments, contrary to the documentation. + +- Issue #10142: Support for SEEK_HOLE/SEEK_DATA (for example, under ZFS). + +Tests +----- + +- Issue #14442: Add missing errno import in test_smtplib. + +- Issue #8315: (partial fix) python -m unittest test.test_email now works. + + +What's New in Python 3.3.0 Alpha 1? +=================================== + +*Release date: 05-Mar-2012* + +Core and Builtins +----------------- + +- Issue #14172: Fix reference leak when marshalling a buffer-like object + (other than a bytes object). + +- Issue #13521: dict.setdefault() now does only one lookup for the given key, + making it "atomic" for many purposes. Patch by Filip Gruszczy?ski. + +- PEP 409, Issue #6210: "raise X from None" is now supported as a means of + suppressing the display of the chained exception context. The chained + context still remains available as the __context__ attribute. + +- Issue #10181: New memoryview implementation fixes multiple ownership + and lifetime issues of dynamically allocated Py_buffer members (#9990) + as well as crashes (#8305, #7433). Many new features have been added + (See whatsnew/3.3), and the documentation has been updated extensively. + The ndarray test object from _testbuffer.c implements all aspects of + PEP-3118, so further development towards the complete implementation + of the PEP can proceed in a test-driven manner. + + Thanks to Nick Coghlan, Antoine Pitrou and Pauli Virtanen for review + and many ideas. + +- Issue #12834: Fix incorrect results of memoryview.tobytes() for + non-contiguous arrays. + +- Issue #5231: Introduce memoryview.cast() method that allows changing + format and shape without making a copy of the underlying memory. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Upgrade Unicode data to Unicode 6.1. + +- Issue #14040: Remove rarely used file name suffixes for C extensions + (under POSIX mainly). + +- Issue #14051: Allow arbitrary attributes to be set of classmethod and + staticmethod. + +- Issue #13703: oCERT-2011-003: Randomize hashes of str and bytes to protect + against denial of service attacks due to hash collisions within the dict and + set types. Patch by David Malcolm, based on work by Victor Stinner. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Issue #12705: A SyntaxError exception is now raised when attempting to + compile multiple statements as a single interactive statement. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Issue #13752: Add a casefold() method to str. + +- Issue #13761: Add a "flush" keyword argument to the print() function, + used to ensure flushing the output stream. + +- Issue #13645: pyc files now contain the size of the corresponding source + code, to avoid timestamp collisions (especially on filesystems with a low + timestamp resolution) when checking for freshness of the bytecode. + +- PEP 380, Issue #11682: Add "yield from " to support easy delegation to + subgenerators (initial patch by Greg Ewing, integration into 3.3 by + Renaud Blanch, Ryan Kelly, Zbigniew J?drzejewski-Szmek and Nick Coghlan) + +- Issue #13748: Raw bytes literals can now be written with the ``rb`` prefix + as well as ``br``. + +- Issue #12736: Use full unicode case mappings for upper, lower, and title case. + +- Issue #12760: Add a create mode to open(). Patch by David Townshend. + +- Issue #13738: Simplify implementation of bytes.lower() and bytes.upper(). + +- Issue #13577: Built-in methods and functions now have a __qualname__. + Patch by sbt. + +- Issue #6695: Full garbage collection runs now clear the freelist of set + objects. Initial patch by Matthias Troffaes. + +- Fix OSError.__init__ and OSError.__new__ so that each of them can be + overriden and take additional arguments (followup to issue #12555). + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #13503: Use a more efficient reduction format for bytearrays with + pickle protocol >= 3. The old reduction format is kept with older protocols + in order to allow unpickling under Python 2. Patch by Irmen de Jong. + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #11849: Ensure that free()d memory arenas are really released + on POSIX systems supporting anonymous memory mappings. Patch by + Charles-Fran?ois Natali. + +- Issue #13452: PyUnicode_EncodeDecimal() doesn't support error handlers + different than "strict" anymore. The caller was unable to compute the + size of the output buffer: it depends on the error handler. + +- PEP 3155 / issue #13448: Qualified name for classes and functions. + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13411: memoryview objects are now hashable when the underlying + object is hashable. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #10227: Add an allocation cache for a single slice object. Patch by + Stefan Behnel. + +- Issue #13393: BufferedReader.read1() now asks the full requested size to + the raw stream instead of limiting itself to the buffer size. + +- Issue #13392: Writing a pyc file should now be atomic under Windows as well. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13389: Full garbage collection passes now clear the freelists for + list and dict objects. They already cleared other freelists in the + interpreter. + +- Issue #13327: Remove the need for an explicit None as the second argument + to os.utime, os.lutimes, os.futimes, os.futimens, os.futimesat, in + order to update to the current time. Also added keyword argument + handling to os.utimensat in order to remove the need for explicit None. + +- Issue #13350: Simplify some C code by replacing most usages of + PyUnicode_Format by PyUnicode_FromFormat. + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #9896: Add start, stop, and step attributes to range objects. + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: ``lambda *, + arg=GLOBAL_NAME: None`` + +- Issue #12797: Added custom opener parameter to builtin open() and + FileIO.open(). + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #13201: Define '==' and '!=' to compare range objects based on + the sequence of values they define (instead of comparing based on + object identity). + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12753: Add support for Unicode name aliases and named sequences. + Both ``unicodedata.lookup()`` and '\N{...}' now resolve aliases, + and ``unicodedata.lookup()`` resolves named sequences too. + +- Issue #12170: The count(), find(), rfind(), index() and rindex() methods + of bytes and bytearray objects now accept an integer between 0 and 255 + as their first argument. Patch by Petri Lehtinen. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #12281: Rewrite the MBCS codec to handle correctly replace and ignore + error handlers on all Windows versions. The MBCS codec is now supporting all + error handlers, instead of only replace to encode and ignore to decode. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #13146: Writing a pyc file is now atomic under POSIX. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. + +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize() + and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to + the current locale encoding. + +- Add internal API for static strings (_Py_identifier et al.). + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- PEP 393: flexible string representation. Thanks to Torsten Becker for the + initial implementation, and Victor Stinner for various bug fixes. + +- Issue #14081: The 'sep' and 'maxsplit' parameter to str.split, bytes.split, + and bytearray.split may now be passed as keyword arguments. + +- Issue #13012: The 'keepends' parameter to str.splitlines may now be passed + as a keyword argument: "my_string.splitlines(keepends=True)". The same + change also applies to bytes.splitlines and bytearray.splitlines. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12904: os.utime, os.futimes, os.lutimes, and os.futimesat now write + atime and mtime with nanosecond precision on modern POSIX platforms. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12773: Make __doc__ mutable on user-defined classes. + +- Issue #12766: Raise a ValueError when creating a class with a class variable + that conflicts with a name in __slots__. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +- Issue #12732: In narrow unicode builds, allow Unicode identifiers which fall + outside the BMP. + +- Issue #12575: Validate user-generated AST before it is compiled. + +- Make type(None), type(Ellipsis), and type(NotImplemented) callable. They + return the respective singleton instances. + +- Forbid summing bytes with sum(). + +- Verify the types of AST strings and identifiers provided by the user before + compiling them. + +- Issue #12647: The None object now has a __bool__() method that returns False. + Formerly, bool(None) returned False only because of special case logic + in PyObject_IsTrue(). + +- Issue #12579: str.format_map() now raises a ValueError if used on a + format string that contains positional fields. Initial patch by + Julian Berman. + +- Issue #10271: Allow warnings.showwarning() be any callable. + +- Issue #11627: Fix segfault when __new__ on a exception returns a + non-exception class. + +- Issue #12149: Update the method cache after a type's dictionary gets + cleared by the garbage collector. This fixes a segfault when an instance + and its type get caught in a reference cycle, and the instance's + deallocator calls one of the methods on the type (e.g. when subclassing + IOBase). Diagnosis and patch by Davide Rizzo. + +- Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows. + +- Issue #9642: Uniformize the tests on the availability of the mbcs codec, add + a new HAVE_MBCS define. + +- Issue #9642: Fix filesystem encoding initialization: use the ANSI code page + on Windows if the mbcs codec is not available, and fail with a fatal error if + we cannot get the locale encoding (if nl_langinfo(CODESET) is not available) + instead of using UTF-8. + +- When a generator yields, do not retain the caller's exception state on the + generator. + +- Issue #12475: Prevent generators from leaking their exception state into the + caller's frame as they return for the last time. + +- Issue #12291: You can now load multiple marshalled objects from a stream, + with other data interleaved between marshalled objects. + +- Issue #12356: When required positional or keyword-only arguments are not + given, produce a informative error message which includes the name(s) of the + missing arguments. + +- Issue #12370: Fix super with no arguments when __class__ is overriden in the + class body. + +- Issue #12084: os.stat on Windows now works properly with relative symbolic + links when called from any directory. + +- Loosen type restrictions on the __dir__ method. __dir__ can now return any + sequence, which will be converted to a list and sorted by dir(). + +- Issue #12265: Make error messages produced by passing an invalid set of + arguments to a function more informative. + +- Issue #12225: Still allow Python to build if Python is not in its hg repo or + mercurial is not installed. + +- Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix + the following case: sys.stdin.read() stopped with CTRL+d (end of file), + raw_input() interrupted by CTRL+c. + +- Issue #12216: Allow unexpected EOF errors to happen on any line of the file. + +- Issue #12199: The TryExcept and TryFinally and AST nodes have been unified + into a Try node. + +- Issue #9670: Increase the default stack size for secondary threads on + Mac OS X and FreeBSD to reduce the chances of a crash instead of a + "maximum recursion depth" RuntimeError exception. + (patch by Ronald Oussoren) + +- Issue #12106: The use of the multiple-with shorthand syntax is now reflected + in the AST. + +- Issue #12190: Try to use the same filename object when compiling unmarshalling + a code objects in the same file. + +- Issue #12166: Move implementations of dir() specialized for various types into + the __dir__() methods of those types. + +- Issue #5715: In socketserver, close the server socket in the child process. + +- Correct lookup of __dir__ on objects. Among other things, this causes errors + besides AttributeError found on lookup to be propagated. + +- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal + module. Patch written by Charles-Fran?ois Natali. + +- Issue #1746656: Added the if_nameindex, if_indextoname, if_nametoindex + methods to the socket module. + +- Issue #12044: Fixed subprocess.Popen when used as a context manager to + wait for the process to end when exiting the context to avoid unintentionally + leaving zombie processes around. + +- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, + clear the end-of-file indicator after CTRL+d. + +- Issue #1856: Avoid crashes and lockups when daemon threads run while the + interpreter is shutting down; instead, these threads are now killed when + they try to take the GIL. + +- Issue #9756: When calling a method descriptor or a slot wrapper descriptor, + the check of the object type doesn't read the __class__ attribute anymore. + Fix a crash if a class override its __class__ attribute (e.g. a proxy of the + str type). Patch written by Andreas St?hrk. + +- Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* + APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch + by Charles-Fran?ois Natali. + +- Issue #10914: Initialize correctly the filesystem codec when creating a new + subinterpreter to fix a bootstrap issue with codecs implemented in Python, as + the ISO-8859-15 codec. + +- Issue #11918: OS/2 and VMS are no more supported because of the lack of + maintainer. + +- Issue #6780: fix starts/endswith error message to mention that tuples are + accepted too. + +- Issue #5057: fix a bug in the peepholer that led to non-portable pyc files + between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP + chars (e.g. "\U00012345"[0]). + +- Issue #11845: Fix typo in rangeobject.c that caused a crash in + compute_slice_indices. Patch by Daniel Urban. + +- Issue #5673: Added a `timeout` keyword argument to subprocess.Popen.wait, + subprocess.Popen.communicated, subprocess.call, subprocess.check_call, and + subprocess.check_output. If the blocking operation takes more than `timeout` + seconds, the `subprocess.TimeoutExpired` exception is raised. + +- Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted + (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch + written by Charles-Francois Natali. + +- Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. + +- Issue #10785: Store the filename as Unicode in the Python parser. + +- Issue #11619: _PyImport_LoadDynamicModule() doesn't encode the path to bytes + on Windows. + +- Issue #10998: Remove mentions of -Q, sys.flags.division_warning and + Py_DivisionWarningFlag left over from Python 2. + +- Issue #11244: Remove an unnecessary peepholer check that was preventing + negative zeros from being constant-folded properly. + +- Issue #11395: io.FileIO().write() clamps the data length to 32,767 bytes on + Windows if the file is a TTY to workaround a Windows bug. The Windows console + returns an error (12: not enough space error) on writing into stdout if + stdout mode is binary and the length is greater than 66,000 bytes (or less, + depending on heap usage). + +- Issue #11320: fix bogus memory management in Modules/getpath.c, leading to + a possible crash when calling Py_SetPath(). + +- Issue #11432: A bug was introduced in subprocess.Popen on posix systems with + 3.2.0 where the stdout or stderr file descriptor being the same as the stdin + file descriptor would raise an exception. webbrowser.open would fail. fixed. + +- Issue #9856: Change object.__format__ with a non-empty format string + to be a DeprecationWarning. In 3.2 it was a PendingDeprecationWarning. + In 3.4 it will be a TypeError. + +- Issue #11244: The peephole optimizer is now able to constant-fold + arbitrarily complex expressions. This also fixes a 3.2 regression where + operations involving negative numbers were not constant-folded. + +- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when + there are many tags (e.g. when using mq). Patch by Nadeem Vawda. + +- Issue #11335: Fixed a memory leak in list.sort when the key function + throws an exception. + +- Issue #8923: When a string is encoded to UTF-8 in strict mode, the result is + cached into the object. Examples: str.encode(), str.encode('utf-8'), + PyUnicode_AsUTF8String() and PyUnicode_AsEncodedString(unicode, "utf-8", + NULL). + +- Issue #10831: PyUnicode_FromFormat() supports %li, %lli and %zi formats. + +- Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse + the format string in the 3 steps, fix crashs on invalid format strings. + +- Issue #13007: whichdb should recognize gdbm 1.9 magic numbers. + +- Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from + UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode). + Patch written by Ray Allen. + +- Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with + a buffer struct having a NULL data pointer. + +- Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and + sys.stdin uses universal newline (replace '\r\n' by '\n'). + +- Issue #11828: startswith and endswith now accept None as slice index. + Patch by Torsten Becker. + +- Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on + narrow build. + +- Issue #11168: Remove filename debug variable from PyEval_EvalFrameEx(). + It encoded the Unicode filename to UTF-8, but the encoding fails on + undecodable filename (on surrogate characters) which raises an unexpected + UnicodeEncodeError on recursion limit. + +- Issue #11187: Remove bootstrap code (use ASCII) of + PyUnicode_AsEncodedString(), it was replaced by a better fallback (use the + locale encoding) in PyUnicode_EncodeFSDefault(). + +- Check for NULL result in PyType_FromSpec. + +- Issue #10516: New copy() and clear() methods for lists and bytearrays. + +- Issue #11386: bytearray.pop() now throws IndexError when the bytearray is + empty, instead of OverflowError. + +- Issue #12380: The rjust, ljust and center methods of bytes and bytearray + now accept a bytearray argument. + +Library +------- + +- Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly + return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been + fixed. + +- Issue #14166: Pickler objects now have an optional ``dispatch_table`` + attribute which allows to set custom per-pickler reduction functions. + Patch by sbt. + +- Issue #14177: marshal.loads() now raises TypeError when given an unicode + string. Patch by Guilherme Gon?alves. + +- Issue #13550: Remove the debug machinery from the threading module: remove + verbose arguments from all threading classes and functions. + +- Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary, + WeakValueDictionary) to return a better approximation when some objects + are dead or dying. Moreover, the implementation is now O(1) rather than + O(n). + +- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode. + Patch by Mikhail Novikov. + +- Issue #11841: Fix comparison bug with 'rc' versions in packaging.version. + Patch by Filip Gruszczy?ski. + +- Issue #13447: Add a test file to host regression tests for bugs in the + scripts found in the Tools directory. + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. Also fixed in packaging. + +- Issue #8033: sqlite3: Fix 64-bit integer handling in user functions + on 32-bit architectures. Initial patch by Philippe Devalkeneer. + +Extension Modules +----------------- + +- Issue #15676: Now "mmap" check for empty files before doing the + offset check. Patch by Steven Willis. + +- Issue #6493: An issue in ctypes on Windows that caused structure bitfields + of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. + +- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. + +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + +- Issue #14212: The re module didn't retain a reference to buffers it was + scanning, resulting in segfaults. + +Tests +----- + +- Issue #15304: Fix warning message when os.chdir() fails inside + test.support.temp_cwd(). Patch by Chris Jerdonek. + +- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch + by Serhiy Storchaka. + +- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the + UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected + tests in test_posix.py to account for this. + +- Issue #15285: Refactor the approach for testing connect timeouts using + two external hosts that have been configured specifically for this type + of test. + +- Issue #15615: Add some tests for the json module's handling of invalid + input data. Patch by Kushal Das. + +- Issue #15496: Add directory removal helpers for tests on Windows. + Patch by Jeremy Kloth. + +- Issue #15467: Move helpers for __sizeof__ tests into test_support. + Patch by Serhiy Storchaka. + +- Issue #15320: Make iterating the list of tests thread-safe when running + tests in multiprocess mode. Patch by Chris Jerdonek. + +- Issue #15230: Adopted a more systematic approach in the runpy tests + +- Issue #15300: Ensure the temporary test working directories are in the same + parent folder when running tests in multiprocess mode from a Python build. + Patch by Chris Jerdonek. + +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + +- Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + +- Issue #14026: In test_cmd_line_script, check that sys.argv is populated + correctly for the various invocation approaches (Patch by Jason Yeo) + +- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging + message (Patch by Jason Yeo) + +- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing + a test failure in test_ssl. + +Build +----- + +- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after + 2801bf875a24 (see #15801). + +- Issue #11715: Fix multiarch detection without having Debian development + tools (dpkg-dev) installed. + +- Issue #15819: Make sure we can build Python out-of-tree from a readonly + source directory. (Somewhat related to Issue #9860.) + +- Issue #15822: Ensure 2to3 grammar pickles are properly installed. + +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. + +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + +- Issue #14197: For OS X framework builds, ensure links to the shared + library are created with the proper ABI suffix. + +- Issue #14472: Update .gitignore. Patch by Matej Cepl. + +- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. + +- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. + +- Issue #14437: Fix building the _io module under Cygwin. + +- Issue #14387: Do not include accu.h from Python.h. + +- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. + Based on patch from Herv? Coatanhay. + +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + +Documentation +------------- + +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd + argument. + +- Issue #15979: Improve timeit documentation. + +- Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + +- Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +- Issue #14674: Add a discussion of the json module's standard compliance. + Patch by Chris Rebert. + +- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by + Daniel Ellis. + +- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch + by Serhiy Storchaka. + +- Issue 15482: Properly document the default 'level' value for __import__() + while warning about using negative values. + +- Issue #15230: Clearly document some of the limitations of the runpy + module and nudge readers towards importlib when appropriate. + +- Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + +- Issue #8799: Fix and improve the threading.Condition documentation. + +- Issue #14943: Correct a default argument value for winreg.OpenKey + and correctly list the argument names in the function's explanation. + +- Issue #14034: added the argparse tutorial. + +- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch + contributed by Chris Jerdonek. + +Tools/Demos +----------- + +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + +- Issue #14695: Fix missing support for starred assignments in + Tools/parser/unparse.py. + + +What's New in Python 3.2.3? +=========================== + +*Release date: 10-Apr-2012* + +Build +----- + +- Issue #14387: Work around a problem building extension modules under Windows + by undefining ``small`` before use in the Python headers. + + +What's New in Python 3.2.3 release candidate 2? +=============================================== + +*Release date: 18-Mar-2012* + +Library +------- + +- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils + on Windows. + +Extension Modules +----------------- + +- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash + table internal to the pyexpat module's copy of the expat library to avoid a + denial of service due to hash collisions. Patch by David Malcolm with some + modifications by the expat project. + + +What's New in Python 3.2.3 release candidate 1? +=============================================== + +*Release date: 24-Feb-2012* + +Core and Builtins +----------------- + +- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED + environment variable, to provide an opt-in way to protect against denial of + service attacks due to hash collisions within the dict and set types. Patch + by David Malcolm, based on work by Victor Stinner. + +- Issue #14084: Fix a file descriptor leak when importing a module with a + bad encoding. + +- Issue #13020: Fix a reference leak when allocating a structsequence object + fails. Patch by Suman Saha. + +- Issue #13908: Ready types returned from PyType_FromSpec. + +- Issue #11235: Fix OverflowError when trying to import a source file whose + modification time doesn't fit in a 32-bit timestamp. + +- Fix the builtin module initialization code to store the init function for + future reinitialization. + +- Issue #8052: The posix subprocess module would take a long time closing + all possible file descriptors in the child process rather than just open + file descriptors. It now closes only the open fds if possible for the + default close_fds=True behavior. + +- Issue #13629: Renumber the tokens in token.h so that they match the indexes + into _PyParser_TokenNames. + +- Fix the fix for issue #12149: it was incorrect, although it had the side + effect of appearing to resolve the issue. Thanks to Mark Shannon for + noticing. + +- Issue #13505: Pickle bytes objects in a way that is compatible with + Python 2 when using protocols <= 2. + +- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix + given by Campbell Barton). + +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + +- Issue #13436: Fix a bogus error message when an AST object was passed + an invalid integer value. + +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER + to allow compiling extension modules with -Wswitch-enum on gcc. + Initial patch by Floris Bruynooghe. + +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder + already accepts them). + +- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode + error handler in interactive mode (when calling into PyOS_Readline()). + +- Issue #13343: Fix a SystemError when a lambda expression uses a global + variable in the default value of a keyword-only argument: + (lambda *, arg=GLOBAL_NAME: None) + +- Issue #10519: Avoid unnecessary recursive function calls in + setobject.c. + +- Issue #10363: Deallocate global locks in Py_Finalize(). + +- Issue #13018: Fix reference leaks in error paths in dictobject.c. + Patch by Suman Saha. + +- Issue #1294232: In a few cases involving metaclass inheritance, the + interpreter would sometimes invoke the wrong metaclass when building a new + class object. These cases now behave correctly. Patch by Daniel Urban. + +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler + warnings. Patch by Josh Triplett and Petri Lehtinen. + +- Issue #13188: When called without an explicit traceback argument, + generator.throw() now gets the traceback from the passed exception's + ``__traceback__`` attribute. Patch by Petri Lehtinen. + +- Issue #7833: Extension modules built using distutils on Windows will no + longer include a "manifest" to prevent them failing at import time in some + embedded situations. + +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + +- Issue #12911: Fix memory consumption when calculating the repr() of huge + tuples or lists. + +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + +- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for + finding the bug and providing a patch. + +- Issue #12973: Fix overflow checks that relied on undefined behaviour in + list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs + caused test failures with recent versions of Clang. + +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + +- Issue #9200: The str.is* methods now work with strings that contain non-BMP + characters even in narrow Unicode builds. + +- Issue #12791: Break reference cycles early when a generator exits with + an exception. + +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + +Library +------- + +- HTMLParser is now able to handle slashes in the start tag. + +- Issue #13641: Decoding functions in the base64 module now accept ASCII-only + unicode strings. Patch by Catalin Iacob. + +- Issue #14043: Speed up importlib's _FileFinder by at least 8x, and add a + new importlib.invalidate_caches() function. + +- Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in + SimpleXMLRPCServer upon malformed POST request. + +- Issue #13961: Move importlib over to using os.replace() for atomic renaming. + +- Do away with ambiguous level values (as suggested by PEP 328) in + importlib.__import__() by raising ValueError when level < 0. + +- Issue #2489: pty.spawn could consume 100% cpu when it encountered an EOF. + +- Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). + +- Issue #13777: Add PF_SYSTEM sockets on OS X. + Patch by Michael Goderbauer. + +- Issue #13015: Fix a possible reference leak in defaultdict.__repr__. + Patch by Suman Saha. + +- Issue #1326113: distutils' and packaging's build_ext commands option now + correctly parses multiple values (separated by whitespace or commas) given + to their --libraries option. + +- Issue #10287: nntplib now queries the server's CAPABILITIES first before + sending MODE READER, and only sends it if not already in READER mode. + Patch by Hynek Schlawack. + +- Issue #13993: HTMLParser is now able to handle broken end tags when + strict=False. + +- Issue #13930: lib2to3 now supports writing converted output files to another + directory tree as well as copying unchanged files and altering the file + suffix. + +- Issue #9750: Fix sqlite3.Connection.iterdump on tables and fields + with a name that is a keyword or contains quotes. Patch by Marko + Kohtala. + +- Issue #10287: nntplib now queries the server's CAPABILITIES again after + authenticating (since the result may change, according to RFC 4643). + Patch by Hynek Schlawack. + +- Issue #13989: Document that GzipFile does not support text mode, and give a + more helpful error message when opened with an invalid mode string. + +- Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building + Distutils-based packages with C extension modules may fail because + Apple has removed gcc-4.2, the version used to build python.org + 64-bit/32-bit Pythons. If the user does not explicitly override + the default C compiler by setting the CC environment variable, + Distutils will now attempt to compile extension modules with clang + if gcc-4.2 is required but not found. Also as a convenience, if + the user does explicitly set CC, substitute its value as the default + compiler in the Distutils LDSHARED configuration variable for OS X. + (Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u + SDK, neither of which are available in Xcode 4. This change does not + attempt to override settings to support their use with Xcode 4.) + +- Issue #13960: HTMLParser is now able to handle broken comments when + strict=False. + +- Issue #13921: Undocument and clean up sqlite3.OptimizedUnicode, + which is obsolete in Python 3.x. It's now aliased to str for + backwards compatibility. + +- When '' is a path (e.g. in sys.path), make sure __file__ uses the current + working directory instead of '' in importlib. + +- Issue #13609: Add two functions to query the terminal size: + os.get_terminal_size (low level) and shutil.get_terminal_size (high level). + Patch by Zbigniew J?drzejewski-Szmek. + +- Issue #13845: On Windows, time.time() now uses GetSystemTimeAsFileTime() + instead of ftime() to have a resolution of 100 ns instead of 1 ms (the clock + accuracy is between 0.5 ms and 15 ms). + +- Issue #13846: Add time.monotonic(), monotonic clock. + +- Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on + Connection sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to + make sure two listeners can't bind to the same socket/pipe (or any existing + socket/pipe). + +- Issue #10811: Fix recursive usage of cursors. Instead of crashing, + raise a ProgrammingError now. + +- Issue #10881: Fix test_site failure with OS X framework builds. + +- Issue #964437: Make IDLE help window non-modal. + Patch by Guilherme Polo and Roger Serwy. + +- Issue #13734: Add os.fwalk(), a directory walking function yielding file + descriptors. + +- Issue #2945: Make the distutils upload command aware of bdist_rpm products. + +- Issue #13712: pysetup create should not convert package_data to extra_files. + +- Issue #11805: package_data in setup.cfg should allow more than one value. + +- Issue #13933: IDLE auto-complete did not work with some imported + module, like hashlib. (Patch by Roger Serwy) + +- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared. + +- Issue #13676: Handle strings with embedded zeros correctly in sqlite3. + +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + +- Issue #8828: Add new function os.replace(), for cross-platform renaming + with overwriting. + +- Issue #13848: open() and the FileIO constructor now check for NUL + characters in the file name. Patch by Hynek Schlawack. + +- Issue #13806: The size check in audioop decompression functions was too + strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. + +- Issue #13812: When a multiprocessing Process child raises an exception, + flush stderr after printing the exception traceback. + +- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC + IV attack countermeasure. + +- Issue #13847: time.localtime() and time.gmtime() now raise an OSError instead + of ValueError on failure. time.ctime() and time.asctime() now raises an + OSError if localtime() failed. time.clock() now raises a RuntimeError if the + processor time used is not available or its value cannot be represented + +- Issue #13862: Fix spurious failure in test_zlib due to runtime/compile time + minor versions not matching. + +- Issue #12804: Fix test_socket and test_urllib2net failures when running tests + on a system without internet access. + +- Issue #13772: In os.symlink() under Windows, do not try to guess the link + target's type (file or directory). The detection was buggy and made the + call non-atomic (therefore prone to race conditions). + +- Issue #6631: Disallow relative file paths in urllib urlopen methods. + +- Issue #13722: Avoid silencing ImportErrors when initializing the codecs + registry. + +- Issue #13781: Fix GzipFile bug that caused an exception to be raised when + opening for writing using a fileobj returned by os.fdopen(). + +- Issue #13803: Under Solaris, distutils doesn't include bitness + in the directory name. + +- Issue #10278: Add time.wallclock() function, monotonic clock. + +- Issue #13809: Fix regression where bz2 module wouldn't work when threads are + disabled. Original patch by Amaury Forgeot d'Arc. + +- Issue #13589: Fix some serialization primitives in the aifc module. + Patch by Oleg Plakhotnyuk. + +- Issue #13642: Unquote before b64encoding user:password during Basic + Authentication. Patch contributed by Joonas Kuorilehto. + +- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow + tests. + +- Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. + The hang would occur when retrieving the result of a scheduled future after + the executor had been shut down. + +- Issue #13502: threading: Fix a race condition in Event.wait() that made it + return False when the event was set and cleared right after. + +- Issue #9993: When the source and destination are on different filesystems, + and the source is a symlink, shutil.move() now recreates a symlink on the + destination instead of copying the file contents. Patch by Jonathan Niehof + and Hynek Schlawack. + +- Issue #12926: Fix a bug in tarfile's link extraction. + +- Issue #13696: Fix the 302 Relative URL Redirection problem. + +- Issue #13636: Weak ciphers are now disabled by default in the ssl module + (except when SSLv2 is explicitly asked for). + +- Issue #12715: Add an optional symlinks argument to shutil functions + (copyfile, copymode, copystat, copy, copy2). When that parameter is + true, symlinks aren't dereferenced and the operation instead acts on the + symlink itself (or creates one, if relevant). Patch by Hynek Schlawack. + +- Add a flags parameter to select.epoll. + +- Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the + SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option. + +- Issue #11006: Don't issue low level warning in subprocess when pipe2() fails. + +- Issue #13620: Support for Chrome browser in webbrowser. Patch contributed + by Arnaud Calmettes. + +- Issue #11829: Fix code execution holes in inspect.getattr_static for + metaclasses with metaclasses. Patch by Andreas St?hrk. + +- Issue #12708: Add starmap() and starmap_async() methods (similar to + itertools.starmap()) to multiprocessing.Pool. Patch by Hynek Schlawack. + +- Issue #1785: Fix inspect and pydoc with misbehaving descriptors. + +- Issue #13637: "a2b" functions in the binascii module now accept ASCII-only + unicode strings. + +- Issue #13634: Add support for querying and disabling SSL compression. + +- Issue #13627: Add support for SSL Elliptic Curve-based Diffie-Hellman + key exchange, through the SSLContext.set_ecdh_curve() method and the + ssl.OP_SINGLE_ECDH_USE option. + +- Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers + choose the cipher based on their own preferences, rather than on the + client's. + +- Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas + St?hrk. + +- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by + C?dric Krier. + +- Issue #11870: threading: Properly reinitialize threads internal locks and + condition variables to avoid deadlocks in child processes. + +- Issue #8035: urllib: Fix a bug where the client could remain stuck after a + redirection or an error. + +- Issue #13560: os.strerror() now uses the current locale encoding instead of + UTF-8. + +- Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem + encoding and the surrogateescape error handler, rather than UTF-8. Patch + by David Watson. + +- Issue #10350: Read and save errno before calling a function which might + overwrite it. Original patch by Hallvard B Furuseth. + +- Issue #11610: Introduce a more general way to declare abstract properties. + +- Issue #13591: A bug in importlib has been fixed that caused import_module + to load a module twice. + +- Issue #4625: If IDLE cannot write to its recent file or breakpoint files, + display a message popup and continue rather than crash. Original patch by + Roger Serwy. + +- Issue #13449 sched.scheduler.run() method has a new "blocking" parameter which + when set to False makes run() execute the scheduled events due to expire + soonest (if any) and then return. Patch by Giampaolo Rodol?. + +- Issue #8684 sched.scheduler class can be safely used in multi-threaded + environments. Patch by Josiah Carlson and Giampaolo Rodol?. + +- Alias resource.error to OSError ala PEP 3151. + +- Issue #5689: Add support for lzma compression to the tarfile module. + +- Issue #13248: Turn 3.2's PendingDeprecationWarning into 3.3's + DeprecationWarning. It covers 'cgi.escape', 'importlib.abc.PyLoader', + 'importlib.abc.PyPycLoader', 'nntplib.NNTP.xgtitle', 'nntplib.NNTP.xpath', + and private attributes of 'smtpd.SMTPChannel'. + +- Issue #5905, #13560: time.strftime() is now using the current locale + encoding, instead of UTF-8, if the wcsftime() function is not available. + +- Issue #8641: Update IDLE 3 syntax coloring to recognize b".." and not u"..". + Patch by Tal Einat. + +- Issue #13464: Add a readinto() method to http.client.HTTPResponse. Patch + by Jon Kuhn. + +- tarfile.py: Correctly detect bzip2 compressed streams with blocksizes + other than 900k. + +- Issue #13439: Fix many errors in turtle docstrings. + +- Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm. + Thanks to Per ?yvind Karlsen for the initial implementation. + +- Issue #13487: Make inspect.getmodule robust against changes done to + sys.modules while it is iterating over it. + +- Issue #12618: Fix a bug that prevented py_compile from creating byte + compiled files in the current directory. Initial patch by Sjoerd de Vries. + +- Issue #13444: When stdout has been closed explicitly, we should not attempt + to flush it at shutdown and print an error. + +- Issue #12567: The curses module uses Unicode functions for Unicode arguments + when it is linked to the ncurses library. It encodes also Unicode strings to + the locale encoding instead of UTF-8. + +- Issue #12856: Ensure child processes do not inherit the parent's random + seed for filename generation in the tempfile module. Patch by Brian + Harring. + +- Issue #9957: SpooledTemporaryFile.truncate() now accepts an optional size + parameter, as other file-like objects. Patch by Ryan Kelly. + +- Issue #13458: Fix a memory leak in the ssl module when decoding a + certificate with a subjectAltName. Patch by Robert Xiao. + +- Issue #13415: os.unsetenv() doesn't ignore errors anymore. + +- Issue #13245: sched.scheduler class constructor's timefunc and + delayfunct parameters are now optional. + scheduler.enter and scheduler.enterabs methods gained a new kwargs parameter. + Patch contributed by Chris Clark. + +- Issue #12328: Under Windows, refactor handling of Ctrl-C events and + make _multiprocessing.win32.WaitForMultipleObjects interruptible when + the wait_flag parameter is false. Patch by sbt. + +- Issue #13322: Fix BufferedWriter.write() to ensure that BlockingIOError is + raised when the wrapped raw file is non-blocking and the write would block. + Previous code assumed that the raw write() would raise BlockingIOError, but + RawIOBase.write() is defined to returned None when the call would block. + Patch by sbt. + +- Issue #13358: HTMLParser now calls handle_data only once for each CDATA. + +- Issue #4147: minidom's toprettyxml no longer adds whitespace around a text + node when it is the only child of an element. Initial patch by Dan + Kenigsberg. + +- Issue #13374: The Windows bytes API has been deprecated in the os module. Use + Unicode filenames instead of bytes filenames to not depend on the ANSI code + page anymore and to support any filename. + +- Issue #13297: Use bytes type to send and receive binary data through XMLRPC. + +- Issue #6397: Support "/dev/poll" polling objects in select module, + under Solaris & derivatives. + +- Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly + handles non-valid attributes, including adjacent and unquoted attributes. + +- Issue #13193: Fix distutils.filelist.FileList and packaging.manifest.Manifest + under Windows. + +- Issue #13384: Remove unnecessary __future__ import in Lib/random.py + +- Issue #13149: Speed up append-only StringIO objects. + +- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely + when called with a timeout. Patch by Arnaud Ysmal. + +- Issue #13254: Fix Maildir initialization so that maildir contents + are read correctly. + +- Issue #3067: locale.setlocale() now raises TypeError if the second + argument is an invalid iterable. Its documentation and docstring + were also updated. Initial patch by Jyrki Pulliainen. + +- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. + +- Issue #13339: Fix compile error in posixmodule.c due to missing semicolon. + Thanks to Robert Xiao. + +- Byte compilation in packaging is now isolated from the calling Python -B or + -O options, instead of being disallowed under -B or buggy under -O. + +- Issue #10570: curses.putp() and curses.tparm() are now expecting a byte + string, instead of a Unicode string. + +- Issue #13295: http.server now produces valid HTML 4.01 strict. + +- Issue #2892: preserve iterparse events in case of SyntaxError. + +- Issue #13287: urllib.request and urllib.error now contains an __all__ + attribute to expose only relevant classes and functions. Patch by Florent + Xicluna. + +- Issue #670664: Fix HTMLParser to correctly handle the content of + ```` and ````. + +- Issue #10817: Fix urlretrieve function to raise ContentTooShortError even + when reporthook is None. Patch by Jyrki Pulliainen. + +- Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + +- Fix the xmlrpc.client user agent to return something similar to + urllib.request user agent: "Python-xmlrpc/3.3". + +- Issue #13293: Better error message when trying to marshal bytes using + xmlrpc.client. + +- Issue #13291: NameError in xmlrpc package. + +- Issue #13258: Use callable() built-in in the standard library. + +- Issue #13273: fix a bug that prevented HTMLParser to properly detect some + tags when strict=False. + +- Issue #11183: Add finer-grained exceptions to the ssl module, so that + you don't have to inspect the exception's attributes in the common case. + +- Issue #13216: Add cp65001 codec, the Windows UTF-8 (CP_UTF8). + +- Issue #13226: Add RTLD_xxx constants to the os module. These constants can be + used with sys.setdlopenflags(). + +- Issue #10278: Add clock_getres(), clock_gettime() and CLOCK_xxx constants to + the time module. time.clock_gettime(time.CLOCK_MONOTONIC) provides a + monotonic clock + +- Issue #10332: multiprocessing: fix a race condition when a Pool is closed + before all tasks have completed. + +- Issue #13255: wrong docstrings in array module. + +- Issue #8540: Remove deprecated Context._clamp attribute in Decimal module. + +- Issue #13235: Added DeprecationWarning to logging.warn() method and function. + +- Issue #9168: now smtpd is able to bind privileged port. + +- Issue #12529: fix cgi.parse_header issue on strings with double-quotes and + semicolons together. Patch by Ben Darnell and Petri Lehtinen. + +- Issue #13227: functools.lru_cache() now has a option to distinguish + calls with different argument types. + +- Issue #6090: zipfile raises a ValueError when a document with a timestamp + earlier than 1980 is provided. Patch contributed by Petri Lehtinen. + +- Issue #13150: sysconfig no longer parses the Makefile and config.h files + when imported, instead doing it at build time. This makes importing + sysconfig faster and reduces Python startup time by 20%. + +- Issue #12448: smtplib now flushes stdout while running ``python -m smtplib`` + in order to display the prompt correctly. + +- Issue #12454: The mailbox module is now using ASCII, instead of the locale + encoding, to read and write .mh_sequences files. + +- Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are + now available on Windows. + +- Issue #1673007: urllib.request now supports HEAD request via new method argument. + Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti. + +- Issue #12386: packaging does not fail anymore when writing the RESOURCES + file. + +- Issue #13158: Fix decoding and encoding of GNU tar specific base-256 number + fields in tarfile. + +- Issue #13025: mimetypes is now reading MIME types using the UTF-8 encoding, + instead of the locale encoding. + +- Issue #10653: On Windows, use strftime() instead of wcsftime() because + wcsftime() doesn't format time zone correctly. + +- Issue #13150: The tokenize module doesn't compile large regular expressions + at startup anymore. + +- Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was + configured with different prefix and exec-prefix. + +- Issue #11254: Teach distutils and packaging to compile .pyc and .pyo files in + PEP 3147-compliant __pycache__ directories. + +- Issue #7367: Fix pkgutil.walk_paths to skip directories whose + contents cannot be read. + +- Issue #3163: The struct module gets new format characters 'n' and 'N' + supporting C integer types ``ssize_t`` and ``size_t``, respectively. + +- Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. + Reported and diagnosed by Thomas Kluyver. + +- Issue #13087: BufferedReader.seek() now always raises UnsupportedOperation + if the underlying raw stream is unseekable, even if the seek could be + satisfied using the internal buffer. Patch by John O'Connor. + +- Issue #7689: Allow pickling of dynamically created classes when their + metaclass is registered with copyreg. Patch by Nicolas M. Thi?ry and Craig + Citro. + +- Issue #13034: When decoding some SSL certificates, the subjectAltName + extension could be unreported. + +- Issue #9871: Prevent IDLE 3 crash when given byte stings + with invalid hex escape sequences, like b'\x0'. + (Original patch by Claudiu Popa.) + +- Issue #12306: Expose the runtime version of the zlib C library as a constant, + ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff. + +- Issue #12959: Add collections.ChainMap to collections.__all__. + +- Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will + now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or + Download-URL field is present. + +- Issue #12567: Add curses.unget_wch() function. Push a character so the next + get_wch() will return it. + +- Issue #9561: distutils and packaging now writes egg-info files using UTF-8, + instead of the locale encoding. + +- Issue #8286: The distutils command sdist will print a warning message instead + of crashing when an invalid path is given in the manifest template. + +- Issue #12841: tarfile unnecessarily checked the existence of numerical user + and group ids on extraction. If one of them did not exist the respective id + of the current user (i.e. root) was used for the file and ownership + information was lost. + +- Issue #12888: Fix a bug in HTMLParser.unescape that prevented it to escape + more than 128 entities. Patch by Peter Otten. + +- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses. + +- Issue #12636: IDLE reads the coding cookie when executing a Python script. + +- Issue #12494: On error, call(), check_call(), check_output() and + getstatusoutput() functions of the subprocess module now kill the process, + read its status (to avoid zombis) and close pipes. + +- Issue #12720: Expose low-level Linux extended file attribute functions in os. + +- Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi + now respect a --skip-build option given to bdist. The packaging commands + were fixed too. + +- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in + the C pickle implementation. + +- Issue #11564: Avoid crashes when trying to pickle huge objects or containers + (more than 2**31 items). Instead, in most cases, an OverflowError is raised. + +- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is + greater than FD_SETSIZE. + +- Issue #12839: Fix crash in zlib module due to version mismatch. + Fix by Richard M. Tew. + +- Issue #9923: The mailcap module now correctly uses the platform path + separator for the MAILCAP environment variable on non-POSIX platforms. + +- Issue #12835: Follow up to #6560 that unconditionally prevents use of the + unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David + Watson. + +- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument + to be used if the private key is encrypted. Patch by Adam Simpkins. + +- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing + Pipe. + +- Issue #12811: tabnanny.check() now promptly closes checked files. Patch by + Anthony Briggs. + +- Issue #6560: The sendmsg/recvmsg API is now exposed by the socket module + when provided by the underlying platform, supporting processing of + ancillary data in pure Python code. Patch by David Watson and Heiko Wundram. + +- Issue #12326: On Linux, sys.platform doesn't contain the major version + anymore. It is now always 'linux', instead of 'linux2' or 'linux3' depending + on the Linux version used to build Python. + +- Issue #12213: Fix a buffering bug with interleaved reads and writes that + could appear on BufferedRandom streams. + +- Issue #12778: Reduce memory consumption when JSON-encoding a large + container of many small objects. + +- Issue #12650: Fix a race condition where a subprocess.Popen could leak + resources (FD/zombie) when killed at the wrong time. + +- Issue #12744: Fix inefficient representation of integers between 2**31 and + 2**63 on systems with a 64-bit C "long". + +- Issue #12646: Add an 'eof' attribute to zlib.Decompress, to make it easier to + detect truncated input streams. + +- Issue #11513: Fix exception handling ``tarfile.TarFile.gzopen()`` when + the file cannot be opened. + +- Issue #12687: Fix a possible buffering bug when unpickling text mode + (protocol 0, mostly) pickles. + +- Issue #10087: Fix the html output format of the calendar module. + +- Issue #12540: Prevent zombie IDLE processes on Windows due to changes + in os.kill(). + +- Issue #13121: add support for inplace math operators to collections.Counter. + +- Add support for unary plus and unary minus to collections.Counter. + +- Issue #12683: urlparse updated to include svn as schemes that uses relative + paths. (svn from 1.5 onwards support relative path). + +- Issue #12655: Expose functions from sched.h in the os module: sched_yield(), + sched_setscheduler(), sched_getscheduler(), sched_setparam(), + sched_get_min_priority(), sched_get_max_priority(), sched_rr_get_interval(), + sched_getaffinity(), sched_setaffinity(). + +- Add ThreadError to threading.__all__. + +- Issues #11104, #8688: Fix the behavior of distutils' sdist command with + manually-maintained MANIFEST files. + +- Issue #11281: smtplib.STMP gets source_address parameter, which adds the + ability to bind to specific source address on a machine with multiple + interfaces. Patch by Paulo Scardine. + +- Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow + symlinks: fix it. Patch by Petri Lehtinen. + +- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') + in Python code) now finds the doc of the method. + +- Issue #10968: Remove indirection in threading. The public names (Event, + Condition, etc.) used to be factory functions returning instances of hidden + classes (_Event, _Condition, etc.), because (if Guido recalls correctly) this + code pre-dates the ability to subclass extension types. It is now possible + to inherit from these classes, without having to import the private + underscored names like multiprocessing did. + +- Issue #9723: Add shlex.quote functions, to escape filenames and command + lines. + +- Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. + +- Issue #12514: Use try/finally to assure the timeit module restores garbage + collections when it is done. + +- Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is + given as a low fd, it gets overwritten. + +- Issue #12590: IDLE editor window now always displays the first line + when opening a long file. With Tk 8.5, the first line was hidden. + +- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates) + Connection:close header. + +- Issue #12102: Document that buffered files must be flushed before being used + with mmap. Patch by Steffen Daode Nurpmeso. + +- Issue #12560: Build libpython.so on OpenBSD. Patch by Stefan Sperling. + +- Issue #1813: Fix codec lookup under Turkish locales. + +- Issue #12591: Improve support of "universal newlines" in the subprocess + module: the piped streams can now be properly read from or written to. + +- Issue #12591: Allow io.TextIOWrapper to work with raw IO objects (without + a read1() method), and add a *write_through* parameter to mandate + unbuffered writes. + +- Issue #10883: Fix socket leaks in urllib.request when using FTP. + +- Issue #12592: Make Python build on OpenBSD 5 (and future major releases). + +- Issue #12372: POSIX semaphores are broken on AIX: don't use them. + +- Issue #12551: Provide a get_channel_binding() method on SSL sockets so as + to get channel binding data for the current SSL session (only the + "tls-unique" channel binding is implemented). This allows the implementation + of certain authentication mechanisms such as SCRAM-SHA-1-PLUS. Patch by + Jacek Konieczny. + +- Issue #665194: email.utils now has format_datetime and parsedate_to_datetime + functions, allowing for round tripping of RFC2822 format dates. + +- Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2 + directory, so that "import DLFCN" and other similar imports work on + Linux 3.0. + +- Issue #7484: smtplib no longer puts <> around addresses in VRFY and EXPN + commands; they aren't required and in fact postfix doesn't support that form. + +- Issue #12273: Remove ast.__version__. AST changes can be accounted for by + checking sys.version_info or sys._mercurial. + +- Silence spurious "broken pipe" tracebacks when shutting down a + ProcessPoolExecutor. + +- Fix potential resource leaks in concurrent.futures.ProcessPoolExecutor + by joining all queues and processes when shutdown() is called. + +- Issue #11603: Fix a crash when __str__ is rebound as __repr__. Patch by + Andreas St?hrk. + +- Issue #11321: Fix a crash with multiple imports of the _pickle module when + embedding Python. Patch by Andreas St?hrk. + +- Issue #6755: Add get_wch() method to curses.window class. Patch by I?igo + Serna. + +- Add cgi.closelog() function to close the log file. + +- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets. + +- Issue #4376: ctypes now supports nested structures in a endian different than + the parent structure. Patch by Vlad Riscutia. + +- Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a + TextIOWrapper to a huge value, not TypeError. + +- Issue #12504: Close file handles in a timely manner in packaging.database. + This fixes a bug with the remove (uninstall) feature on Windows. + +- Issues #12169 and #10510: Factor out code used by various packaging commands + to make HTTP POST requests, and make sure it uses CRLF. + +- Issue #12016: Multibyte CJK decoders now resynchronize faster. They only + ignore the first byte of an invalid byte sequence. For example, + b'\xff\n'.decode('gb2312', 'replace') gives '\ufffd\n' instead of '\ufffd'. + +- Issue #12459: time.sleep() now raises a ValueError if the sleep length is + negative, instead of an infinite sleep on Windows or raising an IOError on + Linux for example, to have the same behaviour on all platforms. + +- Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support + Python scripts using a encoding different than UTF-8 (read the coding cookie + of the script). + +- Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors + if the process has only one pipe. + +- Issue #12467: warnings: fix a race condition if a warning is emitted at + shutdown, if globals()['__file__'] is None. + +- Issue #12451: pydoc: importfile() now opens the Python script in binary mode, + instead of text mode using the locale encoding, to avoid encoding issues. + +- Issue #12451: runpy: run_path() now opens the Python script in binary mode, + instead of text mode using the locale encoding, to support other encodings + than UTF-8 (scripts using the coding cookie). + +- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead + of the text mode (using the locale encoding) to avoid encoding issues. + +- Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better + conformance to the RFCs: correctly handle Sender and Resent- headers. + +- Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by + the garbage collector while the Heap lock is held. + +- Issue #12462: time.sleep() now immediately calls the (Python) signal handler + if it is interrupted by a signal, instead of having to wait until the next + instruction. + +- Issue #12442: new shutil.disk_usage function, providing total, used and free + disk space statistics. + +- Issue #12451: The XInclude default loader of xml.etree now decodes files from + UTF-8 instead of the locale encoding if the encoding is not specified. It now + also opens XML files for the parser in binary mode instead of the text mode + to avoid encoding issues. + +- Issue #12451: doctest.debug_script() doesn't create a temporary file + anymore to avoid encoding issues. + +- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, + to read the Python script from the right encoding. + +- Issue #12451: distutils now opens the setup script in binary mode to read the + encoding cookie, instead of opening it in UTF-8. + +- Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to + check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the + interpreter process. This could cause failures in non-Distutils subprocesses + and was unreliable since tests or user programs could modify the interpreter + environment after Distutils set it. Instead, have Distutils set the the + deployment target only in the environment of each build subprocess. It is + still possible to globally override the default by setting + MACOSX_DEPLOYMENT_TARGET before launching the interpreter; its value must be + greater or equal to the default value, the value with which the interpreter + was built. Also, implement the same handling in packaging. + +- Issue #12422: In the copy module, don't store objects that are their own copy + in the memo dict. + +- Issue #12303: Add sigwaitinfo() and sigtimedwait() to the signal module. + +- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira + Kitada. + +- Issue #1874: email now detects and reports as a defect the presence of + any CTE other than 7bit, 8bit, or binary on a multipart. + +- Issue #12383: Fix subprocess module with env={}: don't copy the environment + variables, start with an empty environment. + +- Issue #11637: Fix support for importing packaging setup hooks from the + project directory. + +- Issue #6771: Moved the curses.wrapper function from the single-function + wrapper module into __init__, eliminating the module. Since __init__ was + already importing the function to curses.wrapper, there is no API change. + +- Issue #11584: email.header.decode_header no longer fails if the header + passed to it is a Header object, and Header/make_header no longer fail + if given binary unknown-8bit input. + +- Issue #11700: mailbox proxy object close methods can now be called multiple + times without error. + +- Issue #11767: Correct file descriptor leak in mailbox's __getitem__ method. + +- Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP + connection if its getresponse() method fails with a socket error. Patch + written by Ezio Melotti. + +- Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files. + Original patch by Erik Bray. + +- Issue #9284: Allow inspect.findsource() to find the source of doctest + functions. + +- Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a + compatibility helper for the distutils-packaging transition. Original patch + by Erik Bray. + +- Issue #12287: In ossaudiodev, check that the device isn't closed in several + methods. + +- Issue #12009: Fixed regression in netrc file comment handling. + +- Issue #12246: Warn and fail when trying to install a third-party project from + an uninstalled Python (built in a source checkout). Original patch by + Tshepang Lekhonkhobe. + +- Issue #10694: zipfile now ignores garbage at the end of a zipfile. + +- Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA. + +- Issue #10424: Argparse now includes the names of the missing required + arguments in the missing arguments error message. + +- Issue #12168: SysLogHandler now allows NUL termination to be controlled using + a new 'append_nul' attribute on the handler. + +- Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes + instead of os.stat. + +- Issue #12021: Make mmap's read() method argument optional. Patch by Petri + Lehtinen. + +- Issue #9205: concurrent.futures.ProcessPoolExecutor now detects killed + children and raises BrokenProcessPool in such a situation. Previously it + would reliably freeze/deadlock. + +- Issue #12040: Expose a new attribute ``sentinel`` on instances of + ``multiprocessing.Process``. Also, fix Process.join() to not use polling + anymore, when given a timeout. + +- Issue #11893: Remove obsolete internal wrapper class ``SSLFakeFile`` in the + smtplib module. Patch by Catalin Iacob. + +- Issue #12080: Fix a Decimal.power() case that took an unreasonably long time + to compute. + +- Issue #12221: Remove __version__ attributes from pyexpat, pickle, tarfile, + pydoc, tkinter, and xml.parsers.expat. This were useless version constants + left over from the Mercurial transition + +- Named tuples now work correctly with vars(). + +- Issue #12085: Fix an attribute error in subprocess.Popen destructor if the + constructor has failed, e.g. because of an undeclared keyword argument. Patch + written by Oleg Oshmyan. + +- Issue #12028: Make threading._get_ident() public, rename it to + threading.get_ident() and document it. This function was already used using + _thread.get_ident(). + +- Issue #12171: IncrementalEncoder.reset() of CJK codecs (multibytecodec) calls + encreset() instead of decreset(). + +- Issue #12218: Removed wsgiref.egg-info. + +- Issue #12196: Add pipe2() to the os module. + +- Issue #985064: Make plistlib more resilient to faulty input plists. + Patch by Mher Movsisyan. + +- Issue #1625: BZ2File and bz2.decompress() now support multi-stream files. + Initial patch by Nir Aides. + +- Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available. + +- Issue #12175: FileIO.readall() now only reads the file position and size + once. + +- Issue #12175: RawIOBase.readall() now returns None if read() returns None. + +- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError + if the file is closed. + +- Issue #11109: New service_action method for BaseServer, used by ForkingMixin + class for cleanup. Initial Patch by Justin Warkentin. + +- Issue #12045: Avoid duplicate execution of command in + ctypes.util._get_soname(). Patch by Sijin Joseph. + +- Issue #10818: Remove the Tk GUI and the serve() function of the pydoc module, + pydoc -g has been deprecated in Python 3.2 and it has a new enhanced web + server. + +- Issue #1441530: In imaplib, read the data in one chunk to speed up large + reads and simplify code. + +- Issue #12070: Fix the Makefile parser of the sysconfig module to handle + correctly references to "bogus variable" (e.g. "prefix=$/opt/python"). + +- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to + their encode() method anymore, but continue to call the reset() method if the + final argument is True. + +- Issue #12049: Add RAND_bytes() and RAND_pseudo_bytes() functions to the ssl + module. + +- Issue #6501: os.device_encoding() returns None on Windows if the application + has no console. + +- Issue #12105: Add O_CLOEXEC to the os module. + +- Issue #12079: Decimal('Infinity').fma(Decimal('0'), (3.91224318126786e+19+0j)) + now raises TypeError (reflecting the invalid type of the 3rd argument) rather + than Decimal.InvalidOperation. + +- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore + to be able to unload the module. + +- Add the packaging module, an improved fork of distutils (also known as + distutils2). + +- Issue #12065: connect_ex() on an SSL socket now returns the original errno + when the socket's timeout expires (it used to return None). + +- Issue #8809: The SMTP_SSL constructor and SMTP.starttls() now support + passing a ``context`` argument pointing to an ssl.SSLContext instance. + Patch by Kasun Herath. + +- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX + with Tk 8.5. + +- Issue #9516: Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET + is set in shell. + +- Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and + their incremental counterparts now raise OverflowError if given an input + larger than 4GB, instead of silently truncating the input and returning + an incorrect result. + +- Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail + attribute when called without a max_length argument. + +- Issue #12062: Fix a flushing bug when doing a certain type of I/O sequence + on a file opened in read+write mode (namely: reading, seeking a bit forward, + writing, then seeking before the previous write but still within buffered + data, and writing again). + +- Issue #9971: Write an optimized implementation of BufferedReader.readinto(). + Patch by John O'Connor. + +- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError. + With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused + IDLE to exit. Converted to valid Unicode null in PythonCmd(). + +- Issue #11799: urllib.request Authentication Handlers will raise a ValueError + when presented with an unsupported Authentication Scheme. Patch contributed + by Yuval Greenfield. + +- Issue #10419, #6011: build_scripts command of distutils handles correctly + non-ASCII path (path to the Python executable). Open and write the script in + binary mode, but ensure that the shebang is decodable from UTF-8 and from the + encoding of the script. + +- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in + order to accept exactly one connection. Patch by Daniel Evers. + +- Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, + instead of a RuntimeError: OSError has an errno attribute. + +- Issue #3709: add a flush_headers method to BaseHTTPRequestHandler, which + manages the sending of headers to output stream and flushing the internal + headers buffer. Patch contribution by Andrew Schaaf + +- Issue #11743: Rewrite multiprocessing connection classes in pure Python. + +- Issue #11164: Stop trying to use _xmlplus in the xml module. + +- Issue #11888: Add log2 function to math module. Patch written by Mark + Dickinson. + +- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional. + +- Issue #8407: The signal handler writes the signal number as a single byte + instead of a nul byte into the wakeup file descriptor. So it is possible to + wait more than one signal and know which signals were raised. + +- Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to the + signal module. + +- Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch + by Kasun Herath. + +- Issue #12002: ftplib's abort() method raises TypeError. + +- Issue #11916: Add a number of MacOSX specific definitions to the errno module. + Patch by Pierre Carrier. + +- Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to + detect mtime changes by comparing to the system clock instead of to the + previous value of the mtime. + +- Issue #11072: added MLSD command (RFC-3659) support to ftplib. + +- Issue #8808: The IMAP4_SSL constructor now allows passing an SSLContext + parameter to control parameters of the secure channel. Patch by Sijin + Joseph. + +- ntpath.samefile failed to notice that "a.txt" and "A.TXT" refer to the same + file on Windows XP. As noticed in issue #10684. + +- Issue #12000: When a SSL certificate has a subjectAltName without any + dNSName entry, ssl.match_hostname() should use the subject's commonName. + Patch by Nicolas Bareil. + +- Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and + assertWarnsRegex now accept a keyword argument 'msg' when used as context + managers. Initial patch by Winston Ewert. + +- Issue #10684: shutil.move used to delete a folder on case insensitive + filesystems when the source and destination name where the same except + for the case. + +- Issue #11647: objects created using contextlib.contextmanager now support + more than one call to the function when used as a decorator. Initial patch + by Ysj Ray. + +- Issue #11930: Removed deprecated time.accept2dyear variable. + Removed year >= 1000 restriction from datetime.strftime. + +- logging: don't define QueueListener if Python has no thread support. + +- functools.cmp_to_key() now works with collections.Hashable(). + +- Issue #11277: mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X to get + around a mmap bug with sparse files. Patch written by Steffen Daode Nurpmeso. + +- Issue #8407: Add signal.pthread_sigmask() function to fetch and/or change the + signal mask of the calling thread. + +- Issue #11858: configparser.ExtendedInterpolation expected lower-case section + names. + +- Issue #11324: ConfigParser(interpolation=None) now works correctly. + +- Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch + by Charles-Fran?ois Natali. + +- Issue #11763: don't use difflib in TestCase.assertMultiLineEqual if the + strings are too long. + +- Issue #11236: getpass.getpass responds to ctrl-c or ctrl-z on terminal. + +- Issue #11856: Speed up parsing of JSON numbers. + +- Issue #11005: threading.RLock()._release_save() raises a RuntimeError if the + lock was not acquired. + +- Issue #11258: Speed up ctypes.util.find_library() under Linux by a factor + of 5 to 10. Initial patch by Jonas H. + +- Issue #11382: Trivial system calls, such as dup() or pipe(), needn't + release the GIL. Patch by Charles-Fran?ois Natali. + +- Issue #11223: Add threading._info() function providing informations about + the thread implementation. + +- Issue #11731: simplify/enhance email parser/generator API by introducing + policy objects. + +- Issue #11768: The signal handler of the signal module only calls + Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or + parallel calls. PyErr_SetInterrupt() writes also into the wake up file. + +- Issue #11492: fix several issues with header folding in the email package. + +- Issue #11852: Add missing imports and update tests. + +- Issue #11875: collections.OrderedDict's __reduce__ was temporarily + mutating the object instead of just working on a copy. + +- Issue #11467: Fix urlparse behavior when handling urls which contains scheme + specific part only digits. Patch by Santoso Wijaya. + +- collections.Counter().copy() now works correctly for subclasses. + +- Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. + Patch by Santoso Wijaya. + +- Issue #11684: complete email.parser bytes API by adding BytesHeaderParser. + +- The bz2 module now handles 4GiB+ input buffers correctly. + +- Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when + _json is not available. + +- Issue #11830: Remove unnecessary introspection code in the decimal module. + +- Issue #11703: urllib2.geturl() does not return correct url when the original + url contains #fragment. + +- Issue #10019: Fixed regression in json module where an indent of 0 stopped + adding newlines and acted instead like 'None'. + +- Issue #11186: pydoc ignores a module if its name contains a surrogate + character in the index of modules. + +- Issue #11815: Use a light-weight SimpleQueue for the result queue in + concurrent.futures.ProcessPoolExecutor. + +- Issue #5162: Treat services like frozen executables to allow child spawning + from multiprocessing.forking on Windows. + +- logging.basicConfig now supports an optional 'handlers' argument taking an + iterable of handlers to be added to the root logger. Additional parameter + checks were also added to basicConfig. + +- Issue #11814: Fix likely typo in multiprocessing.Pool._terminate(). + +- Issue #11747: Fix range formatting in difflib.context_diff() and + difflib.unified_diff(). + +- Issue #8428: Fix a race condition in multiprocessing.Pool when terminating + worker processes: new processes would be spawned while the pool is being + shut down. Patch by Charles-Fran?ois Natali. + +- Issue #2650: re.escape() no longer escapes the '_'. + +- Issue #11757: select.select() now raises ValueError when a negative timeout + is passed (previously, a select.error with EINVAL would be raised). Patch + by Charles-Fran?ois Natali. + +- Issue #7311: fix html.parser to accept non-ASCII attribute values. + +- Issue #11605: email.parser.BytesFeedParser was incorrectly converting + multipart subparts with an 8-bit CTE into unicode instead of preserving the + bytes. + +- Issue #1690608: email.util.formataddr is now RFC 2047 aware: it now has a + charset parameter that defaults to utf-8 and is used as the charset for RFC + 2047 encoding when the realname contains non-ASCII characters. + +- Issue #10963: Ensure that subprocess.communicate() never raises EPIPE. + +- Issue #10791: Implement missing method GzipFile.read1(), allowing GzipFile + to be wrapped in a TextIOWrapper. Patch by Nadeem Vawda. + +- Issue #11707: Added a fast C version of functools.cmp_to_key(). + Patch by Filip Gruszczy?ski. + +- Issue #11688: Add sqlite3.Connection.set_trace_callback(). Patch by + Torsten Landschoff. + +- Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve + private keys. + +- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept + file-like objects using a new ``fileobj`` constructor argument. Patch by + Nadeem Vawda. + +- unittest.TestCase.assertSameElements has been removed. + +- sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not + called yet: detect bootstrap (startup) issues earlier. + +- Issue #11393: Add the new faulthandler module. + +- Issue #11618: Fix the timeout logic in threading.Lock.acquire() under Windows. + +- Removed the 'strict' argument to email.parser.Parser, which has been + deprecated since Python 2.4. + +- Issue #11256: Fix inspect.getcallargs on functions that take only keyword + arguments. + +- Issue #11696: Fix ID generation in msilib. + +- itertools.accumulate now supports an optional *func* argument for + a user-supplied binary function. + +- Issue #11692: Remove unnecessary demo functions in subprocess module. + +- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when + trying to pack a negative (in-range) integer. + +- Issue #11675: multiprocessing.[Raw]Array objects created from an integer size + are now zeroed on creation. This matches the behaviour specified by the + documentation. + +- Issue #7639: Fix short file name generation in bdist_msi + +- Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459. + Patch by Ben Hayden. + +- Issue #11635: Don't use polling in worker threads and processes launched by + concurrent.futures. + +- Issue #6811: Allow importlib to change a code object's co_filename attribute + to match the path to where the source code currently is, not where the code + object originally came from. + +- Issue #8754: Have importlib use the repr of a module name in error messages. + +- Issue #11591: Prevent "import site" from modifying sys.path when python + was started with -S. + +- collections.namedtuple() now adds a _source attribute to the generated + class. This make the source more accessible than the outdated + "verbose" option which prints to stdout but doesn't make the source + string available. + +- Issue #11371: Mark getopt error messages as localizable. Patch by Filip + Gruszczy?ski. + +- Issue #11333: Add __slots__ to collections ABCs. + +- Issue #11628: cmp_to_key generated class should use __slots__. + +- Issue #11666: let help() display named tuple attributes and methods + that start with a leading underscore. + +- Issue #11662: Make urllib and urllib2 ignore redirections if the + scheme is not HTTP, HTTPS or FTP (CVE-2011-1521). + +- Issue #5537: Fix time2isoz() and time2netscape() functions of + httplib.cookiejar for expiration year greater than 2038 on 32-bit systems. + +- Issue #4391: Use proper gettext plural forms in optparse. + +- Issue #11127: Raise a TypeError when trying to pickle a socket object. + +- Issue #11563: Connection:close header is sent by requests using URLOpener + class which helps in closing of sockets after connection is over. Patch + contributions by Jeff McNeil and Nadeem Vawda. + +- Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates + unbuffered pipes, such that select() works properly on them. + +- Issue #5421: Fix misleading error message when one of socket.sendto()'s + arguments has the wrong type. Patch by Nikita Vetoshkin. + +- Issue #10812: Add some extra posix functions to the os module. + +- Issue #10979: unittest stdout buffering now works with class and module + setup and teardown. + +- Issue #11577: fix ResourceWarning triggered by improved binhex test coverage + +- Issue #11243: fix the parameter querying methods of Message to work if + the headers contain un-encoded non-ASCII data. + +- Issue #11401: fix handling of headers with no value; this fixes a regression + relative to Python2 and the result is now the same as it was in Python2. + +- Issue #9298: base64 bodies weren't being folded to line lengths less than 78, + which was a regression relative to Python2. Unlike Python2, the last line + of the folded body now ends with a carriage return. + +- Issue #11560: shutil.unpack_archive now correctly handles the format + parameter. Patch by Evan Dandrea. + +- Issue #5870: Add `subprocess.DEVNULL` constant. + +- Issue #11133: fix two cases where inspect.getattr_static can trigger code + execution. Patch by Andreas St?hrk. + +- Issue #11569: use absolute path to the sysctl command in multiprocessing to + ensure that it will be found regardless of the shell PATH. This ensures + that multiprocessing.cpu_count works on default installs of MacOSX. + +- Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is + not installed. Instead, the zipfile.ZIP_STORED compression is used to create + the ZipFile. Patch by Natalia B. Bidart. + +- Issue #11289: `smtp.SMTP` class is now a context manager so it can be used + in a `with` statement. Contributed by Giampaolo Rodola. + +- Issue #11554: Fixed support for Japanese codecs; previously the body output + encoding was not done if euc-jp or shift-jis was specified as the charset. + +- Issue #11509: Significantly increase test coverage of fileinput. + Patch by Denver Coneybeare at PyCon 2011 Sprints. + +- Issue #11407: `TestCase.run` returns the result object used or created. + Contributed by Janathan Hartley. + +- Issue #11500: Fixed a bug in the OS X proxy bypass code for fully qualified + IP addresses in the proxy exception list. + +- Issue #11491: dbm.error is no longer raised when dbm.open is called with + the "n" as the flag argument and the file exists. The behavior matches + the documentation and general logic. + +- Issue #1162477: Postel Principle adjustment to email date parsing: handle the + fact that some non-compliant MUAs use '.' instead of ':' in time specs. + +- Issue #11131: Fix sign of zero in decimal.Decimal plus and minus + operations when the rounding mode is ROUND_FLOOR. + +- Issue #9935: Speed up pickling of instances of user-defined classes. + +- Issue #5622: Fix curses.wrapper to raise correct exception if curses + initialization fails. + +- Issue #11408: In threading.Lock.acquire(), only call gettimeofday() when + really necessary. Patch by Charles-Fran?ois Natali. + +- Issue #11391: Writing to a mmap object created with + ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a + TypeError. Patch by Charles-Fran?ois Natali. + +- Issue #9795: add context manager protocol support for nntplib.NNTP class. + +- Issue #11306: mailbox in certain cases adapts to an inability to open + certain files in read-write mode. Previously it detected this by + checking for EACCES, now it also checks for EROFS. + +- Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors + on accept(), send() and recv(). + +- Issue #11377: Deprecate platform.popen() and reimplement it with os.popen(). + +- Issue #8513: On UNIX, subprocess supports bytes command string. + +- Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. + +- Issue #11140: Lock.release() now raises a RuntimeError when attempting + to release an unacquired lock, as claimed in the threading documentation. + The _thread.error exception is now an alias of RuntimeError. Patch by + Filip Gruszczy?ski. Patch for _dummy_thread by Aymeric Augustin. + +- Issue #8594: ftplib now provides a source_address parameter to specify which + (address, port) to bind to before connecting. + +- Issue #11326: Add the missing connect_ex() implementation for SSL sockets, + and make it work for non-blocking connects. + +- Issue #11297: Add collections.ChainMap(). + +- Issue #10755: Add the posix.flistdir() function. Patch by Ross Lagerwall. + +- Issue #4761: Add the ``*at()`` family of functions (openat(), etc.) to the + posix module. Patch by Ross Lagerwall. + +- Issue #7322: Trying to read from a socket's file-like object after a timeout + occurred now raises an error instead of silently losing data. + +- Issue #11291: poplib.POP no longer suppresses errors on quit(). + +- Issue #11177: asyncore's create_socket() arguments can now be omitted. + +- Issue #6064: Add a ``daemon`` keyword argument to the threading.Thread + and multiprocessing.Process constructors in order to override the + default behaviour of inheriting the daemonic property from the current + thread/process. + +- Issue #10956: Buffered I/O classes retry reading or writing after a signal + has arrived and the handler returned successfully. + +- Issue #10784: New os.getpriority() and os.setpriority() functions. + +- Issue #11114: Fix catastrophic performance of tell() on text files (up + to 1000x faster in some cases). It is still one to two order of magnitudes + slower than binary tell(). + +- Issue #10882: Add os.sendfile function. + +- Issue #10868: Allow usage of the register method of an ABC as a class + decorator. + +- Issue #11224: Fixed a regression in tarfile that affected the file-like + objects returned by TarFile.extractfile() regarding performance, memory + consumption and failures with the stream interface. + +- Issue #10924: Adding salt and Modular Crypt Format to crypt library. + Moved old C wrapper to _crypt, and added a Python wrapper with + enhanced salt generation and simpler API for password generation. + +- Issue #11074: Make 'tokenize' so it can be reloaded. + +- Issue #11085: Moved collections abstract base classes into a separate + module called collections.abc, following the pattern used by importlib.abc. + For backwards compatibility, the names are imported into the collections + module. + +- Issue #4681: Allow mmap() to work on file sizes and offsets larger than + 4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for + 32-bit Windows. + +- Issue #11169: compileall module uses repr() to format filenames and paths to + escape surrogate characters and show spaces. + +- Issue #11089: Fix performance issue limiting the use of ConfigParser() + with large config files. + +- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers + larger than 4GB. Patch by Nadeem Vawda. + +- Issue #11388: Added a clear() method to MutableSequence + +- Issue #11174: Add argparse.MetavarTypeHelpFormatter, which uses type names + for the names of optional and positional arguments in help messages. + +- Issue #9348: Raise an early error if argparse nargs and metavar don't match. + +- Issue #8982: Improve the documentation for the argparse Namespace object. + +- Issue #9343: Document that argparse parent parsers must be configured before + their children. + +- Issue #9026: Fix order of argparse sub-commands in help messages. + +- Issue #9347: Fix formatting for tuples in argparse type= error messages. + +- Issue #12191: Added shutil.chown() to change user and/or group owner of a + given path also specifying their names. + +- Issue #13988: The _elementtree accelerator is used whenever available. + Now xml.etree.cElementTree becomes a deprecated alias to ElementTree. + +Build +----- + +- Issue #6807: Run msisupport.mak earlier. + +- Issue #10580: Minor grammar change in Windows installer. + +- Issue #13326: Clean __pycache__ directories correctly on OpenBSD. + +- PEP 393: the configure option --with-wide-unicode is removed. + +- Issue #12852: Set _XOPEN_SOURCE to 700, instead of 600, to get POSIX 2008 + functions on OpenBSD (e.g. fdopendir). + +- Issue #11863: Remove support for legacy systems deprecated in Python 3.2 + (following PEP 11). These systems are systems using Mach C Threads, + SunOS lightweight processes, GNU pth threads and IRIX threads. + +- Issue #8746: Correct faulty configure checks so that os.chflags() and + os.lchflags() are once again built on systems that support these + functions (BSD and OS X). Also add new stat file flags for OS X + (UF_HIDDEN and UF_COMPRESSED). + +- Issue #10645: Installing Python no longer creates a + Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory. + +- Do not accidentally include the directory containing sqlite.h twice when + building sqlite3. + +- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, + ensure "make install" creates symlinks in --prefix bin for the "-32" + files in the framework bin directory like the installer does. + +- Issue #11347: Use --no-as-needed when linking libpython3.so. + +- Issue #11411: Fix 'make DESTDIR=' with a relative destination. + +- Issue #11268: Prevent Mac OS X Installer failure if Documentation + package had previously been installed. + +- Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2. + + +IDLE +---- + +- Issue #11718: IDLE's open module dialog couldn't find the __init__.py + file in a package. + +Tools/Demos +----------- + +- Issue #14053: patchcheck.py ("make patchcheck") now works with MQ patches. + Patch by Francisco Mart?n Brugu?. + +- Issue #13930: 2to3 is now able to write its converted output files to another + directory tree as well as copying unchanged files and altering the file + suffix. See its new -o, -W and --add-suffix options. This makes it more + useful in many automated code translation workflows. + +- Issue #13628: python-gdb.py is now able to retrieve more frames in the Python + traceback if Python is optimized. + +- Issue #11996: libpython (gdb), replace "py-bt" command by "py-bt-full" and + add a smarter "py-bt" command printing a classic Python traceback. + +- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. + +- Issue #10639: reindent.py no longer converts newlines and will raise + an error if attempting to convert a file with mixed newlines. + "--newline" option added to specify new line character. + +Extension Modules +----------------- + +- Issue #13840: The error message produced by ctypes.create_string_buffer + when given a Unicode string has been fixed. + +- Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by + Vilmos Nebehaj. + +- Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. + +- Issue #13159: FileIO and BZ2Compressor/BZ2Decompressor now use a linear-time + buffer growth strategy instead of a quadratic-time one. + +- Issue #10141: socket: Add SocketCAN (PF_CAN) support. Initial patch by + Matthias Fuchs, updated by Tiago Gon?alves. + +- Issue #13070: Fix a crash when a TextIOWrapper caught in a reference cycle + would be finalized after the reference to its underlying BufferedRWPair's + writer got cleared by the GC. + +- Issue #12881: ctypes: Fix segfault with large structure field names. + +- Issue #13058: ossaudiodev: fix a file descriptor leak on error. Patch by + Thomas Jarosch. + +- Issue #13013: ctypes: Fix a reference leak in PyCArrayType_from_ctype. + Thanks to Suman Saha for finding the bug and providing a patch. + +- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that + file descriptor was actually received. + +- Issue #1172711: Add 'long long' support to the array module. + Initial patch by Oren Tirosh and Hirokazu Yamamoto. + +- Issue #12483: ctypes: Fix a crash when the destruction of a callback + object triggers the garbage collector. + +- Issue #12950: Fix passing file descriptors in multiprocessing, under + OpenIndiana/Illumos. + +- Issue #12764: Fix a crash in ctypes when the name of a Structure field is not + a string. + +- Issue #11241: subclasses of ctypes.Array can now be subclassed. + +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + +- Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper + signature. Without this, architectures where sizeof void* != sizeof int are + broken. Patch given by Hallvard B Furuseth. + +- Issue #12051: Fix segfault in json.dumps() while encoding highly-nested + objects using the C accelerations. + +- Issue #12017: Fix segfault in json.loads() while decoding highly-nested + objects using the C accelerations. + +- Issue #1838: Prevent segfault in ctypes, when _as_parameter_ on a class is set + to an instance of the class. + +Tests +----- + +- Issue #11689: Fix a variable scoping error in an sqlite3 test + +- Issue #13786: Remove unimplemented 'trace' long option from regrtest.py. + +- Issue #13725: Fix regrtest to recognize the documented -d flag. + Patch by Erno Tukia. + +- Issue #13304: Skip test case if user site-packages disabled (-s or + PYTHONNOUSERSITE). (Patch by Carl Meyer) + +- Issue #5661: Add a test for ECONNRESET/EPIPE handling to test_asyncore. Patch + by Xavier de Gaye. + +- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. + +- Re-enable lib2to3's test_parser.py tests, though with an expected failure + (see issue 13125). + +- Issue #12656: Add tests for IPv6 and Unix sockets to test_asyncore. + +- Issue #6484: Add unit tests for mailcap module (patch by Gregory Nofi) + +- Issue #11651: Improve the Makefile test targets to run more of the test suite + more quickly. The --multiprocess option is now enabled by default, reducing + the amount of time needed to run the tests. "make test" and "make quicktest" + now include some resource-intensive tests, but no longer run the test suite + twice to check for bugs in .pyc generation. Tools/scripts/run_test.py provides + an easy platform-independent way to run test suite with sensible defaults. + +- Issue #12331: The test suite for the packaging module can now run from an + installed Python. + +- Issue #12331: The test suite for lib2to3 can now run from an installed + Python. + +- Issue #12626: In regrtest, allow to filter tests using a glob filter + with the ``-m`` (or ``--match``) option. This works with all test cases + using the unittest module. This is useful with long test suites + such as test_io or test_subprocess. + +- Issue #12624: It is now possible to fail after the first failure when + running in verbose mode (``-v`` or ``-W``), by using the ``--failfast`` + (or ``-G``) option to regrtest. This is useful with long test suites + such as test_io or test_subprocess. + +- Issue #12587: Correct faulty test file and reference in test_tokenize. + (Patch by Robert Xiao) + +- Issue #12573: Add resource checks for dangling Thread and Process objects. + +- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64' + as the processor type on some Mac systems. + +- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary + failure in name resolution. + +- Issue #11812: Solve transient socket failure to connect to 'localhost' + in test_telnetlib.py. + +- Solved a potential deadlock in test_telnetlib.py. Related to issue #11812. + +- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and + an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder + Web site. + +- Avoid failing in test_urllibnet.test_bad_address when some overzealous + DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test + is now skipped instead. + +- Issue #12440: When testing whether some bits in SSLContext.options can be + reset, check the version of the OpenSSL headers Python was compiled against, + rather than the runtime version of the OpenSSL library. + +- Issue #11512: Add a test suite for the cgitb module. Patch by Robbie Clemons. + +- Issue #12497: Install test/data to prevent failures of the various codecmaps + tests. + +- Issue #12496: Install test/capath directory to prevent test_connect_capath + testcase failure in test_ssl. + +- Issue #12469: Run wakeup and pending signal tests in a subprocess to run the + test in a fresh process with only one thread and to not change signal + handling of the parent process. + +- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run + test_tk or test_ttk_guionly under a username that is not currently logged + in to the console windowserver (as may be the case under buildbot or ssh). + +- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. + +- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures + the output and displays it on failure instead. regrtest -v doesn't print the + error twice anymore if there is only one error. + +- Issue #12141: Install copies of template C module file so that + test_build_ext of test_distutils and test_command_build_ext of + test_packaging are no longer silently skipped when + run outside of a build directory. + +- Issue #8746: Add additional tests for os.chflags() and os.lchflags(). + Patch by Garrett Cooper. + +- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9 + 2.8 + on Mac OS X. (Patch by Ronald Oussoren) + +- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2, + iso2022_kr). + +- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch + written by Charles-Fran?ois Natali. + +- Issue #11614: import __hello__ prints "Hello World!". Patch written by + Andreas St?hrk. + +- Issue #5723: Improve json tests to be executed with and without accelerations. + +- Issue #12041: Make test_wait3 more robust. + +- Issue #11873: Change regex in test_compileall to fix occasional failures when + when the randomly generated temporary path happened to match the regex. + +- Issue #11958: Fix FTP tests for IPv6, bind to "::1" instead of "localhost". + Patch written by Charles-Francois Natali. + +- Issue #8407, #11859: Fix tests of test_io using threads and an alarm: use + pthread_sigmask() to ensure that the SIGALRM signal is received by the main + thread. + +- Issue #11811: Factor out detection of IPv6 support on the current host + and make it available as ``test.support.IPV6_ENABLED``. Patch by + Charles-Fran?ois Natali. + +- Issue #10914: Add a minimal embedding test to test_capi. + +- Issue #11223: Skip test_lock_acquire_interruption() and + test_rlock_acquire_interruption() of test_threadsignals if a thread lock is + implemented using a POSIX mutex and a POSIX condition variable. A POSIX + condition variable cannot be interrupted by a signal (e.g. on Linux, the + futex system call is restarted). + +- Issue #11790: Fix sporadic failures in test_multiprocessing.WithProcessesTestCondition. + +- Fix possible "file already exists" error when running the tests in parallel. + +- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows + platforms. Patch by Nadeem Vawda. + +- Issue #11727: Add a --timeout option to regrtest: if a test takes more than + TIMEOUT seconds, dumps the traceback of all threads and exits. + +- Issue #11653: fix -W with -j in regrtest. + +- The email test suite now lives in the Lib/test/test_email package. The test + harness code has also been modernized to allow use of new unittest features. + +- regrtest now discovers test packages as well as test modules. + +- Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov. + +- New test_crashers added to exercise the scripts in the Lib/test/crashers + directory and confirm they fail as expected + +- Issue #11578: added test for the timeit module. Patch by Michael Henry. + +- Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. + +- Issue #11505: improves test coverage of string.py, increases granularity of + string.Formatter tests. Initial patch by Alicia Arlen. + +- Issue #11548: Improve test coverage of the shutil module. Patch by + Evan Dandrea. + +- Issue #11554: Reactivated test_email_codecs. + +- Issue #11505: improves test coverage of string.py. Patch by Alicia + Arlen + +- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a + false positive if the last directory in the path is inaccessible. + +- Issue #11223: Fix test_threadsignals to fail, not hang, when the + non-semaphore implementation of locks is used under POSIX. + +- Issue #10911: Add tests on CGI with non-ASCII characters. Patch written by + Pierre Quentel. + +- Issue #9931: Fix hangs in GUI tests under Windows in certain conditions. + Patch by Hirokazu Yamamoto. + +- Issue #10512: Properly close sockets under test.test_cgi. + +- Issue #10992: Make tests pass under coverage. + +- Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due + to open door files. + +- Issue #10990: Prevent tests from clobbering a set trace function. + +C-API +----- + +- Add PyObject_GenericGetDict and PyObject_GeneriSetDict. They are generic + implementations for the getter and setter of a ``__dict__`` descriptor of C + types. + +- Issue #13727: Add 3 macros to access PyDateTime_Delta members: + PyDateTime_DELTA_GET_DAYS, PyDateTime_DELTA_GET_SECONDS, + PyDateTime_DELTA_GET_MICROSECONDS. + +- Issue #10542: Add 4 macros to work with surrogates: Py_UNICODE_IS_SURROGATE, + Py_UNICODE_IS_HIGH_SURROGATE, Py_UNICODE_IS_LOW_SURROGATE, + Py_UNICODE_JOIN_SURROGATES. + +- Issue #12724: Add Py_RETURN_NOTIMPLEMENTED macro for returning NotImplemented. + +- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with + Mercurial. + +- Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const + char *` instead of `char *`. + +- Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. + +Documentation +------------- + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issues #13491 and #13995: Fix many errors in sqlite3 documentation. + Initial patch for #13491 by Johannes Vogel. + +- Issue #13402: Document absoluteness of sys.executable. + +- Issue #13883: PYTHONCASEOK also works on OS X. + +- Issue #9021: Add an introduction to the copy module documentation. + +- Issue #6005: Examples in the socket library documentation use sendall, where + relevant, instead send method. + +- Issue #12798: Updated the mimetypes documentation. + +- Issue #12949: Document the kwonlyargcount argument for the PyCode_New + C API function. + +- Issue #13513: Fix io.IOBase documentation to correctly link to the + io.IOBase.readline method instead of the readline module. + +- Issue #13237: Reorganise subprocess documentation to emphasise convenience + functions and the most commonly needed arguments to Popen. + +- Issue #13141: Demonstrate recommended style for socketserver examples. + +- Issue #11818: Fix tempfile examples for Python 3. + **(For information about older versions, consult the HISTORY file.)** diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -747,7 +747,7 @@ { if (!self->encoding_start_of_stream) { /* Skip the BOM and use native byte ordering */ -#if defined(WORDS_BIGENDIAN) +#if PY_BIG_ENDIAN return utf16be_encode(self, text); #else return utf16le_encode(self, text); @@ -776,7 +776,7 @@ { if (!self->encoding_start_of_stream) { /* Skip the BOM and use native byte ordering */ -#if defined(WORDS_BIGENDIAN) +#if PY_BIG_ENDIAN return utf32be_encode(self, text); #else return utf32le_encode(self, text); @@ -1913,10 +1913,7 @@ #define COOKIE_BUF_LEN (sizeof(Py_off_t) + 3 * sizeof(int) + sizeof(char)) -#if defined(WORDS_BIGENDIAN) - -# define IS_LITTLE_ENDIAN 0 - +#if PY_BIG_ENDIAN /* We want the least significant byte of start_pos to also be the least significant byte of the cookie, which means that in big-endian mode we must copy the fields in reverse order. */ @@ -1928,9 +1925,6 @@ # define OFF_NEED_EOF 0 #else - -# define IS_LITTLE_ENDIAN 1 - /* Little-endian mode: the least significant byte of start_pos will naturally end up the least significant byte of the cookie. */ @@ -1951,7 +1945,7 @@ return -1; if (_PyLong_AsByteArray(cookieLong, buffer, sizeof(buffer), - IS_LITTLE_ENDIAN, 0) < 0) { + PY_LITTLE_ENDIAN, 0) < 0) { Py_DECREF(cookieLong); return -1; } @@ -1977,9 +1971,9 @@ memcpy(buffer + OFF_CHARS_TO_SKIP, &cookie->chars_to_skip, sizeof(cookie->chars_to_skip)); memcpy(buffer + OFF_NEED_EOF, &cookie->need_eof, sizeof(cookie->need_eof)); - return _PyLong_FromByteArray(buffer, sizeof(buffer), IS_LITTLE_ENDIAN, 0); + return _PyLong_FromByteArray(buffer, sizeof(buffer), + PY_LITTLE_ENDIAN, 0); } -#undef IS_LITTLE_ENDIAN static int _textiowrapper_decoder_setstate(textio *self, cookie_type *cookie) diff --git a/Modules/_sha3/cleanup.py b/Modules/_sha3/cleanup.py --- a/Modules/_sha3/cleanup.py +++ b/Modules/_sha3/cleanup.py @@ -32,10 +32,10 @@ if line.startswith("typedef unsigned long long int"): buf.append("/* %s */\n" % line.strip()) continue - ## remove #include "brg_endian.h" - #if "brg_endian.h" in line: - # buf.append("/* %s */\n" % line.strip()) - # continue + # remove #include "brg_endian.h" + if "brg_endian.h" in line: + buf.append("/* %s */\n" % line.strip()) + continue # transform C++ comments into ANSI C comments line = CPP1.sub(r"/* \1 */", line) line = CPP2.sub(r" /* \1 */", line) diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt32.c b/Modules/_sha3/keccak/KeccakF-1600-opt32.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt32.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt32.c @@ -12,7 +12,7 @@ */ #include -#include "brg_endian.h" +/* #include "brg_endian.h" */ #include "KeccakF-1600-opt32-settings.h" #include "KeccakF-1600-interface.h" diff --git a/Modules/_sha3/keccak/KeccakF-1600-opt64.c b/Modules/_sha3/keccak/KeccakF-1600-opt64.c --- a/Modules/_sha3/keccak/KeccakF-1600-opt64.c +++ b/Modules/_sha3/keccak/KeccakF-1600-opt64.c @@ -12,7 +12,7 @@ */ #include -#include "brg_endian.h" +/* #include "brg_endian.h" */ #include "KeccakF-1600-opt64-settings.h" #include "KeccakF-1600-interface.h" diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -124,11 +124,14 @@ #define UseInterleaveTables #endif -/* replacement for brg_endian.h -#define IS_BIG_ENDIAN BIG_ENDIAN -#define IS_LITTLE_ENDIAN LITTLE_ENDIAN -#define PLATFORM_BYTE_ORDER BYTE_ORDER -*/ +/* replacement for brg_endian.h */ +#define IS_BIG_ENDIAN 4321 +#define IS_LITTLE_ENDIAN 1234 +#if PY_BIG_ENDIAN +# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#else +# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif /* inline all Keccak dependencies */ #include "keccak/KeccakNISTInterface.h" diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1199,12 +1199,11 @@ case '!': /* Network byte order is big-endian */ return bigendian_table; case '=': { /* Host byte order -- different from native in alignment! */ - int n = 1; - char *p = (char *) &n; - if (*p == 1) - return lilendian_table; - else - return bigendian_table; +#if PY_LITTLE_ENDIAN + return lilendian_table; +#else + return bigendian_table; +#endif } default: --*pfmt; /* Back out of pointer increment */ @@ -2088,13 +2087,13 @@ /* Check endian and swap in faster functions */ { - int one = 1; formatdef *native = native_table; formatdef *other, *ptr; - if ((int)*(unsigned char*)&one) - other = lilendian_table; - else - other = bigendian_table; +#if PY_LITTLE_ENDIAN + other = lilendian_table; +#else + other = bigendian_table; +#endif /* Scan through the native table, find a matching entry in the endian table and swap in the native implementations whenever possible diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -1664,11 +1664,8 @@ static enum machine_format_code typecode_to_mformat_code(char typecode) { -#ifdef WORDS_BIGENDIAN - const int is_big_endian = 1; -#else - const int is_big_endian = 0; -#endif + const int is_big_endian = PY_BIG_ENDIAN; + size_t intsize; int is_signed; diff --git a/Modules/sha256module.c b/Modules/sha256module.c --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -21,13 +21,6 @@ #include "hashlib.h" -/* Endianness testing and definitions */ -#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\ - if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;} - -#define PCT_LITTLE_ENDIAN 1 -#define PCT_BIG_ENDIAN 0 - /* Some useful types */ typedef unsigned char SHA_BYTE; @@ -50,7 +43,6 @@ SHA_INT32 digest[8]; /* Message digest */ SHA_INT32 count_lo, count_hi; /* 64-bit bit count */ SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */ - int Endianness; int local; /* unprocessed amount in data */ int digestsize; } SHAobject; @@ -58,13 +50,11 @@ /* When run on a little-endian CPU we need to perform byte reversal on an array of longwords. */ -static void longReverse(SHA_INT32 *buffer, int byteCount, int Endianness) +#if PY_LITTLE_ENDIAN +static void longReverse(SHA_INT32 *buffer, int byteCount) { SHA_INT32 value; - if ( Endianness == PCT_BIG_ENDIAN ) - return; - byteCount /= sizeof(*buffer); while (byteCount--) { value = *buffer; @@ -73,10 +63,10 @@ *buffer++ = ( value << 16 ) | ( value >> 16 ); } } +#endif static void SHAcopy(SHAobject *src, SHAobject *dest) { - dest->Endianness = src->Endianness; dest->local = src->local; dest->digestsize = src->digestsize; dest->count_lo = src->count_lo; @@ -131,7 +121,9 @@ SHA_INT32 S[8], W[64], t0, t1; memcpy(W, sha_info->data, sizeof(sha_info->data)); - longReverse(W, (int)sizeof(sha_info->data), sha_info->Endianness); +#if PY_LITTLE_ENDIAN + longReverse(W, (int)sizeof(sha_info->data)); +#endif for (i = 16; i < 64; ++i) { W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; @@ -228,7 +220,6 @@ static void sha_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = 0x6A09E667L; sha_info->digest[1] = 0xBB67AE85L; sha_info->digest[2] = 0x3C6EF372L; @@ -246,7 +237,6 @@ static void sha224_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = 0xc1059ed8L; sha_info->digest[1] = 0x367cd507L; sha_info->digest[2] = 0x3070dd17L; diff --git a/Modules/sha512module.c b/Modules/sha512module.c --- a/Modules/sha512module.c +++ b/Modules/sha512module.c @@ -22,13 +22,6 @@ #ifdef PY_LONG_LONG /* If no PY_LONG_LONG, don't compile anything! */ -/* Endianness testing and definitions */ -#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\ - if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;} - -#define PCT_LITTLE_ENDIAN 1 -#define PCT_BIG_ENDIAN 0 - /* Some useful types */ typedef unsigned char SHA_BYTE; @@ -52,7 +45,6 @@ SHA_INT64 digest[8]; /* Message digest */ SHA_INT32 count_lo, count_hi; /* 64-bit bit count */ SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */ - int Endianness; int local; /* unprocessed amount in data */ int digestsize; } SHAobject; @@ -60,13 +52,11 @@ /* When run on a little-endian CPU we need to perform byte reversal on an array of longwords. */ -static void longReverse(SHA_INT64 *buffer, int byteCount, int Endianness) +#if PY_LITTLE_ENDIAN +static void longReverse(SHA_INT64 *buffer, int byteCount) { SHA_INT64 value; - if ( Endianness == PCT_BIG_ENDIAN ) - return; - byteCount /= sizeof(*buffer); while (byteCount--) { value = *buffer; @@ -83,10 +73,10 @@ buffer++; } } +#endif static void SHAcopy(SHAobject *src, SHAobject *dest) { - dest->Endianness = src->Endianness; dest->local = src->local; dest->digestsize = src->digestsize; dest->count_lo = src->count_lo; @@ -141,7 +131,9 @@ SHA_INT64 S[8], W[80], t0, t1; memcpy(W, sha_info->data, sizeof(sha_info->data)); - longReverse(W, (int)sizeof(sha_info->data), sha_info->Endianness); +#if PY_LITTLE_ENDIAN + longReverse(W, (int)sizeof(sha_info->data)); +#endif for (i = 16; i < 80; ++i) { W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; @@ -254,7 +246,6 @@ static void sha512_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = Py_ULL(0x6a09e667f3bcc908); sha_info->digest[1] = Py_ULL(0xbb67ae8584caa73b); sha_info->digest[2] = Py_ULL(0x3c6ef372fe94f82b); @@ -272,7 +263,6 @@ static void sha384_init(SHAobject *sha_info) { - TestEndianness(sha_info->Endianness) sha_info->digest[0] = Py_ULL(0xcbbb9d5dc1059ed8); sha_info->digest[1] = Py_ULL(0x629a292a367cd507); sha_info->digest[2] = Py_ULL(0x9159015a3070dd17); diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -988,7 +988,6 @@ * rewritten to use the newer PyLong_{As,From}ByteArray API. */ -#define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one #define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) /* Create a new long int object from a C PY_LONG_LONG int. */ @@ -1141,7 +1140,6 @@ { PyLongObject *v; PY_LONG_LONG bytes; - int one = 1; int res; if (vv == NULL) { @@ -1176,7 +1174,7 @@ case 1: return v->ob_digit[0]; } res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, - SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1); + SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 1); /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ if (res < 0) @@ -1193,7 +1191,6 @@ { PyLongObject *v; unsigned PY_LONG_LONG bytes; - int one = 1; int res; if (vv == NULL) { @@ -1212,7 +1209,7 @@ } res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, - SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0); + SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 0); /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ if (res < 0) @@ -1288,7 +1285,6 @@ return (unsigned PY_LONG_LONG)-1; } } -#undef IS_LITTLE_ENDIAN /* Get a C long long int from a long int object or any object that has an __int__ method. diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h --- a/Objects/stringlib/codecs.h +++ b/Objects/stringlib/codecs.h @@ -47,7 +47,7 @@ unsigned long value = *(unsigned long *) _s; if (value & ASCII_CHAR_MASK) break; -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN _p[0] = (STRINGLIB_CHAR)(value & 0xFFu); _p[1] = (STRINGLIB_CHAR)((value >> 8) & 0xFFu); _p[2] = (STRINGLIB_CHAR)((value >> 16) & 0xFFu); @@ -454,7 +454,7 @@ const unsigned char *q = *inptr; STRINGLIB_CHAR *p = dest + *outpos; /* Offsets from q for retrieving byte pairs in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int ihi = !!native_ordering, ilo = !native_ordering; #else int ihi = !native_ordering, ilo = !!native_ordering; @@ -485,7 +485,7 @@ block = SWAB(block); #endif } -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN # if SIZEOF_LONG == 4 p[0] = (STRINGLIB_CHAR)(block & 0xFFFFu); p[1] = (STRINGLIB_CHAR)(block >> 16); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -47,14 +47,6 @@ #include #endif -/* Endianness switches; defaults to little endian */ - -#ifdef WORDS_BIGENDIAN -# define BYTEORDER_IS_BIG_ENDIAN -#else -# define BYTEORDER_IS_LITTLE_ENDIAN -#endif - /* --- Globals ------------------------------------------------------------ The globals are initialized by the _PyUnicode_Init() API and should @@ -4813,7 +4805,7 @@ int bo = 0; /* assume native ordering by default */ const char *errmsg = ""; /* Offsets from q for retrieving bytes in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; #else int iorder[] = {3, 2, 1, 0}; @@ -4835,7 +4827,7 @@ if (size >= 4) { const Py_UCS4 bom = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | (q[iorder[1]] << 8) | q[iorder[0]]; -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN if (bom == 0x0000FEFF) { q += 4; bo = -1; @@ -4949,7 +4941,7 @@ unsigned char *p; Py_ssize_t nsize, i; /* Offsets from p for storing byte pairs in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int iorder[] = {0, 1, 2, 3}; #else int iorder[] = {3, 2, 1, 0}; @@ -5092,7 +5084,7 @@ return unicode_empty; } -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN native_ordering = bo <= 0; #else native_ordering = bo >= 0; @@ -5209,7 +5201,7 @@ unsigned short *out; Py_ssize_t bytesize; Py_ssize_t pairs; -#ifdef WORDS_BIGENDIAN +#if PY_BIG_ENDIAN int native_ordering = byteorder >= 0; #else int native_ordering = byteorder <= 0; diff --git a/Python/sysmodule.c b/Python/sysmodule.c --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1561,7 +1561,6 @@ _PySys_Init(void) { PyObject *m, *v, *sysdict, *version_info; - char *s; m = PyModule_Create(&sysmodule); if (m == NULL) @@ -1638,20 +1637,14 @@ PyLong_FromLong(0x10FFFF)); SET_SYS_FROM_STRING("builtin_module_names", list_builtin_module_names()); - { - /* Assumes that longs are at least 2 bytes long. - Should be safe! */ - unsigned long number = 1; - char *value; +#if PY_BIG_ENDIAN + SET_SYS_FROM_STRING("byteorder", + PyUnicode_FromString("big")); +#else + SET_SYS_FROM_STRING("byteorder", + PyUnicode_FromString("little")); +#endif - s = (char *) &number; - if (s[0] == 0) - value = "big"; - else - value = "little"; - SET_SYS_FROM_STRING("byteorder", - PyUnicode_FromString(value)); - } #ifdef MS_COREDLL SET_SYS_FROM_STRING("dllhandle", PyLong_FromVoidPtr(PyWin_DLLhModule)); diff --git a/Tools/unicode/comparecodecs.py b/Tools/unicode/comparecodecs.py --- a/Tools/unicode/comparecodecs.py +++ b/Tools/unicode/comparecodecs.py @@ -30,7 +30,7 @@ mismatch += 1 # Check decoding for i in range(256): - c = chr(i) + c = bytes([i]) try: u1 = c.decode(encoding1) except UnicodeError: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 05:31:11 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 18 Oct 2012 05:31:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Clarify_univer?= =?utf-8?q?sal-newline_wording_in_tutorial_=28issue_=2316266=29=2E?= Message-ID: <3XhwlM18hyzR4T@mail.python.org> http://hg.python.org/cpython/rev/7b2a13b20b33 changeset: 79809:7b2a13b20b33 branch: 3.2 parent: 79798:16493102f9b1 user: Chris Jerdonek date: Wed Oct 17 20:17:41 2012 -0700 summary: Clarify universal-newline wording in tutorial (issue #16266). files: Doc/tutorial/inputoutput.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -256,9 +256,10 @@ :dfn:`binary mode`: now the data is read and written in the form of bytes objects. This mode should be used for all files that don't contain text. -In text mode, the default is to convert platform-specific line endings (``\n`` -on Unix, ``\r\n`` on Windows) to just ``\n`` on reading and ``\n`` back to -platform-specific line endings on writing. This behind-the-scenes modification +In text mode, the default when reading is to convert platform-specific line +endings (``\n`` on Unix, ``\r\n`` on Windows) to just ``\n``. When writing in +text mode, the default is to convert occurrences of ``\n`` back to +platform-specific line endings. This behind-the-scenes modification to file data is fine for text files, but will corrupt binary data like that in :file:`JPEG` or :file:`EXE` files. Be very careful to use binary mode when reading and writing such files. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 05:31:12 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 18 Oct 2012 05:31:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_from_3=2E2=3A_clarify_universal-newline_wording_in_tutor?= =?utf-8?q?ial_=28issue_=2316266=29=2E?= Message-ID: <3XhwlN3D4SzR4V@mail.python.org> http://hg.python.org/cpython/rev/b5439bca219f changeset: 79810:b5439bca219f branch: 3.3 parent: 79807:8a37a8adc87a parent: 79809:7b2a13b20b33 user: Chris Jerdonek date: Wed Oct 17 20:21:05 2012 -0700 summary: Merge from 3.2: clarify universal-newline wording in tutorial (issue #16266). files: Doc/tutorial/inputoutput.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -256,9 +256,10 @@ :dfn:`binary mode`: now the data is read and written in the form of bytes objects. This mode should be used for all files that don't contain text. -In text mode, the default is to convert platform-specific line endings (``\n`` -on Unix, ``\r\n`` on Windows) to just ``\n`` on reading and ``\n`` back to -platform-specific line endings on writing. This behind-the-scenes modification +In text mode, the default when reading is to convert platform-specific line +endings (``\n`` on Unix, ``\r\n`` on Windows) to just ``\n``. When writing in +text mode, the default is to convert occurrences of ``\n`` back to +platform-specific line endings. This behind-the-scenes modification to file data is fine for text files, but will corrupt binary data like that in :file:`JPEG` or :file:`EXE` files. Be very careful to use binary mode when reading and writing such files. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 05:31:13 2012 From: python-checkins at python.org (chris.jerdonek) Date: Thu, 18 Oct 2012 05:31:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_clarify_universal-newline_wording_in?= =?utf-8?q?_tutorial_=28issue_=2316266=29=2E?= Message-ID: <3XhwlP5KLhzR4T@mail.python.org> http://hg.python.org/cpython/rev/a45cb181e4d0 changeset: 79811:a45cb181e4d0 parent: 79808:f6fcff683866 parent: 79810:b5439bca219f user: Chris Jerdonek date: Wed Oct 17 20:29:07 2012 -0700 summary: Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266). This also null merges from a previous commit. files: Doc/tutorial/inputoutput.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -256,9 +256,10 @@ :dfn:`binary mode`: now the data is read and written in the form of bytes objects. This mode should be used for all files that don't contain text. -In text mode, the default is to convert platform-specific line endings (``\n`` -on Unix, ``\r\n`` on Windows) to just ``\n`` on reading and ``\n`` back to -platform-specific line endings on writing. This behind-the-scenes modification +In text mode, the default when reading is to convert platform-specific line +endings (``\n`` on Unix, ``\r\n`` on Windows) to just ``\n``. When writing in +text mode, the default is to convert occurrences of ``\n`` back to +platform-specific line endings. This behind-the-scenes modification to file data is fine for text files, but will corrupt binary data like that in :file:`JPEG` or :file:`EXE` files. Be very careful to use binary mode when reading and writing such files. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Thu Oct 18 05:55:39 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Thu, 18 Oct 2012 05:55:39 +0200 Subject: [Python-checkins] Daily reference leaks (f6fcff683866): sum=2 Message-ID: results for f6fcff683866 on branch "default" -------------------------------------------- test_support leaked [0, -1, 1] references, sum=0 test_dbm leaked [0, 2, 0] references, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog91K1YO', '-x'] From python-checkins at python.org Thu Oct 18 07:35:16 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 07:35:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjU3?= =?utf-8?q?=3A_make_test=5Fcreate=5Fconnection=28=29_handle_ENETUNREACH=2E?= Message-ID: <3XhzVX11TMzMQm@mail.python.org> http://hg.python.org/cpython/rev/8599036d9140 changeset: 79812:8599036d9140 branch: 2.7 parent: 79804:0e54f02625e8 user: Trent Nelson date: Thu Oct 18 01:35:32 2012 -0400 summary: Issue #16257: make test_create_connection() handle ENETUNREACH. files: Lib/test/test_socket.py | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1197,7 +1197,26 @@ port = test_support.find_unused_port() with self.assertRaises(socket.error) as cm: socket.create_connection((HOST, port)) - self.assertEqual(cm.exception.errno, errno.ECONNREFUSED) + + # Issue #16257: create_connection() calls getaddrinfo() against + # 'localhost'. This may result in an IPV6 addr being returned + # as well as an IPV4 one: + # >>> socket.getaddrinfo('localhost', port, 0, SOCK_STREAM) + # >>> [(2, 2, 0, '', ('127.0.0.1', 41230)), + # (26, 2, 0, '', ('::1', 41230, 0, 0))] + # + # create_connection() enumerates through all the addresses returned + # and if it doesn't successfully bind to any of them, it propagates + # the last exception it encountered. + # + # On Solaris, ENETUNREACH is returned in this circumstance instead + # of ECONNREFUSED. So, if that errno exists, add it to our list of + # expected errnos. + expected_errnos = [ errno.ECONNREFUSED, ] + if hasattr(errno, 'ENETUNREACH'): + expected_errnos.append(errno.ENETUNREACH) + + self.assertIn(cm.exception.errno, expected_errnos) def test_create_connection_timeout(self): # Issue #9792: create_connection() should not recast timeout errors -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 09:31:50 2012 From: python-checkins at python.org (larry.hastings) Date: Thu, 18 Oct 2012 09:31:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Correction=3A_Ned_is_the_prim?= =?utf-8?q?ary_Mac_guy_on_the_release_team_for_3=2E4=2E?= Message-ID: <3Xj25247HqzPHP@mail.python.org> http://hg.python.org/peps/rev/79e95f487a33 changeset: 4555:79e95f487a33 user: Larry Hastings date: Thu Oct 18 08:31:44 2012 +0100 summary: Correction: Ned is the primary Mac guy on the release team for 3.4. files: pep-0429.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0429.txt b/pep-0429.txt --- a/pep-0429.txt +++ b/pep-0429.txt @@ -27,7 +27,7 @@ - 3.4 Release Manager: Larry Hastings - Windows installers: Martin v. L?wis -- Mac installers: Ronald Oussoren/Ned Deily +- Mac installers: Ned Deily / Ronald Oussoren - Documentation: Georg Brandl -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Thu Oct 18 12:08:14 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 12:08:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2Mjc0?= =?utf-8?q?=3A_backport_of_3=2E2=27s_asyncore/test=5Fasyncore_to_2=2E7=2E?= Message-ID: <3Xj5YV5L3vzR5G@mail.python.org> http://hg.python.org/cpython/rev/90a46f8943d0 changeset: 79813:90a46f8943d0 branch: 2.7 user: Trent Nelson date: Thu Oct 18 06:08:01 2012 -0400 summary: Issue #16274: backport of 3.2's asyncore/test_asyncore to 2.7. This fixes failing tests on Solaris 10. files: Lib/asyncore.py | 8 +++++- Lib/test/test_asyncore.py | 37 ++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Lib/asyncore.py b/Lib/asyncore.py --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -515,7 +515,13 @@ self.log_info('unhandled connect event', 'warning') def handle_accept(self): - self.log_info('unhandled accept event', 'warning') + pair = self.accept() + if pair is not None: + self.handle_accepted(*pair) + + def handle_accepted(self, sock, addr): + sock.close() + self.log_info('unhandled accepted event', 'warning') def handle_close(self): self.log_info('unhandled close event', 'warning') diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -296,7 +296,6 @@ d.handle_read() d.handle_write() d.handle_connect() - d.handle_accept() finally: sys.stdout = stdout @@ -304,8 +303,7 @@ expected = ['warning: unhandled incoming priority event', 'warning: unhandled read event', 'warning: unhandled write event', - 'warning: unhandled connect event', - 'warning: unhandled accept event'] + 'warning: unhandled connect event'] self.assertEqual(lines, expected) def test_issue_8594(self): @@ -453,6 +451,9 @@ def handle_accept(self): raise Exception("handle_accept not supposed to be called") + def handle_accepted(self): + raise Exception("handle_accepted not supposed to be called") + def handle_connect(self): raise Exception("handle_connect not supposed to be called") @@ -483,8 +484,7 @@ def address(self): return self.socket.getsockname()[:2] - def handle_accept(self): - sock, addr = self.accept() + def handle_accepted(self, sock, addr): self.handler(sock) def handle_error(self): @@ -548,6 +548,29 @@ client = BaseClient(server.address) self.loop_waiting_for_flag(server) + def test_handle_accepted(self): + # make sure handle_accepted() is called when a client connects + + class TestListener(BaseTestHandler): + + def __init__(self): + BaseTestHandler.__init__(self) + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + self.bind((HOST, 0)) + self.listen(5) + self.address = self.socket.getsockname()[:2] + + def handle_accept(self): + asyncore.dispatcher.handle_accept(self) + + def handle_accepted(self, sock, addr): + sock.close() + self.flag = True + + server = TestListener() + client = BaseClient(server.address) + self.loop_waiting_for_flag(server) + def test_handle_read(self): # make sure handle_read is called on data received @@ -671,7 +694,8 @@ s = asyncore.dispatcher() s.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.assertEqual(s.socket.family, socket.AF_INET) - self.assertEqual(s.socket.type, socket.SOCK_STREAM) + SOCK_NONBLOCK = getattr(socket, 'SOCK_NONBLOCK', 0) + self.assertEqual(s.socket.type, socket.SOCK_STREAM | SOCK_NONBLOCK) def test_bind(self): s1 = asyncore.dispatcher() @@ -697,6 +721,7 @@ s = asyncore.dispatcher(socket.socket()) self.assertFalse(s.socket.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR)) + s.socket.close() s.create_socket(socket.AF_INET, socket.SOCK_STREAM) s.set_reuse_addr() self.assertTrue(s.socket.getsockopt(socket.SOL_SOCKET, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 13:45:21 2012 From: python-checkins at python.org (trent.nelson) Date: Thu, 18 Oct 2012 13:45:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2Mjc0?= =?utf-8?q?=3A_revert_r79813=3A90a46f8943d0_changes_to_asyncore/test=5Fasy?= =?utf-8?q?ncore=2E?= Message-ID: <3Xj7jY0s5fzR1J@mail.python.org> http://hg.python.org/cpython/rev/2f0770cc6d3f changeset: 79814:2f0770cc6d3f branch: 2.7 user: Trent Nelson date: Thu Oct 18 07:44:43 2012 -0400 summary: Issue #16274: revert r79813:90a46f8943d0 changes to asyncore/test_asyncore. The backport from 3.2 included a few things not appropriate for 2.7. files: Lib/asyncore.py | 8 +----- Lib/test/test_asyncore.py | 37 ++++---------------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/Lib/asyncore.py b/Lib/asyncore.py --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -515,13 +515,7 @@ self.log_info('unhandled connect event', 'warning') def handle_accept(self): - pair = self.accept() - if pair is not None: - self.handle_accepted(*pair) - - def handle_accepted(self, sock, addr): - sock.close() - self.log_info('unhandled accepted event', 'warning') + self.log_info('unhandled accept event', 'warning') def handle_close(self): self.log_info('unhandled close event', 'warning') diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -296,6 +296,7 @@ d.handle_read() d.handle_write() d.handle_connect() + d.handle_accept() finally: sys.stdout = stdout @@ -303,7 +304,8 @@ expected = ['warning: unhandled incoming priority event', 'warning: unhandled read event', 'warning: unhandled write event', - 'warning: unhandled connect event'] + 'warning: unhandled connect event', + 'warning: unhandled accept event'] self.assertEqual(lines, expected) def test_issue_8594(self): @@ -451,9 +453,6 @@ def handle_accept(self): raise Exception("handle_accept not supposed to be called") - def handle_accepted(self): - raise Exception("handle_accepted not supposed to be called") - def handle_connect(self): raise Exception("handle_connect not supposed to be called") @@ -484,7 +483,8 @@ def address(self): return self.socket.getsockname()[:2] - def handle_accepted(self, sock, addr): + def handle_accept(self): + sock, addr = self.accept() self.handler(sock) def handle_error(self): @@ -548,29 +548,6 @@ client = BaseClient(server.address) self.loop_waiting_for_flag(server) - def test_handle_accepted(self): - # make sure handle_accepted() is called when a client connects - - class TestListener(BaseTestHandler): - - def __init__(self): - BaseTestHandler.__init__(self) - self.create_socket(socket.AF_INET, socket.SOCK_STREAM) - self.bind((HOST, 0)) - self.listen(5) - self.address = self.socket.getsockname()[:2] - - def handle_accept(self): - asyncore.dispatcher.handle_accept(self) - - def handle_accepted(self, sock, addr): - sock.close() - self.flag = True - - server = TestListener() - client = BaseClient(server.address) - self.loop_waiting_for_flag(server) - def test_handle_read(self): # make sure handle_read is called on data received @@ -694,8 +671,7 @@ s = asyncore.dispatcher() s.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.assertEqual(s.socket.family, socket.AF_INET) - SOCK_NONBLOCK = getattr(socket, 'SOCK_NONBLOCK', 0) - self.assertEqual(s.socket.type, socket.SOCK_STREAM | SOCK_NONBLOCK) + self.assertEqual(s.socket.type, socket.SOCK_STREAM) def test_bind(self): s1 = asyncore.dispatcher() @@ -721,7 +697,6 @@ s = asyncore.dispatcher(socket.socket()) self.assertFalse(s.socket.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR)) - s.socket.close() s.create_socket(socket.AF_INET, socket.SOCK_STREAM) s.set_reuse_addr() self.assertTrue(s.socket.getsockopt(socket.SOL_SOCKET, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 20:54:15 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 18 Oct 2012 20:54:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2Mjc3?= =?utf-8?q?=3A_in_PyLong=5FFromVoidPtr=2C_add_missing_branch_for_sizeof=28?= =?utf-8?b?dm9pZCopIDw9?= Message-ID: <3XjKDR2KQkzR7k@mail.python.org> http://hg.python.org/cpython/rev/bedb2903d71e changeset: 79815:bedb2903d71e branch: 3.2 parent: 79809:7b2a13b20b33 user: Mark Dickinson date: Thu Oct 18 19:21:43 2012 +0100 summary: Issue #16277: in PyLong_FromVoidPtr, add missing branch for sizeof(void*) <= sizeof(long). files: Objects/longobject.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -926,6 +926,13 @@ PyObject * PyLong_FromVoidPtr(void *p) { +#if SIZEOF_VOID_P <= SIZEOF_LONG + /* special-case null pointer */ + if (!p) + return PyLong_FromLong(0); + return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p); +#else + #ifndef HAVE_LONG_LONG # error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long" #endif @@ -936,6 +943,7 @@ if (!p) return PyLong_FromLong(0); return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p); +#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 20:54:16 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 18 Oct 2012 20:54:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316277=3A_merge_fix_from_3=2E2?= Message-ID: <3XjKDS4VSgzR6T@mail.python.org> http://hg.python.org/cpython/rev/8ce04be1321c changeset: 79816:8ce04be1321c branch: 3.3 parent: 79810:b5439bca219f parent: 79815:bedb2903d71e user: Mark Dickinson date: Thu Oct 18 19:53:28 2012 +0100 summary: Issue #16277: merge fix from 3.2 files: Objects/longobject.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -935,6 +935,13 @@ PyObject * PyLong_FromVoidPtr(void *p) { +#if SIZEOF_VOID_P <= SIZEOF_LONG + /* special-case null pointer */ + if (!p) + return PyLong_FromLong(0); + return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p); +#else + #ifndef HAVE_LONG_LONG # error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long" #endif @@ -945,6 +952,7 @@ if (!p) return PyLong_FromLong(0); return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p); +#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 20:54:17 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 18 Oct 2012 20:54:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316277=3A_merge_fix_from_3=2E3?= Message-ID: <3XjKDT6gHrzR6k@mail.python.org> http://hg.python.org/cpython/rev/02e57069f43e changeset: 79817:02e57069f43e parent: 79811:a45cb181e4d0 parent: 79816:8ce04be1321c user: Mark Dickinson date: Thu Oct 18 19:53:45 2012 +0100 summary: Issue #16277: merge fix from 3.3 files: Objects/longobject.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -935,6 +935,13 @@ PyObject * PyLong_FromVoidPtr(void *p) { +#if SIZEOF_VOID_P <= SIZEOF_LONG + /* special-case null pointer */ + if (!p) + return PyLong_FromLong(0); + return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p); +#else + #ifndef HAVE_LONG_LONG # error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long" #endif @@ -945,6 +952,7 @@ if (!p) return PyLong_FromLong(0); return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p); +#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 21:33:21 2012 From: python-checkins at python.org (antoine.pitrou) Date: Thu, 18 Oct 2012 21:33:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Followup_to_issue_=2315958?= =?utf-8?q?=3A_add_join=2Eh_to_Makefile_dependencies_for_byte_strings?= Message-ID: <3XjL5Y0DdgzMLK@mail.python.org> http://hg.python.org/cpython/rev/388e43bb519d changeset: 79818:388e43bb519d user: Antoine Pitrou date: Thu Oct 18 21:31:22 2012 +0200 summary: Followup to issue #15958: add join.h to Makefile dependencies for byte strings (thanks Serhiy). files: Makefile.pre.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -695,6 +695,7 @@ $(srcdir)/Objects/stringlib/fastsearch.h \ $(srcdir)/Objects/stringlib/find.h \ $(srcdir)/Objects/stringlib/find_max_char.h \ + $(srcdir)/Objects/stringlib/join.h \ $(srcdir)/Objects/stringlib/partition.h \ $(srcdir)/Objects/stringlib/split.h \ $(srcdir)/Objects/stringlib/stringdefs.h \ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 18 23:30:18 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 18 Oct 2012 23:30:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_16280=3A_Drop_questi?= =?utf-8?q?onable_special-casing_of_null_pointer_in?= Message-ID: <3XjNhV6CQPzPRj@mail.python.org> http://hg.python.org/cpython/rev/5ae4ff03b35f changeset: 79819:5ae4ff03b35f user: Mark Dickinson date: Thu Oct 18 22:18:42 2012 +0100 summary: Issue 16280: Drop questionable special-casing of null pointer in PyLong_FromVoidPtr. files: Objects/longobject.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -936,9 +936,6 @@ PyLong_FromVoidPtr(void *p) { #if SIZEOF_VOID_P <= SIZEOF_LONG - /* special-case null pointer */ - if (!p) - return PyLong_FromLong(0); return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p); #else @@ -948,9 +945,6 @@ #if SIZEOF_LONG_LONG < SIZEOF_VOID_P # error "PyLong_FromVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)" #endif - /* special-case null pointer */ - if (!p) - return PyLong_FromLong(0); return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p); #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 03:06:47 2012 From: python-checkins at python.org (daniel.holth) Date: Fri, 19 Oct 2012 03:06:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Metadata_1=2E3=2C_wheel_edits?= Message-ID: <3XjTVH649VzR2r@mail.python.org> http://hg.python.org/peps/rev/b94f8b7d7936 changeset: 4556:b94f8b7d7936 user: Daniel Holth date: Thu Oct 18 21:06:24 2012 -0400 summary: Metadata 1.3, wheel edits files: pep-0426.txt | 21 ++++++++++++++++++--- pep-0427.txt | 11 +++++------ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -33,10 +33,14 @@ The syntax defined in this PEP is for use with Python distribution metadata files. The file format is a simple UTF-8 encoded Key: value -format with no maximum line length. It is parsable by the ``email`` +format with no maximum line length. It is parsable by the ``email`` module with an appropriate ``email.policy.Policy()``. The field names listed in the `Fields`_ section are used as the header names. +In Python 3.2, a serviceable read-only parser is:: + + email.parser.Parser().parsestr(metadata) + There are two standard locations for these metadata files: * the ``PKG-INFO`` file included in the base directory of Python @@ -66,7 +70,8 @@ times in a single metadata file. Other fields may only occur once in a metadata file. Fields marked with "(optional)" are not required to appear in a valid metadata file; all other -fields must be present. +fields must be present. The fields may appear in any order within +the file. Metadata-Version :::::::::::::::: @@ -236,6 +241,11 @@ omitted if it is identical to ``Author``. Example:: +An implementation might iterate over all the declared `Extension:` +fields to invoke the processors for those extensions. As the order of +the fields is not used, the `Extension: Chili` field may appear before +or after its declared tags `Chili/Type:` etc. + Maintainer: C. Schultz, Universal Features Syndicate, Los Angeles, CA @@ -480,12 +490,17 @@ An ASCII string, not containing whitespace or the / character, that indicates the presence of extended metadata. Additional tags defined by -the extension should be of the form string/Name:: +an `Extension: Chili` should be of the form `Chili/Name`:: Extension: Chili Chili/Type: Poblano Chili/Heat: Mild +An implementation might iterate over all the declared `Extension:` +fields to invoke the processors for those extensions. As the order of +the fields is not used, the `Extension: Chili` field may appear before +or after its declared tags `Chili/Type:` etc. + Version Specifiers ================== diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -190,9 +190,9 @@ #. INSTALLER and REQUESTED are not included in the archive. #. RECORD.jws is used for digital signatures. It is not mentioned in RECORD. -#. RECORD.p7s is reserved as a courtesy to anyone who would prefer to +#. RECORD.p7s is allowed as a courtesy to anyone who would prefer to use s/mime signatures to secure their wheel files. It is not - mentioned in RECORD. + mentioned in RECORD and it is ignored by the official tools. #. During extraction, wheel installers verify all the hashes in RECORD against the file contents. Apart from RECORD and its signatures, installation will fail if any file in the archive is not both @@ -210,10 +210,9 @@ distribution-1.0.data/ -The .data directory contains subdirectories and those subdirectories -contain the scripts, headers, documentation and so forth from the -distribution. During installation the contents of these subdirectories -are moved onto their destination paths. +The .data directory contains subdirectories with the scripts, headers, +documentation and so forth from the distribution. During installation the +contents of these subdirectories are moved onto their destination paths. Signed wheel files -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Fri Oct 19 03:19:55 2012 From: python-checkins at python.org (ned.deily) Date: Fri, 19 Oct 2012 03:19:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MjI2?= =?utf-8?q?=3A_Fix_IDLE_Path_Browser_crash=2E?= Message-ID: <3XjTnR4j24zPST@mail.python.org> http://hg.python.org/cpython/rev/d369e50677a6 changeset: 79820:d369e50677a6 branch: 3.3 parent: 79816:8ce04be1321c user: Ned Deily date: Thu Oct 18 18:16:44 2012 -0700 summary: Issue #16226: Fix IDLE Path Browser crash. (Patch by Roger Serwy) files: Lib/idlelib/NEWS.txt | 7 +++++++ Lib/idlelib/PathBrowser.py | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,10 @@ +What's New in IDLE 3.3.1? +========================= + +- Issue #16226: Fix IDLE Path Browser crash. + (Patch by Roger Serwy) + + What's New in IDLE 3.3.0? ========================= diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/PathBrowser.py --- a/Lib/idlelib/PathBrowser.py +++ b/Lib/idlelib/PathBrowser.py @@ -75,7 +75,7 @@ suffixes += importlib.machinery.SOURCE_SUFFIXES[:] suffixes += importlib.machinery.BYTECODE_SUFFIXES[:] sorted = [] - for suff, mode, flag in suffixes: + for suff in suffixes: i = -len(suff) for name in allnames[:]: normed_name = os.path.normcase(name) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 03:19:57 2012 From: python-checkins at python.org (ned.deily) Date: Fri, 19 Oct 2012 03:19:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316226=3A_Fix_IDLE_Path_Browser_crash=2E?= Message-ID: <3XjTnT02JZzPYH@mail.python.org> http://hg.python.org/cpython/rev/58f9523cf407 changeset: 79821:58f9523cf407 parent: 79819:5ae4ff03b35f parent: 79820:d369e50677a6 user: Ned Deily date: Thu Oct 18 18:19:11 2012 -0700 summary: Issue #16226: Fix IDLE Path Browser crash. (Patch by Roger Serwy) files: Lib/idlelib/NEWS.txt | 7 +++++++ Lib/idlelib/PathBrowser.py | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,10 @@ +What's New in IDLE 3.4.0? +========================= + +- Issue #16226: Fix IDLE Path Browser crash. + (Patch by Roger Serwy) + + What's New in IDLE 3.3.0? ========================= diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/PathBrowser.py --- a/Lib/idlelib/PathBrowser.py +++ b/Lib/idlelib/PathBrowser.py @@ -75,7 +75,7 @@ suffixes += importlib.machinery.SOURCE_SUFFIXES[:] suffixes += importlib.machinery.BYTECODE_SUFFIXES[:] sorted = [] - for suff, mode, flag in suffixes: + for suff in suffixes: i = -len(suff) for name in allnames[:]: normed_name = os.path.normcase(name) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 05:04:11 2012 From: python-checkins at python.org (daniel.holth) Date: Fri, 19 Oct 2012 05:04:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_fix_typo?= Message-ID: <3XjX5l3VJpzR5g@mail.python.org> http://hg.python.org/peps/rev/4773b6b3e8f2 changeset: 4557:4773b6b3e8f2 user: Daniel Holth date: Thu Oct 18 21:10:26 2012 -0400 summary: fix typo files: pep-0426.txt | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -33,7 +33,7 @@ The syntax defined in this PEP is for use with Python distribution metadata files. The file format is a simple UTF-8 encoded Key: value -format with no maximum line length. It is parsable by the ``email`` +format with no maximum line length. It is parseable by the ``email`` module with an appropriate ``email.policy.Policy()``. The field names listed in the `Fields`_ section are used as the header names. @@ -241,11 +241,6 @@ omitted if it is identical to ``Author``. Example:: -An implementation might iterate over all the declared `Extension:` -fields to invoke the processors for those extensions. As the order of -the fields is not used, the `Extension: Chili` field may appear before -or after its declared tags `Chili/Type:` etc. - Maintainer: C. Schultz, Universal Features Syndicate, Los Angeles, CA -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Fri Oct 19 05:04:12 2012 From: python-checkins at python.org (daniel.holth) Date: Fri, 19 Oct 2012 05:04:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_425_=28tags=29_-_mention_?= =?utf-8?q?wheel_filename_convention?= Message-ID: <3XjX5m5QByzR6m@mail.python.org> http://hg.python.org/peps/rev/27cd594ef879 changeset: 4558:27cd594ef879 user: Daniel Holth date: Thu Oct 18 23:01:56 2012 -0400 summary: PEP 425 (tags) - mention wheel filename convention files: pep-0425.txt | 43 +++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/pep-0425.txt b/pep-0425.txt --- a/pep-0425.txt +++ b/pep-0425.txt @@ -64,6 +64,14 @@ For example, the tag py27-none-any indicates compatible with Python 2.7 (any Python 2.7 implementation) with no abi requirement, on any platform. +Use +=== + +The `wheel` built package format includes these tags in its filenames, +of the form ``{distribution}-{version}(-{build tag})?-{python tag}-{abi +tag}-{platform tag}.whl``. Other package formats may have their own +conventions. + Details ======= @@ -103,8 +111,7 @@ is abbreviated in the same way as the Python Tag, e.g. `cp33d` would be the CPython 3.3 ABI with debugging. -The CPython stable ABI is `abi3` as in the shared library suffix, and -is available starting with Python 3.2. +The CPython stable ABI is `abi3` as in the shared library suffix. Implementations with a very unstable ABI may use the first 6 bytes (as 8 base64-encoded characters) of the SHA-256 hash of ther source code @@ -135,19 +142,30 @@ system might support:: 1. cp33-cp33m-linux_x86_64 - 2. cp33-none-linux_x86_64 - 3. cp3-abi3-linux_x86_64 + 2. cp33-abi3-linux_x86_64 + 3. cp33-none-linux_x86_64 4. cp33-none-any 5. cp3-none-any - 6. py33-none-any - 7. py3-none-any + 6. cp32-none-any + 7. cp31-none-any + 8. cp30-none-any + 9. py33-none-any + 10. py3-none-any + 11. py32-none-any + 12. py31-none-any + 13. py30-none-any -A user could instruct their installer to fall back to building from an -sdist more or less often by configuring this list of tags. +The list is in order from most-preferred (a distribution with a +compiled extension module, built for the current version of Python) +to least-preferred (a pure-Python distribution built with an older +version of Python). A user could instruct their installer to fall back +to building from an sdist more or less often by configuring this list of +tags; for example, a user could include only the `*-none-any` tags to only +download built packages that advertise themselves as being pure Python. Rarely there will be more than one supported built distribution for a particular version of a package. For example, a packager could release -a package tagged `cp3-abi3-linux_x86_64` that contains an optional C +a package tagged `cp33-abi3-linux_x86_64` that contains an optional C extension and the same distribution tagged `py3-none-any` that does not. The index of the tag in the supported tags list breaks the tie, and the package with the C extension is installed in preference to the package @@ -176,6 +194,13 @@ FAQ === +What tags are used by default? + Tools should use the most-preferred architecture dependent tag + e.g. `cp33-cp33m-win32` or the most-preferred pure python tag + e.g. `py33-none-any` by default. If the packager overrides the + default it indicates that they intended to provide cross-Python + compatibility. + Can I have a tag `py32+` to indicate a minimum Python minor release? No. Inspect the Trove classifiers to determine this level of cross-release compatibility. Similar to the announcements "beaglevote -- Repository URL: http://hg.python.org/peps From solipsis at pitrou.net Fri Oct 19 05:58:13 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Fri, 19 Oct 2012 05:58:13 +0200 Subject: [Python-checkins] Daily reference leaks (58f9523cf407): sum=0 Message-ID: results for 58f9523cf407 on branch "default" -------------------------------------------- test_imp leaked [0, -1, 1] references, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogVAZ9dr', '-x'] From python-checkins at python.org Fri Oct 19 07:38:00 2012 From: python-checkins at python.org (georg.brandl) Date: Fri, 19 Oct 2012 07:38:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_merging_mi?= =?utf-8?q?stake=2E?= Message-ID: <3XjbWD6g6qzR7R@mail.python.org> http://hg.python.org/cpython/rev/415876f5b519 changeset: 79822:415876f5b519 branch: 3.3 parent: 79820:d369e50677a6 user: Georg Brandl date: Fri Oct 19 07:37:44 2012 +0200 summary: Fix merging mistake. files: Misc/NEWS | 318 ------------------------------------------ 1 files changed, 0 insertions(+), 318 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2429,324 +2429,6 @@ - Issue #8033: sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures. Initial patch by Philippe Devalkeneer. -Extension Modules ------------------ - -- Issue #15676: Now "mmap" check for empty files before doing the - offset check. Patch by Steven Willis. - -- Issue #6493: An issue in ctypes on Windows that caused structure bitfields - of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. - -- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. - -- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and - ctypes.c_float that caused an incorrect exception to be returned in the - case of overflow has been fixed. - -- Issue #14212: The re module didn't retain a reference to buffers it was - scanning, resulting in segfaults. - -Tests ------ - -- Issue #15304: Fix warning message when os.chdir() fails inside - test.support.temp_cwd(). Patch by Chris Jerdonek. - -- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch - by Serhiy Storchaka. - -- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the - UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected - tests in test_posix.py to account for this. - -- Issue #15285: Refactor the approach for testing connect timeouts using - two external hosts that have been configured specifically for this type - of test. - -- Issue #15615: Add some tests for the json module's handling of invalid - input data. Patch by Kushal Das. - -- Issue #15496: Add directory removal helpers for tests on Windows. - Patch by Jeremy Kloth. - -- Issue #15467: Move helpers for __sizeof__ tests into test_support. - Patch by Serhiy Storchaka. - -- Issue #15320: Make iterating the list of tests thread-safe when running - tests in multiprocess mode. Patch by Chris Jerdonek. - -- Issue #15230: Adopted a more systematic approach in the runpy tests - -- Issue #15300: Ensure the temporary test working directories are in the same - parent folder when running tests in multiprocess mode from a Python build. - Patch by Chris Jerdonek. - -- test_nntplib now tolerates being run from behind NNTP gateways that add - "X-Antivirus" headers to articles - -- Issue #15043: test_gdb is now skipped entirely if gdb security settings - block loading of the gdb hooks - -- Issue #14026: In test_cmd_line_script, check that sys.argv is populated - correctly for the various invocation approaches (Patch by Jason Yeo) - -- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging - message (Patch by Jason Yeo) - -- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing - a test failure in test_ssl. - -Build ------ - -- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after - 2801bf875a24 (see #15801). - -- Issue #11715: Fix multiarch detection without having Debian development - tools (dpkg-dev) installed. - -- Issue #15819: Make sure we can build Python out-of-tree from a readonly - source directory. (Somewhat related to Issue #9860.) - -- Issue #15822: Ensure 2to3 grammar pickles are properly installed. - -- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. - -- Issue #8847: Disable COMDAT folding in Windows PGO builds. - -- Issue #14197: For OS X framework builds, ensure links to the shared - library are created with the proper ABI suffix. - -- Issue #14472: Update .gitignore. Patch by Matej Cepl. - -- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. - -- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. - -- Issue #14437: Fix building the _io module under Cygwin. - -- Issue #14387: Do not include accu.h from Python.h. - -- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. - Based on patch from Herv? Coatanhay. - -- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. - -Documentation -------------- - -- Issue #16115: Improve subprocess.Popen() documentation around args, shell, - and executable arguments. - -- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with - great native-speaker help from R. David Murray. - -- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd - argument. - -- Issue #15979: Improve timeit documentation. - -- Issue #16036: Improve documentation of built-in int()'s signature and - arguments. - -- Issue #15935: Clarification of argparse docs, re: add_argument() type and - default arguments. Patch contributed by Chris Jerdonek. - -- Issue #11964: Document a change in v3.2 to the behavior of the indent - parameter of json encoding operations. - -- Issue #14674: Add a discussion of the json module's standard compliance. - Patch by Chris Rebert. - -- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by - Daniel Ellis. - -- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch - by Serhiy Storchaka. - -- Issue 15482: Properly document the default 'level' value for __import__() - while warning about using negative values. - -- Issue #15230: Clearly document some of the limitations of the runpy - module and nudge readers towards importlib when appropriate. - -- Issue #13557: Clarify effect of giving two different namespaces to exec or - execfile(). - -- Issue #8799: Fix and improve the threading.Condition documentation. - -- Issue #14943: Correct a default argument value for winreg.OpenKey - and correctly list the argument names in the function's explanation. - -- Issue #14034: added the argparse tutorial. - -- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch - contributed by Chris Jerdonek. - -Tools/Demos ------------ - -- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. - -- Issue #14695: Fix missing support for starred assignments in - Tools/parser/unparse.py. - - -What's New in Python 3.2.3? -=========================== - -*Release date: 10-Apr-2012* - -Build ------ - -- Issue #14387: Work around a problem building extension modules under Windows - by undefining ``small`` before use in the Python headers. - - -What's New in Python 3.2.3 release candidate 2? -=============================================== - -*Release date: 18-Mar-2012* - -Library -------- - -- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils - on Windows. - -Extension Modules ------------------ - -- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash - table internal to the pyexpat module's copy of the expat library to avoid a - denial of service due to hash collisions. Patch by David Malcolm with some - modifications by the expat project. - - -What's New in Python 3.2.3 release candidate 1? -=============================================== - -*Release date: 24-Feb-2012* - -Core and Builtins ------------------ - -- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED - environment variable, to provide an opt-in way to protect against denial of - service attacks due to hash collisions within the dict and set types. Patch - by David Malcolm, based on work by Victor Stinner. - -- Issue #14084: Fix a file descriptor leak when importing a module with a - bad encoding. - -- Issue #13020: Fix a reference leak when allocating a structsequence object - fails. Patch by Suman Saha. - -- Issue #13908: Ready types returned from PyType_FromSpec. - -- Issue #11235: Fix OverflowError when trying to import a source file whose - modification time doesn't fit in a 32-bit timestamp. - -- Fix the builtin module initialization code to store the init function for - future reinitialization. - -- Issue #8052: The posix subprocess module would take a long time closing - all possible file descriptors in the child process rather than just open - file descriptors. It now closes only the open fds if possible for the - default close_fds=True behavior. - -- Issue #13629: Renumber the tokens in token.h so that they match the indexes - into _PyParser_TokenNames. - -- Fix the fix for issue #12149: it was incorrect, although it had the side - effect of appearing to resolve the issue. Thanks to Mark Shannon for - noticing. - -- Issue #13505: Pickle bytes objects in a way that is compatible with - Python 2 when using protocols <= 2. - -- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix - given by Campbell Barton). - -- Issue #7111: Python can now be run without a stdin, stdout or stderr - stream. It was already the case with Python 2. However, the corresponding - sys module entries are now set to None (instead of an unusable file object). - -- Issue #13436: Fix a bogus error message when an AST object was passed - an invalid integer value. - -- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER - to allow compiling extension modules with -Wswitch-enum on gcc. - Initial patch by Floris Bruynooghe. - -- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder - already accepts them). - -- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode - error handler in interactive mode (when calling into PyOS_Readline()). - -- Issue #13343: Fix a SystemError when a lambda expression uses a global - variable in the default value of a keyword-only argument: - (lambda *, arg=GLOBAL_NAME: None) - -- Issue #10519: Avoid unnecessary recursive function calls in - setobject.c. - -- Issue #10363: Deallocate global locks in Py_Finalize(). - -- Issue #13018: Fix reference leaks in error paths in dictobject.c. - Patch by Suman Saha. - -- Issue #1294232: In a few cases involving metaclass inheritance, the - interpreter would sometimes invoke the wrong metaclass when building a new - class object. These cases now behave correctly. Patch by Daniel Urban. - -- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler - warnings. Patch by Josh Triplett and Petri Lehtinen. - -- Issue #13188: When called without an explicit traceback argument, - generator.throw() now gets the traceback from the passed exception's - ``__traceback__`` attribute. Patch by Petri Lehtinen. - -- Issue #7833: Extension modules built using distutils on Windows will no - longer include a "manifest" to prevent them failing at import time in some - embedded situations. - -- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described - as "The pipe is being closed") is now mapped to POSIX errno EPIPE - (previously EINVAL). - -- Issue #12911: Fix memory consumption when calculating the repr() of huge - tuples or lists. - -- Issue #7732: Don't open a directory as a file anymore while importing a - module. Ignore the direcotry if its name matchs the module name (e.g. - "__init__.py") and raise a ImportError instead. - -- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for - finding the bug and providing a patch. - -- Issue #12973: Fix overflow checks that relied on undefined behaviour in - list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs - caused test failures with recent versions of Clang. - -- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now - mapped to POSIX errno ENOTDIR (previously EINVAL). - -- Issue #9200: The str.is* methods now work with strings that contain non-BMP - characters even in narrow Unicode builds. - -- Issue #12791: Break reference cycles early when a generator exits with - an exception. - -- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase - titlecased and cased non-letter characters. - -Library -------- - - HTMLParser is now able to handle slashes in the start tag. - Issue #13641: Decoding functions in the base64 module now accept ASCII-only -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 07:38:02 2012 From: python-checkins at python.org (georg.brandl) Date: Fri, 19 Oct 2012 07:38:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_with_3=2E3?= Message-ID: <3XjbWG34YlzR7R@mail.python.org> http://hg.python.org/cpython/rev/53a7c2226a2b changeset: 79823:53a7c2226a2b parent: 79821:58f9523cf407 parent: 79822:415876f5b519 user: Georg Brandl date: Fri Oct 19 07:37:56 2012 +0200 summary: Merge with 3.3 files: Misc/NEWS | 318 ------------------------------------------ 1 files changed, 0 insertions(+), 318 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2471,324 +2471,6 @@ - Issue #8033: sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures. Initial patch by Philippe Devalkeneer. -Extension Modules ------------------ - -- Issue #15676: Now "mmap" check for empty files before doing the - offset check. Patch by Steven Willis. - -- Issue #6493: An issue in ctypes on Windows that caused structure bitfields - of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed. - -- Issue #15000: Support the "unique" x32 architecture in _posixsubprocess.c. - -- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and - ctypes.c_float that caused an incorrect exception to be returned in the - case of overflow has been fixed. - -- Issue #14212: The re module didn't retain a reference to buffers it was - scanning, resulting in segfaults. - -Tests ------ - -- Issue #15304: Fix warning message when os.chdir() fails inside - test.support.temp_cwd(). Patch by Chris Jerdonek. - -- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch - by Serhiy Storchaka. - -- Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the - UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected - tests in test_posix.py to account for this. - -- Issue #15285: Refactor the approach for testing connect timeouts using - two external hosts that have been configured specifically for this type - of test. - -- Issue #15615: Add some tests for the json module's handling of invalid - input data. Patch by Kushal Das. - -- Issue #15496: Add directory removal helpers for tests on Windows. - Patch by Jeremy Kloth. - -- Issue #15467: Move helpers for __sizeof__ tests into test_support. - Patch by Serhiy Storchaka. - -- Issue #15320: Make iterating the list of tests thread-safe when running - tests in multiprocess mode. Patch by Chris Jerdonek. - -- Issue #15230: Adopted a more systematic approach in the runpy tests - -- Issue #15300: Ensure the temporary test working directories are in the same - parent folder when running tests in multiprocess mode from a Python build. - Patch by Chris Jerdonek. - -- test_nntplib now tolerates being run from behind NNTP gateways that add - "X-Antivirus" headers to articles - -- Issue #15043: test_gdb is now skipped entirely if gdb security settings - block loading of the gdb hooks - -- Issue #14026: In test_cmd_line_script, check that sys.argv is populated - correctly for the various invocation approaches (Patch by Jason Yeo) - -- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging - message (Patch by Jason Yeo) - -- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing - a test failure in test_ssl. - -Build ------ - -- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after - 2801bf875a24 (see #15801). - -- Issue #11715: Fix multiarch detection without having Debian development - tools (dpkg-dev) installed. - -- Issue #15819: Make sure we can build Python out-of-tree from a readonly - source directory. (Somewhat related to Issue #9860.) - -- Issue #15822: Ensure 2to3 grammar pickles are properly installed. - -- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. - -- Issue #8847: Disable COMDAT folding in Windows PGO builds. - -- Issue #14197: For OS X framework builds, ensure links to the shared - library are created with the proper ABI suffix. - -- Issue #14472: Update .gitignore. Patch by Matej Cepl. - -- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. - -- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. - -- Issue #14437: Fix building the _io module under Cygwin. - -- Issue #14387: Do not include accu.h from Python.h. - -- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined. - Based on patch from Herv? Coatanhay. - -- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. - -Documentation -------------- - -- Issue #16115: Improve subprocess.Popen() documentation around args, shell, - and executable arguments. - -- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with - great native-speaker help from R. David Murray. - -- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd - argument. - -- Issue #15979: Improve timeit documentation. - -- Issue #16036: Improve documentation of built-in int()'s signature and - arguments. - -- Issue #15935: Clarification of argparse docs, re: add_argument() type and - default arguments. Patch contributed by Chris Jerdonek. - -- Issue #11964: Document a change in v3.2 to the behavior of the indent - parameter of json encoding operations. - -- Issue #14674: Add a discussion of the json module's standard compliance. - Patch by Chris Rebert. - -- Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by - Daniel Ellis. - -- Issue #15444: Use proper spelling for non-ASCII contributor names. Patch - by Serhiy Storchaka. - -- Issue 15482: Properly document the default 'level' value for __import__() - while warning about using negative values. - -- Issue #15230: Clearly document some of the limitations of the runpy - module and nudge readers towards importlib when appropriate. - -- Issue #13557: Clarify effect of giving two different namespaces to exec or - execfile(). - -- Issue #8799: Fix and improve the threading.Condition documentation. - -- Issue #14943: Correct a default argument value for winreg.OpenKey - and correctly list the argument names in the function's explanation. - -- Issue #14034: added the argparse tutorial. - -- Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch - contributed by Chris Jerdonek. - -Tools/Demos ------------ - -- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. - -- Issue #14695: Fix missing support for starred assignments in - Tools/parser/unparse.py. - - -What's New in Python 3.2.3? -=========================== - -*Release date: 10-Apr-2012* - -Build ------ - -- Issue #14387: Work around a problem building extension modules under Windows - by undefining ``small`` before use in the Python headers. - - -What's New in Python 3.2.3 release candidate 2? -=============================================== - -*Release date: 18-Mar-2012* - -Library -------- - -- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils - on Windows. - -Extension Modules ------------------ - -- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash - table internal to the pyexpat module's copy of the expat library to avoid a - denial of service due to hash collisions. Patch by David Malcolm with some - modifications by the expat project. - - -What's New in Python 3.2.3 release candidate 1? -=============================================== - -*Release date: 24-Feb-2012* - -Core and Builtins ------------------ - -- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED - environment variable, to provide an opt-in way to protect against denial of - service attacks due to hash collisions within the dict and set types. Patch - by David Malcolm, based on work by Victor Stinner. - -- Issue #14084: Fix a file descriptor leak when importing a module with a - bad encoding. - -- Issue #13020: Fix a reference leak when allocating a structsequence object - fails. Patch by Suman Saha. - -- Issue #13908: Ready types returned from PyType_FromSpec. - -- Issue #11235: Fix OverflowError when trying to import a source file whose - modification time doesn't fit in a 32-bit timestamp. - -- Fix the builtin module initialization code to store the init function for - future reinitialization. - -- Issue #8052: The posix subprocess module would take a long time closing - all possible file descriptors in the child process rather than just open - file descriptors. It now closes only the open fds if possible for the - default close_fds=True behavior. - -- Issue #13629: Renumber the tokens in token.h so that they match the indexes - into _PyParser_TokenNames. - -- Fix the fix for issue #12149: it was incorrect, although it had the side - effect of appearing to resolve the issue. Thanks to Mark Shannon for - noticing. - -- Issue #13505: Pickle bytes objects in a way that is compatible with - Python 2 when using protocols <= 2. - -- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix - given by Campbell Barton). - -- Issue #7111: Python can now be run without a stdin, stdout or stderr - stream. It was already the case with Python 2. However, the corresponding - sys module entries are now set to None (instead of an unusable file object). - -- Issue #13436: Fix a bogus error message when an AST object was passed - an invalid integer value. - -- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER - to allow compiling extension modules with -Wswitch-enum on gcc. - Initial patch by Floris Bruynooghe. - -- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder - already accepts them). - -- Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode - error handler in interactive mode (when calling into PyOS_Readline()). - -- Issue #13343: Fix a SystemError when a lambda expression uses a global - variable in the default value of a keyword-only argument: - (lambda *, arg=GLOBAL_NAME: None) - -- Issue #10519: Avoid unnecessary recursive function calls in - setobject.c. - -- Issue #10363: Deallocate global locks in Py_Finalize(). - -- Issue #13018: Fix reference leaks in error paths in dictobject.c. - Patch by Suman Saha. - -- Issue #1294232: In a few cases involving metaclass inheritance, the - interpreter would sometimes invoke the wrong metaclass when building a new - class object. These cases now behave correctly. Patch by Daniel Urban. - -- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler - warnings. Patch by Josh Triplett and Petri Lehtinen. - -- Issue #13188: When called without an explicit traceback argument, - generator.throw() now gets the traceback from the passed exception's - ``__traceback__`` attribute. Patch by Petri Lehtinen. - -- Issue #7833: Extension modules built using distutils on Windows will no - longer include a "manifest" to prevent them failing at import time in some - embedded situations. - -- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described - as "The pipe is being closed") is now mapped to POSIX errno EPIPE - (previously EINVAL). - -- Issue #12911: Fix memory consumption when calculating the repr() of huge - tuples or lists. - -- Issue #7732: Don't open a directory as a file anymore while importing a - module. Ignore the direcotry if its name matchs the module name (e.g. - "__init__.py") and raise a ImportError instead. - -- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for - finding the bug and providing a patch. - -- Issue #12973: Fix overflow checks that relied on undefined behaviour in - list_repeat (listobject.c) and islice_next (itertoolsmodule.c). These bugs - caused test failures with recent versions of Clang. - -- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now - mapped to POSIX errno ENOTDIR (previously EINVAL). - -- Issue #9200: The str.is* methods now work with strings that contain non-BMP - characters even in narrow Unicode builds. - -- Issue #12791: Break reference cycles early when a generator exits with - an exception. - -- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase - titlecased and cased non-letter characters. - -Library -------- - - HTMLParser is now able to handle slashes in the start tag. - Issue #13641: Decoding functions in the base64 module now accept ASCII-only -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 13:25:29 2012 From: python-checkins at python.org (giampaolo.rodola) Date: Fri, 19 Oct 2012 13:25:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_issue_=2316270=3A_urll?= =?utf-8?q?ib_may_hang_when_used_for_retrieving_files_via_FTP_by?= Message-ID: <3XjlD95X4YzR6x@mail.python.org> http://hg.python.org/cpython/rev/edeeb727df86 changeset: 79824:edeeb727df86 user: Giampaolo Rodola' date: Fri Oct 19 13:25:17 2012 +0200 summary: Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. files: Lib/urllib/request.py | 6 ------ Misc/NEWS | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2326,13 +2326,7 @@ return (ftpobj, retrlen) def endtransfer(self): - if not self.busy: - return self.busy = 0 - try: - self.ftp.voidresp() - except ftperrors(): - pass def close(self): self.keepalive = False diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -53,6 +53,9 @@ Library ------- +- Issue #16270: urllib may hang when used for retrieving files via FTP by using + a context manager. Patch by Giampaolo Rodola'. + - Issue #16176: Properly identify Windows 8 via platform.platform() - Issue #16088: BaseHTTPRequestHandler's send_error method includes a -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 13:35:09 2012 From: python-checkins at python.org (giampaolo.rodola) Date: Fri, 19 Oct 2012 13:35:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogRml4IGlzc3VlICMx?= =?utf-8?q?6270=3A_urllib_may_hang_when_used_for_retrieving_files_via_FTP_?= =?utf-8?q?by?= Message-ID: <3XjlRK2cPGzR9J@mail.python.org> http://hg.python.org/cpython/rev/2e6bcbb0ff59 changeset: 79825:2e6bcbb0ff59 branch: 3.3 parent: 79822:415876f5b519 user: Giampaolo Rodola' date: Fri Oct 19 13:34:32 2012 +0200 summary: Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. files: Lib/urllib/request.py | 6 ------ Misc/NEWS | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2326,13 +2326,7 @@ return (ftpobj, retrlen) def endtransfer(self): - if not self.busy: - return self.busy = 0 - try: - self.ftp.voidresp() - except ftperrors(): - pass def close(self): self.keepalive = False diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -43,6 +43,9 @@ Library ------- +- Issue #16270: urllib may hang when used for retrieving files via FTP by using + a context manager. Patch by Giampaolo Rodola'. + - Issue #16176: Properly identify Windows 8 via platform.platform() - Issue #16114: The subprocess module no longer provides a misleading error -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 13:40:38 2012 From: python-checkins at python.org (giampaolo.rodola) Date: Fri, 19 Oct 2012 13:40:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogRml4IGlzc3VlICMx?= =?utf-8?q?6270=3A_urllib_may_hang_when_used_for_retrieving_files_via_FTP_?= =?utf-8?q?by?= Message-ID: <3XjlYf4L9lzPYp@mail.python.org> http://hg.python.org/cpython/rev/7f0d9637a3ad changeset: 79826:7f0d9637a3ad branch: 3.2 parent: 79815:bedb2903d71e user: Giampaolo Rodola' date: Fri Oct 19 13:40:28 2012 +0200 summary: Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. files: Lib/urllib/request.py | 6 ------ Misc/NEWS | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2212,13 +2212,7 @@ return (ftpobj, retrlen) def endtransfer(self): - if not self.busy: - return self.busy = 0 - try: - self.ftp.voidresp() - except ftperrors(): - pass def close(self): self.keepalive = False diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -129,6 +129,9 @@ Library ------- +- Issue #16270: urllib may hang when used for retrieving files via FTP by using + a context manager. Patch by Giampaolo Rodola'. + - Issue #16176: Properly identify Windows 8 via platform.platform() - Issue #16114: The subprocess module no longer provides a misleading -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 13:58:29 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 13:58:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzYwNzQ6?= =?utf-8?q?_Restore_the_long-broken_support_for_running_with_read-only_sou?= =?utf-8?q?rce?= Message-ID: <3XjlyF3G9LzMdF@mail.python.org> http://hg.python.org/cpython/rev/321414874b26 changeset: 79827:321414874b26 branch: 2.7 parent: 79814:2f0770cc6d3f user: Nick Coghlan date: Fri Oct 19 21:58:18 2012 +1000 summary: Issue #6074: Restore the long-broken support for running with read-only source files on Windows files: Lib/test/test_import.py | 48 ++++++++++++++++++++++++++++- Misc/NEWS | 3 + Python/import.c | 6 +++ 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -15,12 +15,24 @@ from test import symlink_support from test import script_helper -def remove_files(name): +def _iter_files(name): for f in (name + os.extsep + "py", name + os.extsep + "pyc", name + os.extsep + "pyo", name + os.extsep + "pyw", name + "$py.class"): + yield f + +def chmod_files(name): + for f in _iter_files(name): + try: + os.chmod(f, 0600) + except OSError as exc: + if exc.errno != errno.ENOENT: + raise + +def remove_files(name): + for f in _iter_files(name): unlink(f) @@ -120,6 +132,40 @@ unload(TESTFN) del sys.path[0] + def test_rewrite_pyc_with_read_only_source(self): + # Issue 6074: a long time ago on posix, and more recently on Windows, + # a read only source file resulted in a read only pyc file, which + # led to problems with updating it later + sys.path.insert(0, os.curdir) + fname = TESTFN + os.extsep + "py" + try: + # Write a Python file, make it read-only and import it + with open(fname, 'w') as f: + f.write("x = 'original'\n") + # Tweak the mtime of the source to ensure pyc gets updated later + s = os.stat(fname) + os.utime(fname, (s.st_atime, s.st_mtime-100000000)) + os.chmod(fname, 0400) + m1 = __import__(TESTFN) + self.assertEqual(m1.x, 'original') + # Change the file and then reimport it + os.chmod(fname, 0600) + with open(fname, 'w') as f: + f.write("x = 'rewritten'\n") + unload(TESTFN) + m2 = __import__(TESTFN) + self.assertEqual(m2.x, 'rewritten') + # Now delete the source file and check the pyc was rewritten + unlink(TESTFN) + unload(TESTFN) + m3 = __import__(TESTFN) + self.assertEqual(m3.x, 'rewritten') + finally: + chmod_files(TESTFN) + remove_files(TESTFN) + unload(TESTFN) + del sys.path[0] + def test_imp_module(self): # Verify that the imp module can correctly load and find .py files diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + - Issue #14783: Improve int() and long() docstrings and switch docstrings for unicode(), slice(), range(), and xrange() to use multi-line signatures. diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -910,6 +910,12 @@ time_t mtime = srcstat->st_mtime; #ifdef MS_WINDOWS /* since Windows uses different permissions */ mode_t mode = srcstat->st_mode & ~S_IEXEC; + /* Issue #6074: We ensure user write access, so we can delete it later + * when the source file changes. (On POSIX, this only requires write + * access to the directory, on Windows, we need write access to the file + * as well) + */ + mode |= _S_IWRITE; #else mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH; #endif -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 14:06:29 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 14:06:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?devguide=3A_Close_=2313440_by_linking?= =?utf-8?q?_to_a_couple_of_blog_posts_from_the_dev_FAQ=2E_Also?= Message-ID: <3Xjm7T3nNSzRBF@mail.python.org> http://hg.python.org/devguide/rev/ec52e044421d changeset: 558:ec52e044421d user: Nick Coghlan date: Fri Oct 19 22:03:15 2012 +1000 summary: Close #13440 by linking to a couple of blog posts from the dev FAQ. Also rearrange the main page a bit to address some other concerns that came up on the tracker issue files: faq.rst | 15 +++++++++++++-- index.rst | 27 ++++++++++++++++----------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -25,6 +25,7 @@ .. _StackOverflow: http://stackoverflow.com/ .. _Freenode: http://freenode.net/ +.. _suggesting-changes: Where should I suggest new features and language changes? --------------------------------------------------------- @@ -37,12 +38,22 @@ task. If the idea is reasonable, someone will suggest posting it as a feature -request on the `issue tracker`_. +request on the `issue tracker`_, or, for larger changes, writing it up as +a `draft PEP`_. + +Sometimes core developers will differ in opinion, or merely be collectively +unconvinced. When there isn't an obvious victor then the +`Status Quo Wins a Stalemate`_ as outlined in the linked post. + +For some examples on language changes that were accepted please read +`Justifying Python Language Changes`_. .. _python-ideas: http://mail.python.org/mailman/listinfo/python-ideas .. _issue tracker: http://bugs.python.org .. _PEP Index: http://www.python.org/dev/peps - +.. _draft PEP: http://www.python.org/dev/peps/pep-0001/ +.. _Status Quo Wins a Stalemate: http://www.boredomandlaziness.org/2011/02/status-quo-wins-stalemate.html +.. _Justifying Python Language Changes: http://www.boredomandlaziness.org/2011/02/justifying-python-language-changes.html Where should I ask general questions about contributing to CPython? ------------------------------------------------------------------- diff --git a/index.rst b/index.rst --- a/index.rst +++ b/index.rst @@ -120,6 +120,7 @@ * :doc:`stdlibchanges` * :doc:`langchanges` +Also refer to :ref:`suggesting-changes` in the FAQ. Other Interpreter Implementations --------------------------------- @@ -146,12 +147,9 @@ .. _resources: +Key Resources +------------- -Resources ---------- - -* Anyone can clone the sources for this guide. See - :ref:`helping-with-the-developers-guide`. * Coding style guides * :PEP:`7` (Style Guide for C Code) * :PEP:`8` (Style Guide for Python Code) @@ -165,17 +163,23 @@ * `Browse online `_ * `Snapshot of py3k `_ * `Daily OS X installer `_ +* PEPs_ (Python Enhancement Proposals) +* :doc:`faq` +* :doc:`developers` + +Additional Resources +-------------------- + +* Anyone can clone the sources for this guide. See + :ref:`helping-with-the-developers-guide`. +* Help with ... + * :doc:`grammar` + * :doc:`compiler` * Tool support * :doc:`emacs` * :doc:`gdb` * Various tools with configuration files as found in the `Misc directory`_ -* Help with ... - * :doc:`grammar` - * :doc:`compiler` -* :doc:`faq` -* PEPs_ (Python Enhancement Proposals) * `python.org maintenance`_ -* :doc:`developers` * :ref:`Search this guide ` @@ -190,3 +194,4 @@ .. _IronPython: http://ironpython.net/ .. _Stackless: http://www.stackless.com/ .. _Issue tracker: http://bugs.python.org/ + -- Repository URL: http://hg.python.org/devguide From python-checkins at python.org Fri Oct 19 14:06:30 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 14:06:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?devguide=3A_Silence_Sphinx_warning?= Message-ID: <3Xjm7V5n8YzRBk@mail.python.org> http://hg.python.org/devguide/rev/08f963e19a3e changeset: 559:08f963e19a3e user: Nick Coghlan date: Fri Oct 19 22:06:19 2012 +1000 summary: Silence Sphinx warning files: setup.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.rst b/setup.rst --- a/setup.rst +++ b/setup.rst @@ -184,7 +184,7 @@ ''''''' **Python 3.3** and later use Microsoft Visual Studio 2010. You can -download Microsoft Visual C++ 2010 Express `here +download Microsoft Visual C++ 2010 Express `from Microsoft's site `_. Most Python versions prior to 3.3 use Microsoft Visual Studio 2008. You can -- Repository URL: http://hg.python.org/devguide From python-checkins at python.org Fri Oct 19 14:38:29 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 14:38:29 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzYwNzQ6?= =?utf-8?q?_Forward_port_Windows_read-only_source_file_fix_from_2=2E7?= Message-ID: <3XjmrP6NCkzRC7@mail.python.org> http://hg.python.org/cpython/rev/1856d57abfc8 changeset: 79828:1856d57abfc8 branch: 3.2 parent: 79826:7f0d9637a3ad user: Nick Coghlan date: Fri Oct 19 22:38:14 2012 +1000 summary: Issue #6074: Forward port Windows read-only source file fix from 2.7 files: Lib/test/test_import.py | 56 ++++++++++++++++++++++++++-- Misc/NEWS | 3 + Python/import.c | 6 +++ 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -20,12 +20,24 @@ from test import script_helper +def _iter_files(name): + for f in (name + os.extsep + "py", + name + os.extsep + "pyc", + name + os.extsep + "pyo", + name + os.extsep + "pyw", + name + "$py.class"): + yield f + +def chmod_files(name): + for f in _iter_files(name): + try: + os.chmod(f, 0o600) + except OSError as exc: + if exc.errno != errno.ENOENT: + raise + def remove_files(name): - for f in (name + ".py", - name + ".pyc", - name + ".pyo", - name + ".pyw", - name + "$py.class"): + for f in _iter_files(name): unlink(f) rmtree('__pycache__') @@ -122,6 +134,40 @@ remove_files(TESTFN) unload(TESTFN) + def test_rewrite_pyc_with_read_only_source(self): + # Issue 6074: a long time ago on posix, and more recently on Windows, + # a read only source file resulted in a read only pyc file, which + # led to problems with updating it later + sys.path.insert(0, os.curdir) + fname = TESTFN + os.extsep + "py" + try: + # Write a Python file, make it read-only and import it + with open(fname, 'w') as f: + f.write("x = 'original'\n") + # Tweak the mtime of the source to ensure pyc gets updated later + s = os.stat(fname) + os.utime(fname, (s.st_atime, s.st_mtime-100000000)) + os.chmod(fname, 0o400) + m1 = __import__(TESTFN) + self.assertEqual(m1.x, 'original') + # Change the file and then reimport it + os.chmod(fname, 0o600) + with open(fname, 'w') as f: + f.write("x = 'rewritten'\n") + unload(TESTFN) + m2 = __import__(TESTFN) + self.assertEqual(m2.x, 'rewritten') + # Now delete the source file and check the pyc was rewritten + unlink(TESTFN) + unload(TESTFN) + m3 = __import__(TESTFN) + self.assertEqual(m3.x, 'rewritten') + finally: + chmod_files(TESTFN) + remove_files(TESTFN) + unload(TESTFN) + del sys.path[0] + def test_imp_module(self): # Verify that the imp module can correctly load and find .py files # XXX (ncoghlan): It would be nice to use support.CleanImport diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + - Issue #14783: Improve int() docstring and switch docstrings for str(), range(), and slice() to use multi-line signatures. diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -1174,6 +1174,12 @@ time_t mtime = srcstat->st_mtime; #ifdef MS_WINDOWS /* since Windows uses different permissions */ mode_t mode = srcstat->st_mode & ~S_IEXEC; + /* Issue #6074: We ensure user write access, so we can delete it later + * when the source file changes. (On POSIX, this only requires write + * access to the directory, on Windows, we need write access to the file + * as well) + */ + mode |= _S_IWRITE; #else mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH; mode_t dirmode = (srcstat->st_mode | -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 14:58:18 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 14:58:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Dummy_merge_from_3=2E2=2C_as_that_approach_to_resolving_=23607?= =?utf-8?q?4_is_not_applicable_to?= Message-ID: <3XjnHG2tYzzRC9@mail.python.org> http://hg.python.org/cpython/rev/3f6db10b7a69 changeset: 79829:3f6db10b7a69 branch: 3.3 parent: 79825:2e6bcbb0ff59 parent: 79828:1856d57abfc8 user: Nick Coghlan date: Fri Oct 19 22:58:06 2012 +1000 summary: Dummy merge from 3.2, as that approach to resolving #6074 is not applicable to importlib files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:01:54 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:01:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Propagate_dummy_merge_from_3=2E3?= Message-ID: <3XjnMQ6w8bzRC6@mail.python.org> http://hg.python.org/cpython/rev/643002d416e8 changeset: 79830:643002d416e8 parent: 79824:edeeb727df86 parent: 79829:3f6db10b7a69 user: Nick Coghlan date: Fri Oct 19 23:01:45 2012 +1000 summary: Propagate dummy merge from 3.3 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:17:59 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:17:59 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzYwNzQ6?= =?utf-8?q?_Actually_delete_the_source_file_in_the_test_as_intended?= Message-ID: <3Xjnjz645KzRCN@mail.python.org> http://hg.python.org/cpython/rev/df83d3bbd934 changeset: 79831:df83d3bbd934 branch: 2.7 parent: 79827:321414874b26 user: Nick Coghlan date: Fri Oct 19 23:17:48 2012 +1000 summary: Issue #6074: Actually delete the source file in the test as intended files: Lib/test/test_import.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -156,7 +156,7 @@ m2 = __import__(TESTFN) self.assertEqual(m2.x, 'rewritten') # Now delete the source file and check the pyc was rewritten - unlink(TESTFN) + unlink(fname) unload(TESTFN) m3 = __import__(TESTFN) self.assertEqual(m3.x, 'rewritten') -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:36:31 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:36:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzYwNzQ6?= =?utf-8?q?_Apply_an_appropriate_fix_for_importlib_based_imports?= Message-ID: <3Xjp7M40t6zRCm@mail.python.org> http://hg.python.org/cpython/rev/bbb3459fbcb8 changeset: 79832:bbb3459fbcb8 branch: 3.3 parent: 79829:3f6db10b7a69 user: Nick Coghlan date: Fri Oct 19 23:32:00 2012 +1000 summary: Issue #6074: Apply an appropriate fix for importlib based imports files: Lib/importlib/_bootstrap.py | 3 + Lib/test/test_import.py | 156 +- Misc/NEWS | 3 + Python/importlib.h | 3803 +++++++++++----------- 4 files changed, 2015 insertions(+), 1950 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1048,6 +1048,9 @@ mode = _os.stat(source_path).st_mode except OSError: mode = 0o666 + # We always ensure write access so we can update cached files + # later even when the source files are read-only on Windows (#6074) + mode |= 0o200 return self.set_data(bytecode_path, data, _mode=mode) def set_data(self, path, data, *, _mode=0o666): diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -14,6 +14,8 @@ import textwrap import errno import shutil +import contextlib +import time import test.support from test.support import ( @@ -33,6 +35,24 @@ rmtree('__pycache__') + at contextlib.contextmanager +def _ready_to_import(name=None, source=""): + # sets up a temporary directory and removes it + # creates the module file + # temporarily clears the module from sys.modules (if any) + name = name or "spam" + with script_helper.temp_dir() as tempdir: + path = script_helper.make_script(tempdir, name, source) + old_module = sys.modules.pop(name, None) + try: + sys.path.insert(0, tempdir) + yield name, path + sys.path.remove(tempdir) + finally: + if old_module is not None: + sys.modules[name] = old_module + + class ImportTests(unittest.TestCase): def setUp(self): @@ -101,54 +121,6 @@ finally: del sys.path[0] - @unittest.skipUnless(os.name == 'posix', - "test meaningful only on posix systems") - def test_creation_mode(self): - mask = 0o022 - with temp_umask(mask): - sys.path.insert(0, os.curdir) - try: - fname = TESTFN + os.extsep + "py" - create_empty_file(fname) - fn = imp.cache_from_source(fname) - unlink(fn) - importlib.invalidate_caches() - __import__(TESTFN) - if not os.path.exists(fn): - self.fail("__import__ did not result in creation of " - "either a .pyc or .pyo file") - s = os.stat(fn) - # Check that the umask is respected, and the executable bits - # aren't set. - self.assertEqual(oct(stat.S_IMODE(s.st_mode)), oct(0o666 & ~mask)) - finally: - del sys.path[0] - remove_files(TESTFN) - unload(TESTFN) - - @unittest.skipUnless(os.name == 'posix', - "test meaningful only on posix systems") - def test_cached_mode_issue_2051(self): - mode = 0o600 - source = TESTFN + ".py" - with script_helper.temp_dir() as tempdir: - path = script_helper.make_script(tempdir, TESTFN, - "key='top secret'") - os.chmod(path, mode) - compiled = imp.cache_from_source(path) - sys.path.insert(0, tempdir) - try: - __import__(TESTFN) - finally: - sys.path.remove(tempdir) - - if not os.path.exists(compiled): - self.fail("__import__ did not result in creation of " - "either a .pyc or .pyo file") - stat_info = os.stat(compiled) - - self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(mode)) - def test_bug7732(self): source = TESTFN + '.py' os.mkdir(source) @@ -345,6 +317,92 @@ self.fail("fromlist must allow bogus names") +class FilePermissionTests(unittest.TestCase): + # tests for file mode on cached .pyc/.pyo files + + @unittest.skipUnless(os.name == 'posix', + "test meaningful only on posix systems") + def test_creation_mode(self): + mask = 0o022 + with temp_umask(mask), _ready_to_import() as (name, path): + cached_path = imp.cache_from_source(path) + module = __import__(name) + if not os.path.exists(cached_path): + self.fail("__import__ did not result in creation of " + "either a .pyc or .pyo file") + stat_info = os.stat(cached_path) + + # Check that the umask is respected, and the executable bits + # aren't set. + self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), + oct(0o666 & ~mask)) + + @unittest.skipUnless(os.name == 'posix', + "test meaningful only on posix systems") + def test_cached_mode_issue_2051(self): + # permissions of .pyc should match those of .py, regardless of mask + mode = 0o600 + with temp_umask(0o022), _ready_to_import() as (name, path): + cached_path = imp.cache_from_source(path) + os.chmod(path, mode) + __import__(name) + if not os.path.exists(cached_path): + self.fail("__import__ did not result in creation of " + "either a .pyc or .pyo file") + stat_info = os.stat(cached_path) + + self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(mode)) + + @unittest.skipUnless(os.name == 'posix', + "test meaningful only on posix systems") + def test_cached_readonly(self): + mode = 0o400 + with temp_umask(0o022), _ready_to_import() as (name, path): + cached_path = imp.cache_from_source(path) + os.chmod(path, mode) + __import__(name) + if not os.path.exists(cached_path): + self.fail("__import__ did not result in creation of " + "either a .pyc or .pyo file") + stat_info = os.stat(cached_path) + + expected = mode | 0o200 # Account for fix for issue #6074 + self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(expected)) + + def test_pyc_always_writable(self): + # Initially read-only .pyc files on Windows used to cause problems + # with later updates, see issue #6074 for details + with _ready_to_import() as (name, path): + # Write a Python file, make it read-only and import it + with open(path, 'w') as f: + f.write("x = 'original'\n") + # Tweak the mtime of the source to ensure pyc gets updated later + s = os.stat(path) + os.utime(path, (s.st_atime, s.st_mtime-100000000)) + os.chmod(path, 0o400) + m = __import__(name) + self.assertEqual(m.x, 'original') + # Change the file and then reimport it + os.chmod(path, 0o600) + with open(path, 'w') as f: + f.write("x = 'rewritten'\n") + unload(name) + importlib.invalidate_caches() + m = __import__(name) + self.assertEqual(m.x, 'rewritten') + # Now delete the source file and check the pyc was rewritten + unlink(path) + unload(name) + importlib.invalidate_caches() + if __debug__: + bytecode_only = path + "c" + else: + bytecode_only = path + "o" + os.rename(imp.cache_from_source(path), bytecode_only) + m = __import__(name) + self.assertEqual(m.x, 'rewritten') + + class PycRewritingTests(unittest.TestCase): # Test that the `co_filename` attribute on code objects always points # to the right file, even when various things happen (e.g. both the .py @@ -945,7 +1003,7 @@ def test_main(verbose=None): - run_unittest(ImportTests, PycacheTests, + run_unittest(ImportTests, PycacheTests, FilePermissionTests, PycRewritingTests, PathsTests, RelativeImportTests, OverridingImportBuiltinTests, ImportlibBootstrapTests, diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + - Issue #14783: Improve int() docstring and switch docstrings for str(), range(), and slice() to use multi-line signatures. diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:36:33 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:36:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_fix_from_=236074_from_3=2E3?= Message-ID: <3Xjp7P0gXyzRDH@mail.python.org> http://hg.python.org/cpython/rev/bedcc790c6e7 changeset: 79833:bedcc790c6e7 parent: 79830:643002d416e8 parent: 79832:bbb3459fbcb8 user: Nick Coghlan date: Fri Oct 19 23:36:15 2012 +1000 summary: Merge fix from #6074 from 3.3 files: Lib/importlib/_bootstrap.py | 3 + Lib/test/test_import.py | 156 +- Misc/NEWS | 3 + Python/importlib.h | 3813 +++++++++++----------- 4 files changed, 2020 insertions(+), 1955 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1048,6 +1048,9 @@ mode = _os.stat(source_path).st_mode except OSError: mode = 0o666 + # We always ensure write access so we can update cached files + # later even when the source files are read-only on Windows (#6074) + mode |= 0o200 return self.set_data(bytecode_path, data, _mode=mode) def set_data(self, path, data, *, _mode=0o666): diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -14,6 +14,8 @@ import textwrap import errno import shutil +import contextlib +import time import test.support from test.support import ( @@ -33,6 +35,24 @@ rmtree('__pycache__') + at contextlib.contextmanager +def _ready_to_import(name=None, source=""): + # sets up a temporary directory and removes it + # creates the module file + # temporarily clears the module from sys.modules (if any) + name = name or "spam" + with script_helper.temp_dir() as tempdir: + path = script_helper.make_script(tempdir, name, source) + old_module = sys.modules.pop(name, None) + try: + sys.path.insert(0, tempdir) + yield name, path + sys.path.remove(tempdir) + finally: + if old_module is not None: + sys.modules[name] = old_module + + class ImportTests(unittest.TestCase): def setUp(self): @@ -101,54 +121,6 @@ finally: del sys.path[0] - @unittest.skipUnless(os.name == 'posix', - "test meaningful only on posix systems") - def test_creation_mode(self): - mask = 0o022 - with temp_umask(mask): - sys.path.insert(0, os.curdir) - try: - fname = TESTFN + os.extsep + "py" - create_empty_file(fname) - fn = imp.cache_from_source(fname) - unlink(fn) - importlib.invalidate_caches() - __import__(TESTFN) - if not os.path.exists(fn): - self.fail("__import__ did not result in creation of " - "either a .pyc or .pyo file") - s = os.stat(fn) - # Check that the umask is respected, and the executable bits - # aren't set. - self.assertEqual(oct(stat.S_IMODE(s.st_mode)), oct(0o666 & ~mask)) - finally: - del sys.path[0] - remove_files(TESTFN) - unload(TESTFN) - - @unittest.skipUnless(os.name == 'posix', - "test meaningful only on posix systems") - def test_cached_mode_issue_2051(self): - mode = 0o600 - source = TESTFN + ".py" - with script_helper.temp_dir() as tempdir: - path = script_helper.make_script(tempdir, TESTFN, - "key='top secret'") - os.chmod(path, mode) - compiled = imp.cache_from_source(path) - sys.path.insert(0, tempdir) - try: - __import__(TESTFN) - finally: - sys.path.remove(tempdir) - - if not os.path.exists(compiled): - self.fail("__import__ did not result in creation of " - "either a .pyc or .pyo file") - stat_info = os.stat(compiled) - - self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(mode)) - def test_bug7732(self): source = TESTFN + '.py' os.mkdir(source) @@ -345,6 +317,92 @@ self.fail("fromlist must allow bogus names") +class FilePermissionTests(unittest.TestCase): + # tests for file mode on cached .pyc/.pyo files + + @unittest.skipUnless(os.name == 'posix', + "test meaningful only on posix systems") + def test_creation_mode(self): + mask = 0o022 + with temp_umask(mask), _ready_to_import() as (name, path): + cached_path = imp.cache_from_source(path) + module = __import__(name) + if not os.path.exists(cached_path): + self.fail("__import__ did not result in creation of " + "either a .pyc or .pyo file") + stat_info = os.stat(cached_path) + + # Check that the umask is respected, and the executable bits + # aren't set. + self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), + oct(0o666 & ~mask)) + + @unittest.skipUnless(os.name == 'posix', + "test meaningful only on posix systems") + def test_cached_mode_issue_2051(self): + # permissions of .pyc should match those of .py, regardless of mask + mode = 0o600 + with temp_umask(0o022), _ready_to_import() as (name, path): + cached_path = imp.cache_from_source(path) + os.chmod(path, mode) + __import__(name) + if not os.path.exists(cached_path): + self.fail("__import__ did not result in creation of " + "either a .pyc or .pyo file") + stat_info = os.stat(cached_path) + + self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(mode)) + + @unittest.skipUnless(os.name == 'posix', + "test meaningful only on posix systems") + def test_cached_readonly(self): + mode = 0o400 + with temp_umask(0o022), _ready_to_import() as (name, path): + cached_path = imp.cache_from_source(path) + os.chmod(path, mode) + __import__(name) + if not os.path.exists(cached_path): + self.fail("__import__ did not result in creation of " + "either a .pyc or .pyo file") + stat_info = os.stat(cached_path) + + expected = mode | 0o200 # Account for fix for issue #6074 + self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(expected)) + + def test_pyc_always_writable(self): + # Initially read-only .pyc files on Windows used to cause problems + # with later updates, see issue #6074 for details + with _ready_to_import() as (name, path): + # Write a Python file, make it read-only and import it + with open(path, 'w') as f: + f.write("x = 'original'\n") + # Tweak the mtime of the source to ensure pyc gets updated later + s = os.stat(path) + os.utime(path, (s.st_atime, s.st_mtime-100000000)) + os.chmod(path, 0o400) + m = __import__(name) + self.assertEqual(m.x, 'original') + # Change the file and then reimport it + os.chmod(path, 0o600) + with open(path, 'w') as f: + f.write("x = 'rewritten'\n") + unload(name) + importlib.invalidate_caches() + m = __import__(name) + self.assertEqual(m.x, 'rewritten') + # Now delete the source file and check the pyc was rewritten + unlink(path) + unload(name) + importlib.invalidate_caches() + if __debug__: + bytecode_only = path + "c" + else: + bytecode_only = path + "o" + os.rename(imp.cache_from_source(path), bytecode_only) + m = __import__(name) + self.assertEqual(m.x, 'rewritten') + + class PycRewritingTests(unittest.TestCase): # Test that the `co_filename` attribute on code objects always points # to the right file, even when various things happen (e.g. both the .py @@ -945,7 +1003,7 @@ def test_main(verbose=None): - run_unittest(ImportTests, PycacheTests, + run_unittest(ImportTests, PycacheTests, FilePermissionTests, PycRewritingTests, PathsTests, RelativeImportTests, OverridingImportBuiltinTests, ImportlibBootstrapTests, diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + - Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified endianess detection and handling. diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:37:36 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:37:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Remove_unused_?= =?utf-8?q?import?= Message-ID: <3Xjp8c5Yf3zRDM@mail.python.org> http://hg.python.org/cpython/rev/6da7a5c3080b changeset: 79834:6da7a5c3080b branch: 3.3 parent: 79832:bbb3459fbcb8 user: Nick Coghlan date: Fri Oct 19 23:37:16 2012 +1000 summary: Remove unused import files: Lib/test/test_import.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -15,7 +15,6 @@ import errno import shutil import contextlib -import time import test.support from test.support import ( -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:37:38 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:37:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3?= Message-ID: <3Xjp8f13ChzRDZ@mail.python.org> http://hg.python.org/cpython/rev/110878cd1c78 changeset: 79835:110878cd1c78 parent: 79833:bedcc790c6e7 parent: 79834:6da7a5c3080b user: Nick Coghlan date: Fri Oct 19 23:37:28 2012 +1000 summary: Merge from 3.3 files: Lib/test/test_import.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -15,7 +15,6 @@ import errno import shutil import contextlib -import time import test.support from test.support import ( -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:41:10 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:41:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzYwNzQ6?= =?utf-8?q?_Actually_delete_the_source_file_in_the_test_as_intended?= Message-ID: <3XjpDk1V6KzRBr@mail.python.org> http://hg.python.org/cpython/rev/8cf7f6fe4282 changeset: 79836:8cf7f6fe4282 branch: 3.2 parent: 79828:1856d57abfc8 user: Nick Coghlan date: Fri Oct 19 23:38:36 2012 +1000 summary: Issue #6074: Actually delete the source file in the test as intended files: Lib/test/test_import.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -158,7 +158,7 @@ m2 = __import__(TESTFN) self.assertEqual(m2.x, 'rewritten') # Now delete the source file and check the pyc was rewritten - unlink(TESTFN) + unlink(fname) unload(TESTFN) m3 = __import__(TESTFN) self.assertEqual(m3.x, 'rewritten') -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:41:11 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:41:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Dummy_merge_from_3=2E2?= Message-ID: <3XjpDl3dhmzRDH@mail.python.org> http://hg.python.org/cpython/rev/9a38456fd43f changeset: 79837:9a38456fd43f branch: 3.3 parent: 79834:6da7a5c3080b parent: 79836:8cf7f6fe4282 user: Nick Coghlan date: Fri Oct 19 23:40:21 2012 +1000 summary: Dummy merge from 3.2 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 15:41:12 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:41:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Propagate_dummy_merge_from_3=2E3?= Message-ID: <3XjpDm5sLFzRDN@mail.python.org> http://hg.python.org/cpython/rev/4d1462e62556 changeset: 79838:4d1462e62556 parent: 79835:110878cd1c78 parent: 79837:9a38456fd43f user: Nick Coghlan date: Fri Oct 19 23:40:58 2012 +1000 summary: Propagate dummy merge from 3.3 files: -- Repository URL: http://hg.python.org/cpython From ncoghlan at gmail.com Fri Oct 19 15:57:50 2012 From: ncoghlan at gmail.com (Nick Coghlan) Date: Fri, 19 Oct 2012 23:57:50 +1000 Subject: [Python-checkins] [Python-Dev] cpython (2.7): Issue #6074: Restore the long-broken support for running with read-only source In-Reply-To: <50815743.4010608@gmail.com> References: <3XjlyF3G9LzMdF@mail.python.org> <50815743.4010608@gmail.com> Message-ID: On Fri, Oct 19, 2012 at 11:36 PM, Serhiy Storchaka wrote: > Why not just > > return (name + os.extsep + "py", > > name + os.extsep + "pyc", > name + os.extsep + "pyo", > name + os.extsep + "pyw", > name + "$py.class") No good reason - I copied the shape of the existing code without really thinking about it. Cheers, Nick. -- Nick Coghlan | ncoghlan at gmail.com | Brisbane, Australia From python-checkins at python.org Fri Oct 19 15:59:44 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 15:59:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_No_reason_to_u?= =?utf-8?q?se_a_generator_here?= Message-ID: <3Xjpf867pSzRF6@mail.python.org> http://hg.python.org/cpython/rev/422a0175bbf5 changeset: 79839:422a0175bbf5 branch: 2.7 parent: 79831:df83d3bbd934 user: Nick Coghlan date: Fri Oct 19 23:59:35 2012 +1000 summary: No reason to use a generator here files: Lib/test/test_import.py | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -15,16 +15,15 @@ from test import symlink_support from test import script_helper -def _iter_files(name): - for f in (name + os.extsep + "py", - name + os.extsep + "pyc", - name + os.extsep + "pyo", - name + os.extsep + "pyw", - name + "$py.class"): - yield f +def _files(name): + return (name + os.extsep + "py", + name + os.extsep + "pyc", + name + os.extsep + "pyo", + name + os.extsep + "pyw", + name + "$py.class") def chmod_files(name): - for f in _iter_files(name): + for f in _files(name): try: os.chmod(f, 0600) except OSError as exc: @@ -32,7 +31,7 @@ raise def remove_files(name): - for f in _iter_files(name): + for f in _files(name): unlink(f) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 16:04:46 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 16:04:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_broken_tes?= =?utf-8?q?t_and_replace_redundant_generator_with_a_tuple?= Message-ID: <3Xjply6BbyzRFT@mail.python.org> http://hg.python.org/cpython/rev/d459a9576d6c changeset: 79840:d459a9576d6c branch: 3.2 parent: 79836:8cf7f6fe4282 user: Nick Coghlan date: Sat Oct 20 00:03:46 2012 +1000 summary: Fix broken test and replace redundant generator with a tuple files: Lib/test/test_import.py | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -20,16 +20,15 @@ from test import script_helper -def _iter_files(name): - for f in (name + os.extsep + "py", - name + os.extsep + "pyc", - name + os.extsep + "pyo", - name + os.extsep + "pyw", - name + "$py.class"): - yield f +def _files(name): + return (name + os.extsep + "py", + name + os.extsep + "pyc", + name + os.extsep + "pyo", + name + os.extsep + "pyw", + name + "$py.class") def chmod_files(name): - for f in _iter_files(name): + for f in _files(name): try: os.chmod(f, 0o600) except OSError as exc: @@ -37,7 +36,7 @@ raise def remove_files(name): - for f in _iter_files(name): + for f in _files(name): unlink(f) rmtree('__pycache__') @@ -160,6 +159,11 @@ # Now delete the source file and check the pyc was rewritten unlink(fname) unload(TESTFN) + if __debug__: + bytecode_name = fname + "c" + else: + bytecode_name = fname + "o" + os.rename(imp.cache_from_source(fname), bytecode_name) m3 = __import__(TESTFN) self.assertEqual(m3.x, 'rewritten') finally: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 16:04:48 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 16:04:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Dummy_merge_from_3=2E2?= Message-ID: <3Xjpm01DcbzRFQ@mail.python.org> http://hg.python.org/cpython/rev/17e0b1fcfec0 changeset: 79841:17e0b1fcfec0 branch: 3.3 parent: 79837:9a38456fd43f parent: 79840:d459a9576d6c user: Nick Coghlan date: Sat Oct 20 00:04:16 2012 +1000 summary: Dummy merge from 3.2 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 16:04:49 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 16:04:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Propagate_dummy_merge_from_3=2E3?= Message-ID: <3Xjpm13bm3zRFg@mail.python.org> http://hg.python.org/cpython/rev/390eb7835946 changeset: 79842:390eb7835946 parent: 79838:4d1462e62556 parent: 79841:17e0b1fcfec0 user: Nick Coghlan date: Sat Oct 20 00:04:36 2012 +1000 summary: Propagate dummy merge from 3.3 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 16:28:24 2012 From: python-checkins at python.org (nick.coghlan) Date: Fri, 19 Oct 2012 16:28:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Defer_both_PEPs_about_speedin?= =?utf-8?q?g_up_the_release_cycle?= Message-ID: <3XjqHD2tNyzMXy@mail.python.org> http://hg.python.org/peps/rev/d468852fb850 changeset: 4559:d468852fb850 user: Nick Coghlan date: Sat Oct 20 00:28:15 2012 +1000 summary: Defer both PEPs about speeding up the release cycle files: pep-0407.txt | 2 +- pep-0413.txt | 2 +- pep0/output.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pep-0407.txt b/pep-0407.txt --- a/pep-0407.txt +++ b/pep-0407.txt @@ -5,7 +5,7 @@ Author: Antoine Pitrou , Georg Brandl , Barry Warsaw -Status: Draft +Status: Deferred Type: Process Content-Type: text/x-rst Created: 2012-01-12 diff --git a/pep-0413.txt b/pep-0413.txt --- a/pep-0413.txt +++ b/pep-0413.txt @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Nick Coghlan -Status: Draft +Status: Deferred Type: Process Content-Type: text/x-rst Created: 2012-02-24 diff --git a/pep0/output.py b/pep0/output.py --- a/pep0/output.py +++ b/pep0/output.py @@ -38,6 +38,8 @@ # over Type value, and vice-versa. if pep.status == 'Draft': open_.append(pep) + elif pep.status == 'Deferred': + deferred.append(pep) elif pep.type_ == 'Process': if pep.status == "Active": meta.append(pep) @@ -45,8 +47,6 @@ dead.append(pep) else: historical.append(pep) - elif pep.status == 'Deferred': - deferred.append(pep) elif pep.status in ('Rejected', 'Withdrawn', 'Incomplete', 'Superseded'): dead.append(pep) -- Repository URL: http://hg.python.org/peps From trent at snakebite.org Fri Oct 19 16:55:47 2012 From: trent at snakebite.org (Trent Nelson) Date: Fri, 19 Oct 2012 07:55:47 -0700 Subject: [Python-checkins] cpython (3.2): Fix broken test and replace redundant generator with a tuple In-Reply-To: <3Xjply6BbyzRFT@mail.python.org> References: <3Xjply6BbyzRFT@mail.python.org> Message-ID: <5E3A89398864414E8EE2CB192E0C965C0E5B523579@EXMBX10.exchhosting.com> I think this broke all the buildbots :-) ====================================================================== ERROR: test_rewrite_pyc_with_read_only_source (test.test_import.ImportTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/home/buildbot/python-clang/3.2.koobs-freebsd-clang/build/Lib/test/test_import.py", line 163, in test_rewrite_pyc_with_read_only_source m3 = __import__(TESTFN) ImportError: No module named @test_66613_tmp ---------------------------------------------------------------------- > -----Original Message----- > From: Python-checkins [mailto:python-checkins- > bounces+trent=snakebite.org at python.org] On Behalf Of nick.coghlan > Sent: Friday, October 19, 2012 10:05 AM > To: python-checkins at python.org > Subject: [Python-checkins] cpython (3.2): Fix broken test and replace redundant > generator with a tuple > > http://hg.python.org/cpython/rev/d459a9576d6c > changeset: 79840:d459a9576d6c > branch: 3.2 > parent: 79836:8cf7f6fe4282 > user: Nick Coghlan > date: Sat Oct 20 00:03:46 2012 +1000 > summary: > Fix broken test and replace redundant generator with a tuple > > files: > Lib/test/test_import.py | 22 +++++++++++++--------- > 1 files changed, 13 insertions(+), 9 deletions(-) > > > diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py > --- a/Lib/test/test_import.py > +++ b/Lib/test/test_import.py > @@ -20,16 +20,15 @@ > from test import script_helper > > > -def _iter_files(name): > - for f in (name + os.extsep + "py", > - name + os.extsep + "pyc", > - name + os.extsep + "pyo", > - name + os.extsep + "pyw", > - name + "$py.class"): > - yield f > +def _files(name): > + return (name + os.extsep + "py", > + name + os.extsep + "pyc", > + name + os.extsep + "pyo", > + name + os.extsep + "pyw", > + name + "$py.class") > > def chmod_files(name): > - for f in _iter_files(name): > + for f in _files(name): > try: > os.chmod(f, 0o600) > except OSError as exc: > @@ -37,7 +36,7 @@ > raise > > def remove_files(name): > - for f in _iter_files(name): > + for f in _files(name): > unlink(f) > rmtree('__pycache__') > > @@ -160,6 +159,11 @@ > # Now delete the source file and check the pyc was rewritten > unlink(fname) > unload(TESTFN) > + if __debug__: > + bytecode_name = fname + "c" > + else: > + bytecode_name = fname + "o" > + os.rename(imp.cache_from_source(fname), bytecode_name) > m3 = __import__(TESTFN) > self.assertEqual(m3.x, 'rewritten') > finally: > > -- > Repository URL: http://hg.python.org/cpython From storchaka at gmail.com Fri Oct 19 15:36:03 2012 From: storchaka at gmail.com (Serhiy Storchaka) Date: Fri, 19 Oct 2012 16:36:03 +0300 Subject: [Python-checkins] cpython (2.7): Issue #6074: Restore the long-broken support for running with read-only source In-Reply-To: <3XjlyF3G9LzMdF@mail.python.org> References: <3XjlyF3G9LzMdF@mail.python.org> Message-ID: <50815743.4010608@gmail.com> On 19.10.12 14:58, nick.coghlan wrote: > http://hg.python.org/cpython/rev/321414874b26 > changeset: 79827:321414874b26 > branch: 2.7 > parent: 79814:2f0770cc6d3f > user: Nick Coghlan > date: Fri Oct 19 21:58:18 2012 +1000 > summary: > Issue #6074: Restore the long-broken support for running with read-only source files on Windows > +def _iter_files(name): > for f in (name + os.extsep + "py", > name + os.extsep + "pyc", > name + os.extsep + "pyo", > name + os.extsep + "pyw", > name + "$py.class"): > + yield f Why not just return (name + os.extsep + "py", name + os.extsep + "pyc", name + os.extsep + "pyo", name + os.extsep + "pyw", name + "$py.class") ? From python-checkins at python.org Fri Oct 19 19:41:13 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 19 Oct 2012 19:41:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Remove_wrong_e?= =?utf-8?q?scape_in_code_snippet=2E?= Message-ID: <3XjvYj3D39zMG3@mail.python.org> http://hg.python.org/cpython/rev/25722e983ada changeset: 79843:25722e983ada branch: 3.3 parent: 79841:17e0b1fcfec0 user: Ezio Melotti date: Fri Oct 19 20:40:18 2012 +0300 summary: Remove wrong escape in code snippet. files: Doc/using/windows.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -456,7 +456,7 @@ In addition to environment variables, the same settings can be configured in the .INI file used by the launcher. The section in the INI file is called ``[defaults]`` and the key name will be the same as the -environment variables without the leading ``PY\_`` prefix (and note that +environment variables without the leading ``PY_`` prefix (and note that the key names in the INI file are case insensitive.) The contents of an environment variable will override things specified in the INI file. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 19:41:14 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 19 Oct 2012 19:41:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_wrong_escape_removal_with_3=2E3=2E?= Message-ID: <3XjvYk5NbgzPDD@mail.python.org> http://hg.python.org/cpython/rev/2d53f92ed54c changeset: 79844:2d53f92ed54c parent: 79842:390eb7835946 parent: 79843:25722e983ada user: Ezio Melotti date: Fri Oct 19 20:40:57 2012 +0300 summary: Merge wrong escape removal with 3.3. files: Doc/using/windows.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -456,7 +456,7 @@ In addition to environment variables, the same settings can be configured in the .INI file used by the launcher. The section in the INI file is called ``[defaults]`` and the key name will be the same as the -environment variables without the leading ``PY\_`` prefix (and note that +environment variables without the leading ``PY_`` prefix (and note that the key names in the INI file are case insensitive.) The contents of an environment variable will override things specified in the INI file. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 19 19:49:42 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 19 Oct 2012 19:49:42 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Remove_wrong_escape_in_code_s?= =?utf-8?q?nippet=2E?= Message-ID: <3XjvlV1vrMzPDD@mail.python.org> http://hg.python.org/peps/rev/1c85c1b55616 changeset: 4560:1c85c1b55616 user: Ezio Melotti date: Fri Oct 19 20:49:15 2012 +0300 summary: Remove wrong escape in code snippet. files: pep-0397.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0397.txt b/pep-0397.txt --- a/pep-0397.txt +++ b/pep-0397.txt @@ -295,7 +295,7 @@ In addition to environment variables, the same settings can be configured in the .INI file used by the launcher. The section in the INI file is called ``[defaults]`` and the key name will be the same as the - environment variables without the leading ``PY\_`` prefix (and note that + environment variables without the leading ``PY_`` prefix (and note that the key names in the INI file are case insensitive.) The contents of an environment variable will override things specified in the INI file. -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Fri Oct 19 21:00:38 2012 From: python-checkins at python.org (brett.cannon) Date: Fri, 19 Oct 2012 21:00:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Minor_grammar_tweak=2E?= Message-ID: <3XjxKL3gxRzR9C@mail.python.org> http://hg.python.org/peps/rev/b1c76265710f changeset: 4561:b1c76265710f user: Brett Cannon date: Fri Oct 19 15:00:32 2012 -0400 summary: Minor grammar tweak. files: pep-0405.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pep-0405.txt b/pep-0405.txt --- a/pep-0405.txt +++ b/pep-0405.txt @@ -57,9 +57,9 @@ administrator privileges). A virtual environment mechanism integrated with Python and drawing on -years of experience with existing third-party tools can be lower -maintenance, more reliable, and more easily available to all Python -users. +years of experience with existing third-party tools can lower +maintenance, raise reliability, and be more easily available to all +Python users. .. _virtualenv: http://www.virtualenv.org -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 20 01:45:55 2012 From: python-checkins at python.org (daniel.holth) Date: Sat, 20 Oct 2012 01:45:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Metadata_1=2E3_tweaks?= Message-ID: <3Xk3fW0nFDzRNb@mail.python.org> http://hg.python.org/peps/rev/75474fb879d3 changeset: 4562:75474fb879d3 user: Daniel Holth date: Fri Oct 19 19:44:20 2012 -0400 summary: Metadata 1.3 tweaks files: pep-0426.txt | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -155,11 +155,11 @@ field as-is. This means that authors should be conservative in the markup they use. -To support empty lines and lines with indentation with respect to -the RFC 822 format, any CRLF character has to be suffixed by 7 spaces -followed by a pipe ("|") char. As a result, the Description field is -encoded into a folded field that can be interpreted by RFC822 -parser [2]_. +To support empty lines and lines with indentation and maintain +compatibility with ``email.parser.Parser()``, any CRLF character has to +be suffixed by 7 spaces followed by a pipe ("|") char. As a result, the +Description field is encoded into a folded field that can be interpreted +by RFC822 parser [2]_. Example:: @@ -221,9 +221,9 @@ Author-email (optional) ::::::::::::::::::::::: -A string containing the author's e-mail address. It can contain -a name and e-mail address in the legal forms for a RFC-822 -``From:`` header. +A string containing the author's e-mail address. It contains a name +and e-mail address in the RFC 5322 recommended ``Address Specification`` +format. Example:: @@ -249,9 +249,8 @@ Maintainer-email (optional) ::::::::::::::::::::::::::: -A string containing the maintainer's e-mail address. It can contain -a name and e-mail address in the legal forms for a RFC-822 -``From:`` header. +A string containing the maintainer's e-mail address. It has the same +format as ``Author-email``. Note that this field is intended for use when a project is being maintained by someone other than the original author: it should be @@ -268,7 +267,7 @@ Text indicating the license covering the distribution where the license is not a selection from the "License" Trove classifiers. See "Classifier" below. This field may also be used to specify a -particular version of a licencse which is named via the ``Classifier`` +particular version of a license which is named via the ``Classifier`` field, or to indicate a variation or exception to such a license. Examples:: @@ -426,7 +425,7 @@ Requires-External: libpng (>=1.5) -Project-URL (multiple-use) +Project-URL (multiple use) :::::::::::::::::::::::::: A string containing a browsable URL for the project and a label for it, @@ -480,12 +479,12 @@ not been declared with `Provides-Extra`. -Extension (multiple-use) +Extension (multiple use) :::::::::::::::::::::::: An ASCII string, not containing whitespace or the / character, that indicates the presence of extended metadata. Additional tags defined by -an `Extension: Chili` should be of the form `Chili/Name`:: +an `Extension: Chili` must be of the form `Chili/Name`:: Extension: Chili Chili/Type: Poblano -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 20 03:45:33 2012 From: python-checkins at python.org (nick.coghlan) Date: Sat, 20 Oct 2012 03:45:33 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_compilatio?= =?utf-8?q?n_on_Windows?= Message-ID: <3Xk6JY4YQmzRGs@mail.python.org> http://hg.python.org/cpython/rev/e829d644d366 changeset: 79845:e829d644d366 branch: 3.2 parent: 79840:d459a9576d6c user: Nick Coghlan date: Sat Oct 20 11:43:58 2012 +1000 summary: Fix compilation on Windows files: Python/import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -1172,6 +1172,7 @@ FILE *fp; char *dirpath; time_t mtime = srcstat->st_mtime; + int saved; #ifdef MS_WINDOWS /* since Windows uses different permissions */ mode_t mode = srcstat->st_mode & ~S_IEXEC; /* Issue #6074: We ensure user write access, so we can delete it later @@ -1186,7 +1187,6 @@ S_IXUSR | S_IXGRP | S_IXOTH | S_IWUSR | S_IWGRP | S_IWOTH); #endif - int saved; /* Ensure that the __pycache__ directory exists. */ dirpath = rightmost_sep(cpathname); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 03:45:34 2012 From: python-checkins at python.org (nick.coghlan) Date: Sat, 20 Oct 2012 03:45:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Dummy_merge_from_3=2E2?= Message-ID: <3Xk6JZ6zgLzRM0@mail.python.org> http://hg.python.org/cpython/rev/ee0c0f1c1eb2 changeset: 79846:ee0c0f1c1eb2 branch: 3.3 parent: 79843:25722e983ada parent: 79845:e829d644d366 user: Nick Coghlan date: Sat Oct 20 11:45:02 2012 +1000 summary: Dummy merge from 3.2 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 03:45:36 2012 From: python-checkins at python.org (nick.coghlan) Date: Sat, 20 Oct 2012 03:45:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Propagate_dummy_merge_from_3=2E3?= Message-ID: <3Xk6Jc20PbzRM6@mail.python.org> http://hg.python.org/cpython/rev/6ff9eef4e7c3 changeset: 79847:6ff9eef4e7c3 parent: 79844:2d53f92ed54c parent: 79846:ee0c0f1c1eb2 user: Nick Coghlan date: Sat Oct 20 11:45:23 2012 +1000 summary: Propagate dummy merge from 3.3 files: -- Repository URL: http://hg.python.org/cpython From ncoghlan at gmail.com Sat Oct 20 04:11:01 2012 From: ncoghlan at gmail.com (Nick Coghlan) Date: Sat, 20 Oct 2012 12:11:01 +1000 Subject: [Python-checkins] cpython (3.2): Fix broken test and replace redundant generator with a tuple In-Reply-To: <5E3A89398864414E8EE2CB192E0C965C0E5B523579@EXMBX10.exchhosting.com> References: <3Xjply6BbyzRFT@mail.python.org> <5E3A89398864414E8EE2CB192E0C965C0E5B523579@EXMBX10.exchhosting.com> Message-ID: On Sat, Oct 20, 2012 at 12:55 AM, Trent Nelson wrote: > I think this broke all the buildbots :-) > > ====================================================================== > ERROR: test_rewrite_pyc_with_read_only_source (test.test_import.ImportTests) > ---------------------------------------------------------------------- > Traceback (most recent call last): > File "/usr/home/buildbot/python-clang/3.2.koobs-freebsd-clang/build/Lib/test/test_import.py", line 163, in test_rewrite_pyc_with_read_only_source > m3 = __import__(TESTFN) > ImportError: No module named @test_66613_tmp Those failures were due to the previous commit (the one this commit fixed) - I had failed to account for __pycache__ when forward porting the test from 2.7 to 3.2. This bug was a bit of a pain, because it turned out that 2.7, 3.2 and 3.3+ all needed different code to fix and test it, even though it was only a 1-line fix to ensure the user had write permissions on the cached bytecode files they created :) Cheers, Nick. -- Nick Coghlan | ncoghlan at gmail.com | Brisbane, Australia From solipsis at pitrou.net Sat Oct 20 05:57:39 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sat, 20 Oct 2012 05:57:39 +0200 Subject: [Python-checkins] Daily reference leaks (2d53f92ed54c): sum=0 Message-ID: results for 2d53f92ed54c on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogo6Rgc9', '-x'] From python-checkins at python.org Sat Oct 20 12:13:51 2012 From: python-checkins at python.org (nick.coghlan) Date: Sat, 20 Oct 2012 12:13:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typo_in_ex?= =?utf-8?q?ample_=28pointed_out_by_a_couple_of_people=2C_most_recently_Ken?= =?utf-8?q?_Rimey=29?= Message-ID: <3XkKb34cgXzR86@mail.python.org> http://hg.python.org/cpython/rev/4adc11300c05 changeset: 79848:4adc11300c05 branch: 3.3 parent: 79846:ee0c0f1c1eb2 user: Nick Coghlan date: Sat Oct 20 20:13:21 2012 +1000 summary: Fix typo in example (pointed out by a couple of people, most recently Ken Rimey) files: Doc/library/concurrent.futures.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -146,7 +146,7 @@ # Start the load operations and mark each future with its URL future_to_url = {executor.submit(load_url, url, 60):url for url in URLS} for future in concurrent.futures.as_completed(future_to_url): - url = future_to_url[url] + url = future_to_url[future] try: data = future.result() except Exception as exc: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 12:13:52 2012 From: python-checkins at python.org (nick.coghlan) Date: Sat, 20 Oct 2012 12:13:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3?= Message-ID: <3XkKb46kHLzR86@mail.python.org> http://hg.python.org/cpython/rev/bfe042a363e6 changeset: 79849:bfe042a363e6 parent: 79847:6ff9eef4e7c3 parent: 79848:4adc11300c05 user: Nick Coghlan date: Sat Oct 20 20:13:42 2012 +1000 summary: Merge from 3.3 files: Doc/library/concurrent.futures.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -146,7 +146,7 @@ # Start the load operations and mark each future with its URL future_to_url = {executor.submit(load_url, url, 60):url for url in URLS} for future in concurrent.futures.as_completed(future_to_url): - url = future_to_url[url] + url = future_to_url[future] try: data = future.result() except Exception as exc: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 14:17:11 2012 From: python-checkins at python.org (mark.dickinson) Date: Sat, 20 Oct 2012 14:17:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_concurrent=2Efutures_d?= =?utf-8?q?ocstring_typo=3A_=22Request_Q=22_-=3E_=22Result_Q=22=2E?= Message-ID: <3XkNKM2Kp6zQvb@mail.python.org> http://hg.python.org/cpython/rev/3f72b3a96508 changeset: 79850:3f72b3a96508 user: Mark Dickinson date: Sat Oct 20 13:16:49 2012 +0100 summary: Fix concurrent.futures docstring typo: "Request Q" -> "Result Q". files: Lib/concurrent/futures/process.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -40,7 +40,7 @@ Process #1..n: - reads _CallItems from "Call Q", executes the calls, and puts the resulting - _ResultItems in "Request Q" + _ResultItems in "Result Q" """ __author__ = 'Brian Quinlan (brian at sweetapp.com)' -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 15:28:07 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 20 Oct 2012 15:28:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Move_note_abou?= =?utf-8?q?t_the_implementation_in_the_=22seealso=22=2E?= Message-ID: <3XkPvC1b17zPWC@mail.python.org> http://hg.python.org/cpython/rev/d316b62c9629 changeset: 79851:d316b62c9629 branch: 3.3 parent: 79848:4adc11300c05 user: Ezio Melotti date: Sat Oct 20 16:26:18 2012 +0300 summary: Move note about the implementation in the "seealso". files: Doc/whatsnew/3.3.rst | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -116,12 +116,10 @@ file whose existence signals the base of a virtual environment's directory tree. -(Implemented by Carl Meyer and Vinay Sajip.) - .. seealso:: :pep:`405` - Python Virtual Environments - PEP written by Carl Meyer + PEP written by Carl Meyer; implementation by Carl Meyer and Vinay Sajip PEP 420: Namespace Packages -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 15:28:08 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 20 Oct 2012 15:28:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_=22seealso=22_change_with_3=2E3=2E?= Message-ID: <3XkPvD3yKrzPYf@mail.python.org> http://hg.python.org/cpython/rev/7219cd440d4c changeset: 79852:7219cd440d4c parent: 79850:3f72b3a96508 parent: 79851:d316b62c9629 user: Ezio Melotti date: Sat Oct 20 16:27:51 2012 +0300 summary: Merge "seealso" change with 3.3. files: Doc/whatsnew/3.3.rst | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -116,12 +116,10 @@ file whose existence signals the base of a virtual environment's directory tree. -(Implemented by Carl Meyer and Vinay Sajip.) - .. seealso:: :pep:`405` - Python Virtual Environments - PEP written by Carl Meyer + PEP written by Carl Meyer; implementation by Carl Meyer and Vinay Sajip PEP 420: Namespace Packages -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 21:54:21 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 20 Oct 2012 21:54:21 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_punctuatio?= =?utf-8?q?n=2E?= Message-ID: <3XkZSs6RMSzR7n@mail.python.org> http://hg.python.org/cpython/rev/21d3f449ae5c changeset: 79853:21d3f449ae5c branch: 3.3 parent: 79851:d316b62c9629 user: Ezio Melotti date: Sat Oct 20 22:53:47 2012 +0300 summary: Fix punctuation. files: Doc/whatsnew/3.3.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -460,8 +460,8 @@ :pep:`380` - Syntax for Delegating to a Subgenerator PEP written by Greg Ewing; implementation by Greg Ewing, integrated into - 3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan, documentation by - Zbigniew J?drzejewski-Szmek and Nick Coghlan) + 3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan; documentation by + Zbigniew J?drzejewski-Szmek and Nick Coghlan PEP 409: Suppressing exception context -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 21:54:23 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 20 Oct 2012 21:54:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_punctuation_fixes_with_3=2E3=2E?= Message-ID: <3XkZSv1dPMzR7n@mail.python.org> http://hg.python.org/cpython/rev/0e685b1c4d58 changeset: 79854:0e685b1c4d58 parent: 79852:7219cd440d4c parent: 79853:21d3f449ae5c user: Ezio Melotti date: Sat Oct 20 22:54:12 2012 +0300 summary: Merge punctuation fixes with 3.3. files: Doc/whatsnew/3.3.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -460,8 +460,8 @@ :pep:`380` - Syntax for Delegating to a Subgenerator PEP written by Greg Ewing; implementation by Greg Ewing, integrated into - 3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan, documentation by - Zbigniew J?drzejewski-Szmek and Nick Coghlan) + 3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan; documentation by + Zbigniew J?drzejewski-Szmek and Nick Coghlan PEP 409: Suppressing exception context -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 22:28:51 2012 From: python-checkins at python.org (ned.deily) Date: Sat, 20 Oct 2012 22:28:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEwNDA1?= =?utf-8?q?=3A_Document_IDLE_context_menus_in_Standard_Library_document?= Message-ID: <3XkbDg6RbXzR86@mail.python.org> http://hg.python.org/cpython/rev/c0a423ce4b96 changeset: 79855:c0a423ce4b96 branch: 2.7 parent: 79839:422a0175bbf5 user: Ned Deily date: Sat Oct 20 13:23:25 2012 -0700 summary: Issue #10405: Document IDLE context menus in Standard Library document and IDLE Help file. (Thanks to Nick ODell and Todd Rovito for suggestions.) Update Debug menu options in docs to match current code plus various other minor IDLE doc and help edits. files: Doc/library/idle.rst | 49 +++++++++++++++++++++++++------ Lib/idlelib/help.txt | 15 +++++++- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -154,27 +154,56 @@ it to the foreground (deiconifying it if necessary). -Debug menu (in the Python Shell window only) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Debug menu +^^^^^^^^^^ + +* in the Python Shell window only Go to file/line - look around the insert point for a filename and linenumber, open the file, and - show the line. + Look around the insert point for a filename and line number, open the file, + and show the line. Useful to view the source lines referenced in an + exception traceback. -Open stack viewer - show the stack traceback of the last exception +Debugger + Run commands in the shell under the debugger. -Debugger toggle - Run commands in the shell under the debugger +Stack viewer + Show the stack traceback of the last exception. -JIT Stack viewer toggle - Open stack viewer on traceback +Auto-open Stack Viewer + Open stack viewer on traceback. .. index:: single: stack viewer single: debugger +Edit context menu +^^^^^^^^^^^^^^^^^ + +* Right-click in Edit window (Control-click on OS X) + +Set Breakpoint + Sets a breakpoint. Breakpoints are only enabled when the debugger is open. + +Clear Breakpoint + Clears the breakpoint on that line. + +.. index:: + single: Set Breakpoint + single: Clear Breakpoint + single: breakpoints + + +Shell context menu +^^^^^^^^^^^^^^^^^^ + +* Right-click in Python Shell window (Control-click on OS X) + +Go to file/line + Same as in Debug menu. + + Basic editing and navigation ---------------------------- diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -80,7 +80,7 @@ Debug Menu (only in Shell window): Go to File/Line -- look around the insert point for a filename - and linenumber, open the file, and show the line + and line number, open the file, and show the line Debugger (toggle) -- Run commands in the shell under the debugger Stack Viewer -- Show the stack traceback of the last exception Auto-open Stack Viewer (toggle) -- Open stack viewer on traceback @@ -92,7 +92,7 @@ Startup Preferences may be set, and Additional Help Sources can be specified. - On MacOS X this menu is not present, use + On OS X this menu is not present, use menu 'IDLE -> Preferences...' instead. --- Code Context -- Open a pane at the top of the edit window which @@ -120,6 +120,15 @@ --- (Additional Help Sources may be added here) +Edit context menu (Right-click / Control-click in Edit window): + + Set Breakpoint -- Sets a breakpoint (when debugger open) + Clear Breakpoint -- Clears the breakpoint on that line + +Shell context menu (Right-click / Control-click in Shell window): + + Go to file/line -- Same as in Debug menu + ** TIPS ** ========== @@ -222,7 +231,7 @@ Alt-p retrieves previous command matching what you have typed. Alt-n retrieves next. - (These are Control-p, Control-n on the Mac) + (These are Control-p, Control-n on OS X) Return while cursor is on a previous command retrieves that command. Expand word is also useful to reduce typing. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 22:28:53 2012 From: python-checkins at python.org (ned.deily) Date: Sat, 20 Oct 2012 22:28:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzEwNDA1?= =?utf-8?q?=3A_Document_IDLE_context_menus_in_Standard_Library_document?= Message-ID: <3XkbDj2wRJzR9D@mail.python.org> http://hg.python.org/cpython/rev/566b7574becb changeset: 79856:566b7574becb branch: 3.2 parent: 79845:e829d644d366 user: Ned Deily date: Sat Oct 20 13:25:34 2012 -0700 summary: Issue #10405: Document IDLE context menus in Standard Library document and IDLE Help file. (Thanks to Nick ODell and Todd Rovito for suggestions.) Update Debug menu options in docs to match current code plus various other minor IDLE doc and help edits. files: Doc/library/idle.rst | 49 +++++++++++++++++++++++++------ Lib/idlelib/help.txt | 15 +++++++- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -154,27 +154,56 @@ it to the foreground (deiconifying it if necessary). -Debug menu (in the Python Shell window only) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Debug menu +^^^^^^^^^^ + +* in the Python Shell window only Go to file/line - look around the insert point for a filename and linenumber, open the file, and - show the line. + Look around the insert point for a filename and line number, open the file, + and show the line. Useful to view the source lines referenced in an + exception traceback. -Open stack viewer - show the stack traceback of the last exception +Debugger + Run commands in the shell under the debugger. -Debugger toggle - Run commands in the shell under the debugger +Stack viewer + Show the stack traceback of the last exception. -JIT Stack viewer toggle - Open stack viewer on traceback +Auto-open Stack Viewer + Open stack viewer on traceback. .. index:: single: stack viewer single: debugger +Edit context menu +^^^^^^^^^^^^^^^^^ + +* Right-click in Edit window (Control-click on OS X) + +Set Breakpoint + Sets a breakpoint. Breakpoints are only enabled when the debugger is open. + +Clear Breakpoint + Clears the breakpoint on that line. + +.. index:: + single: Set Breakpoint + single: Clear Breakpoint + single: breakpoints + + +Shell context menu +^^^^^^^^^^^^^^^^^^ + +* Right-click in Python Shell window (Control-click on OS X) + +Go to file/line + Same as in Debug menu. + + Basic editing and navigation ---------------------------- diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -80,7 +80,7 @@ Debug Menu (only in Shell window): Go to File/Line -- look around the insert point for a filename - and linenumber, open the file, and show the line + and line number, open the file, and show the line Debugger (toggle) -- Run commands in the shell under the debugger Stack Viewer -- Show the stack traceback of the last exception Auto-open Stack Viewer (toggle) -- Open stack viewer on traceback @@ -92,7 +92,7 @@ Startup Preferences may be set, and Additional Help Sources can be specified. - On MacOS X this menu is not present, use + On OS X this menu is not present, use menu 'IDLE -> Preferences...' instead. --- Code Context -- Open a pane at the top of the edit window which @@ -120,6 +120,15 @@ --- (Additional Help Sources may be added here) +Edit context menu (Right-click / Control-click in Edit window): + + Set Breakpoint -- Sets a breakpoint (when debugger open) + Clear Breakpoint -- Clears the breakpoint on that line + +Shell context menu (Right-click / Control-click in Shell window): + + Go to file/line -- Same as in Debug menu + ** TIPS ** ========== @@ -222,7 +231,7 @@ Alt-p retrieves previous command matching what you have typed. Alt-n retrieves next. - (These are Control-p, Control-n on the Mac) + (These are Control-p, Control-n on OS X) Return while cursor is on a previous command retrieves that command. Expand word is also useful to reduce typing. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 22:28:54 2012 From: python-checkins at python.org (ned.deily) Date: Sat, 20 Oct 2012 22:28:54 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2310405=3A_merge_from_3=2E2?= Message-ID: <3XkbDk5Py4zR9v@mail.python.org> http://hg.python.org/cpython/rev/85c4d21f7454 changeset: 79857:85c4d21f7454 branch: 3.3 parent: 79853:21d3f449ae5c parent: 79856:566b7574becb user: Ned Deily date: Sat Oct 20 13:27:32 2012 -0700 summary: Issue #10405: merge from 3.2 files: Doc/library/idle.rst | 49 +++++++++++++++++++++++++------ Lib/idlelib/help.txt | 15 +++++++- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -154,27 +154,56 @@ it to the foreground (deiconifying it if necessary). -Debug menu (in the Python Shell window only) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Debug menu +^^^^^^^^^^ + +* in the Python Shell window only Go to file/line - look around the insert point for a filename and linenumber, open the file, and - show the line. + Look around the insert point for a filename and line number, open the file, + and show the line. Useful to view the source lines referenced in an + exception traceback. -Open stack viewer - show the stack traceback of the last exception +Debugger + Run commands in the shell under the debugger. -Debugger toggle - Run commands in the shell under the debugger +Stack viewer + Show the stack traceback of the last exception. -JIT Stack viewer toggle - Open stack viewer on traceback +Auto-open Stack Viewer + Open stack viewer on traceback. .. index:: single: stack viewer single: debugger +Edit context menu +^^^^^^^^^^^^^^^^^ + +* Right-click in Edit window (Control-click on OS X) + +Set Breakpoint + Sets a breakpoint. Breakpoints are only enabled when the debugger is open. + +Clear Breakpoint + Clears the breakpoint on that line. + +.. index:: + single: Set Breakpoint + single: Clear Breakpoint + single: breakpoints + + +Shell context menu +^^^^^^^^^^^^^^^^^^ + +* Right-click in Python Shell window (Control-click on OS X) + +Go to file/line + Same as in Debug menu. + + Basic editing and navigation ---------------------------- diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -80,7 +80,7 @@ Debug Menu (only in Shell window): Go to File/Line -- look around the insert point for a filename - and linenumber, open the file, and show the line + and line number, open the file, and show the line Debugger (toggle) -- Run commands in the shell under the debugger Stack Viewer -- Show the stack traceback of the last exception Auto-open Stack Viewer (toggle) -- Open stack viewer on traceback @@ -92,7 +92,7 @@ Startup Preferences may be set, and Additional Help Sources can be specified. - On MacOS X this menu is not present, use + On OS X this menu is not present, use menu 'IDLE -> Preferences...' instead. --- Code Context -- Open a pane at the top of the edit window which @@ -120,6 +120,15 @@ --- (Additional Help Sources may be added here) +Edit context menu (Right-click / Control-click in Edit window): + + Set Breakpoint -- Sets a breakpoint (when debugger open) + Clear Breakpoint -- Clears the breakpoint on that line + +Shell context menu (Right-click / Control-click in Shell window): + + Go to file/line -- Same as in Debug menu + ** TIPS ** ========== @@ -222,7 +231,7 @@ Alt-p retrieves previous command matching what you have typed. Alt-n retrieves next. - (These are Control-p, Control-n on the Mac) + (These are Control-p, Control-n on OS X) Return while cursor is on a previous command retrieves that command. Expand word is also useful to reduce typing. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 22:28:56 2012 From: python-checkins at python.org (ned.deily) Date: Sat, 20 Oct 2012 22:28:56 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2310405=3A_merge_from_3=2E3?= Message-ID: <3XkbDm0nYlzRB3@mail.python.org> http://hg.python.org/cpython/rev/ea7849650fd1 changeset: 79858:ea7849650fd1 parent: 79854:0e685b1c4d58 parent: 79857:85c4d21f7454 user: Ned Deily date: Sat Oct 20 13:28:16 2012 -0700 summary: Issue #10405: merge from 3.3 files: Doc/library/idle.rst | 49 +++++++++++++++++++++++++------ Lib/idlelib/help.txt | 15 +++++++- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -154,27 +154,56 @@ it to the foreground (deiconifying it if necessary). -Debug menu (in the Python Shell window only) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Debug menu +^^^^^^^^^^ + +* in the Python Shell window only Go to file/line - look around the insert point for a filename and linenumber, open the file, and - show the line. + Look around the insert point for a filename and line number, open the file, + and show the line. Useful to view the source lines referenced in an + exception traceback. -Open stack viewer - show the stack traceback of the last exception +Debugger + Run commands in the shell under the debugger. -Debugger toggle - Run commands in the shell under the debugger +Stack viewer + Show the stack traceback of the last exception. -JIT Stack viewer toggle - Open stack viewer on traceback +Auto-open Stack Viewer + Open stack viewer on traceback. .. index:: single: stack viewer single: debugger +Edit context menu +^^^^^^^^^^^^^^^^^ + +* Right-click in Edit window (Control-click on OS X) + +Set Breakpoint + Sets a breakpoint. Breakpoints are only enabled when the debugger is open. + +Clear Breakpoint + Clears the breakpoint on that line. + +.. index:: + single: Set Breakpoint + single: Clear Breakpoint + single: breakpoints + + +Shell context menu +^^^^^^^^^^^^^^^^^^ + +* Right-click in Python Shell window (Control-click on OS X) + +Go to file/line + Same as in Debug menu. + + Basic editing and navigation ---------------------------- diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -80,7 +80,7 @@ Debug Menu (only in Shell window): Go to File/Line -- look around the insert point for a filename - and linenumber, open the file, and show the line + and line number, open the file, and show the line Debugger (toggle) -- Run commands in the shell under the debugger Stack Viewer -- Show the stack traceback of the last exception Auto-open Stack Viewer (toggle) -- Open stack viewer on traceback @@ -92,7 +92,7 @@ Startup Preferences may be set, and Additional Help Sources can be specified. - On MacOS X this menu is not present, use + On OS X this menu is not present, use menu 'IDLE -> Preferences...' instead. --- Code Context -- Open a pane at the top of the edit window which @@ -120,6 +120,15 @@ --- (Additional Help Sources may be added here) +Edit context menu (Right-click / Control-click in Edit window): + + Set Breakpoint -- Sets a breakpoint (when debugger open) + Clear Breakpoint -- Clears the breakpoint on that line + +Shell context menu (Right-click / Control-click in Shell window): + + Go to file/line -- Same as in Debug menu + ** TIPS ** ========== @@ -222,7 +231,7 @@ Alt-p retrieves previous command matching what you have typed. Alt-n retrieves next. - (These are Control-p, Control-n on the Mac) + (These are Control-p, Control-n on OS X) Return while cursor is on a previous command retrieves that command. Expand word is also useful to reduce typing. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 20 23:05:07 2012 From: python-checkins at python.org (ned.deily) Date: Sat, 20 Oct 2012 23:05:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?devguide=3A_Issue_=2316289=3A_Update_?= =?utf-8?q?Developer=27s_Guide_for_the_3=2E4_development_cycle=2E?= Message-ID: <3Xkc2W6NnCzQxd@mail.python.org> http://hg.python.org/devguide/rev/2f682e133960 changeset: 560:2f682e133960 user: Ned Deily date: Sat Oct 20 14:04:19 2012 -0700 summary: Issue #16289: Update Developer's Guide for the 3.4 development cycle. Note that the Development Cycle page should be updated again once 3.2.x moves from maintenance to security mode. files: committing.rst | 41 +++++++++++++++++++++++-------------- devcycle.rst | 26 +++++++++++++---------- faq.rst | 29 ++++++++++++------------- setup.rst | 4 +- triaging.rst | 10 ++++---- 5 files changed, 61 insertions(+), 49 deletions(-) diff --git a/committing.rst b/committing.rst --- a/committing.rst +++ b/committing.rst @@ -263,7 +263,7 @@ If the patch is a bugfix and it does not break backwards-compatibility *at all*, then it should be applied to the oldest branch applicable and forward-ported until it reaches the in-development branch -of Python (for example, first in ``3.1``, then in ``3.2`` and finally in +of Python (for example, first in ``3.2``, then in ``3.3`` and finally in ``default``). A forward-port instead of a back-port is preferred as it allows the :abbr:`DAG (directed acyclic graph)` used by hg to work with the movement of the patch through the codebase instead of against it. @@ -286,32 +286,32 @@ Porting Within a Major Version '''''''''''''''''''''''''''''' -Assume that Python 3.3 is the current in-development version of Python and that -you have a patch that should also be applied to Python 3.2. To properly port +Assume that Python 3.4 is the current in-development version of Python and that +you have a patch that should also be applied to Python 3.3. To properly port the patch to both versions of Python, you should first apply the patch to -Python 3.2:: +Python 3.3:: - hg update 3.2 + hg update 3.3 hg import --no-commit patch.diff # Compile; run the test suite hg commit -With the patch now committed, you want to merge the patch up into Python 3.3. +With the patch now committed, you want to merge the patch up into Python 3.4. This should be done *before* pushing your changes to hg.python.org, so that the branches are in sync on the public repository. Assuming you are doing all of your work in a single clone, do:: hg update default - hg merge 3.2 + hg merge 3.3 # Fix any conflicts; compile; run the test suite hg commit .. note:: - *If the patch shouldn't be ported* from Python 3.2 to Python 3.3, you must + *If the patch shouldn't be ported* from Python 3.3 to Python 3.4, you must also make it explicit: merge the changes but revert them before committing:: hg update default - hg merge 3.2 + hg merge 3.3 hg revert -ar default hg commit @@ -324,7 +324,7 @@ hg push -This will push changes in both the Python 3.2 and Python 3.3 branches to +This will push changes in both the Python 3.3 and Python 3.4 branches to hg.python.org. @@ -332,7 +332,7 @@ '''''''''''''''''''''''''''''' Let's say you have committed your changes as changeset ``a7df1a869e4a`` -in the 3.2 branch and now want to port it to 2.7. This is simple using +in the 3.3 branch and now want to port it to 2.7. This is simple using the "graft" command, which uses Mercurial's merge functionality to cherry-pick:: @@ -370,9 +370,16 @@ $ hg clone ssh://hg at hg.python.org/cpython py3k * Then clone it to create another local repository which is then used to + checkout branch 3.3:: + + $ hg clone py3k py3.3 + $ cd py3.3 + $ hg update 3.3 + +* Then clone it to create another local repository which is then used to checkout branch 3.2:: - $ hg clone py3k py3.2 + $ hg clone py3.3 py3.2 $ cd py3.2 $ hg update 3.2 @@ -388,11 +395,11 @@ $ cd py2.7 $ hg update 2.7 -Given this arrangement of local repositories, pushing from the ``py3.1`` -repository will update the ``py3.2`` repository, where you can then merge your -3.1 changes into the 3.2 branch. In turn, pushing changes from the ``py3.2`` +Given this arrangement of local repositories, pushing from the ``py3.2`` +repository will update the ``py3.3`` repository, where you can then merge your +3.2 changes into the 3.3 branch. In turn, pushing changes from the ``py3.3`` repository will update the ``py3k`` repository. Finally, once you have -merged (and tested!) your ``3.2`` changes into the ``default`` branch, pushing +merged (and tested!) your ``3.3`` changes into the ``default`` branch, pushing from the ``py3k`` repository will publish your changes in the public repository. @@ -402,6 +409,8 @@ cd ~/py3k hg pull -u + cd ~/py3.3 + hg pull -u cd ~/py3.2 hg pull -u cd ~/py2.7 diff --git a/devcycle.rst b/devcycle.rst --- a/devcycle.rst +++ b/devcycle.rst @@ -40,8 +40,8 @@ Therefore, each change should be made **first** in the oldest branch to which it applies and forward-ported as appropriate: if a bug must be fixed in both Python -3.2 and 3.3, first fix it in ``3.2`` and then merge ``3.2`` into ``default`` -(which holds the future 3.3). +3.3 and 3.4, first fix it in ``3.3`` and then merge ``3.3`` into ``default`` +(which holds the future 3.4). .. _indevbranch: @@ -54,9 +54,9 @@ changes, performance improvements, bug fixes. As the name indicates, it is the branch :ref:`checked out ` by default by Mercurial. -Once a :ref:`final` release (say, 3.2) is made from the in-development branch, a +Once a :ref:`final` release (say, 3.3) is made from the in-development branch, a new :ref:`maintenance branch ` is created to host all bug fixing -activity for further micro versions (3.2.1, 3.2.2, etc.). +activity for further micro versions (3.3.1, 3.3.2, etc.). .. _maintbranch: @@ -71,13 +71,15 @@ The only changes allowed to occur in a maintenance branch without debate are bug fixes. Also, a general rule for maintenance branches is that compatibility -must not be broken at any point between sibling minor releases (3.1.1, 3.1.2, +must not be broken at any point between sibling minor releases (3.3.1, 3.3.2, etc.). For both rules, only rare exceptions are accepted and **must** be discussed first. When a new maintenance branch is created (after a new *minor version* is -released), the old maintenance branch on that major version (e.g. 3.1.x -after 3.2 gets released) goes into :ref:`security mode `. +released), the old maintenance branch on that major version (e.g. 3.2.x +after 3.3 gets released) will go into :ref:`security mode `, +usually after one last maintenance release at the discretion of the +release manager. .. _secbranch: @@ -97,11 +99,13 @@ Summary ------- -There are 5 open branches right now in the Mercurial repository: +There are 6 open branches right now in the Mercurial repository: -- the ``default`` branch holds the future 3.3 version and descends from ``3.2`` -- the ``3.2`` branch holds bug fixes for future 3.2.x maintenance releases - and descends from ``3.1`` +- the ``default`` branch holds the future 3.4 version and descends from ``3.3`` +- the ``3.3`` branch holds bug fixes for future 3.3.x maintenance releases + and descends from ``3.2`` +- the ``3.2`` branch holds bug fixes for an upcoming final 3.2.4 maintenance + release and then for future 3.2.x security releases - the ``3.1`` branch holds security fixes for future 3.1.x security releases - the ``2.7`` branch holds bug fixes for future 2.7.x maintenance releases and descends from ``2.6`` diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -258,13 +258,12 @@ Typing ``hg branches`` displays the open branches in your local repository:: $ hg branches - default 68026:f12ef116dd10 - 3.2 68025:cef92ee1a323 - 2.7 68010:8174d00d0797 - 3.1 67955:5be8b695ea86 - 2.6 67287:5e26a860eded - 2.5 65464:e4ecac76e499 - + default 79844:2d53f92ed54c + 2.7 79839:422a0175bbf5 + 3.3 79843:25722e983ada (inactive) + 3.2 79840:d459a9576d6c (inactive) + 3.1 76255:5a6fa1b8767f (inactive) + 2.6 76213:f130ce67387d (inactive) Why are some branches marked "inactive"? ---------------------------------------- @@ -273,9 +272,9 @@ $ hg branches default 68042:8ff33af017ef - 3.2 68039:c17d7772c638 (inactive) + 3.3 68039:c17d7772c638 (inactive) -This means all changesets in the "3.2" branch have been merged into the +This means all changesets in the "3.3" branch have been merged into the "default" branch (or any other branch, if such exists). @@ -308,10 +307,10 @@ $ hg branch default - $ hg update 3.2 + $ hg update 3.3 86 files updated, 0 files merged, 11 files removed, 0 files unresolved $ hg branch - 3.2 + 3.3 Adding the ``-v`` option to ``hg update`` will list all updated files. @@ -327,11 +326,11 @@ Just clone your local repository and update each clone to a different branch:: - $ hg clone cpython py32 + $ hg clone cpython py33 updating to branch default 3434 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd py32 - $ hg update 3.2 + $ cd py33 + $ hg update 3.3 86 files updated, 0 files merged, 11 files removed, 0 files unresolved The current branch in a working copy is "sticky": if you pull in some new @@ -935,5 +934,5 @@ message, then it is necessary to identify any Python build directories as auto-load safe. One way to achieve this is to add a line like the following to ``~/.gdbinit`` (edit the specific list of paths as appropriate):: - + add-auto-load-safe-path ~/devel/py3k:~/devel/py32:~/devel/py27 diff --git a/setup.rst b/setup.rst --- a/setup.rst +++ b/setup.rst @@ -42,9 +42,9 @@ If you want a working copy of an already-released version of Python, i.e., a version in :ref:`maintenance mode `, you can update your -working copy. For instance, to update your working copy to Python 3.1, do:: +working copy. For instance, to update your working copy to Python 3.3, do:: - hg update 3.1 + hg update 3.3 You will need to re-compile CPython when you do such an update. diff --git a/triaging.rst b/triaging.rst --- a/triaging.rst +++ b/triaging.rst @@ -125,9 +125,9 @@ Versions '''''''' The known versions of Python that the issue affects and should be fixed for. -Thus if an issue for a new feature is assigned for e.g., Python 3.2 but is not -applied before Python 3.2.0 is released, this field should be updated to say -Python 3.3 as the version and drop Python 3.2. +Thus if an issue for a new feature is assigned for e.g., Python 3.3 but is not +applied before Python 3.3.0 is released, this field should be updated to say +Python 3.4 as the version and drop Python 3.3. Priority '''''''' @@ -170,8 +170,8 @@ The patch attached to the issue is in need of a review. patch There is a patch attached to the issue. -3.2regression - The issue is a regression in 3.2. +3.3regression + The issue is a regression in 3.3. Nosy List ''''''''' -- Repository URL: http://hg.python.org/devguide From python-checkins at python.org Sat Oct 20 23:14:55 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sat, 20 Oct 2012 23:14:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2312805=3A_Make_byt?= =?utf-8?q?es=2Ejoin_and_bytearray=2Ejoin_faster_when_the_separator_is?= Message-ID: <3XkcFq1X9FzR9g@mail.python.org> http://hg.python.org/cpython/rev/bfa715f98c0f changeset: 79859:bfa715f98c0f user: Antoine Pitrou date: Sat Oct 20 23:08:34 2012 +0200 summary: Issue #12805: Make bytes.join and bytearray.join faster when the separator is empty. Patch by Serhiy Storchaka. files: Misc/NEWS | 3 +++ Objects/stringlib/join.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #12805: Make bytes.join and bytearray.join faster when the separator + is empty. Patch by Serhiy Storchaka. + - Issue #6074: Ensure cached bytecode files can always be updated by the user that created them, even when the source file is read-only. diff --git a/Objects/stringlib/join.h b/Objects/stringlib/join.h --- a/Objects/stringlib/join.h +++ b/Objects/stringlib/join.h @@ -94,6 +94,16 @@ /* Catenate everything. */ p = STRINGLIB_STR(res); + if (!seplen) { + /* fast path */ + for (i = 0; i < nbufs; i++) { + Py_ssize_t n = buffers[i].len; + char *q = buffers[i].buf; + Py_MEMCPY(p, q, n); + p += n; + } + goto done; + } for (i = 0; i < nbufs; i++) { Py_ssize_t n; char *q; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 02:23:02 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 02:23:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_indentatio?= =?utf-8?q?n_=28or_Sphinx_will_think_these_are_attributes_of_ConnectionErr?= =?utf-8?q?or=29=2E?= Message-ID: <3XkhQt5fRHzRCg@mail.python.org> http://hg.python.org/cpython/rev/deacfff86da5 changeset: 79860:deacfff86da5 branch: 3.3 parent: 79857:85c4d21f7454 user: Ezio Melotti date: Sun Oct 21 03:22:05 2012 +0300 summary: Fix indentation (or Sphinx will think these are attributes of ConnectionError). files: Doc/library/exceptions.rst | 39 +++++++++++++------------ 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -449,34 +449,35 @@ .. exception:: ConnectionError - A base class for connection-related issues. Subclasses are - :exc:`BrokenPipeError`, :exc:`ConnectionAbortedError`, + A base class for connection-related issues. + + Subclasses are :exc:`BrokenPipeError`, :exc:`ConnectionAbortedError`, :exc:`ConnectionRefusedError` and :exc:`ConnectionResetError`. - .. exception:: BrokenPipeError +.. exception:: BrokenPipeError - A subclass of :exc:`ConnectionError`, raised when trying to write on a - pipe while the other end has been closed, or trying to write on a socket - which has been shutdown for writing. - Corresponds to :c:data:`errno` ``EPIPE`` and ``ESHUTDOWN``. + A subclass of :exc:`ConnectionError`, raised when trying to write on a + pipe while the other end has been closed, or trying to write on a socket + which has been shutdown for writing. + Corresponds to :c:data:`errno` ``EPIPE`` and ``ESHUTDOWN``. - .. exception:: ConnectionAbortedError +.. exception:: ConnectionAbortedError - A subclass of :exc:`ConnectionError`, raised when a connection attempt - is aborted by the peer. - Corresponds to :c:data:`errno` ``ECONNABORTED``. + A subclass of :exc:`ConnectionError`, raised when a connection attempt + is aborted by the peer. + Corresponds to :c:data:`errno` ``ECONNABORTED``. - .. exception:: ConnectionRefusedError +.. exception:: ConnectionRefusedError - A subclass of :exc:`ConnectionError`, raised when a connection attempt - is refused by the peer. - Corresponds to :c:data:`errno` ``ECONNREFUSED``. + A subclass of :exc:`ConnectionError`, raised when a connection attempt + is refused by the peer. + Corresponds to :c:data:`errno` ``ECONNREFUSED``. - .. exception:: ConnectionResetError +.. exception:: ConnectionResetError - A subclass of :exc:`ConnectionError`, raised when a connection is - reset by the peer. - Corresponds to :c:data:`errno` ``ECONNRESET``. + A subclass of :exc:`ConnectionError`, raised when a connection is + reset by the peer. + Corresponds to :c:data:`errno` ``ECONNRESET``. .. exception:: FileExistsError -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 02:23:04 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 02:23:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_indentation_fixes_with_3=2E3=2E?= Message-ID: <3XkhQw0fNQzRCn@mail.python.org> http://hg.python.org/cpython/rev/223477b653e2 changeset: 79861:223477b653e2 parent: 79859:bfa715f98c0f parent: 79860:deacfff86da5 user: Ezio Melotti date: Sun Oct 21 03:22:53 2012 +0300 summary: Merge indentation fixes with 3.3. files: Doc/library/exceptions.rst | 39 +++++++++++++------------ 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -449,34 +449,35 @@ .. exception:: ConnectionError - A base class for connection-related issues. Subclasses are - :exc:`BrokenPipeError`, :exc:`ConnectionAbortedError`, + A base class for connection-related issues. + + Subclasses are :exc:`BrokenPipeError`, :exc:`ConnectionAbortedError`, :exc:`ConnectionRefusedError` and :exc:`ConnectionResetError`. - .. exception:: BrokenPipeError +.. exception:: BrokenPipeError - A subclass of :exc:`ConnectionError`, raised when trying to write on a - pipe while the other end has been closed, or trying to write on a socket - which has been shutdown for writing. - Corresponds to :c:data:`errno` ``EPIPE`` and ``ESHUTDOWN``. + A subclass of :exc:`ConnectionError`, raised when trying to write on a + pipe while the other end has been closed, or trying to write on a socket + which has been shutdown for writing. + Corresponds to :c:data:`errno` ``EPIPE`` and ``ESHUTDOWN``. - .. exception:: ConnectionAbortedError +.. exception:: ConnectionAbortedError - A subclass of :exc:`ConnectionError`, raised when a connection attempt - is aborted by the peer. - Corresponds to :c:data:`errno` ``ECONNABORTED``. + A subclass of :exc:`ConnectionError`, raised when a connection attempt + is aborted by the peer. + Corresponds to :c:data:`errno` ``ECONNABORTED``. - .. exception:: ConnectionRefusedError +.. exception:: ConnectionRefusedError - A subclass of :exc:`ConnectionError`, raised when a connection attempt - is refused by the peer. - Corresponds to :c:data:`errno` ``ECONNREFUSED``. + A subclass of :exc:`ConnectionError`, raised when a connection attempt + is refused by the peer. + Corresponds to :c:data:`errno` ``ECONNREFUSED``. - .. exception:: ConnectionResetError +.. exception:: ConnectionResetError - A subclass of :exc:`ConnectionError`, raised when a connection is - reset by the peer. - Corresponds to :c:data:`errno` ``ECONNRESET``. + A subclass of :exc:`ConnectionError`, raised when a connection is + reset by the peer. + Corresponds to :c:data:`errno` ``ECONNRESET``. .. exception:: FileExistsError -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 04:15:38 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 04:15:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Fix_typo_and_add_comma=2E?= Message-ID: <3Xkkwp38kyzR9q@mail.python.org> http://hg.python.org/peps/rev/e56ad3d184cf changeset: 4563:e56ad3d184cf user: Ezio Melotti date: Sun Oct 21 05:15:31 2012 +0300 summary: Fix typo and add comma. files: pep-0362.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0362.txt b/pep-0362.txt --- a/pep-0362.txt +++ b/pep-0362.txt @@ -279,7 +279,7 @@ - If it has a ``__wrapped__`` attribute, return ``signature(object.__wrapped__)`` - - If the object is a an instance of ``FunctionType`` construct + - If the object is an instance of ``FunctionType``, construct and return a new ``Signature`` for it - If the object is a bound method, construct and return a new ``Signature`` -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sun Oct 21 04:44:48 2012 From: python-checkins at python.org (daniel.holth) Date: Sun, 21 Oct 2012 04:44:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_de-RFC_Metadata_1=2E3=2C_with?= =?utf-8?q?_email=2Epolicy_demo?= Message-ID: <3XklZS2B4LzLsS@mail.python.org> http://hg.python.org/peps/rev/74868fe8ba17 changeset: 4564:74868fe8ba17 user: Daniel Holth date: Sat Oct 20 22:44:40 2012 -0400 summary: de-RFC Metadata 1.3, with email.policy demo files: pep-0426.txt | 125 +++++++++++++++++++++++++++----------- 1 files changed, 88 insertions(+), 37 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -26,16 +26,17 @@ third-party packaging of Python Software easier and defines a formal extension mechanism. The fields are "Setup-Requires-Dist" "Provides-Extra", and "Extension". This version also adds the `extra` -variable to the `environment markers` specification. +variable to the `environment markers` specification and allows the +description to be placed into a payload section. Metadata Files ============== The syntax defined in this PEP is for use with Python distribution metadata files. The file format is a simple UTF-8 encoded Key: value -format with no maximum line length. It is parseable by the ``email`` -module with an appropriate ``email.policy.Policy()``. The field names -listed in the `Fields`_ section are used as the header names. +format with no maximum line length, followed by a blank line and an +arbitrary payload. It is parseable by the ``email`` module with an +appropriate ``email.policy.Policy()``. In Python 3.2, a serviceable read-only parser is:: @@ -46,12 +47,10 @@ * the ``PKG-INFO`` file included in the base directory of Python source distribution archives (as created by the distutils ``sdist`` command) -* the ``dist-info/METADATA`` files in a Python installation database, as +* the ``.dist-info/METADATA`` files in a Python installation database, as described in PEP 376. -Other tools involved in Python distribution may choose to record this -metadata in additional tool-specific locations (e.g. as part of a -binary distribution archive format). +Other tools involved in Python distribution may also use this format. Encoding ======== @@ -141,13 +140,12 @@ Summary: A module for collecting votes from beagles. -Description (optional) -:::::::::::::::::::::: +Description (optional, deprecated) +:::::::::::::::::::::::::::::::::: A longer description of the distribution that can run to several paragraphs. Software that deals with metadata should not assume -any maximum size for this field, though people shouldn't include -their instruction manual as the description. +any maximum size for this field. The contents of this field can be written using reStructuredText markup [1]_. For programs that work with the metadata, supporting @@ -155,27 +153,13 @@ field as-is. This means that authors should be conservative in the markup they use. -To support empty lines and lines with indentation and maintain -compatibility with ``email.parser.Parser()``, any CRLF character has to -be suffixed by 7 spaces followed by a pipe ("|") char. As a result, the -Description field is encoded into a folded field that can be interpreted -by RFC822 parser [2]_. +Since a line separator immediately followed by another line separator +indicates the end of the headers section, any line separator must be +suffixed by whitespace to indicate continuation. -Example:: - - Description: This project provides powerful math functions - |For example, you can use `sum()` to sum numbers: - | - |Example:: - | - | >>> sum(1, 2) - | 3 - | - -This encoding implies that any occurences of a CRLF followed by 7 spaces -and a pipe char have to be replaced by a single CRLF when the field is unfolded -using a RFC822 reader. - +Since Metadata 1.3 the recommended place for the description is in the +payload section of the document, after the last header. The description +needs no special formatting when included in the payload. Keywords (optional) ::::::::::::::::::: @@ -278,6 +262,9 @@ License: GPL version 3, excluding DRM provisions +The full text of the license would normally be included in a separate +file. + Classifier (multiple use) ::::::::::::::::::::::::: @@ -608,21 +595,24 @@ Summary of Differences From PEP 345 =================================== -* Values are now expected to be UTF-8 +* Metadata-Version is now 1.3. -* Metadata-Version is now 1.3. +* Values are now expected to be UTF-8. + +* A payload (containing the description) may appear after the headers. * Added `extra` to environment markers. * Changed fields: - Requires-Dist + - Description * Added fields: - Setup-Requires-Dist - Provides-Extra - - Extension + - Extension References ========== @@ -637,8 +627,69 @@ .. _`Python Package Index`: http://pypi.python.org/pypi/ -.. [2] RFC 822 Long Header Fields: - http://www.freesoft.org/CIE/RFC/822/7.htm +.. [2] PEP 301: + http://www.python.org/dev/peps/pep-0301/ + +Appendix +======== + +Parsing and generating the Metadata 1.3 serialization format using +Python 3.3:: + + # Metadata 1.3 demo + from email.generator import Generator + from email import header + from email.parser import Parser + from email.policy import Compat32 + from email.utils import _has_surrogates + + class MetadataPolicy(Compat32): + max_line_length = 0 + continuation_whitespace = '\t' + + def _sanitize_header(self, name, value): + if not isinstance(value, str): + return value + if _has_surrogates(value): + raise NotImplementedError() + else: + return value + + def _fold(self, name, value, sanitize): + body = ((self.linesep+self.continuation_whitespace) + .join(value.splitlines())) + return ''.join((name, ': ', body, self.linesep)) + + if __name__ == "__main__": + import sys + import textwrap + + pkg_info = """\ + Metadata-Version: 1.3 + Name: package + Version: 0.1.0 + Summary: A package. + Description: Description + =========== + + + A description of the package. + + """ + + m = Parser(policy=MetadataPolicy()).parsestr(pkg_info) + + m['License'] = 'GPL' + description = m['Description'] + description_lines = description.splitlines() + m.set_payload(description_lines[0] + + '\n' + + textwrap.dedent('\n'.join(description_lines[1:])) + + '\n') + del m['Description'] + + # Correct if sys.stdout.encoding == 'UTF-8': + Generator(sys.stdout, maxheaderlen=0).flatten(m) Copyright ========= -- Repository URL: http://hg.python.org/peps From solipsis at pitrou.net Sun Oct 21 05:57:21 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sun, 21 Oct 2012 05:57:21 +0200 Subject: [Python-checkins] Daily reference leaks (223477b653e2): sum=0 Message-ID: results for 223477b653e2 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogldErMs', '-x'] From python-checkins at python.org Sun Oct 21 06:24:50 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 06:24:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogRml4IHR5cG8u?= Message-ID: <3Xknnt3nHqzMXZ@mail.python.org> http://hg.python.org/cpython/rev/ebf6d1bcd961 changeset: 79862:ebf6d1bcd961 branch: 3.3 parent: 79860:deacfff86da5 user: Ezio Melotti date: Sun Oct 21 07:24:13 2012 +0300 summary: Fix typo. files: Doc/library/importlib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -162,7 +162,7 @@ An abstract method for finding a :term:`loader` for the specified module. If this is a top-level import, *path* will be ``None``. - Otheriwse, this is a search for a subpackage or module and *path* + Otherwise, this is a search for a subpackage or module and *path* will be the value of :attr:`__path__` from the parent package. If a loader cannot be found, ``None`` is returned. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 06:24:51 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 06:24:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_typo_fix_with_3=2E3=2E?= Message-ID: <3Xknnv6JXNzR61@mail.python.org> http://hg.python.org/cpython/rev/3c7e3f7590a4 changeset: 79863:3c7e3f7590a4 parent: 79861:223477b653e2 parent: 79862:ebf6d1bcd961 user: Ezio Melotti date: Sun Oct 21 07:24:40 2012 +0300 summary: Merge typo fix with 3.3. files: Doc/library/importlib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -162,7 +162,7 @@ An abstract method for finding a :term:`loader` for the specified module. If this is a top-level import, *path* will be ``None``. - Otheriwse, this is a search for a subpackage or module and *path* + Otherwise, this is a search for a subpackage or module and *path* will be the value of :attr:`__path__` from the parent package. If a loader cannot be found, ``None`` is returned. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 06:37:34 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 06:37:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_PEP_name?= =?utf-8?q?=2E?= Message-ID: <3Xkp4Z5xjkzR3y@mail.python.org> http://hg.python.org/cpython/rev/265fe07f55ec changeset: 79864:265fe07f55ec branch: 3.3 parent: 79862:ebf6d1bcd961 user: Ezio Melotti date: Sun Oct 21 07:36:58 2012 +0300 summary: Fix PEP name. files: Doc/whatsnew/3.3.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -122,8 +122,8 @@ PEP written by Carl Meyer; implementation by Carl Meyer and Vinay Sajip -PEP 420: Namespace Packages -=========================== +PEP 420: Implicit Namespace Packages +==================================== Native support for package directories that don't require ``__init__.py`` marker files and can automatically span multiple path segments (inspired by @@ -132,7 +132,7 @@ .. seealso:: - :pep:`420` - Namespace packages + :pep:`420` - Implicit Namespace Packages PEP written by Eric V. Smith; implementation by Eric V. Smith and Barry Warsaw -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 06:37:36 2012 From: python-checkins at python.org (ezio.melotti) Date: Sun, 21 Oct 2012 06:37:36 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_PEP_name_fix_with_3=2E3=2E?= Message-ID: <3Xkp4c12X7zR3y@mail.python.org> http://hg.python.org/cpython/rev/e0b029e7bffa changeset: 79865:e0b029e7bffa parent: 79863:3c7e3f7590a4 parent: 79864:265fe07f55ec user: Ezio Melotti date: Sun Oct 21 07:37:25 2012 +0300 summary: Merge PEP name fix with 3.3. files: Doc/whatsnew/3.3.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -122,8 +122,8 @@ PEP written by Carl Meyer; implementation by Carl Meyer and Vinay Sajip -PEP 420: Namespace Packages -=========================== +PEP 420: Implicit Namespace Packages +==================================== Native support for package directories that don't require ``__init__.py`` marker files and can automatically span multiple path segments (inspired by @@ -132,7 +132,7 @@ .. seealso:: - :pep:`420` - Namespace packages + :pep:`420` - Implicit Namespace Packages PEP written by Eric V. Smith; implementation by Eric V. Smith and Barry Warsaw -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 14:11:11 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 14:11:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjIw?= =?utf-8?q?=3A_wsgiref_now_always_calls_close=28=29_on_an_iterable_respons?= =?utf-8?q?e=2E?= Message-ID: <3Xl07z42dmzR8K@mail.python.org> http://hg.python.org/cpython/rev/d5af1b235dab changeset: 79866:d5af1b235dab branch: 2.7 parent: 79855:c0a423ce4b96 user: Antoine Pitrou date: Sun Oct 21 14:09:05 2012 +0200 summary: Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. files: Lib/test/test_wsgiref.py | 50 ++++++++++----------------- Lib/wsgiref/handlers.py | 12 +++-- Misc/ACKS | 1 + Misc/NEWS | 3 + 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -591,40 +591,28 @@ (stdpat%(version,sw), h.stdout.getvalue()) ) -# This epilogue is needed for compatibility with the Python 2.5 regrtest module + def testCloseOnError(self): + side_effects = {'close_called': False} + MSG = b"Some output has been sent" + def error_app(e,s): + s("200 OK",[])(MSG) + class CrashyIterable(object): + def __iter__(self): + while True: + yield b'blah' + raise AssertionError("This should be caught by handler") + + def close(self): + side_effects['close_called'] = True + return CrashyIterable() + + h = ErrorHandler() + h.run(error_app) + self.assertEqual(side_effects['close_called'], True) + def test_main(): test_support.run_unittest(__name__) if __name__ == "__main__": test_main() - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# the above lines intentionally left blank diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -122,11 +122,13 @@ in the event loop to iterate over the data, and to call 'self.close()' once the response is finished. """ - if not self.result_is_file() or not self.sendfile(): - for data in self.result: - self.write(data) - self.finish_content() - self.close() + try: + if not self.result_is_file() or not self.sendfile(): + for data in self.result: + self.write(data) + self.finish_content() + finally: + self.close() def get_scheme(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -985,6 +985,7 @@ Laurence Tratt John Tromp Jason Trowbridge +Brent Tubbs Anthony Tuininga David Turner Stephen Turner diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,9 @@ Library ------- +- Issue #16220: wsgiref now always calls close() on an iterable response. + Patch by Brent Tubbs. + - Issue #16176: Properly identify Windows 8 via platform.platform() - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 14:12:32 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 14:12:32 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_whacky_spa?= =?utf-8?q?cing_in_test=5Fwsgiref?= Message-ID: <3Xl09X3NW1zR2f@mail.python.org> http://hg.python.org/cpython/rev/437a12f6dc9c changeset: 79867:437a12f6dc9c branch: 2.7 user: Antoine Pitrou date: Sun Oct 21 14:10:29 2012 +0200 summary: Fix whacky spacing in test_wsgiref files: Lib/test/test_wsgiref.py | 58 ---------------------------- 1 files changed, 0 insertions(+), 58 deletions(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -39,9 +39,6 @@ pass - - - def hello_app(environ,start_response): start_response("200 OK", [ ('Content-Type','text/plain'), @@ -62,27 +59,6 @@ return out.getvalue(), err.getvalue() - - - - - - - - - - - - - - - - - - - - - def compare_generic_iter(make_it,match): """Utility to compare a generic 2.1/2.2+ iterator with an iterable @@ -120,10 +96,6 @@ raise AssertionError("Too many items from .next()",it) - - - - class IntegrationTests(TestCase): def check_hello(self, out, has_length=True): @@ -161,10 +133,6 @@ ) - - - - class UtilityTests(TestCase): def checkShift(self,sn_in,pi_in,part,sn_out,pi_out): @@ -201,11 +169,6 @@ util.setup_testing_defaults(kw) self.assertEqual(util.request_uri(kw,query),uri) - - - - - def checkFW(self,text,size,match): def make_it(text=text,size=size): @@ -224,7 +187,6 @@ it.close() self.assertTrue(it.filelike.closed) - def testSimpleShifts(self): self.checkShift('','/', '', '/', '') self.checkShift('','/x', 'x', '/x', '') @@ -232,7 +194,6 @@ self.checkShift('/a','/x/y', 'x', '/a/x', '/y') self.checkShift('/a','/x/', 'x', '/a/x', '/') - def testNormalizedShifts(self): self.checkShift('/a/b', '/../y', '..', '/a', '/y') self.checkShift('', '/../y', '..', '', '/y') @@ -246,7 +207,6 @@ self.checkShift('/a/b', '/x//', 'x', '/a/b/x', '/') self.checkShift('/a/b', '/.', None, '/a/b', '') - def testDefaults(self): for key, value in [ ('SERVER_NAME','127.0.0.1'), @@ -266,7 +226,6 @@ ]: self.checkDefault(key,value) - def testCrossDefaults(self): self.checkCrossDefault('HTTP_HOST',"foo.bar",SERVER_NAME="foo.bar") self.checkCrossDefault('wsgi.url_scheme',"https",HTTPS="on") @@ -276,7 +235,6 @@ self.checkCrossDefault('SERVER_PORT',"80",HTTPS="foo") self.checkCrossDefault('SERVER_PORT',"443",HTTPS="on") - def testGuessScheme(self): self.assertEqual(util.guess_scheme({}), "http") self.assertEqual(util.guess_scheme({'HTTPS':"foo"}), "http") @@ -284,10 +242,6 @@ self.assertEqual(util.guess_scheme({'HTTPS':"yes"}), "https") self.assertEqual(util.guess_scheme({'HTTPS':"1"}), "https") - - - - def testAppURIs(self): self.checkAppURI("http://127.0.0.1/") self.checkAppURI("http://127.0.0.1/spam", SCRIPT_NAME="/spam") @@ -411,15 +365,6 @@ raise # for testing, we want to see what's happening - - - - - - - - - class HandlerTests(TestCase): def checkEnvironAttrs(self, handler): @@ -460,7 +405,6 @@ h=TestHandler(); h.setup_environ() self.assertEqual(h.environ['wsgi.url_scheme'],'http') - def testAbstractMethods(self): h = BaseHandler() for name in [ @@ -469,7 +413,6 @@ self.assertRaises(NotImplementedError, getattr(h,name)) self.assertRaises(NotImplementedError, h._write, "test") - def testContentLength(self): # Demo one reason iteration is better than write()... ;) @@ -549,7 +492,6 @@ "\r\n"+MSG) self.assertNotEqual(h.stderr.getvalue().find("AssertionError"), -1) - def testHeaderFormats(self): def non_error_app(e,s): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 14:17:13 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 14:17:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjIw?= =?utf-8?q?=3A_wsgiref_now_always_calls_close=28=29_on_an_iterable_respons?= =?utf-8?q?e=2E?= Message-ID: <3Xl0Gx1C0vzR2v@mail.python.org> http://hg.python.org/cpython/rev/eef470032457 changeset: 79868:eef470032457 branch: 3.2 parent: 79856:566b7574becb user: Antoine Pitrou date: Sun Oct 21 14:09:05 2012 +0200 summary: Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. files: Lib/test/test_wsgiref.py | 49 ++++++++++----------------- Lib/wsgiref/handlers.py | 12 ++++-- Misc/ACKS | 1 + Misc/NEWS | 3 + 4 files changed, 29 insertions(+), 36 deletions(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -656,40 +656,27 @@ b"data", h.stdout.getvalue()) -# This epilogue is needed for compatibility with the Python 2.5 regrtest module + def testCloseOnError(self): + side_effects = {'close_called': False} + MSG = b"Some output has been sent" + def error_app(e,s): + s("200 OK",[])(MSG) + class CrashyIterable(object): + def __iter__(self): + while True: + yield b'blah' + raise AssertionError("This should be caught by handler") + def close(self): + side_effects['close_called'] = True + return CrashyIterable() + + h = ErrorHandler() + h.run(error_app) + self.assertEqual(side_effects['close_called'], True) + def test_main(): support.run_unittest(__name__) if __name__ == "__main__": test_main() - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# the above lines intentionally left blank diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -174,11 +174,13 @@ in the event loop to iterate over the data, and to call 'self.close()' once the response is finished. """ - if not self.result_is_file() or not self.sendfile(): - for data in self.result: - self.write(data) - self.finish_content() - self.close() + try: + if not self.result_is_file() or not self.sendfile(): + for data in self.result: + self.write(data) + self.finish_content() + finally: + self.close() def get_scheme(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1067,6 +1067,7 @@ Laurence Tratt John Tromp Jason Trowbridge +Brent Tubbs Anthony Tuininga Erno Tukia David Turner diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -132,6 +132,9 @@ Library ------- +- Issue #16220: wsgiref now always calls close() on an iterable response. + Patch by Brent Tubbs. + - Issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. Patch by Giampaolo Rodola'. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 14:17:14 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 14:17:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_whacky_spa?= =?utf-8?q?cking_in_test=5Fwsgiref?= Message-ID: <3Xl0Gy4ksdzR9Q@mail.python.org> http://hg.python.org/cpython/rev/058fcf5eb644 changeset: 79869:058fcf5eb644 branch: 3.2 user: Antoine Pitrou date: Sun Oct 21 14:13:32 2012 +0200 summary: Fix whacky spacking in test_wsgiref files: Lib/test/test_wsgiref.py | 57 ---------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -39,9 +39,6 @@ pass - - - def hello_app(environ,start_response): start_response("200 OK", [ ('Content-Type','text/plain'), @@ -63,28 +60,6 @@ return out.getvalue(), err.getvalue() - - - - - - - - - - - - - - - - - - - - - - def compare_generic_iter(make_it,match): """Utility to compare a generic 2.1/2.2+ iterator with an iterable @@ -122,10 +97,6 @@ raise AssertionError("Too many items from .__next__()", it) - - - - class IntegrationTests(TestCase): def check_hello(self, out, has_length=True): @@ -195,8 +166,6 @@ out) - - class UtilityTests(TestCase): def checkShift(self,sn_in,pi_in,part,sn_out,pi_out): @@ -235,11 +204,6 @@ util.setup_testing_defaults(kw) self.assertEqual(util.request_uri(kw,query),uri) - - - - - def checkFW(self,text,size,match): def make_it(text=text,size=size): @@ -258,7 +222,6 @@ it.close() self.assertTrue(it.filelike.closed) - def testSimpleShifts(self): self.checkShift('','/', '', '/', '') self.checkShift('','/x', 'x', '/x', '') @@ -266,7 +229,6 @@ self.checkShift('/a','/x/y', 'x', '/a/x', '/y') self.checkShift('/a','/x/', 'x', '/a/x', '/') - def testNormalizedShifts(self): self.checkShift('/a/b', '/../y', '..', '/a', '/y') self.checkShift('', '/../y', '..', '', '/y') @@ -280,7 +242,6 @@ self.checkShift('/a/b', '/x//', 'x', '/a/b/x', '/') self.checkShift('/a/b', '/.', None, '/a/b', '') - def testDefaults(self): for key, value in [ ('SERVER_NAME','127.0.0.1'), @@ -300,7 +261,6 @@ ]: self.checkDefault(key,value) - def testCrossDefaults(self): self.checkCrossDefault('HTTP_HOST',"foo.bar",SERVER_NAME="foo.bar") self.checkCrossDefault('wsgi.url_scheme',"https",HTTPS="on") @@ -310,7 +270,6 @@ self.checkCrossDefault('SERVER_PORT',"80",HTTPS="foo") self.checkCrossDefault('SERVER_PORT',"443",HTTPS="on") - def testGuessScheme(self): self.assertEqual(util.guess_scheme({}), "http") self.assertEqual(util.guess_scheme({'HTTPS':"foo"}), "http") @@ -318,10 +277,6 @@ self.assertEqual(util.guess_scheme({'HTTPS':"yes"}), "https") self.assertEqual(util.guess_scheme({'HTTPS':"1"}), "https") - - - - def testAppURIs(self): self.checkAppURI("http://127.0.0.1/") self.checkAppURI("http://127.0.0.1/spam", SCRIPT_NAME="/spam") @@ -446,15 +401,6 @@ raise # for testing, we want to see what's happening - - - - - - - - - class HandlerTests(TestCase): def checkEnvironAttrs(self, handler): @@ -495,7 +441,6 @@ h=TestHandler(); h.setup_environ() self.assertEqual(h.environ['wsgi.url_scheme'],'http') - def testAbstractMethods(self): h = BaseHandler() for name in [ @@ -504,7 +449,6 @@ self.assertRaises(NotImplementedError, getattr(h,name)) self.assertRaises(NotImplementedError, h._write, "test") - def testContentLength(self): # Demo one reason iteration is better than write()... ;) @@ -596,7 +540,6 @@ "\r\n".encode("iso-8859-1")+MSG)) self.assertIn("AssertionError", h.stderr.getvalue()) - def testHeaderFormats(self): def non_error_app(e,s): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 14:17:16 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 14:17:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316220=3A_wsgiref_now_always_calls_close=28=29_on_an_i?= =?utf-8?q?terable_response=2E?= Message-ID: <3Xl0H00zM1zR8K@mail.python.org> http://hg.python.org/cpython/rev/2530acc092d8 changeset: 79870:2530acc092d8 branch: 3.3 parent: 79864:265fe07f55ec parent: 79869:058fcf5eb644 user: Antoine Pitrou date: Sun Oct 21 14:14:34 2012 +0200 summary: Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. files: Lib/test/test_wsgiref.py | 106 ++++---------------------- Lib/wsgiref/handlers.py | 12 +- Misc/ACKS | 1 + Misc/NEWS | 3 + 4 files changed, 29 insertions(+), 93 deletions(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -41,9 +41,6 @@ pass - - - def hello_app(environ,start_response): start_response("200 OK", [ ('Content-Type','text/plain'), @@ -65,28 +62,6 @@ return out.getvalue(), err.getvalue() - - - - - - - - - - - - - - - - - - - - - - def compare_generic_iter(make_it,match): """Utility to compare a generic 2.1/2.2+ iterator with an iterable @@ -124,10 +99,6 @@ raise AssertionError("Too many items from .__next__()", it) - - - - class IntegrationTests(TestCase): def check_hello(self, out, has_length=True): @@ -201,8 +172,6 @@ out) - - class UtilityTests(TestCase): def checkShift(self,sn_in,pi_in,part,sn_out,pi_out): @@ -241,11 +210,6 @@ util.setup_testing_defaults(kw) self.assertEqual(util.request_uri(kw,query),uri) - - - - - def checkFW(self,text,size,match): def make_it(text=text,size=size): @@ -264,7 +228,6 @@ it.close() self.assertTrue(it.filelike.closed) - def testSimpleShifts(self): self.checkShift('','/', '', '/', '') self.checkShift('','/x', 'x', '/x', '') @@ -272,7 +235,6 @@ self.checkShift('/a','/x/y', 'x', '/a/x', '/y') self.checkShift('/a','/x/', 'x', '/a/x', '/') - def testNormalizedShifts(self): self.checkShift('/a/b', '/../y', '..', '/a', '/y') self.checkShift('', '/../y', '..', '', '/y') @@ -286,7 +248,6 @@ self.checkShift('/a/b', '/x//', 'x', '/a/b/x', '/') self.checkShift('/a/b', '/.', None, '/a/b', '') - def testDefaults(self): for key, value in [ ('SERVER_NAME','127.0.0.1'), @@ -306,7 +267,6 @@ ]: self.checkDefault(key,value) - def testCrossDefaults(self): self.checkCrossDefault('HTTP_HOST',"foo.bar",SERVER_NAME="foo.bar") self.checkCrossDefault('wsgi.url_scheme',"https",HTTPS="on") @@ -316,7 +276,6 @@ self.checkCrossDefault('SERVER_PORT',"80",HTTPS="foo") self.checkCrossDefault('SERVER_PORT',"443",HTTPS="on") - def testGuessScheme(self): self.assertEqual(util.guess_scheme({}), "http") self.assertEqual(util.guess_scheme({'HTTPS':"foo"}), "http") @@ -324,10 +283,6 @@ self.assertEqual(util.guess_scheme({'HTTPS':"yes"}), "https") self.assertEqual(util.guess_scheme({'HTTPS':"1"}), "https") - - - - def testAppURIs(self): self.checkAppURI("http://127.0.0.1/") self.checkAppURI("http://127.0.0.1/spam", SCRIPT_NAME="/spam") @@ -452,15 +407,6 @@ raise # for testing, we want to see what's happening - - - - - - - - - class HandlerTests(TestCase): def checkEnvironAttrs(self, handler): @@ -501,7 +447,6 @@ h=TestHandler(); h.setup_environ() self.assertEqual(h.environ['wsgi.url_scheme'],'http') - def testAbstractMethods(self): h = BaseHandler() for name in [ @@ -510,7 +455,6 @@ self.assertRaises(NotImplementedError, getattr(h,name)) self.assertRaises(NotImplementedError, h._write, "test") - def testContentLength(self): # Demo one reason iteration is better than write()... ;) @@ -602,7 +546,6 @@ "\r\n".encode("iso-8859-1")+MSG)) self.assertIn("AssertionError", h.stderr.getvalue()) - def testHeaderFormats(self): def non_error_app(e,s): @@ -662,40 +605,27 @@ b"data", h.stdout.getvalue()) -# This epilogue is needed for compatibility with the Python 2.5 regrtest module + def testCloseOnError(self): + side_effects = {'close_called': False} + MSG = b"Some output has been sent" + def error_app(e,s): + s("200 OK",[])(MSG) + class CrashyIterable(object): + def __iter__(self): + while True: + yield b'blah' + raise AssertionError("This should be caught by handler") + def close(self): + side_effects['close_called'] = True + return CrashyIterable() + + h = ErrorHandler() + h.run(error_app) + self.assertEqual(side_effects['close_called'], True) + def test_main(): support.run_unittest(__name__) if __name__ == "__main__": test_main() - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# the above lines intentionally left blank diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -174,11 +174,13 @@ in the event loop to iterate over the data, and to call 'self.close()' once the response is finished. """ - if not self.result_is_file() or not self.sendfile(): - for data in self.result: - self.write(data) - self.finish_content() - self.close() + try: + if not self.result_is_file() or not self.sendfile(): + for data in self.result: + self.write(data) + self.finish_content() + finally: + self.close() def get_scheme(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1178,6 +1178,7 @@ Matthias Troffaes John Tromp Jason Trowbridge +Brent Tubbs Anthony Tuininga Erno Tukia David Turner diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,9 @@ Library ------- +- Issue #16220: wsgiref now always calls close() on an iterable response. + Patch by Brent Tubbs. + - Issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. Patch by Giampaolo Rodola'. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 14:17:17 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 14:17:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316220=3A_wsgiref_now_always_calls_close=28=29_o?= =?utf-8?q?n_an_iterable_response=2E?= Message-ID: <3Xl0H14ZH2zR9B@mail.python.org> http://hg.python.org/cpython/rev/cf3a739345c6 changeset: 79871:cf3a739345c6 parent: 79865:e0b029e7bffa parent: 79870:2530acc092d8 user: Antoine Pitrou date: Sun Oct 21 14:15:06 2012 +0200 summary: Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. files: Lib/test/test_wsgiref.py | 106 ++++---------------------- Lib/wsgiref/handlers.py | 12 +- Misc/ACKS | 1 + Misc/NEWS | 3 + 4 files changed, 29 insertions(+), 93 deletions(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -41,9 +41,6 @@ pass - - - def hello_app(environ,start_response): start_response("200 OK", [ ('Content-Type','text/plain'), @@ -65,28 +62,6 @@ return out.getvalue(), err.getvalue() - - - - - - - - - - - - - - - - - - - - - - def compare_generic_iter(make_it,match): """Utility to compare a generic 2.1/2.2+ iterator with an iterable @@ -124,10 +99,6 @@ raise AssertionError("Too many items from .__next__()", it) - - - - class IntegrationTests(TestCase): def check_hello(self, out, has_length=True): @@ -201,8 +172,6 @@ out) - - class UtilityTests(TestCase): def checkShift(self,sn_in,pi_in,part,sn_out,pi_out): @@ -241,11 +210,6 @@ util.setup_testing_defaults(kw) self.assertEqual(util.request_uri(kw,query),uri) - - - - - def checkFW(self,text,size,match): def make_it(text=text,size=size): @@ -264,7 +228,6 @@ it.close() self.assertTrue(it.filelike.closed) - def testSimpleShifts(self): self.checkShift('','/', '', '/', '') self.checkShift('','/x', 'x', '/x', '') @@ -272,7 +235,6 @@ self.checkShift('/a','/x/y', 'x', '/a/x', '/y') self.checkShift('/a','/x/', 'x', '/a/x', '/') - def testNormalizedShifts(self): self.checkShift('/a/b', '/../y', '..', '/a', '/y') self.checkShift('', '/../y', '..', '', '/y') @@ -286,7 +248,6 @@ self.checkShift('/a/b', '/x//', 'x', '/a/b/x', '/') self.checkShift('/a/b', '/.', None, '/a/b', '') - def testDefaults(self): for key, value in [ ('SERVER_NAME','127.0.0.1'), @@ -306,7 +267,6 @@ ]: self.checkDefault(key,value) - def testCrossDefaults(self): self.checkCrossDefault('HTTP_HOST',"foo.bar",SERVER_NAME="foo.bar") self.checkCrossDefault('wsgi.url_scheme',"https",HTTPS="on") @@ -316,7 +276,6 @@ self.checkCrossDefault('SERVER_PORT',"80",HTTPS="foo") self.checkCrossDefault('SERVER_PORT',"443",HTTPS="on") - def testGuessScheme(self): self.assertEqual(util.guess_scheme({}), "http") self.assertEqual(util.guess_scheme({'HTTPS':"foo"}), "http") @@ -324,10 +283,6 @@ self.assertEqual(util.guess_scheme({'HTTPS':"yes"}), "https") self.assertEqual(util.guess_scheme({'HTTPS':"1"}), "https") - - - - def testAppURIs(self): self.checkAppURI("http://127.0.0.1/") self.checkAppURI("http://127.0.0.1/spam", SCRIPT_NAME="/spam") @@ -452,15 +407,6 @@ raise # for testing, we want to see what's happening - - - - - - - - - class HandlerTests(TestCase): def checkEnvironAttrs(self, handler): @@ -501,7 +447,6 @@ h=TestHandler(); h.setup_environ() self.assertEqual(h.environ['wsgi.url_scheme'],'http') - def testAbstractMethods(self): h = BaseHandler() for name in [ @@ -510,7 +455,6 @@ self.assertRaises(NotImplementedError, getattr(h,name)) self.assertRaises(NotImplementedError, h._write, "test") - def testContentLength(self): # Demo one reason iteration is better than write()... ;) @@ -602,7 +546,6 @@ "\r\n".encode("iso-8859-1")+MSG)) self.assertIn("AssertionError", h.stderr.getvalue()) - def testHeaderFormats(self): def non_error_app(e,s): @@ -662,40 +605,27 @@ b"data", h.stdout.getvalue()) -# This epilogue is needed for compatibility with the Python 2.5 regrtest module + def testCloseOnError(self): + side_effects = {'close_called': False} + MSG = b"Some output has been sent" + def error_app(e,s): + s("200 OK",[])(MSG) + class CrashyIterable(object): + def __iter__(self): + while True: + yield b'blah' + raise AssertionError("This should be caught by handler") + def close(self): + side_effects['close_called'] = True + return CrashyIterable() + + h = ErrorHandler() + h.run(error_app) + self.assertEqual(side_effects['close_called'], True) + def test_main(): support.run_unittest(__name__) if __name__ == "__main__": test_main() - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# the above lines intentionally left blank diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -174,11 +174,13 @@ in the event loop to iterate over the data, and to call 'self.close()' once the response is finished. """ - if not self.result_is_file() or not self.sendfile(): - for data in self.result: - self.write(data) - self.finish_content() - self.close() + try: + if not self.result_is_file() or not self.sendfile(): + for data in self.result: + self.write(data) + self.finish_content() + finally: + self.close() def get_scheme(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1178,6 +1178,7 @@ Matthias Troffaes John Tromp Jason Trowbridge +Brent Tubbs Anthony Tuininga Erno Tukia David Turner diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #16220: wsgiref now always calls close() on an iterable response. + Patch by Brent Tubbs. + - Issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. Patch by Giampaolo Rodola'. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 16:35:38 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 16:35:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2312034=3A_Fix_bogu?= =?utf-8?q?s_caching_of_result_in_check=5FGetFinalPathNameByHandle=2E?= Message-ID: <3Xl3Lf4wGyzQvw@mail.python.org> http://hg.python.org/cpython/rev/8afa3ce5ff3e changeset: 79872:8afa3ce5ff3e user: Antoine Pitrou date: Sun Oct 21 16:33:33 2012 +0200 summary: Issue #12034: Fix bogus caching of result in check_GetFinalPathNameByHandle. Patch by Atsuo Ishimoto. files: Misc/NEWS | 3 +++ Modules/posixmodule.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #12034: Fix bogus caching of result in check_GetFinalPathNameByHandle. + Patch by Atsuo Ishimoto. + - Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1390,7 +1390,7 @@ } /* Grab GetFinalPathNameByHandle dynamically from kernel32 */ -static int has_GetFinalPathNameByHandle = 0; +static int has_GetFinalPathNameByHandle = -1; static DWORD (CALLBACK *Py_GetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD); static int @@ -1401,7 +1401,7 @@ DWORD); /* only recheck */ - if (!has_GetFinalPathNameByHandle) + if (-1 == has_GetFinalPathNameByHandle) { hKernel32 = GetModuleHandleW(L"KERNEL32"); *(FARPROC*)&Py_GetFinalPathNameByHandleA = GetProcAddress(hKernel32, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 17:01:03 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 17:01:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316034_follow-up?= =?utf-8?q?=3A_Apply_optimizations_to_the_lzma_module=2E?= Message-ID: <3Xl3vz5pwjzR7q@mail.python.org> http://hg.python.org/cpython/rev/cc02eca14526 changeset: 79873:cc02eca14526 user: Nadeem Vawda date: Sun Oct 21 16:57:32 2012 +0200 summary: Issue #16034 follow-up: Apply optimizations to the lzma module. files: Lib/lzma.py | 99 ++++++++++++++++++++++++++++------------ Misc/NEWS | 2 + 2 files changed, 72 insertions(+), 29 deletions(-) diff --git a/Lib/lzma.py b/Lib/lzma.py --- a/Lib/lzma.py +++ b/Lib/lzma.py @@ -110,7 +110,8 @@ # stream will need a separate decompressor object. self._init_args = {"format":format, "filters":filters} self._decompressor = LZMADecompressor(**self._init_args) - self._buffer = None + self._buffer = b"" + self._buffer_offset = 0 elif mode in ("w", "wb", "a", "ab"): if format is None: format = FORMAT_XZ @@ -143,7 +144,7 @@ try: if self._mode in (_MODE_READ, _MODE_READ_EOF): self._decompressor = None - self._buffer = None + self._buffer = b"" elif self._mode == _MODE_WRITE: self._fp.write(self._compressor.flush()) self._compressor = None @@ -187,15 +188,18 @@ raise ValueError("I/O operation on closed file") def _check_can_read(self): - if not self.readable(): + if self._mode not in (_MODE_READ, _MODE_READ_EOF): + self._check_not_closed() raise io.UnsupportedOperation("File not open for reading") def _check_can_write(self): - if not self.writable(): + if self._mode != _MODE_WRITE: + self._check_not_closed() raise io.UnsupportedOperation("File not open for writing") def _check_can_seek(self): - if not self.readable(): + if self._mode not in (_MODE_READ, _MODE_READ_EOF): + self._check_not_closed() raise io.UnsupportedOperation("Seeking is only supported " "on files open for reading") if not self._fp.seekable(): @@ -204,16 +208,13 @@ # Fill the readahead buffer if it is empty. Returns False on EOF. def _fill_buffer(self): + if self._mode == _MODE_READ_EOF: + return False # Depending on the input data, our call to the decompressor may not # return any data. In this case, try again after reading another block. - while True: - if self._buffer: - return True - - if self._decompressor.unused_data: - rawblock = self._decompressor.unused_data - else: - rawblock = self._fp.read(_BUFFER_SIZE) + while self._buffer_offset == len(self._buffer): + rawblock = (self._decompressor.unused_data or + self._fp.read(_BUFFER_SIZE)) if not rawblock: if self._decompressor.eof: @@ -229,30 +230,48 @@ self._decompressor = LZMADecompressor(**self._init_args) self._buffer = self._decompressor.decompress(rawblock) + self._buffer_offset = 0 + return True # Read data until EOF. # If return_data is false, consume the data without returning it. def _read_all(self, return_data=True): + # The loop assumes that _buffer_offset is 0. Ensure that this is true. + self._buffer = self._buffer[self._buffer_offset:] + self._buffer_offset = 0 + blocks = [] while self._fill_buffer(): if return_data: blocks.append(self._buffer) self._pos += len(self._buffer) - self._buffer = None + self._buffer = b"" if return_data: return b"".join(blocks) # Read a block of up to n bytes. # If return_data is false, consume the data without returning it. def _read_block(self, n, return_data=True): + # If we have enough data buffered, return immediately. + end = self._buffer_offset + n + if end <= len(self._buffer): + data = self._buffer[self._buffer_offset : end] + self._buffer_offset = end + self._pos += len(data) + return data if return_data else None + + # The loop assumes that _buffer_offset is 0. Ensure that this is true. + self._buffer = self._buffer[self._buffer_offset:] + self._buffer_offset = 0 + blocks = [] while n > 0 and self._fill_buffer(): if n < len(self._buffer): data = self._buffer[:n] - self._buffer = self._buffer[n:] + self._buffer_offset = n else: data = self._buffer - self._buffer = None + self._buffer = b"" if return_data: blocks.append(data) self._pos += len(data) @@ -267,9 +286,9 @@ The exact number of bytes returned is unspecified. """ self._check_can_read() - if self._mode == _MODE_READ_EOF or not self._fill_buffer(): + if not self._fill_buffer(): return b"" - return self._buffer + return self._buffer[self._buffer_offset:] def read(self, size=-1): """Read up to size uncompressed bytes from the file. @@ -278,7 +297,7 @@ Returns b"" if the file is already at EOF. """ self._check_can_read() - if self._mode == _MODE_READ_EOF or size == 0: + if size == 0: return b"" elif size < 0: return self._read_all() @@ -295,18 +314,40 @@ # this does not give enough data for the decompressor to make progress. # In this case we make multiple reads, to avoid returning b"". self._check_can_read() - if (size == 0 or self._mode == _MODE_READ_EOF or - not self._fill_buffer()): + if (size == 0 or + # Only call _fill_buffer() if the buffer is actually empty. + # This gives a significant speedup if *size* is small. + (self._buffer_offset == len(self._buffer) and not self._fill_buffer())): return b"" - if 0 < size < len(self._buffer): - data = self._buffer[:size] - self._buffer = self._buffer[size:] + if size > 0: + data = self._buffer[self._buffer_offset : + self._buffer_offset + size] + self._buffer_offset += len(data) else: - data = self._buffer - self._buffer = None + data = self._buffer[self._buffer_offset:] + self._buffer = b"" + self._buffer_offset = 0 self._pos += len(data) return data + def readline(self, size=-1): + """Read a line of uncompressed bytes from the file. + + The terminating newline (if present) is retained. If size is + non-negative, no more than size bytes will be read (in which + case the line may be incomplete). Returns b'' if already at EOF. + """ + self._check_can_read() + # Shortcut for the common case - the whole line is in the buffer. + if size < 0: + end = self._buffer.find(b"\n", self._buffer_offset) + 1 + if end > 0: + line = self._buffer[self._buffer_offset : end] + self._buffer_offset = end + self._pos += len(line) + return line + return io.BufferedIOBase.readline(self, size) + def write(self, data): """Write a bytes object to the file. @@ -326,7 +367,8 @@ self._mode = _MODE_READ self._pos = 0 self._decompressor = LZMADecompressor(**self._init_args) - self._buffer = None + self._buffer = b"" + self._buffer_offset = 0 def seek(self, offset, whence=0): """Change the file position. @@ -365,8 +407,7 @@ offset -= self._pos # Read and discard data until we reach the desired position. - if self._mode != _MODE_READ_EOF: - self._read_block(offset, return_data=False) + self._read_block(offset, return_data=False) return self._pos diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,8 @@ - Issue #12034: Fix bogus caching of result in check_GetFinalPathNameByHandle. Patch by Atsuo Ishimoto. +- Improve performance of `lzma.LZMAFile`. + - Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 17:21:01 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 17:21:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Try_to_fix_issue_=2316264_?= =?utf-8?q?=28test=5Flogging_failure_on_some_buildbots=29=2E?= Message-ID: <3Xl4M11hqfzQt2@mail.python.org> http://hg.python.org/cpython/rev/0fb2267897ba changeset: 79874:0fb2267897ba user: Antoine Pitrou date: Sun Oct 21 17:18:27 2012 +0200 summary: Try to fix issue #16264 (test_logging failure on some buildbots). files: Lib/test/test_logging.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1441,9 +1441,12 @@ self.assertEqual(self.log_output, "spam\neggs\n") def test_noserver(self): + # Avoid timing-related failures due to SocketHandler's own hard-wired + # one-second timeout on socket.create_connection() (issue #16264). + self.sock_hdlr.retryStart = 2.5 # Kill the server self.server.stop(2.0) - #The logging call should try to connect, which should fail + # The logging call should try to connect, which should fail try: raise RuntimeError('Deliberate mistake') except RuntimeError: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 17:23:09 2012 From: python-checkins at python.org (antoine.pitrou) Date: Sun, 21 Oct 2012 17:23:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Build_the_=5Fsha3_module_w?= =?utf-8?q?ith_VS_2008=2E?= Message-ID: <3Xl4PT03YszQt2@mail.python.org> http://hg.python.org/cpython/rev/ce9c9cbd1b11 changeset: 79875:ce9c9cbd1b11 user: Antoine Pitrou date: Sun Oct 21 17:21:04 2012 +0200 summary: Build the _sha3 module with VS 2008. files: PC/VS9.0/pythoncore.vcproj | 4 ++++ PC/config.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/PC/VS9.0/pythoncore.vcproj b/PC/VS9.0/pythoncore.vcproj --- a/PC/VS9.0/pythoncore.vcproj +++ b/PC/VS9.0/pythoncore.vcproj @@ -1151,6 +1151,10 @@ > + + diff --git a/PC/config.c b/PC/config.c --- a/PC/config.c +++ b/PC/config.c @@ -22,6 +22,7 @@ extern PyObject* PyInit__sha1(void); extern PyObject* PyInit__sha256(void); extern PyObject* PyInit__sha512(void); +extern PyObject* PyInit__sha3(void); extern PyObject* PyInit_time(void); extern PyObject* PyInit__thread(void); #ifdef WIN32 @@ -93,6 +94,7 @@ {"_sha1", PyInit__sha1}, {"_sha256", PyInit__sha256}, {"_sha512", PyInit__sha512}, + {"_sha3", PyInit__sha3}, {"time", PyInit_time}, #ifdef WITH_THREAD {"_thread", PyInit__thread}, -- Repository URL: http://hg.python.org/cpython From christian at python.org Sun Oct 21 17:32:02 2012 From: christian at python.org (Christian Heimes) Date: Sun, 21 Oct 2012 17:32:02 +0200 Subject: [Python-checkins] cpython: Build the _sha3 module with VS 2008. In-Reply-To: <3Xl4PT03YszQt2@mail.python.org> References: <3Xl4PT03YszQt2@mail.python.org> Message-ID: <50841572.6040709@python.org> Am 21.10.2012 17:23, schrieb antoine.pitrou: > http://hg.python.org/cpython/rev/ce9c9cbd1b11 > changeset: 79875:ce9c9cbd1b11 > user: Antoine Pitrou > date: Sun Oct 21 17:21:04 2012 +0200 > summary: > Build the _sha3 module with VS 2008. For VS 2010 I decided against this approach and built the extension as a separate .pyd extension because the _sha3 module is rather large (> 200 kB). I think your change is going to break VS 2010. What do the other think? Should the code by built-in by default? From python-checkins at python.org Sun Oct 21 17:44:13 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 17:44:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2312692=3A_Fix_reso?= =?utf-8?q?urce_leak_in_urllib=2Erequest=2E?= Message-ID: <3Xl4sn1PzBzR6x@mail.python.org> http://hg.python.org/cpython/rev/92656b5df2f2 changeset: 79876:92656b5df2f2 user: Nadeem Vawda date: Sun Oct 21 17:37:43 2012 +0200 summary: Issue #12692: Fix resource leak in urllib.request. files: Lib/test/test_urllib2.py | 1 + Lib/urllib/request.py | 6 ++++++ Misc/NEWS | 3 +++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -302,6 +302,7 @@ self.req_headers = [] self.data = None self.raise_on_endheaders = False + self.sock = None self._tunnel_headers = {} def __call__(self, host, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1255,6 +1255,12 @@ raise URLError(err) else: r = h.getresponse() + # If the server does not send us a 'Connection: close' header, + # HTTPConnection assumes the socket should be left open. Manually + # mark the socket to be closed when this response object goes away. + if h.sock: + h.sock.close() + h.sock = None r.url = req.get_full_url() # This line replaces the .msg attribute of the HTTPResponse diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #12692: Fix resource leak in urllib.request when talking to an HTTP + server that does not include a "Connection: close" header in its responses. + - Issue #12034: Fix bogus caching of result in check_GetFinalPathNameByHandle. Patch by Atsuo Ishimoto. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 18:30:14 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 18:30:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzUxNDg6?= =?utf-8?q?_Ignore_=27U=27_in_mode_given_to_gzip=2Eopen=28=29_and_gzip=2EG?= =?utf-8?q?zipFile=28=29=2E?= Message-ID: <3Xl5tt1krszPP7@mail.python.org> http://hg.python.org/cpython/rev/e647229c422b changeset: 79877:e647229c422b branch: 2.7 parent: 79867:437a12f6dc9c user: Nadeem Vawda date: Sun Oct 21 18:15:05 2012 +0200 summary: Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile(). files: Lib/gzip.py | 4 ++++ Lib/test/test_gzip.py | 7 +++++++ Misc/NEWS | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Lib/gzip.py b/Lib/gzip.py --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -81,6 +81,10 @@ """ + # Make sure we don't inadvertently enable universal newlines on the + # underlying file object - in read mode, this causes data corruption. + if mode: + mode = mode.replace('U', '') # guarantee the file is opened in binary mode on platforms # that care about that sort of thing if mode and 'b' not in mode: diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -53,6 +53,13 @@ d = f.read() self.assertEqual(d, data1*50) + def test_read_universal_newlines(self): + # Issue #5148: Reading breaks when mode contains 'U'. + self.test_write() + with gzip.GzipFile(self.filename, 'rU') as f: + d = f.read() + self.assertEqual(d, data1*50) + def test_io_on_closed_object(self): # Test that I/O operations on closed GzipFile objects raise a # ValueError, just like the corresponding functions on file objects. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,8 @@ Library ------- +- Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile(). + - Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 21:22:11 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 21:22:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0Mzk4?= =?utf-8?q?=3A_Fix_size_truncation_and_overflow_bugs_in_bz2_module=2E?= Message-ID: <3Xl9jH0hK0zPGG@mail.python.org> http://hg.python.org/cpython/rev/ebb8c7d79f52 changeset: 79878:ebb8c7d79f52 branch: 3.2 parent: 79869:058fcf5eb644 user: Nadeem Vawda date: Sun Oct 21 21:13:27 2012 +0200 summary: Issue #14398: Fix size truncation and overflow bugs in bz2 module. files: Lib/test/test_bz2.py | 40 ++- Lib/test/testbz2_bigmem.bz2 | Bin Misc/NEWS | 2 + Modules/bz2module.c | 330 ++++++++++++----------- 4 files changed, 218 insertions(+), 154 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 from test import support -from test.support import TESTFN +from test.support import TESTFN, _4G, bigmemtest, findfile import unittest from io import BytesIO @@ -25,6 +25,9 @@ DATA = b'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`' DATA_CRLF = b'BZh91AY&SY\xaez\xbbN\x00\x01H\xdf\x80\x00\x12@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe0@\x01\xbc\xc6`\x86*\x8d=M\xa9\x9a\x86\xd0L@\x0fI\xa6!\xa1\x13\xc8\x88jdi\x8d@\x03@\x1a\x1a\x0c\x0c\x83 \x00\xc4h2\x19\x01\x82D\x84e\t\xe8\x99\x89\x19\x1ah\x00\r\x1a\x11\xaf\x9b\x0fG\xf5(\x1b\x1f?\t\x12\xcf\xb5\xfc\x95E\x00ps\x89\x12^\xa4\xdd\xa2&\x05(\x87\x04\x98\x89u\xe40%\xb6\x19\'\x8c\xc4\x89\xca\x07\x0e\x1b!\x91UIFU%C\x994!DI\xd2\xfa\xf0\xf1N8W\xde\x13A\xf5\x9cr%?\x9f3;I45A\xd1\x8bT\xb1\xa4\xc7\x8d\x1a\\"\xad\xa1\xabyBg\x15\xb9l\x88\x88\x91k"\x94\xa4\xd4\x89\xae*\xa6\x0b\x10\x0c\xd6\xd4m\xe86\xec\xb5j\x8a\x86j\';\xca.\x01I\xf2\xaaJ\xe8\x88\x8cU+t3\xfb\x0c\n\xa33\x13r2\r\x16\xe0\xb3(\xbf\x1d\x83r\xe7M\xf0D\x1365\xd8\x88\xd3\xa4\x92\xcb2\x06\x04\\\xc1\xb0\xea//\xbek&\xd8\xe6+t\xe5\xa1\x13\xada\x16\xder5"w]\xa2i\xb7[\x97R \xe2IT\xcd;Z\x04dk4\xad\x8a\t\xd3\x81z\x10\xf1:^`\xab\x1f\xc5\xdc\x91N\x14$+\x9e\xae\xd3\x80' + with open(findfile("testbz2_bigmem.bz2"), "rb") as f: + DATA_BIGMEM = f.read() + if has_cmdline_bunzip2: def decompress(self, data): pop = subprocess.Popen("bunzip2", shell=True, @@ -44,6 +47,7 @@ def decompress(self, data): return bz2.decompress(data) + class BZ2FileTest(BaseTest): "Test BZ2File type miscellaneous methods." @@ -313,6 +317,17 @@ data += bz2c.flush() self.assertEqual(self.decompress(data), self.TEXT) + @bigmemtest(size=_4G, memuse=1.25) + def testBigmem(self, size): + text = b"a" * size + bz2c = bz2.BZ2Compressor() + data = bz2c.compress(text) + bz2c.flush() + del text + text = self.decompress(data) + self.assertEqual(len(text), size) + self.assertEqual(text.strip(b"a"), b"") + + class BZ2DecompressorTest(BaseTest): def test_Constructor(self): self.assertRaises(TypeError, BZ2Decompressor, 42) @@ -351,6 +366,13 @@ text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, b"anything") + @bigmemtest(size=_4G, memuse=1.25, dry_run=False) + def testBigmem(self, unused_size): + # Issue #14398: decompression fails when output data is >=2GB. + text = bz2.BZ2Decompressor().decompress(self.DATA_BIGMEM) + self.assertEqual(len(text), _4G) + self.assertEqual(text.strip(b"\0"), b"") + class FuncTest(BaseTest): "Test module functions" @@ -374,6 +396,22 @@ # "Test decompress() function with incomplete data" self.assertRaises(ValueError, bz2.decompress, self.DATA[:-10]) + @bigmemtest(size=_4G, memuse=1.25) + def testCompressBigmem(self, size): + text = b"a" * size + data = bz2.compress(text) + del text + text = self.decompress(data) + self.assertEqual(len(text), size) + self.assertEqual(text.strip(b"a"), b"") + + @bigmemtest(size=_4G, memuse=1.25, dry_run=False) + def testDecompressBigmem(self, unused_size): + # Issue #14398: decompression fails when output data is >=2GB. + text = bz2.decompress(self.DATA_BIGMEM) + self.assertEqual(len(text), _4G) + self.assertEqual(text.strip(b"\0"), b"") + def test_main(): support.run_unittest( BZ2FileTest, diff --git a/Lib/test/testbz2_bigmem.bz2 b/Lib/test/testbz2_bigmem.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..c9a4616c8053b1c92a45023635c8610c26299fc2 GIT binary patch [stripped] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -132,6 +132,8 @@ Library ------- +- Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + - Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. diff --git a/Modules/bz2module.c b/Modules/bz2module.c --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -41,23 +41,8 @@ #define MODE_READ_EOF 2 #define MODE_WRITE 3 -#define BZ2FileObject_Check(v) (Py_TYPE(v) == &BZ2File_Type) - -#ifdef BZ_CONFIG_ERROR - -#if SIZEOF_LONG >= 8 -#define BZS_TOTAL_OUT(bzs) \ - (((long)bzs->total_out_hi32 << 32) + bzs->total_out_lo32) -#elif SIZEOF_LONG_LONG >= 8 -#define BZS_TOTAL_OUT(bzs) \ - (((PY_LONG_LONG)bzs->total_out_hi32 << 32) + bzs->total_out_lo32) -#else -#define BZS_TOTAL_OUT(bzs) \ - bzs->total_out_lo32 -#endif - -#else /* ! BZ_CONFIG_ERROR */ +#ifndef BZ_CONFIG_ERROR #define BZ2_bzRead bzRead #define BZ2_bzReadOpen bzReadOpen @@ -72,8 +57,6 @@ #define BZ2_bzDecompressInit bzDecompressInit #define BZ2_bzDecompressEnd bzDecompressEnd -#define BZS_TOTAL_OUT(bzs) bzs->total_out - #endif /* ! BZ_CONFIG_ERROR */ @@ -90,11 +73,7 @@ #define RELEASE_LOCK(obj) #endif -/* Bits in f_newlinetypes */ -#define NEWLINE_UNKNOWN 0 /* No newline seen, yet */ -#define NEWLINE_CR 1 /* \r newline seen */ -#define NEWLINE_LF 2 /* \n newline seen */ -#define NEWLINE_CRLF 4 /* \r\n newline seen */ +#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y)) /* ===================================================================== */ /* Structure definitions. */ @@ -228,6 +207,20 @@ return currentsize + (currentsize >> 3) + 6; } +static int +Util_GrowBuffer(PyObject **buf) +{ + size_t size = PyBytes_GET_SIZE(*buf); + size_t new_size = Util_NewBufferSize(size); + if (new_size > size) { + return _PyBytes_Resize(buf, new_size); + } else { /* overflow */ + PyErr_SetString(PyExc_OverflowError, + "Unable to allocate buffer - output too large"); + return -1; + } +} + /* This is a hacked version of Python's fileobject.c:get_line(). */ static PyObject * Util_GetLine(BZ2FileObject *f, int n) @@ -1418,20 +1411,16 @@ BZ2Comp_compress(BZ2CompObject *self, PyObject *args) { Py_buffer pdata; - char *data; - int datasize; - int bufsize = SMALLCHUNK; - PY_LONG_LONG totalout; + size_t input_left; + size_t output_size = 0; PyObject *ret = NULL; bz_stream *bzs = &self->bzs; int bzerror; if (!PyArg_ParseTuple(args, "y*:compress", &pdata)) return NULL; - data = pdata.buf; - datasize = pdata.len; - if (datasize == 0) { + if (pdata.len == 0) { PyBuffer_Release(&pdata); return PyBytes_FromStringAndSize("", 0); } @@ -1443,41 +1432,51 @@ goto error; } - ret = PyBytes_FromStringAndSize(NULL, bufsize); + ret = PyBytes_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) goto error; - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; - - totalout = BZS_TOTAL_OUT(bzs); + bzs->avail_out = PyBytes_GET_SIZE(ret); for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzCompress(bzs, BZ_RUN); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror != BZ_RUN_OK) { Util_CatchBZ2Error(bzerror); goto error; } - if (bzs->avail_in == 0) - break; /* no more input data */ + if (bzs->avail_in == 0) { + if (input_left == 0) + break; /* no more input data */ + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyBytes_Resize(&ret, bufsize) < 0) { - BZ2_bzCompressEnd(bzs); - goto error; + size_t buffer_left = PyBytes_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzCompressEnd(bzs); + goto error; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyBytes_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs) - - totalout); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (_PyBytes_Resize(&ret, - (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout)) < 0) + if (_PyBytes_Resize(&ret, output_size) < 0) goto error; RELEASE_LOCK(self); @@ -1501,33 +1500,34 @@ static PyObject * BZ2Comp_flush(BZ2CompObject *self) { - int bufsize = SMALLCHUNK; + size_t output_size = 0; PyObject *ret = NULL; bz_stream *bzs = &self->bzs; - PY_LONG_LONG totalout; int bzerror; ACQUIRE_LOCK(self); if (!self->running) { - PyErr_SetString(PyExc_ValueError, "object was already " - "flushed"); + PyErr_SetString(PyExc_ValueError, "object was already flushed"); goto error; } self->running = 0; - ret = PyBytes_FromStringAndSize(NULL, bufsize); + ret = PyBytes_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) goto error; bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; - - totalout = BZS_TOTAL_OUT(bzs); + bzs->avail_out = PyBytes_GET_SIZE(ret); for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzCompress(bzs, BZ_FINISH); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { break; } else if (bzerror != BZ_FINISH_OK) { @@ -1535,21 +1535,20 @@ goto error; } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyBytes_Resize(&ret, bufsize) < 0) - goto error; - bzs->next_out = BUF(ret); - bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs) - - totalout); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + size_t buffer_left = PyBytes_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) + goto error; + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyBytes_GET_SIZE(ret) - output_size; + } + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) { - if (_PyBytes_Resize(&ret, - (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout)) < 0) + if (output_size != PyBytes_GET_SIZE(ret)) + if (_PyBytes_Resize(&ret, output_size) < 0) goto error; - } RELEASE_LOCK(self); return ret; @@ -1714,18 +1713,14 @@ BZ2Decomp_decompress(BZ2DecompObject *self, PyObject *args) { Py_buffer pdata; - char *data; - int datasize; - int bufsize = SMALLCHUNK; - PY_LONG_LONG totalout; + size_t input_left; + size_t output_size = 0; PyObject *ret = NULL; bz_stream *bzs = &self->bzs; int bzerror; if (!PyArg_ParseTuple(args, "y*:decompress", &pdata)) return NULL; - data = pdata.buf; - datasize = pdata.len; ACQUIRE_LOCK(self); if (!self->running) { @@ -1734,55 +1729,65 @@ goto error; } - ret = PyBytes_FromStringAndSize(NULL, bufsize); + ret = PyBytes_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) goto error; - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; - - totalout = BZS_TOTAL_OUT(bzs); + bzs->avail_out = PyBytes_GET_SIZE(ret); for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzDecompress(bzs); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { - if (bzs->avail_in != 0) { + self->running = 0; + input_left += bzs->avail_in; + if (input_left != 0) { Py_DECREF(self->unused_data); self->unused_data = - PyBytes_FromStringAndSize(bzs->next_in, - bzs->avail_in); + PyBytes_FromStringAndSize(bzs->next_in, input_left); + if (self->unused_data == NULL) + goto error; } - self->running = 0; break; } if (bzerror != BZ_OK) { Util_CatchBZ2Error(bzerror); goto error; } - if (bzs->avail_in == 0) - break; /* no more input data */ + if (bzs->avail_in == 0) { + if (input_left == 0) + break; /* no more input data */ + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyBytes_Resize(&ret, bufsize) < 0) { - BZ2_bzDecompressEnd(bzs); - goto error; + size_t buffer_left = PyBytes_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzDecompressEnd(bzs); + goto error; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyBytes_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret); - bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs) - - totalout); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) { - if (_PyBytes_Resize(&ret, - (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout)) < 0) + if (output_size != PyBytes_GET_SIZE(ret)) + if (_PyBytes_Resize(&ret, output_size) < 0) goto error; - } RELEASE_LOCK(self); PyBuffer_Release(&pdata); @@ -1929,10 +1934,10 @@ bz2_compress(PyObject *self, PyObject *args, PyObject *kwargs) { int compresslevel=9; + int action; Py_buffer pdata; - char *data; - int datasize; - int bufsize; + size_t input_left; + size_t output_size = 0; PyObject *ret = NULL; bz_stream _bzs; bz_stream *bzs = &_bzs; @@ -1943,8 +1948,6 @@ kwlist, &pdata, &compresslevel)) return NULL; - data = pdata.buf; - datasize = pdata.len; if (compresslevel < 1 || compresslevel > 9) { PyErr_SetString(PyExc_ValueError, @@ -1953,11 +1956,7 @@ return NULL; } - /* Conforming to bz2 manual, this is large enough to fit compressed - * data in one shot. We will check it later anyway. */ - bufsize = datasize + (datasize/100+1) + 600; - - ret = PyBytes_FromStringAndSize(NULL, bufsize); + ret = PyBytes_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) { PyBuffer_Release(&pdata); return NULL; @@ -1965,10 +1964,12 @@ memset(bzs, 0, sizeof(bz_stream)); - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; + bzs->avail_out = PyBytes_GET_SIZE(ret); bzerror = BZ2_bzCompressInit(bzs, compresslevel, 0, 0); if (bzerror != BZ_OK) { @@ -1978,38 +1979,53 @@ return NULL; } + action = BZ_RUN; + for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS - bzerror = BZ2_bzCompress(bzs, BZ_FINISH); + saved_next_out = bzs->next_out; + bzerror = BZ2_bzCompress(bzs, action); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { break; - } else if (bzerror != BZ_FINISH_OK) { + } else if (bzerror != BZ_RUN_OK && bzerror != BZ_FINISH_OK) { BZ2_bzCompressEnd(bzs); Util_CatchBZ2Error(bzerror); PyBuffer_Release(&pdata); Py_DECREF(ret); return NULL; } + if (action == BZ_RUN && bzs->avail_in == 0) { + if (input_left == 0) { + action = BZ_FINISH; + } else { + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } + } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyBytes_Resize(&ret, bufsize) < 0) { - BZ2_bzCompressEnd(bzs); - PyBuffer_Release(&pdata); - return NULL; + size_t buffer_left = PyBytes_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzCompressEnd(bzs); + PyBuffer_Release(&pdata); + return NULL; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyBytes_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret) + BZS_TOTAL_OUT(bzs); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) { - if (_PyBytes_Resize(&ret, (Py_ssize_t)BZS_TOTAL_OUT(bzs)) < 0) { - ret = NULL; - } - } + if (output_size != PyBytes_GET_SIZE(ret)) + _PyBytes_Resize(&ret, output_size); /* Sets ret to NULL on failure. */ + BZ2_bzCompressEnd(bzs); - PyBuffer_Release(&pdata); return ret; } @@ -2025,9 +2041,8 @@ bz2_decompress(PyObject *self, PyObject *args) { Py_buffer pdata; - char *data; - int datasize; - int bufsize = SMALLCHUNK; + size_t input_left; + size_t output_size = 0; PyObject *ret; bz_stream _bzs; bz_stream *bzs = &_bzs; @@ -2035,15 +2050,13 @@ if (!PyArg_ParseTuple(args, "y*:decompress", &pdata)) return NULL; - data = pdata.buf; - datasize = pdata.len; - if (datasize == 0) { + if (pdata.len == 0) { PyBuffer_Release(&pdata); return PyBytes_FromStringAndSize("", 0); } - ret = PyBytes_FromStringAndSize(NULL, bufsize); + ret = PyBytes_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) { PyBuffer_Release(&pdata); return NULL; @@ -2051,10 +2064,12 @@ memset(bzs, 0, sizeof(bz_stream)); - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; + bzs->avail_out = PyBytes_GET_SIZE(ret); bzerror = BZ2_bzDecompressInit(bzs, 0, 0); if (bzerror != BZ_OK) { @@ -2065,9 +2080,14 @@ } for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzDecompress(bzs); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { break; } else if (bzerror != BZ_OK) { @@ -2078,33 +2098,37 @@ return NULL; } if (bzs->avail_in == 0) { - BZ2_bzDecompressEnd(bzs); - PyErr_SetString(PyExc_ValueError, - "couldn't find end of stream"); - PyBuffer_Release(&pdata); - Py_DECREF(ret); - return NULL; + if (input_left == 0) { + BZ2_bzDecompressEnd(bzs); + PyErr_SetString(PyExc_ValueError, + "couldn't find end of stream"); + PyBuffer_Release(&pdata); + Py_DECREF(ret); + return NULL; + } + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyBytes_Resize(&ret, bufsize) < 0) { - BZ2_bzDecompressEnd(bzs); - PyBuffer_Release(&pdata); - return NULL; + size_t buffer_left = PyBytes_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzDecompressEnd(bzs); + PyBuffer_Release(&pdata); + return NULL; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyBytes_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret) + BZS_TOTAL_OUT(bzs); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) { - if (_PyBytes_Resize(&ret, (Py_ssize_t)BZS_TOTAL_OUT(bzs)) < 0) { - ret = NULL; - } - } + if (output_size != PyBytes_GET_SIZE(ret)) + _PyBytes_Resize(&ret, output_size); /* Sets ret to NULL on failure. */ + BZ2_bzDecompressEnd(bzs); PyBuffer_Release(&pdata); - return ret; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 21:22:12 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 21:22:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_=2314398=3A_Fix_size_truncation_and_overflow_bugs_in_bz2?= =?utf-8?q?_module=2E?= Message-ID: <3Xl9jJ3FjQzPQZ@mail.python.org> http://hg.python.org/cpython/rev/25fdf297c077 changeset: 79879:25fdf297c077 branch: 3.3 parent: 79870:2530acc092d8 parent: 79878:ebb8c7d79f52 user: Nadeem Vawda date: Sun Oct 21 21:16:58 2012 +0200 summary: Merge #14398: Fix size truncation and overflow bugs in bz2 module. files: Misc/NEWS | 2 + Modules/_bz2module.c | 33 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,8 @@ Library ------- +- Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + - Issue #16220: wsgiref now always calls close() on an iterable response. Patch by Brent Tubbs. diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -123,7 +123,14 @@ giving us amortized linear-time behavior. Use a less-than-double growth factor to avoid excessive allocation. */ size_t size = PyBytes_GET_SIZE(*buf); - return _PyBytes_Resize(buf, size + (size >> 3) + 6); + size_t new_size = size + (size >> 3) + 6; + if (new_size > size) { + return _PyBytes_Resize(buf, new_size); + } else { /* overflow */ + PyErr_SetString(PyExc_OverflowError, + "Unable to allocate buffer - output too large"); + return -1; + } } @@ -169,10 +176,14 @@ break; if (c->bzs.avail_out == 0) { - if (grow_buffer(&result) < 0) - goto error; - c->bzs.next_out = PyBytes_AS_STRING(result) + data_size; - c->bzs.avail_out = PyBytes_GET_SIZE(result) - data_size; + size_t buffer_left = PyBytes_GET_SIZE(result) - data_size; + if (buffer_left == 0) { + if (grow_buffer(&result) < 0) + goto error; + c->bzs.next_out = PyBytes_AS_STRING(result) + data_size; + buffer_left = PyBytes_GET_SIZE(result) - data_size; + } + c->bzs.avail_out = MIN(buffer_left, UINT_MAX); } } if (data_size != PyBytes_GET_SIZE(result)) @@ -390,10 +401,14 @@ len -= d->bzs.avail_in; } if (d->bzs.avail_out == 0) { - if (grow_buffer(&result) < 0) - goto error; - d->bzs.next_out = PyBytes_AS_STRING(result) + data_size; - d->bzs.avail_out = PyBytes_GET_SIZE(result) - data_size; + size_t buffer_left = PyBytes_GET_SIZE(result) - data_size; + if (buffer_left == 0) { + if (grow_buffer(&result) < 0) + goto error; + d->bzs.next_out = PyBytes_AS_STRING(result) + data_size; + buffer_left = PyBytes_GET_SIZE(result) - data_size; + } + d->bzs.avail_out = MIN(buffer_left, UINT_MAX); } } if (data_size != PyBytes_GET_SIZE(result)) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 21:22:13 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 21:22:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_=2314398=3A_Fix_size_truncation_and_overflow_bugs_?= =?utf-8?q?in_bz2_module=2E?= Message-ID: <3Xl9jK5WZ0zPW2@mail.python.org> http://hg.python.org/cpython/rev/d6bf506ea13f changeset: 79880:d6bf506ea13f parent: 79876:92656b5df2f2 parent: 79879:25fdf297c077 user: Nadeem Vawda date: Sun Oct 21 21:19:11 2012 +0200 summary: Merge #14398: Fix size truncation and overflow bugs in bz2 module. files: Misc/NEWS | 2 + Modules/_bz2module.c | 33 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,8 @@ Library ------- +- Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + - Issue #12692: Fix resource leak in urllib.request when talking to an HTTP server that does not include a "Connection: close" header in its responses. diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -123,7 +123,14 @@ giving us amortized linear-time behavior. Use a less-than-double growth factor to avoid excessive allocation. */ size_t size = PyBytes_GET_SIZE(*buf); - return _PyBytes_Resize(buf, size + (size >> 3) + 6); + size_t new_size = size + (size >> 3) + 6; + if (new_size > size) { + return _PyBytes_Resize(buf, new_size); + } else { /* overflow */ + PyErr_SetString(PyExc_OverflowError, + "Unable to allocate buffer - output too large"); + return -1; + } } @@ -169,10 +176,14 @@ break; if (c->bzs.avail_out == 0) { - if (grow_buffer(&result) < 0) - goto error; - c->bzs.next_out = PyBytes_AS_STRING(result) + data_size; - c->bzs.avail_out = PyBytes_GET_SIZE(result) - data_size; + size_t buffer_left = PyBytes_GET_SIZE(result) - data_size; + if (buffer_left == 0) { + if (grow_buffer(&result) < 0) + goto error; + c->bzs.next_out = PyBytes_AS_STRING(result) + data_size; + buffer_left = PyBytes_GET_SIZE(result) - data_size; + } + c->bzs.avail_out = MIN(buffer_left, UINT_MAX); } } if (data_size != PyBytes_GET_SIZE(result)) @@ -390,10 +401,14 @@ len -= d->bzs.avail_in; } if (d->bzs.avail_out == 0) { - if (grow_buffer(&result) < 0) - goto error; - d->bzs.next_out = PyBytes_AS_STRING(result) + data_size; - d->bzs.avail_out = PyBytes_GET_SIZE(result) - data_size; + size_t buffer_left = PyBytes_GET_SIZE(result) - data_size; + if (buffer_left == 0) { + if (grow_buffer(&result) < 0) + goto error; + d->bzs.next_out = PyBytes_AS_STRING(result) + data_size; + buffer_left = PyBytes_GET_SIZE(result) - data_size; + } + d->bzs.avail_out = MIN(buffer_left, UINT_MAX); } } if (data_size != PyBytes_GET_SIZE(result)) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 21:22:47 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 21 Oct 2012 21:22:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_VS_9_project_file_for_?= =?utf-8?q?=5Fsha3_module?= Message-ID: <3Xl9jz1vwCzMSX@mail.python.org> http://hg.python.org/cpython/rev/c8217046e2cd changeset: 79881:c8217046e2cd user: Christian Heimes date: Sun Oct 21 21:22:26 2012 +0200 summary: Add VS 9 project file for _sha3 module files: PC/VS9.0/_sha3.vcproj | 513 ++++++++++++++++++++++++++++++ PC/VS9.0/pcbuild.sln | 18 + 2 files changed, 531 insertions(+), 0 deletions(-) diff --git a/PC/VS9.0/_sha3.vcproj b/PC/VS9.0/_sha3.vcproj new file mode 100644 --- /dev/null +++ b/PC/VS9.0/_sha3.vcproj @@ -0,0 +1,513 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PC/VS9.0/pcbuild.sln b/PC/VS9.0/pcbuild.sln --- a/PC/VS9.0/pcbuild.sln +++ b/PC/VS9.0/pcbuild.sln @@ -152,6 +152,8 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sha3", "_sha3.vcproj", "{04F37400-883C-42D7-AE28-6CF9953BF975}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -651,6 +653,22 @@ {A2697BD3-28C1-4AEC-9106-8B748639FD16}.Release|Win32.Build.0 = Release|Win32 {A2697BD3-28C1-4AEC-9106-8B748639FD16}.Release|x64.ActiveCfg = Release|x64 {A2697BD3-28C1-4AEC-9106-8B748639FD16}.Release|x64.Build.0 = Release|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Debug|Win32.ActiveCfg = Debug|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Debug|Win32.Build.0 = Debug|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Debug|x64.ActiveCfg = Debug|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Debug|x64.Build.0 = Debug|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Release|Win32.ActiveCfg = Release|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Release|Win32.Build.0 = Release|Win32 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Release|x64.ActiveCfg = Release|x64 + {04F37400-883C-42D7-AE28-6CF9953BF975}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 21:26:46 2012 From: python-checkins at python.org (christian.heimes) Date: Sun, 21 Oct 2012 21:26:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_backout_ce9c9cbd1b11=2C_Bu?= =?utf-8?q?ild_the_=5Fsha3_module_with_VS_2008?= Message-ID: <3Xl9pZ6BMJzP42@mail.python.org> http://hg.python.org/cpython/rev/96b7e510cb25 changeset: 79882:96b7e510cb25 user: Christian Heimes date: Sun Oct 21 21:26:38 2012 +0200 summary: backout ce9c9cbd1b11, Build the _sha3 module with VS 2008 files: PC/VS9.0/pythoncore.vcproj | 4 ---- PC/config.c | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/PC/VS9.0/pythoncore.vcproj b/PC/VS9.0/pythoncore.vcproj --- a/PC/VS9.0/pythoncore.vcproj +++ b/PC/VS9.0/pythoncore.vcproj @@ -1151,10 +1151,6 @@ > - - diff --git a/PC/config.c b/PC/config.c --- a/PC/config.c +++ b/PC/config.c @@ -22,7 +22,6 @@ extern PyObject* PyInit__sha1(void); extern PyObject* PyInit__sha256(void); extern PyObject* PyInit__sha512(void); -extern PyObject* PyInit__sha3(void); extern PyObject* PyInit_time(void); extern PyObject* PyInit__thread(void); #ifdef WIN32 @@ -94,7 +93,6 @@ {"_sha1", PyInit__sha1}, {"_sha256", PyInit__sha256}, {"_sha512", PyInit__sha512}, - {"_sha3", PyInit__sha3}, {"time", PyInit_time}, #ifdef WITH_THREAD {"_thread", PyInit__thread}, -- Repository URL: http://hg.python.org/cpython From martin at v.loewis.de Sun Oct 21 21:27:11 2012 From: martin at v.loewis.de (=?ISO-8859-1?Q?=22Martin_v=2E_L=F6wis=22?=) Date: Sun, 21 Oct 2012 21:27:11 +0200 Subject: [Python-checkins] cpython: Build the _sha3 module with VS 2008. In-Reply-To: <50841572.6040709@python.org> References: <3Xl4PT03YszQt2@mail.python.org> <50841572.6040709@python.org> Message-ID: <50844C8F.8060706@v.loewis.de> Am 21.10.12 17:32, schrieb Christian Heimes: > Am 21.10.2012 17:23, schrieb antoine.pitrou: >> http://hg.python.org/cpython/rev/ce9c9cbd1b11 >> changeset: 79875:ce9c9cbd1b11 >> user: Antoine Pitrou >> date: Sun Oct 21 17:21:04 2012 +0200 >> summary: >> Build the _sha3 module with VS 2008. > > For VS 2010 I decided against this approach and built the extension as a > separate .pyd extension because the _sha3 module is rather large (> 200 > kB). I think your change is going to break VS 2010. > > What do the other think? Should the code by built-in by default? It's a packaging and maintenance issue. If it is in pythonxy.dll, the project file becomes easier to maintain. That's why I was always opposed to splitting up the existing pythonxy.dll into many project files. OTOH, when adding a module, a decision can be made based on size (e.g.); if the module depends on extra libraries, it shouldn't be in pythonxy.dll. For VS 2008, I don't care - this set of project files isn't really intended for production use, but rather for ongoing development. In the long term, I wish we could use the platform implementations of SHA-3 rather than shipping our own. Regards, Martin From christian at python.org Sun Oct 21 21:52:01 2012 From: christian at python.org (Christian Heimes) Date: Sun, 21 Oct 2012 21:52:01 +0200 Subject: [Python-checkins] cpython: Build the _sha3 module with VS 2008. In-Reply-To: <50844C8F.8060706@v.loewis.de> References: <3Xl4PT03YszQt2@mail.python.org> <50841572.6040709@python.org> <50844C8F.8060706@v.loewis.de> Message-ID: <50845261.1080707@python.org> Am 21.10.2012 21:27, schrieb "Martin v. L?wis": > It's a packaging and maintenance issue. If it is in pythonxy.dll, the > project file becomes easier to maintain. That's why I was always opposed > to splitting up the existing pythonxy.dll into many project files. > > OTOH, when adding a module, a decision can be made based on size (e.g.); > if the module depends on extra libraries, it shouldn't be in > pythonxy.dll. > > For VS 2008, I don't care - this set of project files isn't really > intended for production use, but rather for ongoing development. > > In the long term, I wish we could use the platform implementations > of SHA-3 rather than shipping our own. Hello Martin, Ultimately it's your decision. You are the expert and build master for Windows releases. I've no hard feelings if you prefer to include the code in the main dll. Just say so and I will change the module ASAP. The sha3 module depends on the Keccak reference implementation. I guess the loop unrolling and massive usage of macros in the optimized implementation increases the size of the code considerable. I didn't want to increase the main python.dll from 2.7 MB to almost 3 MB. We may have to ship our own SHA-3 code for quite a while. OpenSSL hasn't even began to include SHA-3. The bugs.python.org entry about Keccak is still the number one hit of a Google search about "openssl keccak". Christian From python-checkins at python.org Sun Oct 21 22:30:11 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sun, 21 Oct 2012 22:30:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2310836=3A_Fix_exce?= =?utf-8?q?ption_raised_when_file_not_found_in_urlretrieve?= Message-ID: <3XlCCl267NzQSc@mail.python.org> http://hg.python.org/cpython/rev/daef5526d2ac changeset: 79883:daef5526d2ac user: Senthil Kumaran date: Sun Oct 21 13:30:02 2012 -0700 summary: Issue #10836: Fix exception raised when file not found in urlretrieve files: Lib/test/test_urllib.py | 5 +++++ Lib/urllib/request.py | 4 ++-- Misc/NEWS | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -268,6 +268,11 @@ finally: self.unfakehttp() + def test_missing_localfile(self): + # Test for #10836 + with self.assertRaises(urllib.error.URLError): + urlopen('file://localhost/a/file/which/doesnot/exists.py') + def test_userpass_inurl(self): self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") try: diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1664,7 +1664,7 @@ return getattr(self, name)(url) else: return getattr(self, name)(url, data) - except HTTPError: + except (HTTPError, URLError): raise except socket.error as msg: raise IOError('socket error', msg).with_traceback(sys.exc_info()[2]) @@ -1891,7 +1891,7 @@ try: stats = os.stat(localname) except OSError as e: - raise URLError(e.errno, e.strerror, e.filename) + raise URLError(e.strerror, e.filename) size = stats.st_size modified = email.utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(url)[0] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #10836: Fix exception raised when file not found in urlretrieve + Initial patch by Ezio Melotti. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #12692: Fix resource leak in urllib.request when talking to an HTTP -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 23:09:44 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 21 Oct 2012 23:09:44 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0Mzk4?= =?utf-8?q?=3A_Fix_size_truncation_and_overflow_bugs_in_bz2_module=2E?= Message-ID: <3XlD5N12HszPPb@mail.python.org> http://hg.python.org/cpython/rev/f03a335621ce changeset: 79884:f03a335621ce branch: 2.7 parent: 79877:e647229c422b user: Nadeem Vawda date: Sun Oct 21 23:09:08 2012 +0200 summary: Issue #14398: Fix size truncation and overflow bugs in bz2 module. files: Lib/test/test_bz2.py | 44 +++- Lib/test/testbz2_bigmem.bz2 | Bin Misc/NEWS | 2 + Modules/bz2module.c | 316 +++++++++++++---------- 4 files changed, 224 insertions(+), 138 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -1,6 +1,6 @@ #!/usr/bin/env python from test import test_support -from test.test_support import TESTFN, import_module +from test.test_support import TESTFN, _4G, bigmemtest, import_module, findfile import unittest from cStringIO import StringIO @@ -24,6 +24,9 @@ DATA = 'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`' DATA_CRLF = 'BZh91AY&SY\xaez\xbbN\x00\x01H\xdf\x80\x00\x12@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe0@\x01\xbc\xc6`\x86*\x8d=M\xa9\x9a\x86\xd0L@\x0fI\xa6!\xa1\x13\xc8\x88jdi\x8d@\x03@\x1a\x1a\x0c\x0c\x83 \x00\xc4h2\x19\x01\x82D\x84e\t\xe8\x99\x89\x19\x1ah\x00\r\x1a\x11\xaf\x9b\x0fG\xf5(\x1b\x1f?\t\x12\xcf\xb5\xfc\x95E\x00ps\x89\x12^\xa4\xdd\xa2&\x05(\x87\x04\x98\x89u\xe40%\xb6\x19\'\x8c\xc4\x89\xca\x07\x0e\x1b!\x91UIFU%C\x994!DI\xd2\xfa\xf0\xf1N8W\xde\x13A\xf5\x9cr%?\x9f3;I45A\xd1\x8bT\xb1\xa4\xc7\x8d\x1a\\"\xad\xa1\xabyBg\x15\xb9l\x88\x88\x91k"\x94\xa4\xd4\x89\xae*\xa6\x0b\x10\x0c\xd6\xd4m\xe86\xec\xb5j\x8a\x86j\';\xca.\x01I\xf2\xaaJ\xe8\x88\x8cU+t3\xfb\x0c\n\xa33\x13r2\r\x16\xe0\xb3(\xbf\x1d\x83r\xe7M\xf0D\x1365\xd8\x88\xd3\xa4\x92\xcb2\x06\x04\\\xc1\xb0\xea//\xbek&\xd8\xe6+t\xe5\xa1\x13\xada\x16\xder5"w]\xa2i\xb7[\x97R \xe2IT\xcd;Z\x04dk4\xad\x8a\t\xd3\x81z\x10\xf1:^`\xab\x1f\xc5\xdc\x91N\x14$+\x9e\xae\xd3\x80' + with open(findfile("testbz2_bigmem.bz2"), "rb") as f: + DATA_BIGMEM = f.read() + if has_cmdline_bunzip2: def decompress(self, data): pop = subprocess.Popen("bunzip2", shell=True, @@ -43,6 +46,7 @@ def decompress(self, data): return bz2.decompress(data) + class BZ2FileTest(BaseTest): "Test BZ2File type miscellaneous methods." @@ -346,6 +350,17 @@ data += bz2c.flush() self.assertEqual(self.decompress(data), self.TEXT) + @bigmemtest(_4G, memuse=1.25) + def testBigmem(self, size): + text = "a" * size + bz2c = bz2.BZ2Compressor() + data = bz2c.compress(text) + bz2c.flush() + del text + text = self.decompress(data) + self.assertEqual(len(text), size) + self.assertEqual(text.strip("a"), "") + + class BZ2DecompressorTest(BaseTest): def test_Constructor(self): self.assertRaises(TypeError, BZ2Decompressor, 42) @@ -384,6 +399,15 @@ text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, "anything") + @bigmemtest(_4G, memuse=1.25) + def testBigmem(self, size): + # Issue #14398: decompression fails when output data is >=2GB. + if size < _4G: + self.skipTest("Test needs 5GB of memory to run.") + text = bz2.BZ2Decompressor().decompress(self.DATA_BIGMEM) + self.assertEqual(len(text), _4G) + self.assertEqual(text.strip("\0"), "") + class FuncTest(BaseTest): "Test module functions" @@ -407,6 +431,24 @@ # "Test decompress() function with incomplete data" self.assertRaises(ValueError, bz2.decompress, self.DATA[:-10]) + @bigmemtest(_4G, memuse=1.25) + def testCompressBigmem(self, size): + text = "a" * size + data = bz2.compress(text) + del text + text = self.decompress(data) + self.assertEqual(len(text), size) + self.assertEqual(text.strip("a"), "") + + @bigmemtest(_4G, memuse=1.25) + def testDecompressBigmem(self, size): + # Issue #14398: decompression fails when output data is >=2GB. + if size < _4G: + self.skipTest("Test needs 5GB of memory to run.") + text = bz2.decompress(self.DATA_BIGMEM) + self.assertEqual(len(text), _4G) + self.assertEqual(text.strip("\0"), "") + def test_main(): test_support.run_unittest( BZ2FileTest, diff --git a/Lib/test/testbz2_bigmem.bz2 b/Lib/test/testbz2_bigmem.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..c9a4616c8053b1c92a45023635c8610c26299fc2 GIT binary patch [stripped] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,8 @@ Library ------- +- Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + - Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile(). - Issue #16220: wsgiref now always calls close() on an iterable response. diff --git a/Modules/bz2module.c b/Modules/bz2module.c --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -41,23 +41,8 @@ #define MODE_READ_EOF 2 #define MODE_WRITE 3 -#define BZ2FileObject_Check(v) (Py_TYPE(v) == &BZ2File_Type) - -#ifdef BZ_CONFIG_ERROR - -#if SIZEOF_LONG >= 8 -#define BZS_TOTAL_OUT(bzs) \ - (((long)bzs->total_out_hi32 << 32) + bzs->total_out_lo32) -#elif SIZEOF_LONG_LONG >= 8 -#define BZS_TOTAL_OUT(bzs) \ - (((PY_LONG_LONG)bzs->total_out_hi32 << 32) + bzs->total_out_lo32) -#else -#define BZS_TOTAL_OUT(bzs) \ - bzs->total_out_lo32 -#endif - -#else /* ! BZ_CONFIG_ERROR */ +#ifndef BZ_CONFIG_ERROR #define BZ2_bzRead bzRead #define BZ2_bzReadOpen bzReadOpen @@ -72,8 +57,6 @@ #define BZ2_bzDecompressInit bzDecompressInit #define BZ2_bzDecompressEnd bzDecompressEnd -#define BZS_TOTAL_OUT(bzs) bzs->total_out - #endif /* ! BZ_CONFIG_ERROR */ @@ -90,6 +73,8 @@ #define RELEASE_LOCK(obj) #endif +#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y)) + /* Bits in f_newlinetypes */ #define NEWLINE_UNKNOWN 0 /* No newline seen, yet */ #define NEWLINE_CR 1 /* \r newline seen */ @@ -234,6 +219,20 @@ return currentsize + (currentsize >> 3) + 6; } +static int +Util_GrowBuffer(PyObject **buf) +{ + size_t size = PyString_GET_SIZE(*buf); + size_t new_size = Util_NewBufferSize(size); + if (new_size > size) { + return _PyString_Resize(buf, new_size); + } else { /* overflow */ + PyErr_SetString(PyExc_OverflowError, + "Unable to allocate buffer - output too large"); + return -1; + } +} + /* This is a hacked version of Python's fileobject.c:get_line(). */ static PyObject * Util_GetLine(BZ2FileObject *f, int n) @@ -1608,20 +1607,16 @@ BZ2Comp_compress(BZ2CompObject *self, PyObject *args) { Py_buffer pdata; - char *data; - int datasize; - int bufsize = SMALLCHUNK; - PY_LONG_LONG totalout; + size_t input_left; + size_t output_size = 0; PyObject *ret = NULL; bz_stream *bzs = &self->bzs; int bzerror; if (!PyArg_ParseTuple(args, "s*:compress", &pdata)) return NULL; - data = pdata.buf; - datasize = pdata.len; - if (datasize == 0) { + if (pdata.len == 0) { PyBuffer_Release(&pdata); return PyString_FromString(""); } @@ -1633,40 +1628,52 @@ goto error; } - ret = PyString_FromStringAndSize(NULL, bufsize); + ret = PyString_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) goto error; - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; - - totalout = BZS_TOTAL_OUT(bzs); + bzs->avail_out = PyString_GET_SIZE(ret); for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzCompress(bzs, BZ_RUN); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror != BZ_RUN_OK) { Util_CatchBZ2Error(bzerror); goto error; } - if (bzs->avail_in == 0) - break; /* no more input data */ + if (bzs->avail_in == 0) { + if (input_left == 0) + break; /* no more input data */ + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyString_Resize(&ret, bufsize) < 0) { - BZ2_bzCompressEnd(bzs); - goto error; + size_t buffer_left = PyString_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzCompressEnd(bzs); + goto error; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyString_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs) - - totalout); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - _PyString_Resize(&ret, (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout)); + if (_PyString_Resize(&ret, output_size) < 0) + goto error; RELEASE_LOCK(self); PyBuffer_Release(&pdata); @@ -1689,33 +1696,34 @@ static PyObject * BZ2Comp_flush(BZ2CompObject *self) { - int bufsize = SMALLCHUNK; + size_t output_size = 0; PyObject *ret = NULL; bz_stream *bzs = &self->bzs; - PY_LONG_LONG totalout; int bzerror; ACQUIRE_LOCK(self); if (!self->running) { - PyErr_SetString(PyExc_ValueError, "object was already " - "flushed"); + PyErr_SetString(PyExc_ValueError, "object was already flushed"); goto error; } self->running = 0; - ret = PyString_FromStringAndSize(NULL, bufsize); + ret = PyString_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) goto error; bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; - - totalout = BZS_TOTAL_OUT(bzs); + bzs->avail_out = PyString_GET_SIZE(ret); for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzCompress(bzs, BZ_FINISH); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { break; } else if (bzerror != BZ_FINISH_OK) { @@ -1723,18 +1731,20 @@ goto error; } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyString_Resize(&ret, bufsize) < 0) - goto error; - bzs->next_out = BUF(ret); - bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs) - - totalout); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + size_t buffer_left = PyString_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) + goto error; + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyString_GET_SIZE(ret) - output_size; + } + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) - _PyString_Resize(&ret, (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout)); + if (output_size != PyString_GET_SIZE(ret)) + if (_PyString_Resize(&ret, output_size) < 0) + goto error; RELEASE_LOCK(self); return ret; @@ -1899,18 +1909,14 @@ BZ2Decomp_decompress(BZ2DecompObject *self, PyObject *args) { Py_buffer pdata; - char *data; - int datasize; - int bufsize = SMALLCHUNK; - PY_LONG_LONG totalout; + size_t input_left; + size_t output_size = 0; PyObject *ret = NULL; bz_stream *bzs = &self->bzs; int bzerror; if (!PyArg_ParseTuple(args, "s*:decompress", &pdata)) return NULL; - data = pdata.buf; - datasize = pdata.len; ACQUIRE_LOCK(self); if (!self->running) { @@ -1919,52 +1925,65 @@ goto error; } - ret = PyString_FromStringAndSize(NULL, bufsize); + ret = PyString_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) goto error; - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; - - totalout = BZS_TOTAL_OUT(bzs); + bzs->avail_out = PyString_GET_SIZE(ret); for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzDecompress(bzs); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { - if (bzs->avail_in != 0) { + self->running = 0; + input_left += bzs->avail_in; + if (input_left != 0) { Py_DECREF(self->unused_data); self->unused_data = - PyString_FromStringAndSize(bzs->next_in, - bzs->avail_in); + PyString_FromStringAndSize(bzs->next_in, input_left); + if (self->unused_data == NULL) + goto error; } - self->running = 0; break; } if (bzerror != BZ_OK) { Util_CatchBZ2Error(bzerror); goto error; } - if (bzs->avail_in == 0) - break; /* no more input data */ + if (bzs->avail_in == 0) { + if (input_left == 0) + break; /* no more input data */ + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyString_Resize(&ret, bufsize) < 0) { - BZ2_bzDecompressEnd(bzs); - goto error; + size_t buffer_left = PyString_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzDecompressEnd(bzs); + goto error; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyString_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret); - bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs) - - totalout); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) - _PyString_Resize(&ret, (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout)); + if (output_size != PyString_GET_SIZE(ret)) + if (_PyString_Resize(&ret, output_size) < 0) + goto error; RELEASE_LOCK(self); PyBuffer_Release(&pdata); @@ -2111,10 +2130,10 @@ bz2_compress(PyObject *self, PyObject *args, PyObject *kwargs) { int compresslevel=9; + int action; Py_buffer pdata; - char *data; - int datasize; - int bufsize; + size_t input_left; + size_t output_size = 0; PyObject *ret = NULL; bz_stream _bzs; bz_stream *bzs = &_bzs; @@ -2125,8 +2144,6 @@ kwlist, &pdata, &compresslevel)) return NULL; - data = pdata.buf; - datasize = pdata.len; if (compresslevel < 1 || compresslevel > 9) { PyErr_SetString(PyExc_ValueError, @@ -2135,11 +2152,7 @@ return NULL; } - /* Conforming to bz2 manual, this is large enough to fit compressed - * data in one shot. We will check it later anyway. */ - bufsize = datasize + (datasize/100+1) + 600; - - ret = PyString_FromStringAndSize(NULL, bufsize); + ret = PyString_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) { PyBuffer_Release(&pdata); return NULL; @@ -2147,10 +2160,12 @@ memset(bzs, 0, sizeof(bz_stream)); - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; + bzs->avail_out = PyString_GET_SIZE(ret); bzerror = BZ2_bzCompressInit(bzs, compresslevel, 0, 0); if (bzerror != BZ_OK) { @@ -2160,36 +2175,53 @@ return NULL; } + action = BZ_RUN; + for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS - bzerror = BZ2_bzCompress(bzs, BZ_FINISH); + saved_next_out = bzs->next_out; + bzerror = BZ2_bzCompress(bzs, action); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { break; - } else if (bzerror != BZ_FINISH_OK) { + } else if (bzerror != BZ_RUN_OK && bzerror != BZ_FINISH_OK) { BZ2_bzCompressEnd(bzs); Util_CatchBZ2Error(bzerror); PyBuffer_Release(&pdata); Py_DECREF(ret); return NULL; } + if (action == BZ_RUN && bzs->avail_in == 0) { + if (input_left == 0) { + action = BZ_FINISH; + } else { + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } + } if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyString_Resize(&ret, bufsize) < 0) { - BZ2_bzCompressEnd(bzs); - PyBuffer_Release(&pdata); - Py_DECREF(ret); - return NULL; + size_t buffer_left = PyString_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzCompressEnd(bzs); + PyBuffer_Release(&pdata); + return NULL; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyString_GET_SIZE(ret) - output_size; } - bzs->next_out = BUF(ret) + BZS_TOTAL_OUT(bzs); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) - _PyString_Resize(&ret, (Py_ssize_t)BZS_TOTAL_OUT(bzs)); + if (output_size != PyString_GET_SIZE(ret)) + _PyString_Resize(&ret, output_size); /* Sets ret to NULL on failure. */ + BZ2_bzCompressEnd(bzs); - PyBuffer_Release(&pdata); return ret; } @@ -2205,9 +2237,8 @@ bz2_decompress(PyObject *self, PyObject *args) { Py_buffer pdata; - char *data; - int datasize; - int bufsize = SMALLCHUNK; + size_t input_left; + size_t output_size = 0; PyObject *ret; bz_stream _bzs; bz_stream *bzs = &_bzs; @@ -2215,15 +2246,13 @@ if (!PyArg_ParseTuple(args, "s*:decompress", &pdata)) return NULL; - data = pdata.buf; - datasize = pdata.len; - if (datasize == 0) { + if (pdata.len == 0) { PyBuffer_Release(&pdata); return PyString_FromString(""); } - ret = PyString_FromStringAndSize(NULL, bufsize); + ret = PyString_FromStringAndSize(NULL, SMALLCHUNK); if (!ret) { PyBuffer_Release(&pdata); return NULL; @@ -2231,10 +2260,12 @@ memset(bzs, 0, sizeof(bz_stream)); - bzs->next_in = data; - bzs->avail_in = datasize; + bzs->next_in = pdata.buf; + bzs->avail_in = MIN(pdata.len, UINT_MAX); + input_left = pdata.len - bzs->avail_in; + bzs->next_out = BUF(ret); - bzs->avail_out = bufsize; + bzs->avail_out = PyString_GET_SIZE(ret); bzerror = BZ2_bzDecompressInit(bzs, 0, 0); if (bzerror != BZ_OK) { @@ -2245,9 +2276,14 @@ } for (;;) { + char *saved_next_out; + Py_BEGIN_ALLOW_THREADS + saved_next_out = bzs->next_out; bzerror = BZ2_bzDecompress(bzs); + output_size += bzs->next_out - saved_next_out; Py_END_ALLOW_THREADS + if (bzerror == BZ_STREAM_END) { break; } else if (bzerror != BZ_OK) { @@ -2258,31 +2294,37 @@ return NULL; } if (bzs->avail_in == 0) { - BZ2_bzDecompressEnd(bzs); - PyErr_SetString(PyExc_ValueError, - "couldn't find end of stream"); - PyBuffer_Release(&pdata); - Py_DECREF(ret); - return NULL; - } - if (bzs->avail_out == 0) { - bufsize = Util_NewBufferSize(bufsize); - if (_PyString_Resize(&ret, bufsize) < 0) { + if (input_left == 0) { BZ2_bzDecompressEnd(bzs); + PyErr_SetString(PyExc_ValueError, + "couldn't find end of stream"); PyBuffer_Release(&pdata); Py_DECREF(ret); return NULL; } - bzs->next_out = BUF(ret) + BZS_TOTAL_OUT(bzs); - bzs->avail_out = bufsize - (bzs->next_out - BUF(ret)); + bzs->avail_in = MIN(input_left, UINT_MAX); + input_left -= bzs->avail_in; + } + if (bzs->avail_out == 0) { + size_t buffer_left = PyString_GET_SIZE(ret) - output_size; + if (buffer_left == 0) { + if (Util_GrowBuffer(&ret) < 0) { + BZ2_bzDecompressEnd(bzs); + PyBuffer_Release(&pdata); + return NULL; + } + bzs->next_out = BUF(ret) + output_size; + buffer_left = PyString_GET_SIZE(ret) - output_size; + } + bzs->avail_out = MIN(buffer_left, UINT_MAX); } } - if (bzs->avail_out != 0) - _PyString_Resize(&ret, (Py_ssize_t)BZS_TOTAL_OUT(bzs)); + if (output_size != PyString_GET_SIZE(ret)) + _PyString_Resize(&ret, output_size); /* Sets ret to NULL on failure. */ + BZ2_bzDecompressEnd(bzs); PyBuffer_Release(&pdata); - return ret; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 23:19:24 2012 From: python-checkins at python.org (matthias.klose) Date: Sun, 21 Oct 2012 23:19:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogLSBJc3N1ZSAjMTYy?= =?utf-8?q?62=3A_fix_out-of-src-tree_builds=2C_if_mercurial_is_not_install?= =?utf-8?b?ZWQu?= Message-ID: <3XlDJX0vdRzPPb@mail.python.org> http://hg.python.org/cpython/rev/03236a19eb87 changeset: 79885:03236a19eb87 branch: 3.2 parent: 79878:ebb8c7d79f52 user: Matthias Klose date: Sun Oct 21 23:05:35 2012 +0200 summary: - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. files: Makefile.pre.in | 2 +- Misc/NEWS | 2 + configure | 47 ++++++++++++++++++++---------------- configure.ac | 12 ++++---- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -280,7 +280,7 @@ ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py # XXX Note that a build now requires Python exist before the build starts -ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py +ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py ########################################################################## # Python diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -590,6 +590,8 @@ Build ----- +- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. + - Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after 2801bf875a24 (see #15801). diff --git a/configure b/configure --- a/configure +++ b/configure @@ -645,8 +645,8 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -HAS_PYTHON -DISABLE_ASDLGEN +PYTHON +ASDLGEN HAS_HG HGBRANCH HGTAG @@ -5281,16 +5281,17 @@ fi -DISABLE_ASDLGEN="" -# Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 +for ac_prog in python$PACKAGE_VERSION python3 python +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAS_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAS_PYTHON"; then - ac_cv_prog_HAS_PYTHON="$HAS_PYTHON" # Let the user override the test. +if ${ac_cv_prog_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5299,7 +5300,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_HAS_PYTHON="found" + ac_cv_prog_PYTHON="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5307,22 +5308,26 @@ done IFS=$as_save_IFS - test -z "$ac_cv_prog_HAS_PYTHON" && ac_cv_prog_HAS_PYTHON="not-found" -fi -fi -HAS_PYTHON=$ac_cv_prog_HAS_PYTHON -if test -n "$HAS_PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_PYTHON" >&5 -$as_echo "$HAS_PYTHON" >&6; } +fi +fi +PYTHON=$ac_cv_prog_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test $HAS_HG != found -o $HAS_PYTHON != found -then - DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" + test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON="not-found" + +if $PYTHON = not-found; then + ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +else + ASDLGEN="$PYTHON" fi diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -867,12 +867,12 @@ HGBRANCH="" fi -AC_SUBST(DISABLE_ASDLGEN) -DISABLE_ASDLGEN="" -AC_CHECK_PROG(HAS_PYTHON, python, found, not-found) -if test $HAS_HG != found -o $HAS_PYTHON != found -then - DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +AC_SUBST(ASDLGEN) +AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found) +if $PYTHON = not-found; then + ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +else + ASDLGEN="$PYTHON" fi -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 23:19:25 2012 From: python-checkins at python.org (matthias.klose) Date: Sun, 21 Oct 2012 23:19:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_-_Issue_=2316262=3A_fix_out-of-src-tree_builds=2C_if_mercurial?= =?utf-8?q?_is_not_installed=2E?= Message-ID: <3XlDJY4vhlzQy1@mail.python.org> http://hg.python.org/cpython/rev/ea6de576d1c8 changeset: 79886:ea6de576d1c8 branch: 3.3 parent: 79879:25fdf297c077 parent: 79885:03236a19eb87 user: Matthias Klose date: Sun Oct 21 23:12:35 2012 +0200 summary: - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. files: Makefile.pre.in | 2 +- Misc/NEWS | 2 + Parser/asdl_c.py | 1 - configure | 47 +++++++++++++++++++---------------- configure.ac | 12 ++++---- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -308,7 +308,7 @@ ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py # XXX Note that a build now requires Python exist before the build starts -ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py +ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py ########################################################################## # Python diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -140,6 +140,8 @@ Build ----- +- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. + - Issue #15298: ensure _sysconfigdata is generated in build directory, not source directory. diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -5,7 +5,6 @@ # handle fields that have a type but no name import os, sys -import subprocess import asdl diff --git a/configure b/configure --- a/configure +++ b/configure @@ -644,8 +644,8 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -HAS_PYTHON -DISABLE_ASDLGEN +PYTHON +ASDLGEN ac_ct_READELF READELF ARFLAGS @@ -5923,16 +5923,17 @@ -DISABLE_ASDLGEN="" -# Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 +for ac_prog in python$PACKAGE_VERSION python3 python +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAS_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAS_PYTHON"; then - ac_cv_prog_HAS_PYTHON="$HAS_PYTHON" # Let the user override the test. +if ${ac_cv_prog_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5941,7 +5942,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_HAS_PYTHON="found" + ac_cv_prog_PYTHON="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5949,22 +5950,26 @@ done IFS=$as_save_IFS - test -z "$ac_cv_prog_HAS_PYTHON" && ac_cv_prog_HAS_PYTHON="not-found" -fi -fi -HAS_PYTHON=$ac_cv_prog_HAS_PYTHON -if test -n "$HAS_PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_PYTHON" >&5 -$as_echo "$HAS_PYTHON" >&6; } +fi +fi +PYTHON=$ac_cv_prog_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test $HAS_HG != found -o $HAS_PYTHON != found -then - DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" + test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON="not-found" + +if $PYTHON = not-found; then + ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +else + ASDLGEN="$PYTHON" fi diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1000,12 +1000,12 @@ fi AC_SUBST(READELF) -AC_SUBST(DISABLE_ASDLGEN) -DISABLE_ASDLGEN="" -AC_CHECK_PROG(HAS_PYTHON, python, found, not-found) -if test $HAS_HG != found -o $HAS_PYTHON != found -then - DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +AC_SUBST(ASDLGEN) +AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found) +if $PYTHON = not-found; then + ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +else + ASDLGEN="$PYTHON" fi -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 21 23:19:27 2012 From: python-checkins at python.org (matthias.klose) Date: Sun, 21 Oct 2012 23:19:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_-_Issue_=2316262=3A_fix_out-of-src-tree_builds=2C_if_mer?= =?utf-8?q?curial_is_not_installed=2E?= Message-ID: <3XlDJb4D0JzPPb@mail.python.org> http://hg.python.org/cpython/rev/2a0c9472c89c changeset: 79887:2a0c9472c89c parent: 79883:daef5526d2ac parent: 79886:ea6de576d1c8 user: Matthias Klose date: Sun Oct 21 23:14:39 2012 +0200 summary: - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. files: Makefile.pre.in | 2 +- Misc/NEWS | 2 + Parser/asdl_c.py | 1 - configure | 336 ++++++++++++++++------------------ configure.ac | 12 +- 5 files changed, 172 insertions(+), 181 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -308,7 +308,7 @@ ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py # XXX Note that a build now requires Python exist before the build starts -ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py +ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py ########################################################################## # Python diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -191,6 +191,8 @@ Build ----- +- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. + - Issue #15298: ensure _sysconfigdata is generated in build directory, not source directory. diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -5,7 +5,6 @@ # handle fields that have a type but no name import os, sys -import subprocess import asdl diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for python 3.4. +# Generated by GNU Autoconf 2.68 for python 3.4. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -192,8 +169,7 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -238,25 +214,21 @@ if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ } # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -488,10 +452,6 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -526,16 +486,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -664,8 +644,8 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -HAS_PYTHON -DISABLE_ASDLGEN +PYTHON +ASDLGEN ac_ct_READELF READELF ARFLAGS @@ -1270,6 +1250,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1559,9 +1541,9 @@ if $ac_init_version; then cat <<\_ACEOF python configure 3.4 -generated by GNU Autoconf 2.69 - -Copyright (C) 2012 Free Software Foundation, Inc. +generated by GNU Autoconf 2.68 + +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1637,7 +1619,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -1935,8 +1917,7 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -1990,8 +1971,7 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2007,8 +1987,7 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2058,8 +2037,7 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2075,8 +2053,7 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2102,8 +2079,7 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2119,8 +2095,7 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2154,8 +2129,7 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -2398,7 +2372,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by python $as_me 3.4, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2784,7 +2758,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_HAS_HG="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3573,7 +3547,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3613,7 +3587,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3666,7 +3640,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3707,7 +3681,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3765,7 +3739,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3809,7 +3783,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4255,7 +4229,8 @@ /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4395,7 +4370,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4438,7 +4413,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4493,7 +4468,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4536,7 +4511,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4591,7 +4566,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4634,7 +4609,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4697,7 +4672,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4741,7 +4716,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4984,7 +4959,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5050,7 +5025,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5257,8 +5232,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5654,7 +5629,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5694,7 +5669,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5749,7 +5724,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5793,7 +5768,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5857,7 +5832,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5901,7 +5876,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_READELF="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5948,16 +5923,17 @@ -DISABLE_ASDLGEN="" -# Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 +for ac_prog in python$PACKAGE_VERSION python3 python +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAS_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAS_PYTHON"; then - ac_cv_prog_HAS_PYTHON="$HAS_PYTHON" # Let the user override the test. +if ${ac_cv_prog_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5965,8 +5941,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAS_PYTHON="found" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PYTHON="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5974,22 +5950,26 @@ done IFS=$as_save_IFS - test -z "$ac_cv_prog_HAS_PYTHON" && ac_cv_prog_HAS_PYTHON="not-found" -fi -fi -HAS_PYTHON=$ac_cv_prog_HAS_PYTHON -if test -n "$HAS_PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_PYTHON" >&5 -$as_echo "$HAS_PYTHON" >&6; } +fi +fi +PYTHON=$ac_cv_prog_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test $HAS_HG != found -o $HAS_PYTHON != found -then - DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" + test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON="not-found" + +if $PYTHON = not-found; then + ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +else + ASDLGEN="$PYTHON" fi @@ -6038,7 +6018,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -6107,7 +6087,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -9002,7 +8982,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9045,7 +9025,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10652,7 +10632,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_TRUE="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12089,8 +12069,7 @@ main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -12121,11 +12100,11 @@ int main () { - +/* FIXME: Include the comments suggested by Paul. */ #ifndef __cplusplus - /* Ultrix mips cc rejects this sort of thing. */ + /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset cs = { 0, 0 }; + const charset cs; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -12142,9 +12121,8 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this sort of thing. */ - char tx; - char *t = &tx; + { /* SCO 3.2v4 cc rejects this. */ + char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -12160,10 +12138,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + { /* AIX XL C 1.02.0.0 rejects this saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; } bx; - struct s *b = &bx; b->j = 5; + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -15495,16 +15473,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -15564,16 +15542,28 @@ as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -15595,7 +15585,7 @@ # values after options handling. ac_log=" This file was extended by python $as_me 3.4, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15657,10 +15647,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ python config.status 3.4 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15750,7 +15740,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1000,12 +1000,12 @@ fi AC_SUBST(READELF) -AC_SUBST(DISABLE_ASDLGEN) -DISABLE_ASDLGEN="" -AC_CHECK_PROG(HAS_PYTHON, python, found, not-found) -if test $HAS_HG != found -o $HAS_PYTHON != found -then - DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +AC_SUBST(ASDLGEN) +AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found) +if $PYTHON = not-found; then + ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" +else + ASDLGEN="$PYTHON" fi -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 04:03:52 2012 From: python-checkins at python.org (senthil.kumaran) Date: Mon, 22 Oct 2012 04:03:52 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316250=3A_Fix_the_?= =?utf-8?q?invocations_of_URLError_which_had_misplaced_filename?= Message-ID: <3XlLcm2KjHzR3w@mail.python.org> http://hg.python.org/cpython/rev/8fb438e7f738 changeset: 79888:8fb438e7f738 user: Senthil Kumaran date: Sun Oct 21 18:31:25 2012 -0700 summary: Issue #16250: Fix the invocations of URLError which had misplaced filename attribute for exception files: Lib/test/test_urllib.py | 32 +++++++++++++++++++++++++++- Lib/urllib/request.py | 26 +++++++++++----------- Misc/NEWS | 3 ++ 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -270,8 +270,36 @@ def test_missing_localfile(self): # Test for #10836 + with self.assertRaises(urllib.error.URLError) as e: + urlopen('file://localhost/a/file/which/doesnot/exists.py') + self.assertTrue(e.exception.filename) + self.assertTrue(e.exception.reason) + + def test_file_notexists(self): + fd, tmp_file = tempfile.mkstemp() + tmp_fileurl = 'file://' + tmp_file + + self.assertTrue(os.path.exists(tmp_file)) + self.assertTrue(urlopen(tmp_fileurl)) + + os.unlink(tmp_file) + self.assertFalse(os.path.exists(tmp_file)) with self.assertRaises(urllib.error.URLError): - urlopen('file://localhost/a/file/which/doesnot/exists.py') + urlopen(tmp_fileurl) + + def test_ftp_nohost(self): + test_ftp_url = 'ftp:///path' + with self.assertRaises(urllib.error.URLError) as e: + urlopen(test_ftp_url) + self.assertFalse(e.exception.filename) + self.assertTrue(e.exception.reason) + + def test_ftp_nonexisting(self): + with self.assertRaises(urllib.error.URLError) as e: + urlopen('ftp://localhost/a/file/which/doesnot/exists.py') + self.assertFalse(e.exception.filename) + self.assertTrue(e.exception.reason) + def test_userpass_inurl(self): self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") @@ -305,7 +333,7 @@ def test_URLopener_deprecation(self): with support.check_warnings(('',DeprecationWarning)): - warn = urllib.request.URLopener() + urllib.request.URLopener() class urlretrieve_FileTests(unittest.TestCase): """Test urllib.urlretrieve() on local files""" diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1419,9 +1419,9 @@ else: origurl = 'file://' + filename return addinfourl(open(localfile, 'rb'), headers, origurl) - except OSError as msg: + except OSError as exp: # users shouldn't expect OSErrors coming from urlopen() - raise URLError(msg) + raise URLError(exp) raise URLError('file not on local host') def _safe_gethostbyname(host): @@ -1480,8 +1480,8 @@ headers += "Content-length: %d\n" % retrlen headers = email.message_from_string(headers) return addinfourl(fp, headers, req.full_url) - except ftplib.all_errors as msg: - exc = URLError('ftp error: %s' % msg) + except ftplib.all_errors as exp: + exc = URLError('ftp error: %r' % exp) raise exc.with_traceback(sys.exc_info()[2]) def connect_ftp(self, user, passwd, host, port, dirs, timeout): @@ -1876,7 +1876,7 @@ def open_file(self, url): """Use local file or FTP depending on form of URL.""" if not isinstance(url, str): - raise URLError('file error', 'proxy support for file protocol currently not implemented') + raise URLError('file error: proxy support for file protocol currently not implemented') if url[:2] == '//' and url[2:3] != '/' and url[2:12].lower() != 'localhost/': raise ValueError("file:// scheme is supported only on localhost") else: @@ -1912,15 +1912,15 @@ elif file[:2] == './': raise ValueError("local file url may start with / or file:. Unknown url of type: %s" % url) return addinfourl(open(localname, 'rb'), headers, urlfile) - raise URLError('local file error', 'not on local host') + raise URLError('local file error: not on local host') def open_ftp(self, url): """Use FTP protocol.""" if not isinstance(url, str): - raise URLError('ftp error', 'proxy support for ftp protocol currently not implemented') + raise URLError('ftp error: proxy support for ftp protocol currently not implemented') import mimetypes host, path = splithost(url) - if not host: raise URLError('ftp error', 'no host given') + if not host: raise URLError('ftp error: no host given') host, port = splitport(host) user, host = splituser(host) if user: user, passwd = splitpasswd(user) @@ -1969,13 +1969,13 @@ headers += "Content-Length: %d\n" % retrlen headers = email.message_from_string(headers) return addinfourl(fp, headers, "ftp:" + url) - except ftperrors() as msg: - raise URLError('ftp error', msg).with_traceback(sys.exc_info()[2]) + except ftperrors() as exp: + raise URLError('ftp error %r' % exp).with_traceback(sys.exc_info()[2]) def open_data(self, url, data=None): """Use "data" URL.""" if not isinstance(url, str): - raise URLError('data error', 'proxy support for data protocol currently not implemented') + raise URLError('data error: proxy support for data protocol currently not implemented') # ignore POSTed data # # syntax of data URLs: @@ -2304,7 +2304,7 @@ conn, retrlen = self.ftp.ntransfercmd(cmd) except ftplib.error_perm as reason: if str(reason)[:3] != '550': - raise URLError('ftp error', reason).with_traceback( + raise URLError('ftp error: %d' % reason).with_traceback( sys.exc_info()[2]) if not conn: # Set transfer mode to ASCII! @@ -2316,7 +2316,7 @@ try: self.ftp.cwd(file) except ftplib.error_perm as reason: - raise URLError('ftp error', reason) from reason + raise URLError('ftp error: %d' % reason) from reason finally: self.ftp.cwd(pwd) cmd = 'LIST ' + file diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #16250: Fix the invocations of URLError which had misplaced filename + attribute for exception. + - Issue #10836: Fix exception raised when file not found in urlretrieve Initial patch by Ezio Melotti. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Mon Oct 22 05:57:30 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Mon, 22 Oct 2012 05:57:30 +0200 Subject: [Python-checkins] Daily reference leaks (2a0c9472c89c): sum=2 Message-ID: results for 2a0c9472c89c on branch "default" -------------------------------------------- test_dbm leaked [2, 0, 0] references, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogBllC9C', '-x'] From python-checkins at python.org Mon Oct 22 13:16:27 2012 From: python-checkins at python.org (jesus.cea) Date: Mon, 22 Oct 2012 13:16:27 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNjI5?= =?utf-8?q?4=3A_8_space_indent_in_tutorial?= Message-ID: <3XlZtM2FrLzPM9@mail.python.org> http://hg.python.org/cpython/rev/1a3f48c6ef16 changeset: 79889:1a3f48c6ef16 branch: 2.7 parent: 79884:f03a335621ce user: Jesus Cea date: Mon Oct 22 13:14:20 2012 +0200 summary: Closes #16294: 8 space indent in tutorial files: Doc/tutorial/stdlib2.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -257,9 +257,9 @@ >>> import weakref, gc >>> class A: ... def __init__(self, value): - ... self.value = value + ... self.value = value ... def __repr__(self): - ... return str(self.value) + ... return str(self.value) ... >>> a = A(10) # create a reference >>> d = weakref.WeakValueDictionary() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 13:16:28 2012 From: python-checkins at python.org (jesus.cea) Date: Mon, 22 Oct 2012 13:16:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNjI5?= =?utf-8?q?4=3A_8_space_indent_in_tutorial?= Message-ID: <3XlZtN4FG5zPM9@mail.python.org> http://hg.python.org/cpython/rev/2015db05d954 changeset: 79890:2015db05d954 branch: 3.2 parent: 79885:03236a19eb87 user: Jesus Cea date: Mon Oct 22 13:15:17 2012 +0200 summary: Closes #16294: 8 space indent in tutorial files: Doc/tutorial/stdlib2.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -257,9 +257,9 @@ >>> import weakref, gc >>> class A: ... def __init__(self, value): - ... self.value = value + ... self.value = value ... def __repr__(self): - ... return str(self.value) + ... return str(self.value) ... >>> a = A(10) # create a reference >>> d = weakref.WeakValueDictionary() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 13:16:30 2012 From: python-checkins at python.org (jesus.cea) Date: Mon, 22 Oct 2012 13:16:30 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_MERGE=3A_Closes_=2316294=3A_8_space_indent_in_tutorial?= Message-ID: <3XlZtQ0MfKzPQZ@mail.python.org> http://hg.python.org/cpython/rev/3344c8208662 changeset: 79891:3344c8208662 branch: 3.3 parent: 79886:ea6de576d1c8 parent: 79890:2015db05d954 user: Jesus Cea date: Mon Oct 22 13:15:45 2012 +0200 summary: MERGE: Closes #16294: 8 space indent in tutorial files: Doc/tutorial/stdlib2.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -259,9 +259,9 @@ >>> import weakref, gc >>> class A: ... def __init__(self, value): - ... self.value = value + ... self.value = value ... def __repr__(self): - ... return str(self.value) + ... return str(self.value) ... >>> a = A(10) # create a reference >>> d = weakref.WeakValueDictionary() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 13:16:31 2012 From: python-checkins at python.org (jesus.cea) Date: Mon, 22 Oct 2012 13:16:31 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Closes_=2316294=3A_8_space_indent_in_tutorial?= Message-ID: <3XlZtR2xHszR3M@mail.python.org> http://hg.python.org/cpython/rev/4ca40082461c changeset: 79892:4ca40082461c parent: 79888:8fb438e7f738 parent: 79891:3344c8208662 user: Jesus Cea date: Mon Oct 22 13:16:05 2012 +0200 summary: MERGE: Closes #16294: 8 space indent in tutorial files: Doc/tutorial/stdlib2.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -259,9 +259,9 @@ >>> import weakref, gc >>> class A: ... def __init__(self, value): - ... self.value = value + ... self.value = value ... def __repr__(self): - ... return str(self.value) + ... return str(self.value) ... >>> a = A(10) # create a reference >>> d = weakref.WeakValueDictionary() -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 15:01:15 2012 From: python-checkins at python.org (kristjan.jonsson) Date: Mon, 22 Oct 2012 15:01:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2Mjk1?= =?utf-8?q?=3A_Link_=22select=22_with_ws2=5F32=2Elib=2C_the_winsock2_stub_?= =?utf-8?q?library=2E?= Message-ID: <3XldCH1CpXzR9y@mail.python.org> http://hg.python.org/cpython/rev/daad150b4670 changeset: 79893:daad150b4670 branch: 3.3 parent: 79891:3344c8208662 user: Kristjan Valur Jonsson date: Mon Oct 22 12:56:47 2012 +0000 summary: Issue #16295: Link "select" with ws2_32.lib, the winsock2 stub library. files: PCbuild/select.vcxproj | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -151,7 +151,7 @@ - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -161,14 +161,14 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -178,14 +178,14 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -195,7 +195,7 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 MachineX64 @@ -203,7 +203,7 @@ - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -213,7 +213,7 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 MachineX64 -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 15:01:16 2012 From: python-checkins at python.org (kristjan.jonsson) Date: Mon, 22 Oct 2012 15:01:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_with_3=2E3=3A_Issue_=2316295=3A_Link_=22select=22_?= =?utf-8?q?with_ws2=5F32=2C_the_winsock2_lib=2E?= Message-ID: <3XldCJ4X27zPT5@mail.python.org> http://hg.python.org/cpython/rev/a2cd25d434b3 changeset: 79894:a2cd25d434b3 parent: 79892:4ca40082461c parent: 79893:daad150b4670 user: Kristjan Valur Jonsson date: Mon Oct 22 12:58:34 2012 +0000 summary: Merge with 3.3: Issue #16295: Link "select" with ws2_32, the winsock2 lib. files: PCbuild/select.vcxproj | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -151,7 +151,7 @@ - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -161,14 +161,14 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -178,14 +178,14 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -195,7 +195,7 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 MachineX64 @@ -203,7 +203,7 @@ - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -213,7 +213,7 @@ X64 - wsock32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 MachineX64 -- Repository URL: http://hg.python.org/cpython From martin at v.loewis.de Mon Oct 22 15:59:30 2012 From: martin at v.loewis.de (=?ISO-8859-1?Q?=22Martin_v=2E_L=F6wis=22?=) Date: Mon, 22 Oct 2012 15:59:30 +0200 Subject: [Python-checkins] cpython: Build the _sha3 module with VS 2008. In-Reply-To: <50845261.1080707@python.org> References: <3Xl4PT03YszQt2@mail.python.org> <50841572.6040709@python.org> <50844C8F.8060706@v.loewis.de> <50845261.1080707@python.org> Message-ID: <50855142.8090800@v.loewis.de> Am 21.10.12 21:52, schrieb Christian Heimes: > Ultimately it's your decision. You are the expert and build master for > Windows releases. I've no hard feelings if you prefer to include the > code in the main dll. Just say so and I will change the module ASAP. It doesn't really matter much either way to me; the status quo is fine (although I think a patch to Tools/msi/msi.py is still needed). > We may have to ship our own SHA-3 code for quite a while. OpenSSL hasn't > even began to include SHA-3. Well... I find it cute to have SHA-3 implemented in Python, however, it probably wouldn't have hurt to only add support five years from now. Regards, Martin From python-checkins at python.org Mon Oct 22 17:01:34 2012 From: python-checkins at python.org (christian.heimes) Date: Mon, 22 Oct 2012 17:01:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_=5Fsha3=2Epyd_to_list_?= =?utf-8?q?of_extension_modules_for_MSI?= Message-ID: <3Xlgt62NV8zRF3@mail.python.org> http://hg.python.org/cpython/rev/cda991390d2f changeset: 79895:cda991390d2f user: Christian Heimes date: Mon Oct 22 17:01:13 2012 +0200 summary: Add _sha3.pyd to list of extension modules for MSI files: Tools/msi/msi.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -99,7 +99,8 @@ '_multiprocessing.pyd', '_lzma.pyd', '_decimal.pyd', - '_testbuffer.pyd' + '_testbuffer.pyd', + '_sha3.pyd', ] # Well-known component UUIDs -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 22 18:15:53 2012 From: python-checkins at python.org (daniel.holth) Date: Mon, 22 Oct 2012 18:15:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Metadata_1=2E3=3A_only_=22Met?= =?utf-8?b?YWRhdGEtVmVyc2lvbiIsICJOYW1lIiwgIlZlcnNpb24iLCBhbmQgIlN1bW1h?= =?utf-8?q?ry=22_are?= Message-ID: <3XljWs5BVszRCr@mail.python.org> http://hg.python.org/peps/rev/50e8ea1a17a0 changeset: 4565:50e8ea1a17a0 user: Daniel Holth date: Mon Oct 22 12:16:04 2012 -0400 summary: Metadata 1.3: only "Metadata-Version", "Name", "Version", and "Summary" are required. files: pep-0426.txt | 46 ++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -65,11 +65,10 @@ This section specifies the names and semantics of each of the supported metadata fields. -Fields marked with "(Multiple use)" may be specified multiple -times in a single metadata file. Other fields may only occur -once in a metadata file. Fields marked with "(optional)" are -not required to appear in a valid metadata file; all other -fields must be present. The fields may appear in any order within +Fields marked with "(optional)" may occur 0 or 1 times. Fields marked +with "(multiple use)" may be specified 0, 1 or more times in a single +metadata file. Only "Metadata-Version", "Name", "Version", and "Summary" +must appear exactly once. The fields may appear in any order within the file. Metadata-Version @@ -103,6 +102,16 @@ Version: 1.0a2 +Summary +::::::: + +A one-line summary of what the distribution does. + +Example:: + + Summary: A module for collecting votes from beagles. + + Platform (multiple use) ::::::::::::::::::::::: @@ -130,16 +139,6 @@ Supported-Platform: i386-win32-2791 -Summary -::::::: - -A one-line summary of what the distribution does. - -Example:: - - Summary: A module for collecting votes from beagles. - - Description (optional, deprecated) :::::::::::::::::::::::::::::::::: @@ -154,12 +153,13 @@ the markup they use. Since a line separator immediately followed by another line separator -indicates the end of the headers section, any line separator must be -suffixed by whitespace to indicate continuation. +indicates the end of the headers section, any line separators in the +description must be suffixed by whitespace to indicate continuation. Since Metadata 1.3 the recommended place for the description is in the payload section of the document, after the last header. The description -needs no special formatting when included in the payload. +does not need to be reformatted when it is included in the payload. + Keywords (optional) ::::::::::::::::::: @@ -182,8 +182,8 @@ Home-page: http://www.example.com/~cschultz/bvote/ -Download-URL -:::::::::::: +Download-URL (optional) +::::::::::::::::::::::: A string containing the URL from which this version of the distribution can be downloaded. (This means that the URL can't be something like @@ -371,8 +371,8 @@ Obsoletes-Dist: OtherProject (<3.0) -Requires-Python -::::::::::::::: +Requires-Python (optional) +:::::::::::::::::::::::::: This field specifies the Python version(s) that the distribution is guaranteed to be compatible with. @@ -603,6 +603,8 @@ * Added `extra` to environment markers. +* Most fields are now optional. + * Changed fields: - Requires-Dist -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Mon Oct 22 18:15:55 2012 From: python-checkins at python.org (daniel.holth) Date: Mon, 22 Oct 2012 18:15:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_explain_signing_scheme_in_faq?= Message-ID: <3XljWv0lz9zRCr@mail.python.org> http://hg.python.org/peps/rev/760e17a922a7 changeset: 4566:760e17a922a7 user: Daniel Holth date: Mon Oct 22 12:16:24 2012 -0400 summary: explain signing scheme in faq files: pep-0427.txt | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -289,9 +289,9 @@ See - http://self-issued.info/docs/draft-ietf-jose-json-web-signature.html -- http://self-issued.info/docs/draft-jones-json-web-signature-json-serialization-01.html -- http://self-issued.info/docs/draft-ietf-jose-json-web-key-05.html -- http://self-issued.info/docs/draft-jones-jose-json-private-key-00.html +- http://self-issued.info/docs/draft-jones-jose-jws-json-serialization.html +- http://self-issued.info/docs/draft-ietf-jose-json-web-key.html +- http://self-issued.info/docs/draft-jones-jose-json-private-key.html Comparison to .egg @@ -329,6 +329,28 @@ your code. The .data directory is just a place for any files that are not normally installed inside ``site-packages`` or on the PYTHONPATH. +Why are you using Ed25519 and JWS instead of PGP, S/MIME, or ECDSA? + Wheel's signing scheme is designed to protect against cryptography + that is not used. Wheel tries to encourage signing by making it very + fast and easy. Signature verification is encouraged by including + the signature in the archive itself rather than making it a separate + download, and by including a Python implementation of the entire + signing system in the reference implementation. + + JWS and Ed25519 yield small, pure-Python implementations. Ed25519 + is fast enough that public-key cryptography can be considered for + applications where it was traditionally too slow to be used, so + wheels can be signed without worrying about performance. In Ed25519, + unlike ECDSA, only key generation, but not signing, depends on + a continuing high-quality source of entropy. The combination of + increased performance, convenience, and availability compared to + using a separate program means digital signatures can always be + enabled in wheel. + + Wheel uses simplified keys and a signature system where key generation + is about as fast as signing, making it possible to consider signing + keys an abundant resource. Keys could represent a build server or + a package rather than the publisher's entire digital identity. Copyright ========= -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Mon Oct 22 18:43:51 2012 From: python-checkins at python.org (senthil.kumaran) Date: Mon, 22 Oct 2012 18:43:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316301=3A_Fix_the_?= =?utf-8?q?localhost_verification_in_urllib/request=2Epy_for_file=3A//=2E?= Message-ID: <3Xlk8769BYzRGN@mail.python.org> http://hg.python.org/cpython/rev/49de26395d1a changeset: 79896:49de26395d1a user: Senthil Kumaran date: Mon Oct 22 09:43:04 2012 -0700 summary: Issue #16301: Fix the localhost verification in urllib/request.py for file://. Modify tests to use localhost for local temp files, which could make Windows Buildbot (#16300) happy files: Lib/test/test_urllib.py | 2 +- Lib/urllib/request.py | 2 +- Misc/NEWS | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -277,7 +277,7 @@ def test_file_notexists(self): fd, tmp_file = tempfile.mkstemp() - tmp_fileurl = 'file://' + tmp_file + tmp_fileurl = 'file://localhost' + tmp_file self.assertTrue(os.path.exists(tmp_file)) self.assertTrue(urlopen(tmp_fileurl)) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1905,7 +1905,7 @@ return addinfourl(open(localname, 'rb'), headers, urlfile) host, port = splitport(host) if (not port - and socket.gethostbyname(host) in (localhost() + thishost())): + and socket.gethostbyname(host) in ((localhost(),) + thishost())): urlfile = file if file[:1] == '/': urlfile = 'file://' + file diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #16301: Fix the localhost verification in urllib/request.py for file:// + urls. + - Issue #16250: Fix the invocations of URLError which had misplaced filename attribute for exception. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 00:20:45 2012 From: python-checkins at python.org (ned.deily) Date: Tue, 23 Oct 2012 00:20:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1ODUz?= =?utf-8?q?=3A_Prevent_IDLE_crash_on_OS_X_when_opening_Preferences_menu?= Message-ID: <3Xlscs5kl6zRL8@mail.python.org> http://hg.python.org/cpython/rev/d089b8fb0f56 changeset: 79897:d089b8fb0f56 branch: 2.7 parent: 79889:1a3f48c6ef16 user: Ned Deily date: Mon Oct 22 15:13:01 2012 -0700 summary: Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu with certain versions of Tk 8.5. Initial patch by Kevin Walzer. files: Lib/idlelib/NEWS.txt | 3 +++ Lib/idlelib/configDialog.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -15,6 +15,9 @@ - Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. +- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu + with certain versions of Tk 8.5. Initial patch by Kevin Walzer. + What's New in IDLE 2.7.3? ========================= diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -832,10 +832,9 @@ fontWeight=tkFont.BOLD else: fontWeight=tkFont.NORMAL - size=self.fontSize.get() - self.editFont.config(size=size, - weight=fontWeight,family=fontName) - self.textHighlightSample.configure(font=(fontName, size, fontWeight)) + newFont = (fontName, self.fontSize.get(), fontWeight) + self.labelFontSample.config(font=newFont) + self.textHighlightSample.configure(font=newFont) def SetHighlightTarget(self): if self.highlightTarget.get()=='Cursor': #bg not possible -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 00:20:47 2012 From: python-checkins at python.org (ned.deily) Date: Tue, 23 Oct 2012 00:20:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODUz?= =?utf-8?q?=3A_Prevent_IDLE_crash_on_OS_X_when_opening_Preferences_menu?= Message-ID: <3Xlscv0nn2zRMx@mail.python.org> http://hg.python.org/cpython/rev/a3d755eaf5fa changeset: 79898:a3d755eaf5fa branch: 3.2 parent: 79890:2015db05d954 user: Ned Deily date: Mon Oct 22 15:14:31 2012 -0700 summary: Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu with certain versions of Tk 8.5. Initial patch by Kevin Walzer. files: Lib/idlelib/NEWS.txt | 3 +++ Lib/idlelib/configDialog.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -21,6 +21,9 @@ - Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. +- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu + with certain versions of Tk 8.5. Initial patch by Kevin Walzer. + What's New in IDLE 3.2.3? ========================= diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -821,10 +821,9 @@ fontWeight=tkFont.BOLD else: fontWeight=tkFont.NORMAL - size=self.fontSize.get() - self.editFont.config(size=size, - weight=fontWeight,family=fontName) - self.textHighlightSample.configure(font=(fontName, size, fontWeight)) + newFont = (fontName, self.fontSize.get(), fontWeight) + self.labelFontSample.config(font=newFont) + self.textHighlightSample.configure(font=newFont) def SetHighlightTarget(self): if self.highlightTarget.get()=='Cursor': #bg not possible -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 00:20:48 2012 From: python-checkins at python.org (ned.deily) Date: Tue, 23 Oct 2012 00:20:48 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2315853=3A_merge_3=2E2_-=3E_3=2E3?= Message-ID: <3Xlscw2s9GzRLJ@mail.python.org> http://hg.python.org/cpython/rev/36e7da8d3059 changeset: 79899:36e7da8d3059 branch: 3.3 parent: 79893:daad150b4670 parent: 79898:a3d755eaf5fa user: Ned Deily date: Mon Oct 22 15:18:46 2012 -0700 summary: Issue #15853: merge 3.2 -> 3.3 files: Lib/idlelib/NEWS.txt | 3 +++ Lib/idlelib/configDialog.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -4,6 +4,9 @@ - Issue #16226: Fix IDLE Path Browser crash. (Patch by Roger Serwy) +- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu + with certain versions of Tk 8.5. Initial patch by Kevin Walzer. + What's New in IDLE 3.3.0? ========================= diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -821,10 +821,9 @@ fontWeight=tkFont.BOLD else: fontWeight=tkFont.NORMAL - size=self.fontSize.get() - self.editFont.config(size=size, - weight=fontWeight,family=fontName) - self.textHighlightSample.configure(font=(fontName, size, fontWeight)) + newFont = (fontName, self.fontSize.get(), fontWeight) + self.labelFontSample.config(font=newFont) + self.textHighlightSample.configure(font=newFont) def SetHighlightTarget(self): if self.highlightTarget.get()=='Cursor': #bg not possible -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 00:20:49 2012 From: python-checkins at python.org (ned.deily) Date: Tue, 23 Oct 2012 00:20:49 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2315853=3A_merge_3=2E3_-=3E_default?= Message-ID: <3Xlscx5nJGzRMx@mail.python.org> http://hg.python.org/cpython/rev/8f61d580aca6 changeset: 79900:8f61d580aca6 parent: 79896:49de26395d1a parent: 79899:36e7da8d3059 user: Ned Deily date: Mon Oct 22 15:20:13 2012 -0700 summary: Issue #15853: merge 3.3 -> default files: Lib/idlelib/NEWS.txt | 3 +++ Lib/idlelib/configDialog.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -4,6 +4,9 @@ - Issue #16226: Fix IDLE Path Browser crash. (Patch by Roger Serwy) +- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu + with certain versions of Tk 8.5. Initial patch by Kevin Walzer. + What's New in IDLE 3.3.0? ========================= diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -821,10 +821,9 @@ fontWeight=tkFont.BOLD else: fontWeight=tkFont.NORMAL - size=self.fontSize.get() - self.editFont.config(size=size, - weight=fontWeight,family=fontName) - self.textHighlightSample.configure(font=(fontName, size, fontWeight)) + newFont = (fontName, self.fontSize.get(), fontWeight) + self.labelFontSample.config(font=newFont) + self.textHighlightSample.configure(font=newFont) def SetHighlightTarget(self): if self.highlightTarget.get()=='Cursor': #bg not possible -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 02:06:50 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 23 Oct 2012 02:06:50 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_the_ResourceWarning_in?= =?utf-8?q?_test=5Furllib=2Epy_due_changes_made_for_=2316301=2E_Patch_by?= Message-ID: <3XlvzG4JVLzRNg@mail.python.org> http://hg.python.org/cpython/rev/478cda291bbc changeset: 79901:478cda291bbc user: Senthil Kumaran date: Mon Oct 22 17:06:43 2012 -0700 summary: Fix the ResourceWarning in test_urllib.py due changes made for #16301. Patch by Berker Peksag files: Lib/test/test_urllib.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -280,7 +280,8 @@ tmp_fileurl = 'file://localhost' + tmp_file self.assertTrue(os.path.exists(tmp_file)) - self.assertTrue(urlopen(tmp_fileurl)) + with urlopen(tmp_fileurl) as fobj: + self.assertTrue(fobj) os.unlink(tmp_file) self.assertFalse(os.path.exists(tmp_file)) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 03:05:24 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 23 Oct 2012 03:05:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Optimize_PyUnicode=5FRichC?= =?utf-8?q?ompare=28=29_for_Py=5FEQ_and_Py=5FNE=3A_always_use_memcmp=28=29?= Message-ID: <3XlxGr1w0rzRJh@mail.python.org> http://hg.python.org/cpython/rev/b68be1025c42 changeset: 79902:b68be1025c42 user: Victor Stinner date: Tue Oct 23 02:48:49 2012 +0200 summary: Optimize PyUnicode_RichCompare() for Py_EQ and Py_NE: always use memcmp() files: Objects/unicodeobject.c | 74 ++++++++++++++++++---------- 1 files changed, 46 insertions(+), 28 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10296,6 +10296,32 @@ return 1; } +static int +unicode_compare_eq(PyObject *str1, PyObject *str2) +{ + int kind; + void *data1, *data2; + Py_ssize_t len; + int cmp; + + /* a string is equal to itself */ + if (str1 == str2) + return 1; + + len = PyUnicode_GET_LENGTH(str1); + if (PyUnicode_GET_LENGTH(str2) != len) + return 0; + kind = PyUnicode_KIND(str1); + if (PyUnicode_KIND(str2) != kind) + return 0; + data1 = PyUnicode_DATA(str1); + data2 = PyUnicode_DATA(str2); + + cmp = memcmp(data1, data2, len * kind); + return (cmp == 0); +} + + int PyUnicode_Compare(PyObject *left, PyObject *right) { @@ -10346,33 +10372,27 @@ PyUnicode_RichCompare(PyObject *left, PyObject *right, int op) { int result; - - if (PyUnicode_Check(left) && PyUnicode_Check(right)) { - PyObject *v; - if (PyUnicode_READY(left) == -1 || - PyUnicode_READY(right) == -1) - return NULL; - if (PyUnicode_GET_LENGTH(left) != PyUnicode_GET_LENGTH(right) || - PyUnicode_KIND(left) != PyUnicode_KIND(right)) { - if (op == Py_EQ) { - Py_INCREF(Py_False); - return Py_False; - } - if (op == Py_NE) { - Py_INCREF(Py_True); - return Py_True; - } - } + PyObject *v; + + if (!PyUnicode_Check(left) || !PyUnicode_Check(right)) + Py_RETURN_NOTIMPLEMENTED; + + if (PyUnicode_READY(left) == -1 || + PyUnicode_READY(right) == -1) + return NULL; + + if (op == Py_EQ || op == Py_NE) { + result = unicode_compare_eq(left, right); + if (op == Py_EQ) + v = TEST_COND(result); + else + v = TEST_COND(!result); + } + else { result = unicode_compare(left, right); /* Convert the return value to a Boolean */ switch (op) { - case Py_EQ: - v = TEST_COND(result == 0); - break; - case Py_NE: - v = TEST_COND(result != 0); - break; case Py_LE: v = TEST_COND(result <= 0); break; @@ -10389,11 +10409,9 @@ PyErr_BadArgument(); return NULL; } - Py_INCREF(v); - return v; - } - - Py_RETURN_NOTIMPLEMENTED; + } + Py_INCREF(v); + return v; } int -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 03:05:25 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 23 Oct 2012 03:05:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Inline_raise=5Ftranslate?= =?utf-8?q?=5Fexception=28=29=3A_it_is_only_used_once?= Message-ID: <3XlxGs4bgbzRK1@mail.python.org> http://hg.python.org/cpython/rev/1ac8b4976b73 changeset: 79903:1ac8b4976b73 user: Victor Stinner date: Tue Oct 23 02:51:50 2012 +0200 summary: Inline raise_translate_exception(): it is only used once files: Objects/unicodeobject.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8064,19 +8064,6 @@ } } -/* raises a UnicodeTranslateError */ -static void -raise_translate_exception(PyObject **exceptionObject, - PyObject *unicode, - Py_ssize_t startpos, Py_ssize_t endpos, - const char *reason) -{ - make_translate_exception(exceptionObject, - unicode, startpos, endpos, reason); - if (*exceptionObject != NULL) - PyCodec_StrictErrors(*exceptionObject); -} - /* error handling callback helper: build arguments, call the callback and check the arguments, put the result into newpos and return the replacement string, which @@ -8352,8 +8339,10 @@ } switch (known_errorHandler) { case 1: /* strict */ - raise_translate_exception(&exc, input, collstart, - collend, reason); + make_translate_exception(&exc, + input, collstart, collend, reason); + if (exc != NULL) + PyCodec_StrictErrors(exc); goto onError; case 2: /* replace */ /* No need to check for space, this is a 1:1 replacement */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 03:05:26 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 23 Oct 2012 03:05:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Optimize_=5FPyUnicode=5FHa?= =?utf-8?q?sNULChars=28=29=3A_use_findchar=28=29_instead_of?= Message-ID: <3XlxGt6nKgzRLD@mail.python.org> http://hg.python.org/cpython/rev/3b0bdd7e4abd changeset: 79904:3b0bdd7e4abd user: Victor Stinner date: Tue Oct 23 02:52:18 2012 +0200 summary: Optimize _PyUnicode_HasNULChars(): use findchar() instead of PyUnicode_Contains() files: Objects/unicodeobject.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3573,17 +3573,19 @@ int -_PyUnicode_HasNULChars(PyObject* s) -{ - static PyObject *nul = NULL; - - if (nul == NULL) - nul = PyUnicode_FromStringAndSize("\0", 1); - if (nul == NULL) - return -1; - return PyUnicode_Contains(s, nul); -} - +_PyUnicode_HasNULChars(PyObject* str) +{ + Py_ssize_t pos; + + if (PyUnicode_READY(str) == -1) + return -1; + pos = findchar(PyUnicode_DATA(str), PyUnicode_KIND(str), + PyUnicode_GET_LENGTH(str), '\0', 1); + if (pos == -1) + return 0; + else + return 1; +} int PyUnicode_FSConverter(PyObject* arg, void* addr) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 03:05:28 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 23 Oct 2012 03:05:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Replace_usage_of_the_depre?= =?utf-8?q?cated_Py=5FUNICODE=5FCOPY=28=29_with_Py=5FMEMCPY=28=29_in?= Message-ID: <3XlxGw6mR7zRLD@mail.python.org> http://hg.python.org/cpython/rev/3c0e1f351dae changeset: 79905:3c0e1f351dae user: Victor Stinner date: Tue Oct 23 02:54:47 2012 +0200 summary: Replace usage of the deprecated Py_UNICODE_COPY() with Py_MEMCPY() in resize_copy() files: Objects/unicodeobject.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -812,8 +812,8 @@ return NULL; copy_length = _PyUnicode_WSTR_LENGTH(unicode); copy_length = Py_MIN(copy_length, length); - Py_UNICODE_COPY(_PyUnicode_WSTR(w), _PyUnicode_WSTR(unicode), - copy_length); + Py_MEMCPY(_PyUnicode_WSTR(w), _PyUnicode_WSTR(unicode), + copy_length * sizeof(wchar_t)); return w; } } -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Tue Oct 23 05:57:14 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Tue, 23 Oct 2012 05:57:14 +0200 Subject: [Python-checkins] Daily reference leaks (3c0e1f351dae): sum=1 Message-ID: results for 3c0e1f351dae on branch "default" -------------------------------------------- test_support leaked [1, 0, 0] references, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogDe7DYh', '-x'] From python-checkins at python.org Tue Oct 23 06:50:34 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 23 Oct 2012 06:50:34 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_skip_the_file_localhost_te?= =?utf-8?q?st_on_windows=2E_Fix_it_on_branch_and_modify_the_test?= Message-ID: <3Xm2Gf4Tn3zPSc@mail.python.org> http://hg.python.org/cpython/rev/1f92315d9568 changeset: 79906:1f92315d9568 parent: 79901:478cda291bbc user: Senthil Kumaran date: Mon Oct 22 21:50:19 2012 -0700 summary: skip the file localhost test on windows. Fix it on branch and modify the test files: Lib/test/test_urllib.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -275,6 +275,7 @@ self.assertTrue(e.exception.filename) self.assertTrue(e.exception.reason) + @unittest.skipIf(sys.platform == "win32", "Skip on Windows: issue16300") def test_file_notexists(self): fd, tmp_file = tempfile.mkstemp() tmp_fileurl = 'file://localhost' + tmp_file -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 06:50:35 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 23 Oct 2012 06:50:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_Automated_merge_with_ssh=3A//hg=2Epython=2Eorg/cpython?= Message-ID: <3Xm2Gg6h26zR7y@mail.python.org> http://hg.python.org/cpython/rev/ab4432daf69f changeset: 79907:ab4432daf69f parent: 79905:3c0e1f351dae parent: 79906:1f92315d9568 user: Senthil Kumaran date: Mon Oct 22 21:50:27 2012 -0700 summary: Automated merge with ssh://hg.python.org/cpython files: Lib/test/test_urllib.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -275,6 +275,7 @@ self.assertTrue(e.exception.filename) self.assertTrue(e.exception.reason) + @unittest.skipIf(sys.platform == "win32", "Skip on Windows: issue16300") def test_file_notexists(self): fd, tmp_file = tempfile.mkstemp() tmp_fileurl = 'file://localhost' + tmp_file -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 11:56:38 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 11:56:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_Fix_typos=2E?= Message-ID: <3Xm93p4l7rzRBC@mail.python.org> http://hg.python.org/peps/rev/3601d079e62a changeset: 4567:3601d079e62a user: Ezio Melotti date: Tue Oct 23 11:56:24 2012 +0200 summary: Fix typos. files: pep-0414.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pep-0414.txt b/pep-0414.txt --- a/pep-0414.txt +++ b/pep-0414.txt @@ -69,7 +69,7 @@ =================================== Python 2 supports a concept of "raw" Unicode literals that don't meet the -convential definition of a raw string: ``\uXXXX`` and ``\UXXXXXXXX`` escape +conventional definition of a raw string: ``\uXXXX`` and ``\UXXXXXXXX`` escape sequences are still processed by the compiler and converted to the appropriate Unicode code points when creating the associated Unicode objects. @@ -336,7 +336,7 @@ Complaint: The existing tools should be good enough for everyone ---------------------------------------------------------------- -A commonly expressed sentiment from developers that have already sucessfully +A commonly expressed sentiment from developers that have already successfully ported applications to Python 3 is along the lines of "if you think it's hard, you're doing it wrong" or "it's not that hard, just try it!". While it is no doubt unintentional, these responses all have the effect of telling the @@ -347,7 +347,7 @@ These responses are a case of completely missing the point of what people are complaining about. The feedback that resulted in this PEP isn't due to people complaining that ports aren't possible. Instead, the feedback is coming from -people that have succesfully *completed* ports and are objecting that they +people that have successfully *completed* ports and are objecting that they found the experience thoroughly *unpleasant* for the class of application that they needed to port (specifically, Unicode aware web frameworks and support libraries). -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Tue Oct 23 14:03:38 2012 From: python-checkins at python.org (petri.lehtinen) Date: Tue, 23 Oct 2012 14:03:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1MDQwOiBDbG9z?= =?utf-8?q?e_files_in_mailbox_tests_for_PyPy_compatibility?= Message-ID: <3XmCtL0nK1zRB1@mail.python.org> http://hg.python.org/cpython/rev/84cd07899baf changeset: 79908:84cd07899baf branch: 2.7 parent: 79897:d089b8fb0f56 user: Petri Lehtinen date: Tue Oct 23 14:39:34 2012 +0300 summary: #15040: Close files in mailbox tests for PyPy compatibility Original patch by Matti Picus. files: Lib/test/test_mailbox.py | 31 ++++++++++++++++++----- Lib/test/test_old_mailbox.py | 16 +++++++++--- Misc/ACKS | 1 + Misc/NEWS | 3 ++ 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -146,6 +146,7 @@ msg = self._box.get(key1) self.assertEqual(msg['from'], 'foo') self.assertEqual(msg.fp.read(), '1' + os.linesep) + msg.fp.close() def test_getitem(self): # Retrieve message using __getitem__() @@ -178,10 +179,14 @@ # Get file representations of messages key0 = self._box.add(self._template % 0) key1 = self._box.add(_sample_message) - self.assertEqual(self._box.get_file(key0).read().replace(os.linesep, '\n'), + msg0 = self._box.get_file(key0) + self.assertEqual(msg0.read().replace(os.linesep, '\n'), self._template % 0) - self.assertEqual(self._box.get_file(key1).read().replace(os.linesep, '\n'), + msg1 = self._box.get_file(key1) + self.assertEqual(msg1.read().replace(os.linesep, '\n'), _sample_message) + msg0.close() + msg1.close() def test_get_file_can_be_closed_twice(self): # Issue 11700 @@ -427,6 +432,7 @@ self._box.add(contents[0]) self._box.add(contents[1]) self._box.add(contents[2]) + oldbox = self._box method() if should_call_close: self._box.close() @@ -435,6 +441,7 @@ self.assertEqual(len(keys), 3) for key in keys: self.assertIn(self._box.get_string(key), contents) + oldbox.close() def test_dump_message(self): # Write message representations to disk @@ -1968,7 +1975,9 @@ self.createMessage("cur") self.mbox = mailbox.Maildir(test_support.TESTFN) #self.assertTrue(len(self.mbox.boxes) == 1) - self.assertIsNot(self.mbox.next(), None) + msg = self.mbox.next() + self.assertIsNot(msg, None) + msg.fp.close() self.assertIs(self.mbox.next(), None) self.assertIs(self.mbox.next(), None) @@ -1976,7 +1985,9 @@ self.createMessage("new") self.mbox = mailbox.Maildir(test_support.TESTFN) #self.assertTrue(len(self.mbox.boxes) == 1) - self.assertIsNot(self.mbox.next(), None) + msg = self.mbox.next() + self.assertIsNot(msg, None) + msg.fp.close() self.assertIs(self.mbox.next(), None) self.assertIs(self.mbox.next(), None) @@ -1985,8 +1996,12 @@ self.createMessage("new") self.mbox = mailbox.Maildir(test_support.TESTFN) #self.assertTrue(len(self.mbox.boxes) == 2) - self.assertIsNot(self.mbox.next(), None) - self.assertIsNot(self.mbox.next(), None) + msg = self.mbox.next() + self.assertIsNot(msg, None) + msg.fp.close() + msg = self.mbox.next() + self.assertIsNot(msg, None) + msg.fp.close() self.assertIs(self.mbox.next(), None) self.assertIs(self.mbox.next(), None) @@ -1995,11 +2010,13 @@ import email.parser fname = self.createMessage("cur", True) n = 0 - for msg in mailbox.PortableUnixMailbox(open(fname), + fid = open(fname) + for msg in mailbox.PortableUnixMailbox(fid, email.parser.Parser().parse): n += 1 self.assertEqual(msg["subject"], "Simple Test") self.assertEqual(len(str(msg)), len(FROM_)+len(DUMMY_MESSAGE)) + fid.close() self.assertEqual(n, 1) ## End: classes from the original module (for backward compatibility). diff --git a/Lib/test/test_old_mailbox.py b/Lib/test/test_old_mailbox.py --- a/Lib/test/test_old_mailbox.py +++ b/Lib/test/test_old_mailbox.py @@ -73,7 +73,9 @@ self.createMessage("cur") self.mbox = mailbox.Maildir(test_support.TESTFN) self.assertTrue(len(self.mbox) == 1) - self.assertTrue(self.mbox.next() is not None) + msg = self.mbox.next() + self.assertTrue(msg is not None) + msg.fp.close() self.assertTrue(self.mbox.next() is None) self.assertTrue(self.mbox.next() is None) @@ -81,7 +83,9 @@ self.createMessage("new") self.mbox = mailbox.Maildir(test_support.TESTFN) self.assertTrue(len(self.mbox) == 1) - self.assertTrue(self.mbox.next() is not None) + msg = self.mbox.next() + self.assertTrue(msg is not None) + msg.fp.close() self.assertTrue(self.mbox.next() is None) self.assertTrue(self.mbox.next() is None) @@ -90,8 +94,12 @@ self.createMessage("new") self.mbox = mailbox.Maildir(test_support.TESTFN) self.assertTrue(len(self.mbox) == 2) - self.assertTrue(self.mbox.next() is not None) - self.assertTrue(self.mbox.next() is not None) + msg = self.mbox.next() + self.assertTrue(msg is not None) + msg.fp.close() + msg = self.mbox.next() + self.assertTrue(msg is not None) + msg.fp.close() self.assertTrue(self.mbox.next() is None) self.assertTrue(self.mbox.next() is None) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -762,6 +762,7 @@ Adrian Phillips Christopher J. Phoenix Neale Pickett +Matti Picus Jim St. Pierre Dan Pierson Martijn Pieters diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -435,6 +435,9 @@ Tests ----- +- Issue #15040: Close files in mailbox tests for PyPy compatibility. + Original patch by Matti Picus. + - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch by Serhiy Storchaka. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 14:48:17 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 14:48:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Reorder_html?= =?utf-8?q?=2Eentities=2Ehtml5_entities_to_make_updates_easier=2E__Patch_b?= =?utf-8?q?y_Iuliia?= Message-ID: <3XmDss66GdzRDp@mail.python.org> http://hg.python.org/cpython/rev/02e5f7d1ab29 changeset: 79909:02e5f7d1ab29 branch: 3.3 parent: 79899:36e7da8d3059 user: Ezio Melotti date: Tue Oct 23 14:45:58 2012 +0200 summary: Reorder html.entities.html5 entities to make updates easier. Patch by Iuliia Proskurnia. files: Lib/html/entities.py | 220 +++++++++++++++--------------- 1 files changed, 110 insertions(+), 110 deletions(-) diff --git a/Lib/html/entities.py b/Lib/html/entities.py --- a/Lib/html/entities.py +++ b/Lib/html/entities.py @@ -259,34 +259,34 @@ # maps the HTML5 named character references to the equivalent Unicode character(s) html5 = { + 'Aacute': '\xc1', + 'aacute': '\xe1', 'Aacute;': '\xc1', - 'Aacute': '\xc1', 'aacute;': '\xe1', - 'aacute': '\xe1', 'Abreve;': '\u0102', 'abreve;': '\u0103', 'ac;': '\u223e', 'acd;': '\u223f', 'acE;': '\u223e\u0333', + 'Acirc': '\xc2', + 'acirc': '\xe2', 'Acirc;': '\xc2', - 'Acirc': '\xc2', 'acirc;': '\xe2', - 'acirc': '\xe2', + 'acute': '\xb4', 'acute;': '\xb4', - 'acute': '\xb4', 'Acy;': '\u0410', 'acy;': '\u0430', + 'AElig': '\xc6', + 'aelig': '\xe6', 'AElig;': '\xc6', - 'AElig': '\xc6', 'aelig;': '\xe6', - 'aelig': '\xe6', 'af;': '\u2061', 'Afr;': '\U0001d504', 'afr;': '\U0001d51e', + 'Agrave': '\xc0', + 'agrave': '\xe0', 'Agrave;': '\xc0', - 'Agrave': '\xc0', 'agrave;': '\xe0', - 'agrave': '\xe0', 'alefsym;': '\u2135', 'aleph;': '\u2135', 'Alpha;': '\u0391', @@ -294,10 +294,10 @@ 'Amacr;': '\u0100', 'amacr;': '\u0101', 'amalg;': '\u2a3f', + 'AMP': '&', + 'amp': '&', 'AMP;': '&', - 'AMP': '&', 'amp;': '&', - 'amp': '&', 'And;': '\u2a53', 'and;': '\u2227', 'andand;': '\u2a55', @@ -335,24 +335,24 @@ 'ApplyFunction;': '\u2061', 'approx;': '\u2248', 'approxeq;': '\u224a', + 'Aring': '\xc5', + 'aring': '\xe5', 'Aring;': '\xc5', - 'Aring': '\xc5', 'aring;': '\xe5', - 'aring': '\xe5', 'Ascr;': '\U0001d49c', 'ascr;': '\U0001d4b6', 'Assign;': '\u2254', 'ast;': '*', 'asymp;': '\u2248', 'asympeq;': '\u224d', + 'Atilde': '\xc3', + 'atilde': '\xe3', 'Atilde;': '\xc3', - 'Atilde': '\xc3', 'atilde;': '\xe3', - 'atilde': '\xe3', + 'Auml': '\xc4', + 'auml': '\xe4', 'Auml;': '\xc4', - 'Auml': '\xc4', 'auml;': '\xe4', - 'auml': '\xe4', 'awconint;': '\u2233', 'awint;': '\u2a11', 'backcong;': '\u224c', @@ -466,8 +466,8 @@ 'bprime;': '\u2035', 'Breve;': '\u02d8', 'breve;': '\u02d8', + 'brvbar': '\xa6', 'brvbar;': '\xa6', - 'brvbar': '\xa6', 'Bscr;': '\u212c', 'bscr;': '\U0001d4b7', 'bsemi;': '\u204f', @@ -500,10 +500,10 @@ 'ccaps;': '\u2a4d', 'Ccaron;': '\u010c', 'ccaron;': '\u010d', + 'Ccedil': '\xc7', + 'ccedil': '\xe7', 'Ccedil;': '\xc7', - 'Ccedil': '\xc7', 'ccedil;': '\xe7', - 'ccedil': '\xe7', 'Ccirc;': '\u0108', 'ccirc;': '\u0109', 'Cconint;': '\u2230', @@ -511,12 +511,12 @@ 'ccupssm;': '\u2a50', 'Cdot;': '\u010a', 'cdot;': '\u010b', + 'cedil': '\xb8', 'cedil;': '\xb8', - 'cedil': '\xb8', 'Cedilla;': '\xb8', 'cemptyv;': '\u29b2', + 'cent': '\xa2', 'cent;': '\xa2', - 'cent': '\xa2', 'CenterDot;': '\xb7', 'centerdot;': '\xb7', 'Cfr;': '\u212d', @@ -572,10 +572,10 @@ 'copf;': '\U0001d554', 'coprod;': '\u2210', 'Coproduct;': '\u2210', + 'COPY': '\xa9', + 'copy': '\xa9', 'COPY;': '\xa9', - 'COPY': '\xa9', 'copy;': '\xa9', - 'copy': '\xa9', 'copysr;': '\u2117', 'CounterClockwiseContourIntegral;': '\u2233', 'crarr;': '\u21b5', @@ -609,8 +609,8 @@ 'curlyeqsucc;': '\u22df', 'curlyvee;': '\u22ce', 'curlywedge;': '\u22cf', + 'curren': '\xa4', 'curren;': '\xa4', - 'curren': '\xa4', 'curvearrowleft;': '\u21b6', 'curvearrowright;': '\u21b7', 'cuvee;': '\u22ce', @@ -639,8 +639,8 @@ 'ddarr;': '\u21ca', 'DDotrahd;': '\u2911', 'ddotseq;': '\u2a77', + 'deg': '\xb0', 'deg;': '\xb0', - 'deg': '\xb0', 'Del;': '\u2207', 'Delta;': '\u0394', 'delta;': '\u03b4', @@ -666,8 +666,8 @@ 'digamma;': '\u03dd', 'disin;': '\u22f2', 'div;': '\xf7', + 'divide': '\xf7', 'divide;': '\xf7', - 'divide': '\xf7', 'divideontimes;': '\u22c7', 'divonx;': '\u22c7', 'DJcy;': '\u0402', @@ -738,18 +738,18 @@ 'DZcy;': '\u040f', 'dzcy;': '\u045f', 'dzigrarr;': '\u27ff', + 'Eacute': '\xc9', + 'eacute': '\xe9', 'Eacute;': '\xc9', - 'Eacute': '\xc9', 'eacute;': '\xe9', - 'eacute': '\xe9', 'easter;': '\u2a6e', 'Ecaron;': '\u011a', 'ecaron;': '\u011b', 'ecir;': '\u2256', + 'Ecirc': '\xca', + 'ecirc': '\xea', 'Ecirc;': '\xca', - 'Ecirc': '\xca', 'ecirc;': '\xea', - 'ecirc': '\xea', 'ecolon;': '\u2255', 'Ecy;': '\u042d', 'ecy;': '\u044d', @@ -762,10 +762,10 @@ 'Efr;': '\U0001d508', 'efr;': '\U0001d522', 'eg;': '\u2a9a', + 'Egrave': '\xc8', + 'egrave': '\xe8', 'Egrave;': '\xc8', - 'Egrave': '\xc8', 'egrave;': '\xe8', - 'egrave': '\xe8', 'egs;': '\u2a96', 'egsdot;': '\u2a98', 'el;': '\u2a99', @@ -781,9 +781,9 @@ 'EmptySmallSquare;': '\u25fb', 'emptyv;': '\u2205', 'EmptyVerySmallSquare;': '\u25ab', - 'emsp;': '\u2003', 'emsp13;': '\u2004', 'emsp14;': '\u2005', + 'emsp;': '\u2003', 'ENG;': '\u014a', 'eng;': '\u014b', 'ensp;': '\u2002', @@ -820,14 +820,14 @@ 'esim;': '\u2242', 'Eta;': '\u0397', 'eta;': '\u03b7', + 'ETH': '\xd0', + 'eth': '\xf0', 'ETH;': '\xd0', - 'ETH': '\xd0', 'eth;': '\xf0', - 'eth': '\xf0', + 'Euml': '\xcb', + 'euml': '\xeb', 'Euml;': '\xcb', - 'Euml': '\xcb', 'euml;': '\xeb', - 'euml': '\xeb', 'euro;': '\u20ac', 'excl;': '!', 'exist;': '\u2203', @@ -860,18 +860,18 @@ 'forkv;': '\u2ad9', 'Fouriertrf;': '\u2131', 'fpartint;': '\u2a0d', + 'frac12': '\xbd', 'frac12;': '\xbd', - 'frac12': '\xbd', 'frac13;': '\u2153', + 'frac14': '\xbc', 'frac14;': '\xbc', - 'frac14': '\xbc', 'frac15;': '\u2155', 'frac16;': '\u2159', 'frac18;': '\u215b', 'frac23;': '\u2154', 'frac25;': '\u2156', + 'frac34': '\xbe', 'frac34;': '\xbe', - 'frac34': '\xbe', 'frac35;': '\u2157', 'frac38;': '\u215c', 'frac45;': '\u2158', @@ -945,11 +945,11 @@ 'gsim;': '\u2273', 'gsime;': '\u2a8e', 'gsiml;': '\u2a90', + 'GT': '>', + 'gt': '>', 'GT;': '>', - 'GT': '>', 'Gt;': '\u226b', 'gt;': '>', - 'gt': '>', 'gtcc;': '\u2aa7', 'gtcir;': '\u2a7a', 'gtdot;': '\u22d7', @@ -1004,29 +1004,29 @@ 'HumpEqual;': '\u224f', 'hybull;': '\u2043', 'hyphen;': '\u2010', + 'Iacute': '\xcd', + 'iacute': '\xed', 'Iacute;': '\xcd', - 'Iacute': '\xcd', 'iacute;': '\xed', - 'iacute': '\xed', 'ic;': '\u2063', + 'Icirc': '\xce', + 'icirc': '\xee', 'Icirc;': '\xce', - 'Icirc': '\xce', 'icirc;': '\xee', - 'icirc': '\xee', 'Icy;': '\u0418', 'icy;': '\u0438', 'Idot;': '\u0130', 'IEcy;': '\u0415', 'iecy;': '\u0435', + 'iexcl': '\xa1', 'iexcl;': '\xa1', - 'iexcl': '\xa1', 'iff;': '\u21d4', 'Ifr;': '\u2111', 'ifr;': '\U0001d526', + 'Igrave': '\xcc', + 'igrave': '\xec', 'Igrave;': '\xcc', - 'Igrave': '\xcc', 'igrave;': '\xec', - 'igrave': '\xec', 'ii;': '\u2148', 'iiiint;': '\u2a0c', 'iiint;': '\u222d', @@ -1070,8 +1070,8 @@ 'Iota;': '\u0399', 'iota;': '\u03b9', 'iprod;': '\u2a3c', + 'iquest': '\xbf', 'iquest;': '\xbf', - 'iquest': '\xbf', 'Iscr;': '\u2110', 'iscr;': '\U0001d4be', 'isin;': '\u2208', @@ -1085,10 +1085,10 @@ 'itilde;': '\u0129', 'Iukcy;': '\u0406', 'iukcy;': '\u0456', + 'Iuml': '\xcf', + 'iuml': '\xef', 'Iuml;': '\xcf', - 'Iuml': '\xcf', 'iuml;': '\xef', - 'iuml': '\xef', 'Jcirc;': '\u0134', 'jcirc;': '\u0135', 'Jcy;': '\u0419', @@ -1135,8 +1135,8 @@ 'langle;': '\u2329', 'lap;': '\u2a85', 'Laplacetrf;': '\u2112', + 'laquo': '\xab', 'laquo;': '\xab', - 'laquo': '\xab', 'Larr;': '\u219e', 'lArr;': '\u21d0', 'larr;': '\u2190', @@ -1316,11 +1316,11 @@ 'lsquor;': '\u201a', 'Lstrok;': '\u0141', 'lstrok;': '\u0142', + 'LT': '<', + 'lt': '<', 'LT;': '<', - 'LT': '<', 'Lt;': '\u226a', 'lt;': '<', - 'lt': '<', 'ltcc;': '\u2aa6', 'ltcir;': '\u2a79', 'ltdot;': '\u22d6', @@ -1336,8 +1336,8 @@ 'luruhar;': '\u2966', 'lvertneqq;': '\u2268\ufe00', 'lvnE;': '\u2268\ufe00', + 'macr': '\xaf', 'macr;': '\xaf', - 'macr': '\xaf', 'male;': '\u2642', 'malt;': '\u2720', 'maltese;': '\u2720', @@ -1359,13 +1359,13 @@ 'Mfr;': '\U0001d510', 'mfr;': '\U0001d52a', 'mho;': '\u2127', + 'micro': '\xb5', 'micro;': '\xb5', - 'micro': '\xb5', 'mid;': '\u2223', 'midast;': '*', 'midcir;': '\u2af0', + 'middot': '\xb7', 'middot;': '\xb7', - 'middot': '\xb7', 'minus;': '\u2212', 'minusb;': '\u229f', 'minusd;': '\u2238', @@ -1397,8 +1397,8 @@ 'natur;': '\u266e', 'natural;': '\u266e', 'naturals;': '\u2115', + 'nbsp': '\xa0', 'nbsp;': '\xa0', - 'nbsp': '\xa0', 'nbump;': '\u224e\u0338', 'nbumpe;': '\u224f\u0338', 'ncap;': '\u2a43', @@ -1479,9 +1479,9 @@ 'NonBreakingSpace;': '\xa0', 'Nopf;': '\u2115', 'nopf;': '\U0001d55f', + 'not': '\xac', 'Not;': '\u2aec', 'not;': '\xac', - 'not': '\xac', 'NotCongruent;': '\u2262', 'NotCupCap;': '\u226d', 'NotDoubleVerticalBar;': '\u2226', @@ -1590,10 +1590,10 @@ 'nsupseteq;': '\u2289', 'nsupseteqq;': '\u2ac6\u0338', 'ntgl;': '\u2279', + 'Ntilde': '\xd1', + 'ntilde': '\xf1', 'Ntilde;': '\xd1', - 'Ntilde': '\xd1', 'ntilde;': '\xf1', - 'ntilde': '\xf1', 'ntlg;': '\u2278', 'ntriangleleft;': '\u22ea', 'ntrianglelefteq;': '\u22ec', @@ -1625,16 +1625,16 @@ 'nwarr;': '\u2196', 'nwarrow;': '\u2196', 'nwnear;': '\u2927', + 'Oacute': '\xd3', + 'oacute': '\xf3', 'Oacute;': '\xd3', - 'Oacute': '\xd3', 'oacute;': '\xf3', - 'oacute': '\xf3', 'oast;': '\u229b', 'ocir;': '\u229a', + 'Ocirc': '\xd4', + 'ocirc': '\xf4', 'Ocirc;': '\xd4', - 'Ocirc': '\xd4', 'ocirc;': '\xf4', - 'ocirc': '\xf4', 'Ocy;': '\u041e', 'ocy;': '\u043e', 'odash;': '\u229d', @@ -1649,10 +1649,10 @@ 'Ofr;': '\U0001d512', 'ofr;': '\U0001d52c', 'ogon;': '\u02db', + 'Ograve': '\xd2', + 'ograve': '\xf2', 'Ograve;': '\xd2', - 'Ograve': '\xd2', 'ograve;': '\xf2', - 'ograve': '\xf2', 'ogt;': '\u29c1', 'ohbar;': '\u29b5', 'ohm;': '\u03a9', @@ -1683,10 +1683,10 @@ 'ord;': '\u2a5d', 'order;': '\u2134', 'orderof;': '\u2134', + 'ordf': '\xaa', 'ordf;': '\xaa', - 'ordf': '\xaa', + 'ordm': '\xba', 'ordm;': '\xba', - 'ordm': '\xba', 'origof;': '\u22b6', 'oror;': '\u2a56', 'orslope;': '\u2a57', @@ -1694,30 +1694,30 @@ 'oS;': '\u24c8', 'Oscr;': '\U0001d4aa', 'oscr;': '\u2134', + 'Oslash': '\xd8', + 'oslash': '\xf8', 'Oslash;': '\xd8', - 'Oslash': '\xd8', 'oslash;': '\xf8', - 'oslash': '\xf8', 'osol;': '\u2298', + 'Otilde': '\xd5', + 'otilde': '\xf5', 'Otilde;': '\xd5', - 'Otilde': '\xd5', 'otilde;': '\xf5', - 'otilde': '\xf5', 'Otimes;': '\u2a37', 'otimes;': '\u2297', 'otimesas;': '\u2a36', + 'Ouml': '\xd6', + 'ouml': '\xf6', 'Ouml;': '\xd6', - 'Ouml': '\xd6', 'ouml;': '\xf6', - 'ouml': '\xf6', 'ovbar;': '\u233d', 'OverBar;': '\u203e', 'OverBrace;': '\u23de', 'OverBracket;': '\u23b4', 'OverParenthesis;': '\u23dc', 'par;': '\u2225', + 'para': '\xb6', 'para;': '\xb6', - 'para': '\xb6', 'parallel;': '\u2225', 'parsim;': '\u2af3', 'parsl;': '\u2afd', @@ -1752,8 +1752,8 @@ 'plusdu;': '\u2a25', 'pluse;': '\u2a72', 'PlusMinus;': '\xb1', + 'plusmn': '\xb1', 'plusmn;': '\xb1', - 'plusmn': '\xb1', 'plussim;': '\u2a26', 'plustwo;': '\u2a27', 'pm;': '\xb1', @@ -1761,8 +1761,8 @@ 'pointint;': '\u2a15', 'Popf;': '\u2119', 'popf;': '\U0001d561', + 'pound': '\xa3', 'pound;': '\xa3', - 'pound': '\xa3', 'Pr;': '\u2abb', 'pr;': '\u227a', 'prap;': '\u2ab7', @@ -1815,10 +1815,10 @@ 'quatint;': '\u2a16', 'quest;': '?', 'questeq;': '\u225f', + 'QUOT': '"', + 'quot': '"', 'QUOT;': '"', - 'QUOT': '"', 'quot;': '"', - 'quot': '"', 'rAarr;': '\u21db', 'race;': '\u223d\u0331', 'Racute;': '\u0154', @@ -1830,8 +1830,8 @@ 'rangd;': '\u2992', 'range;': '\u29a5', 'rangle;': '\u232a', + 'raquo': '\xbb', 'raquo;': '\xbb', - 'raquo': '\xbb', 'Rarr;': '\u21a0', 'rArr;': '\u21d2', 'rarr;': '\u2192', @@ -1879,10 +1879,10 @@ 'realpart;': '\u211c', 'reals;': '\u211d', 'rect;': '\u25ad', + 'REG': '\xae', + 'reg': '\xae', 'REG;': '\xae', - 'REG': '\xae', 'reg;': '\xae', - 'reg': '\xae', 'ReverseElement;': '\u220b', 'ReverseEquilibrium;': '\u21cb', 'ReverseUpEquilibrium;': '\u296f', @@ -1997,8 +1997,8 @@ 'seArr;': '\u21d8', 'searr;': '\u2198', 'searrow;': '\u2198', + 'sect': '\xa7', 'sect;': '\xa7', - 'sect': '\xa7', 'semi;': ';', 'seswar;': '\u2929', 'setminus;': '\u2216', @@ -2018,8 +2018,8 @@ 'shortparallel;': '\u2225', 'ShortRightArrow;': '\u2192', 'ShortUpArrow;': '\u2191', + 'shy': '\xad', 'shy;': '\xad', - 'shy': '\xad', 'Sigma;': '\u03a3', 'sigma;': '\u03c3', 'sigmaf;': '\u03c2', @@ -2128,14 +2128,14 @@ 'Sum;': '\u2211', 'sum;': '\u2211', 'sung;': '\u266a', + 'sup1': '\xb9', + 'sup1;': '\xb9', + 'sup2': '\xb2', + 'sup2;': '\xb2', + 'sup3': '\xb3', + 'sup3;': '\xb3', 'Sup;': '\u22d1', 'sup;': '\u2283', - 'sup1;': '\xb9', - 'sup1': '\xb9', - 'sup2;': '\xb2', - 'sup2': '\xb2', - 'sup3;': '\xb3', - 'sup3': '\xb3', 'supdot;': '\u2abe', 'supdsub;': '\u2ad8', 'supE;': '\u2ac6', @@ -2164,8 +2164,8 @@ 'swarr;': '\u2199', 'swarrow;': '\u2199', 'swnwar;': '\u292a', + 'szlig': '\xdf', 'szlig;': '\xdf', - 'szlig': '\xdf', 'Tab;': '\u2409', 'target;': '\u2316', 'Tau;': '\u03a4', @@ -2195,17 +2195,17 @@ 'ThinSpace;': '\u2009', 'thkap;': '\u2248', 'thksim;': '\u223c', + 'THORN': '\xde', + 'thorn': '\xfe', 'THORN;': '\xde', - 'THORN': '\xde', 'thorn;': '\xfe', - 'thorn': '\xfe', 'Tilde;': '\u223c', 'tilde;': '\u02dc', 'TildeEqual;': '\u2243', 'TildeFullEqual;': '\u2245', 'TildeTilde;': '\u2248', + 'times': '\xd7', 'times;': '\xd7', - 'times': '\xd7', 'timesb;': '\u22a0', 'timesbar;': '\u2a31', 'timesd;': '\u2a30', @@ -2247,10 +2247,10 @@ 'twixt;': '\u226c', 'twoheadleftarrow;': '\u219e', 'twoheadrightarrow;': '\u21a0', + 'Uacute': '\xda', + 'uacute': '\xfa', 'Uacute;': '\xda', - 'Uacute': '\xda', 'uacute;': '\xfa', - 'uacute': '\xfa', 'Uarr;': '\u219f', 'uArr;': '\u21d1', 'uarr;': '\u2191', @@ -2259,10 +2259,10 @@ 'ubrcy;': '\u045e', 'Ubreve;': '\u016c', 'ubreve;': '\u016d', + 'Ucirc': '\xdb', + 'ucirc': '\xfb', 'Ucirc;': '\xdb', - 'Ucirc': '\xdb', 'ucirc;': '\xfb', - 'ucirc': '\xfb', 'Ucy;': '\u0423', 'ucy;': '\u0443', 'udarr;': '\u21c5', @@ -2272,10 +2272,10 @@ 'ufisht;': '\u297e', 'Ufr;': '\U0001d518', 'ufr;': '\U0001d532', + 'Ugrave': '\xd9', + 'ugrave': '\xf9', 'Ugrave;': '\xd9', - 'Ugrave': '\xd9', 'ugrave;': '\xf9', - 'ugrave': '\xf9', 'uHar;': '\u2963', 'uharl;': '\u21bf', 'uharr;': '\u21be', @@ -2286,8 +2286,8 @@ 'ultri;': '\u25f8', 'Umacr;': '\u016a', 'umacr;': '\u016b', + 'uml': '\xa8', 'uml;': '\xa8', - 'uml': '\xa8', 'UnderBar;': '_', 'UnderBrace;': '\u23df', 'UnderBracket;': '\u23b5', @@ -2334,10 +2334,10 @@ 'utri;': '\u25b5', 'utrif;': '\u25b4', 'uuarr;': '\u21c8', + 'Uuml': '\xdc', + 'uuml': '\xfc', 'Uuml;': '\xdc', - 'Uuml': '\xdc', 'uuml;': '\xfc', - 'uuml': '\xfc', 'uwangle;': '\u29a7', 'vangrt;': '\u299c', 'varepsilon;': '\u03f5', @@ -2442,18 +2442,18 @@ 'xutri;': '\u25b3', 'xvee;': '\u22c1', 'xwedge;': '\u22c0', + 'Yacute': '\xdd', + 'yacute': '\xfd', 'Yacute;': '\xdd', - 'Yacute': '\xdd', 'yacute;': '\xfd', - 'yacute': '\xfd', 'YAcy;': '\u042f', 'yacy;': '\u044f', 'Ycirc;': '\u0176', 'ycirc;': '\u0177', 'Ycy;': '\u042b', 'ycy;': '\u044b', + 'yen': '\xa5', 'yen;': '\xa5', - 'yen': '\xa5', 'Yfr;': '\U0001d51c', 'yfr;': '\U0001d536', 'YIcy;': '\u0407', @@ -2464,9 +2464,9 @@ 'yscr;': '\U0001d4ce', 'YUcy;': '\u042e', 'yucy;': '\u044e', + 'yuml': '\xff', 'Yuml;': '\u0178', 'yuml;': '\xff', - 'yuml': '\xff', 'Zacute;': '\u0179', 'zacute;': '\u017a', 'Zcaron;': '\u017d', -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 14:48:19 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 14:48:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_html=2Eentities=2Ehtml5_reordering_with_3=2E3=2E?= Message-ID: <3XmDsv3pG2zRF8@mail.python.org> http://hg.python.org/cpython/rev/82af3dd0cb10 changeset: 79910:82af3dd0cb10 parent: 79907:ab4432daf69f parent: 79909:02e5f7d1ab29 user: Ezio Melotti date: Tue Oct 23 14:47:42 2012 +0200 summary: Merge html.entities.html5 reordering with 3.3. files: Lib/html/entities.py | 220 +++++++++++++++--------------- 1 files changed, 110 insertions(+), 110 deletions(-) diff --git a/Lib/html/entities.py b/Lib/html/entities.py --- a/Lib/html/entities.py +++ b/Lib/html/entities.py @@ -259,34 +259,34 @@ # maps the HTML5 named character references to the equivalent Unicode character(s) html5 = { + 'Aacute': '\xc1', + 'aacute': '\xe1', 'Aacute;': '\xc1', - 'Aacute': '\xc1', 'aacute;': '\xe1', - 'aacute': '\xe1', 'Abreve;': '\u0102', 'abreve;': '\u0103', 'ac;': '\u223e', 'acd;': '\u223f', 'acE;': '\u223e\u0333', + 'Acirc': '\xc2', + 'acirc': '\xe2', 'Acirc;': '\xc2', - 'Acirc': '\xc2', 'acirc;': '\xe2', - 'acirc': '\xe2', + 'acute': '\xb4', 'acute;': '\xb4', - 'acute': '\xb4', 'Acy;': '\u0410', 'acy;': '\u0430', + 'AElig': '\xc6', + 'aelig': '\xe6', 'AElig;': '\xc6', - 'AElig': '\xc6', 'aelig;': '\xe6', - 'aelig': '\xe6', 'af;': '\u2061', 'Afr;': '\U0001d504', 'afr;': '\U0001d51e', + 'Agrave': '\xc0', + 'agrave': '\xe0', 'Agrave;': '\xc0', - 'Agrave': '\xc0', 'agrave;': '\xe0', - 'agrave': '\xe0', 'alefsym;': '\u2135', 'aleph;': '\u2135', 'Alpha;': '\u0391', @@ -294,10 +294,10 @@ 'Amacr;': '\u0100', 'amacr;': '\u0101', 'amalg;': '\u2a3f', + 'AMP': '&', + 'amp': '&', 'AMP;': '&', - 'AMP': '&', 'amp;': '&', - 'amp': '&', 'And;': '\u2a53', 'and;': '\u2227', 'andand;': '\u2a55', @@ -335,24 +335,24 @@ 'ApplyFunction;': '\u2061', 'approx;': '\u2248', 'approxeq;': '\u224a', + 'Aring': '\xc5', + 'aring': '\xe5', 'Aring;': '\xc5', - 'Aring': '\xc5', 'aring;': '\xe5', - 'aring': '\xe5', 'Ascr;': '\U0001d49c', 'ascr;': '\U0001d4b6', 'Assign;': '\u2254', 'ast;': '*', 'asymp;': '\u2248', 'asympeq;': '\u224d', + 'Atilde': '\xc3', + 'atilde': '\xe3', 'Atilde;': '\xc3', - 'Atilde': '\xc3', 'atilde;': '\xe3', - 'atilde': '\xe3', + 'Auml': '\xc4', + 'auml': '\xe4', 'Auml;': '\xc4', - 'Auml': '\xc4', 'auml;': '\xe4', - 'auml': '\xe4', 'awconint;': '\u2233', 'awint;': '\u2a11', 'backcong;': '\u224c', @@ -466,8 +466,8 @@ 'bprime;': '\u2035', 'Breve;': '\u02d8', 'breve;': '\u02d8', + 'brvbar': '\xa6', 'brvbar;': '\xa6', - 'brvbar': '\xa6', 'Bscr;': '\u212c', 'bscr;': '\U0001d4b7', 'bsemi;': '\u204f', @@ -500,10 +500,10 @@ 'ccaps;': '\u2a4d', 'Ccaron;': '\u010c', 'ccaron;': '\u010d', + 'Ccedil': '\xc7', + 'ccedil': '\xe7', 'Ccedil;': '\xc7', - 'Ccedil': '\xc7', 'ccedil;': '\xe7', - 'ccedil': '\xe7', 'Ccirc;': '\u0108', 'ccirc;': '\u0109', 'Cconint;': '\u2230', @@ -511,12 +511,12 @@ 'ccupssm;': '\u2a50', 'Cdot;': '\u010a', 'cdot;': '\u010b', + 'cedil': '\xb8', 'cedil;': '\xb8', - 'cedil': '\xb8', 'Cedilla;': '\xb8', 'cemptyv;': '\u29b2', + 'cent': '\xa2', 'cent;': '\xa2', - 'cent': '\xa2', 'CenterDot;': '\xb7', 'centerdot;': '\xb7', 'Cfr;': '\u212d', @@ -572,10 +572,10 @@ 'copf;': '\U0001d554', 'coprod;': '\u2210', 'Coproduct;': '\u2210', + 'COPY': '\xa9', + 'copy': '\xa9', 'COPY;': '\xa9', - 'COPY': '\xa9', 'copy;': '\xa9', - 'copy': '\xa9', 'copysr;': '\u2117', 'CounterClockwiseContourIntegral;': '\u2233', 'crarr;': '\u21b5', @@ -609,8 +609,8 @@ 'curlyeqsucc;': '\u22df', 'curlyvee;': '\u22ce', 'curlywedge;': '\u22cf', + 'curren': '\xa4', 'curren;': '\xa4', - 'curren': '\xa4', 'curvearrowleft;': '\u21b6', 'curvearrowright;': '\u21b7', 'cuvee;': '\u22ce', @@ -639,8 +639,8 @@ 'ddarr;': '\u21ca', 'DDotrahd;': '\u2911', 'ddotseq;': '\u2a77', + 'deg': '\xb0', 'deg;': '\xb0', - 'deg': '\xb0', 'Del;': '\u2207', 'Delta;': '\u0394', 'delta;': '\u03b4', @@ -666,8 +666,8 @@ 'digamma;': '\u03dd', 'disin;': '\u22f2', 'div;': '\xf7', + 'divide': '\xf7', 'divide;': '\xf7', - 'divide': '\xf7', 'divideontimes;': '\u22c7', 'divonx;': '\u22c7', 'DJcy;': '\u0402', @@ -738,18 +738,18 @@ 'DZcy;': '\u040f', 'dzcy;': '\u045f', 'dzigrarr;': '\u27ff', + 'Eacute': '\xc9', + 'eacute': '\xe9', 'Eacute;': '\xc9', - 'Eacute': '\xc9', 'eacute;': '\xe9', - 'eacute': '\xe9', 'easter;': '\u2a6e', 'Ecaron;': '\u011a', 'ecaron;': '\u011b', 'ecir;': '\u2256', + 'Ecirc': '\xca', + 'ecirc': '\xea', 'Ecirc;': '\xca', - 'Ecirc': '\xca', 'ecirc;': '\xea', - 'ecirc': '\xea', 'ecolon;': '\u2255', 'Ecy;': '\u042d', 'ecy;': '\u044d', @@ -762,10 +762,10 @@ 'Efr;': '\U0001d508', 'efr;': '\U0001d522', 'eg;': '\u2a9a', + 'Egrave': '\xc8', + 'egrave': '\xe8', 'Egrave;': '\xc8', - 'Egrave': '\xc8', 'egrave;': '\xe8', - 'egrave': '\xe8', 'egs;': '\u2a96', 'egsdot;': '\u2a98', 'el;': '\u2a99', @@ -781,9 +781,9 @@ 'EmptySmallSquare;': '\u25fb', 'emptyv;': '\u2205', 'EmptyVerySmallSquare;': '\u25ab', - 'emsp;': '\u2003', 'emsp13;': '\u2004', 'emsp14;': '\u2005', + 'emsp;': '\u2003', 'ENG;': '\u014a', 'eng;': '\u014b', 'ensp;': '\u2002', @@ -820,14 +820,14 @@ 'esim;': '\u2242', 'Eta;': '\u0397', 'eta;': '\u03b7', + 'ETH': '\xd0', + 'eth': '\xf0', 'ETH;': '\xd0', - 'ETH': '\xd0', 'eth;': '\xf0', - 'eth': '\xf0', + 'Euml': '\xcb', + 'euml': '\xeb', 'Euml;': '\xcb', - 'Euml': '\xcb', 'euml;': '\xeb', - 'euml': '\xeb', 'euro;': '\u20ac', 'excl;': '!', 'exist;': '\u2203', @@ -860,18 +860,18 @@ 'forkv;': '\u2ad9', 'Fouriertrf;': '\u2131', 'fpartint;': '\u2a0d', + 'frac12': '\xbd', 'frac12;': '\xbd', - 'frac12': '\xbd', 'frac13;': '\u2153', + 'frac14': '\xbc', 'frac14;': '\xbc', - 'frac14': '\xbc', 'frac15;': '\u2155', 'frac16;': '\u2159', 'frac18;': '\u215b', 'frac23;': '\u2154', 'frac25;': '\u2156', + 'frac34': '\xbe', 'frac34;': '\xbe', - 'frac34': '\xbe', 'frac35;': '\u2157', 'frac38;': '\u215c', 'frac45;': '\u2158', @@ -945,11 +945,11 @@ 'gsim;': '\u2273', 'gsime;': '\u2a8e', 'gsiml;': '\u2a90', + 'GT': '>', + 'gt': '>', 'GT;': '>', - 'GT': '>', 'Gt;': '\u226b', 'gt;': '>', - 'gt': '>', 'gtcc;': '\u2aa7', 'gtcir;': '\u2a7a', 'gtdot;': '\u22d7', @@ -1004,29 +1004,29 @@ 'HumpEqual;': '\u224f', 'hybull;': '\u2043', 'hyphen;': '\u2010', + 'Iacute': '\xcd', + 'iacute': '\xed', 'Iacute;': '\xcd', - 'Iacute': '\xcd', 'iacute;': '\xed', - 'iacute': '\xed', 'ic;': '\u2063', + 'Icirc': '\xce', + 'icirc': '\xee', 'Icirc;': '\xce', - 'Icirc': '\xce', 'icirc;': '\xee', - 'icirc': '\xee', 'Icy;': '\u0418', 'icy;': '\u0438', 'Idot;': '\u0130', 'IEcy;': '\u0415', 'iecy;': '\u0435', + 'iexcl': '\xa1', 'iexcl;': '\xa1', - 'iexcl': '\xa1', 'iff;': '\u21d4', 'Ifr;': '\u2111', 'ifr;': '\U0001d526', + 'Igrave': '\xcc', + 'igrave': '\xec', 'Igrave;': '\xcc', - 'Igrave': '\xcc', 'igrave;': '\xec', - 'igrave': '\xec', 'ii;': '\u2148', 'iiiint;': '\u2a0c', 'iiint;': '\u222d', @@ -1070,8 +1070,8 @@ 'Iota;': '\u0399', 'iota;': '\u03b9', 'iprod;': '\u2a3c', + 'iquest': '\xbf', 'iquest;': '\xbf', - 'iquest': '\xbf', 'Iscr;': '\u2110', 'iscr;': '\U0001d4be', 'isin;': '\u2208', @@ -1085,10 +1085,10 @@ 'itilde;': '\u0129', 'Iukcy;': '\u0406', 'iukcy;': '\u0456', + 'Iuml': '\xcf', + 'iuml': '\xef', 'Iuml;': '\xcf', - 'Iuml': '\xcf', 'iuml;': '\xef', - 'iuml': '\xef', 'Jcirc;': '\u0134', 'jcirc;': '\u0135', 'Jcy;': '\u0419', @@ -1135,8 +1135,8 @@ 'langle;': '\u2329', 'lap;': '\u2a85', 'Laplacetrf;': '\u2112', + 'laquo': '\xab', 'laquo;': '\xab', - 'laquo': '\xab', 'Larr;': '\u219e', 'lArr;': '\u21d0', 'larr;': '\u2190', @@ -1316,11 +1316,11 @@ 'lsquor;': '\u201a', 'Lstrok;': '\u0141', 'lstrok;': '\u0142', + 'LT': '<', + 'lt': '<', 'LT;': '<', - 'LT': '<', 'Lt;': '\u226a', 'lt;': '<', - 'lt': '<', 'ltcc;': '\u2aa6', 'ltcir;': '\u2a79', 'ltdot;': '\u22d6', @@ -1336,8 +1336,8 @@ 'luruhar;': '\u2966', 'lvertneqq;': '\u2268\ufe00', 'lvnE;': '\u2268\ufe00', + 'macr': '\xaf', 'macr;': '\xaf', - 'macr': '\xaf', 'male;': '\u2642', 'malt;': '\u2720', 'maltese;': '\u2720', @@ -1359,13 +1359,13 @@ 'Mfr;': '\U0001d510', 'mfr;': '\U0001d52a', 'mho;': '\u2127', + 'micro': '\xb5', 'micro;': '\xb5', - 'micro': '\xb5', 'mid;': '\u2223', 'midast;': '*', 'midcir;': '\u2af0', + 'middot': '\xb7', 'middot;': '\xb7', - 'middot': '\xb7', 'minus;': '\u2212', 'minusb;': '\u229f', 'minusd;': '\u2238', @@ -1397,8 +1397,8 @@ 'natur;': '\u266e', 'natural;': '\u266e', 'naturals;': '\u2115', + 'nbsp': '\xa0', 'nbsp;': '\xa0', - 'nbsp': '\xa0', 'nbump;': '\u224e\u0338', 'nbumpe;': '\u224f\u0338', 'ncap;': '\u2a43', @@ -1479,9 +1479,9 @@ 'NonBreakingSpace;': '\xa0', 'Nopf;': '\u2115', 'nopf;': '\U0001d55f', + 'not': '\xac', 'Not;': '\u2aec', 'not;': '\xac', - 'not': '\xac', 'NotCongruent;': '\u2262', 'NotCupCap;': '\u226d', 'NotDoubleVerticalBar;': '\u2226', @@ -1590,10 +1590,10 @@ 'nsupseteq;': '\u2289', 'nsupseteqq;': '\u2ac6\u0338', 'ntgl;': '\u2279', + 'Ntilde': '\xd1', + 'ntilde': '\xf1', 'Ntilde;': '\xd1', - 'Ntilde': '\xd1', 'ntilde;': '\xf1', - 'ntilde': '\xf1', 'ntlg;': '\u2278', 'ntriangleleft;': '\u22ea', 'ntrianglelefteq;': '\u22ec', @@ -1625,16 +1625,16 @@ 'nwarr;': '\u2196', 'nwarrow;': '\u2196', 'nwnear;': '\u2927', + 'Oacute': '\xd3', + 'oacute': '\xf3', 'Oacute;': '\xd3', - 'Oacute': '\xd3', 'oacute;': '\xf3', - 'oacute': '\xf3', 'oast;': '\u229b', 'ocir;': '\u229a', + 'Ocirc': '\xd4', + 'ocirc': '\xf4', 'Ocirc;': '\xd4', - 'Ocirc': '\xd4', 'ocirc;': '\xf4', - 'ocirc': '\xf4', 'Ocy;': '\u041e', 'ocy;': '\u043e', 'odash;': '\u229d', @@ -1649,10 +1649,10 @@ 'Ofr;': '\U0001d512', 'ofr;': '\U0001d52c', 'ogon;': '\u02db', + 'Ograve': '\xd2', + 'ograve': '\xf2', 'Ograve;': '\xd2', - 'Ograve': '\xd2', 'ograve;': '\xf2', - 'ograve': '\xf2', 'ogt;': '\u29c1', 'ohbar;': '\u29b5', 'ohm;': '\u03a9', @@ -1683,10 +1683,10 @@ 'ord;': '\u2a5d', 'order;': '\u2134', 'orderof;': '\u2134', + 'ordf': '\xaa', 'ordf;': '\xaa', - 'ordf': '\xaa', + 'ordm': '\xba', 'ordm;': '\xba', - 'ordm': '\xba', 'origof;': '\u22b6', 'oror;': '\u2a56', 'orslope;': '\u2a57', @@ -1694,30 +1694,30 @@ 'oS;': '\u24c8', 'Oscr;': '\U0001d4aa', 'oscr;': '\u2134', + 'Oslash': '\xd8', + 'oslash': '\xf8', 'Oslash;': '\xd8', - 'Oslash': '\xd8', 'oslash;': '\xf8', - 'oslash': '\xf8', 'osol;': '\u2298', + 'Otilde': '\xd5', + 'otilde': '\xf5', 'Otilde;': '\xd5', - 'Otilde': '\xd5', 'otilde;': '\xf5', - 'otilde': '\xf5', 'Otimes;': '\u2a37', 'otimes;': '\u2297', 'otimesas;': '\u2a36', + 'Ouml': '\xd6', + 'ouml': '\xf6', 'Ouml;': '\xd6', - 'Ouml': '\xd6', 'ouml;': '\xf6', - 'ouml': '\xf6', 'ovbar;': '\u233d', 'OverBar;': '\u203e', 'OverBrace;': '\u23de', 'OverBracket;': '\u23b4', 'OverParenthesis;': '\u23dc', 'par;': '\u2225', + 'para': '\xb6', 'para;': '\xb6', - 'para': '\xb6', 'parallel;': '\u2225', 'parsim;': '\u2af3', 'parsl;': '\u2afd', @@ -1752,8 +1752,8 @@ 'plusdu;': '\u2a25', 'pluse;': '\u2a72', 'PlusMinus;': '\xb1', + 'plusmn': '\xb1', 'plusmn;': '\xb1', - 'plusmn': '\xb1', 'plussim;': '\u2a26', 'plustwo;': '\u2a27', 'pm;': '\xb1', @@ -1761,8 +1761,8 @@ 'pointint;': '\u2a15', 'Popf;': '\u2119', 'popf;': '\U0001d561', + 'pound': '\xa3', 'pound;': '\xa3', - 'pound': '\xa3', 'Pr;': '\u2abb', 'pr;': '\u227a', 'prap;': '\u2ab7', @@ -1815,10 +1815,10 @@ 'quatint;': '\u2a16', 'quest;': '?', 'questeq;': '\u225f', + 'QUOT': '"', + 'quot': '"', 'QUOT;': '"', - 'QUOT': '"', 'quot;': '"', - 'quot': '"', 'rAarr;': '\u21db', 'race;': '\u223d\u0331', 'Racute;': '\u0154', @@ -1830,8 +1830,8 @@ 'rangd;': '\u2992', 'range;': '\u29a5', 'rangle;': '\u232a', + 'raquo': '\xbb', 'raquo;': '\xbb', - 'raquo': '\xbb', 'Rarr;': '\u21a0', 'rArr;': '\u21d2', 'rarr;': '\u2192', @@ -1879,10 +1879,10 @@ 'realpart;': '\u211c', 'reals;': '\u211d', 'rect;': '\u25ad', + 'REG': '\xae', + 'reg': '\xae', 'REG;': '\xae', - 'REG': '\xae', 'reg;': '\xae', - 'reg': '\xae', 'ReverseElement;': '\u220b', 'ReverseEquilibrium;': '\u21cb', 'ReverseUpEquilibrium;': '\u296f', @@ -1997,8 +1997,8 @@ 'seArr;': '\u21d8', 'searr;': '\u2198', 'searrow;': '\u2198', + 'sect': '\xa7', 'sect;': '\xa7', - 'sect': '\xa7', 'semi;': ';', 'seswar;': '\u2929', 'setminus;': '\u2216', @@ -2018,8 +2018,8 @@ 'shortparallel;': '\u2225', 'ShortRightArrow;': '\u2192', 'ShortUpArrow;': '\u2191', + 'shy': '\xad', 'shy;': '\xad', - 'shy': '\xad', 'Sigma;': '\u03a3', 'sigma;': '\u03c3', 'sigmaf;': '\u03c2', @@ -2128,14 +2128,14 @@ 'Sum;': '\u2211', 'sum;': '\u2211', 'sung;': '\u266a', + 'sup1': '\xb9', + 'sup1;': '\xb9', + 'sup2': '\xb2', + 'sup2;': '\xb2', + 'sup3': '\xb3', + 'sup3;': '\xb3', 'Sup;': '\u22d1', 'sup;': '\u2283', - 'sup1;': '\xb9', - 'sup1': '\xb9', - 'sup2;': '\xb2', - 'sup2': '\xb2', - 'sup3;': '\xb3', - 'sup3': '\xb3', 'supdot;': '\u2abe', 'supdsub;': '\u2ad8', 'supE;': '\u2ac6', @@ -2164,8 +2164,8 @@ 'swarr;': '\u2199', 'swarrow;': '\u2199', 'swnwar;': '\u292a', + 'szlig': '\xdf', 'szlig;': '\xdf', - 'szlig': '\xdf', 'Tab;': '\u2409', 'target;': '\u2316', 'Tau;': '\u03a4', @@ -2195,17 +2195,17 @@ 'ThinSpace;': '\u2009', 'thkap;': '\u2248', 'thksim;': '\u223c', + 'THORN': '\xde', + 'thorn': '\xfe', 'THORN;': '\xde', - 'THORN': '\xde', 'thorn;': '\xfe', - 'thorn': '\xfe', 'Tilde;': '\u223c', 'tilde;': '\u02dc', 'TildeEqual;': '\u2243', 'TildeFullEqual;': '\u2245', 'TildeTilde;': '\u2248', + 'times': '\xd7', 'times;': '\xd7', - 'times': '\xd7', 'timesb;': '\u22a0', 'timesbar;': '\u2a31', 'timesd;': '\u2a30', @@ -2247,10 +2247,10 @@ 'twixt;': '\u226c', 'twoheadleftarrow;': '\u219e', 'twoheadrightarrow;': '\u21a0', + 'Uacute': '\xda', + 'uacute': '\xfa', 'Uacute;': '\xda', - 'Uacute': '\xda', 'uacute;': '\xfa', - 'uacute': '\xfa', 'Uarr;': '\u219f', 'uArr;': '\u21d1', 'uarr;': '\u2191', @@ -2259,10 +2259,10 @@ 'ubrcy;': '\u045e', 'Ubreve;': '\u016c', 'ubreve;': '\u016d', + 'Ucirc': '\xdb', + 'ucirc': '\xfb', 'Ucirc;': '\xdb', - 'Ucirc': '\xdb', 'ucirc;': '\xfb', - 'ucirc': '\xfb', 'Ucy;': '\u0423', 'ucy;': '\u0443', 'udarr;': '\u21c5', @@ -2272,10 +2272,10 @@ 'ufisht;': '\u297e', 'Ufr;': '\U0001d518', 'ufr;': '\U0001d532', + 'Ugrave': '\xd9', + 'ugrave': '\xf9', 'Ugrave;': '\xd9', - 'Ugrave': '\xd9', 'ugrave;': '\xf9', - 'ugrave': '\xf9', 'uHar;': '\u2963', 'uharl;': '\u21bf', 'uharr;': '\u21be', @@ -2286,8 +2286,8 @@ 'ultri;': '\u25f8', 'Umacr;': '\u016a', 'umacr;': '\u016b', + 'uml': '\xa8', 'uml;': '\xa8', - 'uml': '\xa8', 'UnderBar;': '_', 'UnderBrace;': '\u23df', 'UnderBracket;': '\u23b5', @@ -2334,10 +2334,10 @@ 'utri;': '\u25b5', 'utrif;': '\u25b4', 'uuarr;': '\u21c8', + 'Uuml': '\xdc', + 'uuml': '\xfc', 'Uuml;': '\xdc', - 'Uuml': '\xdc', 'uuml;': '\xfc', - 'uuml': '\xfc', 'uwangle;': '\u29a7', 'vangrt;': '\u299c', 'varepsilon;': '\u03f5', @@ -2442,18 +2442,18 @@ 'xutri;': '\u25b3', 'xvee;': '\u22c1', 'xwedge;': '\u22c0', + 'Yacute': '\xdd', + 'yacute': '\xfd', 'Yacute;': '\xdd', - 'Yacute': '\xdd', 'yacute;': '\xfd', - 'yacute': '\xfd', 'YAcy;': '\u042f', 'yacy;': '\u044f', 'Ycirc;': '\u0176', 'ycirc;': '\u0177', 'Ycy;': '\u042b', 'ycy;': '\u044b', + 'yen': '\xa5', 'yen;': '\xa5', - 'yen': '\xa5', 'Yfr;': '\U0001d51c', 'yfr;': '\U0001d536', 'YIcy;': '\u0407', @@ -2464,9 +2464,9 @@ 'yscr;': '\U0001d4ce', 'YUcy;': '\u042e', 'yucy;': '\u044e', + 'yuml': '\xff', 'Yuml;': '\u0178', 'yuml;': '\xff', - 'yuml': '\xff', 'Zacute;': '\u0179', 'zacute;': '\u017a', 'Zcaron;': '\u017d', -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:20:23 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 23 Oct 2012 15:20:23 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MjQx?= =?utf-8?q?=3A_document_-X_faulthandler_command_line_option=2E?= Message-ID: <3XmFZv0dxkzR3w@mail.python.org> http://hg.python.org/cpython/rev/957a6c00d3af changeset: 79911:957a6c00d3af branch: 3.3 parent: 79909:02e5f7d1ab29 user: Andrew Svetlov date: Tue Oct 23 16:19:26 2012 +0300 summary: Issue #16241: document -X faulthandler command line option. Patch by Marek ?uppa. files: Doc/using/cmdline.rst | 3 ++- Misc/ACKS | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -358,7 +358,8 @@ .. cmdoption:: -X Reserved for various implementation-specific options. CPython currently - defines none of them, but allows to pass arbitrary values and retrieve + defines just one, you can use ``-X faulthander`` to enable + :data:`faulthandler`. It also allows to pass arbitrary values and retrieve them through the :data:`sys._xoptions` dictionary. .. versionchanged:: 3.2 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1133,6 +1133,7 @@ Nathan Sullivan Mark Summerfield Reuben Sumner +Marek ?uppa Hisao Suzuki Kalle Svensson Andrew Svetlov -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:20:24 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 23 Oct 2012 15:20:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316241=3A_document_-X_faulthandler_command_line_?= =?utf-8?q?option=2E?= Message-ID: <3XmFZw398vzRBf@mail.python.org> http://hg.python.org/cpython/rev/665e3be40ad1 changeset: 79912:665e3be40ad1 parent: 79910:82af3dd0cb10 parent: 79911:957a6c00d3af user: Andrew Svetlov date: Tue Oct 23 16:20:11 2012 +0300 summary: Issue #16241: document -X faulthandler command line option. Patch by Marek ?uppa. files: Doc/using/cmdline.rst | 3 ++- Misc/ACKS | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -358,7 +358,8 @@ .. cmdoption:: -X Reserved for various implementation-specific options. CPython currently - defines none of them, but allows to pass arbitrary values and retrieve + defines just one, you can use ``-X faulthander`` to enable + :data:`faulthandler`. It also allows to pass arbitrary values and retrieve them through the :data:`sys._xoptions` dictionary. .. versionchanged:: 3.2 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1133,6 +1133,7 @@ Nathan Sullivan Mark Summerfield Reuben Sumner +Marek ?uppa Hisao Suzuki Kalle Svensson Andrew Svetlov -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:34:02 2012 From: python-checkins at python.org (petri.lehtinen) Date: Tue, 23 Oct 2012 15:34:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Replace_tabs_w?= =?utf-8?q?ith_spaces_in_posixmodule=2Ec?= Message-ID: <3XmFtf6wh6zR7F@mail.python.org> http://hg.python.org/cpython/rev/8647b9c703d4 changeset: 79913:8647b9c703d4 branch: 3.3 parent: 79911:957a6c00d3af user: Petri Lehtinen date: Tue Oct 23 16:12:14 2012 +0300 summary: Replace tabs with spaces in posixmodule.c files: Modules/posixmodule.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2568,7 +2568,7 @@ result = win32_wchdir(path.wide); else result = win32_chdir(path.narrow); - result = !result; /* on unix, success = 0, on windows, success = !0 */ + result = !result; /* on unix, success = 0, on windows, success = !0 */ #elif defined(PYOS_OS2) && defined(PYCC_GCC) result = _chdir2(path.narrow); #else @@ -7116,12 +7116,12 @@ if (!check_CreateSymbolicLink()) { PyErr_SetString(PyExc_NotImplementedError, "CreateSymbolicLink functions not found"); - return NULL; - } + return NULL; + } if (!win32_can_symlink) { PyErr_SetString(PyExc_OSError, "symbolic link privilege not held"); - return NULL; - } + return NULL; + } #endif if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|i$O&:symlink", @@ -7197,7 +7197,7 @@ DWORD n_bytes_returned; DWORD io_result; PyObject *po, *result; - int dir_fd; + int dir_fd; HANDLE reparse_point_handle; char target_buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:34:04 2012 From: python-checkins at python.org (petri.lehtinen) Date: Tue, 23 Oct 2012 15:34:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Replace_tabs_with_spaces_in_posixmodule=2Ec?= Message-ID: <3XmFth2JHbzRBf@mail.python.org> http://hg.python.org/cpython/rev/23ddb98aae9f changeset: 79914:23ddb98aae9f parent: 79912:665e3be40ad1 parent: 79913:8647b9c703d4 user: Petri Lehtinen date: Tue Oct 23 16:31:06 2012 +0300 summary: Replace tabs with spaces in posixmodule.c files: Modules/posixmodule.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2442,7 +2442,7 @@ result = win32_wchdir(path.wide); else result = win32_chdir(path.narrow); - result = !result; /* on unix, success = 0, on windows, success = !0 */ + result = !result; /* on unix, success = 0, on windows, success = !0 */ #else #ifdef HAVE_FCHDIR if (path.fd != -1) @@ -6700,12 +6700,12 @@ if (!check_CreateSymbolicLink()) { PyErr_SetString(PyExc_NotImplementedError, "CreateSymbolicLink functions not found"); - return NULL; - } + return NULL; + } if (!win32_can_symlink) { PyErr_SetString(PyExc_OSError, "symbolic link privilege not held"); - return NULL; - } + return NULL; + } #endif if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|i$O&:symlink", @@ -6781,7 +6781,7 @@ DWORD n_bytes_returned; DWORD io_result; PyObject *po, *result; - int dir_fd; + int dir_fd; HANDLE reparse_point_handle; char target_buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:46:43 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 15:46:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316245=3A_add_a_script_t?= =?utf-8?q?o_generate_the_html=2Eentities=2Ehtml5_dict=2E?= Message-ID: <3XmG9H3nmKzRBw@mail.python.org> http://hg.python.org/cpython/rev/dd8b969d7459 changeset: 79915:dd8b969d7459 user: Ezio Melotti date: Tue Oct 23 15:46:33 2012 +0200 summary: #16245: add a script to generate the html.entities.html5 dict. files: Misc/ACKS | 1 + Tools/scripts/parse_html5_entities.py | 105 ++++++++++++++ 2 files changed, 106 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -929,6 +929,7 @@ Paul Prescod Donovan Preston Paul Price +Iuliia Proskurnia Jyrki Pulliainen Steve Purcell Eduardo P?rez diff --git a/Tools/scripts/parse_html5_entities.py b/Tools/scripts/parse_html5_entities.py new file mode 100644 --- /dev/null +++ b/Tools/scripts/parse_html5_entities.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python3 +""" +Utility for parsing HTML5 entity definitions available from: + + http://dev.w3.org/html5/spec/entities.json + +Written by Ezio Melotti and Iuliia Proskurnia. + +""" + +import os +import sys +import json +from urllib.request import urlopen +from html.entities import html5 + +entities_url = 'http://dev.w3.org/html5/spec/entities.json' + +def get_json(url): + """Download the json file from the url and returns a decoded object.""" + with urlopen(url) as f: + data = f.read().decode('utf-8') + return json.loads(data) + +def create_dict(entities): + """Create the html5 dict from the decoded json object.""" + new_html5 = {} + for name, value in entities.items(): + new_html5[name.lstrip('&')] = value['characters'] + return new_html5 + +def compare_dicts(old, new): + """Compare the old and new dicts and print the differences.""" + added = new.keys() - old.keys() + if added: + print('{} entitie(s) have been added:'.format(len(added))) + for name in sorted(added): + print(' {!r}: {!r}'.format(name, new[name])) + removed = old.keys() - new.keys() + if removed: + print('{} entitie(s) have been removed:'.format(len(removed))) + for name in sorted(removed): + print(' {!r}: {!r}'.format(name, old[name])) + changed = set() + for name in (old.keys() & new.keys()): + if old[name] != new[name]: + changed.add((name, old[name], new[name])) + if changed: + print('{} entitie(s) have been modified:'.format(len(changed))) + for item in sorted(changed): + print(' {!r}: {!r} -> {!r}'.format(*item)) + +def write_items(entities, file=sys.stdout): + """Write the items of the dictionary in the specified file.""" + # The keys in the generated dictionary should be sorted + # in a case-insensitive way, however, when two keys are equal, + # the uppercase version should come first so that the result + # looks like: ['Aacute', 'aacute', 'Aacute;', 'aacute;', ...] + # To do this we first sort in a case-sensitive way (so all the + # uppercase chars come first) and then sort with key=str.lower. + # Since the sorting is stable the uppercase keys will eventually + # be before their equivalent lowercase version. + keys = sorted(entities.keys()) + keys = sorted(keys, key=str.lower) + print('html5 = {', file=file) + for name in keys: + print(' {!r}: {!a},'.format(name, entities[name]), file=file) + print('}', file=file) + + +if __name__ == '__main__': + # without args print a diff between html.entities.html5 and new_html5 + # with --create print the new html5 dict + # with --patch patch the Lib/html/entities.py file + new_html5 = create_dict(get_json(entities_url)) + if '--create' in sys.argv: + print('# map the HTML5 named character references to the ' + 'equivalent Unicode character(s)') + print('# Generated by {}. Do not edit manually.'.format(__file__)) + write_items(new_html5) + elif '--patch' in sys.argv: + fname = 'Lib/html/entities.py' + temp_fname = fname + '.temp' + with open(fname) as f1, open(temp_fname, 'w') as f2: + skip = False + for line in f1: + if line.startswith('html5 = {'): + write_items(new_html5, file=f2) + skip = True + continue + if skip: + # skip the old items until the } + if line.startswith('}'): + skip = False + continue + f2.write(line) + os.remove(fname) + os.rename(temp_fname, fname) + else: + if html5 == new_html5: + print('The current dictionary is updated.') + else: + compare_dicts(html5, new_html5) + print('Run "./python {0} --patch" to update Lib/html/entities.html ' + 'or "./python {0} --create" to see the generated ' 'dictionary.'.format(__file__)) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:54:37 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 15:54:37 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzE2MjQ1OiBGaXgg?= =?utf-8?q?the_value_of_a_few_entities_in_html=2Eentities=2Ehtml5=2E?= Message-ID: <3XmGLP0qMQzRCT@mail.python.org> http://hg.python.org/cpython/rev/1eb1c6942ac8 changeset: 79916:1eb1c6942ac8 branch: 3.3 parent: 79913:8647b9c703d4 user: Ezio Melotti date: Tue Oct 23 15:51:27 2012 +0200 summary: #16245: Fix the value of a few entities in html.entities.html5. files: Lib/html/entities.py | 24 ++++++++++++------------ Misc/NEWS | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Lib/html/entities.py b/Lib/html/entities.py --- a/Lib/html/entities.py +++ b/Lib/html/entities.py @@ -679,7 +679,7 @@ 'dopf;': '\U0001d555', 'Dot;': '\xa8', 'dot;': '\u02d9', - 'DotDot;': '\u25cc\u20dc', + 'DotDot;': '\u20dc', 'doteq;': '\u2250', 'doteqdot;': '\u2251', 'DotEqual;': '\u2250', @@ -706,7 +706,7 @@ 'downarrow;': '\u2193', 'DownArrowBar;': '\u2913', 'DownArrowUpArrow;': '\u21f5', - 'DownBreve;': '\u25cc\u0311', + 'DownBreve;': '\u0311', 'downdownarrows;': '\u21ca', 'downharpoonleft;': '\u21c3', 'downharpoonright;': '\u21c2', @@ -1130,9 +1130,9 @@ 'Lambda;': '\u039b', 'lambda;': '\u03bb', 'Lang;': '\u27ea', - 'lang;': '\u2329', + 'lang;': '\u27e8', 'langd;': '\u2991', - 'langle;': '\u2329', + 'langle;': '\u27e8', 'lap;': '\u2a85', 'Laplacetrf;': '\u2112', 'laquo': '\xab', @@ -1177,7 +1177,7 @@ 'ldsh;': '\u21b2', 'lE;': '\u2266', 'le;': '\u2264', - 'LeftAngleBracket;': '\u2329', + 'LeftAngleBracket;': '\u27e8', 'LeftArrow;': '\u2190', 'Leftarrow;': '\u21d0', 'leftarrow;': '\u2190', @@ -1427,7 +1427,7 @@ 'nesim;': '\u2242\u0338', 'NestedGreaterGreater;': '\u226b', 'NestedLessLess;': '\u226a', - 'NewLine;': '\u240a', + 'NewLine;': '\n', 'nexist;': '\u2204', 'nexists;': '\u2204', 'Nfr;': '\U0001d511', @@ -1826,10 +1826,10 @@ 'radic;': '\u221a', 'raemptyv;': '\u29b3', 'Rang;': '\u27eb', - 'rang;': '\u232a', + 'rang;': '\u27e9', 'rangd;': '\u2992', 'range;': '\u29a5', - 'rangle;': '\u232a', + 'rangle;': '\u27e9', 'raquo': '\xbb', 'raquo;': '\xbb', 'Rarr;': '\u21a0', @@ -1897,7 +1897,7 @@ 'Rho;': '\u03a1', 'rho;': '\u03c1', 'rhov;': '\u03f1', - 'RightAngleBracket;': '\u232a', + 'RightAngleBracket;': '\u27e9', 'RightArrow;': '\u2192', 'Rightarrow;': '\u21d2', 'rightarrow;': '\u2192', @@ -2166,7 +2166,7 @@ 'swnwar;': '\u292a', 'szlig': '\xdf', 'szlig;': '\xdf', - 'Tab;': '\u2409', + 'Tab;': '\t', 'target;': '\u2316', 'Tau;': '\u03a4', 'tau;': '\u03c4', @@ -2177,7 +2177,7 @@ 'tcedil;': '\u0163', 'Tcy;': '\u0422', 'tcy;': '\u0442', - 'tdot;': '\u25cc\u20db', + 'tdot;': '\u20db', 'telrec;': '\u2315', 'Tfr;': '\U0001d517', 'tfr;': '\U0001d531', @@ -2231,7 +2231,7 @@ 'tridot;': '\u25ec', 'trie;': '\u225c', 'triminus;': '\u2a3a', - 'TripleDot;': '\u25cc\u20db', + 'TripleDot;': '\u20db', 'triplus;': '\u2a39', 'trisb;': '\u29cd', 'tritime;': '\u2a3b', diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,8 @@ Library ------- +- Issue #16245: Fix the value of a few entities in html.entities.html5. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #16220: wsgiref now always calls close() on an iterable response. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 15:54:38 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 15:54:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogIzE2MjQ1OiBtZXJnZSB3aXRoIDMuMy4=?= Message-ID: <3XmGLQ2wY0zRCX@mail.python.org> http://hg.python.org/cpython/rev/70fab10cd542 changeset: 79917:70fab10cd542 parent: 79915:dd8b969d7459 parent: 79916:1eb1c6942ac8 user: Ezio Melotti date: Tue Oct 23 15:54:24 2012 +0200 summary: #16245: merge with 3.3. files: Lib/html/entities.py | 24 ++++++++++++------------ Misc/NEWS | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Lib/html/entities.py b/Lib/html/entities.py --- a/Lib/html/entities.py +++ b/Lib/html/entities.py @@ -679,7 +679,7 @@ 'dopf;': '\U0001d555', 'Dot;': '\xa8', 'dot;': '\u02d9', - 'DotDot;': '\u25cc\u20dc', + 'DotDot;': '\u20dc', 'doteq;': '\u2250', 'doteqdot;': '\u2251', 'DotEqual;': '\u2250', @@ -706,7 +706,7 @@ 'downarrow;': '\u2193', 'DownArrowBar;': '\u2913', 'DownArrowUpArrow;': '\u21f5', - 'DownBreve;': '\u25cc\u0311', + 'DownBreve;': '\u0311', 'downdownarrows;': '\u21ca', 'downharpoonleft;': '\u21c3', 'downharpoonright;': '\u21c2', @@ -1130,9 +1130,9 @@ 'Lambda;': '\u039b', 'lambda;': '\u03bb', 'Lang;': '\u27ea', - 'lang;': '\u2329', + 'lang;': '\u27e8', 'langd;': '\u2991', - 'langle;': '\u2329', + 'langle;': '\u27e8', 'lap;': '\u2a85', 'Laplacetrf;': '\u2112', 'laquo': '\xab', @@ -1177,7 +1177,7 @@ 'ldsh;': '\u21b2', 'lE;': '\u2266', 'le;': '\u2264', - 'LeftAngleBracket;': '\u2329', + 'LeftAngleBracket;': '\u27e8', 'LeftArrow;': '\u2190', 'Leftarrow;': '\u21d0', 'leftarrow;': '\u2190', @@ -1427,7 +1427,7 @@ 'nesim;': '\u2242\u0338', 'NestedGreaterGreater;': '\u226b', 'NestedLessLess;': '\u226a', - 'NewLine;': '\u240a', + 'NewLine;': '\n', 'nexist;': '\u2204', 'nexists;': '\u2204', 'Nfr;': '\U0001d511', @@ -1826,10 +1826,10 @@ 'radic;': '\u221a', 'raemptyv;': '\u29b3', 'Rang;': '\u27eb', - 'rang;': '\u232a', + 'rang;': '\u27e9', 'rangd;': '\u2992', 'range;': '\u29a5', - 'rangle;': '\u232a', + 'rangle;': '\u27e9', 'raquo': '\xbb', 'raquo;': '\xbb', 'Rarr;': '\u21a0', @@ -1897,7 +1897,7 @@ 'Rho;': '\u03a1', 'rho;': '\u03c1', 'rhov;': '\u03f1', - 'RightAngleBracket;': '\u232a', + 'RightAngleBracket;': '\u27e9', 'RightArrow;': '\u2192', 'Rightarrow;': '\u21d2', 'rightarrow;': '\u2192', @@ -2166,7 +2166,7 @@ 'swnwar;': '\u292a', 'szlig': '\xdf', 'szlig;': '\xdf', - 'Tab;': '\u2409', + 'Tab;': '\t', 'target;': '\u2316', 'Tau;': '\u03a4', 'tau;': '\u03c4', @@ -2177,7 +2177,7 @@ 'tcedil;': '\u0163', 'Tcy;': '\u0422', 'tcy;': '\u0442', - 'tdot;': '\u25cc\u20db', + 'tdot;': '\u20db', 'telrec;': '\u2315', 'Tfr;': '\U0001d517', 'tfr;': '\U0001d531', @@ -2231,7 +2231,7 @@ 'tridot;': '\u25ec', 'trie;': '\u225c', 'triminus;': '\u2a3a', - 'TripleDot;': '\u25cc\u20db', + 'TripleDot;': '\u20db', 'triplus;': '\u2a39', 'trisb;': '\u29cd', 'tritime;': '\u2a3b', diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,8 @@ Library ------- +- Issue #16245: Fix the value of a few entities in html.entities.html5. + - Issue #16301: Fix the localhost verification in urllib/request.py for file:// urls. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 18:41:01 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 23 Oct 2012 18:41:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_issue16300=3A_addressi?= =?utf-8?q?ng_the_buildbot_failures_on_windows?= Message-ID: <3XmL2P2zj4zRBb@mail.python.org> http://hg.python.org/cpython/rev/00e5e963b7d8 changeset: 79918:00e5e963b7d8 user: Senthil Kumaran date: Tue Oct 23 09:40:53 2012 -0700 summary: Fix issue16300: addressing the buildbot failures on windows files: Lib/test/test_urllib.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -275,10 +275,9 @@ self.assertTrue(e.exception.filename) self.assertTrue(e.exception.reason) - @unittest.skipIf(sys.platform == "win32", "Skip on Windows: issue16300") def test_file_notexists(self): fd, tmp_file = tempfile.mkstemp() - tmp_fileurl = 'file://localhost' + tmp_file + tmp_fileurl = 'file://localhost/' + tmp_file.replace(os.path.sep, '/') self.assertTrue(os.path.exists(tmp_file)) with urlopen(tmp_fileurl) as fobj: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 20:07:13 2012 From: python-checkins at python.org (senthil.kumaran) Date: Tue, 23 Oct 2012 20:07:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_the_windows_buildbot_p?= =?utf-8?q?ermission_error_-_close_the_fd_of_tempfile_beffore?= Message-ID: <3XmMxs5WPMzRDj@mail.python.org> http://hg.python.org/cpython/rev/8576bf1c0302 changeset: 79919:8576bf1c0302 user: Senthil Kumaran date: Tue Oct 23 11:07:02 2012 -0700 summary: Fix the windows buildbot permission error - close the fd of tempfile beffore unlinking files: Lib/test/test_urllib.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -278,12 +278,13 @@ def test_file_notexists(self): fd, tmp_file = tempfile.mkstemp() tmp_fileurl = 'file://localhost/' + tmp_file.replace(os.path.sep, '/') - - self.assertTrue(os.path.exists(tmp_file)) - with urlopen(tmp_fileurl) as fobj: - self.assertTrue(fobj) - - os.unlink(tmp_file) + try: + self.assertTrue(os.path.exists(tmp_file)) + with urlopen(tmp_fileurl) as fobj: + self.assertTrue(fobj) + finally: + os.close(fd) + os.unlink(tmp_file) self.assertFalse(os.path.exists(tmp_file)) with self.assertRaises(urllib.error.URLError): urlopen(tmp_fileurl) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 20:14:55 2012 From: python-checkins at python.org (ezio.melotti) Date: Tue, 23 Oct 2012 20:14:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_Misc/NEWS_entry_for_dd?= =?utf-8?q?8b969d7459/=2316245=2E?= Message-ID: <3XmN6l1njTzRD3@mail.python.org> http://hg.python.org/cpython/rev/fb80df16c4ff changeset: 79920:fb80df16c4ff user: Ezio Melotti date: Tue Oct 23 21:14:34 2012 +0300 summary: Add Misc/NEWS entry for dd8b969d7459/#16245. files: Misc/NEWS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -245,6 +245,9 @@ Tools/Demos ----------- +- Issue #16245: Add the Tools/scripts/parse_html5_entities.py script to parse + the list of HTML5 entities and update the html.entities.html5 dictionary. + - Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 21:27:56 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 23 Oct 2012 21:27:56 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTE2?= =?utf-8?q?=3A_Now_uses_corrected_include_and_library_paths_when_building_?= =?utf-8?q?C?= Message-ID: <3XmPl00Vg1zR96@mail.python.org> http://hg.python.org/cpython/rev/43f537339107 changeset: 79921:43f537339107 branch: 3.3 parent: 79916:1eb1c6942ac8 user: Vinay Sajip date: Tue Oct 23 20:26:14 2012 +0100 summary: Issue #16116: Now uses corrected include and library paths when building C extensions in a venv. files: Lib/distutils/command/build_ext.py | 7 +++++++ Misc/NEWS | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -160,6 +160,11 @@ if isinstance(self.include_dirs, str): self.include_dirs = self.include_dirs.split(os.pathsep) + # If in a virtualenv, add its include directory + # Issue 16116 + if sys.exec_prefix != sys.base_exec_prefix: + self.include_dirs.append(os.path.join(sys.exec_prefix, 'include')) + # Put the Python "system" include dir at the end, so that # any local include dirs take precedence. self.include_dirs.append(py_include) @@ -190,6 +195,8 @@ # must be the *native* platform. But we don't really support # cross-compiling via a binary install anyway, so we let it go. self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs')) + if sys.base_exec_prefix != sys.prefix: # Issue 16116 + self.library_dirs.append(os.path.join(sys.base_exec_prefix, 'libs')) if self.debug: self.build_temp = os.path.join(self.build_temp, "Debug") else: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,9 @@ Library ------- +- Issue #16116: Fix include and library paths to be correctwhen building C + extensions in venvs. + - Issue #16245: Fix the value of a few entities in html.entities.html5. - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 21:27:57 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 23 Oct 2012 21:27:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Closes_=2316116=3A_Merged_fix_from_3=2E3=2E?= Message-ID: <3XmPl133lSzRCf@mail.python.org> http://hg.python.org/cpython/rev/5e9f656c3d67 changeset: 79922:5e9f656c3d67 parent: 79920:fb80df16c4ff parent: 79921:43f537339107 user: Vinay Sajip date: Tue Oct 23 20:27:43 2012 +0100 summary: Closes #16116: Merged fix from 3.3. files: Lib/distutils/command/build_ext.py | 7 +++++++ Misc/NEWS | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -160,6 +160,11 @@ if isinstance(self.include_dirs, str): self.include_dirs = self.include_dirs.split(os.pathsep) + # If in a virtualenv, add its include directory + # Issue 16116 + if sys.exec_prefix != sys.base_exec_prefix: + self.include_dirs.append(os.path.join(sys.exec_prefix, 'include')) + # Put the Python "system" include dir at the end, so that # any local include dirs take precedence. self.include_dirs.append(py_include) @@ -190,6 +195,8 @@ # must be the *native* platform. But we don't really support # cross-compiling via a binary install anyway, so we let it go. self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs')) + if sys.base_exec_prefix != sys.prefix: # Issue 16116 + self.library_dirs.append(os.path.join(sys.base_exec_prefix, 'libs')) if self.debug: self.build_temp = os.path.join(self.build_temp, "Debug") else: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #16116: Fix include and library paths to be correctwhen building C + extensions in venvs. + - Issue #16245: Fix the value of a few entities in html.entities.html5. - Issue #16301: Fix the localhost verification in urllib/request.py for file:// -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 23:50:25 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 23 Oct 2012 23:50:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fixed_whitespa?= =?utf-8?q?ce_typo_in_Misc/NEWS=2E?= Message-ID: <3XmSvP1PM5zR85@mail.python.org> http://hg.python.org/cpython/rev/4d99052f3d4c changeset: 79923:4d99052f3d4c branch: 3.3 parent: 79921:43f537339107 user: Vinay Sajip date: Tue Oct 23 22:49:14 2012 +0100 summary: Fixed whitespace typo in Misc/NEWS. files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,7 +46,7 @@ Library ------- -- Issue #16116: Fix include and library paths to be correctwhen building C +- Issue #16116: Fix include and library paths to be correct when building C extensions in venvs. - Issue #16245: Fix the value of a few entities in html.entities.html5. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 23 23:50:26 2012 From: python-checkins at python.org (vinay.sajip) Date: Tue, 23 Oct 2012 23:50:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merged_fix_of__whitespace_typo_in_Misc/NEWS_from_3=2E3?= =?utf-8?q?=2E?= Message-ID: <3XmSvQ3fRkzRDv@mail.python.org> http://hg.python.org/cpython/rev/0acc5626a578 changeset: 79924:0acc5626a578 parent: 79922:5e9f656c3d67 parent: 79923:4d99052f3d4c user: Vinay Sajip date: Tue Oct 23 22:50:11 2012 +0100 summary: Merged fix of whitespace typo in Misc/NEWS from 3.3. files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,7 +59,7 @@ Library ------- -- Issue #16116: Fix include and library paths to be correctwhen building C +- Issue #16116: Fix include and library paths to be correct when building C extensions in venvs. - Issue #16245: Fix the value of a few entities in html.entities.html5. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Wed Oct 24 05:56:21 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Wed, 24 Oct 2012 05:56:21 +0200 Subject: [Python-checkins] Daily reference leaks (0acc5626a578): sum=0 Message-ID: results for 0acc5626a578 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogHy2gO7', '-x'] From python-checkins at python.org Wed Oct 24 17:22:02 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 24 Oct 2012 17:22:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_make_=5FPyParser=5FTokenNa?= =?utf-8?q?mes_const?= Message-ID: <3XmwDp5Lk2zRK2@mail.python.org> http://hg.python.org/cpython/rev/7e0e15d9957f changeset: 79925:7e0e15d9957f user: Benjamin Peterson date: Wed Oct 24 08:21:52 2012 -0700 summary: make _PyParser_TokenNames const files: Include/token.h | 2 +- Parser/tokenizer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/token.h b/Include/token.h --- a/Include/token.h +++ b/Include/token.h @@ -75,7 +75,7 @@ #define ISEOF(x) ((x) == ENDMARKER) -PyAPI_DATA(char *) _PyParser_TokenNames[]; /* Token names */ +PyAPI_DATA(const char *) _PyParser_TokenNames[]; /* Token names */ PyAPI_FUNC(int) PyToken_OneChar(int); PyAPI_FUNC(int) PyToken_TwoChars(int, int); PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int); diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -47,7 +47,7 @@ /* Token names */ -char *_PyParser_TokenNames[] = { +const char *_PyParser_TokenNames[] = { "ENDMARKER", "NAME", "NUMBER", -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 24 22:07:55 2012 From: python-checkins at python.org (ezio.melotti) Date: Wed, 24 Oct 2012 22:07:55 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MjEwOiBjb21i?= =?utf-8?q?ine_the_two_type=28=29_docs=2E__Patch_by_Pete_Sevander=2E?= Message-ID: <3Xn2Zg1qSxzMsd@mail.python.org> http://hg.python.org/cpython/rev/6dde85f2e4af changeset: 79926:6dde85f2e4af branch: 2.7 parent: 79908:84cd07899baf user: Ezio Melotti date: Wed Oct 24 23:01:30 2012 +0300 summary: #16210: combine the two type() docs. Patch by Pete Sevander. files: Doc/library/functions.rst | 27 +++++++++++---------------- Misc/ACKS | 1 + 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1426,26 +1426,21 @@ .. function:: type(object) + type(name, bases, dict) .. index:: object: type - Return the type of an *object*. The return value is a type object. The - :func:`isinstance` built-in function is recommended for testing the type of an - object. + With one argument, return the type of an *object*. The return value is a + type object. The :func:`isinstance` built-in function is recommended for + testing the type of an object. - With three arguments, :func:`type` functions as a constructor as detailed below. - - -.. function:: type(name, bases, dict) - :noindex: - - Return a new type object. This is essentially a dynamic form of the - :keyword:`class` statement. The *name* string is the class name and becomes the - :attr:`__name__` attribute; the *bases* tuple itemizes the base classes and - becomes the :attr:`__bases__` attribute; and the *dict* dictionary is the - namespace containing definitions for class body and becomes the :attr:`__dict__` - attribute. For example, the following two statements create identical - :class:`type` objects: + With three arguments, return a new type object. This is essentially a + dynamic form of the :keyword:`class` statement. The *name* string is the + class name and becomes the :attr:`__name__` attribute; the *bases* tuple + itemizes the base classes and becomes the :attr:`__bases__` attribute; + and the *dict* dictionary is the namespace containing definitions for class + body and becomes the :attr:`__dict__` attribute. For example, the + following two statements create identical :class:`type` objects: >>> class X(object): ... a = 1 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -884,6 +884,7 @@ Joakim Sernbrant Roger Serwy Jerry Seutter +Pete Sevander Denis Severson Ian Seyer Ha Shao -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 24 22:07:56 2012 From: python-checkins at python.org (ezio.melotti) Date: Wed, 24 Oct 2012 22:07:56 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MjEwOiBjb21i?= =?utf-8?q?ine_the_two_type=28=29_docs=2E__Patch_by_Pete_Sevander=2E?= Message-ID: <3Xn2Zh41FQzNJx@mail.python.org> http://hg.python.org/cpython/rev/997ab4f1530f changeset: 79927:997ab4f1530f branch: 3.2 parent: 79898:a3d755eaf5fa user: Ezio Melotti date: Wed Oct 24 23:06:25 2012 +0300 summary: #16210: combine the two type() docs. Patch by Pete Sevander. files: Doc/library/functions.rst | 26 +++++++++++--------------- Misc/ACKS | 1 + 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1353,29 +1353,25 @@ .. function:: type(object) + type(name, bases, dict) .. index:: object: type - Return the type of an *object*. The return value is a type object and - generally the same object as returned by ``object.__class__``. + + With one argument, return the type of an *object*. The return value is a + type object and generally the same object as returned by ``object.__class__``. The :func:`isinstance` built-in function is recommended for testing the type of an object, because it takes subclasses into account. - With three arguments, :func:`type` functions as a constructor as detailed - below. - -.. function:: type(name, bases, dict) - :noindex: - - Return a new type object. This is essentially a dynamic form of the - :keyword:`class` statement. The *name* string is the class name and becomes the - :attr:`__name__` attribute; the *bases* tuple itemizes the base classes and - becomes the :attr:`__bases__` attribute; and the *dict* dictionary is the - namespace containing definitions for class body and becomes the :attr:`__dict__` - attribute. For example, the following two statements create identical - :class:`type` objects: + With three arguments, return a new type object. This is essentially a + dynamic form of the :keyword:`class` statement. The *name* string is the + class name and becomes the :attr:`__name__` attribute; the *bases* tuple + itemizes the base classes and becomes the :attr:`__bases__` attribute; + and the *dict* dictionary is the namespace containing definitions for class + body and becomes the :attr:`__dict__` attribute. For example, the + following two statements create identical :class:`type` objects: >>> class X: ... a = 1 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -959,6 +959,7 @@ Joakim Sernbrant Roger Serwy Jerry Seutter +Pete Sevander Denis Severson Ian Seyer Ha Shao -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 24 22:07:57 2012 From: python-checkins at python.org (ezio.melotti) Date: Wed, 24 Oct 2012 22:07:57 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_=2316210=3A_merge_with_3=2E2=2E?= Message-ID: <3Xn2Zj69mwzPDT@mail.python.org> http://hg.python.org/cpython/rev/8f1d72106073 changeset: 79928:8f1d72106073 branch: 3.3 parent: 79923:4d99052f3d4c parent: 79927:997ab4f1530f user: Ezio Melotti date: Wed Oct 24 23:06:56 2012 +0300 summary: #16210: merge with 3.2. files: Doc/library/functions.rst | 26 +++++++++++--------------- Misc/ACKS | 1 + 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1323,29 +1323,25 @@ .. function:: type(object) + type(name, bases, dict) .. index:: object: type - Return the type of an *object*. The return value is a type object and - generally the same object as returned by ``object.__class__``. + + With one argument, return the type of an *object*. The return value is a + type object and generally the same object as returned by ``object.__class__``. The :func:`isinstance` built-in function is recommended for testing the type of an object, because it takes subclasses into account. - With three arguments, :func:`type` functions as a constructor as detailed - below. - -.. function:: type(name, bases, dict) - :noindex: - - Return a new type object. This is essentially a dynamic form of the - :keyword:`class` statement. The *name* string is the class name and becomes the - :attr:`__name__` attribute; the *bases* tuple itemizes the base classes and - becomes the :attr:`__bases__` attribute; and the *dict* dictionary is the - namespace containing definitions for class body and becomes the :attr:`__dict__` - attribute. For example, the following two statements create identical - :class:`type` objects: + With three arguments, return a new type object. This is essentially a + dynamic form of the :keyword:`class` statement. The *name* string is the + class name and becomes the :attr:`__name__` attribute; the *bases* tuple + itemizes the base classes and becomes the :attr:`__bases__` attribute; + and the *dict* dictionary is the namespace containing definitions for class + body and becomes the :attr:`__dict__` attribute. For example, the + following two statements create identical :class:`type` objects: >>> class X: ... a = 1 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1059,6 +1059,7 @@ Joakim Sernbrant Roger D. Serwy Jerry Seutter +Pete Sevander Denis Severson Ian Seyer Ha Shao -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 24 22:07:59 2012 From: python-checkins at python.org (ezio.melotti) Date: Wed, 24 Oct 2012 22:07:59 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogIzE2MjEwOiBtZXJnZSB3aXRoIDMuMy4=?= Message-ID: <3Xn2Zl1Ls3zNYF@mail.python.org> http://hg.python.org/cpython/rev/fd69a6d1b0f0 changeset: 79929:fd69a6d1b0f0 parent: 79925:7e0e15d9957f parent: 79928:8f1d72106073 user: Ezio Melotti date: Wed Oct 24 23:07:16 2012 +0300 summary: #16210: merge with 3.3. files: Doc/library/functions.rst | 26 +++++++++++--------------- Misc/ACKS | 1 + 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1323,29 +1323,25 @@ .. function:: type(object) + type(name, bases, dict) .. index:: object: type - Return the type of an *object*. The return value is a type object and - generally the same object as returned by ``object.__class__``. + + With one argument, return the type of an *object*. The return value is a + type object and generally the same object as returned by ``object.__class__``. The :func:`isinstance` built-in function is recommended for testing the type of an object, because it takes subclasses into account. - With three arguments, :func:`type` functions as a constructor as detailed - below. - -.. function:: type(name, bases, dict) - :noindex: - - Return a new type object. This is essentially a dynamic form of the - :keyword:`class` statement. The *name* string is the class name and becomes the - :attr:`__name__` attribute; the *bases* tuple itemizes the base classes and - becomes the :attr:`__bases__` attribute; and the *dict* dictionary is the - namespace containing definitions for class body and becomes the :attr:`__dict__` - attribute. For example, the following two statements create identical - :class:`type` objects: + With three arguments, return a new type object. This is essentially a + dynamic form of the :keyword:`class` statement. The *name* string is the + class name and becomes the :attr:`__name__` attribute; the *bases* tuple + itemizes the base classes and becomes the :attr:`__bases__` attribute; + and the *dict* dictionary is the namespace containing definitions for class + body and becomes the :attr:`__dict__` attribute. For example, the + following two statements create identical :class:`type` objects: >>> class X: ... a = 1 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1060,6 +1060,7 @@ Joakim Sernbrant Roger D. Serwy Jerry Seutter +Pete Sevander Denis Severson Ian Seyer Ha Shao -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 24 22:43:22 2012 From: python-checkins at python.org (ezio.melotti) Date: Wed, 24 Oct 2012 22:43:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzAzOiByZW1v?= =?utf-8?q?ve_extra_quotes_from_exception_and_add_=28=29=2E__Initial_patch?= =?utf-8?q?_by?= Message-ID: <3Xn3MZ1wHVzPCm@mail.python.org> http://hg.python.org/cpython/rev/ad1cc596bedb changeset: 79930:ad1cc596bedb branch: 2.7 parent: 79926:6dde85f2e4af user: Ezio Melotti date: Wed Oct 24 23:43:02 2012 +0300 summary: #16303: remove extra quotes from exception and add (). Initial patch by Vladimir Rutsky. files: Lib/pstats.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/pstats.py b/Lib/pstats.py --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -120,8 +120,8 @@ self.stats = arg.stats arg.stats = {} if not self.stats: - raise TypeError, "Cannot create or construct a %r object from '%r''" % ( - self.__class__, arg) + raise TypeError("Cannot create or construct a %r object from %r" + % (self.__class__, arg)) return def get_top_level_stats(self): -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Thu Oct 25 05:55:49 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Thu, 25 Oct 2012 05:55:49 +0200 Subject: [Python-checkins] Daily reference leaks (fd69a6d1b0f0): sum=0 Message-ID: results for fd69a6d1b0f0 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogIMK_fK', '-x'] From python-checkins at python.org Thu Oct 25 10:38:45 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 25 Oct 2012 10:38:45 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Update_NEWS_fo?= =?utf-8?q?r_issue_=2316241?= Message-ID: <3XnMF16qZZzPPD@mail.python.org> http://hg.python.org/cpython/rev/e816851fb30d changeset: 79931:e816851fb30d branch: 3.3 parent: 79928:8f1d72106073 user: Andrew Svetlov date: Thu Oct 25 11:36:51 2012 +0300 summary: Update NEWS for issue #16241 files: Misc/NEWS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #16241: Document -X faulthandler command line option. + Patch by Marek ?uppa. + - Issue #6074: Ensure cached bytecode files can always be updated by the user that created them, even when the source file is read-only. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 25 10:38:47 2012 From: python-checkins at python.org (andrew.svetlov) Date: Thu, 25 Oct 2012 10:38:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Update_NEWS_for_issue_=2316241?= Message-ID: <3XnMF31xJMzPPD@mail.python.org> http://hg.python.org/cpython/rev/af93948ca33d changeset: 79932:af93948ca33d parent: 79929:fd69a6d1b0f0 parent: 79931:e816851fb30d user: Andrew Svetlov date: Thu Oct 25 11:38:16 2012 +0300 summary: Update NEWS for issue #16241 files: Misc/NEWS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #16241: Document -X faulthandler command line option. + Patch by Marek ?uppa. + - Issue #12805: Make bytes.join and bytearray.join faster when the separator is empty. Patch by Serhiy Storchaka. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 25 11:52:25 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 25 Oct 2012 11:52:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogRml4IG1hdGguZmFj?= =?utf-8?q?torial_KeyboardInterrupt_segfault=2E__Thanks_Amaury_for_report_?= =?utf-8?q?and?= Message-ID: <3XnNt130pyzR9f@mail.python.org> http://hg.python.org/cpython/rev/b4bfcf7a4773 changeset: 79933:b4bfcf7a4773 branch: 3.2 parent: 79927:997ab4f1530f user: Mark Dickinson date: Thu Oct 25 10:46:28 2012 +0100 summary: Fix math.factorial KeyboardInterrupt segfault. Thanks Amaury for report and diagnosis. files: Misc/NEWS | 3 +++ Modules/mathmodule.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -132,6 +132,9 @@ Library ------- +- Issue #16305: Fix a segmentation fault occurring when interrupting + math.factorial. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #16220: wsgiref now always calls close() on an iterable response. diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1330,14 +1330,13 @@ Py_DECREF(outer); outer = tmp; } - - goto done; + Py_DECREF(inner); + return outer; error: Py_DECREF(outer); - done: Py_DECREF(inner); - return outer; + return NULL; } /* Lookup table for small factorial values */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 25 11:52:26 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 25 Oct 2012 11:52:26 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316305=3A_Merge_fix_from_3=2E2=2E?= Message-ID: <3XnNt25JRbzR9b@mail.python.org> http://hg.python.org/cpython/rev/19ed42e84030 changeset: 79934:19ed42e84030 branch: 3.3 parent: 79931:e816851fb30d parent: 79933:b4bfcf7a4773 user: Mark Dickinson date: Thu Oct 25 10:47:46 2012 +0100 summary: Issue #16305: Merge fix from 3.2. files: Misc/NEWS | 3 +++ Modules/mathmodule.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -879,6 +879,9 @@ Library ------- +- Issue #16305: Fix a segmentation fault occurring when interrupting + math.factorial. + - Issue #9803: Don't close IDLE on saving if breakpoint is open. Patch by Roger Serwy. diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1381,14 +1381,13 @@ Py_DECREF(outer); outer = tmp; } - - goto done; + Py_DECREF(inner); + return outer; error: Py_DECREF(outer); - done: Py_DECREF(inner); - return outer; + return NULL; } /* Lookup table for small factorial values */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Thu Oct 25 11:52:28 2012 From: python-checkins at python.org (mark.dickinson) Date: Thu, 25 Oct 2012 11:52:28 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316305=3A_Merge_fix_from_3=2E3=2E?= Message-ID: <3XnNt40NLzzR6x@mail.python.org> http://hg.python.org/cpython/rev/cbdd6852a274 changeset: 79935:cbdd6852a274 parent: 79932:af93948ca33d parent: 79934:19ed42e84030 user: Mark Dickinson date: Thu Oct 25 10:48:39 2012 +0100 summary: Issue #16305: Merge fix from 3.3. files: Misc/NEWS | 3 +++ Modules/mathmodule.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,9 @@ Library ------- +- Issue #16305: Fix a segmentation fault occurring when interrupting + math.factorial. + - Issue #16116: Fix include and library paths to be correct when building C extensions in venvs. diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1381,14 +1381,13 @@ Py_DECREF(outer); outer = tmp; } - - goto done; + Py_DECREF(inner); + return outer; error: Py_DECREF(outer); - done: Py_DECREF(inner); - return outer; + return NULL; } /* Lookup table for small factorial values */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 02:30:08 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 26 Oct 2012 02:30:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_formatting?= =?utf-8?q?_of_syntax_description_of_function_definition=2E?= Message-ID: <3XnmLm0wBPzMG2@mail.python.org> http://hg.python.org/cpython/rev/9c6260403ed5 changeset: 79936:9c6260403ed5 branch: 3.2 parent: 79933:b4bfcf7a4773 user: Chris Jerdonek date: Thu Oct 25 17:21:22 2012 -0700 summary: Fix formatting of syntax description of function definition. files: Doc/reference/compound_stmts.rst | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -442,8 +442,7 @@ decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* parameter_list: (`defparameter` ",")* - : ( "*" [`parameter`] ("," `defparameter`)* - : [, "**" `parameter`] + : ( "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`] : | "**" `parameter` : | `defparameter` [","] ) parameter: `identifier` [":" `expression`] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 02:30:09 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 26 Oct 2012 02:30:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_from_3=2E2=3A_fix_formatting_of_syntax_description_of_fu?= =?utf-8?q?nction_definition=2E?= Message-ID: <3XnmLn3BnBzMG2@mail.python.org> http://hg.python.org/cpython/rev/118a718ba32c changeset: 79937:118a718ba32c branch: 3.3 parent: 79934:19ed42e84030 parent: 79936:9c6260403ed5 user: Chris Jerdonek date: Thu Oct 25 17:23:14 2012 -0700 summary: Merge from 3.2: fix formatting of syntax description of function definition. files: Doc/reference/compound_stmts.rst | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -442,8 +442,7 @@ decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* parameter_list: (`defparameter` ",")* - : ( "*" [`parameter`] ("," `defparameter`)* - : [, "**" `parameter`] + : ( "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`] : | "**" `parameter` : | `defparameter` [","] ) parameter: `identifier` [":" `expression`] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 02:30:10 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 26 Oct 2012 02:30:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_fix_formatting_of_syntax_description?= =?utf-8?q?_of_function_definition=2E?= Message-ID: <3XnmLp5WxGzPFP@mail.python.org> http://hg.python.org/cpython/rev/59a189a15933 changeset: 79938:59a189a15933 parent: 79935:cbdd6852a274 parent: 79937:118a718ba32c user: Chris Jerdonek date: Thu Oct 25 17:23:54 2012 -0700 summary: Merge from 3.3: fix formatting of syntax description of function definition. files: Doc/reference/compound_stmts.rst | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -442,8 +442,7 @@ decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* parameter_list: (`defparameter` ",")* - : ( "*" [`parameter`] ("," `defparameter`)* - : [, "**" `parameter`] + : ( "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`] : | "**" `parameter` : | `defparameter` [","] ) parameter: `identifier` [":" `expression`] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 02:30:12 2012 From: python-checkins at python.org (chris.jerdonek) Date: Fri, 26 Oct 2012 02:30:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?= =?utf-8?q?3=2E2=3A_fix_formatting_of_syntax_description_of_function_defin?= =?utf-8?q?ition=2E?= Message-ID: <3XnmLr0WvvzNcZ@mail.python.org> http://hg.python.org/cpython/rev/405932ddca9c changeset: 79939:405932ddca9c branch: 2.7 parent: 79930:ad1cc596bedb user: Chris Jerdonek date: Thu Oct 25 17:26:10 2012 -0700 summary: Backport from 3.2: fix formatting of syntax description of function definition. files: Doc/reference/compound_stmts.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -431,7 +431,7 @@ funcdef: "def" `funcname` "(" [`parameter_list`] ")" ":" `suite` dotted_name: `identifier` ("." `identifier`)* parameter_list: (`defparameter` ",")* - : ( "*" `identifier` [, "**" `identifier`] + : ( "*" `identifier` ["," "**" `identifier`] : | "**" `identifier` : | `defparameter` [","] ) defparameter: `parameter` ["=" `expression`] -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Fri Oct 26 05:56:35 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Fri, 26 Oct 2012 05:56:35 +0200 Subject: [Python-checkins] Daily reference leaks (59a189a15933): sum=0 Message-ID: results for 59a189a15933 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogUwSjAD', '-x'] From python-checkins at python.org Fri Oct 26 18:16:07 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:16:07 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MjA2OiBJbXBy?= =?utf-8?q?ove_examples_about_dict_construction=2E?= Message-ID: <3Xp9LH3djvzMqk@mail.python.org> http://hg.python.org/cpython/rev/361beec678e1 changeset: 79940:361beec678e1 branch: 2.7 user: Ezio Melotti date: Fri Oct 26 19:14:16 2012 +0300 summary: #16206: Improve examples about dict construction. files: Doc/library/stdtypes.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1979,13 +1979,13 @@ replaces the value from the positional argument. To illustrate, the following examples all return a dictionary equal to - ``{"one": 1, "two": 2}``:: - - >>> a = dict(one=1, two=2) - >>> b = dict({'one': 1, 'two': 2}) - >>> c = dict(zip(('one', 'two'), (1, 2))) - >>> d = dict([['two', 2], ['one', 1]]) - >>> e = {"one": 1, "two": 2} + ``{"one": 1, "two": 2, "three": 3}``:: + + >>> a = dict(one=1, two=2, three=3) + >>> b = {'one': 1, 'two': 2, 'three': 3} + >>> c = dict(zip(['one', 'two', 'three'], [1, 2, 3])) + >>> d = dict([('two', 2), ('one', 1), ('three', 3)]) + >>> e = dict({'three': 3, 'one': 1, 'two': 2}) >>> a == b == c == d == e True -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:16:08 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:16:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MjA2OiBJbXBy?= =?utf-8?q?ove_examples_about_dict_construction=2E?= Message-ID: <3Xp9LJ5rPNzM4Z@mail.python.org> http://hg.python.org/cpython/rev/eb999002916c changeset: 79941:eb999002916c branch: 3.2 parent: 79936:9c6260403ed5 user: Ezio Melotti date: Fri Oct 26 19:14:16 2012 +0300 summary: #16206: Improve examples about dict construction. files: Doc/library/stdtypes.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2137,13 +2137,13 @@ replaces the value from the positional argument. To illustrate, the following examples all return a dictionary equal to - ``{"one": 1, "two": 2}``:: - - >>> a = dict(one=1, two=2) - >>> b = dict({'one': 1, 'two': 2}) - >>> c = dict(zip(('one', 'two'), (1, 2))) - >>> d = dict([['two', 2], ['one', 1]]) - >>> e = {"one": 1, "two": 2} + ``{"one": 1, "two": 2, "three": 3}``:: + + >>> a = dict(one=1, two=2, three=3) + >>> b = {'one': 1, 'two': 2, 'three': 3} + >>> c = dict(zip(['one', 'two', 'three'], [1, 2, 3])) + >>> d = dict([('two', 2), ('one', 1), ('three', 3)]) + >>> e = dict({'three': 3, 'one': 1, 'two': 2}) >>> a == b == c == d == e True -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:16:10 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:16:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_=2316206=3A_merge_with_3=2E2=2E?= Message-ID: <3Xp9LL12XtzPbw@mail.python.org> http://hg.python.org/cpython/rev/2c1fff6f8956 changeset: 79942:2c1fff6f8956 branch: 3.3 parent: 79937:118a718ba32c parent: 79941:eb999002916c user: Ezio Melotti date: Fri Oct 26 19:15:26 2012 +0300 summary: #16206: merge with 3.2. files: Doc/library/stdtypes.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2976,13 +2976,13 @@ replaces the value from the positional argument. To illustrate, the following examples all return a dictionary equal to - ``{"one": 1, "two": 2}``:: - - >>> a = dict(one=1, two=2) - >>> b = dict({'one': 1, 'two': 2}) - >>> c = dict(zip(('one', 'two'), (1, 2))) - >>> d = dict([['two', 2], ['one', 1]]) - >>> e = {"one": 1, "two": 2} + ``{"one": 1, "two": 2, "three": 3}``:: + + >>> a = dict(one=1, two=2, three=3) + >>> b = {'one': 1, 'two': 2, 'three': 3} + >>> c = dict(zip(['one', 'two', 'three'], [1, 2, 3])) + >>> d = dict([('two', 2), ('one', 1), ('three', 3)]) + >>> e = dict({'three': 3, 'one': 1, 'two': 2}) >>> a == b == c == d == e True -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:16:11 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:16:11 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogIzE2MjA2OiBtZXJnZSB3aXRoIDMuMy4=?= Message-ID: <3Xp9LM3D5gzPBw@mail.python.org> http://hg.python.org/cpython/rev/46ce82b4c1fa changeset: 79943:46ce82b4c1fa parent: 79938:59a189a15933 parent: 79942:2c1fff6f8956 user: Ezio Melotti date: Fri Oct 26 19:15:53 2012 +0300 summary: #16206: merge with 3.3. files: Doc/library/stdtypes.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2976,13 +2976,13 @@ replaces the value from the positional argument. To illustrate, the following examples all return a dictionary equal to - ``{"one": 1, "two": 2}``:: - - >>> a = dict(one=1, two=2) - >>> b = dict({'one': 1, 'two': 2}) - >>> c = dict(zip(('one', 'two'), (1, 2))) - >>> d = dict([['two', 2], ['one', 1]]) - >>> e = {"one": 1, "two": 2} + ``{"one": 1, "two": 2, "three": 3}``:: + + >>> a = dict(one=1, two=2, three=3) + >>> b = {'one': 1, 'two': 2, 'three': 3} + >>> c = dict(zip(['one', 'two', 'three'], [1, 2, 3])) + >>> d = dict([('two', 2), ('one', 1), ('three', 3)]) + >>> e = dict({'three': 3, 'one': 1, 'two': 2}) >>> a == b == c == d == e True -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:32:35 2012 From: python-checkins at python.org (giampaolo.rodola) Date: Fri, 26 Oct 2012 18:32:35 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython=3A_remove_obsolete_hasattr=28?= =?utf-8?q?=29_check_for_socket=2Esendall?= Message-ID: <3Xp9jH1q9vzPBj@mail.python.org> http://hg.python.org/cpython/rev/3074ce015cc6 changeset: 79944:3074ce015cc6 user: Giampaolo Rodola' date: Fri Oct 26 18:32:24 2012 +0200 summary: remove obsolete hasattr() check for socket.sendall files: Lib/logging/handlers.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -538,15 +538,7 @@ #but are still unable to connect. if self.sock: try: - if hasattr(self.sock, "sendall"): - self.sock.sendall(s) - else: #pragma: no cover - sentsofar = 0 - left = len(s) - while left > 0: - sent = self.sock.send(s[sentsofar:]) - sentsofar = sentsofar + sent - left = left - sent + self.sock.sendall(s) except socket.error: #pragma: no cover self.sock.close() self.sock = None # so we can call createSocket next time -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:35:13 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:35:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzE2MzE3OiBtZW50?= =?utf-8?q?ion_lzma_in_the_tutorial=2E__Patch_by_Serhiy_Storchaka=2E?= Message-ID: <3Xp9mK5nV9zPBw@mail.python.org> http://hg.python.org/cpython/rev/2fc18ba8ca4a changeset: 79945:2fc18ba8ca4a branch: 3.3 parent: 79942:2c1fff6f8956 user: Ezio Melotti date: Fri Oct 26 19:33:07 2012 +0300 summary: #16317: mention lzma in the tutorial. Patch by Serhiy Storchaka. files: Doc/tutorial/stdlib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst --- a/Doc/tutorial/stdlib.rst +++ b/Doc/tutorial/stdlib.rst @@ -203,7 +203,7 @@ ================ Common data archiving and compression formats are directly supported by modules -including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and +including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`lzma`, :mod:`zipfile` and :mod:`tarfile`. :: >>> import zlib -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:35:15 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:35:15 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogIzE2MzE3OiBtZXJnZSB3aXRoIDMuMy4=?= Message-ID: <3Xp9mM0qmYzPRj@mail.python.org> http://hg.python.org/cpython/rev/f2f615b5718a changeset: 79946:f2f615b5718a parent: 79943:46ce82b4c1fa parent: 79945:2fc18ba8ca4a user: Ezio Melotti date: Fri Oct 26 19:33:37 2012 +0300 summary: #16317: merge with 3.3. files: Doc/tutorial/stdlib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst --- a/Doc/tutorial/stdlib.rst +++ b/Doc/tutorial/stdlib.rst @@ -203,7 +203,7 @@ ================ Common data archiving and compression formats are directly supported by modules -including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and +including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`lzma`, :mod:`zipfile` and :mod:`tarfile`. :: >>> import zlib -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 18:35:16 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 18:35:16 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgaGVhZHMu?= Message-ID: <3Xp9mN2wGczPbX@mail.python.org> http://hg.python.org/cpython/rev/2159ff4595b7 changeset: 79947:2159ff4595b7 parent: 79944:3074ce015cc6 parent: 79946:f2f615b5718a user: Ezio Melotti date: Fri Oct 26 19:35:00 2012 +0300 summary: Merge heads. files: Doc/tutorial/stdlib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst --- a/Doc/tutorial/stdlib.rst +++ b/Doc/tutorial/stdlib.rst @@ -203,7 +203,7 @@ ================ Common data archiving and compression formats are directly supported by modules -including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and +including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`lzma`, :mod:`zipfile` and :mod:`tarfile`. :: >>> import zlib -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 21:44:00 2012 From: python-checkins at python.org (petri.lehtinen) Date: Fri, 26 Oct 2012 21:44:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_Modules/?= =?utf-8?q?=5Ffreeze=5Fimportlib_to_=2Egitignore?= Message-ID: <3XpFy82D3GzQsp@mail.python.org> http://hg.python.org/cpython/rev/5843723bc747 changeset: 79948:5843723bc747 branch: 3.3 parent: 79945:2fc18ba8ca4a user: Petri Lehtinen date: Fri Oct 26 22:40:42 2012 +0300 summary: Add Modules/_freeze_importlib to .gitignore files: .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ Modules/Setup.local Modules/config.c Modules/ld_so_aix +Modules/_freeze_importlib Modules/_testembed PCbuild/*.bsc PCbuild/*.dll -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 21:44:01 2012 From: python-checkins at python.org (petri.lehtinen) Date: Fri, 26 Oct 2012 21:44:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4z?= Message-ID: <3XpFy94NRDzR5y@mail.python.org> http://hg.python.org/cpython/rev/2b7e58153d11 changeset: 79949:2b7e58153d11 parent: 79947:2159ff4595b7 parent: 79948:5843723bc747 user: Petri Lehtinen date: Fri Oct 26 22:40:56 2012 +0300 summary: Merge 3.3 files: .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ Modules/Setup.local Modules/config.c Modules/ld_so_aix +Modules/_freeze_importlib Modules/_testembed PCbuild/*.bsc PCbuild/*.dll -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 22:10:18 2012 From: python-checkins at python.org (ezio.melotti) Date: Fri, 26 Oct 2012 22:10:18 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzMyOiB1c2Ug?= =?utf-8?q?=22except_OSError_as_e=22_in_subprocess_docs=2E__Patch_by_Berke?= =?utf-8?q?r_Peksag=2E?= Message-ID: <3XpGXV4VnQzPb4@mail.python.org> http://hg.python.org/cpython/rev/7a69b4077afb changeset: 79950:7a69b4077afb branch: 2.7 parent: 79940:361beec678e1 user: Ezio Melotti date: Fri Oct 26 23:10:07 2012 +0300 summary: #16332: use "except OSError as e" in subprocess docs. Patch by Berker Peksag. files: Doc/library/subprocess.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -750,7 +750,7 @@ print >>sys.stderr, "Child was terminated by signal", -retcode else: print >>sys.stderr, "Child returned", retcode - except OSError, e: + except OSError as e: print >>sys.stderr, "Execution failed:", e -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 23:29:00 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 26 Oct 2012 23:29:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MjQz?= =?utf-8?q?=3A_add_example_for_inspect=2Eformatargspec?= Message-ID: <3XpJHJ27HfzR6m@mail.python.org> http://hg.python.org/cpython/rev/9d3b616fc702 changeset: 79951:9d3b616fc702 branch: 3.3 parent: 79948:5843723bc747 user: Andrew Svetlov date: Sat Oct 27 00:28:20 2012 +0300 summary: Issue #16243: add example for inspect.formatargspec Patch by Berker Peksag. files: Doc/library/inspect.rst | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -716,7 +716,7 @@ locals dictionary of the given frame. -.. function:: formatargspec(args[, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations, formatarg, formatvarargs, formatvarkw, formatvalue, formatreturns, formatannotations]) +.. function:: formatargspec(args[, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations[, formatarg, formatvarargs, formatvarkw, formatvalue, formatreturns, formatannotations]]) Format a pretty argument spec from the values returned by :func:`getargspec` or :func:`getfullargspec`. @@ -725,7 +725,14 @@ ``defaults``, ``kwonlyargs``, ``kwonlydefaults``, ``annotations``). The other five arguments are the corresponding optional formatting functions that are called to turn names and values into strings. The last argument - is an optional function to format the sequence of arguments. + is an optional function to format the sequence of arguments. For example:: + + >>> from inspect import formatargspec, getfullargspec + >>> def f(a: int, b: float): + ... pass + ... + >>> formatargspec(*getfullargspec(f)) + '(a: int, b: float)' .. function:: formatargvalues(args[, varargs, varkw, locals, formatarg, formatvarargs, formatvarkw, formatvalue]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Fri Oct 26 23:29:01 2012 From: python-checkins at python.org (andrew.svetlov) Date: Fri, 26 Oct 2012 23:29:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316243=3A_add_example_for_inspect=2Eformat?= =?utf-8?q?argspec?= Message-ID: <3XpJHK4GmpzQvL@mail.python.org> http://hg.python.org/cpython/rev/a0337031a6b7 changeset: 79952:a0337031a6b7 parent: 79949:2b7e58153d11 parent: 79951:9d3b616fc702 user: Andrew Svetlov date: Sat Oct 27 00:28:49 2012 +0300 summary: Merge issue #16243: add example for inspect.formatargspec Patch by Berker Peksag. files: Doc/library/inspect.rst | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -716,7 +716,7 @@ locals dictionary of the given frame. -.. function:: formatargspec(args[, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations, formatarg, formatvarargs, formatvarkw, formatvalue, formatreturns, formatannotations]) +.. function:: formatargspec(args[, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations[, formatarg, formatvarargs, formatvarkw, formatvalue, formatreturns, formatannotations]]) Format a pretty argument spec from the values returned by :func:`getargspec` or :func:`getfullargspec`. @@ -725,7 +725,14 @@ ``defaults``, ``kwonlyargs``, ``kwonlydefaults``, ``annotations``). The other five arguments are the corresponding optional formatting functions that are called to turn names and values into strings. The last argument - is an optional function to format the sequence of arguments. + is an optional function to format the sequence of arguments. For example:: + + >>> from inspect import formatargspec, getfullargspec + >>> def f(a: int, b: float): + ... pass + ... + >>> formatargspec(*getfullargspec(f)) + '(a: int, b: float)' .. function:: formatargvalues(args[, varargs, varkw, locals, formatarg, formatvarargs, formatvarkw, formatvalue]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 02:05:02 2012 From: python-checkins at python.org (philip.jenvey) Date: Sat, 27 Oct 2012 02:05:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_bounds_check_f?= =?utf-8?q?or_bad_data_=28thanks_amaury=29?= Message-ID: <3XpMlL1m20zPXZ@mail.python.org> http://hg.python.org/cpython/rev/74d65c746f63 changeset: 79953:74d65c746f63 branch: 3.2 parent: 79941:eb999002916c user: Philip Jenvey date: Fri Oct 26 17:01:53 2012 -0700 summary: bounds check for bad data (thanks amaury) files: Lib/test/test_codecs.py | 2 ++ Python/codecs.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -645,6 +645,8 @@ self.assertEqual(b"abc\xed\xa0\x80def".decode("utf-8", "surrogatepass"), "abc\ud800def") self.assertTrue(codecs.lookup_error("surrogatepass")) + with self.assertRaises(UnicodeDecodeError): + b"abc\xed\xa0".decode("utf-8", "surrogatepass") class UTF7Test(ReadTest): encoding = "utf-7" diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -821,9 +821,10 @@ /* Try decoding a single surrogate character. If there are more, let the codec call us again. */ p += start; - if ((p[0] & 0xf0) == 0xe0 || - (p[1] & 0xc0) == 0x80 || - (p[2] & 0xc0) == 0x80) { + if (strlen(p) > 2 && + ((p[0] & 0xf0) == 0xe0 || + (p[1] & 0xc0) == 0x80 || + (p[2] & 0xc0) == 0x80)) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); if (ch < 0xd800 || ch > 0xdfff) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 02:05:03 2012 From: python-checkins at python.org (philip.jenvey) Date: Sat, 27 Oct 2012 02:05:03 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_with_3=2E2?= Message-ID: <3XpMlM41lHzPXZ@mail.python.org> http://hg.python.org/cpython/rev/fd41c6b4de57 changeset: 79954:fd41c6b4de57 branch: 3.3 parent: 79951:9d3b616fc702 parent: 79953:74d65c746f63 user: Philip Jenvey date: Fri Oct 26 17:05:09 2012 -0700 summary: merge with 3.2 files: Lib/test/test_codecs.py | 2 ++ Python/codecs.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -666,6 +666,8 @@ self.assertEqual(b"\xf0\x90\xbf\xbf\xed\xa0\x80".decode("utf-8", "surrogatepass"), "\U00010fff\uD800") self.assertTrue(codecs.lookup_error("surrogatepass")) + with self.assertRaises(UnicodeDecodeError): + b"abc\xed\xa0".decode("utf-8", "surrogatepass") @unittest.skipUnless(sys.platform == 'win32', 'cp65001 is a Windows-only codec') diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -791,9 +791,10 @@ /* Try decoding a single surrogate character. If there are more, let the codec call us again. */ p += start; - if ((p[0] & 0xf0) == 0xe0 || - (p[1] & 0xc0) == 0x80 || - (p[2] & 0xc0) == 0x80) { + if (strlen(p) > 2 && + ((p[0] & 0xf0) == 0xe0 || + (p[1] & 0xc0) == 0x80 || + (p[2] & 0xc0) == 0x80)) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); if (ch < 0xd800 || ch > 0xdfff) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 02:05:04 2012 From: python-checkins at python.org (philip.jenvey) Date: Sat, 27 Oct 2012 02:05:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_with_3=2E3?= Message-ID: <3XpMlN6W48zR5N@mail.python.org> http://hg.python.org/cpython/rev/8e67d5dc069d changeset: 79955:8e67d5dc069d parent: 79952:a0337031a6b7 parent: 79954:fd41c6b4de57 user: Philip Jenvey date: Fri Oct 26 17:05:55 2012 -0700 summary: merge with 3.3 files: Lib/test/test_codecs.py | 2 ++ Python/codecs.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -666,6 +666,8 @@ self.assertEqual(b"\xf0\x90\xbf\xbf\xed\xa0\x80".decode("utf-8", "surrogatepass"), "\U00010fff\uD800") self.assertTrue(codecs.lookup_error("surrogatepass")) + with self.assertRaises(UnicodeDecodeError): + b"abc\xed\xa0".decode("utf-8", "surrogatepass") @unittest.skipUnless(sys.platform == 'win32', 'cp65001 is a Windows-only codec') diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -791,9 +791,10 @@ /* Try decoding a single surrogate character. If there are more, let the codec call us again. */ p += start; - if ((p[0] & 0xf0) == 0xe0 || - (p[1] & 0xc0) == 0x80 || - (p[2] & 0xc0) == 0x80) { + if (strlen(p) > 2 && + ((p[0] & 0xf0) == 0xe0 || + (p[1] & 0xc0) == 0x80 || + (p[2] & 0xc0) == 0x80)) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); if (ch < 0xd800 || ch > 0xdfff) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 04:21:53 2012 From: python-checkins at python.org (trent.nelson) Date: Sat, 27 Oct 2012 04:21:53 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2Mjc0?= =?utf-8?q?=3A_Fix_test=5Fasyncore_on_Solaris=2E?= Message-ID: <3XpQnF5jVZzR8y@mail.python.org> http://hg.python.org/cpython/rev/937fa81500e2 changeset: 79956:937fa81500e2 branch: 2.7 parent: 79950:7a69b4077afb user: Trent Nelson date: Fri Oct 26 22:21:46 2012 -0400 summary: Issue #16274: Fix test_asyncore on Solaris. files: Lib/test/test_asyncore.py | 5 +++-- Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -484,8 +484,9 @@ return self.socket.getsockname()[:2] def handle_accept(self): - sock, addr = self.accept() - self.handler(sock) + pair = self.accept() + if pair is not None: + self.handler(pair[0]) def handle_error(self): raise diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -435,6 +435,8 @@ Tests ----- +- Issue #16274: Fix test_asyncore on Solaris. Patch by Giampaolo Rodola'. + - Issue #15040: Close files in mailbox tests for PyPy compatibility. Original patch by Matti Picus. -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Sat Oct 27 05:55:12 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Sat, 27 Oct 2012 05:55:12 +0200 Subject: [Python-checkins] Daily reference leaks (8e67d5dc069d): sum=0 Message-ID: results for 8e67d5dc069d on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogQnvnow', '-x'] From python-checkins at python.org Sat Oct 27 11:51:22 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 11:51:22 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjUw?= =?utf-8?q?=3A_Fix_URLError_invocation_with_proper_args=2E?= Message-ID: <3Xpclt6RkfzRB9@mail.python.org> http://hg.python.org/cpython/rev/5e71f2712076 changeset: 79957:5e71f2712076 branch: 3.2 parent: 79953:74d65c746f63 user: Senthil Kumaran date: Sat Oct 27 02:26:46 2012 -0700 summary: Issue #16250: Fix URLError invocation with proper args. files: Lib/test/test_urllib.py | 35 +++++++++++++++++++++++++++++ Lib/urllib/request.py | 33 ++++++++++++-------------- Misc/NEWS | 2 + 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -268,6 +268,41 @@ finally: self.unfakehttp() + def test_missing_localfile(self): + # Test for #10836 + with self.assertRaises(urllib.error.URLError) as e: + urlopen('file://localhost/a/file/which/doesnot/exists.py') + self.assertTrue(e.exception.filename) + self.assertTrue(e.exception.reason) + + def test_file_notexists(self): + fd, tmp_file = tempfile.mkstemp() + tmp_fileurl = 'file://localhost/' + tmp_file.replace(os.path.sep, '/') + try: + self.assertTrue(os.path.exists(tmp_file)) + with urlopen(tmp_fileurl) as fobj: + self.assertTrue(fobj) + finally: + os.close(fd) + os.unlink(tmp_file) + self.assertFalse(os.path.exists(tmp_file)) + with self.assertRaises(urllib.error.URLError): + urlopen(tmp_fileurl) + + def test_ftp_nohost(self): + test_ftp_url = 'ftp:///path' + with self.assertRaises(urllib.error.URLError) as e: + urlopen(test_ftp_url) + self.assertFalse(e.exception.filename) + self.assertTrue(e.exception.reason) + + def test_ftp_nonexisting(self): + with self.assertRaises(urllib.error.URLError) as e: + urlopen('ftp://localhost/a/file/which/doesnot/exists.py') + self.assertFalse(e.exception.filename) + self.assertTrue(e.exception.reason) + + def test_userpass_inurl(self): self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") try: diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1300,9 +1300,9 @@ else: origurl = 'file://' + filename return addinfourl(open(localfile, 'rb'), headers, origurl) - except OSError as msg: + except OSError as exp: # users shouldn't expect OSErrors coming from urlopen() - raise URLError(msg) + raise URLError(exp) raise URLError('file not on local host') def _safe_gethostbyname(host): @@ -1361,8 +1361,8 @@ headers += "Content-length: %d\n" % retrlen headers = email.message_from_string(headers) return addinfourl(fp, headers, req.full_url) - except ftplib.all_errors as msg: - exc = URLError('ftp error: %s' % msg) + except ftplib.all_errors as exp: + exc = URLError('ftp error: %r' % exp) raise exc.with_traceback(sys.exc_info()[2]) def connect_ftp(self, user, passwd, host, port, dirs, timeout): @@ -1662,7 +1662,6 @@ if proxy_bypass(realhost): host = realhost - #print "proxy via http:", host, selector if not host: raise IOError('http error', 'no host given') if proxy_passwd: @@ -1753,7 +1752,7 @@ def open_file(self, url): """Use local file or FTP depending on form of URL.""" if not isinstance(url, str): - raise URLError('file error', 'proxy support for file protocol currently not implemented') + raise URLError('file error: proxy support for file protocol currently not implemented') if url[:2] == '//' and url[2:3] != '/' and url[2:12].lower() != 'localhost/': raise ValueError("file:// scheme is supported only on localhost") else: @@ -1768,7 +1767,7 @@ try: stats = os.stat(localname) except OSError as e: - raise URLError(e.errno, e.strerror, e.filename) + raise URLError(e.strerror, e.filename) size = stats.st_size modified = email.utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(url)[0] @@ -1782,23 +1781,22 @@ return addinfourl(open(localname, 'rb'), headers, urlfile) host, port = splitport(host) if (not port - and socket.gethostbyname(host) in (localhost() + thishost())): + and socket.gethostbyname(host) in ((localhost(),) + thishost())): urlfile = file if file[:1] == '/': urlfile = 'file://' + file elif file[:2] == './': raise ValueError("local file url may start with / or file:. Unknown url of type: %s" % url) return addinfourl(open(localname, 'rb'), headers, urlfile) - raise URLError('local file error', 'not on local host') + raise URLError('local file error: not on local host') def open_ftp(self, url): """Use FTP protocol.""" if not isinstance(url, str): - raise URLError('ftp error', 'proxy support for ftp protocol currently not implemented') + raise URLError('ftp error: proxy support for ftp protocol currently not implemented') import mimetypes - from io import StringIO host, path = splithost(url) - if not host: raise URLError('ftp error', 'no host given') + if not host: raise URLError('ftp error: no host given') host, port = splitport(host) user, host = splituser(host) if user: user, passwd = splitpasswd(user) @@ -1847,13 +1845,13 @@ headers += "Content-Length: %d\n" % retrlen headers = email.message_from_string(headers) return addinfourl(fp, headers, "ftp:" + url) - except ftperrors() as msg: - raise URLError('ftp error', msg).with_traceback(sys.exc_info()[2]) + except ftperrors() as exp: + raise URLError('ftp error %r' % exp).with_traceback(sys.exc_info()[2]) def open_data(self, url, data=None): """Use "data" URL.""" if not isinstance(url, str): - raise URLError('data error', 'proxy support for data protocol currently not implemented') + raise URLError('data error: proxy support for data protocol currently not implemented') # ignore POSTed data # # syntax of data URLs: @@ -2184,7 +2182,7 @@ conn, retrlen = self.ftp.ntransfercmd(cmd) except ftplib.error_perm as reason: if str(reason)[:3] != '550': - raise URLError('ftp error', reason).with_traceback( + raise URLError('ftp error: %d' % reason).with_traceback( sys.exc_info()[2]) if not conn: # Set transfer mode to ASCII! @@ -2196,7 +2194,7 @@ try: self.ftp.cwd(file) except ftplib.error_perm as reason: - raise URLError('ftp error', reason) from reason + raise URLError('ftp error: %d' % reason) from reason finally: self.ftp.cwd(pwd) cmd = 'LIST ' + file @@ -2464,7 +2462,6 @@ test = test.replace("*", r".*") # change glob sequence test = test.replace("?", r".") # change glob char for val in host: - # print "%s <--> %s" %( test, val ) if re.match(test, val, re.I): return 1 return 0 diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -132,6 +132,8 @@ Library ------- +- Issue #16250: Fix URLError invocation with proper args. + - Issue #16305: Fix a segmentation fault occurring when interrupting math.factorial. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 11:51:24 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 11:51:24 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316250=3A_Fix_URLError_invocation_with_proper_args?= Message-ID: <3Xpclw365LzRDm@mail.python.org> http://hg.python.org/cpython/rev/30547e2cd04d changeset: 79958:30547e2cd04d branch: 3.3 parent: 79954:fd41c6b4de57 parent: 79957:5e71f2712076 user: Senthil Kumaran date: Sat Oct 27 02:48:21 2012 -0700 summary: Issue #16250: Fix URLError invocation with proper args files: Lib/test/test_urllib.py | 35 ++++++++++++++++++++++++++++- Lib/urllib/request.py | 30 ++++++++++++------------ Misc/NEWS | 2 + 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -268,6 +268,39 @@ finally: self.unfakehttp() + def test_missing_localfile(self): + # Test for #10836 + # 3.3 - URLError is not captured, explicit IOError is raised. + with self.assertRaises(IOError): + urlopen('file://localhost/a/file/which/doesnot/exists.py') + + def test_file_notexists(self): + fd, tmp_file = tempfile.mkstemp() + tmp_fileurl = 'file://localhost/' + tmp_file.replace(os.path.sep, '/') + try: + self.assertTrue(os.path.exists(tmp_file)) + with urlopen(tmp_fileurl) as fobj: + self.assertTrue(fobj) + finally: + os.close(fd) + os.unlink(tmp_file) + self.assertFalse(os.path.exists(tmp_file)) + # 3.3 - IOError instead of URLError + with self.assertRaises(IOError): + urlopen(tmp_fileurl) + + def test_ftp_nohost(self): + test_ftp_url = 'ftp:///path' + # 3.3 - IOError instead of URLError + with self.assertRaises(IOError): + urlopen(test_ftp_url) + + def test_ftp_nonexisting(self): + # 3.3 - IOError instead of URLError + with self.assertRaises(IOError): + urlopen('ftp://localhost/a/file/which/doesnot/exists.py') + + def test_userpass_inurl(self): self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") try: @@ -300,7 +333,7 @@ def test_URLopener_deprecation(self): with support.check_warnings(('',DeprecationWarning)): - warn = urllib.request.URLopener() + urllib.request.URLopener() class urlretrieve_FileTests(unittest.TestCase): """Test urllib.urlretrieve() on local files""" diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1413,9 +1413,9 @@ else: origurl = 'file://' + filename return addinfourl(open(localfile, 'rb'), headers, origurl) - except OSError as msg: + except OSError as exp: # users shouldn't expect OSErrors coming from urlopen() - raise URLError(msg) + raise URLError(exp) raise URLError('file not on local host') def _safe_gethostbyname(host): @@ -1474,8 +1474,8 @@ headers += "Content-length: %d\n" % retrlen headers = email.message_from_string(headers) return addinfourl(fp, headers, req.full_url) - except ftplib.all_errors as msg: - exc = URLError('ftp error: %s' % msg) + except ftplib.all_errors as exp: + exc = URLError('ftp error: %r' % exp) raise exc.with_traceback(sys.exc_info()[2]) def connect_ftp(self, user, passwd, host, port, dirs, timeout): @@ -1870,7 +1870,7 @@ def open_file(self, url): """Use local file or FTP depending on form of URL.""" if not isinstance(url, str): - raise URLError('file error', 'proxy support for file protocol currently not implemented') + raise URLError('file error: proxy support for file protocol currently not implemented') if url[:2] == '//' and url[2:3] != '/' and url[2:12].lower() != 'localhost/': raise ValueError("file:// scheme is supported only on localhost") else: @@ -1885,7 +1885,7 @@ try: stats = os.stat(localname) except OSError as e: - raise URLError(e.errno, e.strerror, e.filename) + raise URLError(e.strerror, e.filename) size = stats.st_size modified = email.utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(url)[0] @@ -1899,22 +1899,22 @@ return addinfourl(open(localname, 'rb'), headers, urlfile) host, port = splitport(host) if (not port - and socket.gethostbyname(host) in (localhost() + thishost())): + and socket.gethostbyname(host) in ((localhost(),) + thishost())): urlfile = file if file[:1] == '/': urlfile = 'file://' + file elif file[:2] == './': raise ValueError("local file url may start with / or file:. Unknown url of type: %s" % url) return addinfourl(open(localname, 'rb'), headers, urlfile) - raise URLError('local file error', 'not on local host') + raise URLError('local file error: not on local host') def open_ftp(self, url): """Use FTP protocol.""" if not isinstance(url, str): - raise URLError('ftp error', 'proxy support for ftp protocol currently not implemented') + raise URLError('ftp error: proxy support for ftp protocol currently not implemented') import mimetypes host, path = splithost(url) - if not host: raise URLError('ftp error', 'no host given') + if not host: raise URLError('ftp error: no host given') host, port = splitport(host) user, host = splituser(host) if user: user, passwd = splitpasswd(user) @@ -1963,13 +1963,13 @@ headers += "Content-Length: %d\n" % retrlen headers = email.message_from_string(headers) return addinfourl(fp, headers, "ftp:" + url) - except ftperrors() as msg: - raise URLError('ftp error', msg).with_traceback(sys.exc_info()[2]) + except ftperrors() as exp: + raise URLError('ftp error %r' % exp).with_traceback(sys.exc_info()[2]) def open_data(self, url, data=None): """Use "data" URL.""" if not isinstance(url, str): - raise URLError('data error', 'proxy support for data protocol currently not implemented') + raise URLError('data error: proxy support for data protocol currently not implemented') # ignore POSTed data # # syntax of data URLs: @@ -2298,7 +2298,7 @@ conn, retrlen = self.ftp.ntransfercmd(cmd) except ftplib.error_perm as reason: if str(reason)[:3] != '550': - raise URLError('ftp error', reason).with_traceback( + raise URLError('ftp error: %d' % reason).with_traceback( sys.exc_info()[2]) if not conn: # Set transfer mode to ASCII! @@ -2310,7 +2310,7 @@ try: self.ftp.cwd(file) except ftplib.error_perm as reason: - raise URLError('ftp error', reason) from reason + raise URLError('ftp error: %d' % reason) from reason finally: self.ftp.cwd(pwd) cmd = 'LIST ' + file diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,8 @@ Library ------- +- Issue #16250: Fix URLError invocation with proper args. + - Issue #16116: Fix include and library paths to be correct when building C extensions in venvs. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 11:51:25 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 11:51:25 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_3=2E3_and_3=2E2_changes_related_to_10836?= Message-ID: <3Xpclx613RzRDn@mail.python.org> http://hg.python.org/cpython/rev/7173ac8144b0 changeset: 79959:7173ac8144b0 parent: 79955:8e67d5dc069d parent: 79958:30547e2cd04d user: Senthil Kumaran date: Sat Oct 27 02:51:12 2012 -0700 summary: merge 3.3 and 3.2 changes related to 10836 files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 12:48:58 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 12:48:58 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Add_some_tests?= =?utf-8?q?_in_2=2E7_for_Issue_=2316250?= Message-ID: <3Xpf2L3xS2zRBV@mail.python.org> http://hg.python.org/cpython/rev/3fb84c1da8c5 changeset: 79960:3fb84c1da8c5 branch: 2.7 parent: 79956:937fa81500e2 user: Senthil Kumaran date: Sat Oct 27 03:48:40 2012 -0700 summary: Add some tests in 2.7 for Issue #16250 files: Lib/test/test_urllib.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -222,6 +222,27 @@ finally: self.unfakehttp() + def test_missing_localfile(self): + self.assertRaises(IOError, urllib.urlopen, + 'file://localhost/a/missing/file.py') + fd, tmp_file = tempfile.mkstemp() + tmp_fileurl = 'file://localhost/' + tmp_file.replace(os.path.sep, '/') + try: + self.assertTrue(os.path.exists(tmp_file)) + fp = urllib.urlopen(tmp_fileurl) + finally: + os.close(fd) + fp.close() + os.unlink(tmp_file) + + self.assertFalse(os.path.exists(tmp_file)) + self.assertRaises(IOError, urllib.urlopen, tmp_fileurl) + + def test_ftp_nonexisting(self): + self.assertRaises(IOError, urllib.urlopen, + 'ftp://localhost/not/existing/file.py') + + def test_userpass_inurl(self): self.fakehttp('Hello!') try: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 12:58:13 2012 From: python-checkins at python.org (hynek.schlawack) Date: Sat, 27 Oct 2012 12:58:13 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzE2MzA3OiBGaXgg?= =?utf-8?q?multiprocessing=2EPool=2Emap=5Fasync_not_calling_its_callbacks?= Message-ID: <3XpfF120NVzMkD@mail.python.org> http://hg.python.org/cpython/rev/1bccec4ff980 changeset: 79961:1bccec4ff980 branch: 3.3 parent: 79958:30547e2cd04d user: Hynek Schlawack date: Sat Oct 27 12:53:02 2012 +0200 summary: #16307: Fix multiprocessing.Pool.map_async not calling its callbacks Patch by Janne Karila. files: Lib/multiprocessing/pool.py | 3 ++- Lib/test/test_multiprocessing.py | 17 +++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -297,7 +297,8 @@ ''' Asynchronous version of `map()` method. ''' - return self._map_async(func, iterable, mapstar, chunksize) + return self._map_async(func, iterable, mapstar, chunksize, callback, + error_callback) def _map_async(self, func, iterable, mapper, chunksize=None, callback=None, error_callback=None): diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1642,6 +1642,23 @@ self.assertEqual(self.pool.starmap_async(mul, tuples).get(), list(itertools.starmap(mul, tuples))) + def test_map_async(self): + self.assertEqual(self.pool.map_async(sqr, list(range(10))).get(), + list(map(sqr, list(range(10))))) + + def test_map_async_callbacks(self): + call_args = self.manager.list() if self.TYPE == 'manager' else [] + self.pool.map_async(int, ['1'], + callback=call_args.append, + error_callback=call_args.append).wait() + self.assertEqual(1, len(call_args)) + self.assertEqual([1], call_args[0]) + self.pool.map_async(int, ['a'], + callback=call_args.append, + error_callback=call_args.append).wait() + self.assertEqual(2, len(call_args)) + self.assertIsInstance(call_args[1], ValueError) + def test_map_chunksize(self): try: self.pool.map_async(sqr, [], chunksize=1).get(timeout=TIMEOUT1) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -594,6 +594,7 @@ Peter van Kampen Rafe Kaplan Jacob Kaplan-Moss +Janne Karila Per ?yvind Karlsen Lou Kates Hiroaki Kawai diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,9 @@ Library ------- +- Issue #16307: Fix multiprocessing.Pool.map_async not calling its callbacks. + Patch by Janne Karila. + - Issue #16250: Fix URLError invocation with proper args. - Issue #16116: Fix include and library paths to be correct when building C -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 12:58:14 2012 From: python-checkins at python.org (hynek.schlawack) Date: Sat, 27 Oct 2012 12:58:14 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4z?= Message-ID: <3XpfF24TCmzPNY@mail.python.org> http://hg.python.org/cpython/rev/8f0d5ecca524 changeset: 79962:8f0d5ecca524 parent: 79959:7173ac8144b0 parent: 79961:1bccec4ff980 user: Hynek Schlawack date: Sat Oct 27 12:56:30 2012 +0200 summary: Merge 3.3 files: Lib/multiprocessing/pool.py | 3 ++- Lib/test/test_multiprocessing.py | 17 +++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -297,7 +297,8 @@ ''' Asynchronous version of `map()` method. ''' - return self._map_async(func, iterable, mapstar, chunksize) + return self._map_async(func, iterable, mapstar, chunksize, callback, + error_callback) def _map_async(self, func, iterable, mapper, chunksize=None, callback=None, error_callback=None): diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1655,6 +1655,23 @@ self.assertEqual(self.pool.starmap_async(mul, tuples).get(), list(itertools.starmap(mul, tuples))) + def test_map_async(self): + self.assertEqual(self.pool.map_async(sqr, list(range(10))).get(), + list(map(sqr, list(range(10))))) + + def test_map_async_callbacks(self): + call_args = self.manager.list() if self.TYPE == 'manager' else [] + self.pool.map_async(int, ['1'], + callback=call_args.append, + error_callback=call_args.append).wait() + self.assertEqual(1, len(call_args)) + self.assertEqual([1], call_args[0]) + self.pool.map_async(int, ['a'], + callback=call_args.append, + error_callback=call_args.append).wait() + self.assertEqual(2, len(call_args)) + self.assertIsInstance(call_args[1], ValueError) + def test_map_chunksize(self): try: self.pool.map_async(sqr, [], chunksize=1).get(timeout=TIMEOUT1) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -594,6 +594,7 @@ Peter van Kampen Rafe Kaplan Jacob Kaplan-Moss +Janne Karila Per ?yvind Karlsen Lou Kates Hiroaki Kawai diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,9 @@ Library ------- +- Issue #16307: Fix multiprocessing.Pool.map_async not calling its callbacks. + Patch by Janne Karila. + - Issue #16305: Fix a segmentation fault occurring when interrupting math.factorial. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 16:36:46 2012 From: python-checkins at python.org (nick.coghlan) Date: Sat, 27 Oct 2012 16:36:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_for_updating_the_URL_layo?= =?utf-8?q?ut_on_docs=2Epython=2Eorg?= Message-ID: <3Xpl5B1cv9zNm1@mail.python.org> http://hg.python.org/peps/rev/c7ba002ca91d changeset: 4568:c7ba002ca91d user: Nick Coghlan date: Sun Oct 28 00:36:36 2012 +1000 summary: PEP for updating the URL layout on docs.python.org files: pep-0430.txt | 200 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 200 insertions(+), 0 deletions(-) diff --git a/pep-0430.txt b/pep-0430.txt new file mode 100644 --- /dev/null +++ b/pep-0430.txt @@ -0,0 +1,200 @@ +PEP: 430 +Title: Migrating to Python 3 as the default online documentation +Version: $Revision$ +Last-Modified: $Date$ +Author: Nick Coghlan +Status: Draft +Type: Informational +Content-Type: text/x-rst +Created: 27-Oct-2012 + + +Abstract +======== + +This PEP proposes a strategy for migrating the default version of the +Python documentation presented to users of Python when accessing +docs.python.org from 2.7 to Python 3.3. + +It proposes a backwards compatible scheme that preserves the meaning of +existing deep links in to the Python 2 documentation, while still +presenting the Python 3 documentation by default, and presenting the +Python 2 and 3 documentation in a way that avoids making the Python 3 +documentation look like a second-class citizen. + + +Background +========== + +With the transition of the overall Python ecosystem from Python 2 to Python 3 +still in progress, one question which arises periodically [1_, 2_] is when +and how to handle the change from providing the Python 2 documentation as +the default version displayed at the docs.python.org root URL to providing +the Python 3 documentation. + +While efforts are under way [3_] to improve the general version switching +support in the online documentation, this PEP is technically independent +of those improvements. + + +Key Concerns +============ + +There are a couple of key concerns that any migration proposal needs to +address. + + +Don't Confuse Beginners +----------------------- + +Many beginners learn Python through third party resources. These resources, +not all of which are online resources, may reference in to the python.org +online documentation for additional background and details. + +Importantly, even when the online documentation is updated, the "version +added" and "version changed" tags usually provide enough information for +users to adjust appropriately for the specific version they are using. + +While deep links in to the python.org documentation may occasionally break +within the Python 2 series, this is very rare. + +Migrating to Python 3 is a very different matter. Many links would break due +to renames and removals, and the "version added" and "version changed" +information for the Python 2 series is completely absent. + + +Don't Break Useful Resources +---------------------------- + +There are many useful Python resources out there, such as the mailing list +archives on python.org and question-and-answer sites like Stack Overflow, +where links are highly unlikely to be updated, no matter how much notice +is provided. + +Old posts and answers to questions all currently link to docs.python.org +expecting to get the Python 2 documentation at unqualified URLs. Links from +answers that relate to Python 3 are explicitly qualified with ``/py3k/`` in +the path component. + + +Proposal +======== + +This PEP (based on an idea originally put forward back in May [4_]) is to +*not migrate* the Python 2 specific deep links at all, and instead adopt a +scheme where all URLs presented to users on docs.python.org are qualified +appropriately with the relevant release series. + +Visitors to the root URL at ``http://docs.python.org`` would be automatically +redirected to ``http://docs.python.org/3/``, but links deeper in +the version-specific hierarchy, such as to +``http://docs.python.org/library/os``, would instead be redirected to +a Python 2 specific link such as ``http://docs.python.org/2/library/os``. + +The specific subpaths which would be remapped to explicitly qualified +paths for the Python 2 docs are: + +* ``/c-api/`` +* ``/distutils/`` +* ``/extending/`` +* ``/faq/`` +* ``/howto/`` +* ``/library/`` +* ``/reference/`` +* ``/tutorial/`` +* ``/using/`` +* ``/whatsnew/`` +* ``/about.html`` +* ``/bugs.html`` +* ``/contents.html`` +* ``/copyright.html`` +* ``/license.html`` +* ``/genindex.html`` +* ``/glossary.html`` +* ``/py-modindex.html`` +* ``/search.html`` + +The existing ``/py3k/`` subpath would be remapped to the new ``/3/`` subpath. + + +Presented URLs +-------------- + +With this scheme, the following URLs would be presented to users after +resolution of any aliasing and rewriting rules: + +* ``http://docs.python.org/x/*`` +* ``http://docs.python.org/x.y/*`` +* ``http://docs.python.org/release/x.y.z/*`` +* ``http://docs.python.org/devguide`` + +The ``/x/`` URLs mean "give me the latest documentation for this release +series``. Differences relative to previous versions in the release series +will be available through "version added" and "version changed" markers. + +The ``/x.y/`` URLs mean "give me the latest documentation for this release". +It differs from the status quo in that the URLs will actually remain +available in the user's browser for easy copy and pasting. (Currently, +references to specific versions that are not the latest in their release +series will resolve to a stable URL for a specific maintenance version in +the "release" hierarchy, while the current latest version in the release +series resolves to the release series URL. This makes it hard to get a +"latest version specific URL", since it is always necessary to construct +them manually). + + +Rationale +========= + +There is some desire to switch the unqualified references to mean Python 3 +as a sign of confidence in Python 3. Such a move would either break a lot of +things, or else involve an awful lot of work to *avoid* breaking things. + +I believe we can get much the same effect without breaking the world by: + +1. Deprecating the use of unqualified references to the online + documentation (while promising to preserve the meaning of such + references indefinitely) +2. Updating all python.org and python-dev controlled links to use + qualified references (excluding archived email) +3. Redirecting visitors to the root of ``http://docs.python.org`` to + ``http://docs.python.org/3.x`` + +Most importantly, because this scheme doesn't alter the behaviour of any +existing deep links, it could be implemented with a significantly shorter +warning period than would be required for a scheme that risked breaking +deep links, or started to redirect unqualified links to Python 3. The +only part of the scheme which would require any warning at all is the +step of redirecting the "http://docs.python.org/" landing page to the +Python 3.3 documentation. + +Namespaces are one honking great idea - let's do more of those. + + +Implementation +============== + +The URLs on docs.python.org are controlled by the python.org infrastructure +team rather than through the CPython source repo, so acceptance and +implementation of the ideas in this PEP will be up to the team. + + +References +========== + +.. [1] May 2012 discussion + (http://mail.python.org/pipermail/python-dev/2012-May/119524.html) + +.. [2] October 2012 discussion + (http://mail.python.org/pipermail/python-ideas/2012-October/017406.html) + +.. [3] Issue for easier access to other version of the same docs page + (http://bugs.python.org/issue8040) + +.. [4] Using a "/latest/" path prefix + (http://mail.python.org/pipermail/python-dev/2012-May/119567.html) + + +Copyright +=========== +This document has been placed in the public domain. -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sat Oct 27 18:18:47 2012 From: python-checkins at python.org (eric.araujo) Date: Sat, 27 Oct 2012 18:18:47 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?distutils2=3A_Fix_stringification_of_?= =?utf-8?q?final_versions_=28=2316107=29=2E?= Message-ID: <3XpnLv1WfSzQxs@mail.python.org> http://hg.python.org/distutils2/rev/6e98237abde9 changeset: 1352:6e98237abde9 parent: 1350:747eec42e7ae user: ?ric Araujo date: Sat Oct 27 11:58:05 2012 -0400 summary: Fix stringification of final versions (#16107). Report and patch by Richard Jones. files: CHANGES.txt | 1 + CONTRIBUTORS.txt | 1 + distutils2/tests/test_version.py | 4 +++- distutils2/version.py | 3 +++ 4 files changed, 8 insertions(+), 1 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,7 @@ - #10374: Recreate scripts everytime build_scripts is called [pierre paul] - #14733: Have pysetup read setup.cfg early enough to find custom commands [?ric, janusz] +- #16107: Fix trailing '.z' in str('1.0.post1') result [richard] 1.0a4 - 2012-03-13 ------------------ diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -42,6 +42,7 @@ - Preston Holmes - Christian Hudon - Julien Jehannet +- Richard Jones - Jeremy Kloth - Amos Latteier - Mathieu Leduc-Hamel diff --git a/distutils2/tests/test_version.py b/distutils2/tests/test_version.py --- a/distutils2/tests/test_version.py +++ b/distutils2/tests/test_version.py @@ -21,7 +21,9 @@ (V('1.2.3.4.0b3', drop_trailing_zeros=True), '1.2.3.4b3'), (V('1.2.0.0.0', drop_trailing_zeros=True), '1.2'), (V('1.0.dev345'), '1.0.dev345'), - (V('1.0.post456.dev623'), '1.0.post456.dev623')) + (V('1.0.post456.dev623'), '1.0.post456.dev623'), + (V('1.0.post1'), '1.0.post1'), + ) def test_repr(self): diff --git a/distutils2/version.py b/distutils2/version.py --- a/distutils2/version.py +++ b/distutils2/version.py @@ -174,6 +174,9 @@ if postdev and postdev is not _FINAL_MARKER: if postdev[0] == _FINAL_MARKER[0]: postdev = postdev[1:] + # remove trailing '.z' + if postdev[-1] == _FINAL_MARKER[0]: + postdev = postdev[:-1] i = 0 while i < len(postdev): if i % 2 == 0: -- Repository URL: http://hg.python.org/distutils2 From python-checkins at python.org Sat Oct 27 18:37:17 2012 From: python-checkins at python.org (eric.araujo) Date: Sat, 27 Oct 2012 18:37:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?distutils2=3A_Fix_link_in_README_=28?= =?utf-8?q?=2315957=29=2E__Patch_by_Cliff_Dyer=2E?= Message-ID: <3XpnmF1ZKFzR7q@mail.python.org> http://hg.python.org/distutils2/rev/421e74040326 changeset: 1353:421e74040326 user: ?ric Araujo date: Sat Oct 27 12:37:04 2012 -0400 summary: Fix link in README (#15957). Patch by Cliff Dyer. files: README.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -26,7 +26,7 @@ distutils2), all modules, classes and functions have the same name. If you want to contribute, please have a look at DEVNOTES.txt or -http://wiki.python.org/Distutils2/Contributing . +http://wiki.python.org/moin/Distutils2/Contributing . Beware that Distutils2 is still in alpha stage and its API is subject to change. It should be not used for critical deployments. That said, it -- Repository URL: http://hg.python.org/distutils2 From python-checkins at python.org Sat Oct 27 19:20:46 2012 From: python-checkins at python.org (eric.araujo) Date: Sat, 27 Oct 2012 19:20:46 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?distutils2_=28merge_default_-=3E_pyth?= =?utf-8?q?on3=29=3A_Merge_fixes_for_=2316107_and_=2315957_from_default?= Message-ID: <3XppkQ3ls7zN6x@mail.python.org> http://hg.python.org/distutils2/rev/d328dcd07449 changeset: 1354:d328dcd07449 branch: python3 parent: 1351:0291648eb2b2 parent: 1353:421e74040326 user: ?ric Araujo date: Sat Oct 27 13:20:29 2012 -0400 summary: Merge fixes for #16107 and #15957 from default files: CHANGES.txt | 1 + CONTRIBUTORS.txt | 1 + README.txt | 2 +- distutils2/tests/test_version.py | 4 +++- distutils2/version.py | 3 +++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,7 @@ - #10374: Recreate scripts everytime build_scripts is called [pierre paul] - #14733: Have pysetup read setup.cfg early enough to find custom commands [?ric, janusz] +- #16107: Fix trailing '.z' in str('1.0.post1') result [richard] 1.0a4 - 2012-03-13 ------------------ diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -42,6 +42,7 @@ - Preston Holmes - Christian Hudon - Julien Jehannet +- Richard Jones - Jeremy Kloth - Amos Latteier - Mathieu Leduc-Hamel diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -26,7 +26,7 @@ distutils2), all modules, classes and functions have the same name. If you want to contribute, please have a look at DEVNOTES.txt or -http://wiki.python.org/Distutils2/Contributing . +http://wiki.python.org/moin/Distutils2/Contributing . Beware that Distutils2 is still in alpha stage and its API is subject to change. It should be not used for critical deployments. That said, it diff --git a/distutils2/tests/test_version.py b/distutils2/tests/test_version.py --- a/distutils2/tests/test_version.py +++ b/distutils2/tests/test_version.py @@ -21,7 +21,9 @@ (V('1.2.3.4.0b3', drop_trailing_zeros=True), '1.2.3.4b3'), (V('1.2.0.0.0', drop_trailing_zeros=True), '1.2'), (V('1.0.dev345'), '1.0.dev345'), - (V('1.0.post456.dev623'), '1.0.post456.dev623')) + (V('1.0.post456.dev623'), '1.0.post456.dev623'), + (V('1.0.post1'), '1.0.post1'), + ) def test_repr(self): diff --git a/distutils2/version.py b/distutils2/version.py --- a/distutils2/version.py +++ b/distutils2/version.py @@ -174,6 +174,9 @@ if postdev and postdev is not _FINAL_MARKER: if postdev[0] == _FINAL_MARKER[0]: postdev = postdev[1:] + # remove trailing '.z' + if postdev[-1] == _FINAL_MARKER[0]: + postdev = postdev[:-1] i = 0 while i < len(postdev): if i % 2 == 0: -- Repository URL: http://hg.python.org/distutils2 From python-checkins at python.org Sat Oct 27 19:38:09 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 19:38:09 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1MDQzOiBJbXBy?= =?utf-8?q?ove_test=5Fgdb_support_of_gdb_=3E=3D_7=2E4=2E?= Message-ID: <3Xpq6T2SlTzPZ0@mail.python.org> http://hg.python.org/cpython/rev/b71cda2f48c6 changeset: 79963:b71cda2f48c6 branch: 3.2 parent: 79957:5e71f2712076 user: R David Murray date: Sat Oct 27 13:22:41 2012 -0400 summary: #15043: Improve test_gdb support of gdb >= 7.4. Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test. files: Lib/test/test_gdb.py | 84 +++++++++++++++++-------------- 1 files changed, 46 insertions(+), 38 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -19,39 +19,57 @@ # This is what "no gdb" looks like. There may, however, be other # errors that manifest this way too. raise unittest.SkipTest("Couldn't find gdb on the path") -gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.", gdb_version) -if int(gdb_version_number.group(1)) < 7: +gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d)", gdb_version) +gdb_major_version = int(gdb_version_number.group(1)) +gdb_minor_version = int(gdb_version_number.group(2)) +if gdb_major_version < 7: raise unittest.SkipTest("gdb versions before 7.0 didn't support python embedding" " Saw:\n" + gdb_version.decode('ascii', 'replace')) +# Location of custom hooks file in a repository checkout. +checkout_hook_path = os.path.join(os.path.dirname(sys.executable), + 'python-gdb.py') + +def run_gdb(*args, **env_vars): + """Runs gdb in --batch mode with the additional arguments given by *args. + + Returns its (stdout, stderr) decoded from utf-8 using the replace handler. + """ + if env_vars: + env = os.environ.copy() + env.update(env_vars) + else: + env = None + base_cmd = ('gdb', '--batch') + if (gdb_major_version, gdb_minor_version) >= (7, 4): + base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path) + out, err = subprocess.Popen(base_cmd + args, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, + ).communicate() + return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace') + # Verify that "gdb" was built with the embedded python support enabled: -cmd = "--eval-command=python import sys; print sys.version_info" -p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) -gdbpy_version, _ = p.communicate() -if gdbpy_version == b'': +gdbpy_version, _ = run_gdb("--eval-command=python import sys; print sys.version_info") +if not gdbpy_version: raise unittest.SkipTest("gdb not built with embedded python support") -# Verify that "gdb" can load our custom hooks -p = subprocess.Popen(["gdb", "--batch", cmd, - "--args", sys.executable], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) -__, gdbpy_errors = p.communicate() -if b"auto-loading has been declined" in gdbpy_errors: - msg = "gdb security settings prevent use of custom hooks: %s" - raise unittest.SkipTest(msg % gdbpy_errors) +# Verify that "gdb" can load our custom hooks. In theory this should never +# fail, but we don't handle the case of the hooks file not existing if the +# tests are run from an installed Python (we'll produce failures in that case). +cmd = ['--args', sys.executable] +_, gdbpy_errors = run_gdb('--args', sys.executable) +if "auto-loading has been declined" in gdbpy_errors: + msg = "gdb security settings prevent use of custom hooks: " + raise unittest.SkipTest(msg + gdbpy_errors.rstrip()) def gdb_has_frame_select(): # Does this build of gdb have gdb.Frame.select ? - cmd = "--eval-command=python print(dir(gdb.Frame))" - p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) - stdout, _ = p.communicate() - m = re.match(br'.*\[(.*)\].*', stdout) + stdout, _ = run_gdb("--eval-command=python print(dir(gdb.Frame))") + m = re.match(r'.*\[(.*)\].*', stdout) if not m: raise unittest.SkipTest("Unable to parse output from gdb.Frame.select test") - gdb_frame_dir = m.group(1).split(b', ') - return b"'select'" in gdb_frame_dir + gdb_frame_dir = m.group(1).split(', ') + return "'select'" in gdb_frame_dir HAS_PYUP_PYDOWN = gdb_has_frame_select() @@ -61,21 +79,6 @@ """Test that the debugger can debug Python.""" - def run_gdb(self, *args, **env_vars): - """Runs gdb with the command line given by *args. - - Returns its stdout, stderr - """ - if env_vars: - env = os.environ.copy() - env.update(env_vars) - else: - env = None - out, err = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, - ).communicate() - return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace') - def get_stack_trace(self, source=None, script=None, breakpoint=BREAKPOINT_FN, cmds_after_breakpoint=None, @@ -132,7 +135,7 @@ # print ' '.join(args) # Use "args" to invoke gdb, capturing stdout, stderr: - out, err = self.run_gdb(*args, PYTHONHASHSEED='0') + out, err = run_gdb(*args, PYTHONHASHSEED='0') # Ignore some noise on stderr due to the pending breakpoint: err = err.replace('Function "%s" not defined.\n' % breakpoint, '') @@ -149,6 +152,11 @@ 'Do you need "set solib-search-path" or ' '"set sysroot"?\n', '') + err = err.replace('warning: Could not load shared library symbols for ' + 'linux-gate.so.1.\n' + 'Do you need "set solib-search-path" or ' + '"set sysroot"?\n', + '') # Ensure no unexpected error messages: self.assertEqual(err, '') -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 19:38:10 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 19:38:10 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_=2315043=3A_Improve_test=5Fgdb_support_of_gdb_=3E=3D_7?= =?utf-8?b?LjQu?= Message-ID: <3Xpq6V63lWzPbg@mail.python.org> http://hg.python.org/cpython/rev/6f064689b8c0 changeset: 79964:6f064689b8c0 branch: 3.3 parent: 79961:1bccec4ff980 parent: 79963:b71cda2f48c6 user: R David Murray date: Sat Oct 27 13:26:14 2012 -0400 summary: merge #15043: Improve test_gdb support of gdb >= 7.4. Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test. files: Lib/test/test_gdb.py | 82 +++++++++++++++++-------------- 1 files changed, 44 insertions(+), 38 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -26,42 +26,58 @@ # This is what "no gdb" looks like. There may, however, be other # errors that manifest this way too. raise unittest.SkipTest("Couldn't find gdb on the path") -gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.", gdb_version) -if int(gdb_version_number.group(1)) < 7: +gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d)", gdb_version) +gdb_major_version = int(gdb_version_number.group(1)) +gdb_minor_version = int(gdb_version_number.group(2)) +if gdb_major_version < 7: raise unittest.SkipTest("gdb versions before 7.0 didn't support python embedding" " Saw:\n" + gdb_version.decode('ascii', 'replace')) if not sysconfig.is_python_build(): raise unittest.SkipTest("test_gdb only works on source builds at the moment.") +# Location of custom hooks file in a repository checkout. +checkout_hook_path = os.path.join(os.path.dirname(sys.executable), + 'python-gdb.py') + +def run_gdb(*args, **env_vars): + """Runs gdb in --batch mode with the additional arguments given by *args. + + Returns its (stdout, stderr) decoded from utf-8 using the replace handler. + """ + if env_vars: + env = os.environ.copy() + env.update(env_vars) + else: + env = None + base_cmd = ('gdb', '--batch') + if (gdb_major_version, gdb_minor_version) >= (7, 4): + base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path) + out, err = subprocess.Popen(base_cmd + args, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, + ).communicate() + return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace') + # Verify that "gdb" was built with the embedded python support enabled: -cmd = "--eval-command=python import sys; print sys.version_info" -p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) -gdbpy_version, _ = p.communicate() -if gdbpy_version == b'': +gdbpy_version, _ = run_gdb("--eval-command=python import sys; print sys.version_info") +if not gdbpy_version: raise unittest.SkipTest("gdb not built with embedded python support") -# Verify that "gdb" can load our custom hooks -p = subprocess.Popen(["gdb", "--batch", cmd, - "--args", sys.executable], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) -__, gdbpy_errors = p.communicate() -if b"auto-loading has been declined" in gdbpy_errors: - msg = "gdb security settings prevent use of custom hooks: %s" - raise unittest.SkipTest(msg % gdbpy_errors) +# Verify that "gdb" can load our custom hooks. In theory this should never fail. +cmd = ['--args', sys.executable] +_, gdbpy_errors = run_gdb('--args', sys.executable) +if "auto-loading has been declined" in gdbpy_errors: + msg = "gdb security settings prevent use of custom hooks: " + raise unittest.SkipTest(msg + gdbpy_errors.rstrip()) def gdb_has_frame_select(): # Does this build of gdb have gdb.Frame.select ? - cmd = "--eval-command=python print(dir(gdb.Frame))" - p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) - stdout, _ = p.communicate() - m = re.match(br'.*\[(.*)\].*', stdout) + stdout, _ = run_gdb("--eval-command=python print(dir(gdb.Frame))") + m = re.match(r'.*\[(.*)\].*', stdout) if not m: raise unittest.SkipTest("Unable to parse output from gdb.Frame.select test") - gdb_frame_dir = m.group(1).split(b', ') - return b"'select'" in gdb_frame_dir + gdb_frame_dir = m.group(1).split(', ') + return "'select'" in gdb_frame_dir HAS_PYUP_PYDOWN = gdb_has_frame_select() @@ -71,21 +87,6 @@ """Test that the debugger can debug Python.""" - def run_gdb(self, *args, **env_vars): - """Runs gdb with the command line given by *args. - - Returns its stdout, stderr - """ - if env_vars: - env = os.environ.copy() - env.update(env_vars) - else: - env = None - out, err = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, - ).communicate() - return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace') - def get_stack_trace(self, source=None, script=None, breakpoint=BREAKPOINT_FN, cmds_after_breakpoint=None, @@ -142,7 +143,7 @@ # print ' '.join(args) # Use "args" to invoke gdb, capturing stdout, stderr: - out, err = self.run_gdb(*args, PYTHONHASHSEED='0') + out, err = run_gdb(*args, PYTHONHASHSEED='0') # Ignore some noise on stderr due to the pending breakpoint: err = err.replace('Function "%s" not defined.\n' % breakpoint, '') @@ -159,6 +160,11 @@ 'Do you need "set solib-search-path" or ' '"set sysroot"?\n', '') + err = err.replace('warning: Could not load shared library symbols for ' + 'linux-gate.so.1.\n' + 'Do you need "set solib-search-path" or ' + '"set sysroot"?\n', + '') # Ensure no unexpected error messages: self.assertEqual(err, '') -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 19:38:12 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 19:38:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_=2315043=3A_Improve_test=5Fgdb_support_of_gdb_=3E?= =?utf-8?b?PSA3LjQu?= Message-ID: <3Xpq6X2LWCzPWx@mail.python.org> http://hg.python.org/cpython/rev/b9141239a5b4 changeset: 79965:b9141239a5b4 parent: 79962:8f0d5ecca524 parent: 79964:6f064689b8c0 user: R David Murray date: Sat Oct 27 13:36:59 2012 -0400 summary: merge #15043: Improve test_gdb support of gdb >= 7.4. Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test. files: Lib/test/test_gdb.py | 82 +++++++++++++++++-------------- 1 files changed, 44 insertions(+), 38 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -26,42 +26,58 @@ # This is what "no gdb" looks like. There may, however, be other # errors that manifest this way too. raise unittest.SkipTest("Couldn't find gdb on the path") -gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.", gdb_version) -if int(gdb_version_number.group(1)) < 7: +gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.(\d)", gdb_version) +gdb_major_version = int(gdb_version_number.group(1)) +gdb_minor_version = int(gdb_version_number.group(2)) +if gdb_major_version < 7: raise unittest.SkipTest("gdb versions before 7.0 didn't support python embedding" " Saw:\n" + gdb_version.decode('ascii', 'replace')) if not sysconfig.is_python_build(): raise unittest.SkipTest("test_gdb only works on source builds at the moment.") +# Location of custom hooks file in a repository checkout. +checkout_hook_path = os.path.join(os.path.dirname(sys.executable), + 'python-gdb.py') + +def run_gdb(*args, **env_vars): + """Runs gdb in --batch mode with the additional arguments given by *args. + + Returns its (stdout, stderr) decoded from utf-8 using the replace handler. + """ + if env_vars: + env = os.environ.copy() + env.update(env_vars) + else: + env = None + base_cmd = ('gdb', '--batch') + if (gdb_major_version, gdb_minor_version) >= (7, 4): + base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path) + out, err = subprocess.Popen(base_cmd + args, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, + ).communicate() + return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace') + # Verify that "gdb" was built with the embedded python support enabled: -cmd = "--eval-command=python import sys; print sys.version_info" -p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) -gdbpy_version, _ = p.communicate() -if gdbpy_version == b'': +gdbpy_version, _ = run_gdb("--eval-command=python import sys; print sys.version_info") +if not gdbpy_version: raise unittest.SkipTest("gdb not built with embedded python support") -# Verify that "gdb" can load our custom hooks -p = subprocess.Popen(["gdb", "--batch", cmd, - "--args", sys.executable], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) -__, gdbpy_errors = p.communicate() -if b"auto-loading has been declined" in gdbpy_errors: - msg = "gdb security settings prevent use of custom hooks: %s" - raise unittest.SkipTest(msg % gdbpy_errors) +# Verify that "gdb" can load our custom hooks. In theory this should never fail. +cmd = ['--args', sys.executable] +_, gdbpy_errors = run_gdb('--args', sys.executable) +if "auto-loading has been declined" in gdbpy_errors: + msg = "gdb security settings prevent use of custom hooks: " + raise unittest.SkipTest(msg + gdbpy_errors.rstrip()) def gdb_has_frame_select(): # Does this build of gdb have gdb.Frame.select ? - cmd = "--eval-command=python print(dir(gdb.Frame))" - p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) - stdout, _ = p.communicate() - m = re.match(br'.*\[(.*)\].*', stdout) + stdout, _ = run_gdb("--eval-command=python print(dir(gdb.Frame))") + m = re.match(r'.*\[(.*)\].*', stdout) if not m: raise unittest.SkipTest("Unable to parse output from gdb.Frame.select test") - gdb_frame_dir = m.group(1).split(b', ') - return b"'select'" in gdb_frame_dir + gdb_frame_dir = m.group(1).split(', ') + return "'select'" in gdb_frame_dir HAS_PYUP_PYDOWN = gdb_has_frame_select() @@ -71,21 +87,6 @@ """Test that the debugger can debug Python.""" - def run_gdb(self, *args, **env_vars): - """Runs gdb with the command line given by *args. - - Returns its stdout, stderr - """ - if env_vars: - env = os.environ.copy() - env.update(env_vars) - else: - env = None - out, err = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, - ).communicate() - return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace') - def get_stack_trace(self, source=None, script=None, breakpoint=BREAKPOINT_FN, cmds_after_breakpoint=None, @@ -142,7 +143,7 @@ # print ' '.join(args) # Use "args" to invoke gdb, capturing stdout, stderr: - out, err = self.run_gdb(*args, PYTHONHASHSEED='0') + out, err = run_gdb(*args, PYTHONHASHSEED='0') # Ignore some noise on stderr due to the pending breakpoint: err = err.replace('Function "%s" not defined.\n' % breakpoint, '') @@ -159,6 +160,11 @@ 'Do you need "set solib-search-path" or ' '"set sysroot"?\n', '') + err = err.replace('warning: Could not load shared library symbols for ' + 'linux-gate.so.1.\n' + 'Do you need "set solib-search-path" or ' + '"set sysroot"?\n', + '') # Ensure no unexpected error messages: self.assertEqual(err, '') -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 19:48:08 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 19:48:08 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1MDQzOiBJbXBy?= =?utf-8?q?ove_test=5Fgdb_support_of_gdb_=3E=3D_7=2E4=2E?= Message-ID: <3XpqL0545QzPV6@mail.python.org> http://hg.python.org/cpython/rev/1b1ead5cecae changeset: 79966:1b1ead5cecae branch: 2.7 parent: 79960:3fb84c1da8c5 user: R David Murray date: Sat Oct 27 13:47:49 2012 -0400 summary: #15043: Improve test_gdb support of gdb >= 7.4. Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test. files: Lib/test/test_gdb.py | 77 +++++++++++++++++-------------- 1 files changed, 42 insertions(+), 35 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -19,27 +19,47 @@ # This is what "no gdb" looks like. There may, however, be other # errors that manifest this way too. raise unittest.SkipTest("Couldn't find gdb on the path") -gdb_version_number = re.search(r"^GNU gdb [^\d]*(\d+)\.", gdb_version) -if int(gdb_version_number.group(1)) < 7: +gdb_version_number = re.search("^GNU gdb [^\d]*(\d+)\.(\d)", gdb_version) +gdb_major_version = int(gdb_version_number.group(1)) +gdb_minor_version = int(gdb_version_number.group(2)) +if gdb_major_version < 7: raise unittest.SkipTest("gdb versions before 7.0 didn't support python embedding" " Saw:\n" + gdb_version) +# Location of custom hooks file in a repository checkout. +checkout_hook_path = os.path.join(os.path.dirname(sys.executable), + 'python-gdb.py') + +def run_gdb(*args, **env_vars): + """Runs gdb in --batch mode with the additional arguments given by *args. + + Returns its (stdout, stderr) + """ + if env_vars: + env = os.environ.copy() + env.update(env_vars) + else: + env = None + base_cmd = ('gdb', '--batch') + if (gdb_major_version, gdb_minor_version) >= (7, 4): + base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path) + out, err = subprocess.Popen(base_cmd + args, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, + ).communicate() + return out, err + # Verify that "gdb" was built with the embedded python support enabled: -cmd = "--eval-command=python import sys; print sys.version_info" -p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) -gdbpy_version, _ = p.communicate() -if gdbpy_version == '': +gdbpy_version, _ = run_gdb("--eval-command=python import sys; print sys.version_info") +if not gdbpy_version: raise unittest.SkipTest("gdb not built with embedded python support") -# Verify that "gdb" can load our custom hooks -p = subprocess.Popen(["gdb", "--batch", cmd, - "--args", sys.executable], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) -__, gdbpy_errors = p.communicate() -if b"auto-loading has been declined" in gdbpy_errors: - msg = "gdb security settings prevent use of custom hooks: %s" - raise unittest.SkipTest(msg % gdbpy_errors) +# Verify that "gdb" can load our custom hooks. In theory this should never +# fail, but we don't handle the case of the hooks file not existing if the +# tests are run from an installed Python (we'll produce failures in that case). +cmd = ['--args', sys.executable] +_, gdbpy_errors = run_gdb('--args', sys.executable) +if "auto-loading has been declined" in gdbpy_errors: + msg = "gdb security settings prevent use of custom hooks: " def python_is_optimized(): cflags = sysconfig.get_config_vars()['PY_CFLAGS'] @@ -51,10 +71,7 @@ def gdb_has_frame_select(): # Does this build of gdb have gdb.Frame.select ? - cmd = "--eval-command=python print(dir(gdb.Frame))" - p = subprocess.Popen(["gdb", "--batch", cmd], - stdout=subprocess.PIPE) - stdout, _ = p.communicate() + stdout, _ = run_gdb("--eval-command=python print(dir(gdb.Frame))") m = re.match(r'.*\[(.*)\].*', stdout) if not m: raise unittest.SkipTest("Unable to parse output from gdb.Frame.select test") @@ -67,21 +84,6 @@ """Test that the debugger can debug Python.""" - def run_gdb(self, *args, **env_vars): - """Runs gdb with the command line given by *args. - - Returns its stdout, stderr - """ - if env_vars: - env = os.environ.copy() - env.update(env_vars) - else: - env = None - out, err = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env - ).communicate() - return out, err - def get_stack_trace(self, source=None, script=None, breakpoint='PyObject_Print', cmds_after_breakpoint=None, @@ -138,7 +140,7 @@ # print ' '.join(args) # Use "args" to invoke gdb, capturing stdout, stderr: - out, err = self.run_gdb(*args, PYTHONHASHSEED='0') + out, err = run_gdb(*args, PYTHONHASHSEED='0') # Ignore some noise on stderr due to the pending breakpoint: err = err.replace('Function "%s" not defined.\n' % breakpoint, '') @@ -155,6 +157,11 @@ 'Do you need "set solib-search-path" or ' '"set sysroot"?\n', '') + err = err.replace('warning: Could not load shared library symbols for ' + 'linux-gate.so.1.\n' + 'Do you need "set solib-search-path" or ' + '"set sysroot"?\n', + '') # Ensure no unexpected error messages: self.assertEqual(err, '') -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 19:50:51 2012 From: python-checkins at python.org (eric.araujo) Date: Sat, 27 Oct 2012 19:50:51 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?distutils2=3A_Update_Trove_classifier?= =?utf-8?q?s?= Message-ID: <3XpqP76ZKyzMkg@mail.python.org> http://hg.python.org/distutils2/rev/65e23cccd0db changeset: 1355:65e23cccd0db parent: 1353:421e74040326 user: ?ric Araujo date: Sat Oct 27 13:50:39 2012 -0400 summary: Update Trove classifiers files: distutils2/_trove.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/distutils2/_trove.py b/distutils2/_trove.py --- a/distutils2/_trove.py +++ b/distutils2/_trove.py @@ -24,6 +24,7 @@ 'Environment :: MacOS X :: Carbon', 'Environment :: MacOS X :: Cocoa', 'Environment :: No Input/Output (Daemon)', +'Environment :: OpenStack', 'Environment :: Other Environment', 'Environment :: Plugins', 'Environment :: Web Environment', @@ -54,6 +55,7 @@ 'Framework :: Plone :: 4.2', 'Framework :: Plone :: 4.3', 'Framework :: Pylons', +'Framework :: Pyramid', 'Framework :: Setuptools Plugin', 'Framework :: Trac', 'Framework :: Tryton', @@ -102,8 +104,17 @@ 'License :: OSI Approved :: European Union Public Licence 1.0 (EUPL 1.0)', 'License :: OSI Approved :: European Union Public Licence 1.1 (EUPL 1.1)', 'License :: OSI Approved :: GNU Affero General Public License v3', +'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'License :: OSI Approved :: GNU Free Documentation License (FDL)', 'License :: OSI Approved :: GNU General Public License (GPL)', +'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', +'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)', +'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', +'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', +'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)', +'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)', +'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)', +'License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', 'License :: OSI Approved :: IBM Public License', 'License :: OSI Approved :: Intel Open Source License', -- Repository URL: http://hg.python.org/distutils2 From python-checkins at python.org Sat Oct 27 19:55:12 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 19:55:12 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?devguide=3A_This_is_no_longer_needed?= =?utf-8?q?=2C_the_path_is_now_automatically_added_by_the_test=2E?= Message-ID: <3XpqV80r2GzMlb@mail.python.org> http://hg.python.org/devguide/rev/ae2ed4a675cb changeset: 561:ae2ed4a675cb user: R David Murray date: Sat Oct 27 13:53:32 2012 -0400 summary: This is no longer needed, the path is now automatically added by the test. files: faq.rst | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -925,14 +925,3 @@ If the system copy of Autoconf does not match this version, you will need to install your own copy of Autoconf. - - -How do I update my auto-load-safe-path to allow test_gdb to run? ----------------------------------------------------------------- - -If ``test_gdb`` is being skipped with an "auto-loading has been declined" -message, then it is necessary to identify any Python build directories as -auto-load safe. One way to achieve this is to add a line like the following -to ``~/.gdbinit`` (edit the specific list of paths as appropriate):: - - add-auto-load-safe-path ~/devel/py3k:~/devel/py32:~/devel/py27 -- Repository URL: http://hg.python.org/devguide From python-checkins at python.org Sat Oct 27 20:06:00 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 20:06:00 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Include_mentio?= =?utf-8?q?n_of_jenkins_as_an_example_framework_for_doing_CI?= Message-ID: <3Xpqkc0s9vzPCN@mail.python.org> http://hg.python.org/cpython/rev/c5304a04332c changeset: 79967:c5304a04332c branch: 3.2 parent: 79957:5e71f2712076 user: Senthil Kumaran date: Sat Oct 27 11:04:55 2012 -0700 summary: Include mention of jenkins as an example framework for doing CI files: Doc/library/unittest.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -99,9 +99,10 @@ The script :file:`Tools/unittestgui/unittestgui.py` in the Python source distribution is a GUI tool for test discovery and execution. This is intended largely for ease of use - for those new to unit testing. For production environments it is recommended that - tests be driven by a continuous integration system such as `Hudson `_ - or `Buildbot `_. + for those new to unit testing. For production environments it is + recommended that tests be driven by a continuous integration system such as + `Buildbot `_, `Jenkins `_ + or `Hudson `_. .. _unittest-minimal-example: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:06:01 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 20:06:01 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_Automated_merge_with_file=3A///home/vagrant/3=2E3?= Message-ID: <3Xpqkd3F91zPQf@mail.python.org> http://hg.python.org/cpython/rev/5b1331857cbf changeset: 79968:5b1331857cbf branch: 3.2 parent: 79963:b71cda2f48c6 parent: 79967:c5304a04332c user: Senthil Kumaran date: Sat Oct 27 11:05:02 2012 -0700 summary: Automated merge with file:///home/vagrant/3.3 files: Doc/library/unittest.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -99,9 +99,10 @@ The script :file:`Tools/unittestgui/unittestgui.py` in the Python source distribution is a GUI tool for test discovery and execution. This is intended largely for ease of use - for those new to unit testing. For production environments it is recommended that - tests be driven by a continuous integration system such as `Hudson `_ - or `Buildbot `_. + for those new to unit testing. For production environments it is + recommended that tests be driven by a continuous integration system such as + `Buildbot `_, `Jenkins `_ + or `Hudson `_. .. _unittest-minimal-example: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:06:02 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 20:06:02 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_from_3=2E2?= Message-ID: <3Xpqkf5M1czPWS@mail.python.org> http://hg.python.org/cpython/rev/7e936687fe87 changeset: 79969:7e936687fe87 branch: 3.3 parent: 79964:6f064689b8c0 parent: 79968:5b1331857cbf user: Senthil Kumaran date: Sat Oct 27 11:05:32 2012 -0700 summary: merge from 3.2 files: Doc/library/unittest.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -99,9 +99,10 @@ The script :file:`Tools/unittestgui/unittestgui.py` in the Python source distribution is a GUI tool for test discovery and execution. This is intended largely for ease of use - for those new to unit testing. For production environments it is recommended that - tests be driven by a continuous integration system such as `Hudson `_ - or `Buildbot `_. + for those new to unit testing. For production environments it is + recommended that tests be driven by a continuous integration system such as + `Buildbot `_, `Jenkins `_ + or `Hudson `_. .. _unittest-minimal-example: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:06:04 2012 From: python-checkins at python.org (senthil.kumaran) Date: Sat, 27 Oct 2012 20:06:04 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_from_3=2E3?= Message-ID: <3Xpqkh0dg5zPLx@mail.python.org> http://hg.python.org/cpython/rev/b20e473157b8 changeset: 79970:b20e473157b8 parent: 79965:b9141239a5b4 parent: 79969:7e936687fe87 user: Senthil Kumaran date: Sat Oct 27 11:05:54 2012 -0700 summary: merge from 3.3 files: Doc/library/unittest.rst | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -99,9 +99,10 @@ The script :file:`Tools/unittestgui/unittestgui.py` in the Python source distribution is a GUI tool for test discovery and execution. This is intended largely for ease of use - for those new to unit testing. For production environments it is recommended that - tests be driven by a continuous integration system such as `Hudson `_ - or `Buildbot `_. + for those new to unit testing. For production environments it is + recommended that tests be driven by a continuous integration system such as + `Buildbot `_, `Jenkins `_ + or `Hudson `_. .. _unittest-minimal-example: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:57:38 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 20:57:38 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzEyODkwOiBkb24n?= =?utf-8?q?t_emit_=3Cp=3E_tags_in_text_mode_when_logdir_specified=2E?= Message-ID: <3XprtB5NLSzPWg@mail.python.org> http://hg.python.org/cpython/rev/715e5b337c91 changeset: 79971:715e5b337c91 branch: 2.7 parent: 79966:1b1ead5cecae user: R David Murray date: Sat Oct 27 14:42:36 2012 -0400 summary: #12890: don't emit

tags in text mode when logdir specified. Patch by Jeff McNeil. files: Lib/cgitb.py | 11 ++++++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Lib/cgitb.py b/Lib/cgitb.py --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -295,14 +295,19 @@ if self.logdir is not None: suffix = ['.txt', '.html'][self.format=="html"] (fd, path) = tempfile.mkstemp(suffix=suffix, dir=self.logdir) + try: file = os.fdopen(fd, 'w') file.write(doc) file.close() - msg = '

%s contains the description of this error.' % path + msg = '%s contains the description of this error.' % path except: - msg = '

Tried to save traceback to %s, but failed.' % path - self.file.write(msg + '\n') + msg = 'Tried to save traceback to %s, but failed.' % path + + if self.format == 'html': + self.file.write('

%s

\n' % msg) + else: + self.file.write(msg + '\n') try: self.file.flush() except: pass diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -644,6 +644,7 @@ Gordon McMillan Caolan McNamara Andrew McNamara +Jeff McNeil Craig McPheeters Lambert Meertens Bill van Melle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,9 @@ Library ------- +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile(). -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:57:40 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 20:57:40 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzEyODkwOiBkb24n?= =?utf-8?q?t_emit_=3Cp=3E_tags_in_text_mode_when_logdir_specified=2E?= Message-ID: <3XprtD0VV5zPZS@mail.python.org> http://hg.python.org/cpython/rev/abbfb89055d3 changeset: 79972:abbfb89055d3 branch: 3.2 parent: 79968:5b1331857cbf user: R David Murray date: Sat Oct 27 14:42:47 2012 -0400 summary: #12890: don't emit

tags in text mode when logdir specified. Patch by Jeff McNeil. files: Lib/cgitb.py | 11 ++++++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Lib/cgitb.py b/Lib/cgitb.py --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -293,14 +293,19 @@ if self.logdir is not None: suffix = ['.txt', '.html'][self.format=="html"] (fd, path) = tempfile.mkstemp(suffix=suffix, dir=self.logdir) + try: file = os.fdopen(fd, 'w') file.write(doc) file.close() - msg = '

%s contains the description of this error.' % path + msg = '%s contains the description of this error.' % path except: - msg = '

Tried to save traceback to %s, but failed.' % path - self.file.write(msg + '\n') + msg = 'Tried to save traceback to %s, but failed.' % path + + if self.format == 'html': + self.file.write('

%s

\n' % msg) + else: + self.file.write(msg + '\n') try: self.file.flush() except: pass diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -699,6 +699,7 @@ Gordon McMillan Caolan McNamara Andrew McNamara +Jeff McNeil Craig McPheeters Lambert Meertens Bill van Melle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -132,6 +132,9 @@ Library ------- +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #16250: Fix URLError invocation with proper args. - Issue #16305: Fix a segmentation fault occurring when interrupting -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:57:41 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 20:57:41 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_=2312890=3A_don=27t_emit_=3Cp=3E_tags_in_text_mode_when_?= =?utf-8?q?logdir_specified=2E?= Message-ID: <3XprtF3qgKzPZS@mail.python.org> http://hg.python.org/cpython/rev/45764e4bb504 changeset: 79973:45764e4bb504 branch: 3.3 parent: 79969:7e936687fe87 parent: 79972:abbfb89055d3 user: R David Murray date: Sat Oct 27 14:55:25 2012 -0400 summary: merge #12890: don't emit

tags in text mode when logdir specified. Patch by Jeff McNeil. files: Lib/cgitb.py | 11 +++++++-- Lib/test/test_cgitb.py | 33 ++++++++++++++++++++++------- Misc/ACKS | 1 + Misc/NEWS | 3 ++ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/Lib/cgitb.py b/Lib/cgitb.py --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -292,14 +292,19 @@ if self.logdir is not None: suffix = ['.txt', '.html'][self.format=="html"] (fd, path) = tempfile.mkstemp(suffix=suffix, dir=self.logdir) + try: file = os.fdopen(fd, 'w') file.write(doc) file.close() - msg = '

%s contains the description of this error.' % path + msg = '%s contains the description of this error.' % path except: - msg = '

Tried to save traceback to %s, but failed.' % path - self.file.write(msg + '\n') + msg = 'Tried to save traceback to %s, but failed.' % path + + if self.format == 'html': + self.file.write('

%s

\n' % msg) + else: + self.file.write(msg + '\n') try: self.file.flush() except: pass diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py --- a/Lib/test/test_cgitb.py +++ b/Lib/test/test_cgitb.py @@ -1,7 +1,9 @@ from test.support import run_unittest +from test.script_helper import assert_python_failure, temp_dir import unittest import sys import subprocess +import tempfile import cgitb class TestCgitb(unittest.TestCase): @@ -36,16 +38,31 @@ self.assertIn("ValueError", text) self.assertIn("Hello World", text) - def test_hook(self): - proc = subprocess.Popen([sys.executable, '-c', - ('import cgitb;' - 'cgitb.enable();' - 'raise ValueError("Hello World")')], - stdout=subprocess.PIPE) - out = proc.stdout.read().decode(sys.getfilesystemencoding()) - self.addCleanup(proc.stdout.close) + def test_syshook_no_logdir_default_format(self): + with temp_dir() as tracedir: + rc, out, err = assert_python_failure( + '-c', + ('import cgitb; cgitb.enable(logdir="%s"); ' + 'raise ValueError("Hello World")') % tracedir) + out = out.decode(sys.getfilesystemencoding()) self.assertIn("ValueError", out) self.assertIn("Hello World", out) + # By default we emit HTML markup. + self.assertIn('

', out) + self.assertIn('

', out) + + def test_syshook_no_logdir_text_format(self): + # Issue 12890: we were emitting the

tag in text mode. + with temp_dir() as tracedir: + rc, out, err = assert_python_failure( + '-c', + ('import cgitb; cgitb.enable(format="text", logdir="%s"); ' + 'raise ValueError("Hello World")') % tracedir) + out = out.decode(sys.getfilesystemencoding()) + self.assertIn("ValueError", out) + self.assertIn("Hello World", out) + self.assertNotIn('

', out) + self.assertNotIn('

', out) def test_main(): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -769,6 +769,7 @@ Gordon McMillan Andrew McNamara Caolan McNamara +Jeff McNeil Craig McPheeters Lambert Meertens Bill van Melle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,9 @@ Library ------- +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #16307: Fix multiprocessing.Pool.map_async not calling its callbacks. Patch by Janne Karila. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 20:57:43 2012 From: python-checkins at python.org (r.david.murray) Date: Sat, 27 Oct 2012 20:57:43 +0200 (CEST) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_=2312890=3A_don=27t_emit_=3Cp=3E_tags_in_text_mode?= =?utf-8?q?_when_logdir_specified=2E?= Message-ID: <3XprtH07mkzPZS@mail.python.org> http://hg.python.org/cpython/rev/b21c28258d3c changeset: 79974:b21c28258d3c parent: 79970:b20e473157b8 parent: 79973:45764e4bb504 user: R David Murray date: Sat Oct 27 14:57:22 2012 -0400 summary: merge #12890: don't emit

tags in text mode when logdir specified. Patch by Jeff McNeil. files: Lib/cgitb.py | 11 +++++++-- Lib/test/test_cgitb.py | 33 ++++++++++++++++++++++------- Misc/ACKS | 1 + Misc/NEWS | 3 ++ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/Lib/cgitb.py b/Lib/cgitb.py --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -292,14 +292,19 @@ if self.logdir is not None: suffix = ['.txt', '.html'][self.format=="html"] (fd, path) = tempfile.mkstemp(suffix=suffix, dir=self.logdir) + try: file = os.fdopen(fd, 'w') file.write(doc) file.close() - msg = '

%s contains the description of this error.' % path + msg = '%s contains the description of this error.' % path except: - msg = '

Tried to save traceback to %s, but failed.' % path - self.file.write(msg + '\n') + msg = 'Tried to save traceback to %s, but failed.' % path + + if self.format == 'html': + self.file.write('

%s

\n' % msg) + else: + self.file.write(msg + '\n') try: self.file.flush() except: pass diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py --- a/Lib/test/test_cgitb.py +++ b/Lib/test/test_cgitb.py @@ -1,7 +1,9 @@ from test.support import run_unittest +from test.script_helper import assert_python_failure, temp_dir import unittest import sys import subprocess +import tempfile import cgitb class TestCgitb(unittest.TestCase): @@ -36,16 +38,31 @@ self.assertIn("ValueError", text) self.assertIn("Hello World", text) - def test_hook(self): - proc = subprocess.Popen([sys.executable, '-c', - ('import cgitb;' - 'cgitb.enable();' - 'raise ValueError("Hello World")')], - stdout=subprocess.PIPE) - out = proc.stdout.read().decode(sys.getfilesystemencoding()) - self.addCleanup(proc.stdout.close) + def test_syshook_no_logdir_default_format(self): + with temp_dir() as tracedir: + rc, out, err = assert_python_failure( + '-c', + ('import cgitb; cgitb.enable(logdir="%s"); ' + 'raise ValueError("Hello World")') % tracedir) + out = out.decode(sys.getfilesystemencoding()) self.assertIn("ValueError", out) self.assertIn("Hello World", out) + # By default we emit HTML markup. + self.assertIn('

', out) + self.assertIn('

', out) + + def test_syshook_no_logdir_text_format(self): + # Issue 12890: we were emitting the

tag in text mode. + with temp_dir() as tracedir: + rc, out, err = assert_python_failure( + '-c', + ('import cgitb; cgitb.enable(format="text", logdir="%s"); ' + 'raise ValueError("Hello World")') % tracedir) + out = out.decode(sys.getfilesystemencoding()) + self.assertIn("ValueError", out) + self.assertIn("Hello World", out) + self.assertNotIn('

', out) + self.assertNotIn('

', out) def test_main(): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -769,6 +769,7 @@ Gordon McMillan Andrew McNamara Caolan McNamara +Jeff McNeil Craig McPheeters Lambert Meertens Bill van Melle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,9 @@ Library ------- +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #16307: Fix multiprocessing.Pool.map_async not calling its callbacks. Patch by Janne Karila. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 21:12:17 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 27 Oct 2012 21:12:17 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzgwNDA6IGFkZCBh?= =?utf-8?q?_version_switcher_to_the_documentation=2E__Patch_by_Yury_Seliva?= =?utf-8?q?nov=2E?= Message-ID: <3XpsC55MyhzPGh@mail.python.org> http://hg.python.org/cpython/rev/006f9ade82f2 changeset: 79975:006f9ade82f2 branch: 2.7 parent: 79971:715e5b337c91 user: Ezio Melotti date: Sat Oct 27 22:04:56 2012 +0300 summary: #8040: add a version switcher to the documentation. Patch by Yury Selivanov. files: Doc/tools/sphinxext/layout.html | 13 +- Doc/tools/sphinxext/static/version_switch.js | 60 ++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 + 4 files changed, 75 insertions(+), 2 deletions(-) diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -2,18 +2,27 @@ {% block rootrellink %}

    • -
  • {{ shorttitle }}{{ reldelim1 }}
    • +
  • Python{{ reldelim1 }}
    • +
  • + {%- if versionswitcher is defined %} + {{ release }} + Documentation{{ reldelim1 }} + {%- else %} + {{ shorttitle }}{{ reldelim1 }} + {%- endif %} +
    • {% endblock %} {% block extrahead %} {% if not embedded %}{% endif %} + {% if versionswitcher is defined and not embedded %}{% endif %} {{ super() }} {% endblock %} {% block footer %}
    © Copyright {{ copyright|e }}.
    - The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
    Last updated on {{ last_updated|e }}. diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js new file mode 100644 --- /dev/null +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -0,0 +1,60 @@ +(function() { + 'use strict'; + + var all_versions = { + '3.4': 'dev (3.4)', + '3.3': '3.3', + '3.2': '3.2', + '2.7': '2.7', + '2.6': '2.6' + }; + + function build_select(current_version, current_release) { + var buf = [''); + return buf.join(''); + } + + function patch_url(url, new_version) { + var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//, + new_url = url.replace(url_re, '.org/' + new_version + '/'); + + if (new_url == url && !new_url.match(url_re)) { + // python 2 url without version? + new_url = url.replace(/\.org\//, '.org/' + new_version + '/'); + } + return new_url; + } + + function on_switch() { + var selected = $(this).children('option:selected').attr('value'); + + var url = window.location.href, + new_url = patch_url(url, selected); + + if (new_url != url) { + // check beforehand if url exists, else redirect to version's start page + $.get(new_url, function() { + window.location.href = new_url; + }).error(function() { + window.location.href = 'http://docs.python.org/' + selected; + }); + } + } + + $(document).ready(function() { + var select = build_select(DOCUMENTATION_OPTIONS.VERSION, + DOCUMENTATION_OPTIONS.RELEASE); + $('.version_switcher_placeholder').html(select); + $('.version_switcher_placeholder select').bind('change', on_switch); + }); +})(); diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -880,6 +880,7 @@ Barry Scott Nick Seidenman ?iga Seilnach +Yury Selivanov Fred Sells Jiwon Seo Joakim Sernbrant diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -493,6 +493,9 @@ Documentation ------------- +- Issue #8040: added a version switcher to the documentation. Patch by + Yury Selivanov. + - Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 21:12:19 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 27 Oct 2012 21:12:19 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzgwNDA6IGFkZCBh?= =?utf-8?q?_version_switcher_to_the_documentation=2E__Patch_by_Yury_Seliva?= =?utf-8?q?nov=2E?= Message-ID: <3XpsC71mjbzPSB@mail.python.org> http://hg.python.org/cpython/rev/35a2a0e166d0 changeset: 79976:35a2a0e166d0 branch: 3.2 parent: 79972:abbfb89055d3 user: Ezio Melotti date: Sat Oct 27 22:09:16 2012 +0300 summary: #8040: add a version switcher to the documentation. Patch by Yury Selivanov. files: Doc/tools/sphinxext/layout.html | 12 +- Doc/tools/sphinxext/static/version_switch.js | 60 ++++++++++ Misc/NEWS | 3 + 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -3,18 +3,26 @@
  • Python{{ reldelim1 }}
    • -
  • {{ shorttitle }}{{ reldelim1 }}
    • +
  • + {%- if versionswitcher is defined %} + {{ release }} + Documentation{{ reldelim1 }} + {%- else %} + {{ shorttitle }}{{ reldelim1 }} + {%- endif %} +
    • {% endblock %} {% block extrahead %} {% if not embedded %}{% endif %} + {% if versionswitcher is defined and not embedded %}{% endif %} {{ super() }} {% endblock %} {% block footer %}
    © Copyright {{ copyright|e }}.
    - The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
    Last updated on {{ last_updated|e }}. diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js new file mode 100644 --- /dev/null +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -0,0 +1,60 @@ +(function() { + 'use strict'; + + var all_versions = { + '3.4': 'dev (3.4)', + '3.3': '3.3', + '3.2': '3.2', + '2.7': '2.7', + '2.6': '2.6' + }; + + function build_select(current_version, current_release) { + var buf = [''); + return buf.join(''); + } + + function patch_url(url, new_version) { + var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//, + new_url = url.replace(url_re, '.org/' + new_version + '/'); + + if (new_url == url && !new_url.match(url_re)) { + // python 2 url without version? + new_url = url.replace(/\.org\//, '.org/' + new_version + '/'); + } + return new_url; + } + + function on_switch() { + var selected = $(this).children('option:selected').attr('value'); + + var url = window.location.href, + new_url = patch_url(url, selected); + + if (new_url != url) { + // check beforehand if url exists, else redirect to version's start page + $.get(new_url, function() { + window.location.href = new_url; + }).error(function() { + window.location.href = 'http://docs.python.org/' + selected; + }); + } + } + + $(document).ready(function() { + var select = build_select(DOCUMENTATION_OPTIONS.VERSION, + DOCUMENTATION_OPTIONS.RELEASE); + $('.version_switcher_placeholder').html(select); + $('.version_switcher_placeholder select').bind('change', on_switch); + }); +})(); diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -636,6 +636,9 @@ Documentation ------------- +- Issue #8040: added a version switcher to the documentation. Patch by + Yury Selivanov. + - Issue #16115: Improve subprocess.Popen() documentation around args, shell, and executable arguments. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sat Oct 27 21:12:20 2012 From: python-checkins at python.org (ezio.melotti) Date: Sat, 27 Oct 2012 21:12:20 +0200 (CEST) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_=238040=3A_merge_with_3=2E2=2E?= Message-ID: <3XpsC855YrzPSB@mail.python.org> http://hg.python.org/cpython/rev/9505a34b4484 changeset: 79977:9505a34b4484 branch: 3.3 parent: 79973:45764e4bb504 parent: 79976:35a2a0e166d0 user: Ezio Melotti date: Sat Oct 27 22:11:33 2012 +0300 summary: #8040: merge with 3.2. files: Doc/tools/sphinxext/layout.html | 10 +- Doc/tools/sphinxext/static/version_switch.js | 60 ++++++++++ Misc/NEWS | 3 + 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -3,11 +3,19 @@
  • Python{{ reldelim1 }}
    • -
  • {{ shorttitle }}{{ reldelim1 }}
    • +
  • + {%- if versionswitcher is defined %} + {{ release }} + Documentation{{ reldelim1 }} + {%- else %} + {{ shorttitle }}{{ reldelim1 }} + {%- endif %} +
    • {% endblock %} {% block extrahead %} {% if not embedded %}{% endif %} + {% if versionswitcher is defined and not embedded %}{% endif %} {% if pagename == 'whatsnew/changelog' %} {% endif %} + {% if versionswitcher is defined and not embedded %}{% endif %} {% if pagename == 'whatsnew/changelog' %} {% endif %} {{ super() }} {% endblock %} {% block footer %}
    © Copyright {{ copyright|e }}.
    - The Python Software Foundation is a non-profit corporation. + The Python Software Foundation is a non-profit corporation. Please donate.
    Last updated on {{ last_updated|e }}. diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js new file mode 100644 --- /dev/null +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -0,0 +1,66 @@ +(function() { + 'use strict'; + + var all_versions = { + '3.4': 'dev (3.4)', + '3.3': '3.3', + '3.2': '3.2', + '2.7': '2.7', + '2.6': '2.6' + }; + + function build_select(current_version, current_release) { + var buf = [''); + return buf.join(''); + } + + function patch_url(url, new_version) { + var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//, + new_url = url.replace(url_re, '.org/' + new_version + '/'); + + if (new_url == url && !new_url.match(url_re)) { + // python 2 url without version? + new_url = url.replace(/\.org\//, '.org/' + new_version + '/'); + } + return new_url; + } + + function on_switch() { + var selected = $(this).children('option:selected').attr('value'); + + var url = window.location.href, + new_url = patch_url(url, selected); + + if (new_url != url) { + // check beforehand if url exists, else redirect to version's start page + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } + }); + } + } + + $(document).ready(function() { + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); + var select = build_select(version, release); + + $('.version_switcher_placeholder').html(select); + $('.version_switcher_placeholder select').bind('change', on_switch); + }); +})(); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:05:00 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:05:00 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi42IC0+IDIuNyk6?= =?utf-8?q?_merge_with_2=2E6?= Message-ID: <3Xq91S1rD9zR8Z@mail.python.org> http://hg.python.org/cpython/rev/ee33671b2c6a changeset: 79995:ee33671b2c6a branch: 2.7 parent: 79983:7ca30af90c11 parent: 79994:4a17784f2fee user: Georg Brandl date: Sun Oct 28 08:06:11 2012 +0100 summary: merge with 2.6 files: Doc/tools/sphinxext/static/version_switch.js | 18 +++++---- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js --- a/Doc/tools/sphinxext/static/version_switch.js +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -43,19 +43,21 @@ if (new_url != url) { // check beforehand if url exists, else redirect to version's start page - $.get(new_url, function() { - window.location.href = new_url; - }).error(function() { - window.location.href = 'http://docs.python.org/' + selected; + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } }); } } $(document).ready(function() { - var version = DOCUMENTATION_OPTIONS.VERSION.split('.'), - release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION; - - version = version[0] + '.' + version[1]; + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); var select = build_select(version, release); $('.version_switcher_placeholder').html(select); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:05:30 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:05:30 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzgwNDA6IGZpeCBq?= =?utf-8?q?Query_incompatibility?= Message-ID: <3Xq9222mLVzR7s@mail.python.org> http://hg.python.org/cpython/rev/e02d49db3f5b changeset: 79996:e02d49db3f5b branch: 3.2 parent: 79989:f6d04f5cff31 user: Georg Brandl date: Sun Oct 28 07:59:42 2012 +0100 summary: #8040: fix jQuery incompatibility files: Doc/tools/sphinxext/static/version_switch.js | 18 +++++---- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js --- a/Doc/tools/sphinxext/static/version_switch.js +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -43,19 +43,21 @@ if (new_url != url) { // check beforehand if url exists, else redirect to version's start page - $.get(new_url, function() { - window.location.href = new_url; - }).error(function() { - window.location.href = 'http://docs.python.org/' + selected; + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } }); } } $(document).ready(function() { - var version = DOCUMENTATION_OPTIONS.VERSION.split('.'), - release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION; - - version = version[0] + '.' + version[1]; + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); var select = build_select(version, release); $('.version_switcher_placeholder').html(select); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:05:31 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:05:31 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_with_3=2E2?= Message-ID: <3Xq9234vXhzR8W@mail.python.org> http://hg.python.org/cpython/rev/8bde13c5277e changeset: 79997:8bde13c5277e branch: 3.3 parent: 79992:0e4574595674 parent: 79996:e02d49db3f5b user: Georg Brandl date: Sun Oct 28 07:59:54 2012 +0100 summary: merge with 3.2 files: Doc/tools/sphinxext/static/version_switch.js | 18 +++++---- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js --- a/Doc/tools/sphinxext/static/version_switch.js +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -43,19 +43,21 @@ if (new_url != url) { // check beforehand if url exists, else redirect to version's start page - $.get(new_url, function() { - window.location.href = new_url; - }).error(function() { - window.location.href = 'http://docs.python.org/' + selected; + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } }); } } $(document).ready(function() { - var version = DOCUMENTATION_OPTIONS.VERSION.split('.'), - release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION; - - version = version[0] + '.' + version[1]; + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); var select = build_select(version, release); $('.version_switcher_placeholder').html(select); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:05:32 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:05:32 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_with_3=2E3?= Message-ID: <3Xq92472T0zR96@mail.python.org> http://hg.python.org/cpython/rev/21c6175fbcb8 changeset: 79998:21c6175fbcb8 parent: 79993:57a33af85407 parent: 79997:8bde13c5277e user: Georg Brandl date: Sun Oct 28 08:00:01 2012 +0100 summary: merge with 3.3 files: Doc/tools/sphinxext/static/version_switch.js | 18 +++++---- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js --- a/Doc/tools/sphinxext/static/version_switch.js +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -43,19 +43,21 @@ if (new_url != url) { // check beforehand if url exists, else redirect to version's start page - $.get(new_url, function() { - window.location.href = new_url; - }).error(function() { - window.location.href = 'http://docs.python.org/' + selected; + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } }); } } $(document).ready(function() { - var version = DOCUMENTATION_OPTIONS.VERSION.split('.'), - release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION; - - version = version[0] + '.' + version[1]; + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); var select = build_select(version, release); $('.version_switcher_placeholder').html(select); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:07:45 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:07:45 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Add_a_autobuil?= =?utf-8?q?d-quick_target_that_only_rebuilds_HTML=2E?= Message-ID: <3Xq94d2S44zMwy@mail.python.org> http://hg.python.org/cpython/rev/7ddacd944cd6 changeset: 79999:7ddacd944cd6 branch: 2.7 parent: 79995:ee33671b2c6a user: Georg Brandl date: Sun Oct 28 08:09:02 2012 +0100 summary: Add a autobuild-quick target that only rebuilds HTML. files: Doc/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -171,6 +171,10 @@ make update make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' +# for quick rebuilds (HTML only) +autobuild-html: + make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + # for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: @case $(DISTVERSION) in *[abc]*) \ @@ -178,3 +182,4 @@ exit 1;; \ esac @make autobuild-dev + -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:08:12 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:08:12 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_a_autobuil?= =?utf-8?q?d-quick_target_that_only_rebuilds_HTML=2E?= Message-ID: <3Xq9580Pl1zMwy@mail.python.org> http://hg.python.org/cpython/rev/51f292067714 changeset: 80000:51f292067714 branch: 3.3 parent: 79997:8bde13c5277e user: Georg Brandl date: Sun Oct 28 08:09:02 2012 +0100 summary: Add a autobuild-quick target that only rebuilds HTML. files: Doc/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -187,6 +187,10 @@ make update make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' +# for quick rebuilds (HTML only) +autobuild-html: + make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + # for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: @case $(DISTVERSION) in *[abc]*) \ @@ -194,3 +198,4 @@ exit 1;; \ esac @make autobuild-dev + -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:08:13 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:08:13 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_with_3=2E3?= Message-ID: <3Xq9592bKKzMwy@mail.python.org> http://hg.python.org/cpython/rev/6de28ac08dc4 changeset: 80001:6de28ac08dc4 parent: 79998:21c6175fbcb8 parent: 80000:51f292067714 user: Georg Brandl date: Sun Oct 28 08:09:31 2012 +0100 summary: merge with 3.3 files: Doc/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -187,6 +187,10 @@ make update make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' +# for quick rebuilds (HTML only) +autobuild-html: + make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + # for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: @case $(DISTVERSION) in *[abc]*) \ @@ -194,3 +198,4 @@ exit 1;; \ esac @make autobuild-dev + -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:17:33 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:17:33 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Update_current?= =?utf-8?q?_version_of_the_=22dailybuild=22_script=2E?= Message-ID: <3Xq9Hx1yrRzR9p@mail.python.org> http://hg.python.org/cpython/rev/fa6b9bd60cce changeset: 80002:fa6b9bd60cce branch: 2.7 parent: 79999:7ddacd944cd6 user: Georg Brandl date: Sun Oct 28 08:18:52 2012 +0100 summary: Update current version of the "dailybuild" script. files: Doc/tools/dailybuild.py | 38 +++++++++++++++++----------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Doc/tools/dailybuild.py b/Doc/tools/dailybuild.py --- a/Doc/tools/dailybuild.py +++ b/Doc/tools/dailybuild.py @@ -5,12 +5,12 @@ # # Usages: # -# dailybuild.py +# dailybuild.py [-q] # # without any arguments builds docs for all branches configured in the global -# BRANCHES value. +# BRANCHES value. -q selects "quick build", which means to build only HTML. # -# dailybuild.py [-d] +# dailybuild.py [-q] [-d] # # builds one version, where is an SVN checkout directory of the # Python branch to build docs for, and is the directory where the @@ -39,21 +39,23 @@ ] -def build_one(checkout, target, isdev): +def build_one(checkout, target, isdev, quick): print 'Doc autobuild started in %s' % checkout os.chdir(checkout) print 'Running hg pull --update' os.system('/usr/local/bin/hg pull --update') print 'Running make autobuild' - if os.WEXITSTATUS(os.system( - 'cd Doc; make autobuild-%s' % (isdev and 'dev' or 'stable'))) == 2: + maketarget = 'autobuild-' + ('html' if quick else + ('dev' if isdev else 'stable')) + if os.WEXITSTATUS(os.system('cd Doc; make %s' % maketarget)) == 2: print '*' * 80 return - print 'Copying HTML files' + print 'Copying HTML files to %s' % target os.system('cp -a Doc/build/html/* %s' % target) - print 'Copying dist files' - os.system('mkdir -p %s/archives' % target) - os.system('cp -a Doc/dist/* %s/archives' % target) + if not quick: + print 'Copying dist files' + os.system('mkdir -p %s/archives' % target) + os.system('cp -a Doc/dist/* %s/archives' % target) print 'Finished' print '=' * 80 @@ -67,15 +69,21 @@ if __name__ == '__main__': try: - opts, args = getopt.getopt(sys.argv[1:], 'd') + opts, args = getopt.getopt(sys.argv[1:], 'dq') except getopt.error: usage() - if opts and not args: + quick = devel = False + for opt, _ in opts: + if opt == '-q': + quick = True + if opt == '-d': + devel = True + if devel and not args: usage() if args: if len(args) != 2: usage() - build_one(args[0], args[1], bool(opts)) + build_one(args[0], args[1], devel, quick) else: - for branch in BRANCHES: - build_one(*branch) + for checkout, dest, devel in BRANCHES: + build_one(checkout, dest, devel, quick) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 08:27:04 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:27:04 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?peps=3A_Add_version-switcheroo_stuff_?= =?utf-8?q?todos=2E?= Message-ID: <3Xq9Vw4yD8zPhH@mail.python.org> http://hg.python.org/peps/rev/4c70ba368d01 changeset: 4572:4c70ba368d01 user: Georg Brandl date: Sun Oct 28 08:28:24 2012 +0100 summary: Add version-switcheroo stuff todos. files: pep-0101.txt | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pep-0101.txt b/pep-0101.txt --- a/pep-0101.txt +++ b/pep-0101.txt @@ -397,6 +397,8 @@ ___ If this is a final release (even a maintenance release), also unpack the HTML docs to /data/ftp.python.org/pub/docs.python.org/release/X.Y.Z. + If it is a release of a security-fix-only version, tell the DE to + build a version with the "version switcher" and put it there. ___ Let the DE check if the docs are built and work all right. @@ -404,7 +406,8 @@ docs.python.org/X.Y in the Apache config for docs.python.org, update the script Doc/tools/dailybuild.py to point to the right stable/development branches, and to install it and make the initial - checkout. + checkout. The Doc's version_switcher.js script also needs to be + updated. ___ For the extra paranoid, do a completely clean test of the release. This includes downloading the tarball from -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sun Oct 28 08:47:09 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 08:47:09 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Minor_typo_fix=2E?= Message-ID: <3Xq9y572xczRBS@mail.python.org> http://hg.python.org/cpython/rev/be83cbf4a789 changeset: 80003:be83cbf4a789 parent: 80001:6de28ac08dc4 user: Georg Brandl date: Sun Oct 28 08:48:28 2012 +0100 summary: Minor typo fix. files: Include/pyport.h | 2 +- Misc/NEWS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h --- a/Include/pyport.h +++ b/Include/pyport.h @@ -866,7 +866,7 @@ #endif /* - * Convenient macros to deal with endianess of the platform. WORDS_BIGENDIAN is + * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is * detected by configure and defined in pyconfig.h. The code in pyconfig.h * also also takes care of Apple's universal builds. */ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -20,7 +20,7 @@ user that created them, even when the source file is read-only. - Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified - endianess detection and handling. + endianness detection and handling. - Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer objects. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 09:21:59 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 09:21:59 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_430_is_Final=2E?= Message-ID: <3XqBkH6G0DzMwG@mail.python.org> http://hg.python.org/peps/rev/999ce07be045 changeset: 4573:999ce07be045 user: Georg Brandl date: Sun Oct 28 09:23:18 2012 +0100 summary: PEP 430 is Final. files: pep-0430.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0430.txt b/pep-0430.txt --- a/pep-0430.txt +++ b/pep-0430.txt @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Nick Coghlan -Status: Draft +Status: Final Type: Informational Content-Type: text/x-rst Created: 27-Oct-2012 -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sun Oct 28 10:11:30 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 10:11:30 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Update_current?= =?utf-8?q?_version_of_the_=22dailybuild=22_script=2E?= Message-ID: <3XqCqQ220ZzLxC@mail.python.org> http://hg.python.org/cpython/rev/06b2a8c91ba5 changeset: 80004:06b2a8c91ba5 branch: 2.7 parent: 80002:fa6b9bd60cce user: Georg Brandl date: Sun Oct 28 10:12:47 2012 +0100 summary: Update current version of the "dailybuild" script. files: Doc/tools/dailybuild.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/tools/dailybuild.py b/Doc/tools/dailybuild.py --- a/Doc/tools/dailybuild.py +++ b/Doc/tools/dailybuild.py @@ -33,9 +33,9 @@ BRANCHES = [ # checkout, target, isdev - (BUILDROOT + '/python33', WWWROOT + '/py3k', False), - (BUILDROOT + '/python34', WWWROOT + '/dev', True), - (BUILDROOT + '/python27', WWWROOT, False), + (BUILDROOT + '/python33', WWWROOT + '/3.3', False), + (BUILDROOT + '/python34', WWWROOT + '/3.4', True), + (BUILDROOT + '/python27', WWWROOT + '/2.7', False), ] -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:12:02 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 10:12:02 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MzQw?= =?utf-8?q?=3A_exclude_venv/scripts_from_byte-compilation_at_installation_?= =?utf-8?q?time?= Message-ID: <3XqCr25vmDzLxC@mail.python.org> http://hg.python.org/cpython/rev/06a5fe86d87c changeset: 80005:06a5fe86d87c branch: 3.3 parent: 80000:51f292067714 user: Vinay Sajip date: Sun Oct 28 09:11:00 2012 +0000 summary: Issue #16340: exclude venv/scripts from byte-compilation at installation time on Windows. files: Tools/msi/msi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -415,7 +415,7 @@ ("VerdanaRed9", "Verdana", 9, 255, 0), ]) - compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests" "[TARGETDIR]Lib"' + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TARGETDIR]Lib"' lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' # See "CustomAction Table" add_data(db, "CustomAction", [ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:12:04 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 10:12:04 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316340=3A_Merged_fix_from_3=2E3=2E?= Message-ID: <3XqCr410tgzPNY@mail.python.org> http://hg.python.org/cpython/rev/e8619f015ab9 changeset: 80006:e8619f015ab9 parent: 80003:be83cbf4a789 parent: 80005:06a5fe86d87c user: Vinay Sajip date: Sun Oct 28 09:11:48 2012 +0000 summary: Issue #16340: Merged fix from 3.3. files: Tools/msi/msi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -416,7 +416,7 @@ ("VerdanaRed9", "Verdana", 9, 255, 0), ]) - compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests" "[TARGETDIR]Lib"' + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TARGETDIR]Lib"' lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' # See "CustomAction Table" add_data(db, "CustomAction", [ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:43:15 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 10:43:15 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE0NjE2?= =?utf-8?q?=3A_Mention_shlex=2Equote_in_subprocess_docs=2E?= Message-ID: <3XqDX320wfzR6S@mail.python.org> http://hg.python.org/cpython/rev/f9d11ca3ccd1 changeset: 80007:f9d11ca3ccd1 branch: 3.3 parent: 80005:06a5fe86d87c user: Andrew Svetlov date: Sun Oct 28 11:42:26 2012 +0200 summary: Issue #14616: Mention shlex.quote in subprocess docs. Patch by Chris Rebert. files: Doc/library/subprocess.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -341,6 +341,10 @@ from this vulnerability; see the Note in the :class:`Popen` constructor documentation for helpful hints in getting ``shell=False`` to work. + When using ``shell=True``, :func:`shlex.quote` can be used to properly + escape whitespace and shell metacharacters in strings that are going to + be used to construct shell commands. + These options, along with all of the other options, are described in more detail in the :class:`Popen` constructor documentation. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:43:17 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 10:43:17 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2314616=3A_Mention_shlex=2Equote_in_subproc?= =?utf-8?q?ess_docs=2E?= Message-ID: <3XqDX52XSxzR6Z@mail.python.org> http://hg.python.org/cpython/rev/72672cf5d850 changeset: 80008:72672cf5d850 parent: 80006:e8619f015ab9 parent: 80007:f9d11ca3ccd1 user: Andrew Svetlov date: Sun Oct 28 11:43:02 2012 +0200 summary: Merge issue #14616: Mention shlex.quote in subprocess docs. Patch by Chris Rebert. files: Doc/library/subprocess.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -341,6 +341,10 @@ from this vulnerability; see the Note in the :class:`Popen` constructor documentation for helpful hints in getting ``shell=False`` to work. + When using ``shell=True``, :func:`shlex.quote` can be used to properly + escape whitespace and shell metacharacters in strings that are going to + be used to construct shell commands. + These options, along with all of the other options, are described in more detail in the :class:`Popen` constructor documentation. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:48:15 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 10:48:15 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0NjE2?= =?utf-8?q?=3A_Document_pipes=2Equote_and_mention_this_one_in_subprocess_d?= =?utf-8?q?ocs=2E?= Message-ID: <3XqDdq5mW2zR6Z@mail.python.org> http://hg.python.org/cpython/rev/d9ca966cd116 changeset: 80009:d9ca966cd116 branch: 2.7 parent: 80004:06b2a8c91ba5 user: Andrew Svetlov date: Sun Oct 28 11:48:02 2012 +0200 summary: Issue #14616: Document pipes.quote and mention this one in subprocess docs. Patch by Chris Rebert. files: Doc/library/pipes.rst | 39 ++++++++++++++++++++++++- Doc/library/subprocess.rst | 4 ++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/Doc/library/pipes.rst b/Doc/library/pipes.rst --- a/Doc/library/pipes.rst +++ b/Doc/library/pipes.rst @@ -16,8 +16,6 @@ Because the module uses :program:`/bin/sh` command lines, a POSIX or compatible shell for :func:`os.system` and :func:`os.popen` is required. -The :mod:`pipes` module defines the following class: - .. class:: Template() @@ -35,6 +33,43 @@ 'HELLO WORLD' +.. function:: quote(s) + + .. deprecated:: 1.6 + Prior to Python 2.7, this function was not publicly documented. It is + finally exposed publicly in Python 3.3 as the + :func:`quote ` function in the :mod:`shlex` module. + + Return a shell-escaped version of the string *s*. The returned value is a + string that can safely be used as one token in a shell command line, for + cases where you cannot use a list. + + This idiom would be unsafe:: + + >>> filename = 'somefile; rm -rf ~' + >>> command = 'ls -l {}'.format(filename) + >>> print command # executed by a shell: boom! + ls -l somefile; rm -rf ~ + + :func:`quote` lets you plug the security hole:: + + >>> command = 'ls -l {}'.format(quote(filename)) + >>> print command + ls -l 'somefile; rm -rf ~' + >>> remote_command = 'ssh home {}'.format(quote(command)) + >>> print remote_command + ssh home 'ls -l '"'"'somefile; rm -rf ~'"'"'' + + The quoting is compatible with UNIX shells and with :func:`shlex.split`: + + >>> remote_command = shlex.split(remote_command) + >>> remote_command + ['ssh', 'home', "ls -l 'somefile; rm -rf ~'"] + >>> command = shlex.split(remote_command[-1]) + >>> command + ['ls', '-l', 'somefile; rm -rf ~'] + + .. _template-objects: Template Objects diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -256,6 +256,10 @@ from this vulnerability; see the Note in the :class:`Popen` constructor documentation for helpful hints in getting ``shell=False`` to work. + When using ``shell=True``, :func:`pipes.quote` can be used to properly + escape whitespace and shell metacharacters in strings that are going to + be used to construct shell commands. + These options, along with all of the other options, are described in more detail in the :class:`Popen` constructor documentation. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:52:05 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 10:52:05 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogY2hhbmdlc2V0OiA4?= =?utf-8?q?0007=3A49e4541f2aef?= Message-ID: <3XqDkF5xrkzR9w@mail.python.org> http://hg.python.org/cpython/rev/652286ee23f8 changeset: 80010:652286ee23f8 branch: 3.2 parent: 79996:e02d49db3f5b user: Georg Brandl date: Sun Oct 28 10:51:35 2012 +0100 summary: changeset: 80007:49e4541f2aef parent: 80003:be83cbf4a789 parent: 80006:32df036e6b75 user: Georg Brandl date: Sun Oct 28 10:50:11 2012 +0100 summary: merge with 3.3 files: Lib/test/test_urllib2net.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -156,12 +156,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "http://docs.python.org/glossary.html#glossary" + urlwith_frag = "http://docs.python.org/2/glossary.html#glossary" with support.transient_internet(urlwith_frag): req = urllib.request.Request(urlwith_frag) res = urllib.request.urlopen(req) self.assertEqual(res.geturl(), - "http://docs.python.org/glossary.html#glossary") + "http://docs.python.org/2/glossary.html#glossary") def test_custom_headers(self): url = "http://www.example.com" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:52:07 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 10:52:07 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_with_3=2E2?= Message-ID: <3XqDkH1JRDzRC6@mail.python.org> http://hg.python.org/cpython/rev/923ca6d73bad changeset: 80011:923ca6d73bad branch: 3.3 parent: 80007:f9d11ca3ccd1 parent: 80010:652286ee23f8 user: Georg Brandl date: Sun Oct 28 10:51:46 2012 +0100 summary: merge with 3.2 files: Lib/test/test_urllib2net.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -157,12 +157,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "http://docs.python.org/glossary.html#glossary" + urlwith_frag = "http://docs.python.org/2/glossary.html#glossary" with support.transient_internet(urlwith_frag): req = urllib.request.Request(urlwith_frag) res = urllib.request.urlopen(req) self.assertEqual(res.geturl(), - "http://docs.python.org/glossary.html#glossary") + "http://docs.python.org/2/glossary.html#glossary") def test_custom_headers(self): url = "http://www.example.com" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:52:08 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 10:52:08 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_with_3=2E3?= Message-ID: <3XqDkJ3QZ8zRBV@mail.python.org> http://hg.python.org/cpython/rev/1ecef550d744 changeset: 80012:1ecef550d744 parent: 80008:72672cf5d850 parent: 80011:923ca6d73bad user: Georg Brandl date: Sun Oct 28 10:51:52 2012 +0100 summary: merge with 3.3 files: Lib/test/test_urllib2net.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -157,12 +157,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "http://docs.python.org/glossary.html#glossary" + urlwith_frag = "http://docs.python.org/2/glossary.html#glossary" with support.transient_internet(urlwith_frag): req = urllib.request.Request(urlwith_frag) res = urllib.request.urlopen(req) self.assertEqual(res.geturl(), - "http://docs.python.org/glossary.html#glossary") + "http://docs.python.org/2/glossary.html#glossary") def test_custom_headers(self): url = "http://www.example.com" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 10:53:31 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 10:53:31 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogY2hhbmdlc2V0OiA4?= =?utf-8?q?0007=3A49e4541f2aef?= Message-ID: <3XqDlv1MmYzR9w@mail.python.org> http://hg.python.org/cpython/rev/d5072bb0fb20 changeset: 80013:d5072bb0fb20 branch: 2.7 parent: 80009:d9ca966cd116 user: Georg Brandl date: Sun Oct 28 10:51:35 2012 +0100 summary: changeset: 80007:49e4541f2aef parent: 80003:be83cbf4a789 parent: 80006:32df036e6b75 user: Georg Brandl date: Sun Oct 28 10:50:11 2012 +0100 summary: merge with 3.3 files: Lib/test/test_urllib2net.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -157,12 +157,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "http://docs.python.org/glossary.html#glossary" + urlwith_frag = "http://docs.python.org/2/glossary.html#glossary" with test_support.transient_internet(urlwith_frag): req = urllib2.Request(urlwith_frag) res = urllib2.urlopen(req) self.assertEqual(res.geturl(), - "http://docs.python.org/glossary.html#glossary") + "http://docs.python.org/2/glossary.html#glossary") def test_fileno(self): req = urllib2.Request("http://www.python.org") -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 11:01:07 2012 From: python-checkins at python.org (mark.dickinson) Date: Sun, 28 Oct 2012 11:01:07 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0NzAw?= =?utf-8?q?=3A_Fix_buggy_overflow_checks_for_large_precision_and_width_in?= Message-ID: <3XqDwg05h3zR0m@mail.python.org> http://hg.python.org/cpython/rev/21fb1767e185 changeset: 80014:21fb1767e185 branch: 2.7 user: Mark Dickinson date: Sun Oct 28 10:00:46 2012 +0000 summary: Issue #14700: Fix buggy overflow checks for large precision and width in new-style and old-style formatting. files: Lib/test/test_str.py | 27 +++++++++++++++++++ Lib/test/test_unicode.py | 27 +++++++++++++++++++ Misc/NEWS | 3 ++ Objects/stringlib/formatter.h | 16 ++++------ Objects/stringlib/string_format.h | 15 ++++------ Objects/stringobject.c | 4 +- Objects/unicodeobject.c | 4 +- 7 files changed, 74 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py --- a/Lib/test/test_str.py +++ b/Lib/test/test_str.py @@ -35,6 +35,18 @@ string_tests.MixinStrUnicodeUserStringTest.test_formatting(self) self.assertRaises(OverflowError, '%c'.__mod__, 0x1234) + @test_support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = "%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = "%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_conversion(self): # Make sure __str__() behaves properly class Foo0: @@ -371,6 +383,21 @@ self.assertRaises(ValueError, format, "", "-") self.assertRaises(ValueError, "{0:=s}".format, '') + def test_format_huge_precision(self): + format_string = ".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = "{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = "{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -644,6 +644,18 @@ return u'\u1234' self.assertEqual('%s' % Wrapper(), u'\u1234') + @test_support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = u"%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = u"%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_startswith_endswith_errors(self): for meth in (u'foo'.startswith, u'foo'.endswith): with self.assertRaises(UnicodeDecodeError): @@ -1556,6 +1568,21 @@ # will fail self.assertRaises(UnicodeEncodeError, "foo{0}".format, u'\u1000bar') + def test_format_huge_precision(self): + format_string = u".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = u"{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = u"{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #14700: Fix buggy overflow checks for large width and precision + in string formatting operations. + - Issue #6074: Ensure cached bytecode files can always be updated by the user that created them, even when the source file is read-only. diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -73,7 +73,7 @@ get_integer(STRINGLIB_CHAR **ptr, STRINGLIB_CHAR *end, Py_ssize_t *result) { - Py_ssize_t accumulator, digitval, oldaccumulator; + Py_ssize_t accumulator, digitval; int numdigits; accumulator = numdigits = 0; for (;;(*ptr)++, numdigits++) { @@ -83,19 +83,17 @@ if (digitval < 0) break; /* - This trick was copied from old Unicode format code. It's cute, - but would really suck on an old machine with a slow divide - implementation. Fortunately, in the normal case we do not - expect too many digits. + Detect possible overflow before it happens: + + accumulator * 10 + digitval > PY_SSIZE_T_MAX if and only if + accumulator > (PY_SSIZE_T_MAX - digitval) / 10. */ - oldaccumulator = accumulator; - accumulator *= 10; - if ((accumulator+10)/10 != oldaccumulator+1) { + if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { PyErr_Format(PyExc_ValueError, "Too many decimal digits in format string"); return -1; } - accumulator += digitval; + accumulator = accumulator * 10 + digitval; } *result = accumulator; return numdigits; diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h --- a/Objects/stringlib/string_format.h +++ b/Objects/stringlib/string_format.h @@ -197,7 +197,6 @@ { Py_ssize_t accumulator = 0; Py_ssize_t digitval; - Py_ssize_t oldaccumulator; STRINGLIB_CHAR *p; /* empty string is an error */ @@ -209,19 +208,17 @@ if (digitval < 0) return -1; /* - This trick was copied from old Unicode format code. It's cute, - but would really suck on an old machine with a slow divide - implementation. Fortunately, in the normal case we do not - expect too many digits. + Detect possible overflow before it happens: + + accumulator * 10 + digitval > PY_SSIZE_T_MAX if and only if + accumulator > (PY_SSIZE_T_MAX - digitval) / 10. */ - oldaccumulator = accumulator; - accumulator *= 10; - if ((accumulator+10)/10 != oldaccumulator+1) { + if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { PyErr_Format(PyExc_ValueError, "Too many decimal digits in format string"); return -1; } - accumulator += digitval; + accumulator = accumulator * 10 + digitval; } return accumulator; } diff --git a/Objects/stringobject.c b/Objects/stringobject.c --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -4369,7 +4369,7 @@ c = Py_CHARMASK(*fmt++); if (!isdigit(c)) break; - if ((width*10) / 10 != width) { + if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) { PyErr_SetString( PyExc_ValueError, "width too big"); @@ -4404,7 +4404,7 @@ c = Py_CHARMASK(*fmt++); if (!isdigit(c)) break; - if ((prec*10) / 10 != prec) { + if (prec > (INT_MAX - ((int)c - '0')) / 10) { PyErr_SetString( PyExc_ValueError, "prec too big"); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8394,7 +8394,7 @@ c = *fmt++; if (c < '0' || c > '9') break; - if ((width*10) / 10 != width) { + if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) { PyErr_SetString(PyExc_ValueError, "width too big"); goto onError; @@ -8427,7 +8427,7 @@ c = *fmt++; if (c < '0' || c > '9') break; - if ((prec*10) / 10 != prec) { + if (prec > (INT_MAX - ((int)c - '0')) / 10) { PyErr_SetString(PyExc_ValueError, "prec too big"); goto onError; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 11:23:29 2012 From: python-checkins at python.org (mark.dickinson) Date: Sun, 28 Oct 2012 11:23:29 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0NzAw?= =?utf-8?q?=3A_Fix_buggy_overflow_checks_for_large_precision_and_width_in?= Message-ID: <3XqFQT6S4XzRBd@mail.python.org> http://hg.python.org/cpython/rev/102df748572d changeset: 80015:102df748572d branch: 3.2 parent: 80010:652286ee23f8 user: Mark Dickinson date: Sun Oct 28 10:18:03 2012 +0000 summary: Issue #14700: Fix buggy overflow checks for large precision and width in new-style and old-style formatting. files: Lib/test/test_unicode.py | 27 +++++++++++++++++++ Misc/NEWS | 3 ++ Objects/stringlib/formatter.h | 16 ++++------ Objects/stringlib/string_format.h | 15 ++++------ Objects/unicodeobject.c | 4 +- 5 files changed, 45 insertions(+), 20 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -906,6 +906,21 @@ self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + def test_format_huge_precision(self): + format_string = ".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = "{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = "{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): @@ -990,6 +1005,18 @@ self.assertEqual('%f' % INF, 'inf') self.assertEqual('%F' % INF, 'INF') + @support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = "%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = "%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_startswith_endswith_errors(self): for meth in ('foo'.startswith, 'foo'.endswith): with self.assertRaises(TypeError) as cm: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14700: Fix buggy overflow checks when handling large precisions and + widths in old-style and new-style formatting. + - Issue #6074: Ensure cached bytecode files can always be updated by the user that created them, even when the source file is read-only. diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -73,7 +73,7 @@ get_integer(STRINGLIB_CHAR **ptr, STRINGLIB_CHAR *end, Py_ssize_t *result) { - Py_ssize_t accumulator, digitval, oldaccumulator; + Py_ssize_t accumulator, digitval; int numdigits; accumulator = numdigits = 0; for (;;(*ptr)++, numdigits++) { @@ -83,19 +83,17 @@ if (digitval < 0) break; /* - This trick was copied from old Unicode format code. It's cute, - but would really suck on an old machine with a slow divide - implementation. Fortunately, in the normal case we do not - expect too many digits. + Detect possible overflow before it happens: + + accumulator * 10 + digitval > PY_SSIZE_T_MAX if and only if + accumulator > (PY_SSIZE_T_MAX - digitval) / 10. */ - oldaccumulator = accumulator; - accumulator *= 10; - if ((accumulator+10)/10 != oldaccumulator+1) { + if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { PyErr_Format(PyExc_ValueError, "Too many decimal digits in format string"); return -1; } - accumulator += digitval; + accumulator = accumulator * 10 + digitval; } *result = accumulator; return numdigits; diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h --- a/Objects/stringlib/string_format.h +++ b/Objects/stringlib/string_format.h @@ -197,7 +197,6 @@ { Py_ssize_t accumulator = 0; Py_ssize_t digitval; - Py_ssize_t oldaccumulator; STRINGLIB_CHAR *p; /* empty string is an error */ @@ -209,19 +208,17 @@ if (digitval < 0) return -1; /* - This trick was copied from old Unicode format code. It's cute, - but would really suck on an old machine with a slow divide - implementation. Fortunately, in the normal case we do not - expect too many digits. + Detect possible overflow before it happens: + + accumulator * 10 + digitval > PY_SSIZE_T_MAX if and only if + accumulator > (PY_SSIZE_T_MAX - digitval) / 10. */ - oldaccumulator = accumulator; - accumulator *= 10; - if ((accumulator+10)/10 != oldaccumulator+1) { + if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { PyErr_Format(PyExc_ValueError, "Too many decimal digits in format string"); return -1; } - accumulator += digitval; + accumulator = accumulator * 10 + digitval; } return accumulator; } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9648,7 +9648,7 @@ c = *fmt++; if (c < '0' || c > '9') break; - if ((width*10) / 10 != width) { + if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) { PyErr_SetString(PyExc_ValueError, "width too big"); goto onError; @@ -9683,7 +9683,7 @@ c = *fmt++; if (c < '0' || c > '9') break; - if ((prec*10) / 10 != prec) { + if (prec > (INT_MAX - ((int)c - '0')) / 10) { PyErr_SetString(PyExc_ValueError, "prec too big"); goto onError; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 11:23:31 2012 From: python-checkins at python.org (mark.dickinson) Date: Sun, 28 Oct 2012 11:23:31 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2314700=3A_merge_tests_from_3=2E2=2E?= Message-ID: <3XqFQW1yzJzRBw@mail.python.org> http://hg.python.org/cpython/rev/79ea0c84152a changeset: 80016:79ea0c84152a branch: 3.3 parent: 80011:923ca6d73bad parent: 80015:102df748572d user: Mark Dickinson date: Sun Oct 28 10:22:22 2012 +0000 summary: Issue #14700: merge tests from 3.2. files: Lib/test/test_unicode.py | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -981,6 +981,21 @@ self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + def test_format_huge_precision(self): + format_string = ".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = "{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = "{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): @@ -1069,6 +1084,18 @@ self.assertEqual('%.1s' % "a\xe9\u20ac", 'a') self.assertEqual('%.2s' % "a\xe9\u20ac", 'a\xe9') + @support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = "%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = "%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_startswith_endswith_errors(self): for meth in ('foo'.startswith, 'foo'.endswith): with self.assertRaises(TypeError) as cm: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 11:23:32 2012 From: python-checkins at python.org (mark.dickinson) Date: Sun, 28 Oct 2012 11:23:32 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2314700=3A_merge_tests_from_3=2E3=2E?= Message-ID: <3XqFQX4fPFzRCK@mail.python.org> http://hg.python.org/cpython/rev/22c8e6d71529 changeset: 80017:22c8e6d71529 parent: 80012:1ecef550d744 parent: 80016:79ea0c84152a user: Mark Dickinson date: Sun Oct 28 10:23:08 2012 +0000 summary: Issue #14700: merge tests from 3.3. files: Lib/test/test_unicode.py | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -981,6 +981,21 @@ self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + def test_format_huge_precision(self): + format_string = ".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = "{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = "{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): @@ -1069,6 +1084,18 @@ self.assertEqual('%.1s' % "a\xe9\u20ac", 'a') self.assertEqual('%.2s' % "a\xe9\u20ac", 'a\xe9') + @support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = "%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = "%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_startswith_endswith_errors(self): for meth in ('foo'.startswith, 'foo'.endswith): with self.assertRaises(TypeError) as cm: -- Repository URL: http://hg.python.org/cpython From chris.jerdonek at gmail.com Sun Oct 28 12:29:11 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Sun, 28 Oct 2012 04:29:11 -0700 Subject: [Python-checkins] peps: PEP for updating the URL layout on docs.python.org In-Reply-To: <3Xpl5B1cv9zNm1@mail.python.org> References: <3Xpl5B1cv9zNm1@mail.python.org> Message-ID: On Sat, Oct 27, 2012 at 7:36 AM, nick.coghlan wrote: > http://hg.python.org/peps/rev/c7ba002ca91d > changeset: 4568:c7ba002ca91d > user: Nick Coghlan > date: Sun Oct 28 00:36:36 2012 +1000 > summary: > PEP for updating the URL layout on docs.python.org > +* ``http://docs.python.org/x/*`` > +* ``http://docs.python.org/x.y/*`` > +* ``http://docs.python.org/release/x.y.z/*`` > +* ``http://docs.python.org/devguide`` > + > +The ``/x/`` URLs mean "give me the latest documentation for this release > +series``. Differences relative to previous versions in the release series > +will be available through "version added" and "version changed" markers. > + > +The ``/x.y/`` URLs mean "give me the latest documentation for this release". It might be worth clarifying what "latest" means for both the "x" and "x.y" forms. For example, should "http://docs.python.org/3/" today link to the released 3.3.0 version, the in-progress 3.3.1 version, or the in-progress 3.4.0? For the "x" form, I think we mean the second because that is what it points to today, i.e. the in-development version of the highest released minor version of the major version "x". There's a slight mismatch with how we're doing it today because "http://docs.python.org/3/" shows 3.3.0 in the title even though it's the in-progress 3.3.1. The title should perhaps reflect that it's post 3.3.0 (and similarly for the 2.7 and 3.2 pages). --Chris From g.brandl at gmx.net Sun Oct 28 12:34:42 2012 From: g.brandl at gmx.net (Georg Brandl) Date: Sun, 28 Oct 2012 12:34:42 +0100 Subject: [Python-checkins] peps: PEP for updating the URL layout on docs.python.org In-Reply-To: References: <3Xpl5B1cv9zNm1@mail.python.org> Message-ID: Am 28.10.2012 12:29, schrieb Chris Jerdonek: > On Sat, Oct 27, 2012 at 7:36 AM, nick.coghlan > wrote: >> http://hg.python.org/peps/rev/c7ba002ca91d >> changeset: 4568:c7ba002ca91d >> user: Nick Coghlan >> date: Sun Oct 28 00:36:36 2012 +1000 >> summary: >> PEP for updating the URL layout on docs.python.org > >> +* ``http://docs.python.org/x/*`` >> +* ``http://docs.python.org/x.y/*`` >> +* ``http://docs.python.org/release/x.y.z/*`` >> +* ``http://docs.python.org/devguide`` >> + >> +The ``/x/`` URLs mean "give me the latest documentation for this release >> +series``. Differences relative to previous versions in the release series >> +will be available through "version added" and "version changed" markers. >> + >> +The ``/x.y/`` URLs mean "give me the latest documentation for this release". > > It might be worth clarifying what "latest" means for both the "x" and > "x.y" forms. For example, should "http://docs.python.org/3/" today > link to the released 3.3.0 version, the in-progress 3.3.1 version, or > the in-progress 3.4.0? I understand "latest" to mean "latest stable plus bugfixes". I.e., /3/ is 3.3.0+. /dev and /3.4 is 3.4a0. It might need clarifying in the PEP. > For the "x" form, I think we mean the second because that is what it > points to today, i.e. the in-development version of the highest > released minor version of the major version "x". Yep. > There's a slight mismatch with how we're doing it today because > "http://docs.python.org/3/" shows 3.3.0 in the title even though it's > the in-progress 3.3.1. The title should perhaps reflect that it's > post 3.3.0 (and similarly for the 2.7 and 3.2 pages). Well, that has always been the case, and it doesn't matter anyway, because generally there's nothing in 3.3.1, feature-wise, that won't have been in 3.3.0. In the rare event of new features introduced in point releases, such as the hash attack fix, there will be an explicit "New in 3.3.1". Georg From python-checkins at python.org Sun Oct 28 12:54:43 2012 From: python-checkins at python.org (nick.coghlan) Date: Sun, 28 Oct 2012 12:54:43 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?peps=3A_Clarify_what_=27latest_versio?= =?utf-8?q?n=27_means=2C_mark_Georg_as_PEP_czar_and_bump_status?= Message-ID: <3XqHRl2dswzMNv@mail.python.org> http://hg.python.org/peps/rev/3abecddfe726 changeset: 4574:3abecddfe726 user: Nick Coghlan date: Sun Oct 28 21:54:33 2012 +1000 summary: Clarify what 'latest version' means, mark Georg as PEP czar and bump status back to Draft until Georg gives a +1 on the redirection of /dev/ URLs files: pep-0430.txt | 46 ++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pep-0430.txt b/pep-0430.txt --- a/pep-0430.txt +++ b/pep-0430.txt @@ -3,7 +3,8 @@ Version: $Revision$ Last-Modified: $Date$ Author: Nick Coghlan -Status: Final +BDFL-Delegate: Georg Brandl +Status: Draft Type: Informational Content-Type: text/x-rst Created: 27-Oct-2012 @@ -85,13 +86,13 @@ scheme where all URLs presented to users on docs.python.org are qualified appropriately with the relevant release series. -Visitors to the root URL at ``http://docs.python.org`` would be automatically +Visitors to the root URL at ``http://docs.python.org`` will be automatically redirected to ``http://docs.python.org/3/``, but links deeper in the version-specific hierarchy, such as to -``http://docs.python.org/library/os``, would instead be redirected to +``http://docs.python.org/library/os``, will instead be redirected to a Python 2 specific link such as ``http://docs.python.org/2/library/os``. -The specific subpaths which would be remapped to explicitly qualified +The specific subpaths which will be redirected to explicitly qualified paths for the Python 2 docs are: * ``/c-api/`` @@ -114,7 +115,12 @@ * ``/py-modindex.html`` * ``/search.html`` -The existing ``/py3k/`` subpath would be remapped to the new ``/3/`` subpath. +The existing ``/py3k/`` subpath will be redirected to the new ``/3/`` +subpath. + +To help ensure future stability even of links to the in-development version, +the ``/dev/`` subpath will be redirected to the appropriate version specific +subpath (currently ``/3.4/``). Presented URLs @@ -128,20 +134,30 @@ * ``http://docs.python.org/release/x.y.z/*`` * ``http://docs.python.org/devguide`` -The ``/x/`` URLs mean "give me the latest documentation for this release -series``. Differences relative to previous versions in the release series -will be available through "version added" and "version changed" markers. +The ``/x/`` URLs mean "give me the latest documentation for a released +version in this release series". It will draw the documentation from the +relevant maintenance branch in source control (this will always be the +2.7 branch for Python 2 and is currently 3.3 for Python 3). Differences +relative to previous versions in the release series will be available +through "version added" and "version changed" markers. The ``/x.y/`` URLs mean "give me the latest documentation for this release". -It differs from the status quo in that the URLs will actually remain -available in the user's browser for easy copy and pasting. (Currently, -references to specific versions that are not the latest in their release -series will resolve to a stable URL for a specific maintenance version in -the "release" hierarchy, while the current latest version in the release -series resolves to the release series URL. This makes it hard to get a -"latest version specific URL", since it is always necessary to construct +It will draw the documentation from the relevant maintenance branch in +source control (or the default branch for the currently in development +version. It differs from the status quo in that the URLs will +actually remain available in the user's browser for easy copy and pasting. +(Currently, references to specific versions that are not the latest in their +release series will resolve to a stable URL for a specific maintenance +version in the "release" hierarchy, while the current latest version in the +release series resolves to the release series URL. This makes it hard to get +a "latest version specific URL", since it is always necessary to construct them manually). +The ``/release/x.y.x/`` URLs will refer to the documentation of those +releases, exactly as it was at the time of the release. + +The developer's guide is not version specific, and thus retains its own +stable ``/devguide/`` URL. Rationale ========= -- Repository URL: http://hg.python.org/peps From python-checkins at python.org Sun Oct 28 13:07:00 2012 From: python-checkins at python.org (nick.coghlan) Date: Sun, 28 Oct 2012 13:07:00 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?peps=3A_Revert_PEP_430_to_Final=2E?= Message-ID: <3XqHjw6HZ6zR4V@mail.python.org> http://hg.python.org/peps/rev/1ccf682bdfc9 changeset: 4575:1ccf682bdfc9 user: Nick Coghlan date: Sun Oct 28 22:06:46 2012 +1000 summary: Revert PEP 430 to Final. I realised the way Georg had already implemented this made more sense, so I just updated the PEP to reflect the new setup on docs.python.org files: pep-0430.txt | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pep-0430.txt b/pep-0430.txt --- a/pep-0430.txt +++ b/pep-0430.txt @@ -4,7 +4,7 @@ Last-Modified: $Date$ Author: Nick Coghlan BDFL-Delegate: Georg Brandl -Status: Draft +Status: Final Type: Informational Content-Type: text/x-rst Created: 27-Oct-2012 @@ -118,10 +118,6 @@ The existing ``/py3k/`` subpath will be redirected to the new ``/3/`` subpath. -To help ensure future stability even of links to the in-development version, -the ``/dev/`` subpath will be redirected to the appropriate version specific -subpath (currently ``/3.4/``). - Presented URLs -------------- @@ -131,6 +127,7 @@ * ``http://docs.python.org/x/*`` * ``http://docs.python.org/x.y/*`` +* ``http://docs.python.org/dev/*`` * ``http://docs.python.org/release/x.y.z/*`` * ``http://docs.python.org/devguide`` @@ -144,7 +141,7 @@ The ``/x.y/`` URLs mean "give me the latest documentation for this release". It will draw the documentation from the relevant maintenance branch in source control (or the default branch for the currently in development -version. It differs from the status quo in that the URLs will +version). It differs from the status quo in that the URLs will actually remain available in the user's browser for easy copy and pasting. (Currently, references to specific versions that are not the latest in their release series will resolve to a stable URL for a specific maintenance @@ -153,6 +150,9 @@ a "latest version specific URL", since it is always necessary to construct them manually). +The ``/dev/`` URL means the documentation for the default branch in source +control. + The ``/release/x.y.x/`` URLs will refer to the documentation of those releases, exactly as it was at the time of the release. @@ -186,6 +186,17 @@ Namespaces are one honking great idea - let's do more of those. +Note that the approach described in this PEP gives two ways to access the +content of the default branch: as ``/dev/`` or using the appropriate +``/x.y/`` reference. This is deliberate, as the default branch is referenced +for two different purposes: + +* to provide additional information when discussing an upcoming feature of + the next release (a ``/x.y/`` URL is appropriate) +* to provide a stable destination for developers to access the documentation + of the next feature release, regardless of the version (a ``/dev/`` URL is + appropriate) + Implementation ============== -- Repository URL: http://hg.python.org/peps From ncoghlan at gmail.com Sun Oct 28 13:08:36 2012 From: ncoghlan at gmail.com (Nick Coghlan) Date: Sun, 28 Oct 2012 22:08:36 +1000 Subject: [Python-checkins] peps: PEP for updating the URL layout on docs.python.org In-Reply-To: References: <3Xpl5B1cv9zNm1@mail.python.org> Message-ID: On Sun, Oct 28, 2012 at 9:34 PM, Georg Brandl wrote: > Am 28.10.2012 12:29, schrieb Chris Jerdonek: >> On Sat, Oct 27, 2012 at 7:36 AM, nick.coghlan >> wrote: >>> http://hg.python.org/peps/rev/c7ba002ca91d >>> changeset: 4568:c7ba002ca91d >>> user: Nick Coghlan >>> date: Sun Oct 28 00:36:36 2012 +1000 >>> summary: >>> PEP for updating the URL layout on docs.python.org >> >>> +* ``http://docs.python.org/x/*`` >>> +* ``http://docs.python.org/x.y/*`` >>> +* ``http://docs.python.org/release/x.y.z/*`` >>> +* ``http://docs.python.org/devguide`` >>> + >>> +The ``/x/`` URLs mean "give me the latest documentation for this release >>> +series``. Differences relative to previous versions in the release series >>> +will be available through "version added" and "version changed" markers. >>> + >>> +The ``/x.y/`` URLs mean "give me the latest documentation for this release". >> >> It might be worth clarifying what "latest" means for both the "x" and >> "x.y" forms. For example, should "http://docs.python.org/3/" today >> link to the released 3.3.0 version, the in-progress 3.3.1 version, or >> the in-progress 3.4.0? > > I understand "latest" to mean "latest stable plus bugfixes". > I.e., /3/ is 3.3.0+. /dev and /3.4 is 3.4a0. It might need clarifying > in the PEP. Yes, I realised last night that it would be good to be more explicit about this. The "release" hierarchy should be for versions exactly as they were released, while the shorter ones draw directly from source control (and thus may contain fixes which otherwise haven't been released yet). I updated the PEP to describe what Georg has put in place more explicitly (initially I was going to propose a change to the way /dev/ URLs are handled, but then I realised what is already there made more sense). Cheers, Nick. -- Nick Coghlan | ncoghlan at gmail.com | Brisbane, Australia From python-checkins at python.org Sun Oct 28 13:13:25 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 13:13:25 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0NTcw?= =?utf-8?q?=3A_Document_json_sort=5Fkeys_parameter_properly=2E?= Message-ID: <3XqHsK5BcWzRCQ@mail.python.org> http://hg.python.org/cpython/rev/40aedc7da30f changeset: 80018:40aedc7da30f branch: 3.2 parent: 79798:16493102f9b1 user: Andrew Svetlov date: Sun Oct 28 14:10:30 2012 +0200 summary: Issue #14570: Document json sort_keys parameter properly. Patch by Chris Rebert. files: Doc/library/json.rst | 13 +++++++++++-- Lib/json/__init__.py | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -116,7 +116,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,12 +162,18 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. The arguments have the same meaning as in :func:`dump`. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -122,7 +122,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -155,6 +155,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -164,7 +167,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -172,7 +175,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -181,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -213,6 +216,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -222,14 +228,14 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder return cls( skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - separators=separators, default=default, + separators=separators, default=default, sort_keys=sort_keys, **kw).encode(obj) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:13:27 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 13:13:27 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2314570=3A_Document_json_sort=5Fkeys_parameter_pr?= =?utf-8?q?operly=2E?= Message-ID: <3XqHsM1NpxzRFm@mail.python.org> http://hg.python.org/cpython/rev/090484ccba7d changeset: 80019:090484ccba7d branch: 3.3 parent: 80016:79ea0c84152a parent: 80018:40aedc7da30f user: Andrew Svetlov date: Sun Oct 28 14:11:00 2012 +0200 summary: Merge issue #14570: Document json sort_keys parameter properly. Patch by Chris Rebert. files: Doc/library/json.rst | 13 +++++++++++-- Lib/json/__init__.py | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -116,7 +116,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,12 +162,18 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. The arguments have the same meaning as in :func:`dump`. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -122,7 +122,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -155,6 +155,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -164,7 +167,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -172,7 +175,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -181,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -213,6 +216,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -222,14 +228,14 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder return cls( skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - separators=separators, default=default, + separators=separators, default=default, sort_keys=sort_keys, **kw).encode(obj) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:13:28 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 13:13:28 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2314570=3A_Document_json_sort=5Fkeys_parame?= =?utf-8?q?ter_properly=2E?= Message-ID: <3XqHsN4ywxzRFy@mail.python.org> http://hg.python.org/cpython/rev/27ce005372a5 changeset: 80020:27ce005372a5 parent: 80017:22c8e6d71529 parent: 80019:090484ccba7d user: Andrew Svetlov date: Sun Oct 28 14:11:21 2012 +0200 summary: Merge issue #14570: Document json sort_keys parameter properly. Patch by Chris Rebert. files: Doc/library/json.rst | 13 +++++++++++-- Lib/json/__init__.py | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -116,7 +116,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,12 +162,18 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. The arguments have the same meaning as in :func:`dump`. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -122,7 +122,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -155,6 +155,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -164,7 +167,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -172,7 +175,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -181,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -213,6 +216,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -222,14 +228,14 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder return cls( skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - separators=separators, default=default, + separators=separators, default=default, sort_keys=sort_keys, **kw).encode(obj) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:13:30 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 13:13:30 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_merge_heads?= Message-ID: <3XqHsQ1Xy7zRG6@mail.python.org> http://hg.python.org/cpython/rev/cde4b66699fe changeset: 80021:cde4b66699fe branch: 3.2 parent: 80015:102df748572d parent: 80018:40aedc7da30f user: Andrew Svetlov date: Sun Oct 28 14:12:50 2012 +0200 summary: merge heads files: Doc/library/json.rst | 13 +++++++++++-- Lib/json/__init__.py | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -116,7 +116,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,12 +162,18 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. The arguments have the same meaning as in :func:`dump`. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -122,7 +122,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -155,6 +155,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -164,7 +167,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -172,7 +175,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -181,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -213,6 +216,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -222,14 +228,14 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder return cls( skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - separators=separators, default=default, + separators=separators, default=default, sort_keys=sort_keys, **kw).encode(obj) -- Repository URL: http://hg.python.org/cpython From g.brandl at gmx.net Sun Oct 28 13:34:29 2012 From: g.brandl at gmx.net (Georg Brandl) Date: Sun, 28 Oct 2012 13:34:29 +0100 Subject: [Python-checkins] peps: PEP for updating the URL layout on docs.python.org In-Reply-To: References: <3Xpl5B1cv9zNm1@mail.python.org> Message-ID: Am 28.10.2012 13:08, schrieb Nick Coghlan: >>> It might be worth clarifying what "latest" means for both the "x" and >>> "x.y" forms. For example, should "http://docs.python.org/3/" today >>> link to the released 3.3.0 version, the in-progress 3.3.1 version, or >>> the in-progress 3.4.0? >> >> I understand "latest" to mean "latest stable plus bugfixes". >> I.e., /3/ is 3.3.0+. /dev and /3.4 is 3.4a0. It might need clarifying >> in the PEP. > > Yes, I realised last night that it would be good to be more explicit > about this. The "release" hierarchy should be for versions exactly as > they were released, while the shorter ones draw directly from source > control (and thus may contain fixes which otherwise haven't been > released yet). > > I updated the PEP to describe what Georg has put in place more > explicitly (initially I was going to propose a change to the way /dev/ > URLs are handled, but then I realised what is already there made more > sense). Thanks Nick, it reads fine now in the PEP. One thing that could go in there as well: we have two obsolete redirection schemes: * docs3.python.org -- never has been advertised publicy except mentioned on python-dev. I've now created a logfile, so that we can see the amount of traffic there. I expect it to be negligible, and would like to remove the virtual host in the future. * We have a whole lot of redirection in place for pre-2.6 URLs, i.e. d.p.o/tut/..., d.p.o/lib/... etc. How long do we want to keep supporting these? If the mapping was stable, there would be basically no cost to keeping it. However, since the pages in the docs can easily be, and are, renamed, sections moved, and so on, the mapping slowly becomes outdated (and I don't think anyone is interested in keeping it up to date). So I would argue not keeping it indefinitely. Maybe it should be removed once 2.7 goes out of maintenance. In addition, there is also doc.python.org (no "s") which I would keep because it relieves you of remembering if the s is there or not :) Georg From python-checkins at python.org Sun Oct 28 13:38:03 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 13:38:03 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Remove_confusi?= =?utf-8?q?ng_=22Release=22_and_=22Date=22_markers_from_whatsnews=2E?= Message-ID: <3XqJPl4nnMzRCY@mail.python.org> http://hg.python.org/cpython/rev/e791b275c34b changeset: 80022:e791b275c34b branch: 3.2 parent: 80010:652286ee23f8 user: Georg Brandl date: Sun Oct 28 13:35:56 2012 +0100 summary: Remove confusing "Release" and "Date" markers from whatsnews. files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- Doc/whatsnew/3.0.rst | 2 -- Doc/whatsnew/3.1.rst | 2 -- Doc/whatsnew/3.2.rst | 2 -- 5 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:38:05 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 13:38:05 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_merge_heads?= Message-ID: <3XqJPn0LTWzRDC@mail.python.org> http://hg.python.org/cpython/rev/ca508f6bdfa0 changeset: 80023:ca508f6bdfa0 branch: 3.2 parent: 80021:cde4b66699fe parent: 80022:e791b275c34b user: Georg Brandl date: Sun Oct 28 13:37:05 2012 +0100 summary: merge heads files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- Doc/whatsnew/3.0.rst | 2 -- Doc/whatsnew/3.1.rst | 2 -- Doc/whatsnew/3.2.rst | 2 -- 5 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:38:06 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 13:38:06 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Remove_confusing_=22Release=22_and_=22Date=22_markers_from_wha?= =?utf-8?q?tsnews=2E_Merge_with_3=2E2=2E?= Message-ID: <3XqJPp2m2yzRFs@mail.python.org> http://hg.python.org/cpython/rev/d894261b82f9 changeset: 80024:d894261b82f9 branch: 3.3 parent: 80019:090484ccba7d parent: 80023:ca508f6bdfa0 user: Georg Brandl date: Sun Oct 28 13:37:18 2012 +0100 summary: Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.2. files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- Doc/whatsnew/3.0.rst | 2 -- Doc/whatsnew/3.1.rst | 2 -- Doc/whatsnew/3.2.rst | 2 -- Doc/whatsnew/3.3.rst | 3 --- 6 files changed, 0 insertions(+), 13 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,9 +2,6 @@ What's New In Python 3.3 **************************** -:Release: |release| -:Date: |today| - .. Rules for maintenance: * Anyone can add text to this document. Do not spend very much time -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:38:07 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 13:38:07 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Remove_confusing_=22Release=22_and_=22Date=22_markers_fr?= =?utf-8?q?om_whatsnews=2E_Merge_with_3=2E3=2E?= Message-ID: <3XqJPq5BRtzRDq@mail.python.org> http://hg.python.org/cpython/rev/d87feb956596 changeset: 80025:d87feb956596 parent: 80020:27ce005372a5 parent: 80024:d894261b82f9 user: Georg Brandl date: Sun Oct 28 13:37:54 2012 +0100 summary: Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.3. files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- Doc/whatsnew/3.0.rst | 2 -- Doc/whatsnew/3.1.rst | 2 -- Doc/whatsnew/3.2.rst | 2 -- Doc/whatsnew/3.3.rst | 3 --- Doc/whatsnew/3.4.rst | 4 ++-- 7 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,9 +2,6 @@ What's New In Python 3.3 **************************** -:Release: |release| -:Date: |today| - .. Rules for maintenance: * Anyone can add text to this document. Do not spend very much time diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -2,8 +2,8 @@ What's New In Python 3.4 **************************** -:Release: |release| -:Date: |today| +.. :Author: Someone + (uncomment if there is a principal author) .. Rules for maintenance: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:39:04 2012 From: python-checkins at python.org (georg.brandl) Date: Sun, 28 Oct 2012 13:39:04 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Remove_confusi?= =?utf-8?q?ng_=22Release=22_and_=22Date=22_markers_from_whatsnews=2E?= Message-ID: <3XqJQw1nPHzRDG@mail.python.org> http://hg.python.org/cpython/rev/b380c3fc86c3 changeset: 80026:b380c3fc86c3 branch: 2.7 parent: 80014:21fb1767e185 user: Georg Brandl date: Sun Oct 28 13:35:56 2012 +0100 summary: Remove confusing "Release" and "Date" markers from whatsnews. files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -5,8 +5,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:42:44 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 13:42:44 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogQ2xvc2VzICMxNjM0?= =?utf-8?q?0=3A_Handle_exception_while_copying_script_to_venv=2E?= Message-ID: <3XqJW8521fzMkD@mail.python.org> http://hg.python.org/cpython/rev/adefc83c1128 changeset: 80027:adefc83c1128 branch: 3.3 parent: 80019:090484ccba7d user: Vinay Sajip date: Sun Oct 28 12:39:39 2012 +0000 summary: Closes #16340: Handle exception while copying script to venv. files: Lib/venv/__init__.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -305,11 +305,17 @@ mode = 'wb' else: mode = 'w' - data = data.decode('utf-8') - data = self.replace_variables(data, context) - with open(dstfile, mode) as f: - f.write(data) - shutil.copymode(srcfile, dstfile) + try: + data = data.decode('utf-8') + data = self.replace_variables(data, context) + except UnicodeDecodeError as e: + data = None + logger.warning('unable to copy script %r, ' + 'may be binary: %s', srcfile, e) + if data is not None: + with open(dstfile, mode) as f: + f.write(data) + shutil.copymode(srcfile, dstfile) def create(env_dir, system_site_packages=False, clear=False, symlinks=False): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:42:46 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 13:42:46 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Closes_=2316340=3A_Merged_fix_from_3=2E3=2E?= Message-ID: <3XqJWB0Q83zMsd@mail.python.org> http://hg.python.org/cpython/rev/fb969187ecc2 changeset: 80028:fb969187ecc2 parent: 80020:27ce005372a5 parent: 80027:adefc83c1128 user: Vinay Sajip date: Sun Oct 28 12:40:20 2012 +0000 summary: Closes #16340: Merged fix from 3.3. files: Lib/venv/__init__.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -313,11 +313,17 @@ mode = 'wb' else: mode = 'w' - data = data.decode('utf-8') - data = self.replace_variables(data, context) - with open(dstfile, mode) as f: - f.write(data) - shutil.copymode(srcfile, dstfile) + try: + data = data.decode('utf-8') + data = self.replace_variables(data, context) + except UnicodeDecodeError as e: + data = None + logger.warning('unable to copy script %r, ' + 'may be binary: %s', srcfile, e) + if data is not None: + with open(dstfile, mode) as f: + f.write(data) + shutil.copymode(srcfile, dstfile) def create(env_dir, system_site_packages=False, clear=False, symlinks=False): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:42:47 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 13:42:47 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_Merged_upstream_changes=2E?= Message-ID: <3XqJWC2lQczMsd@mail.python.org> http://hg.python.org/cpython/rev/f420b475bc2d changeset: 80029:f420b475bc2d parent: 80028:fb969187ecc2 parent: 80025:d87feb956596 user: Vinay Sajip date: Sun Oct 28 12:41:21 2012 +0000 summary: Merged upstream changes. files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- Doc/whatsnew/3.0.rst | 2 -- Doc/whatsnew/3.1.rst | 2 -- Doc/whatsnew/3.2.rst | 2 -- Doc/whatsnew/3.3.rst | 3 --- Doc/whatsnew/3.4.rst | 4 ++-- 7 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,9 +2,6 @@ What's New In Python 3.3 **************************** -:Release: |release| -:Date: |today| - .. Rules for maintenance: * Anyone can add text to this document. Do not spend very much time diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -2,8 +2,8 @@ What's New In Python 3.4 **************************** -:Release: |release| -:Date: |today| +.. :Author: Someone + (uncomment if there is a principal author) .. Rules for maintenance: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:42:48 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 13:42:48 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_Merged_upstream_changes=2E?= Message-ID: <3XqJWD5J4SzMtk@mail.python.org> http://hg.python.org/cpython/rev/696b05c3bd92 changeset: 80030:696b05c3bd92 branch: 3.3 parent: 80027:adefc83c1128 parent: 80024:d894261b82f9 user: Vinay Sajip date: Sun Oct 28 12:41:44 2012 +0000 summary: Merged upstream changes. files: Doc/whatsnew/2.6.rst | 2 -- Doc/whatsnew/2.7.rst | 2 -- Doc/whatsnew/3.0.rst | 2 -- Doc/whatsnew/3.1.rst | 2 -- Doc/whatsnew/3.2.rst | 2 -- Doc/whatsnew/3.3.rst | 3 --- 6 files changed, 0 insertions(+), 13 deletions(-) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,9 +2,6 @@ What's New In Python 3.3 **************************** -:Release: |release| -:Date: |today| - .. Rules for maintenance: * Anyone can add text to this document. Do not spend very much time -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:42:50 2012 From: python-checkins at python.org (vinay.sajip) Date: Sun, 28 Oct 2012 13:42:50 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Null_merge=2E?= Message-ID: <3XqJWG0FVwzPfH@mail.python.org> http://hg.python.org/cpython/rev/17a1122625ba changeset: 80031:17a1122625ba parent: 80029:f420b475bc2d parent: 80030:696b05c3bd92 user: Vinay Sajip date: Sun Oct 28 12:42:25 2012 +0000 summary: Null merge. files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 13:59:01 2012 From: python-checkins at python.org (andrew.svetlov) Date: Sun, 28 Oct 2012 13:59:01 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0NTcw?= =?utf-8?q?=3A_Document_json_sort=5Fkeys_parameter_properly=2E?= Message-ID: <3XqJsx5KdtzRFx@mail.python.org> http://hg.python.org/cpython/rev/7784008e9ade changeset: 80032:7784008e9ade branch: 2.7 parent: 80026:b380c3fc86c3 user: Andrew Svetlov date: Sun Oct 28 14:58:52 2012 +0200 summary: Issue #14570: Document json sort_keys parameter properly. Patch by Chris Rebert. files: Doc/library/json.rst | 13 +++++++++++-- Lib/json/__init__.py | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -117,7 +117,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp[, skipkeys[, ensure_ascii[, check_circular[, allow_nan[, cls[, indent[, separators[, encoding[, default[, **kw]]]]]]]]]]) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, encoding="utf-8", \ + default=None, sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,6 +162,9 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. @@ -169,7 +175,10 @@ trying to serialize more objects with repeated calls to :func:`dump` and the same *fp* will result in an invalid JSON file. -.. function:: dumps(obj[, skipkeys[, ensure_ascii[, check_circular[, allow_nan[, cls[, indent[, separators[, encoding[, default[, **kw]]]]]]]]]]) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, encoding="utf-8", \ + default=None, sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. If *ensure_ascii* is ``False``, the result may contain non-ASCII characters and the return value diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -121,7 +121,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - encoding='utf-8', default=None, **kw): + encoding='utf-8', default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -161,6 +161,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -170,7 +173,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - encoding == 'utf-8' and default is None and not kw): + encoding == 'utf-8' and default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -178,7 +181,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, encoding=encoding, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -187,7 +190,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - encoding='utf-8', default=None, **kw): + encoding='utf-8', default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -220,6 +223,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -229,7 +235,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - encoding == 'utf-8' and default is None and not kw): + encoding == 'utf-8' and default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder @@ -237,7 +243,7 @@ skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, encoding=encoding, default=default, - **kw).encode(obj) + sort_keys=sort_keys, **kw).encode(obj) _default_decoder = JSONDecoder(encoding=None, object_hook=None, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 14:00:36 2012 From: python-checkins at python.org (hynek.schlawack) Date: Sun, 28 Oct 2012 14:00:36 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_=231492704=3A_Ensure_and_d?= =?utf-8?q?ocument_backward_compatibility_of_the_change?= Message-ID: <3XqJvm6Nj8zRG2@mail.python.org> http://hg.python.org/cpython/rev/e59e274551e0 changeset: 80033:e59e274551e0 parent: 80031:17a1122625ba user: Hynek Schlawack date: Sun Oct 28 13:59:27 2012 +0100 summary: #1492704: Ensure and document backward compatibility of the change files: Doc/library/shutil.rst | 3 ++- Lib/test/test_shutil.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -70,7 +70,8 @@ Now returns *dst*. .. versionchanged:: 3.4 - Raise :exc:`SameFileError` instead of :exc:`Error`. + Raise :exc:`SameFileError` instead of :exc:`Error`. Since the former is + a subclass of the latter, this change is backward compatible. .. exception:: SameFileError diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1223,6 +1223,8 @@ src_file = os.path.join(src_dir, 'foo') write_file(src_file, 'foo') self.assertRaises(SameFileError, shutil.copyfile, src_file, src_file) + # But Error should work too, to stay backward compatible. + self.assertRaises(Error, shutil.copyfile, src_file, src_file) def test_copytree_return_value(self): # copytree returns its destination path. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 14:53:05 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 28 Oct 2012 14:53:05 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316316=3A_mimetype?= =?utf-8?q?s_now_recognizes_the_=2Exz_and_=2Etxz_=28=2Etar=2Exz=29_extensi?= =?utf-8?q?ons=2E?= Message-ID: <3XqL4K2rC8zR9J@mail.python.org> http://hg.python.org/cpython/rev/a3ba5fe9bfd3 changeset: 80034:a3ba5fe9bfd3 user: Nadeem Vawda date: Sun Oct 28 14:52:34 2012 +0100 summary: Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. Patch by Serhiy Storchaka. files: Lib/mimetypes.py | 2 ++ Lib/test/test_mimetypes.py | 2 ++ Misc/NEWS | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -378,12 +378,14 @@ '.taz': '.tar.gz', '.tz': '.tar.gz', '.tbz2': '.tar.bz2', + '.txz': '.tar.xz', } encodings_map = { '.gz': 'gzip', '.Z': 'compress', '.bz2': 'bzip2', + '.xz': 'xz', } # Before adding new types, make sure they are either registered with IANA, diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -22,6 +22,8 @@ eq(self.db.guess_type("foo.tgz"), ("application/x-tar", "gzip")) eq(self.db.guess_type("foo.tar.gz"), ("application/x-tar", "gzip")) eq(self.db.guess_type("foo.tar.Z"), ("application/x-tar", "compress")) + eq(self.db.guess_type("foo.tar.bz2"), ("application/x-tar", "bzip2")) + eq(self.db.guess_type("foo.tar.xz"), ("application/x-tar", "xz")) def test_data_urls(self): eq = self.assertEqual diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,9 @@ Library ------- +- Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. + Patch by Serhiy Storchaka. + - Issue #12890: cgitb no longer prints spurious

    tags in text mode when the logdir option is specified. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 15:22:39 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 28 Oct 2012 15:22:39 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Add_test_for_B?= =?utf-8?q?Z2Decompressor=2Edecompress=28=22=22=29_after_end_of_stream=2E?= Message-ID: <3XqLkR3RFRzRBj@mail.python.org> http://hg.python.org/cpython/rev/e57e9fb3843b changeset: 80035:e57e9fb3843b branch: 2.7 parent: 80032:7784008e9ade user: Nadeem Vawda date: Sun Oct 28 15:20:35 2012 +0100 summary: Add test for BZ2Decompressor.decompress("") after end of stream. files: Lib/test/test_bz2.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -398,6 +398,7 @@ bz2d = BZ2Decompressor() text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, "anything") + self.assertRaises(EOFError, bz2d.decompress, "") @bigmemtest(_4G, memuse=1.25) def testBigmem(self, size): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 15:22:40 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 28 Oct 2012 15:22:40 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Add_test_for_B?= =?utf-8?q?Z2Decompressor=2Edecompress=28=22=22=29_after_end_of_stream=2E?= Message-ID: <3XqLkS5dCpzRBv@mail.python.org> http://hg.python.org/cpython/rev/2e52536a91a3 changeset: 80036:2e52536a91a3 branch: 3.2 parent: 80023:ca508f6bdfa0 user: Nadeem Vawda date: Sun Oct 28 15:20:48 2012 +0100 summary: Add test for BZ2Decompressor.decompress("") after end of stream. files: Lib/test/test_bz2.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -365,6 +365,7 @@ bz2d = BZ2Decompressor() text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, b"anything") + self.assertRaises(EOFError, bz2d.decompress, b"") @bigmemtest(size=_4G, memuse=1.25, dry_run=False) def testBigmem(self, unused_size): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 15:22:42 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 28 Oct 2012 15:22:42 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge=3A_Add_test_for_BZ2Decompressor=2Edecompress=28=22=22=29?= =?utf-8?q?_after_end_of_stream=2E?= Message-ID: <3XqLkV0fGjzRDh@mail.python.org> http://hg.python.org/cpython/rev/0a33422fb0d9 changeset: 80037:0a33422fb0d9 branch: 3.3 parent: 80030:696b05c3bd92 parent: 80036:2e52536a91a3 user: Nadeem Vawda date: Sun Oct 28 15:21:37 2012 +0100 summary: Merge: Add test for BZ2Decompressor.decompress("") after end of stream. files: Lib/test/test_bz2.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -647,6 +647,7 @@ bz2d = BZ2Decompressor() text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, b"anything") + self.assertRaises(EOFError, bz2d.decompress, b"") @bigmemtest(size=_4G + 100, memuse=3) def testDecompress4G(self, size): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 15:22:43 2012 From: python-checkins at python.org (nadeem.vawda) Date: Sun, 28 Oct 2012 15:22:43 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Add_test_for_BZ2Decompressor=2Edecompress=28=22?= =?utf-8?q?=22=29_after_end_of_stream=2E?= Message-ID: <3XqLkW30C1zRF4@mail.python.org> http://hg.python.org/cpython/rev/3bc1784be9aa changeset: 80038:3bc1784be9aa parent: 80034:a3ba5fe9bfd3 parent: 80037:0a33422fb0d9 user: Nadeem Vawda date: Sun Oct 28 15:22:08 2012 +0100 summary: Merge: Add test for BZ2Decompressor.decompress("") after end of stream. files: Lib/test/test_bz2.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -640,6 +640,7 @@ bz2d = BZ2Decompressor() text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, b"anything") + self.assertRaises(EOFError, bz2d.decompress, b"") @bigmemtest(size=_4G + 100, memuse=3) def testDecompress4G(self, size): -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 16:49:13 2012 From: python-checkins at python.org (brett.cannon) Date: Sun, 28 Oct 2012 16:49:13 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MzQy?= =?utf-8?q?=3A_Lib/=5Fsysconfigdata=2Epy_is_no_longer_put_into_Lib=2C_so?= Message-ID: <3XqNfK5dq4zPCN@mail.python.org> http://hg.python.org/cpython/rev/a2b7a3e1ce66 changeset: 80039:a2b7a3e1ce66 branch: 3.3 parent: 79992:0e4574595674 user: Brett Cannon date: Sun Oct 28 11:46:51 2012 -0400 summary: Issue #16342: Lib/_sysconfigdata.py is no longer put into Lib, so don't ignore it if it's still there. files: .hgignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -47,7 +47,6 @@ *.pyd *.cover *~ -Lib/_sysconfigdata.py Lib/lib2to3/*.pickle Lib/test/data/* Misc/*.wpu -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 16:49:15 2012 From: python-checkins at python.org (brett.cannon) Date: Sun, 28 Oct 2012 16:49:15 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_with_3=2E3?= Message-ID: <3XqNfM0wBZzRDx@mail.python.org> http://hg.python.org/cpython/rev/d5d34899f7d5 changeset: 80040:d5d34899f7d5 parent: 79993:57a33af85407 parent: 80039:a2b7a3e1ce66 user: Brett Cannon date: Sun Oct 28 11:47:54 2012 -0400 summary: Merge with 3.3 files: .hgignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -47,7 +47,6 @@ *.pyd *.cover *~ -Lib/_sysconfigdata.py Lib/lib2to3/*.pickle Lib/test/data/* Misc/*.wpu -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 16:49:16 2012 From: python-checkins at python.org (brett.cannon) Date: Sun, 28 Oct 2012 16:49:16 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge?= Message-ID: <3XqNfN6FyQzRFG@mail.python.org> http://hg.python.org/cpython/rev/f3e23c0ba51b changeset: 80041:f3e23c0ba51b parent: 80040:d5d34899f7d5 parent: 80038:3bc1784be9aa user: Brett Cannon date: Sun Oct 28 11:48:24 2012 -0400 summary: merge files: Doc/Makefile | 5 + Doc/library/json.rst | 13 ++++- Doc/library/shutil.rst | 3 +- Doc/library/subprocess.rst | 4 + Doc/tools/sphinxext/static/version_switch.js | 18 +++-- Doc/whatsnew/2.6.rst | 2 - Doc/whatsnew/2.7.rst | 2 - Doc/whatsnew/3.0.rst | 2 - Doc/whatsnew/3.1.rst | 2 - Doc/whatsnew/3.2.rst | 2 - Doc/whatsnew/3.3.rst | 3 - Doc/whatsnew/3.4.rst | 4 +- Include/pyport.h | 2 +- Lib/json/__init__.py | 18 ++++-- Lib/mimetypes.py | 2 + Lib/test/test_bz2.py | 1 + Lib/test/test_mimetypes.py | 2 + Lib/test/test_shutil.py | 2 + Lib/test/test_unicode.py | 27 ++++++++++ Lib/test/test_urllib2net.py | 4 +- Lib/venv/__init__.py | 16 ++++- Misc/NEWS | 5 +- Tools/msi/msi.py | 2 +- 23 files changed, 99 insertions(+), 42 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -187,6 +187,10 @@ make update make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' +# for quick rebuilds (HTML only) +autobuild-html: + make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + # for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: @case $(DISTVERSION) in *[abc]*) \ @@ -194,3 +198,4 @@ exit 1;; \ esac @make autobuild-dev + diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -116,7 +116,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,12 +162,18 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. The arguments have the same meaning as in :func:`dump`. diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -70,7 +70,8 @@ Now returns *dst*. .. versionchanged:: 3.4 - Raise :exc:`SameFileError` instead of :exc:`Error`. + Raise :exc:`SameFileError` instead of :exc:`Error`. Since the former is + a subclass of the latter, this change is backward compatible. .. exception:: SameFileError diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -341,6 +341,10 @@ from this vulnerability; see the Note in the :class:`Popen` constructor documentation for helpful hints in getting ``shell=False`` to work. + When using ``shell=True``, :func:`shlex.quote` can be used to properly + escape whitespace and shell metacharacters in strings that are going to + be used to construct shell commands. + These options, along with all of the other options, are described in more detail in the :class:`Popen` constructor documentation. diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js --- a/Doc/tools/sphinxext/static/version_switch.js +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -43,19 +43,21 @@ if (new_url != url) { // check beforehand if url exists, else redirect to version's start page - $.get(new_url, function() { - window.location.href = new_url; - }).error(function() { - window.location.href = 'http://docs.python.org/' + selected; + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } }); } } $(document).ready(function() { - var version = DOCUMENTATION_OPTIONS.VERSION.split('.'), - release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION; - - version = version[0] + '.' + version[1]; + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); var select = build_select(version, release); $('.version_switcher_placeholder').html(select); diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,9 +2,6 @@ What's New In Python 3.3 **************************** -:Release: |release| -:Date: |today| - .. Rules for maintenance: * Anyone can add text to this document. Do not spend very much time diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -2,8 +2,8 @@ What's New In Python 3.4 **************************** -:Release: |release| -:Date: |today| +.. :Author: Someone + (uncomment if there is a principal author) .. Rules for maintenance: diff --git a/Include/pyport.h b/Include/pyport.h --- a/Include/pyport.h +++ b/Include/pyport.h @@ -866,7 +866,7 @@ #endif /* - * Convenient macros to deal with endianess of the platform. WORDS_BIGENDIAN is + * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is * detected by configure and defined in pyconfig.h. The code in pyconfig.h * also also takes care of Apple's universal builds. */ diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -122,7 +122,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -155,6 +155,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -164,7 +167,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -172,7 +175,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -181,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -213,6 +216,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -222,14 +228,14 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder return cls( skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - separators=separators, default=default, + separators=separators, default=default, sort_keys=sort_keys, **kw).encode(obj) diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -378,12 +378,14 @@ '.taz': '.tar.gz', '.tz': '.tar.gz', '.tbz2': '.tar.bz2', + '.txz': '.tar.xz', } encodings_map = { '.gz': 'gzip', '.Z': 'compress', '.bz2': 'bzip2', + '.xz': 'xz', } # Before adding new types, make sure they are either registered with IANA, diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -640,6 +640,7 @@ bz2d = BZ2Decompressor() text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, b"anything") + self.assertRaises(EOFError, bz2d.decompress, b"") @bigmemtest(size=_4G + 100, memuse=3) def testDecompress4G(self, size): diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -22,6 +22,8 @@ eq(self.db.guess_type("foo.tgz"), ("application/x-tar", "gzip")) eq(self.db.guess_type("foo.tar.gz"), ("application/x-tar", "gzip")) eq(self.db.guess_type("foo.tar.Z"), ("application/x-tar", "compress")) + eq(self.db.guess_type("foo.tar.bz2"), ("application/x-tar", "bzip2")) + eq(self.db.guess_type("foo.tar.xz"), ("application/x-tar", "xz")) def test_data_urls(self): eq = self.assertEqual diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1223,6 +1223,8 @@ src_file = os.path.join(src_dir, 'foo') write_file(src_file, 'foo') self.assertRaises(SameFileError, shutil.copyfile, src_file, src_file) + # But Error should work too, to stay backward compatible. + self.assertRaises(Error, shutil.copyfile, src_file, src_file) def test_copytree_return_value(self): # copytree returns its destination path. diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -981,6 +981,21 @@ self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + def test_format_huge_precision(self): + format_string = ".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = "{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = "{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): @@ -1069,6 +1084,18 @@ self.assertEqual('%.1s' % "a\xe9\u20ac", 'a') self.assertEqual('%.2s' % "a\xe9\u20ac", 'a\xe9') + @support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = "%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = "%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_startswith_endswith_errors(self): for meth in ('foo'.startswith, 'foo'.endswith): with self.assertRaises(TypeError) as cm: diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -157,12 +157,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "http://docs.python.org/glossary.html#glossary" + urlwith_frag = "http://docs.python.org/2/glossary.html#glossary" with support.transient_internet(urlwith_frag): req = urllib.request.Request(urlwith_frag) res = urllib.request.urlopen(req) self.assertEqual(res.geturl(), - "http://docs.python.org/glossary.html#glossary") + "http://docs.python.org/2/glossary.html#glossary") def test_custom_headers(self): url = "http://www.example.com" diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -313,11 +313,17 @@ mode = 'wb' else: mode = 'w' - data = data.decode('utf-8') - data = self.replace_variables(data, context) - with open(dstfile, mode) as f: - f.write(data) - shutil.copymode(srcfile, dstfile) + try: + data = data.decode('utf-8') + data = self.replace_variables(data, context) + except UnicodeDecodeError as e: + data = None + logger.warning('unable to copy script %r, ' + 'may be binary: %s', srcfile, e) + if data is not None: + with open(dstfile, mode) as f: + f.write(data) + shutil.copymode(srcfile, dstfile) def create(env_dir, system_site_packages=False, clear=False, symlinks=False): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -20,7 +20,7 @@ user that created them, even when the source file is read-only. - Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified - endianess detection and handling. + endianness detection and handling. - Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer objects. @@ -62,6 +62,9 @@ Library ------- +- Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. + Patch by Serhiy Storchaka. + - Issue #12890: cgitb no longer prints spurious

    tags in text mode when the logdir option is specified. diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -416,7 +416,7 @@ ("VerdanaRed9", "Verdana", 9, 255, 0), ]) - compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests" "[TARGETDIR]Lib"' + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TARGETDIR]Lib"' lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' # See "CustomAction Table" add_data(db, "CustomAction", [ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 16:49:18 2012 From: python-checkins at python.org (brett.cannon) Date: Sun, 28 Oct 2012 16:49:18 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?= =?utf-8?q?_merge?= Message-ID: <3XqNfQ3ClDzRDn@mail.python.org> http://hg.python.org/cpython/rev/e23aeab37a5a changeset: 80042:e23aeab37a5a branch: 3.3 parent: 80039:a2b7a3e1ce66 parent: 80037:0a33422fb0d9 user: Brett Cannon date: Sun Oct 28 11:49:00 2012 -0400 summary: merge files: Doc/Makefile | 5 + Doc/library/json.rst | 13 ++++- Doc/library/subprocess.rst | 4 + Doc/tools/sphinxext/static/version_switch.js | 18 +++-- Doc/whatsnew/2.6.rst | 2 - Doc/whatsnew/2.7.rst | 2 - Doc/whatsnew/3.0.rst | 2 - Doc/whatsnew/3.1.rst | 2 - Doc/whatsnew/3.2.rst | 2 - Doc/whatsnew/3.3.rst | 3 - Lib/json/__init__.py | 18 ++++-- Lib/test/test_bz2.py | 1 + Lib/test/test_unicode.py | 27 ++++++++++ Lib/test/test_urllib2net.py | 4 +- Lib/venv/__init__.py | 16 ++++- Tools/msi/msi.py | 2 +- 16 files changed, 84 insertions(+), 37 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -187,6 +187,10 @@ make update make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' +# for quick rebuilds (HTML only) +autobuild-html: + make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + # for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: @case $(DISTVERSION) in *[abc]*) \ @@ -194,3 +198,4 @@ exit 1;; \ esac @make autobuild-dev + diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -116,7 +116,10 @@ Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting :term:`file-like object`). @@ -159,12 +162,18 @@ *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw) +.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + check_circular=True, allow_nan=True, cls=None, \ + indent=None, separators=None, default=None, \ + sort_keys=False, **kw) Serialize *obj* to a JSON formatted :class:`str`. The arguments have the same meaning as in :func:`dump`. diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -341,6 +341,10 @@ from this vulnerability; see the Note in the :class:`Popen` constructor documentation for helpful hints in getting ``shell=False`` to work. + When using ``shell=True``, :func:`shlex.quote` can be used to properly + escape whitespace and shell metacharacters in strings that are going to + be used to construct shell commands. + These options, along with all of the other options, are described in more detail in the :class:`Popen` constructor documentation. diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js --- a/Doc/tools/sphinxext/static/version_switch.js +++ b/Doc/tools/sphinxext/static/version_switch.js @@ -43,19 +43,21 @@ if (new_url != url) { // check beforehand if url exists, else redirect to version's start page - $.get(new_url, function() { - window.location.href = new_url; - }).error(function() { - window.location.href = 'http://docs.python.org/' + selected; + $.ajax({ + url: new_url, + success: function() { + window.location.href = new_url; + }, + error: function() { + window.location.href = 'http://docs.python.org/' + selected; + } }); } } $(document).ready(function() { - var version = DOCUMENTATION_OPTIONS.VERSION.split('.'), - release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION; - - version = version[0] + '.' + version[1]; + var release = DOCUMENTATION_OPTIONS.VERSION; + var version = release.substr(0, 3); var select = build_select(version, release); $('.version_switcher_placeholder').html(select); diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -7,8 +7,6 @@ .. XXX add trademark info for Apple, Microsoft, SourceForge. :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -3,8 +3,6 @@ **************************** :Author: A.M. Kuchling (amk at amk.ca) -:Release: |release| -:Date: |today| .. hyperlink all the methods & functions. diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -5,8 +5,6 @@ .. XXX Add trademark info for Apple, Microsoft. :Author: Guido van Rossum -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -3,8 +3,6 @@ **************************** :Author: Raymond Hettinger -:Release: |release| -:Date: |today| .. $Id$ Rules for maintenance: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -2,9 +2,6 @@ What's New In Python 3.3 **************************** -:Release: |release| -:Date: |today| - .. Rules for maintenance: * Anyone can add text to this document. Do not spend very much time diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -122,7 +122,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -155,6 +155,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -164,7 +167,7 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): iterable = _default_encoder.iterencode(obj) else: if cls is None: @@ -172,7 +175,7 @@ iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, separators=separators, - default=default, **kw).iterencode(obj) + default=default, sort_keys=sort_keys, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: @@ -181,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, - default=None, **kw): + default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types @@ -213,6 +216,9 @@ ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. + If *sort_keys* is ``True`` (default: ``False``), then the output of + dictionaries will be sorted by key. + To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the ``.default()`` method to serialize additional types), specify it with the ``cls`` kwarg; otherwise ``JSONEncoder`` is used. @@ -222,14 +228,14 @@ if (not skipkeys and ensure_ascii and check_circular and allow_nan and cls is None and indent is None and separators is None and - default is None and not kw): + default is None and not sort_keys and not kw): return _default_encoder.encode(obj) if cls is None: cls = JSONEncoder return cls( skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - separators=separators, default=default, + separators=separators, default=default, sort_keys=sort_keys, **kw).encode(obj) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -647,6 +647,7 @@ bz2d = BZ2Decompressor() text = bz2d.decompress(self.DATA) self.assertRaises(EOFError, bz2d.decompress, b"anything") + self.assertRaises(EOFError, bz2d.decompress, b"") @bigmemtest(size=_4G + 100, memuse=3) def testDecompress4G(self, size): diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -981,6 +981,21 @@ self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + def test_format_huge_precision(self): + format_string = ".{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_width(self): + format_string = "{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format(2.34, format_string) + + def test_format_huge_item_number(self): + format_string = "{{{}:.6f}}".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string.format(2.34) + def test_format_auto_numbering(self): class C: def __init__(self, x=100): @@ -1069,6 +1084,18 @@ self.assertEqual('%.1s' % "a\xe9\u20ac", 'a') self.assertEqual('%.2s' % "a\xe9\u20ac", 'a\xe9') + @support.cpython_only + def test_formatting_huge_precision(self): + from _testcapi import INT_MAX + format_string = "%.{}f".format(INT_MAX + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + + def test_formatting_huge_width(self): + format_string = "%{}f".format(sys.maxsize + 1) + with self.assertRaises(ValueError): + result = format_string % 2.34 + def test_startswith_endswith_errors(self): for meth in ('foo'.startswith, 'foo'.endswith): with self.assertRaises(TypeError) as cm: diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -157,12 +157,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "http://docs.python.org/glossary.html#glossary" + urlwith_frag = "http://docs.python.org/2/glossary.html#glossary" with support.transient_internet(urlwith_frag): req = urllib.request.Request(urlwith_frag) res = urllib.request.urlopen(req) self.assertEqual(res.geturl(), - "http://docs.python.org/glossary.html#glossary") + "http://docs.python.org/2/glossary.html#glossary") def test_custom_headers(self): url = "http://www.example.com" diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -305,11 +305,17 @@ mode = 'wb' else: mode = 'w' - data = data.decode('utf-8') - data = self.replace_variables(data, context) - with open(dstfile, mode) as f: - f.write(data) - shutil.copymode(srcfile, dstfile) + try: + data = data.decode('utf-8') + data = self.replace_variables(data, context) + except UnicodeDecodeError as e: + data = None + logger.warning('unable to copy script %r, ' + 'may be binary: %s', srcfile, e) + if data is not None: + with open(dstfile, mode) as f: + f.write(data) + shutil.copymode(srcfile, dstfile) def create(env_dir, system_site_packages=False, clear=False, symlinks=False): diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -415,7 +415,7 @@ ("VerdanaRed9", "Verdana", 9, 255, 0), ]) - compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests" "[TARGETDIR]Lib"' + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TARGETDIR]Lib"' lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' # See "CustomAction Table" add_data(db, "CustomAction", [ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 19:19:31 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sun, 28 Oct 2012 19:19:31 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Remove_unneede?= =?utf-8?q?d_=22Release=22_and_=22Date=22_markers_from_doc_index_pages=2E?= Message-ID: <3XqRzl49JvzR91@mail.python.org> http://hg.python.org/cpython/rev/67d337cf1233 changeset: 80043:67d337cf1233 branch: 3.2 parent: 80036:2e52536a91a3 user: Chris Jerdonek date: Sun Oct 28 11:08:26 2012 -0700 summary: Remove unneeded "Release" and "Date" markers from doc index pages. files: Doc/c-api/index.rst | 3 --- Doc/distutils/index.rst | 2 -- Doc/extending/index.rst | 3 --- Doc/faq/index.rst | 3 --- Doc/install/index.rst | 2 -- Doc/library/index.rst | 3 --- Doc/reference/index.rst | 3 --- Doc/tutorial/index.rst | 3 --- 8 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Doc/c-api/index.rst b/Doc/c-api/index.rst --- a/Doc/c-api/index.rst +++ b/Doc/c-api/index.rst @@ -4,9 +4,6 @@ Python/C API Reference Manual ################################## -:Release: |version| -:Date: |today| - This manual documents the API used by C and C++ programmers who want to write extension modules or embed Python. It is a companion to :ref:`extending-index`, which describes the general principles of extension writing but does not diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst --- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -6,8 +6,6 @@ :Authors: Greg Ward, Anthony Baxter :Email: distutils-sig at python.org -:Release: |version| -:Date: |today| This document describes the Python Distribution Utilities ("Distutils") from the module developer's point of view, describing how to use the Distutils to diff --git a/Doc/extending/index.rst b/Doc/extending/index.rst --- a/Doc/extending/index.rst +++ b/Doc/extending/index.rst @@ -4,9 +4,6 @@ Extending and Embedding the Python Interpreter ################################################## -:Release: |version| -:Date: |today| - This document describes how to write modules in C or C++ to extend the Python interpreter with new modules. Those modules can define new functions but also new object types and their methods. The document also describes how to embed diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst --- a/Doc/faq/index.rst +++ b/Doc/faq/index.rst @@ -2,9 +2,6 @@ Python Frequently Asked Questions ################################### -:Release: |version| -:Date: |today| - .. toctree:: :maxdepth: 1 diff --git a/Doc/install/index.rst b/Doc/install/index.rst --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -7,8 +7,6 @@ ***************************** :Author: Greg Ward -:Release: |version| -:Date: |today| .. TODO: Fill in XXX comments diff --git a/Doc/library/index.rst b/Doc/library/index.rst --- a/Doc/library/index.rst +++ b/Doc/library/index.rst @@ -4,9 +4,6 @@ The Python Standard Library ############################### -:Release: |version| -:Date: |today| - While :ref:`reference-index` describes the exact syntax and semantics of the Python language, this library reference manual describes the standard library that is distributed with Python. It also diff --git a/Doc/reference/index.rst b/Doc/reference/index.rst --- a/Doc/reference/index.rst +++ b/Doc/reference/index.rst @@ -4,9 +4,6 @@ The Python Language Reference ################################# -:Release: |version| -:Date: |today| - This reference manual describes the syntax and "core semantics" of the language. It is terse, but attempts to be exact and complete. The semantics of non-essential built-in object types and of the built-in functions and modules diff --git a/Doc/tutorial/index.rst b/Doc/tutorial/index.rst --- a/Doc/tutorial/index.rst +++ b/Doc/tutorial/index.rst @@ -4,9 +4,6 @@ The Python Tutorial ###################### -:Release: |version| -:Date: |today| - Python is an easy to learn, powerful programming language. It has efficient high-level data structures and a simple but effective approach to object-oriented programming. Python's elegant syntax and dynamic typing, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 19:19:33 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sun, 28 Oct 2012 19:19:33 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_from_3=2E2=3A_remove_unneeded_=22Release=22_and_=22Date?= =?utf-8?q?=22_markers_from_index_pages=2E?= Message-ID: <3XqRzn0nJNzRF5@mail.python.org> http://hg.python.org/cpython/rev/74394a6ac5c7 changeset: 80044:74394a6ac5c7 branch: 3.3 parent: 80042:e23aeab37a5a parent: 80043:67d337cf1233 user: Chris Jerdonek date: Sun Oct 28 11:10:24 2012 -0700 summary: Merge from 3.2: remove unneeded "Release" and "Date" markers from index pages. files: Doc/c-api/index.rst | 3 --- Doc/distutils/index.rst | 2 -- Doc/extending/index.rst | 3 --- Doc/faq/index.rst | 3 --- Doc/install/index.rst | 2 -- Doc/library/index.rst | 3 --- Doc/reference/index.rst | 3 --- Doc/tutorial/index.rst | 3 --- 8 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Doc/c-api/index.rst b/Doc/c-api/index.rst --- a/Doc/c-api/index.rst +++ b/Doc/c-api/index.rst @@ -4,9 +4,6 @@ Python/C API Reference Manual ################################## -:Release: |version| -:Date: |today| - This manual documents the API used by C and C++ programmers who want to write extension modules or embed Python. It is a companion to :ref:`extending-index`, which describes the general principles of extension writing but does not diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst --- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -6,8 +6,6 @@ :Authors: Greg Ward, Anthony Baxter :Email: distutils-sig at python.org -:Release: |version| -:Date: |today| This document describes the Python Distribution Utilities ("Distutils") from the module developer's point of view, describing how to use the Distutils to diff --git a/Doc/extending/index.rst b/Doc/extending/index.rst --- a/Doc/extending/index.rst +++ b/Doc/extending/index.rst @@ -4,9 +4,6 @@ Extending and Embedding the Python Interpreter ################################################## -:Release: |version| -:Date: |today| - This document describes how to write modules in C or C++ to extend the Python interpreter with new modules. Those modules can define new functions but also new object types and their methods. The document also describes how to embed diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst --- a/Doc/faq/index.rst +++ b/Doc/faq/index.rst @@ -2,9 +2,6 @@ Python Frequently Asked Questions ################################### -:Release: |version| -:Date: |today| - .. toctree:: :maxdepth: 1 diff --git a/Doc/install/index.rst b/Doc/install/index.rst --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -7,8 +7,6 @@ ***************************** :Author: Greg Ward -:Release: |version| -:Date: |today| .. TODO: Fill in XXX comments diff --git a/Doc/library/index.rst b/Doc/library/index.rst --- a/Doc/library/index.rst +++ b/Doc/library/index.rst @@ -4,9 +4,6 @@ The Python Standard Library ############################### -:Release: |version| -:Date: |today| - While :ref:`reference-index` describes the exact syntax and semantics of the Python language, this library reference manual describes the standard library that is distributed with Python. It also diff --git a/Doc/reference/index.rst b/Doc/reference/index.rst --- a/Doc/reference/index.rst +++ b/Doc/reference/index.rst @@ -4,9 +4,6 @@ The Python Language Reference ################################# -:Release: |version| -:Date: |today| - This reference manual describes the syntax and "core semantics" of the language. It is terse, but attempts to be exact and complete. The semantics of non-essential built-in object types and of the built-in functions and modules diff --git a/Doc/tutorial/index.rst b/Doc/tutorial/index.rst --- a/Doc/tutorial/index.rst +++ b/Doc/tutorial/index.rst @@ -4,9 +4,6 @@ The Python Tutorial ###################### -:Release: |version| -:Date: |today| - Python is an easy to learn, powerful programming language. It has efficient high-level data structures and a simple but effective approach to object-oriented programming. Python's elegant syntax and dynamic typing, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 19:19:34 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sun, 28 Oct 2012 19:19:34 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_remove_unneeded_=22Release=22_and_?= =?utf-8?q?=22Date=22_markers_from_index_pages=2E?= Message-ID: <3XqRzp449xzRFS@mail.python.org> http://hg.python.org/cpython/rev/a1cd431a71c6 changeset: 80045:a1cd431a71c6 parent: 80041:f3e23c0ba51b parent: 80044:74394a6ac5c7 user: Chris Jerdonek date: Sun Oct 28 11:13:51 2012 -0700 summary: Merge from 3.3: remove unneeded "Release" and "Date" markers from index pages. files: Doc/c-api/index.rst | 3 --- Doc/distutils/index.rst | 2 -- Doc/extending/index.rst | 3 --- Doc/faq/index.rst | 3 --- Doc/install/index.rst | 2 -- Doc/library/index.rst | 3 --- Doc/reference/index.rst | 3 --- Doc/tutorial/index.rst | 3 --- 8 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Doc/c-api/index.rst b/Doc/c-api/index.rst --- a/Doc/c-api/index.rst +++ b/Doc/c-api/index.rst @@ -4,9 +4,6 @@ Python/C API Reference Manual ################################## -:Release: |version| -:Date: |today| - This manual documents the API used by C and C++ programmers who want to write extension modules or embed Python. It is a companion to :ref:`extending-index`, which describes the general principles of extension writing but does not diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst --- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -6,8 +6,6 @@ :Authors: Greg Ward, Anthony Baxter :Email: distutils-sig at python.org -:Release: |version| -:Date: |today| This document describes the Python Distribution Utilities ("Distutils") from the module developer's point of view, describing how to use the Distutils to diff --git a/Doc/extending/index.rst b/Doc/extending/index.rst --- a/Doc/extending/index.rst +++ b/Doc/extending/index.rst @@ -4,9 +4,6 @@ Extending and Embedding the Python Interpreter ################################################## -:Release: |version| -:Date: |today| - This document describes how to write modules in C or C++ to extend the Python interpreter with new modules. Those modules can define new functions but also new object types and their methods. The document also describes how to embed diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst --- a/Doc/faq/index.rst +++ b/Doc/faq/index.rst @@ -2,9 +2,6 @@ Python Frequently Asked Questions ################################### -:Release: |version| -:Date: |today| - .. toctree:: :maxdepth: 1 diff --git a/Doc/install/index.rst b/Doc/install/index.rst --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -7,8 +7,6 @@ ***************************** :Author: Greg Ward -:Release: |version| -:Date: |today| .. TODO: Fill in XXX comments diff --git a/Doc/library/index.rst b/Doc/library/index.rst --- a/Doc/library/index.rst +++ b/Doc/library/index.rst @@ -4,9 +4,6 @@ The Python Standard Library ############################### -:Release: |version| -:Date: |today| - While :ref:`reference-index` describes the exact syntax and semantics of the Python language, this library reference manual describes the standard library that is distributed with Python. It also diff --git a/Doc/reference/index.rst b/Doc/reference/index.rst --- a/Doc/reference/index.rst +++ b/Doc/reference/index.rst @@ -4,9 +4,6 @@ The Python Language Reference ################################# -:Release: |version| -:Date: |today| - This reference manual describes the syntax and "core semantics" of the language. It is terse, but attempts to be exact and complete. The semantics of non-essential built-in object types and of the built-in functions and modules diff --git a/Doc/tutorial/index.rst b/Doc/tutorial/index.rst --- a/Doc/tutorial/index.rst +++ b/Doc/tutorial/index.rst @@ -4,9 +4,6 @@ The Python Tutorial ###################### -:Release: |version| -:Date: |today| - Python is an easy to learn, powerful programming language. It has efficient high-level data structures and a simple but effective approach to object-oriented programming. Python's elegant syntax and dynamic typing, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 19:19:36 2012 From: python-checkins at python.org (chris.jerdonek) Date: Sun, 28 Oct 2012 19:19:36 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?= =?utf-8?q?3=2E2=3A_remove_=22Release=22_and_=22Date=22_markers_from_index?= =?utf-8?q?_pages=2E?= Message-ID: <3XqRzr0FCMzRFT@mail.python.org> http://hg.python.org/cpython/rev/95931c48a76f changeset: 80046:95931c48a76f branch: 2.7 parent: 80035:e57e9fb3843b user: Chris Jerdonek date: Sun Oct 28 11:16:36 2012 -0700 summary: Backport from 3.2: remove "Release" and "Date" markers from index pages. files: Doc/c-api/index.rst | 3 --- Doc/distutils/index.rst | 2 -- Doc/extending/index.rst | 3 --- Doc/faq/index.rst | 3 --- Doc/install/index.rst | 2 -- Doc/library/index.rst | 3 --- Doc/reference/index.rst | 3 --- Doc/tutorial/index.rst | 3 --- 8 files changed, 0 insertions(+), 22 deletions(-) diff --git a/Doc/c-api/index.rst b/Doc/c-api/index.rst --- a/Doc/c-api/index.rst +++ b/Doc/c-api/index.rst @@ -4,9 +4,6 @@ Python/C API Reference Manual ################################## -:Release: |version| -:Date: |today| - This manual documents the API used by C and C++ programmers who want to write extension modules or embed Python. It is a companion to :ref:`extending-index`, which describes the general principles of extension writing but does not diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst --- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -6,8 +6,6 @@ :Authors: Greg Ward, Anthony Baxter :Email: distutils-sig at python.org -:Release: |version| -:Date: |today| This document describes the Python Distribution Utilities ("Distutils") from the module developer's point of view, describing how to use the Distutils to diff --git a/Doc/extending/index.rst b/Doc/extending/index.rst --- a/Doc/extending/index.rst +++ b/Doc/extending/index.rst @@ -4,9 +4,6 @@ Extending and Embedding the Python Interpreter ################################################## -:Release: |version| -:Date: |today| - This document describes how to write modules in C or C++ to extend the Python interpreter with new modules. Those modules can define new functions but also new object types and their methods. The document also describes how to embed diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst --- a/Doc/faq/index.rst +++ b/Doc/faq/index.rst @@ -2,9 +2,6 @@ Python Frequently Asked Questions ################################### -:Release: |version| -:Date: |today| - .. toctree:: :maxdepth: 1 diff --git a/Doc/install/index.rst b/Doc/install/index.rst --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -7,8 +7,6 @@ ***************************** :Author: Greg Ward -:Release: |version| -:Date: |today| .. TODO: Fill in XXX comments diff --git a/Doc/library/index.rst b/Doc/library/index.rst --- a/Doc/library/index.rst +++ b/Doc/library/index.rst @@ -4,9 +4,6 @@ The Python Standard Library ############################### -:Release: |version| -:Date: |today| - While :ref:`reference-index` describes the exact syntax and semantics of the Python language, this library reference manual describes the standard library that is distributed with Python. It also diff --git a/Doc/reference/index.rst b/Doc/reference/index.rst --- a/Doc/reference/index.rst +++ b/Doc/reference/index.rst @@ -4,9 +4,6 @@ The Python Language Reference ################################# -:Release: |version| -:Date: |today| - This reference manual describes the syntax and "core semantics" of the language. It is terse, but attempts to be exact and complete. The semantics of non-essential built-in object types and of the built-in functions and modules diff --git a/Doc/tutorial/index.rst b/Doc/tutorial/index.rst --- a/Doc/tutorial/index.rst +++ b/Doc/tutorial/index.rst @@ -4,9 +4,6 @@ The Python Tutorial ###################### -:Release: |version| -:Date: |today| - Python is an easy to learn, powerful programming language. It has efficient high-level data structures and a simple but effective approach to object-oriented programming. Python's elegant syntax and dynamic typing, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Sun Oct 28 22:45:49 2012 From: python-checkins at python.org (daniel.holth) Date: Sun, 28 Oct 2012 22:45:49 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_426_minor_language_cleanu?= =?utf-8?q?p?= Message-ID: <3XqXYn5kPqzPQv@mail.python.org> http://hg.python.org/peps/rev/f9c6cc6d8da5 changeset: 4576:f9c6cc6d8da5 user: Daniel Holth date: Sun Oct 28 17:45:03 2012 -0400 summary: PEP 426 minor language cleanup files: pep-0426.txt | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -38,9 +38,8 @@ arbitrary payload. It is parseable by the ``email`` module with an appropriate ``email.policy.Policy()``. -In Python 3.2, a serviceable read-only parser is:: - - email.parser.Parser().parsestr(metadata) +When ``metadata`` is a Unicode string, +```email.parser.Parser().parsestr(metadata)`` is a serviceable parser. There are two standard locations for these metadata files: @@ -65,11 +64,11 @@ This section specifies the names and semantics of each of the supported metadata fields. -Fields marked with "(optional)" may occur 0 or 1 times. Fields marked -with "(multiple use)" may be specified 0, 1 or more times in a single -metadata file. Only "Metadata-Version", "Name", "Version", and "Summary" -must appear exactly once. The fields may appear in any order within -the file. +In a single Metadata 1.3 file, fields marked with "(optional)" may occur +0 or 1 times. Fields marked with "(multiple use)" may be specified +0, 1 or more times. Only "Metadata-Version", "Name", "Version", and +"Summary" must appear exactly once. The fields may appear in any order +within the file. Metadata-Version :::::::::::::::: -- Repository URL: http://hg.python.org/peps From solipsis at pitrou.net Mon Oct 29 05:56:32 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Mon, 29 Oct 2012 05:56:32 +0100 Subject: [Python-checkins] Daily reference leaks (a1cd431a71c6): sum=0 Message-ID: results for a1cd431a71c6 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogFl52Ie', '-x'] From chris.jerdonek at gmail.com Mon Oct 29 07:44:54 2012 From: chris.jerdonek at gmail.com (Chris Jerdonek) Date: Sun, 28 Oct 2012 23:44:54 -0700 Subject: [Python-checkins] peps: PEP for updating the URL layout on docs.python.org In-Reply-To: <3Xpl5B1cv9zNm1@mail.python.org> References: <3Xpl5B1cv9zNm1@mail.python.org> Message-ID: On Sat, Oct 27, 2012 at 7:36 AM, nick.coghlan wrote: > http://hg.python.org/peps/rev/c7ba002ca91d > changeset: 4568:c7ba002ca91d > user: Nick Coghlan > date: Sun Oct 28 00:36:36 2012 +1000 > summary: > PEP for updating the URL layout on docs.python.org > ... > +Implementation > +============== > + > +The URLs on docs.python.org are controlled by the python.org infrastructure > +team rather than through the CPython source repo, so acceptance and > +implementation of the ideas in this PEP will be up to the team. Related to this, just checking to see if anyone is taking responsibility for following up with http://www.python.org. I imagine they have several links that may no longer point to the correct version (e.g. the "Documentation" link under "Quick Links (2.7.3)" in the left column of the home page now results in http://docs.python.org/3/, and similarly for 2.x on http://www.python.org/doc/ ). --Chris From g.brandl at gmx.net Mon Oct 29 18:24:47 2012 From: g.brandl at gmx.net (Georg Brandl) Date: Mon, 29 Oct 2012 18:24:47 +0100 Subject: [Python-checkins] peps: PEP for updating the URL layout on docs.python.org In-Reply-To: References: <3Xpl5B1cv9zNm1@mail.python.org> Message-ID: Am 29.10.2012 07:44, schrieb Chris Jerdonek: > On Sat, Oct 27, 2012 at 7:36 AM, nick.coghlan > wrote: >> http://hg.python.org/peps/rev/c7ba002ca91d >> changeset: 4568:c7ba002ca91d >> user: Nick Coghlan >> date: Sun Oct 28 00:36:36 2012 +1000 >> summary: >> PEP for updating the URL layout on docs.python.org >> ... >> +Implementation >> +============== >> + >> +The URLs on docs.python.org are controlled by the python.org infrastructure >> +team rather than through the CPython source repo, so acceptance and >> +implementation of the ideas in this PEP will be up to the team. > > Related to this, just checking to see if anyone is taking > responsibility for following up with http://www.python.org. I imagine > they have several links that may no longer point to the correct > version (e.g. the "Documentation" link under "Quick Links (2.7.3)" in > the left column of the home page now results in > http://docs.python.org/3/, and similarly for 2.x on > http://www.python.org/doc/ ). This is now fixed, thanks for the reminder. Georg From python-checkins at python.org Mon Oct 29 18:42:38 2012 From: python-checkins at python.org (ross.lagerwall) Date: Mon, 29 Oct 2012 18:42:38 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_regression?= =?utf-8?q?_from_issue_=2316262?= Message-ID: <3Xr36k0nlRzPf7@mail.python.org> http://hg.python.org/cpython/rev/c6787a4c544e changeset: 80047:c6787a4c544e branch: 3.2 parent: 80043:67d337cf1233 user: Ross Lagerwall date: Mon Oct 29 17:31:54 2012 +0000 summary: Fix regression from issue #16262 files: configure | 277 ++++++++++++++++++++------------------ configure.ac | 2 +- 2 files changed, 147 insertions(+), 132 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,14 +1,12 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for python 3.2. +# Generated by GNU Autoconf 2.69 for python 3.2. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -137,6 +135,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -170,7 +193,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -215,21 +239,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -332,6 +360,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -453,6 +489,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -487,16 +527,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -508,28 +548,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1239,8 +1259,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1526,9 +1544,9 @@ if $ac_init_version; then cat <<\_ACEOF python configure 3.2 -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1604,7 +1622,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1902,7 +1920,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1956,7 +1975,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1972,7 +1992,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2022,7 +2043,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2038,7 +2060,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2064,7 +2087,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2080,7 +2104,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2114,7 +2139,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2357,7 +2383,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by python $as_me 3.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3217,7 +3243,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3257,7 +3283,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3310,7 +3336,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3351,7 +3377,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3409,7 +3435,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3453,7 +3479,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3899,8 +3925,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4039,7 +4064,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4080,7 +4105,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4129,7 +4154,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4360,7 +4385,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4426,7 +4451,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4633,8 +4658,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5033,7 +5058,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5073,7 +5098,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5127,7 +5152,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5177,7 +5202,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_SVNVERSION="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5244,7 +5269,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAS_HG="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5299,7 +5324,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PYTHON="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5324,7 +5349,7 @@ done test -n "$PYTHON" || PYTHON="not-found" -if $PYTHON = not-found; then +if test "$PYTHON" = not-found; then ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" else ASDLGEN="$PYTHON" @@ -5405,7 +5430,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -5474,7 +5499,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -8257,7 +8282,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8300,7 +8325,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9912,7 +9937,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TRUE="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11225,7 +11250,8 @@ main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -11256,11 +11282,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -11277,8 +11303,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -11294,10 +11321,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -14448,16 +14475,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -14517,28 +14544,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -14560,7 +14575,7 @@ # values after options handling. ac_log=" This file was extended by python $as_me 3.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -14622,10 +14637,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ python config.status 3.2 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -14715,7 +14730,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -869,7 +869,7 @@ AC_SUBST(ASDLGEN) AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found) -if $PYTHON = not-found; then +if test "$PYTHON" = not-found; then ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" else ASDLGEN="$PYTHON" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 29 18:42:39 2012 From: python-checkins at python.org (ross.lagerwall) Date: Mon, 29 Oct 2012 18:42:39 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_with_3=2E2_for_issue_=2316262?= Message-ID: <3Xr36l669PzPf7@mail.python.org> http://hg.python.org/cpython/rev/b82a4f8a4c67 changeset: 80048:b82a4f8a4c67 branch: 3.3 parent: 80044:74394a6ac5c7 parent: 80047:c6787a4c544e user: Ross Lagerwall date: Mon Oct 29 17:35:57 2012 +0000 summary: Merge with 3.2 for issue #16262 files: configure | 291 ++++++++++++++++++++------------------ configure.ac | 2 +- 2 files changed, 154 insertions(+), 139 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for python 3.3. +# Generated by GNU Autoconf 2.69 for python 3.3. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1250,8 +1270,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1541,9 +1559,9 @@ if $ac_init_version; then cat <<\_ACEOF python configure 3.3 -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1619,7 +1637,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1917,7 +1935,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1971,7 +1990,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1987,7 +2007,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2037,7 +2058,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2053,7 +2075,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2079,7 +2102,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2095,7 +2119,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2129,7 +2154,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2372,7 +2398,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by python $as_me 3.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2758,7 +2784,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAS_HG="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3547,7 +3573,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3587,7 +3613,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3640,7 +3666,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3681,7 +3707,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3739,7 +3765,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3783,7 +3809,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4229,8 +4255,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4370,7 +4395,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4413,7 +4438,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4468,7 +4493,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4511,7 +4536,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4566,7 +4591,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4609,7 +4634,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4672,7 +4697,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4716,7 +4741,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4959,7 +4984,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5025,7 +5050,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5232,8 +5257,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5629,7 +5654,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5669,7 +5694,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5724,7 +5749,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5768,7 +5793,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5832,7 +5857,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5876,7 +5901,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_READELF="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5941,7 +5966,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PYTHON="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5966,7 +5991,7 @@ done test -n "$PYTHON" || PYTHON="not-found" -if $PYTHON = not-found; then +if test "$PYTHON" = not-found; then ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" else ASDLGEN="$PYTHON" @@ -6018,7 +6043,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -6087,7 +6112,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -8982,7 +9007,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9025,7 +9050,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10632,7 +10657,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TRUE="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12069,7 +12094,8 @@ main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -12100,11 +12126,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -12121,8 +12147,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -12138,10 +12165,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -15473,16 +15500,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -15542,28 +15569,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -15585,7 +15600,7 @@ # values after options handling. ac_log=" This file was extended by python $as_me 3.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15647,10 +15662,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ python config.status 3.3 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15740,7 +15755,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1002,7 +1002,7 @@ AC_SUBST(ASDLGEN) AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found) -if $PYTHON = not-found; then +if test "$PYTHON" = not-found; then ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" else ASDLGEN="$PYTHON" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 29 18:42:41 2012 From: python-checkins at python.org (ross.lagerwall) Date: Mon, 29 Oct 2012 18:42:41 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_with_3=2E3_for_issue_=2316262?= Message-ID: <3Xr36n4HXJzR2P@mail.python.org> http://hg.python.org/cpython/rev/1bee1a176306 changeset: 80049:1bee1a176306 parent: 80045:a1cd431a71c6 parent: 80048:b82a4f8a4c67 user: Ross Lagerwall date: Mon Oct 29 17:39:19 2012 +0000 summary: Merge with 3.3 for issue #16262 files: configure | 291 ++++++++++++++++++++------------------ configure.ac | 2 +- 2 files changed, 154 insertions(+), 139 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for python 3.4. +# Generated by GNU Autoconf 2.69 for python 3.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1250,8 +1270,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1541,9 +1559,9 @@ if $ac_init_version; then cat <<\_ACEOF python configure 3.4 -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1619,7 +1637,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1917,7 +1935,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1971,7 +1990,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1987,7 +2007,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2037,7 +2058,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2053,7 +2075,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2079,7 +2102,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2095,7 +2119,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2129,7 +2154,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2372,7 +2398,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by python $as_me 3.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2758,7 +2784,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAS_HG="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3547,7 +3573,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3587,7 +3613,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3640,7 +3666,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3681,7 +3707,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3739,7 +3765,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3783,7 +3809,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4229,8 +4255,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4370,7 +4395,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4413,7 +4438,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4468,7 +4493,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4511,7 +4536,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4566,7 +4591,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4609,7 +4634,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4672,7 +4697,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4716,7 +4741,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4959,7 +4984,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5025,7 +5050,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5232,8 +5257,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5629,7 +5654,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5669,7 +5694,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5724,7 +5749,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5768,7 +5793,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5832,7 +5857,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5876,7 +5901,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_READELF="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5941,7 +5966,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PYTHON="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5966,7 +5991,7 @@ done test -n "$PYTHON" || PYTHON="not-found" -if $PYTHON = not-found; then +if test "$PYTHON" = not-found; then ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" else ASDLGEN="$PYTHON" @@ -6018,7 +6043,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -6087,7 +6112,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -8982,7 +9007,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9025,7 +9050,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10632,7 +10657,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TRUE="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12069,7 +12094,8 @@ main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -12100,11 +12126,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -12121,8 +12147,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -12138,10 +12165,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -15473,16 +15500,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -15542,28 +15569,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -15585,7 +15600,7 @@ # values after options handling. ac_log=" This file was extended by python $as_me 3.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15647,10 +15662,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ python config.status 3.4 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15740,7 +15755,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1002,7 +1002,7 @@ AC_SUBST(ASDLGEN) AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found) -if $PYTHON = not-found; then +if test "$PYTHON" = not-found; then ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" else ASDLGEN="$PYTHON" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 29 20:29:06 2012 From: python-checkins at python.org (petri.lehtinen) Date: Mon, 29 Oct 2012 20:29:06 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE0ODk3OiBFbmhh?= =?utf-8?q?nce_error_messages_of_struct=2Epack_and_struct=2Epack=5Finto?= Message-ID: <3Xr5TZ2d28zR5L@mail.python.org> http://hg.python.org/cpython/rev/626ed0e06fd6 changeset: 80050:626ed0e06fd6 branch: 2.7 parent: 80046:95931c48a76f user: Petri Lehtinen date: Mon Oct 29 21:16:57 2012 +0200 summary: #14897: Enhance error messages of struct.pack and struct.pack_into Patch by Matti M?ki. files: Misc/ACKS | 3 ++- Misc/NEWS | 3 +++ Modules/_struct.c | 18 ++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -655,6 +655,7 @@ Luke Mewburn Carl Meyer Mike Meyer +Piotr Meyer Steven Miale Trent Mick Tom Middleton @@ -685,7 +686,7 @@ Michael Muller Neil Muller R. David Murray -Piotr Meyer +Matti M?ki Dale Nagata John Nagle Takahiro Nakayama diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -125,6 +125,9 @@ Library ------- +- Issue #14897: Enhance error messages of struct.pack and + struct.pack_into. Patch by Matti M?ki. + - Issue #12890: cgitb no longer prints spurious

    tags in text mode when the logdir option is specified. diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1603,7 +1603,7 @@ if (PyTuple_GET_SIZE(args) != soself->s_len) { PyErr_Format(StructError, - "pack requires exactly %zd arguments", soself->s_len); + "pack expected %zd items for packing (got %zd)", soself->s_len, PyTuple_GET_SIZE(args)); return NULL; } @@ -1642,9 +1642,19 @@ assert(soself->s_codes != NULL); if (PyTuple_GET_SIZE(args) != (soself->s_len + 2)) { - PyErr_Format(StructError, - "pack_into requires exactly %zd arguments", - (soself->s_len + 2)); + if (PyTuple_GET_SIZE(args) == 0) { + PyErr_Format(StructError, + "pack_into expected buffer argument"); + } + else if (PyTuple_GET_SIZE(args) == 1) { + PyErr_Format(StructError, + "pack_into expected offset argument"); + } + else { + PyErr_Format(StructError, + "pack_into expected %zd items for packing (got %zd)", + soself->s_len, (PyTuple_GET_SIZE(args) - 2)); + } return NULL; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 29 20:29:07 2012 From: python-checkins at python.org (petri.lehtinen) Date: Mon, 29 Oct 2012 20:29:07 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE0ODk3OiBFbmhh?= =?utf-8?q?nce_error_messages_of_struct=2Epack_and_struct=2Epack=5Finto?= Message-ID: <3Xr5Tb5LLFzRFS@mail.python.org> http://hg.python.org/cpython/rev/a555bd4026b0 changeset: 80051:a555bd4026b0 branch: 3.2 parent: 80047:c6787a4c544e user: Petri Lehtinen date: Mon Oct 29 21:16:57 2012 +0200 summary: #14897: Enhance error messages of struct.pack and struct.pack_into Patch by Matti M?ki. files: Misc/ACKS | 3 ++- Misc/NEWS | 3 +++ Modules/_struct.c | 18 ++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -710,6 +710,7 @@ Luke Mewburn Carl Meyer Mike Meyer +Piotr Meyer Steven Miale Trent Mick Tom Middleton @@ -742,7 +743,7 @@ Michael Muller Neil Muller R. David Murray -Piotr Meyer +Matti M?ki Dale Nagata John Nagle Takahiro Nakayama diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -135,6 +135,9 @@ Library ------- +- Issue #14897: Enhance error messages of struct.pack and + struct.pack_into. Patch by Matti M?ki. + - Issue #12890: cgitb no longer prints spurious

    tags in text mode when the logdir option is specified. diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1575,7 +1575,7 @@ if (PyTuple_GET_SIZE(args) != soself->s_len) { PyErr_Format(StructError, - "pack requires exactly %zd arguments", soself->s_len); + "pack expected %zd items for packing (got %zd)", soself->s_len, PyTuple_GET_SIZE(args)); return NULL; } @@ -1614,9 +1614,19 @@ assert(soself->s_codes != NULL); if (PyTuple_GET_SIZE(args) != (soself->s_len + 2)) { - PyErr_Format(StructError, - "pack_into requires exactly %zd arguments", - (soself->s_len + 2)); + if (PyTuple_GET_SIZE(args) == 0) { + PyErr_Format(StructError, + "pack_into expected buffer argument"); + } + else if (PyTuple_GET_SIZE(args) == 1) { + PyErr_Format(StructError, + "pack_into expected offset argument"); + } + else { + PyErr_Format(StructError, + "pack_into expected %zd items for packing (got %zd)", + soself->s_len, (PyTuple_GET_SIZE(args) - 2)); + } return NULL; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 29 20:29:09 2012 From: python-checkins at python.org (petri.lehtinen) Date: Mon, 29 Oct 2012 20:29:09 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_=2314897=3A_Enhance_error_messages_of_struct=2Epack_and_struct?= =?utf-8?q?=2Epack=5Finto?= Message-ID: <3Xr5Td0XvTzRG4@mail.python.org> http://hg.python.org/cpython/rev/70d5906e0461 changeset: 80052:70d5906e0461 branch: 3.3 parent: 80048:b82a4f8a4c67 parent: 80051:a555bd4026b0 user: Petri Lehtinen date: Mon Oct 29 21:25:01 2012 +0200 summary: #14897: Enhance error messages of struct.pack and struct.pack_into Patch by Matti M?ki. files: Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/_struct.c | 18 ++++++++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -820,6 +820,7 @@ Neil Muller Louis Munro R. David Murray +Matti M?ki Dale Nagata John Nagle Takahiro Nakayama diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,9 @@ Library ------- +- Issue #14897: Enhance error messages of struct.pack and + struct.pack_into. Patch by Matti M?ki. + - Issue #12890: cgitb no longer prints spurious

    tags in text mode when the logdir option is specified. diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1662,7 +1662,7 @@ if (PyTuple_GET_SIZE(args) != soself->s_len) { PyErr_Format(StructError, - "pack requires exactly %zd arguments", soself->s_len); + "pack expected %zd items for packing (got %zd)", soself->s_len, PyTuple_GET_SIZE(args)); return NULL; } @@ -1701,9 +1701,19 @@ assert(soself->s_codes != NULL); if (PyTuple_GET_SIZE(args) != (soself->s_len + 2)) { - PyErr_Format(StructError, - "pack_into requires exactly %zd arguments", - (soself->s_len + 2)); + if (PyTuple_GET_SIZE(args) == 0) { + PyErr_Format(StructError, + "pack_into expected buffer argument"); + } + else if (PyTuple_GET_SIZE(args) == 1) { + PyErr_Format(StructError, + "pack_into expected offset argument"); + } + else { + PyErr_Format(StructError, + "pack_into expected %zd items for packing (got %zd)", + soself->s_len, (PyTuple_GET_SIZE(args) - 2)); + } return NULL; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Mon Oct 29 20:29:10 2012 From: python-checkins at python.org (petri.lehtinen) Date: Mon, 29 Oct 2012 20:29:10 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_=2314897=3A_Enhance_error_messages_of_struct=2Epack_and_?= =?utf-8?q?struct=2Epack=5Finto?= Message-ID: <3Xr5Tf2sh9zRF8@mail.python.org> http://hg.python.org/cpython/rev/ebc588a3db51 changeset: 80053:ebc588a3db51 parent: 80049:1bee1a176306 parent: 80052:70d5906e0461 user: Petri Lehtinen date: Mon Oct 29 21:26:56 2012 +0200 summary: #14897: Enhance error messages of struct.pack and struct.pack_into Patch by Matti M?ki. files: Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/_struct.c | 18 ++++++++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -820,6 +820,7 @@ Neil Muller Louis Munro R. David Murray +Matti M?ki Dale Nagata John Nagle Takahiro Nakayama diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,9 @@ Library ------- +- Issue #14897: Enhance error messages of struct.pack and + struct.pack_into. Patch by Matti M?ki. + - Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. Patch by Serhiy Storchaka. diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1661,7 +1661,7 @@ if (PyTuple_GET_SIZE(args) != soself->s_len) { PyErr_Format(StructError, - "pack requires exactly %zd arguments", soself->s_len); + "pack expected %zd items for packing (got %zd)", soself->s_len, PyTuple_GET_SIZE(args)); return NULL; } @@ -1700,9 +1700,19 @@ assert(soself->s_codes != NULL); if (PyTuple_GET_SIZE(args) != (soself->s_len + 2)) { - PyErr_Format(StructError, - "pack_into requires exactly %zd arguments", - (soself->s_len + 2)); + if (PyTuple_GET_SIZE(args) == 0) { + PyErr_Format(StructError, + "pack_into expected buffer argument"); + } + else if (PyTuple_GET_SIZE(args) == 1) { + PyErr_Format(StructError, + "pack_into expected offset argument"); + } + else { + PyErr_Format(StructError, + "pack_into expected %zd items for packing (got %zd)", + soself->s_len, (PyTuple_GET_SIZE(args) - 2)); + } return NULL; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 00:21:11 2012 From: python-checkins at python.org (brian.curtin) Date: Tue, 30 Oct 2012 00:21:11 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogRml4ICMxNjE5Ny4g?= =?utf-8?q?Update_docstrings_and_documentation_to_match_winreg_code=2E?= Message-ID: <3XrBdM1cH0zR0m@mail.python.org> http://hg.python.org/cpython/rev/b9e14b89199b changeset: 80054:b9e14b89199b branch: 3.2 parent: 80051:a555bd4026b0 user: Brian Curtin date: Mon Oct 29 18:16:39 2012 -0500 summary: Fix #16197. Update docstrings and documentation to match winreg code. Patch by Zachary Ware. files: Doc/library/winreg.rst | 25 +-- Misc/NEWS | 3 + PC/winreg.c | 200 ++++++++++++++++------------ 3 files changed, 129 insertions(+), 99 deletions(-) diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -60,7 +60,7 @@ :exc:`WindowsError` exception is raised. -.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_ALL_ACCESS) +.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) Creates or opens the specified key, returning a :ref:`handle object `. @@ -70,10 +70,10 @@ *sub_key* is a string that names the key this method opens or creates. - *res* is a reserved integer, and must be zero. The default is zero. + *reserved* is a reserved integer, and must be zero. The default is zero. - *sam* is an integer that specifies an access mask that describes the desired - security access for the key. Default is :const:`KEY_ALL_ACCESS`. See + *access* is an integer that specifies an access mask that describes the desired + security access for the key. Default is :const:`KEY_WRITE`. See :ref:`Access Rights ` for other allowed values. If *key* is one of the predefined keys, *sub_key* may be ``None``. In that @@ -103,7 +103,7 @@ If the method fails, a :exc:`WindowsError` exception is raised. -.. function:: DeleteKeyEx(key, sub_key, access=KEY_ALL_ACCESS, reserved=0) +.. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0) Deletes the specified key. @@ -120,9 +120,9 @@ *key* parameter. This value must not be ``None``, and the key may not have subkeys. - *res* is a reserved integer, and must be zero. The default is zero. + *reserved* is a reserved integer, and must be zero. The default is zero. - *sam* is an integer that specifies an access mask that describes the desired + *access* is an integer that specifies an access mask that describes the desired security access for the key. Default is :const:`KEY_ALL_ACCESS`. See :ref:`Access Rights ` for other allowed values. @@ -244,6 +244,7 @@ .. function:: OpenKey(key, sub_key, reserved=0, access=KEY_READ) + OpenKeyEx(key, sub_key, reserved=0, access=KEY_READ) Opens the specified key, returning a :ref:`handle object `. @@ -265,12 +266,6 @@ .. versionchanged:: 3.2 Allow the use of named arguments. -.. function:: OpenKeyEx() - - The functionality of :func:`OpenKeyEx` is provided via :func:`OpenKey`, - by the use of default arguments. - - .. function:: QueryInfoKey(key) Returns information about a key, as a tuple. @@ -394,11 +389,11 @@ *value_name* is a string that names the subkey with which the value is associated. + *reserved* can be anything -- zero is always passed to the API. + *type* is an integer that specifies the type of the data. See :ref:`Value Types ` for the available types. - *reserved* can be anything -- zero is always passed to the API. - *value* is a string that specifies the new value. This method can also set additional value and type information for the specified diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #16197: Update winreg docstrings and documentation to match code. + Patch by Zachary Ware. + - Issue #14700: Fix buggy overflow checks when handling large precisions and widths in old-style and new-style formatting. diff --git a/PC/winreg.c b/PC/winreg.c --- a/PC/winreg.c +++ b/PC/winreg.c @@ -50,8 +50,8 @@ "FlushKey() - Writes all the attributes of the specified key to the registry.\n" "LoadKey() - Creates a subkey under HKEY_USER or HKEY_LOCAL_MACHINE and stores\n" " registration information from a specified file into that subkey.\n" -"OpenKey() - Alias for \n" -"OpenKeyEx() - Opens the specified key.\n" +"OpenKey() - Opens the specified key.\n" +"OpenKeyEx() - Alias of OpenKey().\n" "QueryValue() - Retrieves the value associated with the unnamed value for a\n" " specified key in the registry.\n" "QueryValueEx() - Retrieves the type and data for a specified value name\n" @@ -72,7 +72,8 @@ PyDoc_STRVAR(CloseKey_doc, -"CloseKey(hkey) - Closes a previously opened registry key.\n" +"CloseKey(hkey)\n" +"Closes a previously opened registry key.\n" "\n" "The hkey argument specifies a previously opened key.\n" "\n" @@ -80,79 +81,91 @@ "closed when the hkey object is destroyed by Python."); PyDoc_STRVAR(ConnectRegistry_doc, -"key = ConnectRegistry(computer_name, key) - " +"ConnectRegistry(computer_name, key) -> key\n" "Establishes a connection to a predefined registry handle on another computer.\n" "\n" "computer_name is the name of the remote computer, of the form \\\\computername.\n" -" If None, the local computer is used.\n" +" If None, the local computer is used.\n" "key is the predefined handle to connect to.\n" "\n" "The return value is the handle of the opened key.\n" "If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(CreateKey_doc, -"key = CreateKey(key, sub_key) - Creates or opens the specified key.\n" +"CreateKey(key, sub_key) -> key\n" +"Creates or opens the specified key.\n" +"\n" +"key is an already open key, or one of the predefined HKEY_* constants.\n" +"sub_key is a string that names the key this method opens or creates.\n" +"\n" +"If key is one of the predefined keys, sub_key may be None. In that case,\n" +"the handle returned is the same key handle passed in to the function.\n" +"\n" +"If the key already exists, this function opens the existing key.\n" +"\n" +"The return value is the handle of the opened key.\n" +"If the function fails, a WindowsError exception is raised."); + +PyDoc_STRVAR(CreateKeyEx_doc, +"CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n" +"Creates or opens the specified key.\n" "\n" "key is an already open key, or one of the predefined HKEY_* constants\n" "sub_key is a string that names the key this method opens or creates.\n" -" If key is one of the predefined keys, sub_key may be None. In that case,\n" -" the handle returned is the same key handle passed in to the function.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the \n" +" desired security access for the key. Default is KEY_WRITE.\n" +"\n" +"If key is one of the predefined keys, sub_key may be None. In that case,\n" +"the handle returned is the same key handle passed in to the function.\n" "\n" "If the key already exists, this function opens the existing key\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, an exception is raised."); - -PyDoc_STRVAR(CreateKeyEx_doc, -"key = CreateKeyEx(key, sub_key, res, sam) - Creates or opens the specified key.\n" -"\n" -"key is an already open key, or one of the predefined HKEY_* constants\n" -"sub_key is a string that names the key this method opens or creates.\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" If key is one of the predefined keys, sub_key may be None. In that case,\n" -" the handle returned is the same key handle passed in to the function.\n" -"\n" -"If the key already exists, this function opens the existing key\n" -"\n" -"The return value is the handle of the opened key.\n" -"If the function fails, an exception is raised."); +"If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(DeleteKey_doc, -"DeleteKey(key, sub_key) - Deletes the specified key.\n" +"DeleteKey(key, sub_key)\n" +"Deletes the specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that must be a subkey of the key identified by the key parameter.\n" -" This value must not be None, and the key may not have subkeys.\n" +"sub_key is a string that must be a subkey of the key identified by the key\n" +" parameter. This value must not be None, and the key may not have\n" +" subkeys.\n" "\n" "This method can not delete keys with subkeys.\n" "\n" -"If the method succeeds, the entire key, including all of its values,\n" -"is removed. If the method fails, a WindowsError exception is raised."); +"If the function succeeds, the entire key, including all of its values,\n" +"is removed. If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(DeleteKeyEx_doc, -"DeleteKeyEx(key, sub_key, sam, res) - Deletes the specified key.\n" +"DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n" +"Deletes the specified key (64-bit OS only).\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that must be a subkey of the key identified by the key parameter.\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" This value must not be None, and the key may not have subkeys.\n" +"sub_key is a string that must be a subkey of the key identified by the key\n" +" parameter. This value must not be None, and the key may not have\n" +" subkeys.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the \n" +" desired security access for the key. Default is KEY_WOW64_64KEY.\n" "\n" "This method can not delete keys with subkeys.\n" "\n" -"If the method succeeds, the entire key, including all of its values,\n" -"is removed. If the method fails, a WindowsError exception is raised.\n" +"If the function succeeds, the entire key, including all of its values,\n" +"is removed. If the function fails, a WindowsError exception is raised.\n" "On unsupported Windows versions, NotImplementedError is raised."); PyDoc_STRVAR(DeleteValue_doc, -"DeleteValue(key, value) - Removes a named value from a registry key.\n" +"DeleteValue(key, value)\n" +"Removes a named value from a registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "value is a string that identifies the value to remove."); PyDoc_STRVAR(EnumKey_doc, -"string = EnumKey(key, index) - Enumerates subkeys of an open registry key.\n" +"EnumKey(key, index) -> string\n" +"Enumerates subkeys of an open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "index is an integer that identifies the index of the key to retrieve.\n" @@ -162,7 +175,8 @@ "raised, indicating no more values are available."); PyDoc_STRVAR(EnumValue_doc, -"tuple = EnumValue(key, index) - Enumerates values of an open registry key.\n" +"EnumValue(key, index) -> tuple\n" +"Enumerates values of an open registry key.\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "index is an integer that identifies the index of the value to retrieve.\n" "\n" @@ -173,35 +187,39 @@ "The result is a tuple of 3 items:\n" "value_name is a string that identifies the value.\n" "value_data is an object that holds the value data, and whose type depends\n" -" on the underlying registry type.\n" +" on the underlying registry type.\n" "data_type is an integer that identifies the type of the value data."); PyDoc_STRVAR(ExpandEnvironmentStrings_doc, -"string = ExpandEnvironmentStrings(string) - Expand environment vars.\n"); +"ExpandEnvironmentStrings(string) -> string\n" +"Expand environment vars.\n"); PyDoc_STRVAR(FlushKey_doc, -"FlushKey(key) - Writes all the attributes of a key to the registry.\n" +"FlushKey(key)\n" +"Writes all the attributes of a key to the registry.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "\n" -"It is not necessary to call RegFlushKey to change a key.\n" -"Registry changes are flushed to disk by the registry using its lazy flusher.\n" -"Registry changes are also flushed to disk at system shutdown.\n" -"Unlike CloseKey(), the FlushKey() method returns only when all the data has\n" -"been written to the registry.\n" -"An application should only call FlushKey() if it requires absolute certainty that registry changes are on disk.\n" -"If you don't know whether a FlushKey() call is required, it probably isn't."); +"It is not necessary to call FlushKey to change a key. Registry changes are\n" +"flushed to disk by the registry using its lazy flusher. Registry changes are\n" +"also flushed to disk at system shutdown. Unlike CloseKey(), the FlushKey()\n" +"method returns only when all the data has been written to the registry.\n" +"\n" +"An application should only call FlushKey() if it requires absolute certainty\n" +"that registry changes are on disk. If you don't know whether a FlushKey()\n" +"call is required, it probably isn't."); PyDoc_STRVAR(LoadKey_doc, -"LoadKey(key, sub_key, file_name) - Creates a subkey under the specified key\n" -"and stores registration information from a specified file into that subkey.\n" +"LoadKey(key, sub_key, file_name)\n" +"Creates a subkey under the specified key and stores registration information\n" +"from a specified file into that subkey.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that identifies the sub_key to load\n" -"file_name is the name of the file to load registry data from.\n" -" This file must have been created with the SaveKey() function.\n" -" Under the file allocation table (FAT) file system, the filename may not\n" -"have an extension.\n" +"sub_key is a string that identifies the sub_key to load.\n" +"file_name is the name of the file to load registry data from. This file must\n" +" have been created with the SaveKey() function. Under the file\n" +" allocation table (FAT) file system, the filename may not have an\n" +" extension.\n" "\n" "A call to LoadKey() fails if the calling process does not have the\n" "SE_RESTORE_PRIVILEGE privilege.\n" @@ -212,13 +230,14 @@ "The docs imply key must be in the HKEY_USER or HKEY_LOCAL_MACHINE tree"); PyDoc_STRVAR(OpenKey_doc, -"key = OpenKey(key, sub_key, res = 0, sam = KEY_READ) - Opens the specified key.\n" +"OpenKey(key, sub_key, reserved=0, access=KEY_READ) -> key\n" +"Opens the specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that identifies the sub_key to open\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" security access for the key. Default is KEY_READ\n" +"sub_key is a string that identifies the sub_key to open.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the desired\n" +" security access for the key. Default is KEY_READ\n" "\n" "The result is a new handle to the specified key\n" "If the function fails, a WindowsError exception is raised."); @@ -226,7 +245,8 @@ PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()"); PyDoc_STRVAR(QueryInfoKey_doc, -"tuple = QueryInfoKey(key) - Returns information about a key.\n" +"QueryInfoKey(key) -> tuple\n" +"Returns information about a key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "\n" @@ -237,44 +257,51 @@ " as 100's of nanoseconds since Jan 1, 1600."); PyDoc_STRVAR(QueryValue_doc, -"string = QueryValue(key, sub_key) - retrieves the unnamed value for a key.\n" +"QueryValue(key, sub_key) -> string\n" +"Retrieves the unnamed value for a key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "sub_key is a string that holds the name of the subkey with which the value\n" -" is associated. If this parameter is None or empty, the function retrieves\n" -" the value set by the SetValue() method for the key identified by key." +" is associated. If this parameter is None or empty, the function\n" +" retrieves the value set by the SetValue() method for the key\n" +" identified by key." "\n" "Values in the registry have name, type, and data components. This method\n" "retrieves the data for a key's first value that has a NULL name.\n" "But the underlying API call doesn't return the type, Lame Lame Lame, DONT USE THIS!!!"); PyDoc_STRVAR(QueryValueEx_doc, -"value,type_id = QueryValueEx(key, value_name) - Retrieves the type and data for a specified value name associated with an open registry key.\n" +"QueryValueEx(key, value_name) -> (value, type_id)\n" +"Retrieves the type and data for a specified value name associated with an\n" +"open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "value_name is a string indicating the value to query"); PyDoc_STRVAR(SaveKey_doc, -"SaveKey(key, file_name) - Saves the specified key, and all its subkeys to the specified file.\n" +"SaveKey(key, file_name)\n" +"Saves the specified key, and all its subkeys to the specified file.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"file_name is the name of the file to save registry data to.\n" -" This file cannot already exist. If this filename includes an extension,\n" -" it cannot be used on file allocation table (FAT) file systems by the\n" -" LoadKey(), ReplaceKey() or RestoreKey() methods.\n" +"file_name is the name of the file to save registry data to. This file cannot\n" +" already exist. If this filename includes an extension, it cannot be\n" +" used on file allocation table (FAT) file systems by the LoadKey(),\n" +" ReplaceKey() or RestoreKey() methods.\n" "\n" -"If key represents a key on a remote computer, the path described by\n" -"file_name is relative to the remote computer.\n" -"The caller of this method must possess the SeBackupPrivilege security privilege.\n" -"This function passes NULL for security_attributes to the API."); +"If key represents a key on a remote computer, the path described by file_name\n" +"is relative to the remote computer.\n" +"\n" +"The caller of this method must possess the SeBackupPrivilege security\n" +"privilege. This function passes NULL for security_attributes to the API."); PyDoc_STRVAR(SetValue_doc, -"SetValue(key, sub_key, type, value) - Associates a value with a specified key.\n" +"SetValue(key, sub_key, type, value)\n" +"Associates a value with a specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "sub_key is a string that names the subkey with which the value is associated.\n" -"type is an integer that specifies the type of the data. Currently this\n" -" must be REG_SZ, meaning only strings are supported.\n" +"type is an integer that specifies the type of the data. Currently this must\n" +" be REG_SZ, meaning only strings are supported.\n" "value is a string that specifies the new value.\n" "\n" "If the key specified by the sub_key parameter does not exist, the SetValue\n" @@ -288,10 +315,12 @@ "KEY_SET_VALUE access."); PyDoc_STRVAR(SetValueEx_doc, -"SetValueEx(key, value_name, reserved, type, value) - Stores data in the value field of an open registry key.\n" +"SetValueEx(key, value_name, reserved, type, value)\n" +"Stores data in the value field of an open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"value_name is a string containing the name of the value to set, or None\n" +"value_name is a string containing the name of the value to set, or None.\n" +"reserved can be anything - zero is always passed to the API.\n" "type is an integer that specifies the type of the data. This should be one of:\n" " REG_BINARY -- Binary data in any form.\n" " REG_DWORD -- A 32-bit number.\n" @@ -306,7 +335,6 @@ " REG_NONE -- No defined value type.\n" " REG_RESOURCE_LIST -- A device-driver resource list.\n" " REG_SZ -- A null-terminated string.\n" -"reserved can be anything - zero is always passed to the API.\n" "value is a string that specifies the new value.\n" "\n" "This method can also set additional value and type information for the\n" @@ -323,6 +351,7 @@ "Disables registry reflection for 32-bit processes running on a 64-bit\n" "Operating System. Will generally raise NotImplemented if executed on\n" "a 32-bit Operating System.\n" +"\n" "If the key is not on the reflection list, the function succeeds but has no effect.\n" "Disabling reflection for a key does not affect reflection of any subkeys."); @@ -332,7 +361,8 @@ "Restoring reflection for a key does not affect reflection of any subkeys."); PyDoc_STRVAR(QueryReflectionKey_doc, -"bool = QueryReflectionKey(hkey) - Determines the reflection state for the specified key.\n" +"QueryReflectionKey(hkey) -> bool\n" +"Determines the reflection state for the specified key.\n" "Will generally raise NotImplemented if executed on a 32-bit Operating System.\n"); /* PyHKEY docstrings */ @@ -360,12 +390,14 @@ PyDoc_STRVAR(PyHKEY_Close_doc, -"key.Close() - Closes the underlying Windows handle.\n" +"key.Close()\n" +"Closes the underlying Windows handle.\n" "\n" "If the handle is already closed, no error is raised."); PyDoc_STRVAR(PyHKEY_Detach_doc, -"int = key.Detach() - Detaches the Windows handle from the handle object.\n" +"key.Detach() -> int\n" +"Detaches the Windows handle from the handle object.\n" "\n" "The result is the value of the handle before it is detached. If the\n" "handle is already detached, this will return zero.\n" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 00:21:13 2012 From: python-checkins at python.org (brian.curtin) Date: Tue, 30 Oct 2012 00:21:13 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_3=2E2?= Message-ID: <3XrBdP5qnCzR6w@mail.python.org> http://hg.python.org/cpython/rev/ed00aab17d8c changeset: 80055:ed00aab17d8c branch: 3.3 parent: 80052:70d5906e0461 parent: 80054:b9e14b89199b user: Brian Curtin date: Mon Oct 29 18:18:43 2012 -0500 summary: Merge 3.2 files: Doc/library/winreg.rst | 25 +-- Misc/NEWS | 3 + PC/winreg.c | 200 ++++++++++++++++------------ 3 files changed, 129 insertions(+), 99 deletions(-) diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -68,7 +68,7 @@ alias of :exc:`OSError`. -.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_ALL_ACCESS) +.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) Creates or opens the specified key, returning a :ref:`handle object `. @@ -78,10 +78,10 @@ *sub_key* is a string that names the key this method opens or creates. - *res* is a reserved integer, and must be zero. The default is zero. + *reserved* is a reserved integer, and must be zero. The default is zero. - *sam* is an integer that specifies an access mask that describes the desired - security access for the key. Default is :const:`KEY_ALL_ACCESS`. See + *access* is an integer that specifies an access mask that describes the desired + security access for the key. Default is :const:`KEY_WRITE`. See :ref:`Access Rights ` for other allowed values. If *key* is one of the predefined keys, *sub_key* may be ``None``. In that @@ -119,7 +119,7 @@ alias of :exc:`OSError`. -.. function:: DeleteKeyEx(key, sub_key, access=KEY_ALL_ACCESS, reserved=0) +.. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0) Deletes the specified key. @@ -136,9 +136,9 @@ *key* parameter. This value must not be ``None``, and the key may not have subkeys. - *res* is a reserved integer, and must be zero. The default is zero. + *reserved* is a reserved integer, and must be zero. The default is zero. - *sam* is an integer that specifies an access mask that describes the desired + *access* is an integer that specifies an access mask that describes the desired security access for the key. Default is :const:`KEY_ALL_ACCESS`. See :ref:`Access Rights ` for other allowed values. @@ -272,6 +272,7 @@ .. function:: OpenKey(key, sub_key, reserved=0, access=KEY_READ) + OpenKeyEx(key, sub_key, reserved=0, access=KEY_READ) Opens the specified key, returning a :ref:`handle object `. @@ -298,12 +299,6 @@ alias of :exc:`OSError`. -.. function:: OpenKeyEx() - - The functionality of :func:`OpenKeyEx` is provided via :func:`OpenKey`, - by the use of default arguments. - - .. function:: QueryInfoKey(key) Returns information about a key, as a tuple. @@ -427,11 +422,11 @@ *value_name* is a string that names the subkey with which the value is associated. + *reserved* can be anything -- zero is always passed to the API. + *type* is an integer that specifies the type of the data. See :ref:`Value Types ` for the available types. - *reserved* can be anything -- zero is always passed to the API. - *value* is a string that specifies the new value. This method can also set additional value and type information for the specified diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #16197: Update winreg docstrings and documentation to match code. + Patch by Zachary Ware. + - Issue #16241: Document -X faulthandler command line option. Patch by Marek ?uppa. diff --git a/PC/winreg.c b/PC/winreg.c --- a/PC/winreg.c +++ b/PC/winreg.c @@ -50,8 +50,8 @@ "FlushKey() - Writes all the attributes of the specified key to the registry.\n" "LoadKey() - Creates a subkey under HKEY_USER or HKEY_LOCAL_MACHINE and stores\n" " registration information from a specified file into that subkey.\n" -"OpenKey() - Alias for \n" -"OpenKeyEx() - Opens the specified key.\n" +"OpenKey() - Opens the specified key.\n" +"OpenKeyEx() - Alias of OpenKey().\n" "QueryValue() - Retrieves the value associated with the unnamed value for a\n" " specified key in the registry.\n" "QueryValueEx() - Retrieves the type and data for a specified value name\n" @@ -72,7 +72,8 @@ PyDoc_STRVAR(CloseKey_doc, -"CloseKey(hkey) - Closes a previously opened registry key.\n" +"CloseKey(hkey)\n" +"Closes a previously opened registry key.\n" "\n" "The hkey argument specifies a previously opened key.\n" "\n" @@ -80,79 +81,91 @@ "closed when the hkey object is destroyed by Python."); PyDoc_STRVAR(ConnectRegistry_doc, -"key = ConnectRegistry(computer_name, key) - " +"ConnectRegistry(computer_name, key) -> key\n" "Establishes a connection to a predefined registry handle on another computer.\n" "\n" "computer_name is the name of the remote computer, of the form \\\\computername.\n" -" If None, the local computer is used.\n" +" If None, the local computer is used.\n" "key is the predefined handle to connect to.\n" "\n" "The return value is the handle of the opened key.\n" "If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(CreateKey_doc, -"key = CreateKey(key, sub_key) - Creates or opens the specified key.\n" +"CreateKey(key, sub_key) -> key\n" +"Creates or opens the specified key.\n" +"\n" +"key is an already open key, or one of the predefined HKEY_* constants.\n" +"sub_key is a string that names the key this method opens or creates.\n" +"\n" +"If key is one of the predefined keys, sub_key may be None. In that case,\n" +"the handle returned is the same key handle passed in to the function.\n" +"\n" +"If the key already exists, this function opens the existing key.\n" +"\n" +"The return value is the handle of the opened key.\n" +"If the function fails, a WindowsError exception is raised."); + +PyDoc_STRVAR(CreateKeyEx_doc, +"CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n" +"Creates or opens the specified key.\n" "\n" "key is an already open key, or one of the predefined HKEY_* constants\n" "sub_key is a string that names the key this method opens or creates.\n" -" If key is one of the predefined keys, sub_key may be None. In that case,\n" -" the handle returned is the same key handle passed in to the function.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the \n" +" desired security access for the key. Default is KEY_WRITE.\n" +"\n" +"If key is one of the predefined keys, sub_key may be None. In that case,\n" +"the handle returned is the same key handle passed in to the function.\n" "\n" "If the key already exists, this function opens the existing key\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, an exception is raised."); - -PyDoc_STRVAR(CreateKeyEx_doc, -"key = CreateKeyEx(key, sub_key, res, sam) - Creates or opens the specified key.\n" -"\n" -"key is an already open key, or one of the predefined HKEY_* constants\n" -"sub_key is a string that names the key this method opens or creates.\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" If key is one of the predefined keys, sub_key may be None. In that case,\n" -" the handle returned is the same key handle passed in to the function.\n" -"\n" -"If the key already exists, this function opens the existing key\n" -"\n" -"The return value is the handle of the opened key.\n" -"If the function fails, an exception is raised."); +"If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(DeleteKey_doc, -"DeleteKey(key, sub_key) - Deletes the specified key.\n" +"DeleteKey(key, sub_key)\n" +"Deletes the specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that must be a subkey of the key identified by the key parameter.\n" -" This value must not be None, and the key may not have subkeys.\n" +"sub_key is a string that must be a subkey of the key identified by the key\n" +" parameter. This value must not be None, and the key may not have\n" +" subkeys.\n" "\n" "This method can not delete keys with subkeys.\n" "\n" -"If the method succeeds, the entire key, including all of its values,\n" -"is removed. If the method fails, a WindowsError exception is raised."); +"If the function succeeds, the entire key, including all of its values,\n" +"is removed. If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(DeleteKeyEx_doc, -"DeleteKeyEx(key, sub_key, sam, res) - Deletes the specified key.\n" +"DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n" +"Deletes the specified key (64-bit OS only).\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that must be a subkey of the key identified by the key parameter.\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" This value must not be None, and the key may not have subkeys.\n" +"sub_key is a string that must be a subkey of the key identified by the key\n" +" parameter. This value must not be None, and the key may not have\n" +" subkeys.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the \n" +" desired security access for the key. Default is KEY_WOW64_64KEY.\n" "\n" "This method can not delete keys with subkeys.\n" "\n" -"If the method succeeds, the entire key, including all of its values,\n" -"is removed. If the method fails, a WindowsError exception is raised.\n" +"If the function succeeds, the entire key, including all of its values,\n" +"is removed. If the function fails, a WindowsError exception is raised.\n" "On unsupported Windows versions, NotImplementedError is raised."); PyDoc_STRVAR(DeleteValue_doc, -"DeleteValue(key, value) - Removes a named value from a registry key.\n" +"DeleteValue(key, value)\n" +"Removes a named value from a registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "value is a string that identifies the value to remove."); PyDoc_STRVAR(EnumKey_doc, -"string = EnumKey(key, index) - Enumerates subkeys of an open registry key.\n" +"EnumKey(key, index) -> string\n" +"Enumerates subkeys of an open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "index is an integer that identifies the index of the key to retrieve.\n" @@ -162,7 +175,8 @@ "raised, indicating no more values are available."); PyDoc_STRVAR(EnumValue_doc, -"tuple = EnumValue(key, index) - Enumerates values of an open registry key.\n" +"EnumValue(key, index) -> tuple\n" +"Enumerates values of an open registry key.\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "index is an integer that identifies the index of the value to retrieve.\n" "\n" @@ -173,35 +187,39 @@ "The result is a tuple of 3 items:\n" "value_name is a string that identifies the value.\n" "value_data is an object that holds the value data, and whose type depends\n" -" on the underlying registry type.\n" +" on the underlying registry type.\n" "data_type is an integer that identifies the type of the value data."); PyDoc_STRVAR(ExpandEnvironmentStrings_doc, -"string = ExpandEnvironmentStrings(string) - Expand environment vars.\n"); +"ExpandEnvironmentStrings(string) -> string\n" +"Expand environment vars.\n"); PyDoc_STRVAR(FlushKey_doc, -"FlushKey(key) - Writes all the attributes of a key to the registry.\n" +"FlushKey(key)\n" +"Writes all the attributes of a key to the registry.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "\n" -"It is not necessary to call RegFlushKey to change a key.\n" -"Registry changes are flushed to disk by the registry using its lazy flusher.\n" -"Registry changes are also flushed to disk at system shutdown.\n" -"Unlike CloseKey(), the FlushKey() method returns only when all the data has\n" -"been written to the registry.\n" -"An application should only call FlushKey() if it requires absolute certainty that registry changes are on disk.\n" -"If you don't know whether a FlushKey() call is required, it probably isn't."); +"It is not necessary to call FlushKey to change a key. Registry changes are\n" +"flushed to disk by the registry using its lazy flusher. Registry changes are\n" +"also flushed to disk at system shutdown. Unlike CloseKey(), the FlushKey()\n" +"method returns only when all the data has been written to the registry.\n" +"\n" +"An application should only call FlushKey() if it requires absolute certainty\n" +"that registry changes are on disk. If you don't know whether a FlushKey()\n" +"call is required, it probably isn't."); PyDoc_STRVAR(LoadKey_doc, -"LoadKey(key, sub_key, file_name) - Creates a subkey under the specified key\n" -"and stores registration information from a specified file into that subkey.\n" +"LoadKey(key, sub_key, file_name)\n" +"Creates a subkey under the specified key and stores registration information\n" +"from a specified file into that subkey.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that identifies the sub_key to load\n" -"file_name is the name of the file to load registry data from.\n" -" This file must have been created with the SaveKey() function.\n" -" Under the file allocation table (FAT) file system, the filename may not\n" -"have an extension.\n" +"sub_key is a string that identifies the sub_key to load.\n" +"file_name is the name of the file to load registry data from. This file must\n" +" have been created with the SaveKey() function. Under the file\n" +" allocation table (FAT) file system, the filename may not have an\n" +" extension.\n" "\n" "A call to LoadKey() fails if the calling process does not have the\n" "SE_RESTORE_PRIVILEGE privilege.\n" @@ -212,13 +230,14 @@ "The docs imply key must be in the HKEY_USER or HKEY_LOCAL_MACHINE tree"); PyDoc_STRVAR(OpenKey_doc, -"key = OpenKey(key, sub_key, res = 0, sam = KEY_READ) - Opens the specified key.\n" +"OpenKey(key, sub_key, reserved=0, access=KEY_READ) -> key\n" +"Opens the specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that identifies the sub_key to open\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" security access for the key. Default is KEY_READ\n" +"sub_key is a string that identifies the sub_key to open.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the desired\n" +" security access for the key. Default is KEY_READ\n" "\n" "The result is a new handle to the specified key\n" "If the function fails, a WindowsError exception is raised."); @@ -226,7 +245,8 @@ PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()"); PyDoc_STRVAR(QueryInfoKey_doc, -"tuple = QueryInfoKey(key) - Returns information about a key.\n" +"QueryInfoKey(key) -> tuple\n" +"Returns information about a key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "\n" @@ -237,44 +257,51 @@ " as 100's of nanoseconds since Jan 1, 1600."); PyDoc_STRVAR(QueryValue_doc, -"string = QueryValue(key, sub_key) - retrieves the unnamed value for a key.\n" +"QueryValue(key, sub_key) -> string\n" +"Retrieves the unnamed value for a key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "sub_key is a string that holds the name of the subkey with which the value\n" -" is associated. If this parameter is None or empty, the function retrieves\n" -" the value set by the SetValue() method for the key identified by key." +" is associated. If this parameter is None or empty, the function\n" +" retrieves the value set by the SetValue() method for the key\n" +" identified by key." "\n" "Values in the registry have name, type, and data components. This method\n" "retrieves the data for a key's first value that has a NULL name.\n" "But the underlying API call doesn't return the type, Lame Lame Lame, DONT USE THIS!!!"); PyDoc_STRVAR(QueryValueEx_doc, -"value,type_id = QueryValueEx(key, value_name) - Retrieves the type and data for a specified value name associated with an open registry key.\n" +"QueryValueEx(key, value_name) -> (value, type_id)\n" +"Retrieves the type and data for a specified value name associated with an\n" +"open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "value_name is a string indicating the value to query"); PyDoc_STRVAR(SaveKey_doc, -"SaveKey(key, file_name) - Saves the specified key, and all its subkeys to the specified file.\n" +"SaveKey(key, file_name)\n" +"Saves the specified key, and all its subkeys to the specified file.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"file_name is the name of the file to save registry data to.\n" -" This file cannot already exist. If this filename includes an extension,\n" -" it cannot be used on file allocation table (FAT) file systems by the\n" -" LoadKey(), ReplaceKey() or RestoreKey() methods.\n" +"file_name is the name of the file to save registry data to. This file cannot\n" +" already exist. If this filename includes an extension, it cannot be\n" +" used on file allocation table (FAT) file systems by the LoadKey(),\n" +" ReplaceKey() or RestoreKey() methods.\n" "\n" -"If key represents a key on a remote computer, the path described by\n" -"file_name is relative to the remote computer.\n" -"The caller of this method must possess the SeBackupPrivilege security privilege.\n" -"This function passes NULL for security_attributes to the API."); +"If key represents a key on a remote computer, the path described by file_name\n" +"is relative to the remote computer.\n" +"\n" +"The caller of this method must possess the SeBackupPrivilege security\n" +"privilege. This function passes NULL for security_attributes to the API."); PyDoc_STRVAR(SetValue_doc, -"SetValue(key, sub_key, type, value) - Associates a value with a specified key.\n" +"SetValue(key, sub_key, type, value)\n" +"Associates a value with a specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "sub_key is a string that names the subkey with which the value is associated.\n" -"type is an integer that specifies the type of the data. Currently this\n" -" must be REG_SZ, meaning only strings are supported.\n" +"type is an integer that specifies the type of the data. Currently this must\n" +" be REG_SZ, meaning only strings are supported.\n" "value is a string that specifies the new value.\n" "\n" "If the key specified by the sub_key parameter does not exist, the SetValue\n" @@ -288,10 +315,12 @@ "KEY_SET_VALUE access."); PyDoc_STRVAR(SetValueEx_doc, -"SetValueEx(key, value_name, reserved, type, value) - Stores data in the value field of an open registry key.\n" +"SetValueEx(key, value_name, reserved, type, value)\n" +"Stores data in the value field of an open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"value_name is a string containing the name of the value to set, or None\n" +"value_name is a string containing the name of the value to set, or None.\n" +"reserved can be anything - zero is always passed to the API.\n" "type is an integer that specifies the type of the data. This should be one of:\n" " REG_BINARY -- Binary data in any form.\n" " REG_DWORD -- A 32-bit number.\n" @@ -306,7 +335,6 @@ " REG_NONE -- No defined value type.\n" " REG_RESOURCE_LIST -- A device-driver resource list.\n" " REG_SZ -- A null-terminated string.\n" -"reserved can be anything - zero is always passed to the API.\n" "value is a string that specifies the new value.\n" "\n" "This method can also set additional value and type information for the\n" @@ -323,6 +351,7 @@ "Disables registry reflection for 32-bit processes running on a 64-bit\n" "Operating System. Will generally raise NotImplemented if executed on\n" "a 32-bit Operating System.\n" +"\n" "If the key is not on the reflection list, the function succeeds but has no effect.\n" "Disabling reflection for a key does not affect reflection of any subkeys."); @@ -332,7 +361,8 @@ "Restoring reflection for a key does not affect reflection of any subkeys."); PyDoc_STRVAR(QueryReflectionKey_doc, -"bool = QueryReflectionKey(hkey) - Determines the reflection state for the specified key.\n" +"QueryReflectionKey(hkey) -> bool\n" +"Determines the reflection state for the specified key.\n" "Will generally raise NotImplemented if executed on a 32-bit Operating System.\n"); /* PyHKEY docstrings */ @@ -360,12 +390,14 @@ PyDoc_STRVAR(PyHKEY_Close_doc, -"key.Close() - Closes the underlying Windows handle.\n" +"key.Close()\n" +"Closes the underlying Windows handle.\n" "\n" "If the handle is already closed, no error is raised."); PyDoc_STRVAR(PyHKEY_Detach_doc, -"int = key.Detach() - Detaches the Windows handle from the handle object.\n" +"key.Detach() -> int\n" +"Detaches the Windows handle from the handle object.\n" "\n" "The result is the value of the handle before it is detached. If the\n" "handle is already detached, this will return zero.\n" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 00:21:16 2012 From: python-checkins at python.org (brian.curtin) Date: Tue, 30 Oct 2012 00:21:16 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogTWVyZ2UgMy4z?= Message-ID: <3XrBdS2WKnzPf7@mail.python.org> http://hg.python.org/cpython/rev/6961c8af54f8 changeset: 80056:6961c8af54f8 parent: 80053:ebc588a3db51 parent: 80055:ed00aab17d8c user: Brian Curtin date: Mon Oct 29 18:20:18 2012 -0500 summary: Merge 3.3 files: Doc/library/winreg.rst | 25 +-- Misc/NEWS | 3 + PC/winreg.c | 200 ++++++++++++++++------------ 3 files changed, 129 insertions(+), 99 deletions(-) diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -68,7 +68,7 @@ alias of :exc:`OSError`. -.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_ALL_ACCESS) +.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) Creates or opens the specified key, returning a :ref:`handle object `. @@ -78,10 +78,10 @@ *sub_key* is a string that names the key this method opens or creates. - *res* is a reserved integer, and must be zero. The default is zero. + *reserved* is a reserved integer, and must be zero. The default is zero. - *sam* is an integer that specifies an access mask that describes the desired - security access for the key. Default is :const:`KEY_ALL_ACCESS`. See + *access* is an integer that specifies an access mask that describes the desired + security access for the key. Default is :const:`KEY_WRITE`. See :ref:`Access Rights ` for other allowed values. If *key* is one of the predefined keys, *sub_key* may be ``None``. In that @@ -119,7 +119,7 @@ alias of :exc:`OSError`. -.. function:: DeleteKeyEx(key, sub_key, access=KEY_ALL_ACCESS, reserved=0) +.. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0) Deletes the specified key. @@ -136,9 +136,9 @@ *key* parameter. This value must not be ``None``, and the key may not have subkeys. - *res* is a reserved integer, and must be zero. The default is zero. + *reserved* is a reserved integer, and must be zero. The default is zero. - *sam* is an integer that specifies an access mask that describes the desired + *access* is an integer that specifies an access mask that describes the desired security access for the key. Default is :const:`KEY_ALL_ACCESS`. See :ref:`Access Rights ` for other allowed values. @@ -272,6 +272,7 @@ .. function:: OpenKey(key, sub_key, reserved=0, access=KEY_READ) + OpenKeyEx(key, sub_key, reserved=0, access=KEY_READ) Opens the specified key, returning a :ref:`handle object `. @@ -298,12 +299,6 @@ alias of :exc:`OSError`. -.. function:: OpenKeyEx() - - The functionality of :func:`OpenKeyEx` is provided via :func:`OpenKey`, - by the use of default arguments. - - .. function:: QueryInfoKey(key) Returns information about a key, as a tuple. @@ -427,11 +422,11 @@ *value_name* is a string that names the subkey with which the value is associated. + *reserved* can be anything -- zero is always passed to the API. + *type* is an integer that specifies the type of the data. See :ref:`Value Types ` for the available types. - *reserved* can be anything -- zero is always passed to the API. - *value* is a string that specifies the new value. This method can also set additional value and type information for the specified diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #16197: Update winreg docstrings and documentation to match code. + Patch by Zachary Ware. + - Issue #16241: Document -X faulthandler command line option. Patch by Marek ?uppa. diff --git a/PC/winreg.c b/PC/winreg.c --- a/PC/winreg.c +++ b/PC/winreg.c @@ -50,8 +50,8 @@ "FlushKey() - Writes all the attributes of the specified key to the registry.\n" "LoadKey() - Creates a subkey under HKEY_USER or HKEY_LOCAL_MACHINE and stores\n" " registration information from a specified file into that subkey.\n" -"OpenKey() - Alias for \n" -"OpenKeyEx() - Opens the specified key.\n" +"OpenKey() - Opens the specified key.\n" +"OpenKeyEx() - Alias of OpenKey().\n" "QueryValue() - Retrieves the value associated with the unnamed value for a\n" " specified key in the registry.\n" "QueryValueEx() - Retrieves the type and data for a specified value name\n" @@ -72,7 +72,8 @@ PyDoc_STRVAR(CloseKey_doc, -"CloseKey(hkey) - Closes a previously opened registry key.\n" +"CloseKey(hkey)\n" +"Closes a previously opened registry key.\n" "\n" "The hkey argument specifies a previously opened key.\n" "\n" @@ -80,79 +81,91 @@ "closed when the hkey object is destroyed by Python."); PyDoc_STRVAR(ConnectRegistry_doc, -"key = ConnectRegistry(computer_name, key) - " +"ConnectRegistry(computer_name, key) -> key\n" "Establishes a connection to a predefined registry handle on another computer.\n" "\n" "computer_name is the name of the remote computer, of the form \\\\computername.\n" -" If None, the local computer is used.\n" +" If None, the local computer is used.\n" "key is the predefined handle to connect to.\n" "\n" "The return value is the handle of the opened key.\n" "If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(CreateKey_doc, -"key = CreateKey(key, sub_key) - Creates or opens the specified key.\n" +"CreateKey(key, sub_key) -> key\n" +"Creates or opens the specified key.\n" +"\n" +"key is an already open key, or one of the predefined HKEY_* constants.\n" +"sub_key is a string that names the key this method opens or creates.\n" +"\n" +"If key is one of the predefined keys, sub_key may be None. In that case,\n" +"the handle returned is the same key handle passed in to the function.\n" +"\n" +"If the key already exists, this function opens the existing key.\n" +"\n" +"The return value is the handle of the opened key.\n" +"If the function fails, a WindowsError exception is raised."); + +PyDoc_STRVAR(CreateKeyEx_doc, +"CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n" +"Creates or opens the specified key.\n" "\n" "key is an already open key, or one of the predefined HKEY_* constants\n" "sub_key is a string that names the key this method opens or creates.\n" -" If key is one of the predefined keys, sub_key may be None. In that case,\n" -" the handle returned is the same key handle passed in to the function.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the \n" +" desired security access for the key. Default is KEY_WRITE.\n" +"\n" +"If key is one of the predefined keys, sub_key may be None. In that case,\n" +"the handle returned is the same key handle passed in to the function.\n" "\n" "If the key already exists, this function opens the existing key\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, an exception is raised."); - -PyDoc_STRVAR(CreateKeyEx_doc, -"key = CreateKeyEx(key, sub_key, res, sam) - Creates or opens the specified key.\n" -"\n" -"key is an already open key, or one of the predefined HKEY_* constants\n" -"sub_key is a string that names the key this method opens or creates.\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" If key is one of the predefined keys, sub_key may be None. In that case,\n" -" the handle returned is the same key handle passed in to the function.\n" -"\n" -"If the key already exists, this function opens the existing key\n" -"\n" -"The return value is the handle of the opened key.\n" -"If the function fails, an exception is raised."); +"If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(DeleteKey_doc, -"DeleteKey(key, sub_key) - Deletes the specified key.\n" +"DeleteKey(key, sub_key)\n" +"Deletes the specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that must be a subkey of the key identified by the key parameter.\n" -" This value must not be None, and the key may not have subkeys.\n" +"sub_key is a string that must be a subkey of the key identified by the key\n" +" parameter. This value must not be None, and the key may not have\n" +" subkeys.\n" "\n" "This method can not delete keys with subkeys.\n" "\n" -"If the method succeeds, the entire key, including all of its values,\n" -"is removed. If the method fails, a WindowsError exception is raised."); +"If the function succeeds, the entire key, including all of its values,\n" +"is removed. If the function fails, a WindowsError exception is raised."); PyDoc_STRVAR(DeleteKeyEx_doc, -"DeleteKeyEx(key, sub_key, sam, res) - Deletes the specified key.\n" +"DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n" +"Deletes the specified key (64-bit OS only).\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that must be a subkey of the key identified by the key parameter.\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" This value must not be None, and the key may not have subkeys.\n" +"sub_key is a string that must be a subkey of the key identified by the key\n" +" parameter. This value must not be None, and the key may not have\n" +" subkeys.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the \n" +" desired security access for the key. Default is KEY_WOW64_64KEY.\n" "\n" "This method can not delete keys with subkeys.\n" "\n" -"If the method succeeds, the entire key, including all of its values,\n" -"is removed. If the method fails, a WindowsError exception is raised.\n" +"If the function succeeds, the entire key, including all of its values,\n" +"is removed. If the function fails, a WindowsError exception is raised.\n" "On unsupported Windows versions, NotImplementedError is raised."); PyDoc_STRVAR(DeleteValue_doc, -"DeleteValue(key, value) - Removes a named value from a registry key.\n" +"DeleteValue(key, value)\n" +"Removes a named value from a registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "value is a string that identifies the value to remove."); PyDoc_STRVAR(EnumKey_doc, -"string = EnumKey(key, index) - Enumerates subkeys of an open registry key.\n" +"EnumKey(key, index) -> string\n" +"Enumerates subkeys of an open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "index is an integer that identifies the index of the key to retrieve.\n" @@ -162,7 +175,8 @@ "raised, indicating no more values are available."); PyDoc_STRVAR(EnumValue_doc, -"tuple = EnumValue(key, index) - Enumerates values of an open registry key.\n" +"EnumValue(key, index) -> tuple\n" +"Enumerates values of an open registry key.\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "index is an integer that identifies the index of the value to retrieve.\n" "\n" @@ -173,35 +187,39 @@ "The result is a tuple of 3 items:\n" "value_name is a string that identifies the value.\n" "value_data is an object that holds the value data, and whose type depends\n" -" on the underlying registry type.\n" +" on the underlying registry type.\n" "data_type is an integer that identifies the type of the value data."); PyDoc_STRVAR(ExpandEnvironmentStrings_doc, -"string = ExpandEnvironmentStrings(string) - Expand environment vars.\n"); +"ExpandEnvironmentStrings(string) -> string\n" +"Expand environment vars.\n"); PyDoc_STRVAR(FlushKey_doc, -"FlushKey(key) - Writes all the attributes of a key to the registry.\n" +"FlushKey(key)\n" +"Writes all the attributes of a key to the registry.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "\n" -"It is not necessary to call RegFlushKey to change a key.\n" -"Registry changes are flushed to disk by the registry using its lazy flusher.\n" -"Registry changes are also flushed to disk at system shutdown.\n" -"Unlike CloseKey(), the FlushKey() method returns only when all the data has\n" -"been written to the registry.\n" -"An application should only call FlushKey() if it requires absolute certainty that registry changes are on disk.\n" -"If you don't know whether a FlushKey() call is required, it probably isn't."); +"It is not necessary to call FlushKey to change a key. Registry changes are\n" +"flushed to disk by the registry using its lazy flusher. Registry changes are\n" +"also flushed to disk at system shutdown. Unlike CloseKey(), the FlushKey()\n" +"method returns only when all the data has been written to the registry.\n" +"\n" +"An application should only call FlushKey() if it requires absolute certainty\n" +"that registry changes are on disk. If you don't know whether a FlushKey()\n" +"call is required, it probably isn't."); PyDoc_STRVAR(LoadKey_doc, -"LoadKey(key, sub_key, file_name) - Creates a subkey under the specified key\n" -"and stores registration information from a specified file into that subkey.\n" +"LoadKey(key, sub_key, file_name)\n" +"Creates a subkey under the specified key and stores registration information\n" +"from a specified file into that subkey.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that identifies the sub_key to load\n" -"file_name is the name of the file to load registry data from.\n" -" This file must have been created with the SaveKey() function.\n" -" Under the file allocation table (FAT) file system, the filename may not\n" -"have an extension.\n" +"sub_key is a string that identifies the sub_key to load.\n" +"file_name is the name of the file to load registry data from. This file must\n" +" have been created with the SaveKey() function. Under the file\n" +" allocation table (FAT) file system, the filename may not have an\n" +" extension.\n" "\n" "A call to LoadKey() fails if the calling process does not have the\n" "SE_RESTORE_PRIVILEGE privilege.\n" @@ -212,13 +230,14 @@ "The docs imply key must be in the HKEY_USER or HKEY_LOCAL_MACHINE tree"); PyDoc_STRVAR(OpenKey_doc, -"key = OpenKey(key, sub_key, res = 0, sam = KEY_READ) - Opens the specified key.\n" +"OpenKey(key, sub_key, reserved=0, access=KEY_READ) -> key\n" +"Opens the specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"sub_key is a string that identifies the sub_key to open\n" -"res is a reserved integer, and must be zero. Default is zero.\n" -"sam is an integer that specifies an access mask that describes the desired\n" -" security access for the key. Default is KEY_READ\n" +"sub_key is a string that identifies the sub_key to open.\n" +"reserved is a reserved integer, and must be zero. Default is zero.\n" +"access is an integer that specifies an access mask that describes the desired\n" +" security access for the key. Default is KEY_READ\n" "\n" "The result is a new handle to the specified key\n" "If the function fails, a WindowsError exception is raised."); @@ -226,7 +245,8 @@ PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()"); PyDoc_STRVAR(QueryInfoKey_doc, -"tuple = QueryInfoKey(key) - Returns information about a key.\n" +"QueryInfoKey(key) -> tuple\n" +"Returns information about a key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "\n" @@ -237,44 +257,51 @@ " as 100's of nanoseconds since Jan 1, 1600."); PyDoc_STRVAR(QueryValue_doc, -"string = QueryValue(key, sub_key) - retrieves the unnamed value for a key.\n" +"QueryValue(key, sub_key) -> string\n" +"Retrieves the unnamed value for a key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "sub_key is a string that holds the name of the subkey with which the value\n" -" is associated. If this parameter is None or empty, the function retrieves\n" -" the value set by the SetValue() method for the key identified by key." +" is associated. If this parameter is None or empty, the function\n" +" retrieves the value set by the SetValue() method for the key\n" +" identified by key." "\n" "Values in the registry have name, type, and data components. This method\n" "retrieves the data for a key's first value that has a NULL name.\n" "But the underlying API call doesn't return the type, Lame Lame Lame, DONT USE THIS!!!"); PyDoc_STRVAR(QueryValueEx_doc, -"value,type_id = QueryValueEx(key, value_name) - Retrieves the type and data for a specified value name associated with an open registry key.\n" +"QueryValueEx(key, value_name) -> (value, type_id)\n" +"Retrieves the type and data for a specified value name associated with an\n" +"open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "value_name is a string indicating the value to query"); PyDoc_STRVAR(SaveKey_doc, -"SaveKey(key, file_name) - Saves the specified key, and all its subkeys to the specified file.\n" +"SaveKey(key, file_name)\n" +"Saves the specified key, and all its subkeys to the specified file.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"file_name is the name of the file to save registry data to.\n" -" This file cannot already exist. If this filename includes an extension,\n" -" it cannot be used on file allocation table (FAT) file systems by the\n" -" LoadKey(), ReplaceKey() or RestoreKey() methods.\n" +"file_name is the name of the file to save registry data to. This file cannot\n" +" already exist. If this filename includes an extension, it cannot be\n" +" used on file allocation table (FAT) file systems by the LoadKey(),\n" +" ReplaceKey() or RestoreKey() methods.\n" "\n" -"If key represents a key on a remote computer, the path described by\n" -"file_name is relative to the remote computer.\n" -"The caller of this method must possess the SeBackupPrivilege security privilege.\n" -"This function passes NULL for security_attributes to the API."); +"If key represents a key on a remote computer, the path described by file_name\n" +"is relative to the remote computer.\n" +"\n" +"The caller of this method must possess the SeBackupPrivilege security\n" +"privilege. This function passes NULL for security_attributes to the API."); PyDoc_STRVAR(SetValue_doc, -"SetValue(key, sub_key, type, value) - Associates a value with a specified key.\n" +"SetValue(key, sub_key, type, value)\n" +"Associates a value with a specified key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" "sub_key is a string that names the subkey with which the value is associated.\n" -"type is an integer that specifies the type of the data. Currently this\n" -" must be REG_SZ, meaning only strings are supported.\n" +"type is an integer that specifies the type of the data. Currently this must\n" +" be REG_SZ, meaning only strings are supported.\n" "value is a string that specifies the new value.\n" "\n" "If the key specified by the sub_key parameter does not exist, the SetValue\n" @@ -288,10 +315,12 @@ "KEY_SET_VALUE access."); PyDoc_STRVAR(SetValueEx_doc, -"SetValueEx(key, value_name, reserved, type, value) - Stores data in the value field of an open registry key.\n" +"SetValueEx(key, value_name, reserved, type, value)\n" +"Stores data in the value field of an open registry key.\n" "\n" "key is an already open key, or any one of the predefined HKEY_* constants.\n" -"value_name is a string containing the name of the value to set, or None\n" +"value_name is a string containing the name of the value to set, or None.\n" +"reserved can be anything - zero is always passed to the API.\n" "type is an integer that specifies the type of the data. This should be one of:\n" " REG_BINARY -- Binary data in any form.\n" " REG_DWORD -- A 32-bit number.\n" @@ -306,7 +335,6 @@ " REG_NONE -- No defined value type.\n" " REG_RESOURCE_LIST -- A device-driver resource list.\n" " REG_SZ -- A null-terminated string.\n" -"reserved can be anything - zero is always passed to the API.\n" "value is a string that specifies the new value.\n" "\n" "This method can also set additional value and type information for the\n" @@ -323,6 +351,7 @@ "Disables registry reflection for 32-bit processes running on a 64-bit\n" "Operating System. Will generally raise NotImplemented if executed on\n" "a 32-bit Operating System.\n" +"\n" "If the key is not on the reflection list, the function succeeds but has no effect.\n" "Disabling reflection for a key does not affect reflection of any subkeys."); @@ -332,7 +361,8 @@ "Restoring reflection for a key does not affect reflection of any subkeys."); PyDoc_STRVAR(QueryReflectionKey_doc, -"bool = QueryReflectionKey(hkey) - Determines the reflection state for the specified key.\n" +"QueryReflectionKey(hkey) -> bool\n" +"Determines the reflection state for the specified key.\n" "Will generally raise NotImplemented if executed on a 32-bit Operating System.\n"); /* PyHKEY docstrings */ @@ -360,12 +390,14 @@ PyDoc_STRVAR(PyHKEY_Close_doc, -"key.Close() - Closes the underlying Windows handle.\n" +"key.Close()\n" +"Closes the underlying Windows handle.\n" "\n" "If the handle is already closed, no error is raised."); PyDoc_STRVAR(PyHKEY_Detach_doc, -"int = key.Detach() - Detaches the Windows handle from the handle object.\n" +"key.Detach() -> int\n" +"Detaches the Windows handle from the handle object.\n" "\n" "The result is the value of the handle before it is detached. If the\n" "handle is already detached, this will return zero.\n" -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 01:43:28 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 30 Oct 2012 01:43:28 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316330=3A_Use_surr?= =?utf-8?q?ogate-related_macros?= Message-ID: <3XrDSJ2dMvzR91@mail.python.org> http://hg.python.org/cpython/rev/13dd8199c112 changeset: 80057:13dd8199c112 user: Victor Stinner date: Tue Oct 30 01:42:39 2012 +0100 summary: Issue #16330: Use surrogate-related macros Patch written by Serhiy Storchaka. files: Include/unicodeobject.h | 6 +++--- Modules/_json.c | 21 ++++++++++----------- Modules/cjkcodecs/cjkcodecs.h | 11 +++++------ Objects/unicodeobject.c | 7 +++---- Python/codecs.c | 4 ++-- Python/fileutils.c | 4 ++-- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -180,9 +180,9 @@ } while (0) /* macros to work with surrogates */ -#define Py_UNICODE_IS_SURROGATE(ch) (0xD800 <= ch && ch <= 0xDFFF) -#define Py_UNICODE_IS_HIGH_SURROGATE(ch) (0xD800 <= ch && ch <= 0xDBFF) -#define Py_UNICODE_IS_LOW_SURROGATE(ch) (0xDC00 <= ch && ch <= 0xDFFF) +#define Py_UNICODE_IS_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDFFF) +#define Py_UNICODE_IS_HIGH_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDBFF) +#define Py_UNICODE_IS_LOW_SURROGATE(ch) (0xDC00 <= (ch) && (ch) <= 0xDFFF) /* Join two surrogate characters and return a single Py_UCS4 value. */ #define Py_UNICODE_JOIN_SURROGATES(high, low) \ (((((Py_UCS4)(high) & 0x03FF) << 10) | \ diff --git a/Modules/_json.c b/Modules/_json.c --- a/Modules/_json.c +++ b/Modules/_json.c @@ -174,14 +174,13 @@ default: if (c >= 0x10000) { /* UTF-16 surrogate pair */ - Py_UCS4 v = c - 0x10000; - c = 0xd800 | ((v >> 10) & 0x3ff); + Py_UCS4 v = Py_UNICODE_HIGH_SURROGATE(c); output[chars++] = 'u'; - output[chars++] = Py_hexdigits[(c >> 12) & 0xf]; - output[chars++] = Py_hexdigits[(c >> 8) & 0xf]; - output[chars++] = Py_hexdigits[(c >> 4) & 0xf]; - output[chars++] = Py_hexdigits[(c ) & 0xf]; - c = 0xdc00 | (v & 0x3ff); + output[chars++] = Py_hexdigits[(v >> 12) & 0xf]; + output[chars++] = Py_hexdigits[(v >> 8) & 0xf]; + output[chars++] = Py_hexdigits[(v >> 4) & 0xf]; + output[chars++] = Py_hexdigits[(v ) & 0xf]; + c = Py_UNICODE_LOW_SURROGATE(c); output[chars++] = '\\'; } output[chars++] = 'u'; @@ -431,7 +430,7 @@ } } /* Surrogate pair */ - if ((c & 0xfc00) == 0xd800) { + if (Py_UNICODE_IS_HIGH_SURROGATE(c)) { Py_UCS4 c2 = 0; if (end + 6 >= len) { raise_errmsg("Unpaired high surrogate", pystr, end - 5); @@ -462,13 +461,13 @@ goto bail; } } - if ((c2 & 0xfc00) != 0xdc00) { + if (!Py_UNICODE_IS_LOW_SURROGATE(c2)) { raise_errmsg("Unpaired high surrogate", pystr, end - 5); goto bail; } - c = 0x10000 + (((c - 0xd800) << 10) | (c2 - 0xdc00)); + c = Py_UNICODE_JOIN_SURROGATES(c, c2); } - else if ((c & 0xfc00) == 0xdc00) { + else if (Py_UNICODE_IS_LOW_SURROGATE(c)) { raise_errmsg("Unpaired low surrogate", pystr, end - 5); goto bail; } diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h --- a/Modules/cjkcodecs/cjkcodecs.h +++ b/Modules/cjkcodecs/cjkcodecs.h @@ -148,8 +148,8 @@ #if Py_UNICODE_SIZE == 2 # define WRITEUCS4(c) \ REQUIRE_OUTBUF(2) \ - (*outbuf)[0] = 0xd800 + (((c) - 0x10000) >> 10); \ - (*outbuf)[1] = 0xdc00 + (((c) - 0x10000) & 0x3ff); \ + (*outbuf)[0] = Py_UNICODE_HIGH_SURROGATE(c); \ + (*outbuf)[1] = Py_UNICODE_LOW_SURROGATE(c); \ NEXT_OUT(2) #else # define WRITEUCS4(c) \ @@ -188,11 +188,10 @@ #if Py_UNICODE_SIZE == 2 #define DECODE_SURROGATE(c) \ - if (c >> 10 == 0xd800 >> 10) { /* high surrogate */ \ + if (Py_UNICODE_IS_HIGH_SURROGATE(c)) { \ REQUIRE_INBUF(2) \ - if (IN2 >> 10 == 0xdc00 >> 10) { /* low surrogate */ \ - c = 0x10000 + ((ucs4_t)(c - 0xd800) << 10) + \ - ((ucs4_t)(IN2) - 0xdc00); \ + if (Py_UNICODE_IS_LOW_SURROGATE(IN2)) { \ + c = Py_UNICODE_JOIN_SURROGATES(c, IN2) \ } \ } #define GET_INSIZE(c) ((c) > 0xffff ? 2 : 1) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4412,7 +4412,7 @@ /* code first surrogate */ base64bits += 16; - base64buffer = (base64buffer << 16) | 0xd800 | ((ch-0x10000) >> 10); + base64buffer = (base64buffer << 16) | Py_UNICODE_HIGH_SURROGATE(ch); while (base64bits >= 6) { *out++ = TO_BASE64(base64buffer >> (base64bits-6)); base64bits -= 6; @@ -7052,9 +7052,8 @@ charsize = 1; } else { - ch -= 0x10000; - chars[0] = 0xd800 + (ch >> 10); - chars[1] = 0xdc00 + (ch & 0x3ff); + chars[0] = Py_UNICODE_HIGH_SURROGATE(ch); + chars[1] = Py_UNICODE_LOW_SURROGATE(ch); charsize = 2; } diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -761,7 +761,7 @@ for (i = start; i < end; i++) { /* object is guaranteed to be "ready" */ Py_UCS4 ch = PyUnicode_READ_CHAR(object, i); - if (ch < 0xd800 || ch > 0xdfff) { + if (!Py_UNICODE_IS_SURROGATE(ch)) { /* Not a surrogate, fail with original exception */ PyErr_SetObject(PyExceptionInstance_Class(exc), exc); Py_DECREF(res); @@ -797,7 +797,7 @@ (p[2] & 0xc0) == 0x80)) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); - if (ch < 0xd800 || ch > 0xdfff) + if (!Py_UNICODE_IS_SURROGATE(ch)) /* it's not a surrogate - fail */ ch = 0; } diff --git a/Python/fileutils.c b/Python/fileutils.c --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -85,7 +85,7 @@ /* Only use the result if it contains no surrogate characters. */ for (tmp = res; *tmp != 0 && - (*tmp < 0xd800 || *tmp > 0xdfff); tmp++) + !Py_UNICODE_IS_SURROGATE(*tmp); tmp++) ; if (*tmp == 0) { if (size != NULL) @@ -131,7 +131,7 @@ memset(&mbs, 0, sizeof mbs); continue; } - if (*out >= 0xd800 && *out <= 0xdfff) { + if (Py_UNICODE_IS_SURROGATE(*out)) { /* Surrogate character. Escape the original byte sequence with surrogateescape. */ argsize -= converted; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 02:18:53 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 30 Oct 2012 02:18:53 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Raising_?= =?utf-8?q?an_OSError_doesn=27t_decode_or_encode_the_filename_anymore?= Message-ID: <3XrFF90PnBzR9g@mail.python.org> http://hg.python.org/cpython/rev/67d69f943b7f changeset: 80058:67d69f943b7f user: Victor Stinner date: Tue Oct 30 02:17:38 2012 +0100 summary: Issue #15478: Raising an OSError doesn't decode or encode the filename anymore Pass the original filename argument to OSError constructor, instead of trying to encode it to or decode it from the filesystem encoding. This change avoids an additionnal UnicodeDecodeError on Windows if the filename cannot be decoded from the filesystem encoding (ANSI code page). files: Doc/library/exceptions.rst | 6 + Lib/test/support.py | 11 + Lib/test/test_os.py | 71 +++++++ Modules/_io/fileio.c | 7 +- Modules/posixmodule.c | 224 ++++++++++++------------ 5 files changed, 205 insertions(+), 114 deletions(-) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -246,6 +246,12 @@ :exc:`VMSError`, :exc:`socket.error`, :exc:`select.error` and :exc:`mmap.error` have been merged into :exc:`OSError`. + .. versionchanged:: 3.4 + + The :attr:`filename` attribute is now the original file name passed to + the function, instead of the name encoded to or decoded from the + filesystem encoding. + .. exception:: OverflowError diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -647,6 +647,17 @@ # the byte 0xff. Skip some unicode filename tests. pass +# TESTFN_UNDECODABLE is a filename (bytes type) that should *not* be able to be +# decoded from the filesystem encoding (in strict mode). It can be None if we +# cannot generate such filename. +TESTFN_UNDECODABLE = None +for name in (b'abc\xff', b'\xe7w\xf0'): + try: + os.fsdecode(name) + except UnicodeDecodeErorr: + TESTFN_UNDECODABLE = name + break + # Save the initial cwd SAVEDCWD = os.getcwd() diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2046,6 +2046,76 @@ self.assertEqual(expected, actual) +class OSErrorTests(unittest.TestCase): + def setUp(self): + class Str(str): + pass + + self.filenames = [] + if support.TESTFN_UNENCODABLE is not None: + decoded = support.TESTFN_UNENCODABLE + else: + decoded = support.TESTFN + self.filenames.append(decoded) + self.filenames.append(Str(decoded)) + if support.TESTFN_UNDECODABLE is not None: + encoded = support.TESTFN_UNDECODABLE + else: + encoded = os.fsencode(support.TESTFN) + self.filenames.append(encoded) + self.filenames.append(memoryview(encoded)) + + def test_oserror_filename(self): + funcs = [ + (os.chdir,), + (os.chmod, 0o777), + (os.chown, 0, 0), + (os.lchown, 0, 0), + (os.listdir,), + (os.lstat,), + (os.open, os.O_RDONLY), + (os.rename, "dst"), + (os.replace, "dst"), + (os.rmdir,), + (os.stat,), + (os.truncate, 0), + (os.unlink,), + ] + if sys.platform == "win32": + funcs.extend(( + (os._getfullpathname,), + (os._isdir,), + )) + if hasattr(os, "chflags"): + funcs.extend(( + (os.chflags, 0), + (os.lchflags, 0), + )) + if hasattr(os, "chroot"): + funcs.append((os.chroot,)) + if hasattr(os, "link"): + funcs.append((os.link, "dst")) + if hasattr(os, "listxattr"): + funcs.extend(( + (os.listxattr,), + (os.getxattr, "user.test"), + (os.setxattr, "user.test", b'user'), + (os.removexattr, "user.test"), + )) + if hasattr(os, "lchmod"): + funcs.append((os.lchmod, 0o777)) + if hasattr(os, "readlink"): + funcs.append((os.readlink,)) + + for func, *func_args in funcs: + for name in self.filenames: + try: + func(name, *func_args) + except FileNotFoundError as err: + self.assertIs(err.filename, name) + else: + self.fail("No exception thrown by {}".format(func)) + @support.reap_threads def test_main(): support.run_unittest( @@ -2074,6 +2144,7 @@ ExtendedAttributeTests, Win32DeprecatedBytesAPI, TermsizeTests, + OSErrorTests, ) if __name__ == "__main__": diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -391,12 +391,7 @@ fd_is_own = 1; if (self->fd < 0) { -#ifdef MS_WINDOWS - if (widename != NULL) - PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, nameobj); - else -#endif - PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); + PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, nameobj); goto error; } } diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -514,8 +514,8 @@ * path_cleanup(). However it is safe to do so.) */ typedef struct { - char *function_name; - char *argument_name; + const char *function_name; + const char *argument_name; int nullable; int allow_fd; wchar_t *wide; @@ -1017,25 +1017,6 @@ { return PyErr_SetFromErrno(PyExc_OSError); } -static PyObject * -posix_error_with_filename(char* name) -{ - return PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); -} - - -static PyObject * -posix_error_with_allocated_filename(PyObject* name) -{ - PyObject *name_str, *rc; - name_str = PyUnicode_DecodeFSDefaultAndSize(PyBytes_AsString(name), - PyBytes_GET_SIZE(name)); - Py_DECREF(name); - rc = PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, - name_str); - Py_XDECREF(name_str); - return rc; -} #ifdef MS_WINDOWS static PyObject * @@ -1080,29 +1061,14 @@ #endif /* MS_WINDOWS */ -/* - * Some functions return Win32 errors, others only ever use posix_error - * (this is for backwards compatibility with exceptions) - */ -static PyObject * -path_posix_error(char *function_name, path_t *path) -{ - if (path->narrow) - return posix_error_with_filename(path->narrow); - return posix_error(); -} - -static PyObject * -path_error(char *function_name, path_t *path) +static PyObject * +path_error(path_t *path) { #ifdef MS_WINDOWS - if (path->narrow) - return win32_error(function_name, path->narrow); - if (path->wide) - return win32_error_unicode(function_name, path->wide); - return win32_error(function_name, NULL); -#else - return path_posix_error(function_name, path); + return PyErr_SetExcFromWindowsErrWithFilenameObject(PyExc_OSError, + 0, path->object); +#else + return PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, path->object); #endif } @@ -1128,21 +1094,25 @@ } static PyObject * -posix_1str(PyObject *args, char *format, int (*func)(const char*)) -{ - PyObject *opath1 = NULL; - char *path1; +posix_1str(const char *func_name, PyObject *args, char *format, + int (*func)(const char*)) +{ + path_t path; int res; + memset(&path, 0, sizeof(path)); + path.function_name = func_name; if (!PyArg_ParseTuple(args, format, - PyUnicode_FSConverter, &opath1)) - return NULL; - path1 = PyBytes_AsString(opath1); + path_converter, &path)) + return NULL; Py_BEGIN_ALLOW_THREADS - res = (*func)(path1); + res = (*func)(path.narrow); Py_END_ALLOW_THREADS - if (res < 0) - return posix_error_with_allocated_filename(opath1); - Py_DECREF(opath1); + if (res < 0) { + path_error(&path); + path_cleanup(&path); + return NULL; + } + path_cleanup(&path); Py_INCREF(Py_None); return Py_None; } @@ -2158,8 +2128,9 @@ result = STAT(path->narrow, &st); Py_END_ALLOW_THREADS - if (result != 0) - return path_error("stat", path); + if (result != 0) { + return path_error(path); + } return _pystat_fromstructstat(&st); } @@ -2190,6 +2161,7 @@ PyObject *return_value; memset(&path, 0, sizeof(path)); + path.function_name = "stat"; path.allow_fd = 1; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&p:stat", keywords, path_converter, &path, @@ -2220,6 +2192,7 @@ PyObject *return_value; memset(&path, 0, sizeof(path)); + path.function_name = "lstat"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:lstat", keywords, path_converter, &path, #ifdef HAVE_FSTATAT @@ -2428,6 +2401,7 @@ static char *keywords[] = {"path", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "chdir"; #ifdef HAVE_FCHDIR path.allow_fd = 1; #endif @@ -2454,7 +2428,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error("chdir", &path); + return_value = path_error(&path); goto exit; } @@ -2518,6 +2492,7 @@ #endif memset(&path, 0, sizeof(path)); + path.function_name = "chmod"; #ifdef HAVE_FCHMOD path.allow_fd = 1; #endif @@ -2612,7 +2587,7 @@ } else #endif - return_value = path_error("chmod", &path); + return_value = path_error(&path); goto exit; } #endif @@ -2656,20 +2631,23 @@ static PyObject * posix_lchmod(PyObject *self, PyObject *args) { - PyObject *opath; - char *path; + path_t path; int i; int res; - if (!PyArg_ParseTuple(args, "O&i:lchmod", PyUnicode_FSConverter, - &opath, &i)) - return NULL; - path = PyBytes_AsString(opath); + memset(&path, 0, sizeof(path)); + path.function_name = "lchmod"; + if (!PyArg_ParseTuple(args, "O&i:lchmod", + path_converter, &path, &i)) + return NULL; Py_BEGIN_ALLOW_THREADS - res = lchmod(path, i); + res = lchmod(path.narrow, i); Py_END_ALLOW_THREADS - if (res < 0) - return posix_error_with_allocated_filename(opath); - Py_DECREF(opath); + if (res < 0) { + path_error(&path); + path_cleanup(&path); + return NULL; + } + path_cleanup(&path); Py_RETURN_NONE; } #endif /* HAVE_LCHMOD */ @@ -2697,6 +2675,7 @@ static char *keywords[] = {"path", "flags", "follow_symlinks", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "chflags"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&k|$i:chflags", keywords, path_converter, &path, &flags, &follow_symlinks)) @@ -2717,7 +2696,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_posix_error("chflags", &path); + return_value = path_error(&path); goto exit; } @@ -2740,22 +2719,25 @@ static PyObject * posix_lchflags(PyObject *self, PyObject *args) { - PyObject *opath; + path_t path; char *path; unsigned long flags; int res; + memset(&path, 0, sizeof(path)); + path.function_name = "lchflags"; if (!PyArg_ParseTuple(args, "O&k:lchflags", - PyUnicode_FSConverter, &opath, &flags)) - return NULL; - path = PyBytes_AsString(opath); + path_converter, &path, &flags)) + return NULL; Py_BEGIN_ALLOW_THREADS - res = lchflags(path, flags); + res = lchflags(path.narrow, flags); Py_END_ALLOW_THREADS - if (res < 0) - return posix_error_with_allocated_filename(opath); - Py_DECREF(opath); - Py_INCREF(Py_None); - return Py_None; + if (res < 0) { + path_error(&path); + path_cleanup(&path); + return NULL; + } + path_cleanup(&path); + Py_RETURN_NONE; } #endif /* HAVE_LCHFLAGS */ @@ -2767,7 +2749,7 @@ static PyObject * posix_chroot(PyObject *self, PyObject *args) { - return posix_1str(args, "O&:chroot", chroot); + return posix_1str("chroot", args, "O&:chroot", chroot); } #endif @@ -2850,6 +2832,7 @@ "follow_symlinks", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "chown"; #ifdef HAVE_FCHOWN path.allow_fd = 1; #endif @@ -2908,7 +2891,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_posix_error("chown", &path); + return_value = path_error(&path); goto exit; } @@ -2954,21 +2937,24 @@ static PyObject * posix_lchown(PyObject *self, PyObject *args) { - PyObject *opath; - char *path; + path_t path; long uid, gid; int res; + memset(&path, 0, sizeof(path)); + path.function_name = "lchown"; if (!PyArg_ParseTuple(args, "O&ll:lchown", - PyUnicode_FSConverter, &opath, + path_converter, &path, &uid, &gid)) return NULL; - path = PyBytes_AsString(opath); Py_BEGIN_ALLOW_THREADS - res = lchown(path, (uid_t) uid, (gid_t) gid); + res = lchown(path.narrow, (uid_t) uid, (gid_t) gid); Py_END_ALLOW_THREADS - if (res < 0) - return posix_error_with_allocated_filename(opath); - Py_DECREF(opath); + if (res < 0) { + path_error(&path); + path_cleanup(&path); + return NULL; + } + path_cleanup(&path); Py_INCREF(Py_None); return Py_None; } @@ -3084,6 +3070,8 @@ memset(&src, 0, sizeof(src)); memset(&dst, 0, sizeof(dst)); + src.function_name = "link"; + dst.function_name = "link"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|O&O&p:link", keywords, path_converter, &src, path_converter, &dst, @@ -3132,7 +3120,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error("link", &dst); + return_value = path_error(&src); goto exit; } #endif @@ -3189,6 +3177,7 @@ #endif memset(&path, 0, sizeof(path)); + path.function_name = "listdir"; path.nullable = 1; #ifdef HAVE_FDOPENDIR path.allow_fd = 1; @@ -3383,7 +3372,7 @@ } if (dirp == NULL) { - list = path_error("listdir", &path); + list = path_error(&path); goto exit; } if ((list = PyList_New(0)) == NULL) { @@ -3399,7 +3388,7 @@ break; } else { Py_DECREF(list); - list = path_error("listdir", &path); + list = path_error(&path); goto exit; } } @@ -3650,6 +3639,7 @@ int result; memset(&path, 0, sizeof(path)); + path.function_name = "mkdir"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|i$O&:mkdir", keywords, path_converter, &path, &mode, #ifdef HAVE_MKDIRAT @@ -3686,7 +3676,7 @@ #endif Py_END_ALLOW_THREADS if (result < 0) { - return_value = path_error("mkdir", &path); + return_value = path_error(&path); goto exit; } #endif @@ -3804,6 +3794,8 @@ memset(&src, 0, sizeof(src)); memset(&dst, 0, sizeof(dst)); + src.function_name = function_name; + dst.function_name = function_name; strcpy(format, "O&O&|$O&O&:"); strcat(format, function_name); if (!PyArg_ParseTupleAndKeywords(args, kwargs, format, keywords, @@ -3852,7 +3844,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error(function_name, &dst); + return_value = path_error(&src); goto exit; } #endif @@ -3916,6 +3908,7 @@ PyObject *return_value = NULL; memset(&path, 0, sizeof(path)); + path.function_name = "rmdir"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:rmdir", keywords, path_converter, &path, #ifdef HAVE_UNLINKAT @@ -3944,7 +3937,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error("rmdir", &path); + return_value = path_error(&path); goto exit; } @@ -4072,6 +4065,7 @@ PyObject *return_value = NULL; memset(&path, 0, sizeof(path)); + path.function_name = "unlink"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:unlink", keywords, path_converter, &path, #ifdef HAVE_UNLINKAT @@ -4100,7 +4094,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error("unlink", &path); + return_value = path_error(&path); goto exit; } @@ -4787,6 +4781,7 @@ like posix.environ. */ memset(&path, 0, sizeof(path)); + path.function_name = "execve"; #ifdef HAVE_FEXECVE path.allow_fd = 1; #endif @@ -4826,7 +4821,7 @@ /* If we get here it's definitely an error */ - path_posix_error("execve", &path); + path_error(&path); while (--envc >= 0) PyMem_DEL(envlist[envc]); @@ -6602,6 +6597,7 @@ static char *keywords[] = {"path", "dir_fd", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "readlink"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:readlink", keywords, path_converter, &path, #ifdef HAVE_READLINKAT @@ -6622,7 +6618,7 @@ Py_END_ALLOW_THREADS if (length < 0) { - return_value = path_posix_error("readlink", &path); + return_value = path_error(&path); goto exit; } @@ -6692,8 +6688,10 @@ #endif memset(&src, 0, sizeof(src)); + src.function_name = "symlink"; src.argument_name = "src"; memset(&dst, 0, sizeof(dst)); + dst.function_name = "symlink"; dst.argument_name = "dst"; #ifdef MS_WINDOWS @@ -6755,7 +6753,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error("symlink", &dst); + return_value = path_error(&dst); goto exit; } #endif @@ -7080,6 +7078,7 @@ static char *keywords[] = {"path", "flags", "mode", "dir_fd", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "open"; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&i|i$O&:open", keywords, path_converter, &path, &flags, &mode, @@ -7112,7 +7111,7 @@ return_value = posix_error(); else #endif - return_value = path_error("open", &path); + return_value = path_error(&path); goto exit; } @@ -7999,6 +7998,7 @@ static char *keywords[] = {"path", "length", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "truncate"; #ifdef HAVE_FTRUNCATE path.allow_fd = 1; #endif @@ -8016,7 +8016,7 @@ res = truncate(path.narrow, length); Py_END_ALLOW_THREADS if (res < 0) - result = path_posix_error("truncate", &path); + result = path_error(&path); else { Py_INCREF(Py_None); result = Py_None; @@ -8488,6 +8488,7 @@ struct statvfs st; memset(&path, 0, sizeof(path)); + path.function_name = "statvfs"; #ifdef HAVE_FSTATVFS path.allow_fd = 1; #endif @@ -8514,7 +8515,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_posix_error("statvfs", &path); + return_value = path_error(&path); goto exit; } @@ -8751,6 +8752,7 @@ static char *keywords[] = {"path", "name", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "pathconf"; #ifdef HAVE_FPATHCONF path.allow_fd = 1; #endif @@ -8771,7 +8773,7 @@ /* could be a path or name problem */ posix_error(); else - result = path_posix_error("pathconf", &path); + result = path_error(&path); } else result = PyLong_FromLong(limit); @@ -9831,6 +9833,8 @@ memset(&path, 0, sizeof(path)); memset(&attribute, 0, sizeof(attribute)); + path.function_name = "getxattr"; + attribute.function_name = "getxattr"; path.allow_fd = 1; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$p:getxattr", keywords, path_converter, &path, @@ -9847,7 +9851,7 @@ static Py_ssize_t buffer_sizes[] = {128, XATTR_SIZE_MAX, 0}; Py_ssize_t buffer_size = buffer_sizes[i]; if (!buffer_size) { - path_error("getxattr", &path); + path_error(&path); goto exit; } buffer = PyBytes_FromStringAndSize(NULL, buffer_size); @@ -9869,7 +9873,7 @@ buffer = NULL; if (errno == ERANGE) continue; - path_error("getxattr", &path); + path_error(&path); goto exit; } @@ -9908,6 +9912,7 @@ "flags", "follow_symlinks", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "setxattr"; path.allow_fd = 1; memset(&attribute, 0, sizeof(attribute)); memset(&value, 0, sizeof(value)); @@ -9935,7 +9940,7 @@ Py_END_ALLOW_THREADS; if (result) { - return_value = path_error("setxattr", &path); + return_value = path_error(&path); goto exit; } @@ -9969,7 +9974,9 @@ static char *keywords[] = {"path", "attribute", "follow_symlinks", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "removexattr"; memset(&attribute, 0, sizeof(attribute)); + attribute.function_name = "removexattr"; path.allow_fd = 1; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$p:removexattr", keywords, @@ -9991,7 +9998,7 @@ Py_END_ALLOW_THREADS; if (result) { - return_value = path_error("removexattr", &path); + return_value = path_error(&path); goto exit; } @@ -10027,6 +10034,7 @@ static char *keywords[] = {"path", "follow_symlinks", NULL}; memset(&path, 0, sizeof(path)); + path.function_name = "listxattr"; path.allow_fd = 1; path.fd = -1; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O&$p:listxattr", keywords, @@ -10045,7 +10053,7 @@ Py_ssize_t buffer_size = buffer_sizes[i]; if (!buffer_size) { /* ERANGE */ - path_error("listxattr", &path); + path_error(&path); break; } buffer = PyMem_MALLOC(buffer_size); @@ -10066,7 +10074,7 @@ if (length < 0) { if (errno == ERANGE) continue; - path_error("listxattr", &path); + path_error(&path); break; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 02:30:33 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 30 Oct 2012 02:30:33 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316330=3A_Fix_comp?= =?utf-8?q?ilation_on_Windows?= Message-ID: <3XrFVd4MyxzRD0@mail.python.org> http://hg.python.org/cpython/rev/812f5c379188 changeset: 80060:812f5c379188 user: Victor Stinner date: Tue Oct 30 02:30:31 2012 +0100 summary: Issue #16330: Fix compilation on Windows files: Modules/cjkcodecs/cjkcodecs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h --- a/Modules/cjkcodecs/cjkcodecs.h +++ b/Modules/cjkcodecs/cjkcodecs.h @@ -191,7 +191,7 @@ if (Py_UNICODE_IS_HIGH_SURROGATE(c)) { \ REQUIRE_INBUF(2) \ if (Py_UNICODE_IS_LOW_SURROGATE(IN2)) { \ - c = Py_UNICODE_JOIN_SURROGATES(c, IN2) \ + c = Py_UNICODE_JOIN_SURROGATES(c, IN2); \ } \ } #define GET_INSIZE(c) ((c) > 0xffff ? 2 : 1) -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Tue Oct 30 05:55:05 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Tue, 30 Oct 2012 05:55:05 +0100 Subject: [Python-checkins] Daily reference leaks (812f5c379188): sum=-1 Message-ID: results for 812f5c379188 on branch "default" -------------------------------------------- test_support leaked [0, 0, -1] references, sum=-1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogLjfCA1', '-x'] From python-checkins at python.org Tue Oct 30 20:56:57 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 30 Oct 2012 20:56:57 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MzQx?= =?utf-8?q?=3A_convert_examples_to_use_except_=2E=2E=2E_as_=2E=2E=2E_synta?= =?utf-8?q?x=2E?= Message-ID: <3Xrk3F4J53zRJJ@mail.python.org> http://hg.python.org/cpython/rev/4e9617d3c514 changeset: 80061:4e9617d3c514 branch: 2.7 parent: 80050:626ed0e06fd6 user: Andrew Svetlov date: Tue Oct 30 21:56:43 2012 +0200 summary: Issue #16341: convert examples to use except ... as ... syntax. files: Doc/howto/urllib2.rst | 10 +++++----- Doc/includes/email-unpack.py | 2 +- Doc/includes/sqlite3/complete_statement.py | 2 +- Doc/library/csv.rst | 2 +- Doc/library/getopt.rst | 2 +- Doc/library/shutil.rst | 6 +++--- Doc/library/socket.rst | 8 ++++---- Doc/library/ssl.rst | 2 +- Doc/library/xdrlib.rst | 3 +-- Doc/library/xmlrpclib.rst | 6 +++--- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -201,7 +201,7 @@ >>> req = urllib2.Request('http://www.pretend_server.org') >>> try: urllib2.urlopen(req) - ... except URLError, e: + ... except URLError as e: ... print e.reason #doctest: +SKIP ... (4, 'getaddrinfo failed') @@ -310,7 +310,7 @@ >>> req = urllib2.Request('http://www.python.org/fish.html') >>> try: ... urllib2.urlopen(req) - ... except urllib2.HTTPError, e: + ... except urllib2.HTTPError as e: ... print e.code ... print e.read() #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE ... @@ -338,10 +338,10 @@ req = Request(someurl) try: response = urlopen(req) - except HTTPError, e: + except HTTPError as e: print 'The server couldn\'t fulfill the request.' print 'Error code: ', e.code - except URLError, e: + except URLError as e: print 'We failed to reach a server.' print 'Reason: ', e.reason else: @@ -362,7 +362,7 @@ req = Request(someurl) try: response = urlopen(req) - except URLError, e: + except URLError as e: if hasattr(e, 'reason'): print 'We failed to reach a server.' print 'Reason: ', e.reason diff --git a/Doc/includes/email-unpack.py b/Doc/includes/email-unpack.py --- a/Doc/includes/email-unpack.py +++ b/Doc/includes/email-unpack.py @@ -35,7 +35,7 @@ try: os.mkdir(opts.directory) - except OSError, e: + except OSError as e: # Ignore directory exists error if e.errno != errno.EEXIST: raise diff --git a/Doc/includes/sqlite3/complete_statement.py b/Doc/includes/sqlite3/complete_statement.py --- a/Doc/includes/sqlite3/complete_statement.py +++ b/Doc/includes/sqlite3/complete_statement.py @@ -23,7 +23,7 @@ if buffer.lstrip().upper().startswith("SELECT"): print cur.fetchall() - except sqlite3.Error, e: + except sqlite3.Error as e: print "An error occurred:", e.args[0] buffer = "" diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst --- a/Doc/library/csv.rst +++ b/Doc/library/csv.rst @@ -480,7 +480,7 @@ try: for row in reader: print row - except csv.Error, e: + except csv.Error as e: sys.exit('file %s, line %d: %s' % (filename, reader.line_num, e)) And while the module doesn't directly support parsing strings, it can easily be diff --git a/Doc/library/getopt.rst b/Doc/library/getopt.rst --- a/Doc/library/getopt.rst +++ b/Doc/library/getopt.rst @@ -126,7 +126,7 @@ def main(): try: opts, args = getopt.getopt(sys.argv[1:], "ho:v", ["help", "output="]) - except getopt.GetoptError, err: + except getopt.GetoptError as err: # print help information and exit: print str(err) # will print something like "option -a not recognized" usage() diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -219,18 +219,18 @@ else: copy2(srcname, dstname) # XXX What about devices, sockets etc.? - except (IOError, os.error), why: + except (IOError, os.error) as why: errors.append((srcname, dstname, str(why))) # catch the Error from the recursive copytree so that we can # continue with other files - except Error, err: + except Error as err: errors.extend(err.args[0]) try: copystat(src, dst) except WindowsError: # can't copy file access times on Windows pass - except OSError, why: + except OSError as why: errors.extend((src, dst, str(why))) if errors: raise Error(errors) diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -920,13 +920,13 @@ af, socktype, proto, canonname, sa = res try: s = socket.socket(af, socktype, proto) - except socket.error, msg: + except socket.error as msg: s = None continue try: s.bind(sa) s.listen(1) - except socket.error, msg: + except socket.error as msg: s.close() s = None continue @@ -955,12 +955,12 @@ af, socktype, proto, canonname, sa = res try: s = socket.socket(af, socktype, proto) - except socket.error, msg: + except socket.error as msg: s = None continue try: s.connect(sa) - except socket.error, msg: + except socket.error as msg: s.close() s = None continue diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -361,7 +361,7 @@ try: s.do_handshake() break - except ssl.SSLError, err: + except ssl.SSLError as err: if err.args[0] == ssl.SSL_ERROR_WANT_READ: select.select([s], [], []) elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE: diff --git a/Doc/library/xdrlib.rst b/Doc/library/xdrlib.rst --- a/Doc/library/xdrlib.rst +++ b/Doc/library/xdrlib.rst @@ -274,6 +274,5 @@ p = xdrlib.Packer() try: p.pack_double(8.01) - except xdrlib.ConversionError, instance: + except xdrlib.ConversionError as instance: print 'packing the double failed:', instance.msg - diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst --- a/Doc/library/xmlrpclib.rst +++ b/Doc/library/xmlrpclib.rst @@ -380,7 +380,7 @@ proxy = xmlrpclib.ServerProxy("http://localhost:8000/") try: proxy.add(2, 5) - except xmlrpclib.Fault, err: + except xmlrpclib.Fault as err: print "A fault occurred" print "Fault code: %d" % err.faultCode print "Fault string: %s" % err.faultString @@ -427,7 +427,7 @@ try: proxy.some_method() - except xmlrpclib.ProtocolError, err: + except xmlrpclib.ProtocolError as err: print "A protocol error occurred" print "URL: %s" % err.url print "HTTP/HTTPS headers: %s" % err.headers @@ -545,7 +545,7 @@ try: print server.examples.getStateName(41) - except Error, v: + except Error as v: print "ERROR", v To access an XML-RPC server through a proxy, you need to define a custom -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 21:49:30 2012 From: python-checkins at python.org (andrew.svetlov) Date: Tue, 30 Oct 2012 21:49:30 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315721=3A_apply_PE?= =?utf-8?q?P_384_Refactoring_to_tkinter_module=2E?= Message-ID: <3XrlCt04ZqzRLS@mail.python.org> http://hg.python.org/cpython/rev/4eb6e07e8171 changeset: 80062:4eb6e07e8171 parent: 80060:812f5c379188 user: Andrew Svetlov date: Tue Oct 30 22:49:16 2012 +0200 summary: Issue #15721: apply PEP 384 Refactoring to tkinter module. files: Modules/_tkinter.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -794,7 +794,7 @@ {Py_tp_dealloc, (destructor)PyTclObject_dealloc}, {Py_tp_repr, (reprfunc)PyTclObject_repr}, {Py_tp_str, (reprfunc)PyTclObject_str}, - {Py_tp_getattro, NULL}, + {Py_tp_getattro, PyObject_GenericGetAttr}, {Py_tp_richcompare, PyTclObject_richcompare}, {Py_tp_getset, PyTclObject_getsetlist}, {0, 0} @@ -2831,11 +2831,6 @@ { PyObject *m, *uexe, *cexe, *o; - /* Due to cross platform compiler issues the slots must be filled - * here. It's required for portability to Windows without requiring - * C++. See xxxlimited.c*/ - PyTclObject_Type_slots[3].pfunc = PyObject_GenericGetAttr; - #ifdef WITH_THREAD tcl_lock = PyThread_allocate_lock(); if (tcl_lock == NULL) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 22:46:57 2012 From: python-checkins at python.org (antoine.pitrou) Date: Tue, 30 Oct 2012 22:46:57 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316351=3A_New_func?= =?utf-8?q?tion_gc=2Eget=5Fstats=28=29_returns_per-generation_collection?= Message-ID: <3XrmV92q9LzPdh@mail.python.org> http://hg.python.org/cpython/rev/43d87cdf9457 changeset: 80063:43d87cdf9457 user: Antoine Pitrou date: Tue Oct 30 22:43:19 2012 +0100 summary: Issue #16351: New function gc.get_stats() returns per-generation collection statistics. files: Doc/library/gc.rst | 18 +++++++++ Lib/test/test_gc.py | 26 +++++++++++++ Misc/NEWS | 3 + Modules/gcmodule.c | 64 +++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 0 deletions(-) diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst --- a/Doc/library/gc.rst +++ b/Doc/library/gc.rst @@ -67,6 +67,24 @@ returned. +.. function:: get_stats() + + Return a list of 3 per-generation dictionaries containing collection + statistics since interpreter start. At this moment, each dictionary will + contain the following items: + + * ``collections`` is the number of times this generation was collected; + + * ``collected`` is the total number of objects collected inside this + generation; + + * ``uncollectable`` is the total number of objects which were found + to be uncollectable (and were therefore moved to the :data:`garbage` + list) inside this generation. + + .. versionadded:: 3.4 + + .. function:: set_threshold(threshold0[, threshold1[, threshold2]]) Set the garbage collection thresholds (the collection frequency). Setting diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py --- a/Lib/test/test_gc.py +++ b/Lib/test/test_gc.py @@ -610,6 +610,32 @@ stderr = run_command(code % "gc.DEBUG_SAVEALL") self.assertNotIn(b"uncollectable objects at shutdown", stderr) + def test_get_stats(self): + stats = gc.get_stats() + self.assertEqual(len(stats), 3) + for st in stats: + self.assertIsInstance(st, dict) + self.assertEqual(set(st), + {"collected", "collections", "uncollectable"}) + self.assertGreaterEqual(st["collected"], 0) + self.assertGreaterEqual(st["collections"], 0) + self.assertGreaterEqual(st["uncollectable"], 0) + # Check that collection counts are incremented correctly + if gc.isenabled(): + self.addCleanup(gc.enable) + gc.disable() + old = gc.get_stats() + gc.collect(0) + new = gc.get_stats() + self.assertEqual(new[0]["collections"], old[0]["collections"] + 1) + self.assertEqual(new[1]["collections"], old[1]["collections"]) + self.assertEqual(new[2]["collections"], old[2]["collections"]) + gc.collect(2) + new = gc.get_stats() + self.assertEqual(new[0]["collections"], old[0]["collections"] + 1) + self.assertEqual(new[1]["collections"], old[1]["collections"]) + self.assertEqual(new[2]["collections"], old[2]["collections"] + 1) + class GCCallbackTests(unittest.TestCase): def setUp(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -65,6 +65,9 @@ Library ------- +- Issue #16351: New function gc.get_stats() returns per-generation collection + statistics. + - Issue #14897: Enhance error messages of struct.pack and struct.pack_into. Patch by Matti M?ki. diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -168,6 +168,18 @@ static int debug; static PyObject *tmod = NULL; +/* Running stats per generation */ +struct gc_generation_stats { + /* total number of collections */ + Py_ssize_t collections; + /* total number of collected objects */ + Py_ssize_t collected; + /* total number of uncollectable objects (put into gc.garbage) */ + Py_ssize_t uncollectable; +}; + +static struct gc_generation_stats generation_stats[NUM_GENERATIONS]; + /*-------------------------------------------------------------------------- gc_refs values. @@ -852,6 +864,7 @@ PyGC_Head finalizers; /* objects with, & reachable from, __del__ */ PyGC_Head *gc; double t1 = 0.0; + struct gc_generation_stats *stats = &generation_stats[generation]; if (debug & DEBUG_STATS) { PySys_WriteStderr("gc: collecting generation %d...\n", @@ -993,10 +1006,14 @@ Py_FatalError("unexpected exception during garbage collection"); } + /* Update stats */ if (n_collected) *n_collected = m; if (n_uncollectable) *n_uncollectable = n; + stats->collections++; + stats->collected += m; + stats->uncollectable += n; return n+m; } @@ -1343,6 +1360,52 @@ return result; } +PyDoc_STRVAR(gc_get_stats__doc__, +"get_stats() -> [...]\n" +"\n" +"Return a list of dictionaries containing per-generation statistics.\n"); + +static PyObject * +gc_get_stats(PyObject *self, PyObject *noargs) +{ + int i; + PyObject *result; + struct gc_generation_stats stats[NUM_GENERATIONS], *st; + + /* To get consistent values despite allocations while constructing + the result list, we use a snapshot of the running stats. */ + for (i = 0; i < NUM_GENERATIONS; i++) { + stats[i] = generation_stats[i]; + } + + result = PyList_New(0); + if (result == NULL) + return NULL; + + for (i = 0; i < NUM_GENERATIONS; i++) { + PyObject *dict; + st = &stats[i]; + dict = Py_BuildValue("{snsnsn}", + "collections", st->collections, + "collected", st->collected, + "uncollectable", st->uncollectable + ); + if (dict == NULL) + goto error; + if (PyList_Append(result, dict)) { + Py_DECREF(dict); + goto error; + } + Py_DECREF(dict); + } + return result; + +error: + Py_XDECREF(result); + return NULL; +} + + PyDoc_STRVAR(gc_is_tracked__doc__, "is_tracked(obj) -> bool\n" "\n" @@ -1393,6 +1456,7 @@ {"collect", (PyCFunction)gc_collect, METH_VARARGS | METH_KEYWORDS, gc_collect__doc__}, {"get_objects", gc_get_objects,METH_NOARGS, gc_get_objects__doc__}, + {"get_stats", gc_get_stats, METH_NOARGS, gc_get_stats__doc__}, {"is_tracked", gc_is_tracked, METH_O, gc_is_tracked__doc__}, {"get_referrers", gc_get_referrers, METH_VARARGS, gc_get_referrers__doc__}, -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 23:24:10 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 30 Oct 2012 23:24:10 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2314625=3A_Rewrite_?= =?utf-8?q?the_UTF-32_decoder=2E_It_is_now_3x_to_4x_faster?= Message-ID: <3XrnK664pXzRG8@mail.python.org> http://hg.python.org/cpython/rev/9badfe3a31a7 changeset: 80064:9badfe3a31a7 user: Victor Stinner date: Tue Oct 30 23:12:47 2012 +0100 summary: Close #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster Patch written by Serhiy Storchaka. files: Doc/whatsnew/3.4.rst | 2 +- Misc/NEWS | 3 + Objects/unicodeobject.c | 166 +++++++++++++-------------- 3 files changed, 85 insertions(+), 86 deletions(-) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -157,7 +157,7 @@ Major performance enhancements have been added: -* None yet. +* The UTF-32 decoder is now 3x to 4x faster. Build and C API Changes diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch + written by Serhiy Storchaka. + - Issue #16197: Update winreg docstrings and documentation to match code. Patch by Zachary Ware. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4804,14 +4804,8 @@ Py_ssize_t outpos; PyObject *unicode; const unsigned char *q, *e; - int bo = 0; /* assume native ordering by default */ + int le, bo = 0; /* assume native ordering by default */ const char *errmsg = ""; - /* Offsets from q for retrieving bytes in the right order. */ -#if PY_LITTLE_ENDIAN - int iorder[] = {0, 1, 2, 3}; -#else - int iorder[] = {3, 2, 1, 0}; -#endif PyObject *errorHandler = NULL; PyObject *exc = NULL; @@ -4825,83 +4819,88 @@ byte order setting accordingly. In native mode, the leading BOM mark is skipped, in all other modes, it is copied to the output stream as-is (giving a ZWNBSP character). */ - if (bo == 0) { - if (size >= 4) { - const Py_UCS4 bom = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | - (q[iorder[1]] << 8) | q[iorder[0]]; -#if PY_LITTLE_ENDIAN - if (bom == 0x0000FEFF) { + if (bo == 0 && size >= 4) { + Py_UCS4 bom = (q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0]; + if (bom == 0x0000FEFF) { + bo = -1; + q += 4; + } + else if (bom == 0xFFFE0000) { + bo = 1; + q += 4; + } + if (byteorder) + *byteorder = bo; + } + + if (q == e) { + if (consumed) + *consumed = size; + Py_INCREF(unicode_empty); + return unicode_empty; + } + +#ifdef WORDS_BIGENDIAN + le = bo < 0; +#else + le = bo <= 0; +#endif + + unicode = PyUnicode_New((e - q + 3) / 4, 127); + if (!unicode) + return NULL; + + outpos = 0; + while (1) { + Py_UCS4 ch = 0; + Py_UCS4 maxch = PyUnicode_MAX_CHAR_VALUE(unicode); + + if (e - q >= 4) { + enum PyUnicode_Kind kind = PyUnicode_KIND(unicode); + void *data = PyUnicode_DATA(unicode); + const unsigned char *last = e - 4; + if (le) { + do { + ch = (q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0]; + if (ch > maxch) + break; + PyUnicode_WRITE(kind, data, outpos++, ch); + q += 4; + } while (q <= last); + } + else { + do { + ch = (q[0] << 24) | (q[1] << 16) | (q[2] << 8) | q[3]; + if (ch > maxch) + break; + PyUnicode_WRITE(kind, data, outpos++, ch); + q += 4; + } while (q <= last); + } + } + + if (ch <= maxch) { + if (q == e || consumed) + break; + /* remaining bytes at the end? (size should be divisible by 4) */ + errmsg = "truncated data"; + startinpos = ((const char *)q) - starts; + endinpos = ((const char *)e) - starts; + } + else { + if (ch < 0x110000) { + if (unicode_putchar(&unicode, &outpos, ch) < 0) + goto onError; q += 4; - bo = -1; - } - else if (bom == 0xFFFE0000) { - q += 4; - bo = 1; - } -#else - if (bom == 0x0000FEFF) { - q += 4; - bo = 1; - } - else if (bom == 0xFFFE0000) { - q += 4; - bo = -1; - } -#endif - } - } - - if (bo == -1) { - /* force LE */ - iorder[0] = 0; - iorder[1] = 1; - iorder[2] = 2; - iorder[3] = 3; - } - else if (bo == 1) { - /* force BE */ - iorder[0] = 3; - iorder[1] = 2; - iorder[2] = 1; - iorder[3] = 0; - } - - /* This might be one to much, because of a BOM */ - unicode = PyUnicode_New((size+3)/4, 127); - if (!unicode) - return NULL; - if (size == 0) - return unicode; - outpos = 0; - - while (q < e) { - Py_UCS4 ch; - /* remaining bytes at the end? (size should be divisible by 4) */ - if (e-q<4) { - if (consumed) - break; - errmsg = "truncated data"; - startinpos = ((const char *)q)-starts; - endinpos = ((const char *)e)-starts; - goto utf32Error; - /* The remaining input chars are ignored if the callback - chooses to skip the input */ - } - ch = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | - (q[iorder[1]] << 8) | q[iorder[0]]; - - if (ch >= 0x110000) - { + continue; + } errmsg = "codepoint not in range(0x110000)"; - startinpos = ((const char *)q)-starts; - endinpos = startinpos+4; - goto utf32Error; - } - if (unicode_putchar(&unicode, &outpos, ch) < 0) - goto onError; - q += 4; - continue; - utf32Error: + startinpos = ((const char *)q) - starts; + endinpos = startinpos + 4; + } + + /* The remaining input chars are ignored if the callback + chooses to skip the input */ if (unicode_decode_call_errorhandler( errors, &errorHandler, "utf32", errmsg, @@ -4910,9 +4909,6 @@ goto onError; } - if (byteorder) - *byteorder = bo; - if (consumed) *consumed = (const char *)q-starts; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Tue Oct 30 23:42:27 2012 From: python-checkins at python.org (victor.stinner) Date: Tue, 30 Oct 2012 23:42:27 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316086=3A_PyTypeOb?= =?utf-8?q?ject=2Etp=5Fflags_and_PyType=5FSpec=2Eflags_are_now_unsigned?= Message-ID: <3XrnkC25PgzRDc@mail.python.org> http://hg.python.org/cpython/rev/10795aac6df7 changeset: 80065:10795aac6df7 user: Victor Stinner date: Tue Oct 30 23:40:45 2012 +0100 summary: Issue #16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned ... (unsigned long and unsigned int) to avoid an undefined behaviour with Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is now unsigned too (unsigned long, instead of long). files: Include/object.h | 42 ++++++++++++++++---------------- Misc/NEWS | 5 +++ Objects/typeobject.c | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Include/object.h b/Include/object.h --- a/Include/object.h +++ b/Include/object.h @@ -362,7 +362,7 @@ PyBufferProcs *tp_as_buffer; /* Flags to define presence of optional/expanded features */ - long tp_flags; + unsigned long tp_flags; const char *tp_doc; /* Documentation string */ @@ -428,7 +428,7 @@ const char* name; int basicsize; int itemsize; - int flags; + unsigned int flags; PyType_Slot *slots; /* terminated by slot==0. */ } PyType_Spec; @@ -470,7 +470,7 @@ PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */ PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */ -PyAPI_FUNC(long) PyType_GetFlags(PyTypeObject*); +PyAPI_FUNC(unsigned long) PyType_GetFlags(PyTypeObject*); #define PyType_Check(op) \ PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS) @@ -603,44 +603,44 @@ */ /* Set if the type object is dynamically allocated */ -#define Py_TPFLAGS_HEAPTYPE (1L<<9) +#define Py_TPFLAGS_HEAPTYPE (1UL << 9) /* Set if the type allows subclassing */ -#define Py_TPFLAGS_BASETYPE (1L<<10) +#define Py_TPFLAGS_BASETYPE (1UL << 10) /* Set if the type is 'ready' -- fully initialized */ -#define Py_TPFLAGS_READY (1L<<12) +#define Py_TPFLAGS_READY (1UL << 12) /* Set while the type is being 'readied', to prevent recursive ready calls */ -#define Py_TPFLAGS_READYING (1L<<13) +#define Py_TPFLAGS_READYING (1UL << 13) /* Objects support garbage collection (see objimp.h) */ -#define Py_TPFLAGS_HAVE_GC (1L<<14) +#define Py_TPFLAGS_HAVE_GC (1UL << 14) /* These two bits are preserved for Stackless Python, next after this is 17 */ #ifdef STACKLESS -#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3L<<15) +#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3UL << 15) #else #define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0 #endif /* Objects support type attribute cache */ -#define Py_TPFLAGS_HAVE_VERSION_TAG (1L<<18) -#define Py_TPFLAGS_VALID_VERSION_TAG (1L<<19) +#define Py_TPFLAGS_HAVE_VERSION_TAG (1UL << 18) +#define Py_TPFLAGS_VALID_VERSION_TAG (1UL << 19) /* Type is abstract and cannot be instantiated */ -#define Py_TPFLAGS_IS_ABSTRACT (1L<<20) +#define Py_TPFLAGS_IS_ABSTRACT (1UL << 20) /* These flags are used to determine if a type is a subclass. */ -#define Py_TPFLAGS_INT_SUBCLASS (1L<<23) -#define Py_TPFLAGS_LONG_SUBCLASS (1L<<24) -#define Py_TPFLAGS_LIST_SUBCLASS (1L<<25) -#define Py_TPFLAGS_TUPLE_SUBCLASS (1L<<26) -#define Py_TPFLAGS_BYTES_SUBCLASS (1L<<27) -#define Py_TPFLAGS_UNICODE_SUBCLASS (1L<<28) -#define Py_TPFLAGS_DICT_SUBCLASS (1L<<29) -#define Py_TPFLAGS_BASE_EXC_SUBCLASS (1L<<30) -#define Py_TPFLAGS_TYPE_SUBCLASS (1L<<31) +#define Py_TPFLAGS_INT_SUBCLASS (1UL << 23) +#define Py_TPFLAGS_LONG_SUBCLASS (1UL << 24) +#define Py_TPFLAGS_LIST_SUBCLASS (1UL << 25) +#define Py_TPFLAGS_TUPLE_SUBCLASS (1UL << 26) +#define Py_TPFLAGS_BYTES_SUBCLASS (1UL << 27) +#define Py_TPFLAGS_UNICODE_SUBCLASS (1UL << 28) +#define Py_TPFLAGS_DICT_SUBCLASS (1UL << 29) +#define Py_TPFLAGS_BASE_EXC_SUBCLASS (1UL << 30) +#define Py_TPFLAGS_TYPE_SUBCLASS (1UL << 31) #define Py_TPFLAGS_DEFAULT ( \ Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,11 @@ Core and Builtins ----------------- +- Issue #16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned + (unsigned long and unsigned int) to avoid an undefined behaviour with + Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is + now unsigned too (unsigned long, instead of long). + - Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch written by Serhiy Storchaka. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1931,7 +1931,7 @@ return res; } -long +unsigned long PyType_GetFlags(PyTypeObject *type) { return type->tp_flags; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 01:07:09 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 01:07:09 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=239566=3A_Explicit_?= =?utf-8?q?downcast_to_fix_compiler_warnings_on_Win64?= Message-ID: <3Xrqbx1RDxzRCn@mail.python.org> http://hg.python.org/cpython/rev/96fc87997ce9 changeset: 80066:96fc87997ce9 user: Victor Stinner date: Wed Oct 31 00:33:57 2012 +0100 summary: Issue #9566: Explicit downcast to fix compiler warnings on Win64 files: Modules/faulthandler.c | 6 ++++-- Modules/md5module.c | 2 +- Modules/sha1module.c | 2 +- Modules/zlibmodule.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -22,7 +22,9 @@ # define FAULTHANDLER_USER #endif -#define PUTS(fd, str) write(fd, str, strlen(str)) +/* cast size_t to int because write() takes an int on Windows + (anyway, the length is smaller than 30 characters) */ +#define PUTS(fd, str) write(fd, str, (int)strlen(str)) #ifdef HAVE_SIGACTION typedef struct sigaction _Py_sighandler_t; @@ -445,7 +447,7 @@ /* get the thread holding the GIL, NULL if no thread hold the GIL */ current = _Py_atomic_load_relaxed(&_PyThreadState_Current); - write(thread.fd, thread.header, thread.header_len); + write(thread.fd, thread.header, (int)thread.header_len); errmsg = _Py_DumpTracebackThreads(thread.fd, thread.interp, current); ok = (errmsg == NULL); diff --git a/Modules/md5module.c b/Modules/md5module.c --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -246,7 +246,7 @@ } else { n = MIN(inlen, (Py_ssize_t)(MD5_BLOCKSIZE - md5->curlen)); memcpy(md5->buf + md5->curlen, in, (size_t)n); - md5->curlen += n; + md5->curlen += (MD5_INT32)n; in += n; inlen -= n; if (md5->curlen == MD5_BLOCKSIZE) { diff --git a/Modules/sha1module.c b/Modules/sha1module.c --- a/Modules/sha1module.c +++ b/Modules/sha1module.c @@ -222,7 +222,7 @@ } else { n = MIN(inlen, (Py_ssize_t)(SHA1_BLOCKSIZE - sha1->curlen)); memcpy(sha1->buf + sha1->curlen, in, (size_t)n); - sha1->curlen += n; + sha1->curlen += (SHA1_INT32)n; in += n; inlen -= n; if (sha1->curlen == SHA1_BLOCKSIZE) { diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -161,7 +161,7 @@ goto error; } input = pinput.buf; - length = pinput.len; + length = (unsigned int)pinput.len; zst.avail_out = length + length/1000 + 12 + 1; @@ -251,7 +251,7 @@ goto error; } input = pinput.buf; - length = pinput.len; + length = (unsigned int)pinput.len; if (r_strlen <= 0) r_strlen = 1; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 01:07:10 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 01:07:10 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=239566=3A_Use_the_r?= =?utf-8?q?ight_type_to_fix_a_compiler_warnings_on_Win64?= Message-ID: <3Xrqby3cH9zRDl@mail.python.org> http://hg.python.org/cpython/rev/dabe2486e2ce changeset: 80067:dabe2486e2ce user: Victor Stinner date: Wed Oct 31 00:37:41 2012 +0100 summary: Issue #9566: Use the right type to fix a compiler warnings on Win64 files: Modules/_sre.c | 14 +++++++------- Objects/frameobject.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Modules/_sre.c b/Modules/_sre.c --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -1865,7 +1865,7 @@ pattern_match(PatternObject* self, PyObject* args, PyObject* kw) { SRE_STATE state; - int status; + Py_ssize_t status; PyObject* string; Py_ssize_t start = 0; @@ -2034,7 +2034,7 @@ { SRE_STATE state; PyObject* list; - int status; + Py_ssize_t status; Py_ssize_t i, b, e; PyObject* string; @@ -2160,7 +2160,7 @@ SRE_STATE state; PyObject* list; PyObject* item; - int status; + Py_ssize_t status; Py_ssize_t n; Py_ssize_t i; void* last; @@ -2276,7 +2276,7 @@ PyObject* args; PyObject* match; void* ptr; - int status; + Py_ssize_t status; Py_ssize_t n; Py_ssize_t i, b, e; int logical_charsize, charsize; @@ -2295,7 +2295,7 @@ ptr = getstring(ptemplate, &n, &logical_charsize, &charsize, &view); b = charsize; if (ptr) { - literal = sre_literal_template(b, ptr, n); + literal = sre_literal_template(charsize, ptr, n); } else { PyErr_Clear(); literal = 0; @@ -3721,7 +3721,7 @@ { SRE_STATE* state = &self->state; PyObject* match; - int status; + Py_ssize_t status; state_reset(state); @@ -3752,7 +3752,7 @@ { SRE_STATE* state = &self->state; PyObject* match; - int status; + Py_ssize_t status; state_reset(state); diff --git a/Objects/frameobject.c b/Objects/frameobject.c --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -466,7 +466,7 @@ frame_traverse(PyFrameObject *f, visitproc visit, void *arg) { PyObject **fastlocals, **p; - int i, slots; + Py_ssize_t i, slots; Py_VISIT(f->f_back); Py_VISIT(f->f_code); @@ -496,7 +496,7 @@ frame_clear(PyFrameObject *f) { PyObject **fastlocals, **p, **oldtop; - int i, slots; + Py_ssize_t i, slots; /* Before anything else, make sure that this frame is clearly marked * as being defunct! Else, e.g., a generator reachable from this @@ -848,7 +848,7 @@ PyObject *error_type, *error_value, *error_traceback; PyCodeObject *co; Py_ssize_t j; - int ncells, nfreevars; + Py_ssize_t ncells, nfreevars; if (f == NULL) return; locals = f->f_locals; @@ -900,7 +900,7 @@ PyObject *error_type, *error_value, *error_traceback; PyCodeObject *co; Py_ssize_t j; - int ncells, nfreevars; + Py_ssize_t ncells, nfreevars; if (f == NULL) return; locals = f->f_locals; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 01:07:11 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 01:07:11 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Fix_test?= =?utf-8?q?=5Fos_on_Windows_=28os=2Echown_is_missing=29?= Message-ID: <3Xrqbz5mFqzRCB@mail.python.org> http://hg.python.org/cpython/rev/01cc9fb52887 changeset: 80068:01cc9fb52887 user: Victor Stinner date: Wed Oct 31 01:04:10 2012 +0100 summary: Issue #15478: Fix test_os on Windows (os.chown is missing) files: Lib/test/test_os.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2069,7 +2069,6 @@ funcs = [ (os.chdir,), (os.chmod, 0o777), - (os.chown, 0, 0), (os.lchown, 0, 0), (os.listdir,), (os.lstat,), @@ -2081,6 +2080,8 @@ (os.truncate, 0), (os.unlink,), ] + if hasattr(os, "chown"): + funcs.append((os.chown, 0, 0)) if sys.platform == "win32": funcs.extend(( (os._getfullpathname,), -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 01:13:04 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 01:13:04 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Fix_test?= =?utf-8?q?=5Fos_on_FreeBSD?= Message-ID: <3Xrqkm0xwVzPk0@mail.python.org> http://hg.python.org/cpython/rev/ef87bd0797de changeset: 80069:ef87bd0797de user: Victor Stinner date: Wed Oct 31 01:12:55 2012 +0100 summary: Issue #15478: Fix test_os on FreeBSD Calling OS functions can fail with errors other than FileNotFoundError: a FreeBSD buildbot fails for example with a PermissionError. files: Lib/test/test_os.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2112,7 +2112,7 @@ for name in self.filenames: try: func(name, *func_args) - except FileNotFoundError as err: + except OSError as err: self.assertIs(err.filename, name) else: self.fail("No exception thrown by {}".format(func)) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 01:21:27 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 31 Oct 2012 01:21:27 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzEyODkwOiBmaXgg?= =?utf-8?q?test_on_windows?= Message-ID: <3XrqwR1B8KzR4V@mail.python.org> http://hg.python.org/cpython/rev/7648b7ed6d91 changeset: 80070:7648b7ed6d91 branch: 3.3 parent: 80055:ed00aab17d8c user: R David Murray date: Tue Oct 30 20:20:09 2012 -0400 summary: #12890: fix test on windows Patch by Stephen Tonkin. files: Lib/test/test_cgitb.py | 10 ++++------ Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py --- a/Lib/test/test_cgitb.py +++ b/Lib/test/test_cgitb.py @@ -36,13 +36,12 @@ self.assertIn("ValueError", text) self.assertIn("Hello World", text) - @unittest.skipIf(sys.platform=='win32', "test fails on windows, see issue 12890") def test_syshook_no_logdir_default_format(self): with temp_dir() as tracedir: rc, out, err = assert_python_failure( '-c', - ('import cgitb; cgitb.enable(logdir="%s"); ' - 'raise ValueError("Hello World")') % tracedir) + ('import cgitb; cgitb.enable(logdir=%s); ' + 'raise ValueError("Hello World")') % repr(tracedir)) out = out.decode(sys.getfilesystemencoding()) self.assertIn("ValueError", out) self.assertIn("Hello World", out) @@ -50,14 +49,13 @@ self.assertIn('

    ', out) self.assertIn('

    ', out) - @unittest.skipIf(sys.platform=='win32', "test fails on windows, see issue 12890") def test_syshook_no_logdir_text_format(self): # Issue 12890: we were emitting the

    tag in text mode. with temp_dir() as tracedir: rc, out, err = assert_python_failure( '-c', - ('import cgitb; cgitb.enable(format="text", logdir="%s"); ' - 'raise ValueError("Hello World")') % tracedir) + ('import cgitb; cgitb.enable(format="text", logdir=%s); ' + 'raise ValueError("Hello World")') % repr(tracedir)) out = out.decode(sys.getfilesystemencoding()) self.assertIn("ValueError", out) self.assertIn("Hello World", out) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1174,6 +1174,7 @@ R Lindsay Todd Eugene Toder Erik Tollerud +Stephen Tonkin Matias Torchinsky Sandro Tosi Richard Townsend -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 01:21:28 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 31 Oct 2012 01:21:28 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_=2312890=3A_fix_test_on_windows?= Message-ID: <3XrqwS3c6fzRCq@mail.python.org> http://hg.python.org/cpython/rev/d24befb680d6 changeset: 80071:d24befb680d6 parent: 80069:ef87bd0797de parent: 80070:7648b7ed6d91 user: R David Murray date: Tue Oct 30 20:20:54 2012 -0400 summary: #12890: fix test on windows Patch by Stephen Tonkin. files: Lib/test/test_cgitb.py | 10 ++++------ Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py --- a/Lib/test/test_cgitb.py +++ b/Lib/test/test_cgitb.py @@ -36,13 +36,12 @@ self.assertIn("ValueError", text) self.assertIn("Hello World", text) - @unittest.skipIf(sys.platform=='win32', "test fails on windows, see issue 12890") def test_syshook_no_logdir_default_format(self): with temp_dir() as tracedir: rc, out, err = assert_python_failure( '-c', - ('import cgitb; cgitb.enable(logdir="%s"); ' - 'raise ValueError("Hello World")') % tracedir) + ('import cgitb; cgitb.enable(logdir=%s); ' + 'raise ValueError("Hello World")') % repr(tracedir)) out = out.decode(sys.getfilesystemencoding()) self.assertIn("ValueError", out) self.assertIn("Hello World", out) @@ -50,14 +49,13 @@ self.assertIn('

    ', out) self.assertIn('

    ', out) - @unittest.skipIf(sys.platform=='win32', "test fails on windows, see issue 12890") def test_syshook_no_logdir_text_format(self): # Issue 12890: we were emitting the

    tag in text mode. with temp_dir() as tracedir: rc, out, err = assert_python_failure( '-c', - ('import cgitb; cgitb.enable(format="text", logdir="%s"); ' - 'raise ValueError("Hello World")') % tracedir) + ('import cgitb; cgitb.enable(format="text", logdir=%s); ' + 'raise ValueError("Hello World")') % repr(tracedir)) out = out.decode(sys.getfilesystemencoding()) self.assertIn("ValueError", out) self.assertIn("Hello World", out) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1175,6 +1175,7 @@ R Lindsay Todd Eugene Toder Erik Tollerud +Stephen Tonkin Matias Torchinsky Sandro Tosi Richard Townsend -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 04:34:46 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 04:34:46 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_initialize_mor?= =?utf-8?q?e_global_type_objects_=28closes_=2316369=29?= Message-ID: <3XrwCV5TNQzP8p@mail.python.org> http://hg.python.org/cpython/rev/eec0cafe171d changeset: 80072:eec0cafe171d branch: 3.2 parent: 80054:b9e14b89199b user: Benjamin Peterson date: Tue Oct 30 23:21:10 2012 -0400 summary: initialize more global type objects (closes #16369) files: Modules/symtablemodule.c | 3 +++ Objects/object.c | 24 ++++++++++++++++++++++++ Objects/unicodeobject.c | 6 ++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -63,6 +63,9 @@ { PyObject *m; + if (PyType_Ready(&PySTEntry_Type) < 0) + return NULL; + m = PyModule_Create(&symtablemodule); if (m == NULL) return NULL; diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1644,6 +1644,30 @@ if (PyType_Ready(&PyZip_Type) < 0) Py_FatalError("Can't initialize zip type"); + + if (PyType_Ready(&PyCapsule_Type) < 0) + Py_FatalError("Can't initialize capsule type"); + + if (PyType_Ready(&PyLongRangeIter_Type) < 0) + Py_FatalError("Can't initialize long range iterator type"); + + if (PyType_Ready(&PyCell_Type) < 0) + Py_FatalError("Can't initialize cell type"); + + if (PyType_Ready(&PyInstanceMethod_Type) < 0) + Py_FatalError("Can't initialize instance method type"); + + if (PyType_Ready(&PyClassMethodDescr_Type) < 0) + Py_FatalError("Can't initialize class method descr type"); + + if (PyType_Ready(&PyMethodDescr_Type) < 0) + Py_FatalError("Can't initialize method descr type"); + + if (PyType_Ready(&PyCallIter_Type) < 0) + Py_FatalError("Can't initialize call iter type"); + + if (PyType_Ready(&PySeqIter_Type) < 0) + Py_FatalError("Can't initialize sequence iterator type"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10079,6 +10079,12 @@ ); PyType_Ready(&EncodingMapType); + + if (PyType_Ready(&PyFieldNameIter_Type) < 0) + Py_FatalError("Can't initialize field name iterator type"); + + if (PyType_Ready(&PyFormatterIter_Type) < 0) + Py_FatalError("Can't initialize formatter iter type"); } /* Finalize the Unicode implementation */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 04:34:48 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 04:34:48 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_3=2E2_=28=2316369=29?= Message-ID: <3XrwCX11KFzPbg@mail.python.org> http://hg.python.org/cpython/rev/9371bf2287c4 changeset: 80073:9371bf2287c4 branch: 3.3 parent: 80070:7648b7ed6d91 parent: 80072:eec0cafe171d user: Benjamin Peterson date: Tue Oct 30 23:27:52 2012 -0400 summary: merge 3.2 (#16369) files: Modules/symtablemodule.c | 3 +++ Objects/object.c | 24 ++++++++++++++++++++++++ Objects/unicodeobject.c | 6 ++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -63,6 +63,9 @@ { PyObject *m; + if (PyType_Ready(&PySTEntry_Type) < 0) + return NULL; + m = PyModule_Create(&symtablemodule); if (m == NULL) return NULL; diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1710,6 +1710,30 @@ if (PyType_Ready(&_PyNamespace_Type) < 0) Py_FatalError("Can't initialize namespace type"); + + if (PyType_Ready(&PyCapsule_Type) < 0) + Py_FatalError("Can't initialize capsule type"); + + if (PyType_Ready(&PyLongRangeIter_Type) < 0) + Py_FatalError("Can't initialize long range iterator type"); + + if (PyType_Ready(&PyCell_Type) < 0) + Py_FatalError("Can't initialize cell type"); + + if (PyType_Ready(&PyInstanceMethod_Type) < 0) + Py_FatalError("Can't initialize instance method type"); + + if (PyType_Ready(&PyClassMethodDescr_Type) < 0) + Py_FatalError("Can't initialize class method descr type"); + + if (PyType_Ready(&PyMethodDescr_Type) < 0) + Py_FatalError("Can't initialize method descr type"); + + if (PyType_Ready(&PyCallIter_Type) < 0) + Py_FatalError("Can't initialize call iter type"); + + if (PyType_Ready(&PySeqIter_Type) < 0) + Py_FatalError("Can't initialize sequence iterator type"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14167,6 +14167,12 @@ PyType_Ready(&EncodingMapType); + if (PyType_Ready(&PyFieldNameIter_Type) < 0) + Py_FatalError("Can't initialize field name iterator type"); + + if (PyType_Ready(&PyFormatterIter_Type) < 0) + Py_FatalError("Can't initialize formatter iter type"); + #ifdef HAVE_MBCS winver.dwOSVersionInfoSize = sizeof(winver); if (!GetVersionEx((OSVERSIONINFO*)&winver)) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 04:34:49 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 04:34:49 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4zICgjMTYzNjkp?= Message-ID: <3XrwCY3HgjzPbg@mail.python.org> http://hg.python.org/cpython/rev/aa52d8559ce5 changeset: 80074:aa52d8559ce5 parent: 80071:d24befb680d6 parent: 80073:9371bf2287c4 user: Benjamin Peterson date: Tue Oct 30 23:31:12 2012 -0400 summary: merge 3.3 (#16369) files: Modules/symtablemodule.c | 3 +++ Objects/object.c | 24 ++++++++++++++++++++++++ Objects/unicodeobject.c | 6 ++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -63,6 +63,9 @@ { PyObject *m; + if (PyType_Ready(&PySTEntry_Type) < 0) + return NULL; + m = PyModule_Create(&symtablemodule); if (m == NULL) return NULL; diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1719,6 +1719,30 @@ if (PyType_Ready(&_PyNamespace_Type) < 0) Py_FatalError("Can't initialize namespace type"); + + if (PyType_Ready(&PyCapsule_Type) < 0) + Py_FatalError("Can't initialize capsule type"); + + if (PyType_Ready(&PyLongRangeIter_Type) < 0) + Py_FatalError("Can't initialize long range iterator type"); + + if (PyType_Ready(&PyCell_Type) < 0) + Py_FatalError("Can't initialize cell type"); + + if (PyType_Ready(&PyInstanceMethod_Type) < 0) + Py_FatalError("Can't initialize instance method type"); + + if (PyType_Ready(&PyClassMethodDescr_Type) < 0) + Py_FatalError("Can't initialize class method descr type"); + + if (PyType_Ready(&PyMethodDescr_Type) < 0) + Py_FatalError("Can't initialize method descr type"); + + if (PyType_Ready(&PyCallIter_Type) < 0) + Py_FatalError("Can't initialize call iter type"); + + if (PyType_Ready(&PySeqIter_Type) < 0) + Py_FatalError("Can't initialize sequence iterator type"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14222,6 +14222,12 @@ PyType_Ready(&EncodingMapType); + if (PyType_Ready(&PyFieldNameIter_Type) < 0) + Py_FatalError("Can't initialize field name iterator type"); + + if (PyType_Ready(&PyFormatterIter_Type) < 0) + Py_FatalError("Can't initialize formatter iter type"); + #ifdef HAVE_MBCS winver.dwOSVersionInfoSize = sizeof(winver); if (!GetVersionEx((OSVERSIONINFO*)&winver)) { -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 04:34:50 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 04:34:50 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_initialize_mor?= =?utf-8?q?e_global_type_objects_=28closes_=2316369=29?= Message-ID: <3XrwCZ5fQszPg9@mail.python.org> http://hg.python.org/cpython/rev/315bd0ceb97a changeset: 80075:315bd0ceb97a branch: 2.7 parent: 80061:4e9617d3c514 user: Benjamin Peterson date: Tue Oct 30 23:21:10 2012 -0400 summary: initialize more global type objects (closes #16369) files: Modules/symtablemodule.c | 3 +++ Objects/object.c | 12 ++++++++++++ Objects/unicodeobject.c | 6 ++++++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -52,6 +52,9 @@ { PyObject *m; + if (PyType_Ready(&PySTEntry_Type) < 0) + return; + m = Py_InitModule("_symtable", symtable_methods); if (m == NULL) return; diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -2198,6 +2198,18 @@ if (PyType_Ready(&PyFile_Type) < 0) Py_FatalError("Can't initialize file type"); + + if (PyType_Ready(&PyCapsule_Type) < 0) + Py_FatalError("Can't initialize capsule type"); + + if (PyType_Ready(&PyCell_Type) < 0) + Py_FatalError("Can't initialize cell type"); + + if (PyType_Ready(&PyCallIter_Type) < 0) + Py_FatalError("Can't initialize call iter type"); + + if (PyType_Ready(&PySeqIter_Type) < 0) + Py_FatalError("Can't initialize sequence iterator type"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8847,6 +8847,12 @@ ); PyType_Ready(&EncodingMapType); + + if (PyType_Ready(&PyFieldNameIter_Type) < 0) + Py_FatalError("Can't initialize field name iterator type"); + + if (PyType_Ready(&PyFormatterIter_Type) < 0) + Py_FatalError("Can't initialize formatter iter type"); } /* Finalize the Unicode implementation */ -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 04:44:19 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 04:44:19 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_initialize_map/filter/zip_?= =?utf-8?q?in_=5FPyBuiltin=5FInit_rather_than_the_catch-all_function?= Message-ID: <3XrwQW44lgzMP8@mail.python.org> http://hg.python.org/cpython/rev/75fe7f5fda9a changeset: 80076:75fe7f5fda9a parent: 80074:aa52d8559ce5 user: Benjamin Peterson date: Tue Oct 30 23:41:54 2012 -0400 summary: initialize map/filter/zip in _PyBuiltin_Init rather than the catch-all function files: Objects/object.c | 9 --------- Python/bltinmodule.c | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1708,15 +1708,6 @@ if (PyType_Ready(&PyMemberDescr_Type) < 0) Py_FatalError("Can't initialize member descriptor type"); - if (PyType_Ready(&PyFilter_Type) < 0) - Py_FatalError("Can't initialize filter type"); - - if (PyType_Ready(&PyMap_Type) < 0) - Py_FatalError("Can't initialize map type"); - - if (PyType_Ready(&PyZip_Type) < 0) - Py_FatalError("Can't initialize zip type"); - if (PyType_Ready(&_PyNamespace_Type) < 0) Py_FatalError("Can't initialize namespace type"); diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2405,6 +2405,12 @@ _PyBuiltin_Init(void) { PyObject *mod, *dict, *debug; + + if (PyType_Ready(&PyFilter_Type) < 0 || + PyType_Ready(&PyMap_Type) < 0 || + PyType_Ready(&PyZip_Type) < 0) + return NULL; + mod = PyModule_Create(&builtinsmodule); if (mod == NULL) return NULL; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 05:08:13 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 05:08:13 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogZG9uJ3Qgc2hhZG93?= =?utf-8?q?_the_=5F=5Fqualname=5F=5F_descriptor_with_=5F=5Fqualname=5F=5F_?= =?utf-8?q?in_the_class=27s?= Message-ID: <3Xrwy50bZmzP42@mail.python.org> http://hg.python.org/cpython/rev/1d700e1aff33 changeset: 80077:1d700e1aff33 branch: 3.3 parent: 80073:9371bf2287c4 user: Benjamin Peterson date: Tue Oct 30 23:51:03 2012 -0400 summary: don't shadow the __qualname__ descriptor with __qualname__ in the class's __dict__ (closes #16271) files: Lib/test/test_descr.py | 8 ++++---- Misc/NEWS | 3 +++ Objects/typeobject.c | 9 ++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4506,7 +4506,7 @@ ns = {'__qualname__': 'some.name'} tp = type('Foo', (), ns) self.assertEqual(tp.__qualname__, 'some.name') - self.assertEqual(tp.__dict__['__qualname__'], 'some.name') + self.assertNotIn('__qualname__', tp.__dict__) self.assertEqual(ns, {'__qualname__': 'some.name'}) ns = {'__qualname__': 1} @@ -4564,7 +4564,7 @@ keys = list(it) keys.sort() self.assertEqual(keys, ['__dict__', '__doc__', '__module__', - '__qualname__', '__weakref__', 'meth']) + '__weakref__', 'meth']) @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), 'trace function introduces __local__') @@ -4573,7 +4573,7 @@ it = self.C.__dict__.values() self.assertNotIsInstance(it, list) values = list(it) - self.assertEqual(len(values), 6) + self.assertEqual(len(values), 5) @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), 'trace function introduces __local__') @@ -4584,7 +4584,7 @@ keys = [item[0] for item in it] keys.sort() self.assertEqual(keys, ['__dict__', '__doc__', '__module__', - '__qualname__', '__weakref__', 'meth']) + '__weakref__', 'meth']) def test_dict_type_with_metaclass(self): # Testing type of __dict__ when metaclass set... diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a + class's __dict__ and on type. + - Issue #16197: Update winreg docstrings and documentation to match code. Patch by Zachary Ware. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2250,11 +2250,10 @@ goto error; } } - else { - qualname = et->ht_name; - } - Py_INCREF(qualname); - et->ht_qualname = qualname; + et->ht_qualname = qualname ? qualname : et->ht_name; + Py_INCREF(et->ht_qualname); + if (qualname != NULL && PyDict_DelItem(dict, PyId___qualname__.object) < 0) + goto error; /* Set tp_doc to a copy of dict['__doc__'], if the latter is there and is a string. The __doc__ accessor will first look for tp_doc; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 05:08:14 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 05:08:14 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_do_safety_chec?= =?utf-8?q?ks_on_=5F=5Fqualname=5F=5F_assignment?= Message-ID: <3Xrwy63D7fzPYy@mail.python.org> http://hg.python.org/cpython/rev/c21c894eefe1 changeset: 80078:c21c894eefe1 branch: 3.3 user: Benjamin Peterson date: Wed Oct 31 00:01:15 2012 -0400 summary: do safety checks on __qualname__ assignment files: Lib/test/test_descr.py | 8 ++++++++ Misc/NEWS | 3 +++ Objects/typeobject.c | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4502,6 +4502,14 @@ self.assertEqual(float.real.__qualname__, 'float.real') self.assertEqual(int.__add__.__qualname__, 'int.__add__') + class X: + pass + with self.assertRaises(TypeError): + del X.__qualname__ + + self.assertRaises(TypeError, type.__dict__['__qualname__'].__set__, + str, 'Oink') + def test_qualname_dict(self): ns = {'__qualname__': 'some.name'} tp = type('Foo', (), ns) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Fix segfaults on setting __qualname__ on builtin types and attempting to + delete it on any type. + - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a class's __dict__ and on type. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -311,6 +311,8 @@ { PyHeapTypeObject* et; + if (!check_set_special_type_attr(type, value, "__qualname__")) + return -1; if (!PyUnicode_Check(value)) { PyErr_Format(PyExc_TypeError, "can only assign string to %s.__qualname__, not '%s'", -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 05:08:15 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 05:08:15 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3Xrwy76hHCzPYy@mail.python.org> http://hg.python.org/cpython/rev/2200aab16b56 changeset: 80079:2200aab16b56 parent: 80076:75fe7f5fda9a parent: 80078:c21c894eefe1 user: Benjamin Peterson date: Wed Oct 31 00:04:42 2012 -0400 summary: merge 3.3 files: Lib/test/test_descr.py | 16 ++++++++++++---- Misc/NEWS | 6 ++++++ Objects/typeobject.c | 11 ++++++----- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4502,11 +4502,19 @@ self.assertEqual(float.real.__qualname__, 'float.real') self.assertEqual(int.__add__.__qualname__, 'int.__add__') + class X: + pass + with self.assertRaises(TypeError): + del X.__qualname__ + + self.assertRaises(TypeError, type.__dict__['__qualname__'].__set__, + str, 'Oink') + def test_qualname_dict(self): ns = {'__qualname__': 'some.name'} tp = type('Foo', (), ns) self.assertEqual(tp.__qualname__, 'some.name') - self.assertEqual(tp.__dict__['__qualname__'], 'some.name') + self.assertNotIn('__qualname__', tp.__dict__) self.assertEqual(ns, {'__qualname__': 'some.name'}) ns = {'__qualname__': 1} @@ -4564,7 +4572,7 @@ keys = list(it) keys.sort() self.assertEqual(keys, ['__dict__', '__doc__', '__module__', - '__qualname__', '__weakref__', 'meth']) + '__weakref__', 'meth']) @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), 'trace function introduces __local__') @@ -4573,7 +4581,7 @@ it = self.C.__dict__.values() self.assertNotIsInstance(it, list) values = list(it) - self.assertEqual(len(values), 6) + self.assertEqual(len(values), 5) @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), 'trace function introduces __local__') @@ -4584,7 +4592,7 @@ keys = [item[0] for item in it] keys.sort() self.assertEqual(keys, ['__dict__', '__doc__', '__module__', - '__qualname__', '__weakref__', 'meth']) + '__weakref__', 'meth']) def test_dict_type_with_metaclass(self): # Testing type of __dict__ when metaclass set... diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,9 +15,15 @@ Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is now unsigned too (unsigned long, instead of long). +- Fix segfaults on setting __qualname__ on builtin types and attempting to + delete it on any type. + - Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch written by Serhiy Storchaka. +- Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a + class's __dict__ and on type. + - Issue #16197: Update winreg docstrings and documentation to match code. Patch by Zachary Ware. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -311,6 +311,8 @@ { PyHeapTypeObject* et; + if (!check_set_special_type_attr(type, value, "__qualname__")) + return -1; if (!PyUnicode_Check(value)) { PyErr_Format(PyExc_TypeError, "can only assign string to %s.__qualname__, not '%s'", @@ -2250,11 +2252,10 @@ goto error; } } - else { - qualname = et->ht_name; - } - Py_INCREF(qualname); - et->ht_qualname = qualname; + et->ht_qualname = qualname ? qualname : et->ht_name; + Py_INCREF(et->ht_qualname); + if (qualname != NULL && PyDict_DelItem(dict, PyId___qualname__.object) < 0) + goto error; /* Set tp_doc to a copy of dict['__doc__'], if the latter is there and is a string. The __doc__ accessor will first look for tp_doc; -- Repository URL: http://hg.python.org/cpython From solipsis at pitrou.net Wed Oct 31 05:56:43 2012 From: solipsis at pitrou.net (solipsis at pitrou.net) Date: Wed, 31 Oct 2012 05:56:43 +0100 Subject: [Python-checkins] Daily reference leaks (d24befb680d6): sum=0 Message-ID: results for d24befb680d6 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogKidJMY', '-x'] From python-checkins at python.org Wed Oct 31 10:30:28 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 10:30:28 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typo_in_mo?= =?utf-8?q?ck_docs=2E?= Message-ID: <3Xs45w1L6kzPfC@mail.python.org> http://hg.python.org/cpython/rev/78f584e055eb changeset: 80080:78f584e055eb branch: 3.3 parent: 80078:c21c894eefe1 user: Andrew Svetlov date: Wed Oct 31 11:29:52 2012 +0200 summary: Fix typo in mock docs. files: Doc/library/unittest.mock.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -1,3 +1,4 @@ + :mod:`unittest.mock` --- mock object library ============================================ @@ -646,7 +647,7 @@ which have no meaning on a non-callable mock. Mock objects that use a class or an instance as a `spec` or `spec_set` are able -to pass `isintance` tests: +to pass `isinstance` tests: >>> mock = Mock(spec=SomeClass) >>> isinstance(mock, SomeClass) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 10:30:29 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 10:30:29 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_fix_typo_in_mock_docs=2E?= Message-ID: <3Xs45x3Xw8zPfC@mail.python.org> http://hg.python.org/cpython/rev/2e9e2bc904d8 changeset: 80081:2e9e2bc904d8 parent: 80079:2200aab16b56 parent: 80080:78f584e055eb user: Andrew Svetlov date: Wed Oct 31 11:30:18 2012 +0200 summary: Merge: fix typo in mock docs. files: Doc/library/unittest.mock.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -1,3 +1,4 @@ + :mod:`unittest.mock` --- mock object library ============================================ @@ -646,7 +647,7 @@ which have no meaning on a non-callable mock. Mock objects that use a class or an instance as a `spec` or `spec_set` are able -to pass `isintance` tests: +to pass `isinstance` tests: >>> mock = Mock(spec=SomeClass) >>> isinstance(mock, SomeClass) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 10:51:50 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 10:51:50 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_docstring_?= =?utf-8?q?for_deque_ctor_to_mark_iterable_parameter_optional?= Message-ID: <3Xs4ZZ5RPYzMft@mail.python.org> http://hg.python.org/cpython/rev/96c02b5a4e8d changeset: 80082:96c02b5a4e8d branch: 2.7 parent: 80075:315bd0ceb97a user: Andrew Svetlov date: Wed Oct 31 11:50:00 2012 +0200 summary: Fix docstring for deque ctor to mark iterable parameter optional files: Modules/_collectionsmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1077,7 +1077,7 @@ }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 10:51:52 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 10:51:52 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_docstring_?= =?utf-8?q?for_deque_ctor_to_mark_iterable_parameter_optional?= Message-ID: <3Xs4Zc5dbBzR23@mail.python.org> http://hg.python.org/cpython/rev/9de80866f56b changeset: 80083:9de80866f56b branch: 3.2 parent: 80072:eec0cafe171d user: Andrew Svetlov date: Wed Oct 31 11:50:40 2012 +0200 summary: Fix docstring for deque ctor to mark iterable parameter optional files: Modules/_collectionsmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1019,7 +1019,7 @@ }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 10:51:54 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 10:51:54 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge=3A_fix_docstring_for_deque_ctor_to_mark_iterable_paramet?= =?utf-8?q?er_optional?= Message-ID: <3Xs4Zf1SL4zR2P@mail.python.org> http://hg.python.org/cpython/rev/6925c66fd775 changeset: 80084:6925c66fd775 branch: 3.3 parent: 80080:78f584e055eb parent: 80083:9de80866f56b user: Andrew Svetlov date: Wed Oct 31 11:51:13 2012 +0200 summary: Merge: fix docstring for deque ctor to mark iterable parameter optional files: Modules/_collectionsmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1019,7 +1019,7 @@ }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 10:51:55 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 10:51:55 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_fix_docstring_for_deque_ctor_to_mark_iterable_p?= =?utf-8?q?arameter_optional?= Message-ID: <3Xs4Zg406SzR5L@mail.python.org> http://hg.python.org/cpython/rev/c6b711cbac48 changeset: 80085:c6b711cbac48 parent: 80081:2e9e2bc904d8 parent: 80084:6925c66fd775 user: Andrew Svetlov date: Wed Oct 31 11:51:39 2012 +0200 summary: Merge: fix docstring for deque ctor to mark iterable parameter optional files: Modules/_collectionsmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1019,7 +1019,7 @@ }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 11:03:59 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 11:03:59 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Remove_already?= =?utf-8?q?_dropped_function_PySys=5FGetFile_from_documentation=2E?= Message-ID: <3Xs4rb748YzPVg@mail.python.org> http://hg.python.org/cpython/rev/deac156c4dd4 changeset: 80086:deac156c4dd4 branch: 3.2 parent: 80083:9de80866f56b user: Andrew Svetlov date: Wed Oct 31 12:02:56 2012 +0200 summary: Remove already dropped function PySys_GetFile from documentation. Thanks to Daniel M?llner from docs@ files: Doc/c-api/sys.rst | 6 ------ Doc/data/refcounts.dat | 4 ---- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -61,12 +61,6 @@ Return the object *name* from the :mod:`sys` module or *NULL* if it does not exist, without setting an exception. -.. c:function:: FILE *PySys_GetFile(char *name, FILE *def) - - Return the :c:type:`FILE*` associated with the object *name* in the - :mod:`sys` module, or *def* if *name* is not in the module or is not associated - with a :c:type:`FILE*`. - .. c:function:: int PySys_SetObject(char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is *NULL*, in which diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -1310,10 +1310,6 @@ PySys_AddXOption:void::: PySys_AddXOption:const wchar_t*:s:: -PySys_GetFile:FILE*::: -PySys_GetFile:char*:name:: -PySys_GetFile:FILE*:def:: - PySys_GetObject:PyObject*::0: PySys_GetObject:char*:name:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 11:04:01 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 11:04:01 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge=3A_Remove_already_dropped_function_PySys=5FGetFile_from_?= =?utf-8?q?documentation=2E?= Message-ID: <3Xs4rd2WxpzPVg@mail.python.org> http://hg.python.org/cpython/rev/b6f302dfc5eb changeset: 80087:b6f302dfc5eb branch: 3.3 parent: 80084:6925c66fd775 parent: 80086:deac156c4dd4 user: Andrew Svetlov date: Wed Oct 31 12:03:18 2012 +0200 summary: Merge: Remove already dropped function PySys_GetFile from documentation. Thanks to Daniel M?llner from docs@ files: Doc/c-api/sys.rst | 6 ------ Doc/data/refcounts.dat | 4 ---- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -61,12 +61,6 @@ Return the object *name* from the :mod:`sys` module or *NULL* if it does not exist, without setting an exception. -.. c:function:: FILE *PySys_GetFile(char *name, FILE *def) - - Return the :c:type:`FILE*` associated with the object *name* in the - :mod:`sys` module, or *def* if *name* is not in the module or is not associated - with a :c:type:`FILE*`. - .. c:function:: int PySys_SetObject(char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is *NULL*, in which diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -1315,10 +1315,6 @@ PySys_AddXOption:void::: PySys_AddXOption:const wchar_t*:s:: -PySys_GetFile:FILE*::: -PySys_GetFile:char*:name:: -PySys_GetFile:FILE*:def:: - PySys_GetObject:PyObject*::0: PySys_GetObject:char*:name:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 11:04:02 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 11:04:02 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge=3A_Remove_already_dropped_function_PySys=5FGetFile?= =?utf-8?q?_from_documentation=2E?= Message-ID: <3Xs4rf5LwczPYy@mail.python.org> http://hg.python.org/cpython/rev/9f464eff218a changeset: 80088:9f464eff218a parent: 80085:c6b711cbac48 parent: 80087:b6f302dfc5eb user: Andrew Svetlov date: Wed Oct 31 12:03:48 2012 +0200 summary: Merge: Remove already dropped function PySys_GetFile from documentation. Thanks to Daniel M?llner from docs@ files: Doc/c-api/sys.rst | 6 ------ Doc/data/refcounts.dat | 4 ---- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -61,12 +61,6 @@ Return the object *name* from the :mod:`sys` module or *NULL* if it does not exist, without setting an exception. -.. c:function:: FILE *PySys_GetFile(char *name, FILE *def) - - Return the :c:type:`FILE*` associated with the object *name* in the - :mod:`sys` module, or *def* if *name* is not in the module or is not associated - with a :c:type:`FILE*`. - .. c:function:: int PySys_SetObject(char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is *NULL*, in which diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -1315,10 +1315,6 @@ PySys_AddXOption:void::: PySys_AddXOption:const wchar_t*:s:: -PySys_GetFile:FILE*::: -PySys_GetFile:char*:name:: -PySys_GetFile:FILE*:def:: - PySys_GetObject:PyObject*::0: PySys_GetObject:char*:name:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:04:36 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:04:36 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2Mzcw?= =?utf-8?q?=3A_Mention_Py=5FSetProgramName_in_example_for_very_high_level?= Message-ID: <3XsBBD3JTTzPYy@mail.python.org> http://hg.python.org/cpython/rev/6e24eb832fb2 changeset: 80089:6e24eb832fb2 branch: 2.7 parent: 80082:96c02b5a4e8d user: Andrew Svetlov date: Wed Oct 31 16:01:09 2012 +0200 summary: Issue #16370: Mention Py_SetProgramName in example for very high level embedding. files: Doc/extending/embedding.rst | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -61,6 +61,7 @@ int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print 'Today is',ctime(time())\n"); @@ -68,14 +69,18 @@ return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:04:37 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:04:37 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2Mzcw?= =?utf-8?q?=3A_Mention_Py=5FSetProgramName_in_example_for_very_high_level?= Message-ID: <3XsBBF5ktczPhW@mail.python.org> http://hg.python.org/cpython/rev/4c35f5ec6acf changeset: 80090:4c35f5ec6acf branch: 3.2 parent: 80086:deac156c4dd4 user: Andrew Svetlov date: Wed Oct 31 16:03:14 2012 +0200 summary: Issue #16370: Mention Py_SetProgramName in example for very high level embedding. files: Doc/extending/embedding.rst | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); @@ -65,14 +66,18 @@ return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:04:39 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:04:39 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2316370=3A_Mention_Py=5FSetProgramName_in_example?= =?utf-8?q?_for_very_high_level?= Message-ID: <3XsBBH0hKHzPhW@mail.python.org> http://hg.python.org/cpython/rev/b6a5f54e0a34 changeset: 80091:b6a5f54e0a34 branch: 3.3 parent: 80087:b6f302dfc5eb parent: 80090:4c35f5ec6acf user: Andrew Svetlov date: Wed Oct 31 16:03:44 2012 +0200 summary: Merge issue #16370: Mention Py_SetProgramName in example for very high level embedding. files: Doc/extending/embedding.rst | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); @@ -65,14 +66,18 @@ return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:04:40 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:04:40 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316370=3A_Mention_Py=5FSetProgramName_in_e?= =?utf-8?q?xample_for_very_high_level?= Message-ID: <3XsBBJ2mxbzPlK@mail.python.org> http://hg.python.org/cpython/rev/0c1b81465d9c changeset: 80092:0c1b81465d9c parent: 80088:9f464eff218a parent: 80091:b6a5f54e0a34 user: Andrew Svetlov date: Wed Oct 31 16:04:22 2012 +0200 summary: Merge issue #16370: Mention Py_SetProgramName in example for very high level embedding. files: Doc/extending/embedding.rst | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); @@ -65,14 +66,18 @@ return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:21:48 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:21:48 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2Mzcx?= =?utf-8?q?=3A_fix_typo_in_ctypes_documentation=2E?= Message-ID: <3XsBZ45XW5zPSl@mail.python.org> http://hg.python.org/cpython/rev/ee13dc0793df changeset: 80093:ee13dc0793df branch: 3.2 parent: 80090:4c35f5ec6acf user: Andrew Svetlov date: Wed Oct 31 16:20:54 2012 +0200 summary: Issue #16371: fix typo in ctypes documentation. Thanks to George Yoshida. files: Doc/library/ctypes.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1155,7 +1155,7 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than +There are some edges in :mod:`ctypes` where you may expect something else than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:21:50 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:21:50 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2316371=3A_fix_typo_in_ctypes_documentation=2E?= Message-ID: <3XsBZ60g8gzPVV@mail.python.org> http://hg.python.org/cpython/rev/8badb59fd35e changeset: 80094:8badb59fd35e branch: 3.3 parent: 80091:b6a5f54e0a34 parent: 80093:ee13dc0793df user: Andrew Svetlov date: Wed Oct 31 16:21:16 2012 +0200 summary: Merge issue #16371: fix typo in ctypes documentation. Thanks to George Yoshida. files: Doc/library/ctypes.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1094,7 +1094,7 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than +There are some edges in :mod:`ctypes` where you may expect something else than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:21:51 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 15:21:51 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316371=3A_fix_typo_in_ctypes_documentation?= =?utf-8?q?=2E?= Message-ID: <3XsBZ72p4QzPc9@mail.python.org> http://hg.python.org/cpython/rev/0dac3e07ee8b changeset: 80095:0dac3e07ee8b parent: 80092:0c1b81465d9c parent: 80094:8badb59fd35e user: Andrew Svetlov date: Wed Oct 31 16:21:32 2012 +0200 summary: Merge issue #16371: fix typo in ctypes documentation. Thanks to George Yoshida. files: Doc/library/ctypes.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1094,7 +1094,7 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than +There are some edges in :mod:`ctypes` where you may expect something else than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:53:38 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 31 Oct 2012 15:53:38 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MzcxOiBmaXgg?= =?utf-8?q?up_the_English_a_bit_more=2E?= Message-ID: <3XsCGp6CyxzMVN@mail.python.org> http://hg.python.org/cpython/rev/f0b22e314975 changeset: 80096:f0b22e314975 branch: 3.2 parent: 80093:ee13dc0793df user: R David Murray date: Wed Oct 31 10:50:27 2012 -0400 summary: #16371: fix up the English a bit more. files: Doc/library/ctypes.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1155,8 +1155,8 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may expect something else than -what actually happens. +There are some edges in :mod:`ctypes` where you might expect something other +than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:53:40 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 31 Oct 2012 15:53:40 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_=2316371=3A_fix_up_the_English_a_bit_more=2E?= Message-ID: <3XsCGr1GGjzPk6@mail.python.org> http://hg.python.org/cpython/rev/85504242d0ce changeset: 80097:85504242d0ce branch: 3.3 parent: 80094:8badb59fd35e parent: 80096:f0b22e314975 user: R David Murray date: Wed Oct 31 10:51:35 2012 -0400 summary: merge #16371: fix up the English a bit more. files: Doc/library/ctypes.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1094,8 +1094,8 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may expect something else than -what actually happens. +There are some edges in :mod:`ctypes` where you might expect something other +than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:53:41 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 31 Oct 2012 15:53:41 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_merge_=2316371=3A_fix_up_the_English_a_bit_more=2E?= Message-ID: <3XsCGs3SG5zR2f@mail.python.org> http://hg.python.org/cpython/rev/f5dec8c57715 changeset: 80098:f5dec8c57715 parent: 80095:0dac3e07ee8b parent: 80097:85504242d0ce user: R David Murray date: Wed Oct 31 10:52:16 2012 -0400 summary: merge #16371: fix up the English a bit more. files: Doc/library/ctypes.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1094,8 +1094,8 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may expect something else than -what actually happens. +There are some edges in :mod:`ctypes` where you might expect something other +than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 15:53:42 2012 From: python-checkins at python.org (r.david.murray) Date: Wed, 31 Oct 2012 15:53:42 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzcxOiBmaXgg?= =?utf-8?q?up_the_English=2E?= Message-ID: <3XsCGt5YDbzR2f@mail.python.org> http://hg.python.org/cpython/rev/fa959dc5c61d changeset: 80099:fa959dc5c61d branch: 2.7 parent: 80089:6e24eb832fb2 user: R David Murray date: Wed Oct 31 10:53:13 2012 -0400 summary: #16371: fix up the English. files: Doc/library/ctypes.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1153,8 +1153,8 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than -what actually happens. +There are some edge cases in :mod:`ctypes` where you might expect something +other than what actually happens. Consider the following example:: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 17:11:07 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 31 Oct 2012 17:11:07 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNjM2?= =?utf-8?q?9=3A_Global_PyTypeObjects_not_initialized_with_PyType=5FReady?= =?utf-8?b?KC4uLiku?= Message-ID: <3XsF0C0P41zM3Z@mail.python.org> http://hg.python.org/cpython/rev/abe8a2908f08 changeset: 80100:abe8a2908f08 branch: 2.7 user: Jesus Cea date: Wed Oct 31 17:00:19 2012 +0100 summary: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT! files: Misc/NEWS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -50,6 +50,8 @@ - Issue #15897: zipimport.c doesn't check return value of fseek(). Patch by Felipe Cruz. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, return the proper failure return value (1). Patch contributed by Jeff Knupp. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 17:11:08 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 31 Oct 2012 17:11:08 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNjM2?= =?utf-8?q?9=3A_Global_PyTypeObjects_not_initialized_with_PyType=5FReady?= =?utf-8?b?KC4uLiku?= Message-ID: <3XsF0D2ZkZzMwT@mail.python.org> http://hg.python.org/cpython/rev/e9ea7f6a7107 changeset: 80101:e9ea7f6a7107 branch: 3.2 parent: 80096:f0b22e314975 user: Jesus Cea date: Wed Oct 31 17:00:59 2012 +0100 summary: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT! files: Misc/NEWS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -58,6 +58,8 @@ - Issue #15368: An issue that caused bytecode generation to be non-deterministic when using randomized hashing (-R) has been fixed. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 17:11:09 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 31 Oct 2012 17:11:09 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_MERGE=3A_Closes_=2316369=3A_Global_PyTypeObjects_not_initializ?= =?utf-8?q?ed_with?= Message-ID: <3XsF0F4kkyzM95@mail.python.org> http://hg.python.org/cpython/rev/9a4e2d394ba0 changeset: 80102:9a4e2d394ba0 branch: 3.3 parent: 80097:85504242d0ce parent: 80101:e9ea7f6a7107 user: Jesus Cea date: Wed Oct 31 17:02:03 2012 +0100 summary: MERGE: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT! files: Misc/NEWS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -552,6 +552,8 @@ - Issue #15110: Fix the tracebacks generated by "import xxx" to not show the importlib stack frames. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 17:11:10 2012 From: python-checkins at python.org (jesus.cea) Date: Wed, 31 Oct 2012 17:11:10 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_MERGE=3A_Closes_=2316369=3A_Global_PyTypeObjects_not_ini?= =?utf-8?q?tialized_with?= Message-ID: <3XsF0G6vQwzM3Z@mail.python.org> http://hg.python.org/cpython/rev/e5f39546989f changeset: 80103:e5f39546989f parent: 80098:f5dec8c57715 parent: 80102:9a4e2d394ba0 user: Jesus Cea date: Wed Oct 31 17:02:25 2012 +0100 summary: MERGE: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT! files: Misc/NEWS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -632,6 +632,8 @@ - Issue #15110: Fix the tracebacks generated by "import xxx" to not show the importlib stack frames. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 18:30:11 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 18:30:11 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTk3?= =?utf-8?q?=3A_Fix_several_small_errors_in_winreg_documentation=2E?= Message-ID: <3XsGlR6FkxzPLQ@mail.python.org> http://hg.python.org/cpython/rev/2e7da832219d changeset: 80104:2e7da832219d branch: 3.3 parent: 80102:9a4e2d394ba0 user: Andrew Svetlov date: Wed Oct 31 19:29:33 2012 +0200 summary: Issue #16197: Fix several small errors in winreg documentation. Initial patch by Zachary Ware. files: Doc/library/winreg.rst | 49 +++++++++++++++-------------- PC/winreg.c | 16 ++++---- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -12,6 +12,17 @@ to ensure that the handles are closed correctly, even if the programmer neglects to explicitly close them. +.. _exception-changed: + +.. versionchanged:: 3.3 + Several functions in this module used to raise a + :exc:`WindowsError`, which is now an alias of :exc:`OSError`. + +.. _functions: + +Functions +------------------ + This module offers the following functions: @@ -37,12 +48,11 @@ *key* is the predefined handle to connect to. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: CreateKey(key, sub_key) @@ -60,12 +70,11 @@ If the key already exists, this function opens the existing key. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) @@ -89,14 +98,13 @@ If the key already exists, this function opens the existing key. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionadded:: 3.2 .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteKey(key, sub_key) @@ -112,11 +120,10 @@ *This method can not delete keys with subkeys.* If the method succeeds, the entire key, including all of its values, is removed. - If the method fails, a :exc:`OSError` exception is raised. + If the method fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0) @@ -145,15 +152,14 @@ *This method can not delete keys with subkeys.* If the method succeeds, the entire key, including all of its values, is - removed. If the method fails, a :exc:`OSError` exception is raised. + removed. If the method fails, an :exc:`OSError` exception is raised. On unsupported Windows versions, :exc:`NotImplementedError` is raised. .. versionadded:: 3.2 .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteValue(key, value) @@ -176,12 +182,11 @@ *index* is an integer that identifies the index of the key to retrieve. The function retrieves the name of one subkey each time it is called. It is - typically called repeatedly until a :exc:`OSError` exception is + typically called repeatedly until an :exc:`OSError` exception is raised, indicating, no more values are available. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: EnumValue(key, index) @@ -194,7 +199,7 @@ *index* is an integer that identifies the index of the value to retrieve. The function retrieves the name of one subkey each time it is called. It is - typically called repeatedly, until a :exc:`OSError` exception is + typically called repeatedly, until an :exc:`OSError` exception is raised, indicating no more values. The result is a tuple of 3 items: @@ -214,8 +219,7 @@ +-------+--------------------------------------------+ .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: ExpandEnvironmentStrings(str) @@ -295,8 +299,7 @@ Allow the use of named arguments. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: QueryInfoKey(key) diff --git a/PC/winreg.c b/PC/winreg.c --- a/PC/winreg.c +++ b/PC/winreg.c @@ -89,7 +89,7 @@ "key is the predefined handle to connect to.\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(CreateKey_doc, "CreateKey(key, sub_key) -> key\n" @@ -104,7 +104,7 @@ "If the key already exists, this function opens the existing key.\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(CreateKeyEx_doc, "CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n" @@ -122,7 +122,7 @@ "If the key already exists, this function opens the existing key\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(DeleteKey_doc, "DeleteKey(key, sub_key)\n" @@ -136,7 +136,7 @@ "This method can not delete keys with subkeys.\n" "\n" "If the function succeeds, the entire key, including all of its values,\n" -"is removed. If the function fails, a WindowsError exception is raised."); +"is removed. If the function fails, an OSError exception is raised."); PyDoc_STRVAR(DeleteKeyEx_doc, "DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n" @@ -153,7 +153,7 @@ "This method can not delete keys with subkeys.\n" "\n" "If the function succeeds, the entire key, including all of its values,\n" -"is removed. If the function fails, a WindowsError exception is raised.\n" +"is removed. If the function fails, an OSError exception is raised.\n" "On unsupported Windows versions, NotImplementedError is raised."); PyDoc_STRVAR(DeleteValue_doc, @@ -171,7 +171,7 @@ "index is an integer that identifies the index of the key to retrieve.\n" "\n" "The function retrieves the name of one subkey each time it is called.\n" -"It is typically called repeatedly until a WindowsError exception is\n" +"It is typically called repeatedly until an OSError exception is\n" "raised, indicating no more values are available."); PyDoc_STRVAR(EnumValue_doc, @@ -181,7 +181,7 @@ "index is an integer that identifies the index of the value to retrieve.\n" "\n" "The function retrieves the name of one subkey each time it is called.\n" -"It is typically called repeatedly, until a WindowsError exception\n" +"It is typically called repeatedly, until an OSError exception\n" "is raised, indicating no more values.\n" "\n" "The result is a tuple of 3 items:\n" @@ -240,7 +240,7 @@ " security access for the key. Default is KEY_READ\n" "\n" "The result is a new handle to the specified key\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()"); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 18:30:13 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 18:30:13 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316197=3A_Fix_several_small_errors_in_winr?= =?utf-8?q?eg_documentation=2E?= Message-ID: <3XsGlT2dRgzPLQ@mail.python.org> http://hg.python.org/cpython/rev/f1310219c702 changeset: 80105:f1310219c702 parent: 80103:e5f39546989f parent: 80104:2e7da832219d user: Andrew Svetlov date: Wed Oct 31 19:30:00 2012 +0200 summary: Merge issue #16197: Fix several small errors in winreg documentation. Initial patch by Zachary Ware. files: Doc/library/winreg.rst | 49 +++++++++++++++-------------- PC/winreg.c | 16 ++++---- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -12,6 +12,17 @@ to ensure that the handles are closed correctly, even if the programmer neglects to explicitly close them. +.. _exception-changed: + +.. versionchanged:: 3.3 + Several functions in this module used to raise a + :exc:`WindowsError`, which is now an alias of :exc:`OSError`. + +.. _functions: + +Functions +------------------ + This module offers the following functions: @@ -37,12 +48,11 @@ *key* is the predefined handle to connect to. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: CreateKey(key, sub_key) @@ -60,12 +70,11 @@ If the key already exists, this function opens the existing key. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) @@ -89,14 +98,13 @@ If the key already exists, this function opens the existing key. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionadded:: 3.2 .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteKey(key, sub_key) @@ -112,11 +120,10 @@ *This method can not delete keys with subkeys.* If the method succeeds, the entire key, including all of its values, is removed. - If the method fails, a :exc:`OSError` exception is raised. + If the method fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0) @@ -145,15 +152,14 @@ *This method can not delete keys with subkeys.* If the method succeeds, the entire key, including all of its values, is - removed. If the method fails, a :exc:`OSError` exception is raised. + removed. If the method fails, an :exc:`OSError` exception is raised. On unsupported Windows versions, :exc:`NotImplementedError` is raised. .. versionadded:: 3.2 .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteValue(key, value) @@ -176,12 +182,11 @@ *index* is an integer that identifies the index of the key to retrieve. The function retrieves the name of one subkey each time it is called. It is - typically called repeatedly until a :exc:`OSError` exception is + typically called repeatedly until an :exc:`OSError` exception is raised, indicating, no more values are available. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: EnumValue(key, index) @@ -194,7 +199,7 @@ *index* is an integer that identifies the index of the value to retrieve. The function retrieves the name of one subkey each time it is called. It is - typically called repeatedly, until a :exc:`OSError` exception is + typically called repeatedly, until an :exc:`OSError` exception is raised, indicating no more values. The result is a tuple of 3 items: @@ -214,8 +219,7 @@ +-------+--------------------------------------------+ .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: ExpandEnvironmentStrings(str) @@ -295,8 +299,7 @@ Allow the use of named arguments. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: QueryInfoKey(key) diff --git a/PC/winreg.c b/PC/winreg.c --- a/PC/winreg.c +++ b/PC/winreg.c @@ -89,7 +89,7 @@ "key is the predefined handle to connect to.\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(CreateKey_doc, "CreateKey(key, sub_key) -> key\n" @@ -104,7 +104,7 @@ "If the key already exists, this function opens the existing key.\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(CreateKeyEx_doc, "CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n" @@ -122,7 +122,7 @@ "If the key already exists, this function opens the existing key\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(DeleteKey_doc, "DeleteKey(key, sub_key)\n" @@ -136,7 +136,7 @@ "This method can not delete keys with subkeys.\n" "\n" "If the function succeeds, the entire key, including all of its values,\n" -"is removed. If the function fails, a WindowsError exception is raised."); +"is removed. If the function fails, an OSError exception is raised."); PyDoc_STRVAR(DeleteKeyEx_doc, "DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n" @@ -153,7 +153,7 @@ "This method can not delete keys with subkeys.\n" "\n" "If the function succeeds, the entire key, including all of its values,\n" -"is removed. If the function fails, a WindowsError exception is raised.\n" +"is removed. If the function fails, an OSError exception is raised.\n" "On unsupported Windows versions, NotImplementedError is raised."); PyDoc_STRVAR(DeleteValue_doc, @@ -171,7 +171,7 @@ "index is an integer that identifies the index of the key to retrieve.\n" "\n" "The function retrieves the name of one subkey each time it is called.\n" -"It is typically called repeatedly until a WindowsError exception is\n" +"It is typically called repeatedly until an OSError exception is\n" "raised, indicating no more values are available."); PyDoc_STRVAR(EnumValue_doc, @@ -181,7 +181,7 @@ "index is an integer that identifies the index of the value to retrieve.\n" "\n" "The function retrieves the name of one subkey each time it is called.\n" -"It is typically called repeatedly, until a WindowsError exception\n" +"It is typically called repeatedly, until an OSError exception\n" "is raised, indicating no more values.\n" "\n" "The result is a tuple of 3 items:\n" @@ -240,7 +240,7 @@ " security access for the key. Default is KEY_READ\n" "\n" "The result is a new handle to the specified key\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()"); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 18:36:29 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 18:36:29 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_make_PyGrammar=5FLabelRepr?= =?utf-8?q?_return_a_const_char_*_=28closes_=2316369=29?= Message-ID: <3XsGtj336XzPVD@mail.python.org> http://hg.python.org/cpython/rev/e87d617cef23 changeset: 80106:e87d617cef23 parent: 80079:2200aab16b56 user: Benjamin Peterson date: Wed Oct 31 13:36:13 2012 -0400 summary: make PyGrammar_LabelRepr return a const char * (closes #16369) files: Include/grammar.h | 2 +- Parser/grammar1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/grammar.h b/Include/grammar.h --- a/Include/grammar.h +++ b/Include/grammar.h @@ -76,7 +76,7 @@ int addlabel(labellist *ll, int type, char *str); int findlabel(labellist *ll, int type, char *str); -char *PyGrammar_LabelRepr(label *lb); +const char *PyGrammar_LabelRepr(label *lb); void translatelabels(grammar *g); void addfirstsets(grammar *g); diff --git a/Parser/grammar1.c b/Parser/grammar1.c --- a/Parser/grammar1.c +++ b/Parser/grammar1.c @@ -30,7 +30,7 @@ #endif } -char * +const char * PyGrammar_LabelRepr(label *lb) { static char buf[100]; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 18:36:30 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 18:36:30 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?= =?utf-8?q?=29=3A_merge_heads?= Message-ID: <3XsGtk6knXzPhQ@mail.python.org> http://hg.python.org/cpython/rev/f2e4b9870cfb changeset: 80107:f2e4b9870cfb parent: 80106:e87d617cef23 parent: 80105:f1310219c702 user: Benjamin Peterson date: Wed Oct 31 13:36:21 2012 -0400 summary: merge heads files: Doc/c-api/sys.rst | 6 -- Doc/data/refcounts.dat | 4 - Doc/extending/embedding.rst | 21 ++++++--- Doc/library/ctypes.rst | 4 +- Doc/library/unittest.mock.rst | 3 +- Doc/library/winreg.rst | 49 ++++++++++++---------- Misc/NEWS | 2 + Modules/_collectionsmodule.c | 2 +- PC/winreg.c | 16 +++--- 9 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -61,12 +61,6 @@ Return the object *name* from the :mod:`sys` module or *NULL* if it does not exist, without setting an exception. -.. c:function:: FILE *PySys_GetFile(char *name, FILE *def) - - Return the :c:type:`FILE*` associated with the object *name* in the - :mod:`sys` module, or *def* if *name* is not in the module or is not associated - with a :c:type:`FILE*`. - .. c:function:: int PySys_SetObject(char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is *NULL*, in which diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -1315,10 +1315,6 @@ PySys_AddXOption:void::: PySys_AddXOption:const wchar_t*:s:: -PySys_GetFile:FILE*::: -PySys_GetFile:char*:name:: -PySys_GetFile:FILE*:def:: - PySys_GetObject:PyObject*::0: PySys_GetObject:char*:name:: diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); @@ -65,14 +66,18 @@ return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1094,8 +1094,8 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than -what actually happens. +There are some edges in :mod:`ctypes` where you might expect something other +than what actually happens. Consider the following example:: diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -1,3 +1,4 @@ + :mod:`unittest.mock` --- mock object library ============================================ @@ -646,7 +647,7 @@ which have no meaning on a non-callable mock. Mock objects that use a class or an instance as a `spec` or `spec_set` are able -to pass `isintance` tests: +to pass `isinstance` tests: >>> mock = Mock(spec=SomeClass) >>> isinstance(mock, SomeClass) diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -12,6 +12,17 @@ to ensure that the handles are closed correctly, even if the programmer neglects to explicitly close them. +.. _exception-changed: + +.. versionchanged:: 3.3 + Several functions in this module used to raise a + :exc:`WindowsError`, which is now an alias of :exc:`OSError`. + +.. _functions: + +Functions +------------------ + This module offers the following functions: @@ -37,12 +48,11 @@ *key* is the predefined handle to connect to. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: CreateKey(key, sub_key) @@ -60,12 +70,11 @@ If the key already exists, this function opens the existing key. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) @@ -89,14 +98,13 @@ If the key already exists, this function opens the existing key. - The return value is the handle of the opened key. If the function fails, a + The return value is the handle of the opened key. If the function fails, an :exc:`OSError` exception is raised. .. versionadded:: 3.2 .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteKey(key, sub_key) @@ -112,11 +120,10 @@ *This method can not delete keys with subkeys.* If the method succeeds, the entire key, including all of its values, is removed. - If the method fails, a :exc:`OSError` exception is raised. + If the method fails, an :exc:`OSError` exception is raised. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0) @@ -145,15 +152,14 @@ *This method can not delete keys with subkeys.* If the method succeeds, the entire key, including all of its values, is - removed. If the method fails, a :exc:`OSError` exception is raised. + removed. If the method fails, an :exc:`OSError` exception is raised. On unsupported Windows versions, :exc:`NotImplementedError` is raised. .. versionadded:: 3.2 .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: DeleteValue(key, value) @@ -176,12 +182,11 @@ *index* is an integer that identifies the index of the key to retrieve. The function retrieves the name of one subkey each time it is called. It is - typically called repeatedly until a :exc:`OSError` exception is + typically called repeatedly until an :exc:`OSError` exception is raised, indicating, no more values are available. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: EnumValue(key, index) @@ -194,7 +199,7 @@ *index* is an integer that identifies the index of the value to retrieve. The function retrieves the name of one subkey each time it is called. It is - typically called repeatedly, until a :exc:`OSError` exception is + typically called repeatedly, until an :exc:`OSError` exception is raised, indicating no more values. The result is a tuple of 3 items: @@ -214,8 +219,7 @@ +-------+--------------------------------------------+ .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: ExpandEnvironmentStrings(str) @@ -295,8 +299,7 @@ Allow the use of named arguments. .. versionchanged:: 3.3 - This function used to raise a :exc:`WindowsError`, which is now an - alias of :exc:`OSError`. + See :ref:`above `. .. function:: QueryInfoKey(key) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -632,6 +632,8 @@ - Issue #15110: Fix the tracebacks generated by "import xxx" to not show the importlib stack frames. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1019,7 +1019,7 @@ }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); diff --git a/PC/winreg.c b/PC/winreg.c --- a/PC/winreg.c +++ b/PC/winreg.c @@ -89,7 +89,7 @@ "key is the predefined handle to connect to.\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(CreateKey_doc, "CreateKey(key, sub_key) -> key\n" @@ -104,7 +104,7 @@ "If the key already exists, this function opens the existing key.\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(CreateKeyEx_doc, "CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n" @@ -122,7 +122,7 @@ "If the key already exists, this function opens the existing key\n" "\n" "The return value is the handle of the opened key.\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(DeleteKey_doc, "DeleteKey(key, sub_key)\n" @@ -136,7 +136,7 @@ "This method can not delete keys with subkeys.\n" "\n" "If the function succeeds, the entire key, including all of its values,\n" -"is removed. If the function fails, a WindowsError exception is raised."); +"is removed. If the function fails, an OSError exception is raised."); PyDoc_STRVAR(DeleteKeyEx_doc, "DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n" @@ -153,7 +153,7 @@ "This method can not delete keys with subkeys.\n" "\n" "If the function succeeds, the entire key, including all of its values,\n" -"is removed. If the function fails, a WindowsError exception is raised.\n" +"is removed. If the function fails, an OSError exception is raised.\n" "On unsupported Windows versions, NotImplementedError is raised."); PyDoc_STRVAR(DeleteValue_doc, @@ -171,7 +171,7 @@ "index is an integer that identifies the index of the key to retrieve.\n" "\n" "The function retrieves the name of one subkey each time it is called.\n" -"It is typically called repeatedly until a WindowsError exception is\n" +"It is typically called repeatedly until an OSError exception is\n" "raised, indicating no more values are available."); PyDoc_STRVAR(EnumValue_doc, @@ -181,7 +181,7 @@ "index is an integer that identifies the index of the value to retrieve.\n" "\n" "The function retrieves the name of one subkey each time it is called.\n" -"It is typically called repeatedly, until a WindowsError exception\n" +"It is typically called repeatedly, until an OSError exception\n" "is raised, indicating no more values.\n" "\n" "The result is a tuple of 3 items:\n" @@ -240,7 +240,7 @@ " security access for the key. Default is KEY_READ\n" "\n" "The result is a new handle to the specified key\n" -"If the function fails, a WindowsError exception is raised."); +"If the function fails, an OSError exception is raised."); PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()"); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 18:54:59 2012 From: python-checkins at python.org (mark.dickinson) Date: Wed, 31 Oct 2012 18:54:59 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2313701=3A_Fix_deco?= =?utf-8?q?rator_avoidance_=28due_to_desire_for_Python_2=2E3?= Message-ID: <3XsHJ36HH1zMhF@mail.python.org> http://hg.python.org/cpython/rev/7ada0faded9b changeset: 80108:7ada0faded9b user: Mark Dickinson date: Wed Oct 31 17:53:27 2012 +0000 summary: Issue #13701: Fix decorator avoidance (due to desire for Python 2.3 compatibility) in decimal module. files: Lib/decimal.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Lib/decimal.py b/Lib/decimal.py --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -703,8 +703,7 @@ raise TypeError("Cannot convert %r to Decimal" % value) - # @classmethod, but @decorator is not valid Python 2.3 syntax, so - # don't use it (see notes on Py2.3 compatibility at top of file) + @classmethod def from_float(cls, f): """Converts a float to a decimal number, exactly. @@ -743,7 +742,6 @@ return result else: return cls(result) - from_float = classmethod(from_float) def _isnan(self): """Returns whether the number is not actually one. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:14:20 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:14:20 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_only_fast-path?= =?utf-8?q?_fromkeys=28=29_when_the_constructor_returns_a_empty_dict_=28cl?= =?utf-8?q?oses?= Message-ID: <3XsHkN2Vv0zPZm@mail.python.org> http://hg.python.org/cpython/rev/a965eac352ec changeset: 80109:a965eac352ec branch: 3.2 parent: 80072:eec0cafe171d user: Benjamin Peterson date: Wed Oct 31 14:05:55 2012 -0400 summary: only fast-path fromkeys() when the constructor returns a empty dict (closes #16345) files: Lib/test/test_dict.py | 8 +++ Misc/NEWS | 3 + Objects/dictobject.c | 67 +++++++++++++++--------------- 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -254,6 +254,14 @@ d = dict(zip(range(6), range(6))) self.assertEqual(dict.fromkeys(d, 0), dict(zip(range(6), [0]*6))) + class baddict3(dict): + def __new__(cls): + return d + d = {i : i for i in range(10)} + res = d.copy() + res.update(a=None, b=None, c=None) + self.assertEqual(baddict3.fromkeys({"a", "b", "c"}), res) + def test_copy(self): d = {1:1, 2:2, 3:3} self.assertEqual(d.copy(), {1:1, 2:2, 3:3}) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + recieved a nonempty dict from the constructor. + - Issue #16197: Update winreg docstrings and documentation to match code. Patch by Zachary Ware. diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1335,49 +1335,50 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - PyObject *oldvalue; - Py_ssize_t pos = 0; - PyObject *key; - Py_hash_t hash; + if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + PyObject *oldvalue; + Py_ssize_t pos = 0; + PyObject *key; + Py_hash_t hash; - if (dictresize(mp, Py_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { - Py_INCREF(key); - Py_INCREF(value); - if (insertdict(mp, key, hash, value)) { + if (dictresize(mp, Py_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { + Py_INCREF(key); + Py_INCREF(value); + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; - } + if (PyAnySet_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + Py_ssize_t pos = 0; + PyObject *key; + Py_hash_t hash; - if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - Py_ssize_t pos = 0; - PyObject *key; - Py_hash_t hash; - - if (dictresize(mp, PySet_GET_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PySet_NextEntry(seq, &pos, &key, &hash)) { - Py_INCREF(key); - Py_INCREF(value); - if (insertdict(mp, key, hash, value)) { + if (dictresize(mp, PySet_GET_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PySet_NextEntry(seq, &pos, &key, &hash)) { + Py_INCREF(key); + Py_INCREF(value); + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; } it = PyObject_GetIter(seq); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:14:21 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:14:21 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_merge_heads?= Message-ID: <3XsHkP66DxzPdK@mail.python.org> http://hg.python.org/cpython/rev/dc47b093d2a4 changeset: 80110:dc47b093d2a4 branch: 3.2 parent: 80109:a965eac352ec parent: 80101:e9ea7f6a7107 user: Benjamin Peterson date: Wed Oct 31 14:06:07 2012 -0400 summary: merge heads files: Doc/c-api/sys.rst | 6 ------ Doc/data/refcounts.dat | 4 ---- Doc/extending/embedding.rst | 21 +++++++++++++-------- Doc/library/ctypes.rst | 4 ++-- Misc/NEWS | 2 ++ Modules/_collectionsmodule.c | 2 +- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -61,12 +61,6 @@ Return the object *name* from the :mod:`sys` module or *NULL* if it does not exist, without setting an exception. -.. c:function:: FILE *PySys_GetFile(char *name, FILE *def) - - Return the :c:type:`FILE*` associated with the object *name* in the - :mod:`sys` module, or *def* if *name* is not in the module or is not associated - with a :c:type:`FILE*`. - .. c:function:: int PySys_SetObject(char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is *NULL*, in which diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -1310,10 +1310,6 @@ PySys_AddXOption:void::: PySys_AddXOption:const wchar_t*:s:: -PySys_GetFile:FILE*::: -PySys_GetFile:char*:name:: -PySys_GetFile:FILE*:def:: - PySys_GetObject:PyObject*::0: PySys_GetObject:char*:name:: diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); @@ -65,14 +66,18 @@ return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1155,8 +1155,8 @@ Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than -what actually happens. +There are some edges in :mod:`ctypes` where you might expect something other +than what actually happens. Consider the following example:: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -61,6 +61,8 @@ - Issue #15368: An issue that caused bytecode generation to be non-deterministic when using randomized hashing (-R) has been fixed. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1019,7 +1019,7 @@ }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:14:23 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:14:23 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_3=2E2_=28=2316345=29?= Message-ID: <3XsHkR2MG4zQxs@mail.python.org> http://hg.python.org/cpython/rev/b68da8f2ed95 changeset: 80111:b68da8f2ed95 branch: 3.3 parent: 80104:2e7da832219d parent: 80110:dc47b093d2a4 user: Benjamin Peterson date: Wed Oct 31 14:09:11 2012 -0400 summary: merge 3.2 (#16345) files: Lib/test/test_dict.py | 8 +++ Misc/NEWS | 3 + Objects/dictobject.c | 63 +++++++++++++++--------------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -256,6 +256,14 @@ d = dict(zip(range(6), range(6))) self.assertEqual(dict.fromkeys(d, 0), dict(zip(range(6), [0]*6))) + class baddict3(dict): + def __new__(cls): + return d + d = {i : i for i in range(10)} + res = d.copy() + res.update(a=None, b=None, c=None) + self.assertEqual(baddict3.fromkeys({"a", "b", "c"}), res) + def test_copy(self): d = {1:1, 2:2, 3:3} self.assertEqual(d.copy(), {1:1, 2:2, 3:3}) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,9 @@ - Fix segfaults on setting __qualname__ on builtin types and attempting to delete it on any type. +- Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + recieved a nonempty dict from the constructor. + - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a class's __dict__ and on type. diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1707,45 +1707,46 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - PyObject *oldvalue; - Py_ssize_t pos = 0; - PyObject *key; - Py_hash_t hash; - - if (dictresize(mp, Py_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { - if (insertdict(mp, key, hash, value)) { + if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + PyObject *oldvalue; + Py_ssize_t pos = 0; + PyObject *key; + Py_hash_t hash; + + if (dictresize(mp, Py_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; - } - - if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - Py_ssize_t pos = 0; - PyObject *key; - Py_hash_t hash; - - if (dictresize(mp, PySet_GET_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PySet_NextEntry(seq, &pos, &key, &hash)) { - if (insertdict(mp, key, hash, value)) { + if (PyAnySet_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + Py_ssize_t pos = 0; + PyObject *key; + Py_hash_t hash; + + if (dictresize(mp, PySet_GET_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PySet_NextEntry(seq, &pos, &key, &hash)) { + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; } it = PyObject_GetIter(seq); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:14:24 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:14:24 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4zICgjMTYzNDUp?= Message-ID: <3XsHkS66SPzPZv@mail.python.org> http://hg.python.org/cpython/rev/411d52192062 changeset: 80112:411d52192062 parent: 80108:7ada0faded9b parent: 80111:b68da8f2ed95 user: Benjamin Peterson date: Wed Oct 31 14:10:04 2012 -0400 summary: merge 3.3 (#16345) files: Lib/test/test_dict.py | 8 +++ Misc/NEWS | 3 + Objects/dictobject.c | 63 +++++++++++++++--------------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -256,6 +256,14 @@ d = dict(zip(range(6), range(6))) self.assertEqual(dict.fromkeys(d, 0), dict(zip(range(6), [0]*6))) + class baddict3(dict): + def __new__(cls): + return d + d = {i : i for i in range(10)} + res = d.copy() + res.update(a=None, b=None, c=None) + self.assertEqual(baddict3.fromkeys({"a", "b", "c"}), res) + def test_copy(self): d = {1:1, 2:2, 3:3} self.assertEqual(d.copy(), {1:1, 2:2, 3:3}) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -21,6 +21,9 @@ - Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch written by Serhiy Storchaka. +- Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + recieved a nonempty dict from the constructor. + - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a class's __dict__ and on type. diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1707,45 +1707,46 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - PyObject *oldvalue; - Py_ssize_t pos = 0; - PyObject *key; - Py_hash_t hash; - - if (dictresize(mp, Py_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { - if (insertdict(mp, key, hash, value)) { + if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + PyObject *oldvalue; + Py_ssize_t pos = 0; + PyObject *key; + Py_hash_t hash; + + if (dictresize(mp, Py_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; - } - - if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - Py_ssize_t pos = 0; - PyObject *key; - Py_hash_t hash; - - if (dictresize(mp, PySet_GET_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PySet_NextEntry(seq, &pos, &key, &hash)) { - if (insertdict(mp, key, hash, value)) { + if (PyAnySet_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + Py_ssize_t pos = 0; + PyObject *key; + Py_hash_t hash; + + if (dictresize(mp, PySet_GET_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PySet_NextEntry(seq, &pos, &key, &hash)) { + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; } it = PyObject_GetIter(seq); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:14:26 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:14:26 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_only_fast-path?= =?utf-8?q?_fromkeys=28=29_when_the_constructor_returns_a_empty_dict_=28cl?= =?utf-8?q?oses?= Message-ID: <3XsHkV2HpFzQxs@mail.python.org> http://hg.python.org/cpython/rev/6a582cdfee41 changeset: 80113:6a582cdfee41 branch: 2.7 parent: 80100:abe8a2908f08 user: Benjamin Peterson date: Wed Oct 31 14:05:55 2012 -0400 summary: only fast-path fromkeys() when the constructor returns a empty dict (closes #16345) files: Lib/test/test_dict.py | 8 +++ Misc/NEWS | 3 + Objects/dictobject.c | 71 +++++++++++++++--------------- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -254,6 +254,14 @@ d = dict(zip(range(6), range(6))) self.assertEqual(dict.fromkeys(d, 0), dict(zip(range(6), [0]*6))) + class baddict3(dict): + def __new__(cls): + return d + d = {i : i for i in range(10)} + res = d.copy() + res.update(a=None, b=None, c=None) + self.assertEqual(baddict3.fromkeys({"a", "b", "c"}), res) + def test_copy(self): d = {1:1, 2:2, 3:3} self.assertEqual(d.copy(), {1:1, 2:2, 3:3}) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ - Issue #14700: Fix buggy overflow checks for large width and precision in string formatting operations. +- Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + recieved a nonempty dict from the constructor. + - Issue #6074: Ensure cached bytecode files can always be updated by the user that created them, even when the source file is read-only. diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1353,49 +1353,50 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - PyObject *oldvalue; - Py_ssize_t pos = 0; - PyObject *key; - long hash; - - if (dictresize(mp, Py_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { - Py_INCREF(key); - Py_INCREF(value); - if (insertdict(mp, key, hash, value)) { + if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + PyObject *oldvalue; + Py_ssize_t pos = 0; + PyObject *key; + long hash; + + if (dictresize(mp, Py_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { + Py_INCREF(key); + Py_INCREF(value); + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; - } - - if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) { - PyDictObject *mp = (PyDictObject *)d; - Py_ssize_t pos = 0; - PyObject *key; - long hash; - - if (dictresize(mp, PySet_GET_SIZE(seq))) { - Py_DECREF(d); - return NULL; - } - - while (_PySet_NextEntry(seq, &pos, &key, &hash)) { - Py_INCREF(key); - Py_INCREF(value); - if (insertdict(mp, key, hash, value)) { + if (PyAnySet_CheckExact(seq)) { + PyDictObject *mp = (PyDictObject *)d; + Py_ssize_t pos = 0; + PyObject *key; + long hash; + + if (dictresize(mp, PySet_GET_SIZE(seq))) { Py_DECREF(d); return NULL; } + + while (_PySet_NextEntry(seq, &pos, &key, &hash)) { + Py_INCREF(key); + Py_INCREF(value); + if (insertdict(mp, key, hash, value)) { + Py_DECREF(d); + return NULL; + } + } + return d; } - return d; } it = PyObject_GetIter(seq); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:21 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:21 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_fix_spelling?= Message-ID: <3XsHxx0lzvzR79@mail.python.org> http://hg.python.org/cpython/rev/1f268d1b3a10 changeset: 80114:1f268d1b3a10 branch: 3.2 parent: 80110:dc47b093d2a4 user: Benjamin Peterson date: Wed Oct 31 14:16:09 2012 -0400 summary: fix spelling files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -11,7 +11,7 @@ ----------------- - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass - recieved a nonempty dict from the constructor. + received a nonempty dict from the constructor. - Issue #16197: Update winreg docstrings and documentation to match code. Patch by Zachary Ware. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:22 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:22 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_3=2E2?= Message-ID: <3XsHxy2x91zR5s@mail.python.org> http://hg.python.org/cpython/rev/28ce20fd9594 changeset: 80115:28ce20fd9594 branch: 3.3 parent: 80111:b68da8f2ed95 parent: 80114:1f268d1b3a10 user: Benjamin Peterson date: Wed Oct 31 14:16:17 2012 -0400 summary: merge 3.2 files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,7 +16,7 @@ delete it on any type. - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass - recieved a nonempty dict from the constructor. + received a nonempty dict from the constructor. - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a class's __dict__ and on type. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:23 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:23 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3XsHxz515HzM6v@mail.python.org> http://hg.python.org/cpython/rev/a647e498e73a changeset: 80116:a647e498e73a parent: 80112:411d52192062 parent: 80115:28ce20fd9594 user: Benjamin Peterson date: Wed Oct 31 14:16:22 2012 -0400 summary: merge 3.3 files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,7 +22,7 @@ written by Serhiy Storchaka. - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass - recieved a nonempty dict from the constructor. + received a nonempty dict from the constructor. - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a class's __dict__ and on type. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:25 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:25 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_fix_spelling?= Message-ID: <3XsHy10C0HzR7k@mail.python.org> http://hg.python.org/cpython/rev/eebb0072965f changeset: 80117:eebb0072965f branch: 2.7 parent: 80113:6a582cdfee41 user: Benjamin Peterson date: Wed Oct 31 14:16:09 2012 -0400 summary: fix spelling files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,7 +13,7 @@ in string formatting operations. - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass - recieved a nonempty dict from the constructor. + received a nonempty dict from the constructor. - Issue #6074: Ensure cached bytecode files can always be updated by the user that created them, even when the source file is read-only. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:26 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:26 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_avoid_a_functi?= =?utf-8?q?on_call_with_redundant_checks_for_dict_size?= Message-ID: <3XsHy22bNzzR5s@mail.python.org> http://hg.python.org/cpython/rev/9c388672279d changeset: 80118:9c388672279d branch: 2.7 user: Benjamin Peterson date: Wed Oct 31 14:22:12 2012 -0400 summary: avoid a function call with redundant checks for dict size files: Objects/dictobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1353,7 +1353,7 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(d) && ((PyDictObject *)d)->ma_used == 0) { if (PyDict_CheckExact(seq)) { PyDictObject *mp = (PyDictObject *)d; PyObject *oldvalue; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:27 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:27 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_avoid_a_functi?= =?utf-8?q?on_call_with_redundant_checks_for_dict_size?= Message-ID: <3XsHy34kG2zQtl@mail.python.org> http://hg.python.org/cpython/rev/e9da658cdddb changeset: 80119:e9da658cdddb branch: 3.2 parent: 80114:1f268d1b3a10 user: Benjamin Peterson date: Wed Oct 31 14:22:12 2012 -0400 summary: avoid a function call with redundant checks for dict size files: Objects/dictobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1335,7 +1335,7 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(d) && ((PyDictObject *)d)->ma_used == 0) { if (PyDict_CheckExact(seq)) { PyDictObject *mp = (PyDictObject *)d; PyObject *oldvalue; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:28 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:28 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_merge_3=2E2?= Message-ID: <3XsHy47281zR96@mail.python.org> http://hg.python.org/cpython/rev/4b842da2b0ac changeset: 80120:4b842da2b0ac branch: 3.3 parent: 80115:28ce20fd9594 parent: 80119:e9da658cdddb user: Benjamin Peterson date: Wed Oct 31 14:22:25 2012 -0400 summary: merge 3.2 files: Objects/dictobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1707,7 +1707,7 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(d) && ((PyDictObject *)d)->ma_used == 0) { if (PyDict_CheckExact(seq)) { PyDictObject *mp = (PyDictObject *)d; PyObject *oldvalue; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 19:24:30 2012 From: python-checkins at python.org (benjamin.peterson) Date: Wed, 31 Oct 2012 19:24:30 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?b?KTogbWVyZ2UgMy4z?= Message-ID: <3XsHy627QLzR96@mail.python.org> http://hg.python.org/cpython/rev/1698d1ab0b0a changeset: 80121:1698d1ab0b0a parent: 80116:a647e498e73a parent: 80120:4b842da2b0ac user: Benjamin Peterson date: Wed Oct 31 14:22:31 2012 -0400 summary: merge 3.3 files: Objects/dictobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1707,7 +1707,7 @@ if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(d) && ((PyDictObject *)d)->ma_used == 0) { if (PyDict_CheckExact(seq)) { PyDictObject *mp = (PyDictObject *)d; PyObject *oldvalue; -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 20:45:38 2012 From: python-checkins at python.org (mark.dickinson) Date: Wed, 31 Oct 2012 20:45:38 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MzQ4?= =?utf-8?q?=3A_Fix_incorrect_documentation_for_Decimal=2Eremainder=5Fnear?= =?utf-8?q?=2E?= Message-ID: <3XsKlk1wg3zMXH@mail.python.org> http://hg.python.org/cpython/rev/1122f5bfc957 changeset: 80122:1122f5bfc957 branch: 2.7 parent: 80118:9c388672279d user: Mark Dickinson date: Wed Oct 31 19:44:09 2012 +0000 summary: Issue #16348: Fix incorrect documentation for Decimal.remainder_near. files: Doc/library/decimal.rst | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -802,12 +802,21 @@ .. method:: remainder_near(other[, context]) - Compute the modulo as either a positive or negative value depending on - which is closest to zero. For instance, ``Decimal(10).remainder_near(6)`` - returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``. - - If both are equally close, the one chosen will have the same sign as - *self*. + Return the remainder from dividing *self* by *other*. This differs from + ``self % other`` in that the sign of the remainder is chosen so as to + minimize its absolute value. More precisely, the return value is + ``self - n * other`` where ``n`` is the integer nearest to the exact + value of ``self / other``, and if two integers are equally near then the + even one is chosen. + + If the result is zero then its sign will be the sign of *self*. + + >>> Decimal(18).remainder_near(Decimal(10)) + Decimal('-2') + >>> Decimal(25).remainder_near(Decimal(10)) + Decimal('5') + >>> Decimal(35).remainder_near(Decimal(10)) + Decimal('-5') .. method:: rotate(other[, context]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 20:45:39 2012 From: python-checkins at python.org (mark.dickinson) Date: Wed, 31 Oct 2012 20:45:39 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MzQ4?= =?utf-8?q?=3A_Fix_incorrect_documentation_for_Decimal=2Eremainder=5Fnear?= =?utf-8?q?=2E?= Message-ID: <3XsKll4L4yzPTs@mail.python.org> http://hg.python.org/cpython/rev/8570943ad5a2 changeset: 80123:8570943ad5a2 branch: 3.2 parent: 80119:e9da658cdddb user: Mark Dickinson date: Wed Oct 31 19:44:36 2012 +0000 summary: Issue #16348: Fix incorrect documentation for Decimal.remainder_near. files: Doc/library/decimal.rst | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -710,12 +710,21 @@ .. method:: remainder_near(other[, context]) - Compute the modulo as either a positive or negative value depending on - which is closest to zero. For instance, ``Decimal(10).remainder_near(6)`` - returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``. - - If both are equally close, the one chosen will have the same sign as - *self*. + Return the remainder from dividing *self* by *other*. This differs from + ``self % other`` in that the sign of the remainder is chosen so as to + minimize its absolute value. More precisely, the return value is + ``self - n * other`` where ``n`` is the integer nearest to the exact + value of ``self / other``, and if two integers are equally near then the + even one is chosen. + + If the result is zero then its sign will be the sign of *self*. + + >>> Decimal(18).remainder_near(Decimal(10)) + Decimal('-2') + >>> Decimal(25).remainder_near(Decimal(10)) + Decimal('5') + >>> Decimal(35).remainder_near(Decimal(10)) + Decimal('-5') .. method:: rotate(other[, context]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 20:45:40 2012 From: python-checkins at python.org (mark.dickinson) Date: Wed, 31 Oct 2012 20:45:40 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Issue_=2316348=3A_merge_fix_from_3=2E2=2E?= Message-ID: <3XsKlm6SGWzR7F@mail.python.org> http://hg.python.org/cpython/rev/9dc587378874 changeset: 80124:9dc587378874 branch: 3.3 parent: 80120:4b842da2b0ac parent: 80123:8570943ad5a2 user: Mark Dickinson date: Wed Oct 31 19:45:05 2012 +0000 summary: Issue #16348: merge fix from 3.2. files: Doc/library/decimal.rst | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -750,12 +750,21 @@ .. method:: remainder_near(other[, context]) - Compute the modulo as either a positive or negative value depending on - which is closest to zero. For instance, ``Decimal(10).remainder_near(6)`` - returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``. - - If both are equally close, the one chosen will have the same sign as - *self*. + Return the remainder from dividing *self* by *other*. This differs from + ``self % other`` in that the sign of the remainder is chosen so as to + minimize its absolute value. More precisely, the return value is + ``self - n * other`` where ``n`` is the integer nearest to the exact + value of ``self / other``, and if two integers are equally near then the + even one is chosen. + + If the result is zero then its sign will be the sign of *self*. + + >>> Decimal(18).remainder_near(Decimal(10)) + Decimal('-2') + >>> Decimal(25).remainder_near(Decimal(10)) + Decimal('5') + >>> Decimal(35).remainder_near(Decimal(10)) + Decimal('-5') .. method:: rotate(other[, context]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 20:45:42 2012 From: python-checkins at python.org (mark.dickinson) Date: Wed, 31 Oct 2012 20:45:42 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2316348=3A_merge_fix_from_3=2E3=2E?= Message-ID: <3XsKlp1Z9vzR5s@mail.python.org> http://hg.python.org/cpython/rev/7b36ed59738c changeset: 80125:7b36ed59738c parent: 80121:1698d1ab0b0a parent: 80124:9dc587378874 user: Mark Dickinson date: Wed Oct 31 19:45:21 2012 +0000 summary: Issue #16348: merge fix from 3.3. files: Doc/library/decimal.rst | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -750,12 +750,21 @@ .. method:: remainder_near(other[, context]) - Compute the modulo as either a positive or negative value depending on - which is closest to zero. For instance, ``Decimal(10).remainder_near(6)`` - returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``. - - If both are equally close, the one chosen will have the same sign as - *self*. + Return the remainder from dividing *self* by *other*. This differs from + ``self % other`` in that the sign of the remainder is chosen so as to + minimize its absolute value. More precisely, the return value is + ``self - n * other`` where ``n`` is the integer nearest to the exact + value of ``self / other``, and if two integers are equally near then the + even one is chosen. + + If the result is zero then its sign will be the sign of *self*. + + >>> Decimal(18).remainder_near(Decimal(10)) + Decimal('-2') + >>> Decimal(25).remainder_near(Decimal(10)) + Decimal('5') + >>> Decimal(35).remainder_near(Decimal(10)) + Decimal('-5') .. method:: rotate(other[, context]) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:06:55 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:06:55 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0OTAw?= =?utf-8?q?=3A_document_added_sort_keys_for_profile_stats=2E?= Message-ID: <3XsLDH3VwnzNgn@mail.python.org> http://hg.python.org/cpython/rev/f263a84871de changeset: 80126:f263a84871de branch: 2.7 parent: 80122:1122f5bfc957 user: Andrew Svetlov date: Wed Oct 31 21:54:45 2012 +0200 summary: Issue #14900: document added sort keys for profile stats. files: Doc/library/profile.rst | 250 +++++++++++++++------------ 1 files changed, 141 insertions(+), 109 deletions(-) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -46,7 +46,8 @@ the profiler in some way, the task might be easier with this module. .. versionchanged:: 2.4 - Now also reports the time spent in calls to built-in functions and methods. + Now also reports the time spent in calls to built-in functions + and methods. #. :mod:`hotshot` was an experimental C module that focused on minimizing the overhead of profiling, at the expense of longer data @@ -231,15 +232,16 @@ reading the source code for these modules. -.. function:: run(command[, filename]) +.. function:: run(command[, filename][, sort]) This function takes a single argument that can be passed to the - :keyword:`exec` statement, and an optional file name. In all cases this - routine attempts to :keyword:`exec` its first argument, and gather profiling - statistics from the execution. If no file name is present, then this function - automatically prints a simple profiling report, sorted by the standard name - string (file/line/function-name) that is presented in each line. The - following is a typical output from such a call:: + :keyword:`exec` statement, and optionally a file name and a sorting + directive. In all cases this routine attempts to :keyword:`exec` + its first argument, and gather profiling statistics from the + execution. If no file name is present, then this function + automatically prints a simple profiling report, sorted by the + standard name string (file/line/function-name) that is presented in + each line. The following is a typical output from such a call:: 2706 function calls (2004 primitive calls) in 4.504 CPU seconds @@ -250,18 +252,19 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, tottime - for the total time spent in the given function (and excluding time made in calls - to sub-functions), + for the total time spent in the given function (and + excluding time made in calls to sub-functions), percall is the quotient of ``tottime`` divided by ``ncalls`` @@ -276,10 +279,12 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. For information on the sort + argument, refer to :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals[, filename]) @@ -300,19 +305,22 @@ .. class:: Stats(filename, stream=sys.stdout[, ...]) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -330,15 +338,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(filename[, ...]) @@ -352,25 +362,27 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. versionadded:: 2.3 .. method:: Stats.sort_stats(key[, ...]) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -382,10 +394,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -398,51 +416,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats([restriction, ...]) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -469,17 +496,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees([restriction, ...]) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -580,32 +609,36 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns plain - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns plain integers, you can also invoke the class constructor + with a second argument specifying the real duration of one unit of + time. For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. .. rubric:: Footnotes @@ -613,4 +646,3 @@ .. [#] Prior to Python 2.2, it was necessary to edit the profiler source code to embed the bias as a literal number. You still can, but that method is no longer described, because no longer needed. - -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:06:57 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:06:57 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0OTAw?= =?utf-8?q?=3A_document_added_sort_keys_for_profile_stats=2E?= Message-ID: <3XsLDK1FNbzPgD@mail.python.org> http://hg.python.org/cpython/rev/52d6974fa05b changeset: 80127:52d6974fa05b branch: 3.2 parent: 80101:e9ea7f6a7107 user: Andrew Svetlov date: Wed Oct 31 22:03:28 2012 +0200 summary: Issue #14900: document added sort keys for profile stats. files: Doc/library/profile.rst | 231 +++++++++++++++------------ 1 files changed, 130 insertions(+), 101 deletions(-) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -240,11 +240,12 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, @@ -266,14 +267,14 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. - If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno), - ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or - ``'cumulative'`` (sort by cumulative time). The default is ``'stdname'``. + If *sort* is given, it can be one of values allowed for *key* + parameter from :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals, filename=None) @@ -291,19 +292,22 @@ .. class:: Stats(*filenames, stream=sys.stdout) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -318,15 +322,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(*filenames) @@ -340,23 +346,25 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. method:: Stats.sort_stats(*keys) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -368,10 +376,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -384,51 +398,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats(*restrictions) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -455,17 +478,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees(*restrictions) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -566,29 +591,33 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns integers, you can also invoke the class constructor with a + second argument specifying the real duration of one unit of time. + For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:06:58 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:06:58 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2314900=3A_document_added_sort_keys_for_profile_s?= =?utf-8?q?tats=2E?= Message-ID: <3XsLDL5yGmzPnV@mail.python.org> http://hg.python.org/cpython/rev/78963f00d4ad changeset: 80128:78963f00d4ad branch: 3.3 parent: 80124:9dc587378874 parent: 80127:52d6974fa05b user: Andrew Svetlov date: Wed Oct 31 22:04:06 2012 +0200 summary: Merge issue #14900: document added sort keys for profile stats. files: Doc/library/profile.rst | 231 +++++++++++++++------------ 1 files changed, 130 insertions(+), 101 deletions(-) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -240,11 +240,12 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, @@ -266,14 +267,14 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. - If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno), - ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or - ``'cumulative'`` (sort by cumulative time). The default is ``'stdname'``. + If *sort* is given, it can be one of values allowed for *key* + parameter from :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals, filename=None) @@ -291,19 +292,22 @@ .. class:: Stats(*filenames, stream=sys.stdout) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -318,15 +322,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(*filenames) @@ -340,23 +346,25 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. method:: Stats.sort_stats(*keys) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -368,10 +376,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -384,51 +398,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats(*restrictions) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -455,17 +478,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees(*restrictions) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -566,29 +591,33 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns integers, you can also invoke the class constructor with a + second argument specifying the real duration of one unit of time. + For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:07:00 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:07:00 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Issue_=2314900=3A_document_added_sort_keys_for_profile_s?= =?utf-8?q?tats=2E?= Message-ID: <3XsLDN3TT4zPhw@mail.python.org> http://hg.python.org/cpython/rev/dd4783955353 changeset: 80129:dd4783955353 parent: 80125:7b36ed59738c parent: 80128:78963f00d4ad user: Andrew Svetlov date: Wed Oct 31 22:04:20 2012 +0200 summary: Issue #14900: document added sort keys for profile stats. files: Doc/library/profile.rst | 231 +++++++++++++++------------ 1 files changed, 130 insertions(+), 101 deletions(-) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -240,11 +240,12 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, @@ -266,14 +267,14 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. - If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno), - ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or - ``'cumulative'`` (sort by cumulative time). The default is ``'stdname'``. + If *sort* is given, it can be one of values allowed for *key* + parameter from :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals, filename=None) @@ -291,19 +292,22 @@ .. class:: Stats(*filenames, stream=sys.stdout) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -318,15 +322,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(*filenames) @@ -340,23 +346,25 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. method:: Stats.sort_stats(*keys) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -368,10 +376,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -384,51 +398,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats(*restrictions) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -455,17 +478,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees(*restrictions) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -566,29 +591,33 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns integers, you can also invoke the class constructor with a + second argument specifying the real duration of one unit of time. + For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:07:02 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:07:02 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?= =?utf-8?q?_merge_heads?= Message-ID: <3XsLDQ0tLNzPmt@mail.python.org> http://hg.python.org/cpython/rev/f159ebbb223e changeset: 80130:f159ebbb223e branch: 3.2 parent: 80123:8570943ad5a2 parent: 80127:52d6974fa05b user: Andrew Svetlov date: Wed Oct 31 22:05:46 2012 +0200 summary: merge heads files: Doc/library/profile.rst | 231 +++++++++++++++------------ 1 files changed, 130 insertions(+), 101 deletions(-) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -240,11 +240,12 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, @@ -266,14 +267,14 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. - If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno), - ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or - ``'cumulative'`` (sort by cumulative time). The default is ``'stdname'``. + If *sort* is given, it can be one of values allowed for *key* + parameter from :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals, filename=None) @@ -291,19 +292,22 @@ .. class:: Stats(*filenames, stream=sys.stdout) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -318,15 +322,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(*filenames) @@ -340,23 +346,25 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. method:: Stats.sort_stats(*keys) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -368,10 +376,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -384,51 +398,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats(*restrictions) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -455,17 +478,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees(*restrictions) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -566,29 +591,33 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns integers, you can also invoke the class constructor with a + second argument specifying the real duration of one unit of time. + For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:07:03 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:07:03 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_null_merge?= Message-ID: <3XsLDR3c8NzPbJ@mail.python.org> http://hg.python.org/cpython/rev/f4b023d77db1 changeset: 80131:f4b023d77db1 branch: 3.3 parent: 80128:78963f00d4ad parent: 80130:f159ebbb223e user: Andrew Svetlov date: Wed Oct 31 22:06:27 2012 +0200 summary: null merge files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:07:04 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:07:04 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_null_merge?= Message-ID: <3XsLDS5VnkzPj3@mail.python.org> http://hg.python.org/cpython/rev/75db7cb578ad changeset: 80132:75db7cb578ad parent: 80129:dd4783955353 parent: 80131:f4b023d77db1 user: Andrew Svetlov date: Wed Oct 31 22:06:43 2012 +0200 summary: null merge files: -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:39:23 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:39:23 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2Mzc3?= =?utf-8?q?=3A_Fix_bisect_unittest=2E?= Message-ID: <3XsLxl0GRQzPNp@mail.python.org> http://hg.python.org/cpython/rev/838e2b19489e changeset: 80133:838e2b19489e branch: 3.2 parent: 80130:f159ebbb223e user: Andrew Svetlov date: Wed Oct 31 22:37:50 2012 +0200 summary: Issue #16377: Fix bisect unittest. Patch by Yury Selivanov. files: Lib/test/test_bisect.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py --- a/Lib/test/test_bisect.py +++ b/Lib/test/test_bisect.py @@ -239,7 +239,7 @@ else: f = self.module.insort_right f(insorted, digit) - self.assertEqual(sorted(insorted), insorted) + self.assertEqual(sorted(insorted), insorted) def test_backcompatibility(self): self.assertEqual(self.module.insort, self.module.insort_right) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:39:24 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:39:24 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?= =?utf-8?q?_Merge_issue_=2316377=3A_Fix_bisect_unittest=2E?= Message-ID: <3XsLxm2kpgzPdY@mail.python.org> http://hg.python.org/cpython/rev/f3dd84feeb58 changeset: 80134:f3dd84feeb58 branch: 3.3 parent: 80131:f4b023d77db1 parent: 80133:838e2b19489e user: Andrew Svetlov date: Wed Oct 31 22:38:20 2012 +0200 summary: Merge issue #16377: Fix bisect unittest. Patch by Yury Selivanov. files: Lib/test/test_bisect.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py --- a/Lib/test/test_bisect.py +++ b/Lib/test/test_bisect.py @@ -239,7 +239,7 @@ else: f = self.module.insort_right f(insorted, digit) - self.assertEqual(sorted(insorted), insorted) + self.assertEqual(sorted(insorted), insorted) def test_backcompatibility(self): self.assertEqual(self.module.insort, self.module.insort_right) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:39:25 2012 From: python-checkins at python.org (andrew.svetlov) Date: Wed, 31 Oct 2012 21:39:25 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?= =?utf-8?q?=29=3A_Merge_issue_=2316377=3A_Fix_bisect_unittest=2E?= Message-ID: <3XsLxn4rPVzPNp@mail.python.org> http://hg.python.org/cpython/rev/016d1a1fd601 changeset: 80135:016d1a1fd601 parent: 80132:75db7cb578ad parent: 80134:f3dd84feeb58 user: Andrew Svetlov date: Wed Oct 31 22:38:44 2012 +0200 summary: Merge issue #16377: Fix bisect unittest. Patch by Yury Selivanov. files: Lib/test/test_bisect.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py --- a/Lib/test/test_bisect.py +++ b/Lib/test/test_bisect.py @@ -239,7 +239,7 @@ else: f = self.module.insort_right f(insorted, digit) - self.assertEqual(sorted(insorted), insorted) + self.assertEqual(sorted(insorted), insorted) def test_backcompatibility(self): self.assertEqual(self.module.insort, self.module.insort_right) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 21:41:13 2012 From: python-checkins at python.org (mark.dickinson) Date: Wed, 31 Oct 2012 21:41:13 +0100 (CET) Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2Mzc3?= =?utf-8?q?=3A_fix_missed_test_due_to_incorrect_indentation_in_test=5Fbise?= =?utf-8?b?Y3Qu?= Message-ID: <3XsLzs40hgzPbC@mail.python.org> http://hg.python.org/cpython/rev/8296b686c6de changeset: 80136:8296b686c6de branch: 2.7 parent: 80126:f263a84871de user: Mark Dickinson date: Wed Oct 31 20:38:52 2012 +0000 summary: Issue #16377: fix missed test due to incorrect indentation in test_bisect. Thanks Yury Selivanov. files: Lib/test/test_bisect.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py --- a/Lib/test/test_bisect.py +++ b/Lib/test/test_bisect.py @@ -242,7 +242,7 @@ else: f = self.module.insort_right f(insorted, digit) - self.assertEqual(sorted(insorted), insorted) + self.assertEqual(sorted(insorted), insorted) def test_backcompatibility(self): self.assertEqual(self.module.insort, self.module.insort_right) -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 22:25:38 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 22:25:38 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Use_path?= =?utf-8?q?=5Ferror=28=29_in_more_posix_functions=2C_especially_in_Windows?= Message-ID: <3XsMz64CW3zPdY@mail.python.org> http://hg.python.org/cpython/rev/13ebaa36d87d changeset: 80137:13ebaa36d87d parent: 80135:016d1a1fd601 user: Victor Stinner date: Wed Oct 31 22:24:06 2012 +0100 summary: Issue #15478: Use path_error() in more posix functions, especially in Windows implementation files: Modules/posixmodule.c | 93 ++++++++----------------------- 1 files changed, 24 insertions(+), 69 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1035,17 +1035,6 @@ } static PyObject * -win32_error_unicode(char* function, wchar_t* filename) -{ - /* XXX - see win32_error for comments on 'function' */ - errno = GetLastError(); - if (filename) - return PyErr_SetFromWindowsErrWithUnicodeFilename(errno, filename); - else - return PyErr_SetFromWindowsErr(errno); -} - -static PyObject * win32_error_object(char* function, PyObject* filename) { /* XXX - see win32_error for comments on 'function' */ @@ -1119,44 +1108,6 @@ #ifdef MS_WINDOWS -static PyObject* -win32_1str(PyObject* args, char* func, - char* format, BOOL (__stdcall *funcA)(LPCSTR), - char* wformat, BOOL (__stdcall *funcW)(LPWSTR)) -{ - PyObject *uni; - const char *ansi; - BOOL result; - - if (PyArg_ParseTuple(args, wformat, &uni)) - { - wchar_t *wstr = PyUnicode_AsUnicode(uni); - if (wstr == NULL) - return NULL; - Py_BEGIN_ALLOW_THREADS - result = funcW(wstr); - Py_END_ALLOW_THREADS - if (!result) - return win32_error_object(func, uni); - Py_INCREF(Py_None); - return Py_None; - } - PyErr_Clear(); - - if (!PyArg_ParseTuple(args, format, &ansi)) - return NULL; - if (win32_warn_bytes_api()) - return NULL; - Py_BEGIN_ALLOW_THREADS - result = funcA(ansi); - Py_END_ALLOW_THREADS - if (!result) - return win32_error(func, ansi); - Py_INCREF(Py_None); - return Py_None; - -} - /* This is a reimplementation of the C library's chdir function, but one that produces Win32 errors instead of DOS error codes. chdir is essentially a wrapper around SetCurrentDirectory; however, @@ -2533,7 +2484,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("chmod", path.object); + return_value = path_error(&path); goto exit; } #else /* MS_WINDOWS */ @@ -2989,11 +2940,13 @@ return NULL; } if (!len) { - if (wbuf2 != wbuf) free(wbuf2); - return win32_error("getcwdu", NULL); + if (wbuf2 != wbuf) + free(wbuf2); + return PyErr_SetFromWindowsErr(0); } resobj = PyUnicode_FromWideChar(wbuf2, len); - if (wbuf2 != wbuf) free(wbuf2); + if (wbuf2 != wbuf) + free(wbuf2); return resobj; } @@ -3101,7 +3054,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("link", dst.object); + return_value = path_error(&dst); goto exit; } #else @@ -3225,8 +3178,7 @@ if (error == ERROR_FILE_NOT_FOUND) goto exit; Py_DECREF(list); - list = NULL; - win32_error_unicode("FindFirstFileW", wnamebuf); + list = path_error(&path); goto exit; } do { @@ -3255,7 +3207,7 @@ it got to the end of the directory. */ if (!result && GetLastError() != ERROR_NO_MORE_FILES) { Py_DECREF(list); - list = win32_error_unicode("FindNextFileW", wnamebuf); + list = path_error(&path); goto exit; } } while (result == TRUE); @@ -3282,7 +3234,8 @@ if (error == ERROR_FILE_NOT_FOUND) goto exit; Py_DECREF(list); - list = win32_error("FindFirstFile", namebuf); + path.func = "FindFirstFile"; + list = path_error(&path); goto exit; } do { @@ -3310,7 +3263,8 @@ it got to the end of the directory. */ if (!result && GetLastError() != ERROR_NO_MORE_FILES) { Py_DECREF(list); - list = win32_error("FindNextFile", namebuf); + path.func = "FindNextFile"; + list = path_error(&path); goto exit; } } while (result == TRUE); @@ -3320,7 +3274,7 @@ if (FindClose(hFindFile) == FALSE) { if (list != NULL) { Py_DECREF(list); - list = win32_error_object("FindClose", path.object); + list = path_error(&path); } } } @@ -3569,7 +3523,7 @@ return posix_error(); if (!GetFileInformationByHandle(hFile, &info)) - return win32_error("_getfileinformation", NULL); + return PyErr_SetFromWindowsErr(0); return Py_BuildValue("iii", info.dwVolumeSerialNumber, info.nFileIndexHigh, @@ -3658,7 +3612,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("mkdir", path.object); + return_value = path_error(&path); goto exit; } #else @@ -3828,7 +3782,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object(function_name, dst.object); + return_value = path_error(&dst); goto exit; } @@ -4396,6 +4350,7 @@ PyObject *return_value = NULL; memset(&path, 0, sizeof(path)); + path.function_name = "utime"; #if UTIME_HAVE_FD path.allow_fd = 1; #endif @@ -4484,7 +4439,7 @@ FILE_FLAG_BACKUP_SEMANTICS, NULL); Py_END_ALLOW_THREADS if (hFile == INVALID_HANDLE_VALUE) { - win32_error_object("utime", path.object); + path_error(&path); goto exit; } @@ -4493,7 +4448,7 @@ GetSystemTime(&now); if (!SystemTimeToFileTime(&now, &mtime) || !SystemTimeToFileTime(&now, &atime)) { - win32_error("utime", NULL); + PyErr_SetFromWindowsErr(0); goto exit; } } @@ -4506,7 +4461,7 @@ as that may confuse the user into believing that something is wrong with the file, when it also could be the time stamp that gives a problem. */ - win32_error("utime", NULL); + PyErr_SetFromWindowsErr(0); goto exit; } #else /* MS_WINDOWS */ @@ -6736,7 +6691,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("symlink", src.object); + return_value = path_error(&src); goto exit; } @@ -7648,7 +7603,7 @@ Py_END_ALLOW_THREADS if (res != 0) { #ifdef MS_WINDOWS - return win32_error("fstat", NULL); + return PyErr_SetFromWindowsErr(0); #else return posix_error(); #endif @@ -7694,7 +7649,7 @@ BOOL ok; ok = CreatePipe(&read, &write, NULL, 0); if (!ok) - return win32_error("CreatePipe", NULL); + return PyErr_SetFromWindowsErr(0); read_fd = _open_osfhandle((Py_intptr_t)read, 0); write_fd = _open_osfhandle((Py_intptr_t)write, 1); return Py_BuildValue("(ii)", read_fd, write_fd); -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 22:25:39 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 22:25:39 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Fix_agai?= =?utf-8?q?n_to_fix_test=5Fos_on_Windows?= Message-ID: <3XsMz76QPnzNbh@mail.python.org> http://hg.python.org/cpython/rev/9f696742dbda changeset: 80138:9f696742dbda user: Victor Stinner date: Wed Oct 31 22:16:38 2012 +0100 summary: Issue #15478: Fix again to fix test_os on Windows files: Lib/test/support.py | 2 +- Lib/test/test_os.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -654,7 +654,7 @@ for name in (b'abc\xff', b'\xe7w\xf0'): try: os.fsdecode(name) - except UnicodeDecodeErorr: + except UnicodeDecodeError: TESTFN_UNDECODABLE = name break diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2069,7 +2069,6 @@ funcs = [ (os.chdir,), (os.chmod, 0o777), - (os.lchown, 0, 0), (os.listdir,), (os.lstat,), (os.open, os.O_RDONLY), @@ -2077,15 +2076,19 @@ (os.replace, "dst"), (os.rmdir,), (os.stat,), - (os.truncate, 0), (os.unlink,), ] if hasattr(os, "chown"): funcs.append((os.chown, 0, 0)) + if hasattr(os, "lchown"): + funcs.append((os.lchown, 0, 0)) + if hasattr(os, "truncate"): + funcs.append((os.truncate, 0)) if sys.platform == "win32": + import nt funcs.extend(( - (os._getfullpathname,), - (os._isdir,), + (nt._getfullpathname,), + (nt._isdir,), )) if hasattr(os, "chflags"): funcs.extend(( -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 22:48:03 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 22:48:03 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Use_sour?= =?utf-8?q?ce_filename_in_OSError=2C_not_destination_filename?= Message-ID: <3XsNSz22zdzS7Q@mail.python.org> http://hg.python.org/cpython/rev/6903f5214e99 changeset: 80139:6903f5214e99 user: Victor Stinner date: Wed Oct 31 22:47:43 2012 +0100 summary: Issue #15478: Use source filename in OSError, not destination filename And other fixes for Windows: * rename, replace and link require arguments of the same type on Windows * readlink only supports unicode filenames on Windows * os.open() specifies the filename on OSError files: Lib/test/test_os.py | 86 ++++++++++++++++++------------ Modules/posixmodule.c | 14 +--- 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2051,68 +2051,82 @@ class Str(str): pass - self.filenames = [] + self.bytes_filenames = [] + self.unicode_filenames = [] if support.TESTFN_UNENCODABLE is not None: decoded = support.TESTFN_UNENCODABLE else: decoded = support.TESTFN - self.filenames.append(decoded) - self.filenames.append(Str(decoded)) + self.unicode_filenames.append(decoded) + self.unicode_filenames.append(Str(decoded)) if support.TESTFN_UNDECODABLE is not None: encoded = support.TESTFN_UNDECODABLE else: encoded = os.fsencode(support.TESTFN) - self.filenames.append(encoded) - self.filenames.append(memoryview(encoded)) + self.bytes_filenames.append(encoded) + self.bytes_filenames.append(memoryview(encoded)) + + self.filenames = self.bytes_filenames + self.unicode_filenames def test_oserror_filename(self): funcs = [ - (os.chdir,), - (os.chmod, 0o777), - (os.listdir,), - (os.lstat,), - (os.open, os.O_RDONLY), - (os.rename, "dst"), - (os.replace, "dst"), - (os.rmdir,), - (os.stat,), - (os.unlink,), + (self.filenames, os.chdir,), + (self.filenames, os.chmod, 0o777), + (self.filenames, os.listdir,), + (self.filenames, os.lstat,), + (self.filenames, os.open, os.O_RDONLY), + (self.filenames, os.rmdir,), + (self.filenames, os.stat,), + (self.filenames, os.unlink,), ] + if sys.platform == "win32": + funcs.extend(( + (self.bytes_filenames, os.rename, b"dst"), + (self.bytes_filenames, os.replace, b"dst"), + (self.unicode_filenames, os.rename, "dst"), + (self.unicode_filenames, os.replace, "dst"), + )) + else: + funcs.extend(( + (self.filenames, os.rename, "dst"), + (self.filenames, os.replace, "dst"), + )) if hasattr(os, "chown"): - funcs.append((os.chown, 0, 0)) + funcs.append((self.filenames, os.chown, 0, 0)) if hasattr(os, "lchown"): - funcs.append((os.lchown, 0, 0)) + funcs.append((self.filenames, os.lchown, 0, 0)) if hasattr(os, "truncate"): - funcs.append((os.truncate, 0)) - if sys.platform == "win32": - import nt - funcs.extend(( - (nt._getfullpathname,), - (nt._isdir,), - )) + funcs.append((self.filenames, os.truncate, 0)) if hasattr(os, "chflags"): funcs.extend(( - (os.chflags, 0), - (os.lchflags, 0), + (self.filenames, os.chflags, 0), + (self.filenames, os.lchflags, 0), )) if hasattr(os, "chroot"): - funcs.append((os.chroot,)) + funcs.append((self.filenames, os.chroot,)) if hasattr(os, "link"): - funcs.append((os.link, "dst")) + if sys.platform == "win32": + funcs.append((self.bytes_filenames, os.link, b"dst")) + funcs.append((self.unicode_filenames, os.link, "dst")) + else: + funcs.append((self.filenames, os.link, "dst")) if hasattr(os, "listxattr"): funcs.extend(( - (os.listxattr,), - (os.getxattr, "user.test"), - (os.setxattr, "user.test", b'user'), - (os.removexattr, "user.test"), + (self.filenames, os.listxattr,), + (self.filenames, os.getxattr, "user.test"), + (self.filenames, os.setxattr, "user.test", b'user'), + (self.filenames, os.removexattr, "user.test"), )) if hasattr(os, "lchmod"): - funcs.append((os.lchmod, 0o777)) + funcs.append((self.filenames, os.lchmod, 0o777)) if hasattr(os, "readlink"): - funcs.append((os.readlink,)) + if sys.platform == "win32": + funcs.append((self.unicode_filenames, os.readlink,)) + else: + funcs.append((self.filenames, os.readlink,)) - for func, *func_args in funcs: - for name in self.filenames: + for filenames, func, *func_args in funcs: + for name in filenames: try: func(name, *func_args) except OSError as err: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3054,7 +3054,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } #else @@ -3234,7 +3234,6 @@ if (error == ERROR_FILE_NOT_FOUND) goto exit; Py_DECREF(list); - path.func = "FindFirstFile"; list = path_error(&path); goto exit; } @@ -3263,7 +3262,6 @@ it got to the end of the directory. */ if (!result && GetLastError() != ERROR_NO_MORE_FILES) { Py_DECREF(list); - path.func = "FindNextFile"; list = path_error(&path); goto exit; } @@ -3782,7 +3780,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } @@ -6707,7 +6705,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } #endif @@ -7059,12 +7057,6 @@ Py_END_ALLOW_THREADS if (fd == -1) { -#ifdef MS_WINDOWS - /* force use of posix_error here for exact backwards compatibility */ - if (path.wide) - return_value = posix_error(); - else -#endif return_value = path_error(&path); goto exit; } -- Repository URL: http://hg.python.org/cpython From python-checkins at python.org Wed Oct 31 23:01:34 2012 From: python-checkins at python.org (victor.stinner) Date: Wed, 31 Oct 2012 23:01:34 +0100 (CET) Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315441=2C_=2315478?= =?utf-8?q?=3A_Reenable_test=5Fnonascii=5Fabspath=28=29_on_Windows?= Message-ID: <3XsNmZ6rYFzPZR@mail.python.org> http://hg.python.org/cpython/rev/b3434c1ae503 changeset: 80140:b3434c1ae503 user: Victor Stinner date: Wed Oct 31 23:01:30 2012 +0100 summary: Issue #15441, #15478: Reenable test_nonascii_abspath() on Windows The real bug (issue #15478) has been fixed correctly. files: Lib/test/test_genericpath.py | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py --- a/Lib/test/test_genericpath.py +++ b/Lib/test/test_genericpath.py @@ -311,14 +311,10 @@ @unittest.skipIf(sys.platform == 'darwin', "Mac OS X denies the creation of a directory with an invalid utf8 name") def test_nonascii_abspath(self): - name = b'\xe7w\xf0' - if sys.platform == 'win32': - try: - os.fsdecode(name) - except UnicodeDecodeError: - self.skipTest("the filename %a is not decodable " - "from the ANSI code page %s" - % (name, sys.getfilesystemencoding())) + if support.TESTFN_UNDECODABLE: + name = support.TESTFN_UNDECODABLE + else: + name = b'a\xffb\xe7w\xf0' # Test non-ASCII, non-UTF8 bytes in the path. with warnings.catch_warnings(): -- Repository URL: http://hg.python.org/cpython