Commit Graph

2171 Commits

Author SHA1 Message Date
Jack Jansen 0e53685d10 This file has been dead for aeons. I have no idea how it suddenly
surfaced again.
2001-08-21 10:49:11 +00:00
Jack Jansen a0f4369f5a Oops, these compatibility modules were missing. Which went unnoticed because their companions had been put in the wrong place. 2001-08-20 15:35:57 +00:00
Jack Jansen 7586b049ba Various toolbox modules were generated in lib-dynload accidentally
in stead of in Carbon. Fixed.
2001-08-20 15:31:56 +00:00
Jack Jansen d0688ebc10 Oops, this file shouldn't have been removed. 2001-08-20 10:20:27 +00:00
Jack Jansen 914f9e926d The destination folder is now :Lib:lib-dynload 2001-08-19 22:32:57 +00:00
Jack Jansen f60edf861c PATCHLEVEL is outdated, use PY_VERSION. 2001-08-19 22:32:27 +00:00
Jack Jansen ad251c7516 Step 1 in packaging the toolbox modules and making MacPython more
like normal Python. toolbox modules are now in the Carbon package
in :Mac:Lib, with a workaround flat namespace in :Mac:Lib:lib-compat.
Other dynamic modules are in :Lib:lib-dynload. :Mac:Lib:lib-toolbox and
:Mac:Plugins are gone.
2001-08-19 22:30:31 +00:00
Jack Jansen d39c246a4c Dynamic modules are now put in :Lib:lib-dynload by default. For the toolbox modules this is overridden to put them in :Mac:Lib:Carbon. 2001-08-19 22:29:57 +00:00
Jack Jansen edb17c971f Compatibility modules. lib-compat is on the default sys.path for MacPython 2.2, and each of these modules imports * from its namesake in the Carbon package. 2001-08-19 22:28:32 +00:00
Jack Jansen 63f6b4984b Moved to either :Mac:Lib (WASTEconst and files that weren't generated) or to the Carbon package. 2001-08-19 22:20:55 +00:00
Jack Jansen ab98ae9b4e The modules with toolbox constants. 2001-08-19 22:13:00 +00:00
Jack Jansen 06eb422a37 Carbon is now a package encapsulating all the toolbox modules. Carbon is not
the best of names right now (because QuickTime, for instance, is part of
its own framekwork in OSX terminology, and because all these modules also
work on pre-Carbon MacOS) but in a year or so it will be:-).
2001-08-19 22:07:59 +00:00
Jack Jansen 52caac1c55 Moved here form lib-toolbox, for lack of a better place to go. 2001-08-19 22:05:33 +00:00
Jack Jansen d0fc42f439 Moved here from lib-toolbox, where they should never have been in the first place (all the other stuff there wa generated with bgen). 2001-08-19 22:05:06 +00:00
Jack Jansen 42b1539e98 Step 1 in packaging the toolbox modules and making MacPython more
like normal Python. toolbox modules are now in the Carbon package
in :Mac:Lib, with a workaround flat namespace in :Mac:Lib:lib-compat.
Other dynamic modules are in :Lib:lib-dynload. :Mac:Lib:lib-toolbox and
:Mac:Plugins are gone.
2001-08-19 22:02:56 +00:00
Jack Jansen 106fceacb2 Temporarily disabled the import hook. It breaks with the package-based
Carbon and its workaround.
2001-08-19 22:00:20 +00:00
Jack Jansen 13dca1d50f Got rid of all the plugin xml files: they are generated, and
they were only in the repository for people building MacPython from
CVS (the .cmp project files are in a MacPython source
distribution). The process to regenerate them is now easier (and
documented!) so these shouldn't be needed anymore.

And eventually they should all be built by setup.py anyway.
2001-08-19 20:28:39 +00:00
Jack Jansen e791a6421f If genpluginprojects is called from fullbuild we set the Python source directory to be the same as fullbuild uses (in stead of using the default sys.prefix). This fixes an issue Mark Day raised that you can't use fullbuild with one Python installation to build another one. 2001-08-16 20:39:17 +00:00
Just van Rossum 7a401795db Long time overdue: change sys.path defaults so that people will
have to do "from PIL import Image" instead of "import Image".
2001-08-16 15:16:19 +00:00
Jack Jansen 1690409243 Updated to the current state of things (long overdue). 2001-08-16 14:10:56 +00:00
Jack Jansen 686a4a6d0f Removed expat from the access paths, it isn't needed. 2001-08-16 14:10:08 +00:00
Jack Jansen ce3016a142 Merged release21-maint changes. 2001-08-12 00:11:15 +00:00
Jack Jansen d7b568ac4d test_glob found a nasty bug in GUSI opendir(): it will not fail when called on files, but in stead open the parent directory! We now explicitly test for the argument being a directory and simulate ENOTDIR otherwise. 2001-08-11 23:18:55 +00:00
Jack Jansen b5982221bb Before asking the finder to start the application (if start=1 is specified), check that it isn't incidentally running already. 2001-08-11 22:29:18 +00:00
Jack Jansen fb513a20b5 Got rid of the activate() so codewarrior doesn't come to front. It isn't needed, and without it you can get work done while building the projects:-) 2001-08-11 22:28:11 +00:00
Jack Jansen af86470e85 Added a note about the various tests here. 2001-08-11 21:13:19 +00:00
Just van Rossum f3456912e4 use the proper prefix file under Carbon 2001-08-11 10:07:23 +00:00
Jack Jansen 09379da7de Regenerated. 2001-08-10 12:17:04 +00:00
Jack Jansen 0cdba05815 Changed reference to config.h to pyconfig.h. 2001-08-10 10:01:05 +00:00
Jack Jansen ab04653715 Resource files for OSX Python.framework. Incomplete, and they should probably
eventually be generated so version numbers and such are automatically
correct, but they do the job for now.
2001-08-08 22:00:26 +00:00
Jack Jansen 4795fccd66 Adapted for pymactoolbox.c and changed externals elsewhere. 2001-08-08 15:29:22 +00:00
Jack Jansen deefbe5666 - Don't return mac-style pathnames in unix-Python.
- Fixed up a lot more prototypes (gcc also wants them on static routines)
- Fixed various other gcc warnings.
2001-08-08 13:46:49 +00:00
Jack Jansen 94bebc0381 Split macglue.c into two: a new mactoolboxglue.c (in ./Python)
with functionality needed for both unix-Python and MacPython and a
new smaller ./Mac/Python/macglue.c which contains MacPython stuff only.

pymactoolbox.h has moved to ./Include from ./Mac/Include and now also
contains the relevant stuff from macglue.h.

The net effect of this is that the ./Mac subdirectory is not needed
anymore for building the unix-Python core on MacOSX (it is needed
for building the extension modules).
2001-08-08 13:17:31 +00:00
Jack Jansen c4dcb63019 Brought up-to-date. 2001-08-07 15:34:47 +00:00
Jack Jansen b760923b20 Got rid of 68k-Mac and other outdated ifdefs. 2001-08-07 15:30:23 +00:00
Jack Jansen 71c5b02859 Got rid of mactcp cruft, added Mlte and CF modules. 2001-08-07 15:29:17 +00:00
Jack Jansen b927285c03 Removed unused variable. 2001-08-07 15:28:52 +00:00
Jack Jansen cf68425b12 Yet another project. 2001-08-07 15:26:26 +00:00
Jack Jansen 596e18a666 Got rid of (hopefully) the last 68k Mac-related ifdefs and various other cruft. 2001-08-07 15:14:53 +00:00
Jack Jansen 8d319d4f8f Removed outdated stuff. 2001-08-07 15:12:04 +00:00
Jack Jansen 179e085113 Project files for the new plugin modules, plus a few that hadn't been added yet but should have been. 2001-08-07 14:21:56 +00:00
Jack Jansen 67992b7732 Bit another bullet: all toolbox modules are now in dynamically loaded modules. Everything still seems to work, but the ConfigurePythonXXX on initial install may still need work. 2001-08-07 13:53:25 +00:00
Jack Jansen 59c14e2254 Bit the bullet and enabled garbage collection (finally).
Also updated pyconfig.h to the current state of pyconfig.h.in.
2001-08-07 12:33:32 +00:00
Jack Jansen 4590049228 Oops, arg type for the glue routine was wrong. 2001-08-06 15:32:30 +00:00
Just van Rossum e6e745fc49 Show the MacPython IDE version in the interactive banner. 2001-08-06 11:12:18 +00:00
Jack Jansen a5bca579fd PyMac_GetFSSpec must be called via the dylib glue code on OSX. 2001-08-03 15:39:27 +00:00
Jack Jansen 3988358b4d If we use frameworks we should include CoreServices/CoreServices.h, not the
old-style CoreFoundation.h.
2001-08-03 15:36:23 +00:00
Jack Jansen 03b33effc7 TXNTSMCheck isn't available under Mach-O Carbon. 2001-08-03 15:34:29 +00:00
Jack Jansen 446b3b2d58 ICFindConfigFile isn't needed, and it's gone under carbon. 2001-08-03 14:12:36 +00:00
Jack Jansen 83e6ae9b12 EasyDialogs has a working version of this. 2001-08-03 14:10:54 +00:00
Jack Jansen 7f9a63ca4c These stopped working a long time ago, and they're not worth fixing. 2001-08-03 14:10:27 +00:00
Jack Jansen 5150edd979 Obsolete, EasyDialogs has the same code (but working:-). 2001-08-03 14:09:33 +00:00
Jack Jansen dffae32172 Obsolete: uses old applescript support. 2001-08-03 14:07:52 +00:00
Jack Jansen b4c975a367 Obsolete, uses the old non-package-based applescript suite support. 2001-08-03 14:06:17 +00:00
Jack Jansen 7a9f9557db This "test" showed an obsolete way to get scrolled lists in dialogs. Removed. 2001-08-03 14:05:29 +00:00
Jack Jansen 4369b00c71 This "test" showed an obsolete way to get scrolled lists in dialogs. Removed. 2001-08-03 14:02:07 +00:00
Jack Jansen 54ad7f56a2 Removed: it doesn't work anymore, and it wasn't all that useful anyway. The FrameWork testcode shows similar functionality. 2001-08-03 13:58:16 +00:00
Jack Jansen 3a22c8657c Obsolete, superseded by :Mac:Demo:imgbrowse and friends. 2001-08-03 13:56:12 +00:00
Jack Jansen ba24ace0fb Obsolete, superseded by :Mac:Demo:TE 2001-08-03 13:53:50 +00:00
Jack Jansen 5291fb1e09 Obsolete, superseded by :Mac:Demo:waste 2001-08-03 13:53:17 +00:00
Jack Jansen 1cd95229a2 Obsolete, removed. 2001-08-03 13:49:52 +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 ddafd2b0c7 (Finally) converted to new-style args.
Added an optional (and ignored) 3d parameter to open() to make the signature compatible with posixmodule.
Added the various O_ constants (by stealing the code from posixmodule).

test_fileinput now passes.
2001-08-03 13:07:19 +00:00
Jack Jansen 2d713d1006 Added descrobject.c and mysnprintf.c 2001-08-03 13:05:57 +00:00
Jack Jansen 66298f10df Regenerated for new description stuff. 2001-08-03 13:05:18 +00:00
Jack Jansen b4a7db7736 config.h renamed to pyconfig.h 2001-07-27 09:22:03 +00:00
Jack Jansen 8d2f3d66ee ProgressBar crashed when you tried to drag it. Fixed. Thanks go to Alfonso Baciero. 2001-07-27 09:21:28 +00:00
Jack Jansen 5bb6ff926b Changed findertools.move() to move() in movetotrash. 2001-07-24 11:37:23 +00:00
Fred Drake 79e75e1916 Use string.ascii_letters instead of string.letters (SF bug #226706). 2001-07-20 19:05:50 +00:00
Jack Jansen 6f70d62855 Used an adapted MethodGenerator to generate methods too for functions that have the object as the second arg after a first CFAllocatorRef arg (which we pass as NULL always anyway). 2001-07-17 20:47:13 +00:00
Jack Jansen 654c8db9a0 Typo in the classic mlte build line. 2001-07-16 22:04:08 +00:00
Jack Jansen e85e4e43bd The TNXDraw gworld argument is optional. 2001-07-16 21:58:44 +00:00
Jack Jansen e160fe13da It now works under Carbon. Under Classic the scrollbars don't show
up, for reasons unknown.
2001-07-16 21:57:50 +00:00
Jack Jansen 177200959b Minimal text editor using MLTE (code based on wed.py, the waste demo).
It's sort-of starting to work, but there's still problems with redraws and
with resizing the window.
2001-07-14 14:02:21 +00:00
Jack Jansen f0ded2f0bc Various small fixes. The demo now starts to limp along. 2001-07-14 14:00:50 +00:00
Jack Jansen e1608529d1 The constants for MLTE. 2001-07-14 13:59:47 +00:00
Jack Jansen d4b8361910 Fixed the mis-guessed parameters and added support for a few optional parameter types. There's a good chance that this is usable now (but there's no test code yet). 2001-07-13 22:27:20 +00:00
Jack Jansen 198641247b Added Mlte module (which, to my surprise, is available for classic ppc as well). 2001-07-13 20:57:47 +00:00
Jack Jansen 2aadb891e7 First stab at an interface to the Multi Language Text Editor. It compiles and imports, but that's about all. Apple didn't put const in front of their input-only by-reference args, so that needs fixing first. 2001-07-13 20:56:52 +00:00
Jack Jansen 2c278ed4a5 Fixed another case of the PyArg_Parse 'h' semantic change problem, sigh... 2001-07-12 21:48:10 +00:00
Just van Rossum 3eec7620be - fixed some re usage, partly so it'll still work when re uses pre instead
of sre, and partly fixing re -> regex porting oversights
- fixed PyFontify.py so it actually *works* again..
2001-07-10 19:25:40 +00:00
Jack Jansen 4e566ab904 Implemented minimal FSRef support, plus conversion between FSRefs, FSSpecs and pathnames where applicable.
PyMac_GetFSSpec and PyMac_BuildFSSpec have moved to macfsmodule from macglue.

These mods are untested on OSX.
2001-07-08 22:07:23 +00:00
Just van Rossum 25ddc6330f - minor cleanup, removed bogus comments
- make method reload handle __private attrs correctly
- fixed whole word search
2001-07-05 07:06:26 +00:00
Just van Rossum 924e18e0b8 don't crash when encountering bad marshal data 2001-07-05 07:03:16 +00:00
unknown c90acb9599 Do conversion of CFStrings to/from unicode. 2001-07-04 22:38:52 +00:00
unknown d1054ef31a Set the default 8-bit encoding based on the system script and language. 2001-07-04 22:37:19 +00:00
unknown f428aef3b2 Don't promise mac-japanese encoding as we don't have a codec for it.
Return a reasonable name for the general macos exception (MacOS.Error).
2001-07-04 22:36:27 +00:00
Jack Jansen 4542897d96 Added the new unicode defines. Not really tested yet, but Python compiles again at least. 2001-07-02 15:34:57 +00:00
Jack Jansen 340d98f564 - Use weaklink generators so we can support OSX-only calls without crashing on OS9.
- Convert CFString to/from Python strings. Currently always MacRoman, to be fixed later (as is unicode support). Python->CFString conversion is automatic.
2001-07-01 22:04:02 +00:00
Jack Jansen 7becc91fef Added CFURL support, and got base chaining to really work. 2001-06-28 22:08:26 +00:00
Jack Jansen bc7c8960e0 CFArray, CFData and CFDictonary are now covered, but mainly opaque.
CFStrings are in better shape, but Unicode support and automatic conversion to/from Python strings remains to be done.
2001-06-27 22:00:55 +00:00
Jack Jansen f4b9fb719a Added CF module build and project generation (carbon only). 2001-06-26 21:52:08 +00:00
Jack Jansen 686f9c344c First small step towards bgen-generated CoreFoundation. there is hardly any real functionality yet, but method chains seem to work, and so do Retain/Release semantics. 2001-06-26 21:51:18 +00:00
Jack Jansen ba18673045 Added a note about recompiling OSAm before distributing. 2001-06-26 08:06:59 +00:00
Just van Rossum 639a740e50 Fixed typo in doc string. 2001-06-26 06:57:12 +00:00
Just van Rossum 0297dca941 Fixed bug that prevented shared libs that are submodules of a
package to be loaded from a PYD resource.
2001-06-26 06:54:33 +00:00
Jack Jansen 19f273c7b6 WaitNextEvent short vs. unsigned short fix. 2001-06-25 08:48:05 +00:00
Just van Rossum 1a3125ef73 Changed the order of the buttons for EasyDialogs.AskYesNoCancel() from the unusual [cancel, no, yes] to the more standard [no, cancel, yes]. 2001-06-22 15:09:56 +00:00
Just van Rossum 67456e841c don't blow up when the charno SyntaxError value is None 2001-06-21 21:52:15 +00:00
Just van Rossum b10eb84f29 repaired expandselection and uncomment breakage 2001-06-21 17:51:17 +00:00
Just van Rossum 50cb38df43 Added support for the gc module (!). 2001-06-21 14:50:03 +00:00
Jack Jansen 2942131dac Got rid of a silly #if. 2001-06-20 21:44:38 +00:00
Jack Jansen b8248d8cff Don't use extern when we mean staticforward (OSX gcc is picky about it).
Blacklist SendControlMessage: it's signature has changed between Universal Headers 3.3 and 3.4.
2001-06-20 21:31:28 +00:00
Jack Jansen 82bcbd04fd {Is,Set}AntiAliasedTextEnabled don't exist on MacOS 8.5.5 and earlier. For now: cop out and blacklist them. 2001-06-20 21:29:19 +00:00
Jack Jansen 3685a4328d ANSIfied function headers to shut up compiler warnings on OSX/Mach-o. 2001-06-20 21:22:23 +00:00
Jack Jansen 6b9289ff1a Added a const to shut up a compiler warning. 2001-06-20 21:21:07 +00:00
Jack Jansen 4edc5eb639 Reversed the order of the checks for None or a Dialog where a Window is expected so it doesn't crash under OSX/Mach-o. 2001-06-20 21:20:22 +00:00
Jack Jansen 8853b18cc8 Removed some unused routines under Carbon. They caused compile errors with UH34. 2001-06-20 20:55:05 +00:00
Jack Jansen ff75c214ef Adapted to Universal Headers 3.4: new refcontype and use UPP names in stead of Proc names for callback creation. 2001-06-20 20:53:38 +00:00
Jack Jansen 5daef31355 Adapted for Universal Headers 3.4: refcon type has changed (sigh) and use modern (UPP in stead of Proc) names for callback object creation. 2001-06-20 20:50:19 +00:00
Just van Rossum d700d79a73 Override bdb's canonic() method with a no-op: with bdb's version we couldn't edit breakpoints in file-less ("Untitled" script windows). Besides, we did't need it as we always use full path names anyway. 2001-06-20 19:57:55 +00:00
Just van Rossum fb3e54fd99 made 7-bit-clean. 2001-06-19 21:38:42 +00:00
Just van Rossum dc3c617cb8 Some long overdue maintainance. Made all IDE sources 7-bit-clean, to avoid any further encoding conversion troubles. 2001-06-19 21:37:33 +00:00
Jack Jansen 13a0172658 Got rid of mactoolboxglue.c 2001-06-13 12:41:25 +00:00
Jack Jansen 0c995756b3 Fixed an error in the signature of the QdRGB converter routines. 2001-06-13 12:39:02 +00:00
Jack Jansen dac238bd46 When reading from stdin (with the dialog box) use any partial line on
stdout as the prompt. This makes raw_input() and print "xxx", ; sys.stdin.readline() work a bit more palatable.
2001-05-26 20:01:41 +00:00
Jack Jansen a5ca7dd71a One more macroman<->latin1 conversion victim. 2001-05-23 20:03:06 +00:00
Jack Jansen 0e2d6bfe09 Updated to reflect the current state of config.h.in. 2001-05-23 08:55:50 +00:00
Jack Jansen fe9110b2ad removed a routine that has moved to macglue.c 2001-05-22 22:37:05 +00:00
Jack Jansen 0268ac80de Include Carbon/Carbon.h if appropriate.
Fixed glue initialization code so prototype is correct.
2001-05-22 22:34:56 +00:00
Jack Jansen b16cf50077 Added WITHOUT_FRAMEWORKS and USE_TOOLBOX_OBJECT_GLUE defines. 2001-05-22 22:21:45 +00:00
Jack Jansen 11493bc65f Simple script to regenerate all bgen-generated modules. 2001-05-22 22:18:21 +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 1129671350 Fixed changed UPP routines names. The module now compiles and loads. 2001-05-22 21:48:40 +00:00
Jack Jansen b45032e629 Fixed a nasty slowdown in imports in frozen applications: the shortcut
for loading modules from the application resource fork stopped working
when sys.path component normalization was implemented. Comparison
of sys.path components is now done by FSSpec in stead of by pathname.
2001-05-22 14:13:02 +00:00
Jack Jansen 25e0c79487 Another include Carbon/Carbon.h 2001-05-19 12:57:22 +00:00
Jack Jansen 741e0378e4 Moved PyMac_GetFullPath from macgetargv.c to macglue.c. It should
have been there in the first place.
2001-05-19 12:55:57 +00:00
Jack Jansen f3163303a9 Ifdeffed a few more sections. All functionality that is relevant on MacOSX
now appears to work.
2001-05-19 12:50:05 +00:00
Jack Jansen 6143d533b6 Include Carbon/Carbon.h in stead of universal headers, if appropriate.
Test for TARGET_API_MAC_OS8 in stead of !TARGET_API_MAC_CARBON where
appropriate.
2001-05-19 12:34:59 +00:00
Jack Jansen 9f66b4af6a include Carbon/Carbon.h in stead of universal headers, if appropriate. 2001-05-19 12:32:39 +00:00
Jack Jansen 8bb1dc1f8d Merged mactoolboxglue.c into macglue.c. A later step will be to separate out
the stuff that is only needed on classic-MacOS.
2001-05-19 12:31:09 +00:00
Jack Jansen b686791b77 Added pymactoolboxglue.c and changed the exported symbols having to do with this. 2001-05-17 22:14:36 +00:00
Jack Jansen e8f53bb779 Dynamically loaded toolbox modules don't need to link against each other anymore, due to the new glue code that ties them together. 2001-05-17 22:12:55 +00:00
Jack Jansen f57a4a2e97 Glue code to connect obj_New and obj_Convert routines (the PyArg_Parse and Py_BuildTuple helpers) from one dynamically imported module to another. 2001-05-17 22:11:44 +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 6f84ed5afc Fixed macroman<->latin1 conversion. Some chars don't
exist in latin1, but at least the roundtrip results in the
same macroman characters.
2001-05-17 12:45:13 +00:00
Jack Jansen dfebe90c4c Fixed macroman<->latin1 conversion. Some characters don't exist in latin1, but at least the roundtrip gives
the correct macroman characters again.
2001-05-17 12:35:13 +00:00
Jack Jansen 5a4718e1ed Bah, somehow the macroman<->iso-latin-1 translation got lost during the merge. Checking in one fixed file to make sure MacCVS Pro isn't the problem. If it isn't a flurry of checkins will follow tomorrow. If it is... well... 2001-05-15 20:22:08 +00:00
Jack Jansen 6db483e679 Added a WITHOUT_FRAMEWORKS define to all the config files, so that on MacOS<=9 compiles use Universal Headers, not Carbon/Carbon.h. 2001-05-14 15:00:38 +00:00
Jack Jansen 0194ad5c7d Got the first MacPython module working under MacOSX/MachO (gestalt). Main changes
are including Carbon/Carbon.h in stead of the old headers (unless WITHOUT_FRAMEWORKS
is defined, as it will be for classic MacPython) and selectively disabling all the
stuff that is unneeded in a unix-Python (event handling, etc).
2001-05-12 22:46:35 +00:00
Jack Jansen 6e68a7e74f Be more sensible about when to use TARGET_API_MAC_OS8 in stead of !TARGET_API_MAC_CARBON. This should greatly facilitate porting stuff to OSX in its MachO/BSD incarnation. 2001-05-12 21:31:34 +00:00
Jack Jansen 1bd0a712ad Added iterobject.c to the project. And trying my first checkin at the same time. 2001-05-12 21:09:45 +00:00
Jack Jansen 99e607a86f Added a note that test_longexp needs 400MB. 2001-05-10 12:20:30 +00:00
Jack Jansen d454b578e2 Has been dead so long that there's no use keeping it in the active bit of the repository. 2001-05-10 12:17:03 +00:00
Jack Jansen 569c09c013 Removed some confusing sentences that are no longer relevant now that
calldll is part of the standard macPython distribution.
2001-05-08 14:20:11 +00:00
Jack Jansen e9bcb5c766 Got rid of the whole event filtering mess again, I can't get it to work. Simply disabling the Tk event handling hook in _tkinter is not as nice, but at least it works. 2001-04-27 20:43:27 +00:00
Jack Jansen 69f086cbb6 Apparently the code to forestall Tk eating events was too aggressive (Tk user input stopped working). Fixed (I hope:-). 2001-04-26 13:22:33 +00:00
Jack Jansen c1218bc014 Files for 2.1 distribution. 2001-04-25 22:11:24 +00:00
Jack Jansen c54be4299c Check RefCon backpointer to python object with IsPointerValid() before dereferencing it (carbon only). 2001-04-25 22:09:29 +00:00
Jack Jansen 26e51e1e83 Updated copyright info (which was long due). 2001-04-25 22:08:12 +00:00
Jack Jansen b4b27bec0e - Raise console window on input. Fixes Carbon hang. 2001-04-25 22:07:42 +00:00
Jack Jansen 15f1c08d96 - Raise console window on input. Fixes Carbon hang.
- Better handling of menu bar save/restore.
- Override abort() so it honours the "keep console window" flag.
2001-04-25 22:07:27 +00:00
Jack Jansen ee677913df Don't crash if InfoScrap doesn't exist (as is the case in Carbon). 2001-04-25 22:05:36 +00:00
Jack Jansen 43935128a4 Finally merged morefindertools into findertools. 2001-04-07 12:53:45 +00:00
Jack Jansen 3aee7752fa Added a note about Help and ctb missing in carbon. 2001-04-06 09:02:43 +00:00
Jack Jansen bad62deca1 Version 1.2 by Christopher Stern. 2001-04-06 08:34:55 +00:00
Jack Jansen e3850f5b6c Disable fused-add-mul instructions. They give a nonstandard result for some things that test_coercion complains about. The added performance is probably minimal for Python anyway. 2001-04-03 21:56:12 +00:00
Jack Jansen 216b8707d9 If the frontmost window is not a Tk window exit the event handling code early. This fixes that using Tk once used to disable cmd-. processing. It may also influence Tk/IDE interaction, I'm not sure. 2001-04-03 14:36:35 +00:00
Jack Jansen 6333af1743 On OSX show a dialog explaining that ConfigurePythonCarbon launch will probably fail. This turns out to be a VISE 7.1.1 problem, probably. 2001-03-29 13:54:23 +00:00
Jack Jansen 2e2546c5fd On OSX always copy PythonCore. It turns out an orphaned alias in /Library/CFMSupport (happens when you remove python and aliased pythoncore) wreaks havoc with the system. 2001-03-29 13:53:19 +00:00
Jack Jansen 9bfae985ab Changed some of the dialogs to be a little clearer. 2001-03-29 13:52:16 +00:00
Jack Jansen fc369f21d5 Don't show finder-delay-warning on OSX. Untested. 2001-03-28 20:33:24 +00:00
Jack Jansen 2b73fe9956 Updated for 2.1b2 distribution. 2001-03-27 21:38:55 +00:00
Jack Jansen ff4e62dbde Added a note about BBPy.lm. 2001-03-27 21:37:06 +00:00
Jack Jansen 64f9f7108f Added a note about the new (since 2.0) OSA architecture. 2001-03-27 21:34:31 +00:00
Jack Jansen 3f4c173d5c Oops, ISO translation was off. Fixed. 2001-03-27 21:32:34 +00:00
Jack Jansen 996c5c17d4 Disable fused-add-mul instructions. They give a nonstandard result for some things that test_coercion complains about. The added performance is probably minimal for Python anyway. 2001-03-26 20:03:30 +00:00
Jack Jansen c658236d72 Fixed some access paths. 2001-03-26 08:37:28 +00:00
Jack Jansen 9de05f4157 Started on 2.1b2 release notes. Cleaned out alfa notes, etc. 2001-03-20 23:30:38 +00:00
Jack Jansen 875b51dff9 Added dummy _tkinter module for Carbon, which explains that Tkinter isnt supported under Carbon. 2001-03-20 23:30:06 +00:00
Jack Jansen aabdb0d5bf Dummy _tkinter module for Carbon, which explains that Tkinter isnt supported under Carbon. 2001-03-20 23:29:41 +00:00
Jack Jansen fddef433d1 Got module to work under Carbon. Also disabled a few more bits of cfm68k support. 2001-03-20 21:55:51 +00:00
Jack Jansen 26d42df3c1 Added riscos modules to modules that don't have to be included. 2001-03-20 21:55:07 +00:00
Jack Jansen 4cf97c4972 Files for second 2.1b1 distribution. 2001-03-15 14:41:01 +00:00
Jack Jansen 5c82d13e1f FindFolder argument is a short, not an unsigned short.
Added kLocalDomain and friends.
2001-03-15 14:39:37 +00:00
Jack Jansen 6b498de165 Handle the apple menu differently under Carbon. 2001-03-15 14:39:03 +00:00
Jack Jansen abd703d0ce FindFolder argument is a short, not an unsigned short. 2001-03-15 14:38:10 +00:00
Jack Jansen 06646a1be0 Added QDFlushPortBuffer calls. 2001-03-15 14:35:33 +00:00
Jack Jansen fffec05bcb Import kOnSystemDisk from MACFS 2001-03-15 14:33:24 +00:00
Jack Jansen d11f93c475 Look for shared libraries first in kLocalDomain and then in kOnSystemDisk.
Don't do sys.prefix==os.getcwd() check unless we're an applet.
2001-03-15 14:28:40 +00:00
Jack Jansen 8ef786ea95 Files for second 2.1b1 distribution. 2001-03-15 14:27:09 +00:00
Jack Jansen dbc692e286 Chris Stern's BBEdit Python language module. 2001-03-10 13:24:41 +00:00
Jack Jansen 0a3939fc71 Finished implementation of removing incorrect preferences file. 2001-03-09 23:15:27 +00:00
Jack Jansen e5c9474f0f Default waittime in the eventloop is now None. At low level it will then be set to GetCaretTime(). 2001-03-08 23:10:37 +00:00
Jack Jansen 53ebe562f5 Handle the ReopenApplication event (by ignoring it). 2001-03-08 23:09:32 +00:00
Jack Jansen 54f3bdbfe1 Detect that the preference file may be incorrect, and offer to remove it. This isn't finished yet. 2001-03-08 23:07:57 +00:00
Jack Jansen 4c52203b51 Started on relnotes for the next beta. 2001-03-08 23:07:16 +00:00
Jack Jansen 8f728592be Added a warning message about the delay after installation. Untested. 2001-03-08 21:18:54 +00:00
Jack Jansen 1d79f79bd0 Files for 2.1b1 distribution. 2001-03-06 22:51:42 +00:00
Jack Jansen 5fc3381098 PythonInterpreterClassic and PythonInterpreterCarbon now have filetype "Atmp". The ConfigurePythonXXX scripts will set this to APPL when copying either of those to PythonInterpreter. 2001-03-06 22:51:00 +00:00
Jack Jansen c1463c9870 macostools.copy() now has an optional forcetype flag, which sets the filetype. This is used by various tools to set the type to APPL when copying interpreter template files (Atmp filetype). 2001-03-06 22:46:25 +00:00
Jack Jansen bb74f95821 Started on plst resource. Not enabled yet. 2001-03-06 22:45:29 +00:00
Jack Jansen 36bcf9b94f Re-try the file copy once if it fails. This works around an obscure and non-reproducibe bug in GUSI. 2001-03-06 22:43:06 +00:00
Jack Jansen cbe7b1c93e Files for 2.1b1 distribution. 2001-03-06 22:42:12 +00:00
Jack Jansen b25ec91a94 Testing commit with a single blank line. 2001-03-05 15:44:55 +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 7fc49a4441 - Numeric now lives in Lib:site-python.
- Imaging and Numeric are now also available under Carbon.
- Started working on the active installer.
2001-03-01 23:19:05 +00:00
Jack Jansen 807e70101e - Numeric now lives in Lib:site-python.
- Imaging and Numeric are now also available under Carbon.
2001-03-01 23:18:31 +00:00
Jack Jansen b34d0ed403 Removed some stuff that shouldn't be in the dev distribution. 2001-03-01 23:17:43 +00:00
Jack Jansen 1b45c73be0 Removed Extensions:Numeric from sys.path. It now lives in Lib:site-python. 2001-03-01 23:16:51 +00:00
Jack Jansen dbd0c3a124 Silly typo which caused the stack browser to crash. 2001-03-01 23:15:54 +00:00
Jack Jansen a647807e40 Also build Imaging for Carbon. 2001-03-01 23:15:01 +00:00
Jack Jansen f1d7b41fa0 Disable GetWindowSpareFlag and GetWindowGoAwayBox on carbon. 2001-02-28 23:32:42 +00:00
Jack Jansen 0b7c4f2dea Put PPC distributions back in, rearranged packages and use VISE variable magic to determine which ConfigurePythonXXX to run. 2001-02-28 23:23:31 +00:00
Jack Jansen c6cecf55d1 Reset the resource file chain before calling PyMac_OpenPrefFile. I'm not sure why this wasn't a problem before... 2001-02-28 15:54:18 +00:00
Jack Jansen f7fb3e6435 Oops, need to import Res. 2001-02-28 15:53:18 +00:00
Jack Jansen 72b97aed80 If we can't find our splash dialog (i.e. we're probably running from source) go into interactive mode: print what we're doing and ask about carbon/classic configure. 2001-02-28 11:23:04 +00:00
Jack Jansen 24033e3d60 Updated for 2.1a3 2001-02-27 23:24:07 +00:00
Jack Jansen 6223d48933 Added Popt resource for "dont show console"
Changed SIZE resource to be carbon-compatible.
2001-02-27 23:22:51 +00:00
Jack Jansen 64700c9603 Various tweaks to make it work on MacOSX. 2001-02-27 23:22:02 +00:00
Jack Jansen 9fa7720976 Added future.c 2001-02-27 23:19:58 +00:00
Jack Jansen cced0aa3e0 SetListCellIndent() argument was guessed incorrectly. Fixed. 2001-02-27 13:00:36 +00:00
Jack Jansen f02f4c8825 Soundex has gone. 2001-02-27 12:59:49 +00:00
Jack Jansen 501d89da40 Soundex has gone. 2001-02-27 12:48:42 +00:00
Jack Jansen 5dd7362295 Hide the ProgressBar before raising KeyboardInterrupt. Not doing so resulted in a hang on Carbon. 2001-02-23 22:18:27 +00:00
Jack Jansen be1e569682 Turn on the "multifinder aware" bit. This should always have been on, but was was never a problem that it was off until CarbonLib 1.1 (which requires it, for some reason). 2001-02-23 22:13:07 +00:00
Jack Jansen add8b246f6 Release a PYC resource after reading it. No need to keep it incore. 2001-02-21 15:48:19 +00:00
Jack Jansen 316a01093d Waste 2.0 has many more options for the undo label. 2001-02-21 15:45:55 +00:00
Jack Jansen 9ad2752381 Use re in stead of regex, so we get rid of the annoying warning during startup. 2001-02-21 13:54:31 +00:00
Jack Jansen 599ce9c6c2 On OSX passing NULL to NewUniversalFilterProc() does not return NULL but a crashing UPP. This made ModalDialog (and, hence EditPythonPrefs and EasyDialogs and many others) crash. Fixed. 2001-02-20 22:27:43 +00:00
Jack Jansen 0b1f1b5145 - Removed debug
- Make sure splash screens are visible
2001-02-17 23:39:35 +00:00
Jack Jansen cbb5d4972f ConfigurePython now comes in two flavors: ConfigurePythonClassic and ConfigurePythonCarbon, which copy the respective interpreters to PythonInterpreter and rebuild all the applets. This allows MacOS9 users to switch back and forth. 2001-02-17 23:31:48 +00:00
Jack Jansen a4f8e58058 Allow selecting a template in findtemplate(), so Classic programs can build Carbon applets and vice-versa. 2001-02-17 23:30:19 +00:00
Jack Jansen 881cd36853 2.1a2 distribution files. 2001-02-17 22:12:43 +00:00
Jack Jansen 0eb5f2df3f Added a note that this file is incorrect for 2.1a2. 2001-02-17 22:04:13 +00:00
Jack Jansen 2f9a9e3c31 2.1a2 distribution files. 2001-02-17 22:03:42 +00:00
Jack Jansen 657ba27dde More changes to attempt to get the menubar back on exit. Without success:-( 2001-02-17 22:02:07 +00:00
Jack Jansen fab7415831 Made version string shorter for Carbon so it fits on one line. 2001-02-17 22:00:43 +00:00
Jack Jansen f3eaf01c23 More modifications to bring the script output in line with the real thing. 2001-02-17 22:00:18 +00:00
Jack Jansen 7df9c60b8a Steven Majewski's instructions for building the toolbox modules for
incorporating them in a vanilla Python under MacOSX (i.e. in a
non-MacPython-Python). Not complete and up-to-date right now, but
that'll be fixed shortly.
2001-02-16 21:48:24 +00:00
Jack Jansen b61ff2982a A few more tweaks (there were a couple of files missing on my work machine). 2001-02-15 22:58:12 +00:00
Jack Jansen c982ef2df6 Waste 1.3 extra's modified for waste 2.0 (and missing from MW's distribution of 2.0). 2001-02-15 22:56:41 +00:00
Jack Jansen ed24cd2cf7 DialogWindows now have a self.dlg in addition to self.wid. 2001-02-14 17:07:04 +00:00
Jack Jansen 3ff82a3a4c The new touched() was far too expensive. Re-enabled the old one, the ae-based one is available as touched_ae(). Have to read up on the subject of telling the finder about changes. 2001-02-14 17:06:32 +00:00
Jack Jansen 3112bc10ee Also create alias to PythonCoreCarbon.
Got rid of lots of 68k stuff.
2001-02-14 17:04:51 +00:00
Jack Jansen 26ce8fb315 Started on the 2.1a2 installer. 2001-02-14 16:58:21 +00:00
Jack Jansen 0eea16633a Adapted unweave to Matthias' fixes. It's still off-by-one-space in some cases. 2001-02-13 22:58:56 +00:00
Jack Jansen 26d813e42c Got rid of full pathnames in "generated from" comments, so that these files are the same no mater which machine they've been generated on. 2001-02-12 16:09:44 +00:00
Jack Jansen 90f22fee6b Brought in line with current config.h.in. 2001-02-12 14:59:13 +00:00
Jack Jansen 883a19eb9a Not sure what changed, probably an artefact of the new modules and/or new gusi. 2001-02-12 14:57:59 +00:00
Jack Jansen 9826fe5372 The interpreters built are now called PythonInterpreterClassic and PythonInterpreterCarbon. The fullbuild script takes care of copying either of these to PythonInterpreter. 2001-02-12 14:52:47 +00:00
Jack Jansen 6e27118b72 Added modules _testcapi, _weakref, _symtable. 2001-02-12 14:50:52 +00:00
Jack Jansen 5288c47f6b Added buttons for building interpreter, carbon standalone.
Added modules _testcapi, _weakref, _symtable.
2001-02-12 14:46:53 +00:00
Jack Jansen 497314e2e5 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. 2001-02-11 01:26:28 +00:00
Jack Jansen 3f49e4d064 Oops, repr didn't allocate the memory it used... 2001-02-11 01:12:53 +00:00
Jack Jansen 8a38714ba0 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. 2001-02-11 01:08:04 +00:00
Jack Jansen add58f95cc Added prototype for DlgObj_WhichDialog() 2001-02-09 15:59:18 +00:00
Jack Jansen 7e31f68bf1 Replaced touched(), which no longer seems to work under os9, with something using an appleevent to the finder. More expensive, but at least it works:-) 2001-02-09 15:58:34 +00:00
Jack Jansen 34f83b3f56 Added a few constants. 2001-02-09 15:57:53 +00:00
Jack Jansen 784c611053 Dialogs and there windows were still confused in some spots. Fixed. 2001-02-09 15:57:01 +00:00
Jack Jansen def0d8da5a Get rid of from ... import * 2001-02-09 15:56:19 +00:00
Jack Jansen 5c734e8165 Replaced by :Lib:cfmfile.py. 2001-02-08 13:17:23 +00:00
Jack Jansen 69e7f11aa8 Added DlgObj_WhichDialog, analoguous to WhichWindow, and use this to get at dialogs. 2001-02-06 16:14:54 +00:00
Jack Jansen d6b2aeb10d QDFlushPortBuffer() has an optional region argument. 2001-02-06 16:13:50 +00:00
Jack Jansen ecdaadb7c6 Also recognize DragRef as a method-argument. 2001-02-05 13:47:13 +00:00
Jack Jansen dc2ac8d39f Accept Dialogs and Windows where Grafports are expected (such as in SetPort) and do a MacOSX compatible cast. Bit of a hack, but good enough for now. 2001-02-02 22:41:48 +00:00
Jack Jansen 340eb88fa8 On MacOSX StackSpace() may lie because it doesn't know about the stack rlimit. For now we set a hard limit of 256K (default rlimit is 512K). 2001-02-02 22:40:28 +00:00
Jack Jansen 87eb4f8bb3 New internal function BMObj_NewCopied() which copies the BitMap. Used to get the screenBits bitmap. 2001-01-30 09:57:13 +00:00
Jack Jansen 01a2d9e281 Use FSpCreateResFile() in stead of CreateResFile().
Don't call OpenDeskAcc() and AppendResMenu() on Carbon.
2001-01-29 15:32:00 +00:00
Jack Jansen bf21bef254 Got ZeroScrap() and PutScrap() to work under Carbon. 2001-01-29 15:20:06 +00:00
Jack Jansen 64aa1e2c83 Use FSpCreateResFile() in stead of CreateResFile(). 2001-01-29 15:19:17 +00:00
Jack Jansen 565e956cb0 Use CountMenuItems() in stead of CountMItems(). 2001-01-29 15:18:46 +00:00
Jack Jansen 1bbf6ff00f Make balloon code dependent on existence of Help module 2001-01-29 14:59:33 +00:00
Jack Jansen a3e2dcadcc Removed device from the list of Qd incompatibilities. It should be there, but causes too many false positives. 2001-01-29 14:27:32 +00:00
Jack Jansen 5c3c58bde0 Accessor functions for regions and such expect an existing region as parameter. Fixed for grafport attribute access.
Got GetPortBitMapForCopyBits() and port.portBits to work.
2001-01-29 14:07:01 +00:00
Jack Jansen 9b897ecaac Ported the icglue module to carbon. 2001-01-29 13:33:16 +00:00
Jack Jansen 54c0787909 Added generators for EnableMenuItem and CheckMenuItem (which have Mac in front of their name in the include files). 2001-01-29 13:32:10 +00:00
Jack Jansen f424f24bbb Re-enabled Scrap (even though it's mostly empty right now). 2001-01-29 13:31:10 +00:00
Jack Jansen afd0aa680a Replace {Enable,Disable,Check}Item with their carbon-compatible equivalents {Enable,Disable,Check}MenuItem. 2001-01-29 13:29:47 +00:00
Jack Jansen 5a8115c94b Ported the icglue module to carbon. 2001-01-29 13:27:46 +00:00
Jack Jansen 13735e3e3e Added Help, Scrap and icglue missing methods. 2001-01-29 13:22:29 +00:00
Jack Jansen 2beeb22533 Added cellobject.c 2001-01-28 22:45:46 +00:00
Jack Jansen a813153e15 Got waste to work for Carbon. 2001-01-26 16:32:20 +00:00
Jack Jansen c34a5ade0a ucnhash module has gone, xreadlines module added. 2001-01-25 18:31:16 +00:00
Jack Jansen 41eb3c7dc5 ucnhash module has gone. 2001-01-25 16:28:34 +00:00
Jack Jansen 4ff2fe7ee1 ucnhash module has gone, xreadlines module added. 2001-01-25 16:28:00 +00:00
Jack Jansen c4abd00457 Got rid of extraneous Modues:TE in the search path. 2001-01-24 16:09:59 +00:00
Jack Jansen 48d11c133a Waste and scrap now sort-of work for Carbon. Scrap is mostly empty, and waste uses a mixture between Waste 2.0 and Waste 1.3. 2001-01-24 16:07:31 +00:00
Jack Jansen 4a4adf4293 Recognize {compiler} and {project} prefixes to pathnames and output the correct XML. 2001-01-24 16:04:50 +00:00
Jack Jansen 7b3cc1f9c3 Regenerated (and manually massaged for PutScrap) so it can be byuilt both for Carbon and Classic. The Carbon module is rather empty, though, for now. 2001-01-24 16:04:01 +00:00
Jack Jansen 5396feb3bb Quick (manual) fix to make the module compile with Waste 2.0. TBD later. 2001-01-24 16:03:05 +00:00
Jack Jansen 8c98266a7d Waste and scrap now sort-of work for Carbon. Scrap is mostly empty, and waste uses a mixture between Waste 2.0 and Waste 1.3. 2001-01-24 16:02:07 +00:00
Jack Jansen f47075e86d Blacklisted (for the time being) the functions that have a component argument. Don't want to drag the Cm module into the core set too. 2001-01-24 14:22:13 +00:00
Jack Jansen 131c288484 Build directives for PythonStandalone were missing. 2001-01-24 14:06:35 +00:00
Jack Jansen bace5e9481 Added the GrafPort attributes that are unavailable under Carbon. 2001-01-24 14:06:04 +00:00
Jack Jansen bd58edaa01 Implemented direct attribute access for Carbon builds and accessor functions for non-carbon builds. 2001-01-24 14:05:11 +00:00
Jack Jansen 7b7e713c0d Also build the Carbon extension modules. 2001-01-23 23:19:41 +00:00
Jack Jansen b51362163a Removed extraneous references to Modules:TE 2001-01-23 23:19:13 +00:00
Jack Jansen 119177b900 The C-prefix file for Carbon plugin projects. 2001-01-23 22:46:21 +00:00
Jack Jansen dfebb2786a Ah well, why not check this in. A script to remove all .pyc files in a folder hierarchy. 2001-01-23 22:45:52 +00:00
Jack Jansen 3236f6ad8c Projects for Carbon plugin modules. 2001-01-23 22:42:45 +00:00
Jack Jansen 366ffcb7ff Use &# escape for non-ascii chars. 2001-01-23 22:40:32 +00:00
Jack Jansen 193509b320 Added an attribute runtimemodel, which is either "ppc" or "carbon" and is the runtime model of the current interpreter. Will have to ad another value later for real MacOSX MachO, I guess. 2001-01-23 22:38:23 +00:00
Jack Jansen c3fc51f61b Added the actual builds of the carbon projects. 2001-01-23 22:36:52 +00:00
Jack Jansen 8c19b882e4 Generate Carbon as well as classic PPC plugin projects. This module is finally paying back the investment in it! 2001-01-23 22:36:26 +00:00
Jack Jansen 6abe676538 Various settings were unconditionally set. Allow them to be overridden in the settings dict. 2001-01-23 22:35:22 +00:00
Jack Jansen 50f6f6f621 If the template is not specified it depends on the current execution model (classic ppc or carbon). 2001-01-23 22:34:50 +00:00
Jack Jansen 6ecf14639d Added a template for Carbon plugin projects. 2001-01-23 22:33:31 +00:00
Jack Jansen a106f82e4e Moved files from template to template-ppc, as this is the template for classic PPC projects. 2001-01-23 22:33:01 +00:00
Jack Jansen 9080e9b938 Added a note about the memory size.
Added Matthias Neeracher and Alexandre Parenteau to the "thank you" list. This should have been done _ages_ ago for Matthias! Shame shame!!
2001-01-23 21:03:52 +00:00