Mailman 3 February 2007 - Python-checkins

r53622 - sandbox/trunk/import_in_py/importlib.py sandbox/trunk/import_in_py/test_importlib.py
by brett.cannon Feb. 1, 2007

Feb. 1, 2007

Author: brett.cannon Date: Fri Feb 2 00:15:47 2007 New Revision: 53622 Modified: sandbox/trunk/import_in_py/importlib.py sandbox/trunk/import_in_py/test_importlib.py Log: Abstract out getting a module from the cache, sys.modules. Allows for more fine-grained control over whether the existence of a module in sys.modules should allow for it to be returned or should be blocked for security reasons. Modified: sandbox/trunk/import_in_py/importlib.py ============================================================================== --- sandbox/trunk/import_in_py/importlib.py (original) +++ sandbox/trunk/import_in_py/importlib.py Fri Feb 2 00:15:47 2007 @@ -692,6 +692,16 @@ return loader else: raise ImportError("No module found named %s" % name) + + def module_from_cache(self, name): + """Try to return the named module from sys.modules. + + Return False if the module is not in the cache. + """ + if name in sys.modules: + return sys.modules[name] + else: + return False def _import_module(self, name, path=None): """Import the specified module with no handling of parent modules. @@ -700,12 +710,12 @@ import was attempted and failed) then ImportError is raised. """ - if name in sys.modules: - value = sys.modules[name] - if value is None: + cached_module = self.module_from_cache(name) + if cached_module is not False: + if cached_module is None: raise ImportError("relative import redirect") else: - return value + return cached_module try: # Attempt to find a loader on sys.meta_path. loader = self._search_meta_path(name, path) Modified: sandbox/trunk/import_in_py/test_importlib.py ============================================================================== --- sandbox/trunk/import_in_py/test_importlib.py (original) +++ sandbox/trunk/import_in_py/test_importlib.py Fri Feb 2 00:15:47 2007 @@ -1141,6 +1141,17 @@ for level in (-1, 0): self.failUnlessRaises(ValueError, self.importer, '', {}, {}, level) + def test_module_from_cache(self): + # If a value is in sys.modules it should be returned (no matter the + # object type), else return False. + value = "a 'module'" + mod_name = "module name" + sys.modules[mod_name] = value + returned = self.importer.module_from_cache(mod_name) + self.failUnless(returned is value) + returned = self.importer.module_from_cache(mod_name + 'asdfeddf') + self.failUnless(returned is False) + class ImportMetaPathTests(ImportHelper):

1 0

buildbot warnings in x86 Ubuntu edgy (icc) 2.5
by buildbot＠python.org Feb. 1, 2007

Feb. 1, 2007

The Buildbot has detected a new failure of x86 Ubuntu edgy (icc) 2.5. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520Ubuntu%2520edgy%2520%2528icc… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release25-maint] HEAD Blamelist: raymond.hettinger Build had warnings: warnings test Excerpt from the test logfile: 1 test failed: test_timeout ====================================================================== FAIL: testConnectTimeout (test.test_timeout.TimeoutTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/buildbot/Buildbot/2.5.baxter-ubuntu/build/Lib/test/test_timeout.py", line 128, in testConnectTimeout %(_delta, self.fuzz, _timeout)) AssertionError: timeout (3.5154) is more than 2 seconds more than expected (0.001) sincerely, -The Buildbot

1 0

r53621 - peps/trunk/pep-0008.txt
by andrew.kuchling Feb. 1, 2007

Feb. 1, 2007

Author: andrew.kuchling Date: Thu Feb 1 22:09:28 2007 New Revision: 53621 Modified: peps/trunk/pep-0008.txt Log: Mention bare except: clauses in PEP 8; see the python-dev archive around Dec. 22 2007 for a short discussion Modified: peps/trunk/pep-0008.txt ============================================================================== --- peps/trunk/pep-0008.txt (original) +++ peps/trunk/pep-0008.txt Thu Feb 1 22:09:28 2007 @@ -663,6 +663,32 @@ continuation characters thanks to the containing parentheses. The older form will be removed in Python 3000. + - When catching exceptions, mention specific exceptions + whenever possible instead of using a bare 'except:' clause. + + For example, use: + + try: + import platform_specific_module + except ImportError: + platform_specific_module = None + + A bare 'except:' clause will catch SystemExit and KeyboardInterrupt + exceptions, making it harder to interrupt a program with Control-C, + and can disguise other problems. If you want to catch all + exceptions that signal program errors, use 'except StandardError:'. + + A good rule of thumb is to limit use of bare 'except' clauses to two + cases: + + 1) If the exception handler will be printing out or logging + the traceback; at least the user will be aware that an + error has occurred. + + 2) If the code needs to do some cleanup work, but then lets + the exception propagate upwards with 'raise'. + 'try...finally' is a better way to handle this case. + - Use string methods instead of the string module. String methods are always much faster and share the same API with

2 1

r53620 - peps/trunk/pep-0008.txt
by andrew.kuchling Feb. 1, 2007

Feb. 1, 2007

Author: andrew.kuchling Date: Thu Feb 1 22:04:19 2007 New Revision: 53620 Modified: peps/trunk/pep-0008.txt Log: Wording fix Modified: peps/trunk/pep-0008.txt ============================================================================== --- peps/trunk/pep-0008.txt (original) +++ peps/trunk/pep-0008.txt Thu Feb 1 22:04:19 2007 @@ -628,7 +628,7 @@ in-place string concatenation for statements in the form a+=b or a=a+b. Those statements run more slowly in Jython. In performance sensitive parts of the library, the ''.join() form should be used instead. This - will assure that concatenation occurs in linear time across various + will ensure that concatenation occurs in linear time across various implementations. - Comparisons to singletons like None should always be done with

1 0

r53619 - peps/trunk/pep-0008.txt
by andrew.kuchling Feb. 1, 2007

Feb. 1, 2007

Author: andrew.kuchling Date: Thu Feb 1 22:03:07 2007 New Revision: 53619 Modified: peps/trunk/pep-0008.txt Log: Be stricter about string exceptions Modified: peps/trunk/pep-0008.txt ============================================================================== --- peps/trunk/pep-0008.txt (original) +++ peps/trunk/pep-0008.txt Thu Feb 1 22:03:07 2007 @@ -641,9 +641,8 @@ - Use class-based exceptions. - String exceptions in new code are strongly discouraged, as they will - eventually (in Python 2.5) be deprecated and then (in Python 3000 or - perhaps sooner) removed. + String exceptions in new code are forbidden, because this language + feature is being removed in Python 2.6. Modules or packages should define their own domain-specific base exception class, which should be subclassed from the built-in Exception

1 0

r53618 - python/trunk/Objects/setobject.c
by raymond.hettinger Feb. 1, 2007

Feb. 1, 2007

Author: raymond.hettinger Date: Thu Feb 1 22:02:59 2007 New Revision: 53618 Modified: python/trunk/Objects/setobject.c Log: Bug #1648179: set.update() not recognizing __iter__ overrides in dict subclasses. Modified: python/trunk/Objects/setobject.c ============================================================================== --- python/trunk/Objects/setobject.c (original) +++ python/trunk/Objects/setobject.c Thu Feb 1 22:02:59 2007 @@ -915,7 +915,7 @@ if (PyAnySet_Check(other)) return set_merge(so, other); - if (PyDict_Check(other)) { + if (PyDict_CheckExact(other)) { PyObject *value; Py_ssize_t pos = 0; while (PyDict_Next(other, &pos, &key, &value)) { @@ -1363,7 +1363,7 @@ setentry *entry; Py_ssize_t pos = 0; - if (!PyAnySet_Check(other) && !PyDict_Check(other)) { + if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) { result = set_copy(so); if (result == NULL) return NULL; @@ -1377,7 +1377,7 @@ if (result == NULL) return NULL; - if (PyDict_Check(other)) { + if (PyDict_CheckExact(other)) { while (set_next(so, &pos, &entry)) { setentry entrycopy; entrycopy.hash = entry->hash; @@ -1450,7 +1450,7 @@ if ((PyObject *)so == other) return set_clear(so); - if (PyDict_Check(other)) { + if (PyDict_CheckExact(other)) { PyObject *value; int rv; while (PyDict_Next(other, &pos, &key, &value)) {

1 0

r53617 - in python/branches/release25-maint: Misc/NEWS Objects/setobject.c
by raymond.hettinger Feb. 1, 2007

Feb. 1, 2007

Author: raymond.hettinger Date: Thu Feb 1 22:01:21 2007 New Revision: 53617 Modified: python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Objects/setobject.c Log: Bug #1648179: set.update() not recognizing __iter__ overrides in dict subclasses. Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Thu Feb 1 22:01:21 2007 @@ -16,6 +16,9 @@ a weakref on itself during a __del__ call for new-style classes (classic classes still have the bug). +- Bug #1648179: set.update() did not recognize an overridden __iter__ + method in subclasses of dict. + - Bug #1579370: Make PyTraceBack_Here use the current thread, not the frame's thread state. Modified: python/branches/release25-maint/Objects/setobject.c ============================================================================== --- python/branches/release25-maint/Objects/setobject.c (original) +++ python/branches/release25-maint/Objects/setobject.c Thu Feb 1 22:01:21 2007 @@ -915,7 +915,7 @@ if (PyAnySet_Check(other)) return set_merge(so, other); - if (PyDict_Check(other)) { + if (PyDict_CheckExact(other)) { PyObject *value; Py_ssize_t pos = 0; while (PyDict_Next(other, &pos, &key, &value)) { @@ -1363,7 +1363,7 @@ setentry *entry; Py_ssize_t pos = 0; - if (!PyAnySet_Check(other) && !PyDict_Check(other)) { + if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) { result = set_copy(so); if (result == NULL) return NULL; @@ -1377,7 +1377,7 @@ if (result == NULL) return NULL; - if (PyDict_Check(other)) { + if (PyDict_CheckExact(other)) { while (set_next(so, &pos, &entry)) { setentry entrycopy; entrycopy.hash = entry->hash; @@ -1450,7 +1450,7 @@ if ((PyObject *)so == other) return set_clear(so); - if (PyDict_Check(other)) { + if (PyDict_CheckExact(other)) { PyObject *value; int rv; while (PyDict_Next(other, &pos, &key, &value)) {

1 0

r53616 - in python/branches/bcannon-objcap: BRANCHNEWS Python/pythonrun.c
by brett.cannon Feb. 1, 2007

Feb. 1, 2007

Author: brett.cannon Date: Thu Feb 1 21:53:44 2007 New Revision: 53616 Modified: python/branches/bcannon-objcap/BRANCHNEWS python/branches/bcannon-objcap/Python/pythonrun.c Log: Start using importlib for imports. Required moving other modules into .hidden for support reasons. Need to tweak importlib to block imports starting with '.'. Modified: python/branches/bcannon-objcap/BRANCHNEWS ============================================================================== --- python/branches/bcannon-objcap/BRANCHNEWS (original) +++ python/branches/bcannon-objcap/BRANCHNEWS Thu Feb 1 21:53:44 2007 @@ -8,6 +8,10 @@ Core and builtins ----------------- +* Use an instance of importlib.Import as what __import__ delegates to. This + necessitates storing a large chunk of modules into sys.modules['.hidden'] so + that importlib can keep working. + * Clear out sys.path_importer_cache. * Force 'warnings' to be cached by the C code. Modified: python/branches/bcannon-objcap/Python/pythonrun.c ============================================================================== --- python/branches/bcannon-objcap/Python/pythonrun.c (original) +++ python/branches/bcannon-objcap/Python/pythonrun.c Thu Feb 1 21:53:44 2007 @@ -333,24 +333,32 @@ { PyInterpreterState *interp; Py_ssize_t module_count, x; - PyObject* module_names_list; - PyObject* hidden_modules; + PyObject *module_names_list; + PyObject *hidden_modules; + PyObject *import_module; + PyObject *import_callable; Py_InitializeEx(1); interp = PyThreadState_GET()->interp; + import_module = PyImport_ImportModule("importlib"); + + import_callable = PyObject_CallMethod(import_module, "Import", ""); + /* Store import machinery somewhere so that a reference is held as needed. */ - PyDict_SetItemString(interp->sysdict, "import_", - PyDict_GetItemString(interp->builtins, "__import__")); + PyDict_SetItemString(interp->sysdict, "import_", import_callable); PyDict_SetItemString(interp->builtins, "__import__", PyDict_GetItemString(interp->sysdict, "import_delegate")); + Py_DECREF(import_module); + Py_DECREF(import_callable); + /* Clear out sys.modules. - Some modules must be kept around (at least for now; **XXX need to do - a security audit of each one!): + Some modules must be kept around in order for Python to function + properly. * __builtin__ Lose this and Python will not run. @@ -369,6 +377,9 @@ Exposed by codecs. * warnings (cache in C code) Warnings reset otherwise. Requires 'sys' module to work. + + All other modules are kept in the '.hidden' dict in sys.modules for + use by importlib. */ /* Get the 'warnings' module cached away at the C level. */ PyModule_GetWarningsModule(); @@ -388,21 +399,18 @@ (strcmp(module_name, "_codecs") == 0)) { continue; } - /* Modules that *must* stay but can be invisible. */ - /*else if ((strcmp(module_name, "warnings") == 0)) { + /* All other modules must be stored away for importlib. */ + else { PyObject *module = PyDict_GetItemString(interp->modules, module_name); PyDict_SetItemString(hidden_modules, module_name, module); PyDict_DelItemString(interp->modules, module_name); - }*/ - /* Everything else can go. */ - else { - PyDict_DelItemString(interp->modules, module_name); } } - /* Store away modules that must stick around but should not be exposed. + /* Store away modules that must stick around but should not be exposed; + this is done for importlib's benefit. */ PyDict_SetItemString(interp->modules, ".hidden", hidden_modules);

1 0

r53615 - sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
by phillip.eby Feb. 1, 2007

Feb. 1, 2007

Author: phillip.eby Date: Thu Feb 1 21:03:39 2007 New Revision: 53615 Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py Log: Fix script language detection problem (backport from trunk) Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py Thu Feb 1 21:03:39 2007 @@ -373,7 +373,7 @@ for script_name in dist.metadata_listdir('scripts'): self.install_script( dist, script_name, - '\n'.join(dist.get_metadata('scripts/'+script_name).splitlines()) + dist.get_metadata('scripts/'+script_name) ) self.install_wrapper_scripts(dist) @@ -593,7 +593,7 @@ "import pkg_resources\n" "pkg_resources.run_script(%(spec)r, %(script_name)r)\n" ) % locals() - self.write_script(script_name, script_text) + self.write_script(script_name, script_text, 'b') def write_script(self, script_name, contents, mode="t", blockers=()): """Write an executable file to the scripts directory""" @@ -1518,22 +1518,16 @@ def is_python_script(script_text, filename): """Is this text, as a whole, a Python script? (as opposed to shell/bat/etc. """ - if script_text.startswith('#!'): - # It begins with a '#!' line, so check if 'python' is in it somewhere - from distutils.command.build_scripts import first_line_re - lines = script_text.splitlines() - - if first_line_re.match(lines[0]): - return True # It's got a python "#!" line, consider it Python - else: - return False # It's some other scripting language - if filename.endswith('.py') or filename.endswith('.pyw'): return True # extension says it's Python if is_python(script_text, filename): return True # it's syntactically valid Python + if script_text.startswith('#!'): + # It begins with a '#!' line, so check if 'python' is in it somewhere + return 'python' in script_text.splitlines()[0].lower() + return False # Not any Python I can recognize @@ -1556,6 +1550,12 @@ + + + + + + def get_script_args(dist, executable=sys_executable, wininst=False): """Yield write_script() argument tuples for a distribution's entrypoints""" spec = str(dist.as_requirement())

1 0

r53614 - sandbox/trunk/setuptools/setuptools/command/easy_install.py
by phillip.eby Feb. 1, 2007

Feb. 1, 2007

Author: phillip.eby Date: Thu Feb 1 20:59:49 2007 New Revision: 53614 Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py Log: Fix script language detection so that scripts built on Windows are correctly identified as still being Python code! Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/command/easy_install.py (original) +++ sandbox/trunk/setuptools/setuptools/command/easy_install.py Thu Feb 1 20:59:49 2007 @@ -373,7 +373,7 @@ for script_name in dist.metadata_listdir('scripts'): self.install_script( dist, script_name, - '\n'.join(dist.get_metadata('scripts/'+script_name).splitlines()) + dist.get_metadata('scripts/'+script_name) ) self.install_wrapper_scripts(dist) @@ -593,7 +593,7 @@ "import pkg_resources\n" "pkg_resources.run_script(%(spec)r, %(script_name)r)\n" ) % locals() - self.write_script(script_name, script_text) + self.write_script(script_name, script_text, 'b') def write_script(self, script_name, contents, mode="t", blockers=()): """Write an executable file to the scripts directory""" @@ -1518,22 +1518,16 @@ def is_python_script(script_text, filename): """Is this text, as a whole, a Python script? (as opposed to shell/bat/etc. """ - if script_text.startswith('#!'): - # It begins with a '#!' line, so check if 'python' is in it somewhere - from distutils.command.build_scripts import first_line_re - lines = script_text.splitlines() - - if first_line_re.match(lines[0]): - return True # It's got a python "#!" line, consider it Python - else: - return False # It's some other scripting language - if filename.endswith('.py') or filename.endswith('.pyw'): return True # extension says it's Python if is_python(script_text, filename): return True # it's syntactically valid Python + if script_text.startswith('#!'): + # It begins with a '#!' line, so check if 'python' is in it somewhere + return 'python' in script_text.splitlines()[0].lower() + return False # Not any Python I can recognize @@ -1556,6 +1550,12 @@ + + + + + + def get_script_args(dist, executable=sys_executable, wininst=False): """Yield write_script() argument tuples for a distribution's entrypoints""" spec = str(dist.as_requirement())

1 0