Commit Graph

20043 Commits

Author SHA1 Message Date
Raymond Hettinger 9ce9f77983 Improve tutorial suggestion for looping techniques 2015-09-01 02:20:44 -07:00
Martin Panter 6a31bb5cac Issue #24952: Clarify default argument of stack_size() in threading, thread
Patch from Mattip.
2015-08-31 03:40:59 +00:00
Raymond Hettinger fe2f2876ce Make an example a little clearer 2015-08-30 14:48:42 -07:00
Zachary Ware e0c8e26294 Issue #24962: Remove space from filename 2015-08-29 22:25:04 -05:00
R David Murray f79aa5870f #24926: Fix typo in example. 2015-08-24 12:50:50 -04:00
Robert Collins d951625f81 Merge 2.7 heads. 2015-08-24 12:10:23 +12:00
Robert Collins 11ac1a8239 Issue #22812: Fix unittest discovery examples.
Patch from Pam McA'Nulty.
2015-08-24 12:06:18 +12:00
Ned Deily c9a5a19e81 Issue #24079: Improve description of the text and tail attributes for
ElementTree Element objects.  Initial patch by Martin Panter.
2015-08-17 22:10:47 -04:00
Robert Collins 311c8d63e5 Issue #24531: Document that encoding lines cannot follow non-comment lines.
Patch from Terry Reedy
2015-08-06 21:08:44 +12:00
Robert Collins 937f2f70f5 Issue #20769: Improve reload() docs. Patch by Dorian Pula. 2015-08-05 08:16:41 +12:00
Terry Jan Reedy fa002d4cdd Issue #13884: Idle: Remove tearoff lines from menus. Patch by Roger Serwy. 2015-07-30 16:44:09 -04:00
Berker Peksag ffc7e8eebe Issue #12160: Fix incorrect StreamCodec references in Codec.encode() and Codec.decode() docs.
It should StreamWriter for Codecs.encode() and StreamReader for Codec.decode().

Patch by Nick Weinhold.
2015-07-30 23:27:13 +03:00
Robert Collins f524799a65 Issue #23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan. 2015-07-30 06:14:32 +12:00
Robert Collins 2f2c829688 Issue #23254: Document how to close the TCPServer listening socket.
Patch from Martin Panter.
2015-07-29 12:48:42 +12:00
Benjamin Peterson cdbe6fc23b we don't care about python 1.5.2 2015-07-21 23:17:16 -07:00
Zachary Ware c6fe4dbea5 Issue #24680: Remove random backslash. Patch by cdz. 2015-07-21 22:33:16 -05:00
Benjamin Peterson 26040e87d1 'not' is very important here 2015-07-06 11:28:07 -05:00
Benjamin Peterson 678e7a9080 tighten warning 2015-07-06 09:40:43 -05:00
Zachary Ware e6f87fcfa1 Update Docs/tools/susp-ignored.csv 2015-07-06 00:08:15 -05:00
Ned Deily b2f949aafb Issue #24330: Update IDLE doc and help to note "Configure IDLE" difference
on OS X.  Original patch by André Freitas.
2015-07-04 15:04:42 -07:00
R David Murray 3995421228 #24548: replace dead link with pointer to archive.org. 2015-07-04 15:50:30 -04:00
Terry Jan Reedy e079936241 Issue #24525: Add missing word. Patch by Vincent Legoll. 2015-07-03 19:10:14 -04:00
Berker Peksag 1ecb5ce707 Issue #24496: Backport gzip examples to Python 2.
gzip.open() supports context management protocol in Python 2, so it's better to
use it in the examples section.

Patch by Jakub Kadlčík.
2015-06-25 23:57:42 +03:00
Berker Peksag 6750c8b803 Issue #23684: Clarify the return value of the scheme attribute of ParseResult and SplitResult objects.
Patch by Martin Panter.
2015-06-25 23:47:43 +03:00
Serhiy Storchaka 1670af6c33 Added the const qualifier for char* argument of Py_EnterRecursiveCall(). 2015-06-21 16:26:28 +03:00
Berker Peksag 0e8af341fa Issue #24443: Fix links for Event.clear() and Event.wait() methods.
Patch by Jaivish Kothari.
2015-06-13 11:05:31 +03:00
Terry Jan Reedy 039573dc17 whitespace 2015-06-12 16:47:03 -04:00
Terry Jan Reedy f4ae91382a Issue #24406: Add sentences on dict comparisons, similar to those for Sequence
and set comparisions.  Patch by Gareth Rees.
2015-06-12 16:38:51 -04:00
Benjamin Peterson 822be2ec32 that this is "for Python" is obvious 2015-06-05 21:03:08 -05:00
Ned Deily 43a98df147 Issue #24357: use example.org instead 2015-06-01 21:17:14 -07:00
Ned Deily 14c9ea6e8e Issue #24357: Change host in socket.getaddrinfo example to one that
does support IPv6 and IPv4; www.python.org currently does not.
2015-06-01 18:45:49 -07:00
Benjamin Peterson 78ba242403 update for 3.6 emerging 2015-05-27 18:32:25 -05:00
Ned Deily ad73b5ad58 Issue 24304: Fix broken license link in FAQ. 2015-05-27 15:36:39 -07:00
Terry Jan Reedy 13ab3a46ae Make expression legal python by adding '1'. 2015-05-23 16:16:23 -04:00
Terry Jan Reedy 84924e6e92 Issue #22155: Add File Handlers subsection with createfilehandler to Tkinter
doc.  Remove obsolete example from FAQ.  Patch by Martin Panter.
2015-05-17 14:49:20 -04:00
Andrew Kuchling c711b61ad4 #19934: fix mangled wording 2015-05-13 11:25:40 -04:00
Raymond Hettinger bd04919014 Issue #19934: Document *None* as an acceptable input to Counter.most_common([n]) 2015-05-13 02:50:57 -07:00
Benjamin Peterson b9b0a580f2 use imperative 2015-05-12 19:15:53 -04:00
Raymond Hettinger 632d692e29 Issue #24161: Document that PyIter_Check() returns false positives for old-style instances. 2015-05-11 10:22:20 -07:00
Benjamin Peterson 69af580131 update example, since python.org is HTTPS-only now (closes #24118) 2015-05-03 13:00:21 -04:00
R David Murray 10324f88a8 #24108: Update fnmatch.translate example to show correct output.
Patch by Merlijn van Deen.
2015-05-02 15:09:22 -04:00
R David Murray 11d041a045 #24081: Remove obsolete caveat from import docs.
Per Eric Snow's research, this changed in Python 2.4 in changeset 331e60d8ce,
but these docs were not updated.
2015-05-02 15:02:30 -04:00
Vinay Sajip 68099ae7e0 Issue #24060: Made logging.Formatter documentation a little clearer. 2015-05-02 09:42:24 +01:00
Berker Peksag 31200ff81b Issue #23356: Simplify convert_arg_line_to_args example.
Patch by py.user.
2015-04-26 12:12:45 +03:00
Benjamin Peterson cf0d31c8ba fix relative link (closes #24057) 2015-04-25 14:15:16 -04:00
Benjamin Peterson 2c6ca8adb3 recommend requests library (closes #23989)
Patch by Van Lindberg.
2015-04-20 18:20:27 -04:00
Vinay Sajip 1b4aa45441 Issue #23536: Clarified scope of fileConfig()'s API. 2015-04-18 13:05:19 +01:00
Charles-François Natali 6d12c80c91 Fix PyGILState_GetThisThreadState() prototype in the API documentation. 2015-04-15 19:30:38 +01:00
Zachary Ware e093f11f4b Issue #23730: Document the return value of ZipFile.extract
Patch by Stéphane Wirtel.
2015-04-13 16:40:49 -05:00
Zachary Ware b9298a4fbb Issue #17202: Add .bat to .hgeol to force them to CRLF.
Using LF can a script to fail if it tries to use a label that is
split across 512 byte blocks.  Who knows why.
2015-04-13 11:54:11 -05:00
Benjamin Peterson 721c86ef36 use imperative 2015-04-11 07:42:42 -04:00
Benjamin Peterson af80ce3f82 highlight is now highlighted (closes #23909) 2015-04-10 18:40:21 -04:00
Berker Peksag 928b3fff8a Issue #23400: Add notes about the sem_open support of the host OS to
"Pipes and Queues" and "Synchronization between processes" subsections.

Patch by Davin Potts.
2015-04-08 18:12:53 +03:00
Benjamin Peterson ce29e87e6f actually ssl3 is just completely broken 2015-04-08 11:11:00 -04:00
Raymond Hettinger 2baaba8a95 Issue #23729: Improve docs for ElementTree namespace parsing 2015-03-30 20:46:54 -07:00
Ezio Melotti 1afb9da747 #23512: list non-essential built-in functions after the table. Patch by Carlo Beccarini. 2015-03-24 13:44:58 +02:00
Ezio Melotti bc1fda39ae #11468: improve unittest basic example. Initial patch by Florian Preinstorfer. 2015-03-24 12:42:41 +02:00
Raymond Hettinger 510a6e9247 Issue 23729: Document ElementTree namespace handling and fix an omission in the XPATH predicate table. 2015-03-22 15:31:28 -07:00
R David Murray b4b000f002 #23539: Set Content-Length to 0 for PUT, POST, and PATCH if body is None.
Some http servers will reject PUT, POST, and PATCH requests if they
do not have a Content-Length header.

Patch by James Rutherford.
2015-03-22 15:15:44 -04:00
Benjamin Peterson 29368584d2 clarify behavior of shutil.move when destination exists (closes #22933)
Patch by Mike Short.
2015-03-22 10:11:54 -04:00
Benjamin Peterson 5151838132 versionchanged for rc4 removal (closes #23679) 2015-03-16 12:43:38 -05:00
Eli Bendersky 9872ad46d5 Issue #23549: Clarify confusion in heapq doc - accessing the mininmal element
The current documentation only mentions heap[0] as the smallest element in the
beginning, and not in any of the methods' docs. There's no method to access the
minimal element without popping it, and the documentation of nsmallest is
confusing because it may suggest that min() is the way to go for n==1.
default
2015-03-14 20:20:36 -07:00
Serhiy Storchaka 251aede2f2 Fix minor docs markup errors. 2015-03-14 21:32:41 +02:00
Benjamin Peterson dbbc07c2ec the default is sys.maxsize not sys.maxint (closes #23645) 2015-03-13 14:32:31 -05:00
Ned Deily 0acf4ad786 Issue #23617: Correct plurals typo noted by Kentrell Johnson. 2015-03-09 01:54:25 -07:00
Benjamin Peterson 81bec811b3 replace Amazon links in the documentation (closes #23579)
Patch by Sayan Chowdhury.
2015-03-07 09:34:16 -05:00
Benjamin Peterson 72ef961059 expose X509_V_FLAG_TRUSTED_FIRST 2015-03-04 22:49:41 -05:00
Benjamin Peterson b198ad9a3c wrap everything at 80 chars 2015-03-02 09:34:31 -05:00
Ned Deily 0e4da40e58 Issue #23499: Fix grammar error noticed by SilentGhost 2015-02-22 16:08:23 -08:00
Serhiy Storchaka 4809d1fccd Issues #814253, #9179: Warnings now are raised when group references and
conditional group references are used in lookbehind assertions in regular
expressions.
2015-02-21 12:08:36 +02:00
Zachary Ware bbdad5442b Fix typo pointed out on docs@ by Yaniv Sayeh 2015-02-19 22:28:36 -06:00
Ned Deily e0944c94e0 Fix missing :ref: for idle in doc build. 2015-02-06 15:41:27 +11:00
Benjamin Peterson ad5ddf79c3 remove parenthesis from print statement (closes #23396) 2015-02-04 22:06:55 -05:00
Stefan Krah 1c9bf63a15 Preserve critical whitespace in Doc/*. 2015-02-01 19:49:38 +01:00
Stefan Krah 3f1ef5b756 Issue #23352: Document that Py_buffer.suboffsets must be NULL if no suboffsets
are required.
2015-02-01 19:40:50 +01:00
Vinay Sajip caaaa1413a Added a cookbook entry on logging audible messages. 2015-02-01 15:14:03 +00:00
Vinay Sajip 9e74fc3ee2 Added a logging cookbook entry on customized exception formatting. 2015-01-28 07:29:13 +00:00
Serhiy Storchaka c328d11ef1 Issue #14099: Backout changeset c2c4cde55f6f (except adapted tests). 2015-01-26 13:45:04 +02:00
R David Murray 9a6d32e78c #23251: Reflow paragraph. 2015-01-25 15:48:47 -05:00
R David Murray f8fe12a5a6 #23251: note that time.sleep affects the current thread only.
This is parallel to the language used in the unix man page.
2015-01-25 15:48:26 -05:00
Benjamin Peterson aa7075845c prefer server alpn ordering over the client's 2015-01-23 17:30:26 -05:00
Benjamin Peterson 65aa261eba fix versionchanged 2015-01-23 16:47:52 -05:00
Benjamin Peterson b10bfbe036 pep 466 backport of alpn (#20188) 2015-01-23 16:35:37 -05:00
Vinay Sajip 5e3b2dfef4 Issue #23305: clarified RotatingFileHandler documentation. 2015-01-23 21:18:02 +00:00
Berker Peksag 1b6e5381c3 Issue #22317: Document the action parameter in ArgumentParser.add_subparsers() docs.
Patch by Mike Short.
2015-01-20 06:55:51 +02:00
Serhiy Storchaka e8c9e14af9 Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:42:50 +02:00
Ned Deily b5daa3d6db Issue #23180: Rename IDLE "Windows" menu item to "Window".
Patch by Al Sweigart.
2015-01-17 21:03:41 -08:00
Georg Brandl 7ff0360223 Closes #23244: fix typo. Thanks Mayank Tripathi for the patch. 2015-01-15 08:16:01 +01:00
Ethan Furman 3700cc3ad6 Issue20467: clarify __init__'s role 2015-01-14 22:02:10 -08:00
Georg Brandl a44ec3ff4c Closes #23181: codepoint -> code point 2015-01-14 08:26:30 +01:00
Benjamin Peterson 07f90476b9 fix instances of consecutive articles (closes #23221)
Patch by Karan Goel.
2015-01-13 09:17:24 -05:00
Antoine Pitrou a8efb6b080 Issue #22952: improve multiprocessing doc introduction and defer notes until appropriate.
Patch by Davin Potts.
2015-01-11 15:09:27 +01:00
Mark Dickinson a024f80a71 Issue #21902: Replace incorrect 'hyperbolic arc sine' (etc.) with 'inverse hyperbolic sine' (etc.). Remove meaningless reference to radians. 2015-01-11 13:03:06 +00:00
Berker Peksag 96556a7b1f Silence a Sphinx warning in ftplib.rst.
ftplib.rst:61: WARNING: Block quote ends without a blank line; unexpect
ed unindent.
2015-01-06 18:36:02 +02:00
Berker Peksag 80154584a6 Fix a markup error in the argparse documentation.
Reported by Jason Sachs on docs@.
2015-01-06 18:29:04 +02:00
Victor Stinner 7c90667f74 Issue #21356: Make ssl.RAND_egd() optional to support LibreSSL. The
availability of the function is checked during the compilation. Patch written
by Bernard Spil.
2015-01-06 13:53:37 +01:00
Vinay Sajip 6fcb9a5152 Clarified documentation for logging exception function/method. 2015-01-06 11:10:12 +00:00
Benjamin Peterson 0258c5de8b emphasize that cffi is better than extension modules for portability 2015-01-05 14:38:46 -06:00
Benjamin Peterson 7b4b28469b allow a SSLContext to be given to ftplib.FTP_TLS 2015-01-04 15:36:31 -06:00
Benjamin Peterson 9fe67ceebf make SSLv23 the default version in ftplib (closes #23111) 2015-01-04 10:20:16 -06:00
Ned Deily b09ec90e9b Add missing URL link to Modernize docs. 2015-01-03 00:45:25 -08:00
Benjamin Peterson dd87637d04 update for copyright for 2015 2014-12-31 18:09:36 -06:00
Berker Peksag 87d415fa5c Issue #23125: Update nose project page link.
Reported by Damien Marié.
2014-12-28 18:51:25 +02:00
Benjamin Peterson cb36d247a7 improve incorrect French (#23109)
Following suggestions from Clément.
2014-12-24 13:58:05 -06:00
Berker Peksag d4f5c1436b Issue #23070: Fix a comment in the tutorial.
"Python" has 6 characters, not 7.

Reported by Ross Burnett.
2014-12-17 14:59:33 +02:00
Berker Peksag 0bf02c8df4 Issue #23047: Fix typo in pyporting.rst.
Patch by Chaitanya agrawal.
2014-12-13 15:51:18 +02:00
Brett Cannon fcf094c950 Backport of porting HOWTO 2014-12-12 15:15:49 -05:00
Benjamin Peterson df611a97f0 remove reference to dead irc channel (closes #23038) 2014-12-12 09:56:33 -05:00
Raymond Hettinger e4efc3d913 Issue 23005: Fix typos 2014-12-11 23:55:54 -08:00
Terry Jan Reedy f0f09b9470 Issue #23006: Improve the documentation and indexing of dict.__missing__.
Add an entry in the language datamodel special methods section.
Revise and index its discussion in the stdtypes mapping/dict section.
Backport the code example from 3.4.
2014-12-10 18:38:07 -05:00
Benjamin Peterson 402bd79817 fix path to patchlevel.py 2014-12-10 11:04:17 -05:00
Ned Deily 62a8660267 Issue #17128: Use private version of OpenSSL for 2.7.9 OS X 10.5+ installer.
Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot
verify newer SHA-256 certs as now used by python.org services.  Document
in the installer ReadMe some of the certificate management issues that
users now need to be more concerned with due to PEP 476's enabling cert
verification by default.  For now, continue to use the Apple-supplied
0.9.8 libs for the 10.6+ installer since they use Apple private APIs to
verify certificates using the system- and user-managed CA keychain stores.
2014-12-09 23:45:13 -08:00
Berker Peksag 3e1c8237e8 Issue #12602: Add missing cross-references to runpy and using/cmdline docs.
Patch by Éric Araujo.
2014-12-10 02:07:08 +02:00
Benjamin Peterson a50afa386c Merge 2.7.9 release branch 2014-12-07 14:25:59 -05:00
Benjamin Peterson 73d5031054 remove mention of check_hostname parameter 2014-12-07 14:25:38 -05:00
Benjamin Peterson 204a0eca5a merge 2.7.9 release branch 2014-12-07 13:41:52 -05:00
Benjamin Peterson 227f6e0dc5 remove HTTPSConnection's check_hostname parameter (#22959) 2014-12-07 13:41:26 -05:00
Benjamin Peterson 542125e614 merge 2.7.9 release branch 2014-12-06 11:36:48 -05:00
Benjamin Peterson fd0c92fe07 note that sslv3 may not be available 2014-12-06 11:36:32 -05:00
Terry Jan Reedy bafef5ade3 Edit Menus section of Idle doc. Make menu entries match current Idle in order
and case.  Edit some of the explanatory sentences and end all with a period.
2014-12-05 02:42:54 -05:00
Terry Jan Reedy 9e466cf122 Issue #3068: Document the new Configure Extensions dialog and menu entry. 2014-12-04 01:22:41 -05:00
Terry Jan Reedy eb40589324 Issue #16893: Update 2.7 version of Idle doc to match 3.4 doc as of the just
committed 6db65ff985b6.
2014-12-04 00:55:46 -05:00
Antoine Pitrou bf9eb35f96 Fix #22987: update the compatibility matrix for a SSLv23 client. 2014-12-03 20:00:56 +01:00
Serhiy Storchaka 45aa771fe9 Issue #14099: ZipFile.open() no longer reopen the underlying file. Objects
returned by ZipFile.open() can now operate independently of the ZipFile even
if the ZipFile was created by passing in a file-like object as the first
argument to the constructor.
2014-12-03 09:11:12 +02:00
Benjamin Peterson 5a608c2e8b merge 2.7.9 release branch 2014-11-29 22:57:15 -05:00
Benjamin Peterson efa3cf84d2 add context parameter to xmlrpclib.ServerProxy (#22960)
Patch from Alex Gaynor.
2014-11-29 22:55:35 -05:00
Serhiy Storchaka 2c1f37667d Issue #21514: The documentation of the json module now refers to new JSON RFC
7159 instead of obsoleted RFC 4627.
2014-11-27 19:41:34 +02:00
Zachary Ware 6ac2b4db94 pydoc: Add a note about setting PAGER to affect console output pagination.
Suggested by James Lowden on docs@.
2014-11-26 23:44:25 -06:00
Benjamin Peterson 72275ef7c3 remove incorrect plural 2014-11-25 14:54:45 -06:00
Berker Peksag 8a9c682d41 Issue #20351: Add examples for csv.DictReader and csv.DictWriter.
Patch by Charles-Axel Dein.
2014-11-24 23:50:46 +02:00
Ned Deily 40ce014baf Fix faulty indent. 2014-11-23 20:55:55 -08:00
Benjamin Peterson e3e7d40514 pep 476: verify certificates by default (#22417) 2014-11-23 21:02:02 -06:00
Benjamin Peterson b206473ef8 give urllib.urlopen a context parameter (closes #22927) 2014-11-23 20:55:24 -06:00
Benjamin Peterson 6fa40c496e fix versionchanged version 2014-11-23 20:13:55 -06:00
Benjamin Peterson 31aa69ead5 allow hostname to be passed to SSLContext even if OpenSSL doesn't support SNI (closes #22921)
Patch from Donald Stufft.
2014-11-23 20:13:31 -06:00
Benjamin Peterson fcfb18ee2b allow passing cert/ssl information to urllib2.urlopen and httplib.HTTPSConnection
This is basically a backport of issues #9003 and #22366.
2014-11-23 11:42:45 -06:00
Ned Deily 86b36e5ec5 Fix 2to3 reference link in pyporting.rst. 2014-11-22 16:03:40 -08:00
Donald Stufft 527d4ace85 Issue #22827: Backport the new Distributing and Instaling Docs from 3.4 2014-11-20 09:38:31 -05:00
Ned Deily 3f1d0b3121 Issue 22878: PEP 477 - "make install" and "make altinstall" integration
The backport of ensurepip to 2.7.9 allows pip to optionally be installed
or upgraded using the bundled pip provided by the new ensurepip module.
The option can be specified persistently using the configure option:

    ./configure --with-ensurepip[=upgrade|install|no]

It can also be overridden on either the "install" or "altinstall" targets:

    make [alt]install ENSUREPIP=[upgrade|install|no]

For Python 2, the default option is "no" (do not install pip).
2014-11-20 02:11:03 -08:00
Georg Brandl 05e7c9ea6f Fix description. 2014-11-14 11:20:07 +01:00
Georg Brandl 96c4de960c Closes #22868: make example less ambiguous. 2014-11-14 11:12:53 +01:00
Nick Coghlan 01bd3c1231 Close #22300 by tweaking 2.7.9 What's New announcements 2014-11-14 20:05:04 +10:00
Donald Stufft 8aaff54db3 Implement PEP 477 - Backport ensurepip (PEP 453) to 2.7
* Backports ensurepip to the 2.7 branch
* Backports some of the improved documentation to the 2.7 branch.
* Adds a private backport of the 3.x mock library as test._mock_backport
  to enable saner testing of ensurepip.

Key Differences from 3.x:

* Ensurepip does not have any Makefile integration, specifically
  it is not ran by default in the Makefile.
* There is no venv module in 2.7, so downstream distributors can
  completely disable ensurepip, ideally with a message redirecting
  to the correct way to install pip.
* To match the ``python`` command in 2.7, ensurepip will install
  the unversioned ``pip`` command as well.
* No-op and hide --default-pip and add --no-default-pip to restore
  the 3.x behavor on 2.7.
2014-11-11 10:24:11 -05:00
Serhiy Storchaka 04eee63949 Issue #22845: Improved formatting of dis documentation. 2014-11-11 10:02:57 +02:00
Raymond Hettinger 3454941d26 Use internal links where possible 2014-11-09 17:25:42 -08:00
Raymond Hettinger ccae479e2d Issue 22830: Clarify docs for functools.cmp_to_key(). 2014-11-09 17:10:17 -08:00
Steve Dower b3067a2023 Fixes path to patchlevel.py in doc/make.bat 2014-11-05 20:13:46 -08:00
Georg Brandl a1137fba89 Closes #22525: clarify documentation for ast.literal_eval(). 2014-11-05 20:20:28 +01:00
Georg Brandl 34d1597bb7 #22613: fix several factual errors in builtin docs (thanks Jacques Ducasse) 2014-10-31 09:41:46 +01:00
Georg Brandl 500380135b #22613: minor other fixes in library docs (thanks Jacques Ducasse) 2014-10-31 10:25:48 +01:00