Commit Graph

67 Commits

Author SHA1 Message Date
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
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 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
Christian Heimes c5f05e45cf Patch #2167 from calvin: Remove unused imports 2008-02-23 17:40:11 +00:00
Jack Jansen 918a9e2f63 Updated (and regenerated) for name change in tp_init method arguments:
they are now _self, _args and _kwds.
2005-07-03 20:59:44 +00:00
Tim Peters 182b5aca27 Whitespace normalization, via reindent.py. 2004-07-18 06:16:08 +00:00
Jack Jansen 7107c1aff3 Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.
2003-11-20 13:31:00 +00:00
Jack Jansen a53f4eba19 Getting rid of code conditional on TARGET_API_MAC_*. 2003-11-19 16:34:04 +00:00
Jack Jansen 9588770e25 PyDoc_STR is always defined nowadays (and has been for quite some time:-) 2003-11-19 16:18:02 +00:00
Jack Jansen e48cef7aba Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.
2003-11-19 16:13:35 +00:00
Jack Jansen b734869f46 - Various tweaks to shut up compiler warnings.
- Regenerated with the correct calls to PyType_Ready and the correct
  deallocator calls.
2002-12-23 23:16:25 +00:00
Jack Jansen f955784f0c Regenerated with inheritance-aware xxxx_Check() macros. 2002-12-19 21:24:35 +00:00
Jack Jansen 6c7e326eaa Getting rid of pre-Carbon (MacOS8) support. All code depending on
TARGET_API_MAC_OS8 (or !TARGET_API_MAC_CARBON) is gone. Also some
TARGET_API_MAC_OSX conditional code is gone, because it is no longer
used on OSX-only Python (only in MacPython-OS9).
2002-12-12 10:31:54 +00:00
Jack Jansen 5f61a05d7f Fixed so the Res.Resource() accepts either another resource, a string
or no argument (giving an empty resource).
2002-12-05 23:26:38 +00:00
Jack Jansen dbd5701d73 Converted the Carbon modules to use PEP252-style objects, with
descriptors in stead of manual getattr hooks to get at attributes
of the objects.

For Qd I have in stead gotten rid of most of the attribute access
in favor of the carbon-style accessor methods (with the exception
of visRgn, to be done later), and of the Carbon.Qd.qd global object,
for which accessor functions are also available.

For List I have fixed the fact that various methods were incorrectly
generated as functions.

CF is untouched: PEP252 doesn't allow "poor-mans-inheritance" with
basechain, so it will have to wait for PEP253 support.
2002-11-29 23:40:48 +00:00
Jack Jansen 972573553e Define PyDoc_STR if it isn't defined. This makes these modules compile
for Python 2.2.
2002-11-18 15:26:43 +00:00
Jack Jansen 49931887d7 Regenerated with PyDoc_STR() around docstrings. 2002-08-16 09:09:31 +00:00
Jack Jansen 87eea88b5a After generating the Python file with definitions try to run it, so
we catch errors during the build process in stead of later during runtime.
2002-08-15 21:48:16 +00:00
Jack Jansen aaebdd6a02 Enable building of Carbon toolbox modules with unix-Python. 2002-08-05 15:39:30 +00:00
Jack Jansen 033b79c483 Regenerated. 2002-04-23 22:46:01 +00:00
Jack Jansen 150ed6113c Generate with weaklink stubs, so missing routines (on MacOS 8.6 and earlier)
don't cause import failure.

Fixes 531398, 2.2.1 candidate.
2002-03-22 14:16:39 +00:00
Jack Jansen cb6cf13261 Some of the newer routines return an OSErr, like most toolbox calls, in stead of depending on ResError(). Second half of fix for #531291.
2.2.1 candidate.
2002-03-18 15:31:08 +00:00
Jack Jansen 3bac5ca11a Some of the new routines are carbon-only. 2002-01-04 16:00:27 +00:00
Jack Jansen 69ac361cb5 Added some support for unicode arguments. 2002-01-01 22:43:13 +00:00
Jack Jansen 620a7667eb Updated to Universal Headers 3.4 2001-12-18 15:39:38 +00:00
Guido van Rossum 146483964e Patch supplied by Burton Radons for his own SF bug #487390: Modifying
type.__module__ behavior.

This adds the module name and a dot in front of the type name in every
type object initializer, except for built-in types (and those that
already had this).  Note that it touches lots of Mac modules -- I have
no way to test these but the changes look right.  Apologies if they're
not.  This also touches the weakref docs, which contains a sample type
object initializer.  It also touches the mmap test output, because the
mmap type's repr is included in that output.  It touches object.h to
put the correct description in a comment.
2001-12-08 18:02:58 +00:00
Jack Jansen b3be216b41 Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
2001-11-30 14:16:36 +00:00
Jack Jansen 044d95e9f7 A few more gcc warnings bite the dust. 2001-09-05 15:44:37 +00:00
Jack Jansen fd064863eb Shut up many more gcc warnings. 2001-09-05 10:31:52 +00:00
Jack Jansen 06d2e1af35 Regenerated without default int return types. 2001-09-04 22:19:18 +00:00
Jack Jansen 25a5bd7708 Renamed. 2001-08-23 14:11:10 +00:00
Jack Jansen 50ecb0ad83 Renamed the Mac toolbox modules to have an initial _ in their name. 2001-08-23 14:02:09 +00:00
Jack Jansen 77105a960b The MacOS toolbox modules have acquired an _ in front of their name. Normal usage is through a wrapper module (without underscore) which lives in the Carbon package. 2001-08-23 13:51:46 +00:00
Jack Jansen cbed91b4db Merging appropriate 2.1.1 fixes back into the main trunk. 2001-08-03 13:31:36 +00:00
Jack Jansen fa77e1a1b1 Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python. 2001-05-22 21:56:42 +00:00
Jack Jansen 0e04eecdbf First step in porting MacPython modules to OSX/unix: break all references between modules except for the obj_New() and obj_Convert() routines, the PyArg_Parse and Py_BuildValue helpers.
And these can now be vectored through glue routines (by defining USE_TOOLBOX_OBJECT_GLUE) which will do the necessary imports, whereupon the module's init routine will tell the glue routine about the real conversion routine address and everything is fine again.
2001-05-17 21:58:34 +00:00
Jack Jansen 043732e95d Enable FSpResourceFileAlreadyOpen only for Carbon. This is not strictly correct: OS9 InterfaceLib has it, but enabling it will make Python refuse to run on 8.6 and earlier. 2001-03-02 16:32:03 +00:00
Jack Jansen 7ee67a1224 Remove (unused) regex imports. 2001-01-02 22:02:45 +00:00
Jack Jansen 723ad8ae73 More toolbox modules adapted to Universal Headers 3.3.2. 2000-12-12 22:10:21 +00:00
Jack Jansen 74a1e63a89 Test for TARGET_API_MAC_CARBON with #if in stead of #ifdef. 2000-07-14 22:37:27 +00:00
Jack Jansen 9d8b96c850 pymactoolbox.h contains protoypes for all externally visible toolbox module
functions. Include it in stead of duplicating the declarations everywhere. Also
cleaned up toolbox module exports, and got rid of resNotFound error.
2000-07-14 22:16:45 +00:00
Jack Jansen e79dc76f53 Made the core toolbox modules carbon-compatible using the new greylist feature of bgen: non-carbon methods are still included in non-carbon MacPython. The issue of backward compatibility of Python code is still open.
Macmodule and macosmodule have also been carbonified. Some functionality is still missing there.
2000-06-02 21:35:07 +00:00
Jack Jansen add03b62fd Handles were never disposed. Added an AutoDispose(onoff) method to control this.
Also added a Handle() function which is like Resource() but has auto-dispose on by default.
2000-03-08 16:58:15 +00:00
Jack Jansen 2d76c25f59 In places where a ResObj is expected for PyArg_Parse and the object passed in isn't but it does have an as_Resource method use that. This makes life a lot easier
for appearance portability (and was needed anyway).
1999-12-12 22:57:29 +00:00
Jack Jansen a05ac607d7 Regenerated with CW Pro 5.2, which has MacOS 8.6 and Appearance 1.1 support. 1999-12-12 21:41:51 +00:00
Jack Jansen e180d99280 Grmpf, a lot more routines have gotten a "Mac" prefix for their
declaration, probably so the universal headers are useable on
windows/unix too. Have to think of a more definite workaround later,
for now we manually declare the old names in the *edit.py files.
1998-04-24 10:28:20 +00:00
Jack Jansen 1c4e614627 Re-generated from new (3.1) universal headers 1998-04-21 15:23:55 +00:00
Jack Jansen 0c4d947eac Replaced addpack by handcrafted code to find the bgen stuff. 1998-04-17 14:07:56 +00:00
Jack Jansen 21f96872f2 Regenerated from Universal Headers 3.0.1. Some new calls are
blacklisted, because they are not available in classic 68k programs,
and bgen doesn't have a way to put #ifdef/#endif in the generated
code. For now we only implement calls that work on all three models.
1998-02-20 16:02:09 +00:00