Commit Graph

813 Commits

Author SHA1 Message Date
Barry Warsaw 30dbd1429a Document the two changes to the mailbox.py module:
- All constructors grow an optional argument `factory' which is a
  callable used when new message instances are created by the next()
  methods.  Defaults to the rfc822.Message class.

- A new subclass of UnixMailbox is added, called PortableUnixMailbox.
  It's identical to UnixMailbox, but uses a more portable test for
  From_ delimiter lines.  With PortableUnixMailbox, any line that
  starts with "From " is considered a delimiter (this should really
  check for two newlines before the F, but it doesn't.
2001-01-31 22:14:01 +00:00
Tim Peters ee826f88c9 Docs for new Windows zlib build procedure. 2001-01-31 19:39:44 +00:00
Jeremy Hylton 69c327988a add note about two kinds of illegal imports that are now checked 2001-01-30 01:27:28 +00:00
Moshe Zadka 6af0ce0501 Added news of function comparison and hashing by identity 2001-01-29 06:41:00 +00:00
Tim Peters 0149e84af2 SF bug #130306: statcache.py full of thread problems.
Fixed the thread races.  Function forget_dir was also utterly Unix-specific.
2001-01-28 05:07:00 +00:00
Tim Peters 547397c45b SF bug http://sourceforge.net/bugs/?func=detailbug&bug_id=130242&group_id=5470
SF patch http://sourceforge.net/patch/?func=detailpatch&patch_id=103453&group_id=5470
PyMember_Set of T_CHAR always raises exception.
Unfortunately, this is a use of a C API function that Python itself never makes, so
there's no .py test I can check in to verify this stays fixed.  But the fault in the
code is obvious, and Dave Cole's patch just as obviously fixes it.
2001-01-27 06:20:08 +00:00
Tim Peters 40ead76ed6 Added news about repr(string). 2001-01-27 05:35:26 +00:00
Tim Peters 85e2e4742d SF bug 130030: Claim of bad betavariate algorithm. 2001-01-26 06:49:56 +00:00
Tim Peters d52269bfd0 Fix bugs introduced by rewrite (in particular, time-based initialization
got broken).  Also added new method .jumpahead(N).  This finally gives us
a semi-decent answer to how Python's RNGs can be used safely and efficiently
in multithreaded programs (although it requires the user to use the new
machinery!).
2001-01-25 06:23:18 +00:00
Tim Peters d7b5e88e8e Reworked random.py so that it no longer depends on, and offers all the
functionality of, whrandom.py.  Also closes all the "XXX" todos in
random.py.  New frequently-requested functions/methods getstate() and
setstate().  All exported functions are now bound methods of a hidden
instance.  Killed all unintended exports.  Updated the docs.
FRED:  The more I fiddle the docs, the less I understand the exact
intended use of the \var, \code, \method tags.  Please review critically.
GUIDO:  See email.  I updated NEWS as if whrandom were deprecated; I
think it should be.
2001-01-25 03:36:26 +00:00
Barry Warsaw bbd89b66b1 PyObject_Dump() -> _PyObject_Dump()
PyGC_Dump() -> _PyGC_Dump()
2001-01-24 04:18:13 +00:00
Barry Warsaw 39e44d7a9c A few useful definitions if you're using gdb. Copy to ~/.gdbinit to
pull it in automatically.
2001-01-23 16:25:19 +00:00
Guido van Rossum 1e33bdcb76 Added notes about setup.py and cygwin build; removed note about
the previous auto-configuring modules feature (already obsolete :-).
2001-01-23 03:17:00 +00:00
Guido van Rossum c201bf46b9 Get rid of weird @SET_CXX@ macro occurrence. 2001-01-23 01:53:41 +00:00
Guido van Rossum 89a27ec01c A few more contributors. 2001-01-23 00:06:20 +00:00
Marc-André Lemburg ebb195b270 Updating NEWS to match the current state of affairs. 2001-01-20 10:34:52 +00:00
Thomas Wouters fe385251f4 Make the 'time' argument to the timemodule functions strftime, asctime,
ctime, gmtime and localtime optional, defaulting to 'the current time' in
all cases. Adjust docs, add news item. Also convert all argument-handling to
METH_VARARGS. Closes SF patch #103265.
2001-01-19 23:16:56 +00:00
Andrew M. Kuchling f5c9e86333 Add Jason Tishler to the ACKS file 2001-01-19 16:29:28 +00:00
Guido van Rossum a88479f0e3 - Add note about complex numbers.
- Changed description of rich comparisons to emphasize that < and >
  (etc.) are each other's reflection.  Also use this word in the note
  about the demise of __rcmp__.
2001-01-18 14:28:08 +00:00
Tim Peters 691e0e95de Variant of SF patch 103252: Startup optimize: read *.pyc as string, not with getc(). 2001-01-18 04:39:16 +00:00
Marc-André Lemburg ad7c98e264 This patch adds a new builtin unistr() which behaves like str()
except that it always returns Unicode objects.

A new C API PyObject_Unicode() is also provided.

This closes patch #101664.

Written by Marc-Andre Lemburg. Copyright assigned to Guido van Rossum.
2001-01-17 17:09:53 +00:00
Guido van Rossum f98eda01ab News item for rich comparisons.
(I'm going to check in some more uses of rich comparisons, but the
basic feature should be in place now.)
2001-01-17 15:54:45 +00:00
Barry Warsaw 573b54125d Add a NEWS item about function attributes. 2001-01-15 20:43:18 +00:00
Guido van Rossum 051e335d42 Add note about new and improved xrange(). 2001-01-15 19:11:10 +00:00
Guido van Rossum da91f227ec Add note about ftplib defaulting to passive mode. 2001-01-15 16:36:08 +00:00
Tim Peters f29b64d243 Use the "MS" getline hack (fgets()) by default on non-get_unlocked
platforms.  See NEWS for details.
2001-01-15 06:33:19 +00:00
Tim Peters b9e202b2dc Added Jeffery Collins. 2001-01-14 05:04:40 +00:00
Andrew M. Kuchling f6f3a89fbd Mention new curses.panel module 2001-01-13 14:53:34 +00:00
Martin v. Löwis 10a2787313 Document extensions to .pth files. 2001-01-13 09:54:41 +00:00
Guido van Rossum 1cc8f83666 News about from...import. 2001-01-12 16:25:08 +00:00
Guido van Rossum ae72d87822 Typo. 2001-01-11 15:00:14 +00:00
Guido van Rossum f61f166bca Added a whole slew of news items. Not striving for completeness --
I've skipped all bugfixes, Unicode, distutils changes.  But this
should be a start!
2001-01-10 20:13:55 +00:00
Tim Peters 742bb6f9fd Clarification of new bisect module functions. 2001-01-05 08:05:32 +00:00
Martin v. Löwis be4c0f56a2 Recognize pyc files even if they don't end in pyc.
Patch #103067 with modifications as discussed in email.
2001-01-04 20:30:56 +00:00
Guido van Rossum c4e1775081 Two new names. 2001-01-03 23:51:26 +00:00
Tim Peters 36cdad12dd Fred, THIS NEEDS DOCS! The function docstrings tell the tale.
Christmas present to myself:  the bisect module didn't define what
happened if the new element was already in the list.  It so happens
that it inserted the new element "to the right" of all equal elements.
Since it wasn't defined, among other bad implications it was a mystery
how to use bisect to determine whether an element was already in the
list (I've seen code that *assumed* "to the right" without justification).
Added new methods bisect_left and insort_left that insert "to the left"
instead; made the old names bisect and insort aliases for the new names
bisect_right and insort_right; beefed up docstrings to explain what
these actually do; and added a std test for the bisect module.
2000-12-29 02:06:45 +00:00
Barry Warsaw e0c182fb5f (python-font-lock-keywords): Add highlighting of `as' as a keyword,
but only in "import foo as bar" statements (including optional
preceding `from' clause).
2000-12-27 17:41:47 +00:00
Guido van Rossum 1378c32dd8 Document the -W option as best as I can.
Get rid of BeOpen references.
2000-12-19 03:21:54 +00:00
Andrew M. Kuchling a1099be778 Fix typo 2000-12-15 01:16:43 +00:00
Guido van Rossum 3661d39474 Describe {}.popitem(). 2000-12-12 22:10:31 +00:00
Tim Peters d92dfe0ef5 SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. 2000-12-12 01:18:41 +00:00
Guido van Rossum 37da22b3f4 The C+ compiler is called $(CXX) these days, not CCC.
This fixes SF Bug #124478.
2000-12-06 23:46:29 +00:00
Tim Peters 9940b800a4 Made the description of %[udxXo] formats of negative longs in 2.1 more accurate.
I suggested to Guido that %u be deprecated (it seems useless in Python to me).
2000-12-01 07:59:35 +00:00
Tim Peters a3a3a030af Fox for SF bug #123859: %[duxXo] long formats inconsistent. 2000-11-30 05:22:44 +00:00
Barry Warsaw 3c34bb33ff (py-goto-beginning-of-tqs): When searching backwards for the matching
delimiter, watch out for backslash escaped delimiters.  Also use =
instead of eq for character comparison (because a character is = to
it's integer value, but not eq to it).
2000-10-27 05:00:25 +00:00
Fred Drake cf3bc8c5a5 Rename Setup.in to Setup.dist, and assume that configure will create
Setup (instead of creating it from the Makefile).
2000-10-26 17:07:40 +00:00
Tim Peters adfb94fd79 Typo repair. 2000-10-16 20:51:33 +00:00
Jeremy Hylton d867a2cc21 revise xml comment 2000-10-16 20:41:38 +00:00
Fred Drake 1a640506ec Updated the XML package comment. 2000-10-16 20:27:25 +00:00
Tim Peters 989b7b91a1 Filled in math-module info; fixed a typo or two. 2000-10-16 20:24:53 +00:00
Jeremy Hylton d6e2023107 Add NEWS for 2.0 final (there are a few XXX comments that must be
addressed).

Fix a few nits in 2.0c1 news.
2000-10-16 20:08:38 +00:00
Jeremy Hylton 21000caee7 distutils setup files for Tkinter 2000-10-16 15:36:25 +00:00
Jeremy Hylton 355e2f2bc8 misc. RPM support files 2000-10-16 15:34:52 +00:00
Jeremy Hylton 6040aaa9a2 add note explaining what a release candidate is 2000-10-09 21:27:22 +00:00
Tim Peters 46446d6242 Repaired IDLE Unicode bug description.
Added tokenize.py bugfix info.
2000-10-09 21:19:31 +00:00
Guido van Rossum 56fe7f8649 WAVE test + bugfix contributor. 2000-10-09 20:07:00 +00:00
Guido van Rossum 5c2c6046eb And another. 2000-10-09 19:52:41 +00:00
Jeremy Hylton 32e20ff838 typo 2000-10-09 19:48:11 +00:00
Guido van Rossum fded5ed251 One more name. 2000-10-09 19:29:35 +00:00
Jeremy Hylton 109212037b added better description of BeOS changes from Donn Cave 2000-10-09 18:34:12 +00:00
Jeremy Hylton ed9e644793 Summary of changes between 2.0b2 and 2.0c1 2000-10-09 18:26:42 +00:00
Jeremy Hylton 30e78773eb new name 2000-10-09 18:26:16 +00:00
Fred Drake 3105f920bf Added Daniel Dittmar, for helping get the configuration working for
Reliant UNIX.
2000-10-02 14:52:31 +00:00
Jeremy Hylton 625915eb4f typo 2000-10-02 13:43:33 +00:00
Fred Drake 9f11cf8811 Capitalized an "if" that should have been -- noted by Grant Griffin
<grant.griffin@honeywell.com>.
2000-09-29 17:54:40 +00:00
Fred Drake 45888ffbd4 Added a missing "is" -- noted by Grant Griffin
<grant.griffin@honeywell.com>.
2000-09-29 17:09:11 +00:00
Jeremy Hylton 97693b0479 Fix GC news 2000-09-26 17:42:51 +00:00
Fred Drake 67233bc405 Fixed typo, description of changes to dbm module. 2000-09-26 16:40:27 +00:00
Jeremy Hylton fa2e2c1469 The rest of the news for 2.0b2 2000-09-26 16:31:30 +00:00
Fred Drake 64bb380c09 Elaborated the notes on the XML support.
In the limits.h comment, noted that INT_MAX and LONG_MAX are guaranteed
to be defined.

Noted that Reliant UNIX now gets proper API support for extension modules.
2000-09-26 16:21:35 +00:00
Guido van Rossum f62ed9c775 Fixed some typos, added some punctuation (e.g. consistently terminate
sentences with a period and put () after function/method names), and
filled in the blanks on mailbox and posixfile.  Noted <limits.h> change.
2000-09-26 11:16:10 +00:00
Tim Peters 482c021b6a New info and fixed some typos. 2000-09-26 06:33:09 +00:00
Jeremy Hylton 1b6185941e partial list of changes between 2.0b1 and 2.0b2 2000-09-26 05:32:36 +00:00
Guido van Rossum ee76f0b293 Credit where credit is due. Also fixed an unalphabetic sequence. 2000-09-25 14:46:26 +00:00
Marc-André Lemburg 5cd2f0d4a2 Updated according to the changes made to the "s#" parser marker
and bumped the version number to 1.7.
2000-09-21 21:21:59 +00:00
Tim Peters 077a11dd00 arraymodule: Fix SF bug 113960.
reverse() didn't work at all due to bad arg check.
    Fixed that.
    Added Brad Chapman to ACKS file, as the proud new owner of two
        implicitly copyrighted lines of Python source code <wink>.
    Repaired buffer_info's total lack of arg-checking.
    Replaced memmove by memcpy in reverse() guts, as memmove is
        often slower and the memory areas are guaranteed disjoint.
    Replaced poke-and-hope unchecked decl of tmp buffer size by
        assert-checked larger tmp buffer.
    Got rid of inconsistent spaces before open paren in docstrings.
    Added reverse() sanity tests to test_array.py.
2000-09-16 22:31:29 +00:00
Barry Warsaw 645693783c Describe the -h and -V flags. Closes patch #101496 2000-09-15 18:39:09 +00:00
Guido van Rossum 56db095018 Another typo (in the list comprehension example). 2000-09-06 23:34:25 +00:00
Guido van Rossum 4338a284b8 Fix three typos. 2000-09-06 13:02:08 +00:00
Tim Peters 8b09233f93 Added Windows news. Also repeated 1.6 Windows news since most people getting
2.0b1 for Windows will not have bothered getting 1.6.  Also changed
"Changed, New, Obsolete Tools" to say "None" since nobody had put an entry
there.
2000-09-05 20:15:25 +00:00
Jeremy Hylton 24c3d6080d All the NEWS that I could finish in 15 minutes (and then some)
Removed some attributions from the shorter entries in Changed Modules,
because that section is so long.
2000-09-05 19:36:26 +00:00
Jeremy Hylton bdebd54571 current progress on 2.0 NEWS 2000-09-05 18:28:54 +00:00
Guido van Rossum b1156badb4 The malloc rearrangement was actually already in 1.6. 2000-09-05 15:43:23 +00:00
Guido van Rossum 830ca2af5a Added readline news. (Skip) 2000-09-05 15:34:16 +00:00
Guido van Rossum e905e95721 Barry Warsaw: Fixed -+ operator. Added some new sections. Leave some
XXX notes for now.

I could use help here!!!!  Please mail me patches ASAP.  We may have
to put some of this off to 2.0final, but it's best to have it in shape
now...
2000-09-05 12:42:46 +00:00
Guido van Rossum f2ffce0518 Added the 2.0b1 news. 2000-09-05 04:38:34 +00:00
Guido van Rossum f2eac99a4f Added release dates (in some cases detemined by looking at the mtime
of distribution files in ftp://ftp.python.org/pub/python/src/).
2000-09-04 17:24:24 +00:00
Guido van Rossum a598c93b11 1.6 is history. 2000-09-04 16:26:03 +00:00
Guido van Rossum 410a84441d Tim Peters: "Audun S. Runde mailto:audun@mindspring.com wins a
Fabulous Prize for being our first Windows ME tester!  Also our only,
and I think he should get another prize just for that."
2000-09-04 12:11:50 +00:00
Guido van Rossum ff07f8c7ea Patch by Martin von Löwis to give him his umlaut, to remove Christian
Tismer's clone, and to list Hajime Saitou's real name.

Added a note that the file uses Latin-1 (as distributed).
2000-09-02 15:01:50 +00:00
Guido van Rossum 46981de633 Updated to include all files here. 2000-09-01 23:22:12 +00:00
Guido van Rossum 752435773b Delete too. 2000-09-01 23:21:04 +00:00
Guido van Rossum 73eec6360b Deleted. Long obsolete. 2000-09-01 23:18:22 +00:00
Guido van Rossum 0fdd3dcc45 Deleted. We no longer require disclaimers on contributions. 2000-09-01 23:16:41 +00:00
Guido van Rossum 2d721e2506 Deleted; this is ancient info. 2000-09-01 23:15:38 +00:00
Guido van Rossum c13b39c798 Deleted. This is obsoleted by Tools/scripts/fixnotice.py. 2000-09-01 23:12:13 +00:00
Guido van Rossum 8ed602b6e2 Remove the 1.5.2 news. 2.0 news is still to be done. 2000-09-01 22:34:33 +00:00
Guido van Rossum 2001da4e0c Moved NEWS from 1.5.2 here. 2000-09-01 22:26:44 +00:00
Guido van Rossum 44f6e6859b Deleted. This information is now in ../LICENSE. 2000-09-01 22:17:32 +00:00
Guido van Rossum f4a090d579 Clean up a bit. Drop -X option, update date, remove documentation
URLs, add various useful URLs.  Update address and email.  Drop PSA
and copyright.  Add license info.
2000-09-01 20:36:34 +00:00
Jeremy Hylton c18b7d9b2b script that reports a fairly safe recursionlimit for a specific platform 2000-08-31 19:24:17 +00:00
Barry Warsaw 2ef0753a17 Added James Henstridge 2000-08-30 03:30:28 +00:00
Marc-André Lemburg bff879cabb This patch finalizes the move from UTF-8 to a default encoding in
the Python Unicode implementation.

The internal buffer used for implementing the buffer protocol
is renamed to defenc to make this change visible. It now holds the
default encoded version of the Unicode object and is calculated
on demand (NULL otherwise).

Since the default encoding defaults to ASCII, this will mean that
Unicode objects which hold non-ASCII characters will no longer
work on C APIs using the "s" or "t" parser markers. C APIs must now
explicitly provide Unicode support via the "u", "U" or "es"/"es#"
parser markers in order to work with non-ASCII Unicode strings.

(Note: this patch will also have to be applied to the 1.6 branch
 of the CVS tree.)
2000-08-03 18:46:08 +00:00
Peter Schneider-Kamp 397be50a88 moving files to nondist/sf-html 2000-07-14 08:54:58 +00:00
Vladimir Marangozov a1dbd1b21b Gosh - clean up that messy HTML; make it valid XHTML instead. 2000-07-14 06:22:54 +00:00
Peter Schneider-Kamp 374724ed74 added information how to edit pages at http://python.sourceforge.net 2000-07-14 01:43:31 +00:00
Peter Schneider-Kamp 737bcc3466 small FAQ about Python CVS and patches at SourceForge 2000-07-14 01:28:47 +00:00
Guido van Rossum fd71b9e9d4 Change copyright notice. 2000-06-30 23:50:40 +00:00
Guido van Rossum 8f8e2428f7 s/REGENTS/COPYRIGHT HOLDERS/ followed by paragraph reflow. 2000-06-30 20:22:36 +00:00
Fred Drake 1d758b0108 The new copyright / license. 2000-06-30 18:41:01 +00:00
Barry Warsaw 6de7213e7a Setup.thread => Setup.config 2000-06-30 16:04:18 +00:00
Greg Ward 6fc9f8ed18 Typo fix. 2000-06-29 12:45:50 +00:00
Guido van Rossum e8d2d6b34c Some new names (some contributors of patches that haven't even been
accepted yet!)
2000-06-29 00:04:51 +00:00
Barry Warsaw 99eadf4de9 (py-execute-region): Make sure the new temporary buffer is current for
the insertion of the text.
2000-06-23 20:24:25 +00:00
Marc-André Lemburg bfa36f5407 Marc-Andre Lemburg <mal@lemburg.com>:
Updated to version 1.5. Includes typo fixes by Andrew Kuchling
and a new section on the default encoding.
2000-06-08 17:51:33 +00:00
Barry Warsaw caee2fe35d (py-execute-region): Based on suggestions by Francois Pinard and Skip
Montanaro, handle execution of indented regions by inserting an "if
1:" in front of the block.  This better preserves things like triple
quoted strings and commented regions.  This patch resolves PR#264.
2000-05-23 05:47:43 +00:00
Guido van Rossum 9ab06ee7b2 Added a few new names... 2000-05-11 18:20:30 +00:00
Fred Drake a69ef82643 M.-A. Lemburg <mal@lemburg.com>:
Added a useful link to Markus Kuhn's Unicode and UTF-8
FAQ.
2000-05-09 19:58:19 +00:00
Fred Drake 10dfd4c1c3 M.-A. Lemburg <mal@lemburg.com>:
Updated to version 1.4.
2000-04-13 14:12:38 +00:00
Guido van Rossum 2581764f21 Version 1.3 of the Python Unicode Integration proposal. 2000-04-10 19:45:09 +00:00
Guido van Rossum 0b4400e86c Bunch of new names, mostly from patches and bugs mailing lists
(everyone who said something remotely useful in the last 100 messages
I archived has been added :-).
2000-04-10 19:14:16 +00:00
Guido van Rossum 494ef17472 Two more names. I just realize that there may be more contributors to
distutils lurking in CVS logs that I probably haven't read.  Oh well.
2000-03-31 19:51:06 +00:00
Guido van Rossum 5964f8d60b I believe I've now got all the names mentioned in the CVS logs since
1.5.2 was released, except those who contributed only to Doc files --
Fred has his own way of doing this.

This doesn't mean that I've got everyone who contributed *before*
1.5.2 was released in here... :-(
2000-03-31 19:45:17 +00:00
Guido van Rossum 0380c2638c More names. 2000-03-31 13:01:57 +00:00
Guido van Rossum fb2789f387 Couple more names. We need to add way more names -- I'll have to dig
them out of the changelogs :-(
2000-03-31 00:45:00 +00:00
Jeremy Hylton 7690151c7e slightly modified version of Greg Ewing's extended call syntax patch
executive summary:
Instead of typing 'apply(f, args, kwargs)' you can type 'f(*arg, **kwargs)'.
Some file-by-file details follow.

Grammar/Grammar:
    simplify varargslist, replacing '*' '*' with '**'
    add * & ** options to arglist

Include/opcode.h & Lib/dis.py:
    define three new opcodes
        CALL_FUNCTION_VAR
        CALL_FUNCTION_KW
        CALL_FUNCTION_VAR_KW

Python/ceval.c:
    extend TypeError "keyword parameter redefined" message to include
        the name of the offending keyword
    reindent CALL_FUNCTION using four spaces
    add handling of sequences and dictionaries using extend calls
    fix function import_from to use PyErr_Format
2000-03-28 23:49:17 +00:00
Guido van Rossum 24bdb0474f Marc-Andre Lemburg:
The attached patch set includes a workaround to get Python with
Unicode compile on BSDI 4.x (courtesy Thomas Wouters; the cause
is a bug in the BSDI wchar.h header file) and Python interfaces
for the MBCS codec donated by Mark Hammond.

Also included are some minor corrections w/r to the docs of
the new "es" and "es#" parser markers (use PyMem_Free() instead
of free(); thanks to Mark Hammond for finding these).

The unicodedata tests are now in a separate file
(test_unicodedata.py) to avoid problems if the module cannot
be found.
2000-03-28 20:29:59 +00:00
Guido van Rossum d8855fde88 Marc-Andre Lemburg:
Attached you find the latest update of the Unicode implementation.
The patch is against the current CVS version.

It includes the fix I posted yesterday for the core dump problem
in codecs.c (was introduced by my previous patch set -- sorry),
adds more tests for the codecs and two new parser markers
"es" and "es#".
2000-03-24 22:14:19 +00:00
Barry Warsaw 51ac58039f On 17-Mar-2000, Marc-Andre Lemburg said:
Attached you find an update of the Unicode implementation.

    The patch is against the current CVS version. I would appreciate
    if someone with CVS checkin permissions could check the changes
    in.

    The patch contains all bugs and patches sent this week and also
    fixes a leak in the codecs code and a bug in the free list code
    for Unicode objects (which only shows up when compiling Python
    with Py_DEBUG; thanks to MarkH for spotting this one).
2000-03-20 16:36:48 +00:00
Guido van Rossum 9ed0d1ef18 Marc-Andre Lemburg: Python Unicode integration proposal, version 1.2. 2000-03-10 23:14:11 +00:00
Barry Warsaw c6f8fd925e Last try, think I got it now. 1999-12-01 23:40:01 +00:00
Barry Warsaw 490b15d30b Once more 1999-12-01 23:38:27 +00:00
Barry Warsaw a20a1e7d4b Once more 1999-12-01 23:38:03 +00:00
Barry Warsaw 6b96ec3625 Urg! 1999-12-01 23:36:42 +00:00
Barry Warsaw 6c3e3a90df more trivial stuff to test CVS -- should be the last? 1999-12-01 23:30:46 +00:00
Barry Warsaw 0afe026108 testing CVS once more 1999-12-01 23:29:10 +00:00
Barry Warsaw fcd490b290 testing CVS 1999-12-01 23:25:55 +00:00
Barry Warsaw 71d9f0dba1 testing CVS 1999-12-01 23:23:32 +00:00
Barry Warsaw 34790539a9 testing CVS 1999-12-01 23:01:50 +00:00
Barry Warsaw a8a57a7e03 testing CVS 1999-12-01 22:55:28 +00:00
Barry Warsaw 8896a2bd27 Minor change to test new CVS reporting 1999-12-01 22:53:10 +00:00
Barry Warsaw de4636c232 Minor change to test new CVS reporting 1999-12-01 22:52:19 +00:00
Barry Warsaw 61c0461c24 Minor change to test new CVS reporting 1999-12-01 22:47:14 +00:00
Barry Warsaw 086bc367ee Minor change to test new CVS reporting 1999-12-01 22:46:09 +00:00
Barry Warsaw bda81c86af Minor change to test new CVS reporting 1999-12-01 22:43:04 +00:00
Barry Warsaw 0319b370d0 Minor change to test new CVS reporting 1999-12-01 22:38:59 +00:00
Barry Warsaw 554cd94096 Minor change to test new CVS reporting 1999-12-01 22:34:42 +00:00
Guido van Rossum fd6aabbb35 Checking in text versions of release forms and explanation. 1999-11-05 15:21:08 +00:00
Fred Drake f2e9e2978e Oops, better update the date on the .TH line. 1999-08-20 13:30:49 +00:00
Fred Drake 4c9be9dffa Various updates, mostly to add information to the SEE ALSO and
INTERNET RESOURCES sections based on c.l.py comments.
1999-08-20 13:10:20 +00:00
Barry Warsaw 50765abb29 (py-shell): Set the default shell if not set yet. It's sometimes
convenient to call py-shell before the first Python file has been
visited.
1999-08-10 21:49:00 +00:00
Barry Warsaw 5ed843fc52 A few minor Customize changes:
(python): Set defgroup :prefix to "py-" to make variable names cleaner.

(py-jpython-command, py-jpython-command-args): Set :tag for proper
capitalization of JPython in variable name display.
1999-07-28 22:06:06 +00:00
Barry Warsaw 11f215607e (python-mode): Set which interpreter (CPython or JPython) to use the
first time a py buffer is visited during the Emacs session.  This
ensures that py-which-shells is initialized and also guarantees that
the mode lines reflect the correct shell.  First bug found by GvR,
second one has long bugged :) me.

(py-toggle-shells): Programmatically, arg can also take the symbols
`cpython' or `jpython', which makes it easy to call with the value of
py-default-interpreter.

(py-shell): Don't need to initialize py-which-* variables since these
will guarantee to be initialized by python-mode when the first py
buffer is visited.

(py-default-interpreter): Update docstring.
1999-07-28 21:59:43 +00:00
Barry Warsaw ddc469679b (py-beginning-of-def-or-class): Only move to match-beginning if the
regex match actually succeeded!
1999-07-27 21:40:02 +00:00
Barry Warsaw c0d2d51dd2 (py-statement-closes-block-p): py-goto-initial-line could leave us in
the line's whitespace.  back-to-indentation should /follow/ this call.
1999-06-03 22:18:59 +00:00
Barry Warsaw fa2def2a61 (py-electric-backspace): I'm not sure this function should be special
casing when py-honor-comment-indentation is nil, but this could be a
religious issue with some.  Seems to me we should still be dedenting
such comment lines one level.
1999-05-24 21:43:37 +00:00
Barry Warsaw 53db859408 (py-parse-state): When running under Emacs -- which doesn't have
buffer-syntactic-context -- just short circuit the TQS test by jumping
to point-min and doing the test from there.  For long files, this will
be faster than looping with a re-search-backwards.
1999-05-24 19:57:32 +00:00
Barry Warsaw a8f99ba2d2 (py-statement-closes-block-p): Add a py-goto-initial-line which fixes
indentation when the return value is a multiline sexp:

def bug():
    try:
        if 2>1:
            return (11+
                    12)

        else:   #XXX
            return 12
    except:
        return 13
1999-05-24 18:37:57 +00:00
Guido van Rossum b65a43a970 News for 1.5.2 (final). 1999-04-13 15:52:45 +00:00
Guido van Rossum 8f9fabd360 More (Cameron Laird is honorary; the others are 1.5.2c1 testers). 1999-04-13 14:32:42 +00:00
Guido van Rossum 7cf904736e Bunch of new names who helped iron out the last wrinkles of 1.5.2. 1999-04-13 14:25:52 +00:00
Guido van Rossum 913a32632f Correct missed character in Andrew Dalke's name. 1999-04-10 17:17:51 +00:00
Guido van Rossum 437cfe842f News for the 1.5.2c1 release. 1999-04-08 20:17:57 +00:00
Guido van Rossum 1e7b0acb4d Removing an unused image of a snake.
I don't know what its origins are but I think I've seen it
once in a NeXT dictionary application -- not sure whether
anyone owns copyright but I don't see why we should risk it.
1999-04-07 17:23:09 +00:00
Guido van Rossum ae14230069 Bunch of new contributors, including 9 who contributed to the Docs,
reported by Fred.
1999-04-05 21:18:12 +00:00
Fred Drake 0df2188d08 Typo: "apparentlt" --> "apparently" 1999-02-22 15:38:58 +00:00
Guido van Rossum 74608e6a05 New in 1.5.2b2. 1999-02-18 16:02:20 +00:00
Guido van Rossum 8a06aea269 Couple of new names. 1999-02-18 16:01:43 +00:00
Barry Warsaw 3b4e2f0b87 (py-shell): Added optional argprompt, which will prompt for additional
switches to pass into the shell process (only on initial startup).
1999-02-16 23:52:46 +00:00
Barry Warsaw aa384fd616 (py-default-interpreter): New variable which selects whether CPython
or JPython is the default interpreter to use when `C-c !' is entered
for the first time.
1999-02-16 23:36:16 +00:00
Guido van Rossum 71ddcd87e2 Finn Bock. 1999-02-16 21:30:18 +00:00
Guido van Rossum c54367a2f0 Uwe Zessin. 1999-02-08 22:29:40 +00:00
Guido van Rossum 3e0d319196 The usual. 1999-01-25 21:57:29 +00:00
Barry Warsaw f19feb8fb5 (py-mode-map): Add back force of RET (aka C-m) to
py-newline-and-indent.
1999-01-21 17:06:11 +00:00
Barry Warsaw cb5540e72a (py-mode-map): Removed special bindings for C-m and C-j to
py-newline-and-indent.  These ought to get picked up by the mapcar
that follows; any existing binding to newline-and-indent gets shadowed
to py-newline-and-indent.

This will break some people who, e.g. bind C-m or C-j to newline but
still want these bound to py-newline-and-indent in Python mode.  On
the other hand, the forced binding pisses off Emacs diehards.  So
consider this experimental and see if any tall Dutch guys complain :-)
1999-01-19 13:26:56 +00:00
Barry Warsaw f8ddb6afa0 (py-narrow-to-defun): New command (bound to C-x n d) which mimics the
standard narrow-to-defun but works with Python classes and methods.
With no arg, narrows to most enclosing def/method.  With C-u arg,
narrows to most enclosing class.
1999-01-18 21:49:39 +00:00
Barry Warsaw 1d7b0fa9ca (py-electric-delete): Implement the XEmacs 21 blessed way of checking
for delete forwardness.
1999-01-15 02:12:31 +00:00
Barry Warsaw 1a1c6bbf8c (py-outdent-p): Short circuit infloop for illegal construct
(e.g. except: on first line of buffer).
1999-01-09 17:22:38 +00:00
Guido van Rossum de8b026148 Added shlex and netrc modules; added warning about urllib change
affecting subclasses (which Jeremy just found out).
1998-12-22 16:41:09 +00:00
Guido van Rossum e96bd3f60f News for 1.5.2b1. Moved news before 1.5.1 to HISTORY. 1998-12-21 21:45:04 +00:00
Guido van Rossum 9818d0f06a New names. Keep those contributions coming! 1998-12-21 21:42:22 +00:00
Guido van Rossum 439d1fa8b0 Moved history up to and including 1.5.1 here. 1998-12-21 21:41:14 +00:00
Barry Warsaw 9c1696cff5 (py-goto-beginning-of-tqs): Finds the beginning of the triple quoted
string we find ourselves in, based on the passed in delimiter.

(py-compute-indentation): Fixes for indentation errors when we land
inside a triple quoted string.  For example:

def foo():
   if os.path.isfile(o_pri_mbox_file) and os.path.isfile(o_pub_mbox_file):
       print """\
I found both a private and a public mbox archive file
    private: %s
    public : %s

I won't move either file, but you should choose one and move it to

    %s

You may want to merge them manually, but be careful about exposing private
correspondences to the public.""" % (
    o_pri_mbox_file, o_pub_mbox_file, mbox_file)
*----indentation would be wrong on this line.
1998-12-15 04:36:22 +00:00
Guido van Rossum 9819e4c5cf Sjoerd Mullender writes:
The example Makefile.pre.in should also look at Setup.thread and
Setup.local.  Otherwise modules such as thread don't get incorporated
in extensions.
1998-12-09 17:05:33 +00:00
Barry Warsaw 34d8317013 (py-execute-region): Hack around the different behavior and switch
semantics between CPython/JPython when the script source is piped to
stdin.
1998-11-20 03:04:07 +00:00
Barry Warsaw 014e0e29b1 (py-execute-region): Patch by Hunter Kelly so that execution uses the
correct Python shell (CPython or JPython).
1998-11-17 19:24:47 +00:00
Barry Warsaw 1d5f988457 (py-imenu-method-regexp): Fix suggested by Daniel Calvelo to
generalize the matching of function arguments.
1998-10-28 04:08:13 +00:00
Barry Warsaw 6839d3af10 #XEmacs 21 now supports Imenu, so I am able to test (and fix) some
#simple things.  First step: rename the Imenu supportive variables and
#functions in this file to py-imenu-* so I can grok what is part of
#python-mode and what is part of Imenu.

(py-imenu-create-index-engine): Fixed problem with two classes in a
single file, caused by new semantics of py-beginning-of-def-or-class
when called programmatically.

#Note, there are still some problems with Imenu when arguments to
#functions are funky, but it should be much better now.
1998-10-28 00:10:45 +00:00
Barry Warsaw 38e21e75ad #Some minor changes in the commentary, obstensibly to test the new
#checkin script.
1998-10-27 22:09:25 +00:00
Barry Warsaw 1bbc031999 #Fixed some typos in docstrings. 1998-10-27 21:54:56 +00:00
Guido van Rossum e8c10f90a7 All the news that's fit to print. In other words, it's 1.5.2a2 time. 1998-10-17 19:43:13 +00:00
Guido van Rossum fdb8fb8b31 A few new ones... 1998-10-02 01:21:40 +00:00
Barry Warsaw 4f94c73879 (py-comint-output-filter-function): Horrible kludgearound for making
the de-queing of exec files work for NT XEmacs 21.0.
1998-09-25 19:40:10 +00:00
Barry Warsaw d35c255e44 (py-guess-indent-offset): Only print message about py-indent-offset
when in an interactive session (suggested by B. Wiener).
1998-09-25 00:08:38 +00:00
Barry Warsaw 02e5f69c90 (py-execute-file, py-execute-import-or-reload): Use a Python `raw'
string in the argument to execfile() so a Windows temp directory
named, e.g. c:\\tmp doesn't get interpreted as a file name with an
embedded tab!  (given by C. Waldman).
1998-09-24 23:48:40 +00:00
Barry Warsaw 218eb75ba7 (py-block-comment-prefix): Remove trailing space. Also explain that
this string should not end with whitespace.

(py-compute-indentation): Append whitespace regexp to
py-block-comment-prefix so that any combination of intervening
whitespace will be recognized.
1998-09-22 19:51:47 +00:00
Barry Warsaw bc3760b09d #Code rearranging to quiet byte-compiler 1998-09-14 16:16:18 +00:00
Jeremy Hylton faff0bdcba correct bogus instructions 'ccoment out' -> 'uncomment' 1998-09-10 20:18:09 +00:00
Guido van Rossum 106a470da2 Fixed the words in the comment and error message about defining FULL_PATH.
(It's not SCRIPTPATH!)
1998-09-10 18:22:18 +00:00
Jeremy Hylton 1deebabc77 include <string.h> to get prototype for strcmp
change error messages to be a little more straightforward

change definition of FULL_PATH so that an error is raised if the
setuid wrapper is used un-edited
1998-09-10 18:10:59 +00:00
Barry Warsaw 4d1874093f (py-in-literal): How'd this get through? c-point => py-point 1998-08-29 06:32:31 +00:00
Barry Warsaw f7039e29ec Update commentary. For most stuff, point people to the web page 1998-08-20 22:10:46 +00:00
Barry Warsaw 6dfbe5dcec (py-shell-map): New variable contains the keymap used in *Python*
shell buffers.

(py-shell): Moved the require of comint to the top level.  Also
use-local-map py-shell-map instead of hacking on the comint-mode-map.
This eliminates breakage of other comint-mode buffers (e.g. shell).
1998-08-20 21:51:27 +00:00
Barry Warsaw a81fb33c6b (py-shell): comint-output-filter-functions is already buffer-local 1998-08-20 20:00:53 +00:00
Barry Warsaw 3c96f6f361 (py-process-filter): Deleted this function. In order to fix
interactions with newer Emacsen, I've rewritten the way all the
process filters work in the *Python* buffer.  We use more of the
comint infrastructure, specifically the default process filter.  This
means that scrolling is now handled by the default comint variables
including comint-scroll-to-bottom-on-output.  Note that this is
somewhat experimental change!

(py-comint-output-filter-function): Moved to here from the obsolete
py-process-filter function, the logic to pop and exec the next queued
file waiting to be executed.

(py-execute-file): Don't bind comint-scroll-to-bottom-on-output to t,
and save the excursion when inserting the "working on" message.  This
lets the standard comint scrolling variables as set by the user,
continue to work.

(python-mode, py-shell, py-describe-mode): Remove description of
py-scroll-process-buffer.  Also in py-shell, make
comint-output-filter-functions buffer-local, and add
py-comint-output-filter-function to this hook (instead of setting the
process filter).

(py-scroll-process-buffer): Deleted this variable.  See comint
variables including comint-scroll-to-bottom-on-output.

(py-execute-region): When exec files are being queued, push the next
temp file on the end of the list.

(py-submit-bug-report): Removed reporting of py-scroll-process-buffer.
1998-08-20 19:44:51 +00:00
Barry Warsaw 93c88cca06 (imenu-example--create-python-index-engine): Fix nesting breakage when
a method definition has args that span multiple lines; be sure to go
to the beginning of the method definition -- but watch out for the
match-data!
1998-08-18 02:00:44 +00:00
Guido van Rossum 0ceaada2da New contributor. 1998-08-11 19:23:31 +00:00
Guido van Rossum 27b3bc3fbf Reordered the news to make it more accessible. Also removed some dups. 1998-08-11 18:42:26 +00:00
Guido van Rossum ab9d6f0be9 Got all the 1.5.2 news that's fit to print. Now we may need to
organize it better...
1998-08-10 22:01:13 +00:00
Barry Warsaw 650e8a6db2 (imenu-example--python-method-regexp): Patch from Christian Tanzer:
"3.67 fixes Imenu as far as classes are concerned, but some default
values for function arguments are still not supported."

This ought to fix that problem.
1998-08-10 21:46:24 +00:00
Barry Warsaw 12c9294ea3 (py-compute-indentation): Changes to the `t' condition which affect
indetnation of normal statements: The regular expression that searches
for indenting comment lines has been changed to not require a
space/tab after the first `#'.  We then explicitly look for
py-block-comment-prefix depending on the value of
py-honor-comment-indentation.

I think this more accurately reflects the documentation for
py-honor-comment-indentation.
1998-08-10 21:44:37 +00:00
Guido van Rossum 20392ccb87 # mention Porting in list of files 1998-08-10 16:38:58 +00:00
Guido van Rossum 6ca3defcfa mini-faq on porting python 1998-08-10 16:36:48 +00:00
Barry Warsaw 71c3adb7ec #Typos from previous checkin 1998-08-10 16:34:33 +00:00
Barry Warsaw 41a05c75d4 Huge number of docstring changes, typo fixes, rewordings, GNU standard
conformations, etc., etc. inspired and given by Michael Ernst.  These
include error string fixes, moving of comments to docstrings, some
other non-related typos, terminology standardizing (b/w TP and myself,
and b/w myself and myself :-) although more can still be done.
E.g. "outdenting" => "dedenting".
1998-08-10 16:33:12 +00:00
Barry Warsaw 1b3442493a (py-execute-region): When temp-names are broken (Emacs 19.34), a
serial number isn't enough to uniquify the temp file name -- what if
two users are on the same machine?  Add in the (emacs-pid) to help
further.  Should never be tickled on Emacs 20, XEmacs 20, 21.
1998-08-07 22:24:16 +00:00
Guido van Rossum f5475c95a7 Checkpointing news for 1.5.2a1... (Not all done.) 1998-08-06 17:55:46 +00:00
Guido van Rossum a690394cae New meat. 1998-08-04 22:59:26 +00:00
Guido van Rossum fc8f5d1a7f typo (pwill -> will). 1998-08-04 22:58:51 +00:00
Barry Warsaw 7c29b2328b (py-beginning-of-def-or-class, py-end-of-def-or-class,
py-mark-def-or-class): Integrated Michael Ernst latest patches.
Primarily, it allows functions that search or mark defs/classes based
on programmatic specification, to take an 'either flag value which
allows searching for both classes and defs (stopping at the nearest
construct).

Also clean up some docstrings.
1998-07-07 17:45:38 +00:00
Barry Warsaw 003932a508 (py-comment-indent-function): A replacement for
comment-indent-function's default lambda value (in simple.el), this
version finally kills this nit: auto-filling a comment that starts in
column zero with filladapt turned off would cascade the #'s to the
right.

Now auto-filling seems to work with or without filladapt, and with the
comment starting in any column.

(python-mode): Set comment-indent-function.
1998-07-07 15:11:24 +00:00
Guido van Rossum 0b3b43ca6f New blood. 1998-06-30 17:02:57 +00:00
Guido van Rossum 795a4bc666 Added a line to process SGI_ABI. 1998-06-08 21:22:12 +00:00
Guido van Rossum 750c8cee7e Add LDLAST to the list of variables processed by the sed script. 1998-05-20 15:53:22 +00:00
Barry Warsaw 3bfed5b6b1 (py-ask-about-save): New variable used in
py-execute-import-or-reload.  Same semantics as
compilation-ask-about-save.
1998-05-19 16:25:04 +00:00
Barry Warsaw 1d0364b2dc (py-execute-string): Bind to C-c C-s, and put on menu 1998-05-19 16:15:26 +00:00
Barry Warsaw 751f4931d8 (py-stringlit-re): Another ME patch to recognize SQTQs and DQTQs
(single and double quoted triple quoted strings :-) with embedded
single like-quotes.  Also recognizes raw prefix.
1998-05-19 16:06:21 +00:00
Barry Warsaw 820273d6d1 More ME patches:
(py-execute-import-or-reload): Cool new command that imports or
reloads the current file as a module, so as not to clutter the global
namespace.  Bound to C-c C-m.

(py-execute-def-or-class): New command that sends the current def or
class to the interpreter.  Bound to C-M-x.

(py-execute-string): New command that sends arbitrary string to the
interpreter.  Not bound by default.

(py-describe-mode): Doco updates.
1998-05-19 15:54:45 +00:00
Barry Warsaw ab0e86cbcc (beginning-of-python-def-or-class): Renamed to
py-beginning-of-def-or-class, and defaliased for backwards
compatibility.  ME patch to add optional second argument, count.

(end-of-python-def-or-class): Renamed to py-end-of-def-or-class, and
defaliased for backwards compatibility.  ME patch to add optional
second argument, count.
1998-05-19 15:31:46 +00:00
Barry Warsaw ebc7b7ac45 More ME patches:
(py-shell): Recognize the Python debugger prompt

(py-jump-to-exception): Force into python-mode any buffer that gets
jumped to on exception.  Cope with py-exception-buffer possibly a
cons.
1998-05-19 15:01:06 +00:00
Barry Warsaw 145ab1ce9d #Documentation and comment typos patch given by Michael Ernst. More
#of his patches to follow.
1998-05-19 14:49:49 +00:00
Guido van Rossum cc8e1a4ed7 Add some help for AIX. (Konrad Hinsen) 1998-04-30 13:34:12 +00:00
Barry Warsaw 77d1fce2f6 (py-compute-indentation): Use forward-comment to skip over all
whitespace and comment noise.
1998-04-16 20:04:59 +00:00
Guido van Rossum 974f295dd4 Some more new stuff. 1998-04-13 21:00:54 +00:00
Guido van Rossum 9238f23c50 Two more, for beta testers who reported real bugs. 1998-04-13 18:14:22 +00:00
Guido van Rossum c45cf02938 Added changes from 1.5 to 1.5.1.
The sections are now in a more useful order: the most recent changes
are listed first.
1998-04-10 20:06:21 +00:00
Guido van Rossum 07c44c7ad5 Document -x too. 1998-04-10 19:46:00 +00:00
Guido van Rossum 29d465bef7 Document -t flag. 1998-04-10 19:36:09 +00:00
Guido van Rossum 13aa5cedcb Jeff Epler 1998-04-10 19:18:03 +00:00
Barry Warsaw ea609c18a0 (py-toggle-shells): Added a message in the minibuf. 1998-04-10 16:08:26 +00:00
Barry Warsaw a239880a22 Quick and extremely dirty hacks to toggle between using CPython and
JPython interpreters.  This implementation may suck.

(py-jpython-command, py-jpython-command-args): New variables.

(py-mode-map): py-toggle-shells bound to C-c C-t

(py-toggle-shells): Command to toggle between using CPython (the
default) and JPython.  This is buffer local, and notice the mode-name
change.

(py-shell): Use either CPython or JPython.  Note that py-execute-*
still needs to be modified.
1998-04-09 23:28:20 +00:00
Guido van Rossum e2bb8bb90d Tons of new names... 1998-04-09 21:01:06 +00:00
Barry Warsaw 3179fe03ca (imenu-example--python-class-regexp): Fix to recognize Module.Class in
inheritance list.
1998-04-04 21:36:53 +00:00
Barry Warsaw 5204b4a984 #Oops, I lost the CVS/RCS $Revision$ 1998-04-02 19:27:18 +00:00
Barry Warsaw 92166d9a75 (py-compute-indentation): When looking at a continuation line inside
an open paren, do a better job of reindenting the line.  For example:

def foo():
    print 'hello %s, %d' % (
    a, b)

Hit TAB on the line starting with `a'.  Without this patch this line
will never be reindented.
1998-04-01 21:59:41 +00:00
Barry Warsaw 585f733b39 Two patches for Emacs 20.2 compatibility:
(py-compute-indentation): int-to-char isn't defined in Emacs, but we
don't really need it anyway, so just remove this conversion.  XEmacs
is happy either way.

(py-parse-state): The Emacs branch (i.e. w/o buffer-syntactic-context)
wasn't adjusting point correctly.
1998-04-01 21:13:51 +00:00
Barry Warsaw f9b99f4375 (py-postprocess-output-buffer): Return t if an exception was found,
otherwise return nil.

(py-execute-region): When executing the buffer asynchronously in a
subprocess, if an exception occurred, show both the output buffer and
the file containing the exception, leaving point on the source line
containing bottom-most error in the traceback.  If no exception
occurred, jump to the output buffer (no change).
1998-03-26 16:08:59 +00:00
Barry Warsaw 512af04b35 (py-execute-region): Watch out for shell-command-on-region killing a
zero sized output buffer.
1998-03-25 23:27:17 +00:00
Barry Warsaw beef9e73c3 Removed all the mixed indentation face stuff. It's not as helpful as
it at first seems.  I think we've got a good idea of what to do, but
it'll be a bit of work... for later.
1998-03-20 17:06:11 +00:00
Barry Warsaw 8ca702823d (py-tab-face): => py-mixed-indentation-face
(python-font-lock-keywords): Better regexp given by Sjoerd.  This
matches only mixed indentation which is probably more useful than
matching all tabs.
1998-03-20 14:48:30 +00:00