Ronald Oussoren
3d3ffd8c44
Merged revisions 82150 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r82150 | ronald.oussoren | 2010-06-22 11:32:22 +0200 (Tue, 22 Jun 2010) | 12 lines
The code in _scproxy (a mac specific helper module to
detect proxy settings) had the wrong logic for detecting
if the checkbox 'Exclude simple hostnames' is checked. This
checkin fixes that.
As a result the test failure 'Issue8455' goes away on systems
where the checkbox is not checked.
I'm carefully avoiding saying that is fixes that issue,
test_urllib2_localnet assumes that system proxy settings are
empty (not just on OSX, see Issue8455 for details).
........
2010-06-27 12:49:49 +00:00
Antoine Pitrou
c7c96a90bc
Recorded merge of revisions 81029 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
2010-05-09 15:15:40 +00:00
Ronald Oussoren
012c44c28a
Merged revisions 80657 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80657 | ronald.oussoren | 2010-04-30 17:11:22 +0200 (Fri, 30 Apr 2010) | 3 lines
Add notes about uninstalling a framework install to
Mac/README. Fixes issue 7107.
........
2010-04-30 15:12:32 +00:00
Ronald Oussoren
309bf3beb3
Merged revisions 80653 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80653 | ronald.oussoren | 2010-04-30 16:58:39 +0200 (Fri, 30 Apr 2010) | 2 lines
Fix for issue 8476
........
2010-04-30 14:59:42 +00:00
Martin v. Löwis
78ca466f7f
Merged revisions 80355 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80355 | martin.v.loewis | 2010-04-22 13:34:36 +0200 (Do, 22 Apr 2010) | 3 lines
Issue #8475 : Pass absolute interpreter path to
"make html".
........
2010-04-22 13:15:47 +00:00
Ronald Oussoren
0d0832d03c
Ensure framework actually installs after earlier
...
changes to CFLAGS and BASECFLAGS handling
2010-04-20 15:34:43 +00:00
Ronald Oussoren
fd4ef551ea
Merged revisions 80243 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80243 | ronald.oussoren | 2010-04-20 10:54:48 +0200 (Tue, 20 Apr 2010) | 3 lines
This patch fixes the handling of a weak-linked
variable and should fix issue #8095 .
........
2010-04-20 09:57:18 +00:00
Ronald Oussoren
6f76187fb2
Merged revisions 80232 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80232 | ronald.oussoren | 2010-04-20 07:50:44 +0200 (Tue, 20 Apr 2010) | 3 lines
Explicitly set system default for $PATH to
ensure we have a clean build environment (OSX installer)
........
2010-04-20 06:37:38 +00:00
Ronald Oussoren
a23bccee07
Fix for issue #8175 : ensure that configure --with-universal-archs=all
...
works on osx 10.5
2010-04-18 19:14:06 +00:00
Ronald Oussoren
7fd72820bc
Merged revisions 80179 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80179 | ronald.oussoren | 2010-04-18 16:01:05 +0200 (Sun, 18 Apr 2010) | 5 lines
Add check to build-installer.py to ensure that
the right version of Tcl/Tk is available (on OSX)
Fixes issue #5651
........
2010-04-18 15:23:23 +00:00
Georg Brandl
b6453a902e
Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77120 | georg.brandl | 2009-12-29 22:09:17 +0100 (Di, 29 Dez 2009) | 1 line
#7595 : fix typo in argument default constant.
........
r77151 | georg.brandl | 2009-12-30 19:32:50 +0100 (Mi, 30 Dez 2009) | 1 line
#7487 : update Pygments version.
........
r77155 | georg.brandl | 2009-12-30 20:03:00 +0100 (Mi, 30 Dez 2009) | 1 line
We only support Windows NT derivatives now.
........
r77209 | georg.brandl | 2010-01-01 14:07:05 +0100 (Fr, 01 Jan 2010) | 1 line
More yearly updates.
........
r77229 | georg.brandl | 2010-01-02 13:35:01 +0100 (Sa, 02 Jan 2010) | 1 line
Fix casing.
........
r77256 | georg.brandl | 2010-01-02 23:55:55 +0100 (Sa, 02 Jan 2010) | 1 line
Fix typo.
........
r77317 | georg.brandl | 2010-01-05 19:14:52 +0100 (Di, 05 Jan 2010) | 1 line
Add Stefan.
........
r77331 | georg.brandl | 2010-01-06 18:43:06 +0100 (Mi, 06 Jan 2010) | 1 line
Small fixes to test_cmd: fix signature of do_shell, remove duplicate import, add option to run the custom Cmd class.
........
r77333 | georg.brandl | 2010-01-06 19:26:08 +0100 (Mi, 06 Jan 2010) | 1 line
#5950 : document that zip files with comments are unsupported in zipimport.
........
r77359 | georg.brandl | 2010-01-07 21:54:45 +0100 (Do, 07 Jan 2010) | 1 line
Fix description for Py_GetPath(); it sounded like it always returned sys.path.
........
r77360 | georg.brandl | 2010-01-07 22:48:47 +0100 (Do, 07 Jan 2010) | 1 line
#7653 : clarify how the PythonPath registry key should look like.
........
r77382 | georg.brandl | 2010-01-09 10:47:11 +0100 (Sa, 09 Jan 2010) | 1 line
#7422 : make it clear that getargspec() only works on Python functions.
........
r77561 | georg.brandl | 2010-01-17 09:42:30 +0100 (So, 17 Jan 2010) | 1 line
#7699 : improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such.
........
r77570 | georg.brandl | 2010-01-17 13:14:42 +0100 (So, 17 Jan 2010) | 1 line
Add note about usage of STRINGLIB_EMPTY.
........
2010-03-21 19:16:28 +00:00
Ronald Oussoren
ea580e176c
Fix for issue8089: a framework build with --with-universal-archs=3-way|intel had no way to select
...
a 32-bit executable (which is needed because not all (GUI) libraries are available in 64-bit mode)
Also fixes a typo in Mac/README
2010-03-09 10:36:28 +00:00
Ronald Oussoren
1dbfbab1d2
Remove documentation for the no longer existing 'Python IDE'
...
from the Python.app bundle on OSX.
This fixes Issue7437, the documentation contained filenames that
broke the installer on OSX 10.3.
2009-12-08 16:39:36 +00:00
Ronald Oussoren
7fb01eaff7
Merged revisions 76407 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76407 | ronald.oussoren | 2009-11-19 18:42:51 +0100 (Thu, 19 Nov 2009) | 4 lines
Don't use the '==' operator with test, that's an unportable bash-ism.
(Issue 7179)
........
2009-11-19 17:43:53 +00:00
Ronald Oussoren
c9d113bf61
Merged revisions 75147 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75147 | ronald.oussoren | 2009-09-29 21:34:13 +0200 (Tue, 29 Sep 2009) | 4 lines
Fix for issue6957: ensure that the OSX installer
installs a version of Python that can build
extensions on OSX 10.6.
........
2009-09-29 19:35:03 +00:00
Ronald Oussoren
d08417182f
Merged revisions 75131 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75131 | ronald.oussoren | 2009-09-29 15:00:44 +0200 (Tue, 29 Sep 2009) | 8 lines
* Update the Mac/README file. Add the list of OSX-specific configure options
to that README file with some explanation.
* Be more strict in the configure script: complain loudly when the user has
specified invalid combinations of OSX-specific configure arguments.
The error message refers to the Mac/README file for more information.
........
2009-09-29 13:01:59 +00:00
Ronald Oussoren
5270fce038
Merged revisions 75017 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75017 | ronald.oussoren | 2009-09-22 16:24:57 +0200 (Tue, 22 Sep 2009) | 4 lines
The 'Navigation Toolbox' is not available at all for 64-bit
code, make this explicit in the C code to avoid confusing
error messages during the build.
........
2009-09-22 14:26:55 +00:00
Ronald Oussoren
3aeda28b22
Merged revisions 74981 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74981 | ronald.oussoren | 2009-09-20 22:16:11 +0200 (Sun, 20 Sep 2009) | 3 lines
* Make it easier to build custom installers (such as a 3-way universal build)
* Upgrade bzip dependency to 1.0.5
........
2009-09-20 20:17:15 +00:00
Ronald Oussoren
02e2021714
r74963 didn't include the merger of _scproxy.c
2009-09-20 19:21:24 +00:00
Ronald Oussoren
2b88dd0817
Merged revisions 74966 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74966 | ronald.oussoren | 2009-09-20 13:19:00 +0200 (Sun, 20 Sep 2009) | 2 lines
For for issue 6934: failures in postflight script in OSX installer
........
2009-09-20 11:19:24 +00:00
Ronald Oussoren
461f2205cc
Merged revisions 74672 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74672 | ronald.oussoren | 2009-09-06 12:00:26 +0200 (Sun, 06 Sep 2009) | 1 line
Fix build issues on OSX 10.6 (issue 6802)
........
2009-09-06 10:54:28 +00:00
Ronald Oussoren
1b564a4639
Merge seticon.m file, for some reason 'svnmerge'
...
didn't actually add this file to the repository
(probably due me not being awake enough at the
time of the initial merge)
2009-04-01 13:46:47 +00:00
Ronald Oussoren
85da5e83de
Merged revisions 70802 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70802 | ronald.oussoren | 2009-03-31 08:20:45 -0500 (Tue, 31 Mar 2009) | 4 lines
Minor update to OSX build-installer script, needed
to ensure that the build will succeed in a clean
checkout and with a non-default deployment target.
........
2009-03-31 13:23:26 +00:00
Ronald Oussoren
524e36a5d0
Merged revisions 70746 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70746 | ronald.oussoren | 2009-03-30 15:02:08 -0500 (Mon, 30 Mar 2009) | 2 lines
Fix for issue 13095
........
2009-03-30 20:04:12 +00:00
Ronald Oussoren
ed96036049
Merged revisions 70741 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70741 | ronald.oussoren | 2009-03-30 14:56:25 -0500 (Mon, 30 Mar 2009) | 2 lines
Fixes issue 5270
........
2009-03-30 19:58:41 +00:00
Ronald Oussoren
7f2e6e6106
Merged revisions 70737 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70737 | ronald.oussoren | 2009-03-30 14:34:51 -0500 (Mon, 30 Mar 2009) | 6 lines
* Set a custom icon on the Python installer DMG
* Remove last traces of "MacPython"
* Add options to build different flavors of the installer
(still defaulting to a 2-way universal build that
runs on OSX 10.3)
........
2009-03-30 19:37:10 +00:00
Ronald Oussoren
d14b600523
Merged revisions 70727 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70727 | ronald.oussoren | 2009-03-30 12:15:29 -0500 (Mon, 30 Mar 2009) | 5 lines
* Updates installed dependencies to latest releaases (bzip, zlib, ...)
* Changes code for updating folder icons from Python code
that uses the deprecated Carbon module to a much simpler
Cocoa program in Objective-C
........
2009-03-30 17:17:52 +00:00
Ronald Oussoren
c17003a19a
Merged revisions 70713 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70713 | ronald.oussoren | 2009-03-30 10:20:46 -0500 (Mon, 30 Mar 2009) | 2 lines
This patch fixes issue 1254695 (wrong argument type conversion in Carbon.Qt)
........
2009-03-30 15:24:08 +00:00
Ronald Oussoren
de3dfc1635
Merged revisions 70176 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70176 | ronald.oussoren | 2009-03-04 22:35:05 +0100 (Wed, 04 Mar 2009) | 2 lines
Fixes issues 3883 and 5194
........
2009-03-04 21:35:38 +00:00
Ronald Oussoren
6f64894a92
Merged revisions 70169 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70169 | ronald.oussoren | 2009-03-04 22:12:17 +0100 (Wed, 04 Mar 2009) | 2 lines
Fix for issue 5226.
........
2009-03-04 21:13:03 +00:00
Ronald Oussoren
03674a3855
Merged revisions 70167 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70167 | ronald.oussoren | 2009-03-04 22:07:19 +0100 (Wed, 04 Mar 2009) | 2 lines
Fix issue 5224.
........
2009-03-04 21:10:17 +00:00
Ronald Oussoren
1414e17b39
Backport of r68150
2009-01-02 11:47:17 +00:00
Benjamin Peterson
be2c0a9fe3
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66766 | benjamin.peterson | 2008-10-03 06:52:06 -0500 (Fri, 03 Oct 2008) | 1 line
update the mac installer script
................
r66767 | andrew.kuchling | 2008-10-03 07:26:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring typo.
................
r66771 | hirokazu.yamamoto | 2008-10-03 11:18:42 -0500 (Fri, 03 Oct 2008) | 2 lines
Fixed following error when DocXMLRPCServer failed.
UnboundLocalError: local variable 'serv' referenced before assignment
................
r66772 | andrew.kuchling | 2008-10-03 11:29:19 -0500 (Fri, 03 Oct 2008) | 1 line
Mention exception in docstring
................
r66774 | andrew.kuchling | 2008-10-03 11:42:52 -0500 (Fri, 03 Oct 2008) | 1 line
Typo fix
................
r66776 | hirokazu.yamamoto | 2008-10-03 12:34:49 -0500 (Fri, 03 Oct 2008) | 2 lines
Issue #1706863 : Fixed "'NoneType' object has no attribute 'rfind'" error when sqlite libfile not found.
................
r66783 | andrew.kuchling | 2008-10-03 20:02:29 -0500 (Fri, 03 Oct 2008) | 1 line
Use correct capitalization of NaN
................
r66784 | andrew.kuchling | 2008-10-03 20:03:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring change: Specify exception raised
................
r66785 | andrew.kuchling | 2008-10-03 20:04:24 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring changes: Specify exceptions raised
................
r66786 | andrew.kuchling | 2008-10-03 20:05:56 -0500 (Fri, 03 Oct 2008) | 3 lines
Docstring change for *partition: use same tense as other docstrings.
Hyphenate left- and right-justified.
Fix 'registerd' typo
................
r66787 | andrew.kuchling | 2008-10-03 22:08:56 -0500 (Fri, 03 Oct 2008) | 1 line
two corrections
................
r66790 | andrew.kuchling | 2008-10-04 11:52:01 -0500 (Sat, 04 Oct 2008) | 1 line
Set svn:keywords
................
r66793 | georg.brandl | 2008-10-04 13:26:01 -0500 (Sat, 04 Oct 2008) | 2 lines
#4041 : don't refer to removed and outdated modules.
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
Merged revisions 66707,66775,66782 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line
fix #4001 : fix_imports didn't check for __init__.py before converting to relative imports
........
r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines
Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.
Fixes http://bugs.python.org/issue2532 . Thanks to Nick Edds.
........
r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line
add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
................
2008-10-04 21:33:08 +00:00
Benjamin Peterson
a9f397d6b5
change version to 2.6
2008-10-02 19:26:56 +00:00
Ronald Oussoren
aa8efbf084
Another fix for 4-way universal builds, use the right #ifndef guard
...
to detect the OSX 10.5 SDK.
2008-08-12 12:41:45 +00:00
Ronald Oussoren
5aa0b4d766
Fix build issue on OSX 10.4, somehow this wasn't committed before.
2008-07-22 07:06:33 +00:00
Ronald Oussoren
0bd10fd5cc
Last bit of a fix for issue3381 (addon for my patch in r65061)
2008-07-18 05:48:03 +00:00
Mark Dickinson
1b6c4c80a3
issue #3199 : Fix typo in Mac/Makefile.in
2008-06-25 15:29:32 +00:00
Gregory P. Smith
dd96db63f6
This reverts r63675 based on the discussion in this thread:
...
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
2008-06-09 04:58:54 +00:00
Ronald Oussoren
0d236eb05a
Fix build issue on OSX 10.4
2008-06-06 21:31:33 +00:00
Ronald Oussoren
5640ce2f1e
MacOS X: Enable 4-way universal builds
...
This patch adds a new configure argument on OSX:
--with-universal-archs=[32-bit|64-bit|all]
When used with the --enable-universalsdk option this controls which
CPU architectures are includes in the framework. The default is 32-bit,
meaning i386 and ppc. The most useful alternative is 'all', which includes
all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).
This includes limited support for the Carbon bindings in 64-bit mode as well,
limited because (a) I haven't done extensive testing and (b) a large portion
of the Carbon API's aren't available in 64-bit mode anyway.
I've also duplicated a feature of Apple's build of python: setting the
environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
extensions using distutils.
2008-06-05 12:58:24 +00:00
Christian Heimes
593daf545b
Renamed PyString to PyBytes
2008-05-26 12:51:38 +00:00
Ronald Oussoren
6cc9fd7bd5
Make gestaltmodule.c 64-bit safe.
2008-05-18 20:47:13 +00:00
Benjamin Peterson
236819310d
Add warnings to and deprecated all those Mac modules
2008-05-12 21:42:13 +00:00
Ronald Oussoren
f2ef92cee7
Fix for #1905 : PythonLauncher not working correctly on OSX 10.5/Leopard
...
This fixes both Python Launchar and the terminalcommand module.
2008-05-02 21:42:35 +00:00
Ronald Oussoren
85f19709f9
Finish fix for issue2573, previous patch was incomplete.
2008-05-02 19:58:56 +00:00
Ronald Oussoren
580c7fec67
Fix for issue #2573 : Can't change the framework name on OS X builds
...
This introduces a new configure option: --with-framework-name=NAME
(defaulting to 'Python'). This allows you to install several copies
of the Python framework with different names (such as a normal build
and a debug build).
2008-05-02 19:45:11 +00:00
Benjamin Peterson
5b63acd31e
#2503 make singletons compared with "is" not == or !=
...
Thanks to Wummel for the patch
2008-03-29 15:24:25 +00:00
Christian Heimes
c5f05e45cf
Patch #2167 from calvin: Remove unused imports
2008-02-23 17:40:11 +00:00
Christian Heimes
000a074c95
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
...
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
2008-01-03 22:16:32 +00:00