Commit Graph

16321 Commits

Author SHA1 Message Date
R David Murray 99e1bfad09 whatsnew: sunau supports 24 bit samples. 2014-03-07 21:15:56 -05:00
R David Murray 47d083cf1a whatsnew: cp273 codec (#10907797)
Also updated the docs and added the aliases mentioned by the
references.
2014-03-07 21:00:34 -05:00
R David Murray e2684d93e2 whatsnew: get[status|output] works on windows.
Since 3.3.4.... :(
2014-03-07 20:06:24 -05:00
R David Murray 48b6b70b95 #10197: Update get[status]output versionchanged with actual version.
This was perhaps on the border between a bug fix and a feature since
the Python3 docs did not originally say it was unix only.  However, the
functions never worked anywhere but unix, and the docs were changed to
say it was unix only well before the windows support was added.

Unfortunately, windows support was added in 3.3.4 as well as 3.4.
That leaves us in the uncomfortable position of needing the tag to say
"version changed: 3.3.4" :(
2014-03-07 20:04:41 -05:00
R David Murray 95b696a010 #10197: Update get[status]output versionchanged with actual version.
This was perhaps on the border between a bug fix and a feature since
the Python3 docs did not originally say it was unix only.  However, the
functions never worked anywhere but unix, and the docs were changed to
say it was unix only well before the windows support was added.

Unfortunately, windows support was added in 3.3.4 as well as 3.4.
That leaves us in the uncomfortable position of needing the tag to say
"version changed: 3.3.4" :(
2014-03-07 20:04:17 -05:00
Brett Cannon c39e892955 Issue #20813: Backport Python 2/3 HOWTO updates 2014-03-07 12:28:35 -05:00
Brett Cannon 6634e15d77 Issue #20812: Add a short opener to the Python 2/3 porting HOWTO.
Thanks to Nick Coghlan for the suggestion.
2014-03-07 12:27:10 -05:00
R David Murray beec02ac06 whatsnew: note in deprecation section about html.parser strict. 2014-03-06 13:40:53 -05:00
R David Murray 393c8f36ef whatsnew: rewrite resource entry: prlimit and new constants. 2014-03-06 12:47:31 -05:00
R David Murray 6674ac0873 whatsnew: ipaddress is_global
Also tweaked the docs a bit and added the missing entry for
the ipv6 is_global.
2014-03-06 11:51:37 -05:00
R David Murray 83db8fc3cc whatsnew: improve PyZipFile filterfuc entry, and its docs (#19274). 2014-03-05 10:48:01 -05:00
R David Murray 04edfdf320 whatsnew: tweak a couple importlib porting notes.
I had missed that there was already an entry for the Frozen package change, so
I combined mine with the existing one.  Also added the info about the reload
change to the entry for the other changes to reload, but I'm missing an issue
number for the rest of the attribute behavior changes so I left myself an
XXX as a reminder to find it.
2014-03-03 08:56:43 -05:00
R David Murray 66902edf23 whatsnew: Windows build uses ASLR and DEP. 2014-03-03 08:26:49 -05:00
Nick Coghlan dc855b7b1f Close #20839: pkgutil.find_loader now uses importlib.util.find_spec 2014-03-04 20:39:42 +10:00
Ethan Furman c913a7a6f6 Issue20653: fix ReST for Enum 2014-03-03 15:02:04 -08:00
Ethan Furman 9c45444727 Close issue20653: improve functional API docs; minor code changes 2014-03-03 12:42:52 -08:00
Victor Stinner f70200e5a9 Close #20814: doc: Fix "Pretty top" example of tracemalloc 2014-03-03 11:57:57 +01:00
R David Murray 8be77910be whatsnew: add some issue number annotations.
Add issue number to tick_counter, PyOS_ReadlineFunctionPointer, marshal
optimizations (add Antoine's contribution to the entry under the marshal
module), and absolute paths in __file__.
2014-03-02 17:14:33 -05:00
R David Murray db8843f36e whatsnew: memoryview is Sequence and supports Reversed. 2014-03-01 12:09:55 -05:00
R David Murray 9c0c101ee4 whatsnew: unittest discover works on namespace packages (#17457).
I also added the docs that never got committed, editing the patch provided by
Claudiu.

I collapsed the now three versionchanged directives for discovery into one.  I
tried several different styles for this.  The most obvious is a bulleted list,
but currently the only way I could find to produce that is to have *something*
appear on the versionchanged line after the colon, which combined with the
blank space before the bulleted list just looks wrong.  I also tried the
current single-line-three-sentences version with bullet characters before each
sentence, and I almost went with that as it made it clear that the three
sentences are independent.  But I decided to just go with the sentences for
simplicity reasons.
2014-03-01 11:57:58 -05:00
R David Murray 8ab50214bd whatsnew: give Serhiy credit for audioop 24-bit sample support. 2014-02-28 13:30:27 -05:00
R David Murray 0bec63e67d whatsnew: compression libraries support 'x' mode. 2014-02-27 20:05:42 -05:00
R David Murray 4b1ea234a0 whatsnew: tarfile stat constants removal. 2014-02-27 18:55:34 -05:00
R David Murray ecef6cd2f1 whatsnew: return types of re functions. 2014-02-27 18:32:32 -05:00
Andrew Kuchling 98f2bbf794 #16135: remove mentions of OS/2 from the documentation 2014-03-01 07:53:28 -05:00
Brett Cannon acc74e6c63 Issue #20650: Tweak some awkward wording. 2014-02-28 10:06:18 -05:00
R David Murray 871119eb2f whatsnew: fix textwrap/shorten entry, and improve the related docs.
I had incorrectly added back the shorten method when I initially
made the whatsnew entry, but the shorten function docs were not
correct according to the code.  I also improved the wording in
general.
2014-02-27 18:01:43 -05:00
R David Murray 9251d59523 whatsnew: expand pbkdf2_hmac entry slightly. 2014-02-26 13:07:21 -05:00
R David Murray d2d81f0163 whatsnew: reformat pdb entry to match style of most other module entries.
That is: one paragraph per feature.
2014-02-26 12:52:51 -05:00
R David Murray bdf5efa10c whatsnew: reword the contextlib.redirect_stdout entry for increased clarity. 2014-02-26 12:46:19 -05:00
Zachary Ware 7bbd101bb1 Fix several C-API doc typos caught by tomo cocoa on docs@.
The signature and description of PyException_SetCause now use "cause"
rather than "ctx" to match the code.
2014-02-26 10:40:38 -06:00
Zachary Ware 5ea5d2c3f7 Issue #20759: Fix some typos in the mock docs. 2014-02-26 09:34:43 -06:00
R David Murray 80ebf6d171 whatsnew: attribute base64 memoryview change to Nick. 2014-02-26 10:09:25 -05:00
R David Murray 63f4dd5e8f whatsnew: pprint's compact option. 2014-02-26 09:51:58 -05:00
Zachary Ware f8a5892140 Merge with 3.3 2014-02-26 10:41:40 -06:00
Zachary Ware 984689821d Close #20759: Fix some typos in the mock docs. (Merge with 3.3) 2014-02-26 09:38:39 -06:00
R David Murray 13cc883aaa whatsnew: DynanicClassAttribute (#19030), Py_SetStandardStreamEncoding (#16129)
Adding missing docs for DynamicClassAttribute by copying the docstring.  The
doc entry could stand some expansion, which I will note on the issue.
2014-02-25 16:03:14 -05:00
Antoine Pitrou ef85119618 Issue #20765: Add missing documentation for PurePath.with_name() and PurePath.with_suffix(). 2014-02-25 20:33:02 +01:00
R David Murray 77d73facdc whatsnew: encoding is now optional in PYTHONIOENCODING (#18818) 2014-02-25 10:55:29 -05:00
R David Murray 6c0f707cd1 whatsnew: logging SocketHandler and DatagramHandler support Unix domain sockets. 2014-02-25 10:39:56 -05:00
R David Murray 7cae336890 whatsnew: Request.method can be overridden in subclasses (#18978).
Jason doced the change in the constructor *method* description, but
not the description of Request.method, so I added the change there
as well.
2014-02-25 10:22:50 -05:00
Guido van Rossum 3e97585b3e Clarify that flow control works for datagrams, except on BSD. 2014-02-24 14:31:25 -08:00
R David Murray 8920e915fa whatsnew: http.server --bind cli option.
Also some fixups in the docs.
2014-02-24 17:21:42 -05:00
R David Murray 56f3c306c2 whatsnew: unittest.TestCase.assertLogs.
Also fix issue number in address sanity check entry.
2014-02-24 16:05:57 -05:00
R David Murray 4e4a313486 Fix return type in doc of PyStructSequence_InitType2. 2014-02-24 15:51:57 -05:00
R David Murray 4e564c893b whatsnew: cypthon can be compiled with address sanity checking enabled. 2014-02-24 15:48:22 -05:00
R David Murray 4f91364598 Merge #20628: make it clear that DictReader/Writer *fieldnames* is a Sequence.
Including the subsequent line re-wrapping.
2014-02-24 15:34:48 -05:00
R David Murray f031a6f334 #20628: wrap lines to < 80. 2014-02-24 15:32:54 -05:00
R David Murray df714b9f70 #20628: make it clear that DictReader/Writer *fieldnames* is a Sequence.
Patch by Sean Rodman.
2014-02-24 15:29:22 -05:00
Ezio Melotti c5f5e625aa #20740: merge with 3.3. 2014-02-24 20:59:48 +02:00
Ezio Melotti 6b532349d0 #20740: desquarify 2. 2014-02-24 20:58:31 +02:00
R David Murray 8eb443d58b Fix typo. 2014-02-24 12:59:20 -05:00
R David Murray 26818f64f0 whatsnew: frame.clear, expanded entry for -I/isolated mode. 2014-02-24 10:38:13 -05:00
Victor Stinner de0e1d30d8 asyncio doc: fix references in subprocess doc 2014-02-24 13:19:19 +01:00
Victor Stinner 07171242d5 subprocess.Popen.wait doc: mention asyncio to avoid busy loop 2014-02-24 13:18:47 +01:00
Georg Brandl 09141c4782 Closes #20755: port sphinx-1.1 fixes from default 2014-02-24 09:35:07 +01:00
Georg Brandl 06a70621ed merge with 3.3 2014-02-24 09:27:16 +01:00
Georg Brandl c4f44c027e Closes #20735: remove erroneous deprecated marker from stringprep docs 2014-02-24 09:26:53 +01:00
R David Murray 54bf73a54a whatsnew: threading.main_thread, os.urandom persistent handle, sunau.open with. 2014-02-23 21:31:53 -05:00
R David Murray 0b32adf832 whatsnew: unittest uses argparse now. 2014-02-23 21:02:53 -05:00
R David Murray ef3da23cb3 whatsnew: unittest drops references to successful tests. 2014-02-23 20:53:50 -05:00
R David Murray 27519673d3 whatsnew: pyvenv --copies option.
Also added the missing documentation for new new option.
2014-02-23 11:36:25 -05:00
R David Murray f3f2838ee5 whatsnew: devnull fileno/close/closed. 2014-02-23 11:21:59 -05:00
R David Murray 93a9328326 whatsnew: hashlib.hash.name is now public and returns lowercase always. 2014-02-23 10:42:47 -05:00
R David Murray 6e1bc7cab9 whatsnew: textwrap.shorten.
Also add the missing TextWrapper.shorten method doc.
2014-02-23 10:22:07 -05:00
R David Murray a183064d86 whatsnew: ExtensionFileLoader.get_filename.
Also reflow mmap paragraph.
2014-02-23 09:41:27 -05:00
Ezio Melotti 32f30a8d9b #20677: fix typo in enum docs. Patch by Saimadhav Heblikar. 2014-02-23 17:13:31 +02:00
R David Murray 98681d4ac1 Reflow paragraph. 2014-02-22 16:32:07 -05:00
R David Murray 928924d1a1 whatsnew: os.path.ismount recognizes volumes mounted below root. 2014-02-22 16:31:26 -05:00
R David Murray 237fda2984 whatsnew: PyStructSequence_InitType2, Victor's MemoryError fixes.
I'm documenting this new function, but I'm wondering if this will trigger
someone to think about whether or not this actually makes sense :)
2014-02-22 16:02:22 -05:00
R David Murray 7c12432fe1 whatsnew: Windows uses VirtualAlloc, --version goes to stdout. 2014-02-22 15:35:37 -05:00
R David Murray b070b3f502 whatsnew: frozen package __path__; and min/max versionadded. 2014-02-22 15:05:08 -05:00
R David Murray fce0082005 whatsnew: importlib deprecations.
This addresses issue #20199, if I got it right.  The deprecation and
replacement lists are based on the importlib documentation.
2014-02-22 14:28:46 -05:00
Yury Selivanov 7a19355c77 asyncio.docs: Document subprocess_exec and subprocess_shell. Issue #20694. 2014-02-20 20:10:28 -05:00
Yury Selivanov f9200ae398 asyncio.docs: Improve wordings; add a note to the Coroutines section. Issue #20706 2014-02-20 16:20:44 -05:00
Yury Selivanov 35669ae77e asyncio.docs: Improve documentation of Streams. Issue #20696. 2014-02-20 14:10:02 -05:00
Yury Selivanov d5797422dd asyncio.docs: Document Error Handling API and asyncio.Handle 2014-02-19 20:58:44 -05:00
Victor Stinner aabc131224 asyncio doc: remove reference to _DEBUG (now replaced with PYTHONASYNCIODEBUG
env var), document the default debug mode
2014-02-20 01:44:10 +01:00
Victor Stinner 7ef60cd8c2 asyncio, Tulip issue #136: Add get/set_debug() methods to BaseEventLoopTests.
Add also a PYTHONASYNCIODEBUG environment variable to debug coroutines since
Python startup, to be able to debug coroutines defined directly in the asyncio
module.
2014-02-19 23:15:02 +01:00
Victor Stinner 03e9cb2b0b asyncio: document new create_unix_connection() and create_unix_server() methods
of BaseEventLoop
2014-02-19 13:32:34 +01:00
Yury Selivanov 34ce99f66d Mangle __parameters in __annotations__ dict properly. Issue #20625. 2014-02-18 12:49:41 -05:00
Victor Stinner 8b21d91e35 Issue #20493: Document that asyncio should not exceed one day 2014-02-18 09:37:43 +01:00
Victor Stinner 0aba4dc1ed Close #20649: Fix typo in asyncio doc. Patch written by Brett Cannon. 2014-02-18 09:22:00 +01:00
Victor Stinner 38df2adaeb Close #20652: asyncio doc: close the event loop in run_forever() example. Fix
also typo. Patch written by Vajrasky Kok.
2014-02-17 10:54:30 +01:00
Victor Stinner 23f628de4a Issue #20616: Add a format() method to tracemalloc.Traceback. 2014-02-16 23:53:38 +01:00
Andrew Kuchling c77974e033 Merge from 3.3 2014-02-16 12:18:17 -05:00
Andrew Kuchling 3137885c36 #12211: remove paragraph about NaNs 2014-02-16 12:09:35 -05:00
Andrew Kuchling 87a113b807 Merge from 3.3 2014-02-16 11:15:13 -05:00
Andrew Kuchling 8cb1ec3274 #12211: clarify math.copysign() documentation and docstring 2014-02-16 11:11:25 -05:00
Georg Brandl f7b2f36f74 Doc: do not rely on checked-out Sphinx toolchain from svn.python.org anymore
Nowadays it is likely that people will have Sphinx installed,
and if not, they will know how to install it.

This also simplifies life a lot for distribution packagers,
who typically do not want the doc build process to connect
to external web resources.
2014-02-16 09:46:36 +01:00
Andrew Kuchling a3d0ffe2c6 Merge from 3.3 2014-02-15 17:22:41 -05:00
Andrew Kuchling e5235f1624 #20241: use correct RFC number 2014-02-15 17:11:06 -05:00
Andrew Kuchling cb3ff4468a #16728: Mention collections.abc.Sequence in 'sequence' glossary entry 2014-02-15 17:05:26 -05:00
Andrew Kuchling ac6e578691 Merge from 3.3 2014-02-15 16:40:08 -05:00
Andrew Kuchling 46ff4ee81c Clarify versionchanged sentence. Closes #20497. 2014-02-15 16:39:37 -05:00
Benjamin Peterson 30f240150e merge 3.3 2014-02-15 15:39:01 -05:00
Andrew Kuchling 4da9ab0357 #20237: make a revision pass over the XML vulnerabilities section 2014-02-15 15:33:44 -05:00
Ezio Melotti 504f6e8653 #19890: merge with 3.3. 2014-02-15 16:59:39 +02:00
Ezio Melotti e426b71789 #19890: fix typo in multiprocessing docs. Patch by Mike Short. 2014-02-15 16:58:52 +02:00
Victor Stinner 28773465e6 ayncio, Tulip issue 129: BaseEventLoop.sock_connect() now raises an error if
the address is not resolved (hostname instead of an IP address) for AF_INET and
AF_INET6 address families.
2014-02-13 09:24:37 +01:00
R David Murray 85489f9031 whatsnew: 'other improvements' and 'optimizations' belong under CPython heading. 2014-02-12 13:41:01 -05:00
R David Murray 5d411a1a49 whatsnew: PyUnicode_FromFormat width/precision, thread cleanup after fork. 2014-02-12 13:39:11 -05:00
R David Murray af7d2c4917 whatsnew: LOAD_CLASSDEREF, -X showrefcount 2014-02-12 13:00:36 -05:00
R David Murray 2167e29d31 whatsnew: os.path.samestat on windows, keyword defaults evaluation order. 2014-02-12 00:02:34 -05:00
R David Murray db2d8a4ca5 whatsnew: command.com support gone, int *base* can be __index__ but not float. 2014-02-11 23:34:14 -05:00
R David Murray d630e79cc7 whatsnew: object.__format__ raises TypeError on non-empty string.
See issues #7994 and #9856.  I also modified with wording of the format doc
entry to better match what really happens, and added a versionchanged to the
datamodel object.__format__ section.
2014-02-11 18:34:22 -05:00
R David Murray 540227214c whatsnew: undocumented Popen.wait endtime is deprecated. 2014-02-11 12:40:18 -05:00
Gregory P. Smith bbe3335f65 Deprecate Popen.wait()'s undocumented endtime parameter. issue20572. 2014-02-11 09:21:03 -08:00
R David Murray 801fe934d9 whatsnew: __complex__ may not return float, .so may have multiple python modules
Also a NEWS wording fixup.
2014-02-11 08:13:10 -05:00
Larry Hastings 3f99504c08 Merge Python 3.4.0rc1 release branch. 2014-02-11 00:15:46 -08:00
R David Murray 04e24288e1 whatsnew: slice.index no longer accepts negative values (or overflows). 2014-02-10 21:30:42 -05:00
R David Murray 8dffa0e5cf Fix PYTHONPATH wording. It's just PATH, not "normal posix convention". 2014-02-10 19:16:40 -05:00
R David Murray 96eeddba05 whatsnew: bytes/bytearray.join args, PYTHONPATH= is same as not set. 2014-02-10 19:12:52 -05:00
Georg Brandl d8413bab22 merge with 3.3 2014-02-10 22:11:21 +01:00
Georg Brandl 8f9c20b8ff merge with 3.3.4 releasing repo 2014-02-10 22:04:20 +01:00
Larry Hastings ad88d7a26b Python 3.4.0rc1 release: Updated pydoc topics, fixed suspicious markup errors. 2014-02-10 04:26:10 -08:00
Larry Hastings 8f9f0f12e8 Issue #20517: Removed unnecessary new (short-lived) functions from PyErr. 2014-02-10 03:43:57 -08:00
Larry Hastings b082731fbb Issue #20517: Functions in the os module that accept two filenames
now register both filenames in the exception on failure.
This required adding new C API functions allowing OSError exceptions
to reference two filenames instead of one.
2014-02-09 22:05:19 -08:00
Eli Bendersky 136fea253e More complete documentation of event loops and policies.
Documented the AbstractEventLoopPolicy interface explicitly and explained the
relation between the global loop & policy access functions. Added an initial
section that explains the connections in general terms. Documented missing XXX
methods.
2014-02-09 06:55:58 -08:00
Eli Bendersky b73c83318d Various formatting & grammar fixes in asyncio* docs. 2014-02-09 06:07:47 -08:00
Eli Bendersky 8b402629ae Fix typo in library/ipc.rst 2014-02-09 05:54:13 -08:00
Benjamin Peterson 0b094ce170 do not line break reference 2014-02-16 12:46:30 -05:00
Nick Coghlan 72318b97f6 Issue #20500: clarify that invocation may be indirect 2014-02-09 12:05:13 +10:00
Nick Coghlan c0bc0b46bb Issue #20500: Note other public APIs with the new assertion 2014-02-09 12:00:01 +10:00
Victor Stinner 0c3949c963 asyncio: Remove Process.subprocess attribute; it's too easy to get inconsistent
Process and Popen objects
2014-02-09 02:51:40 +01:00
Nick Coghlan 3d7b3641d3 Note the new debug assertion in PyObject_Str 2014-02-09 10:57:34 +10:00
Brian Curtin c9d1a6b85e merge 2014-02-08 18:36:57 -06:00
Brian Curtin a1afeec9aa Spelling corrections. Submitted to python-dev by python@mrabarnett.plus.com 2014-02-08 18:36:14 -06:00
Victor Stinner 12c68b20b7 asyncio doc: fix gather() doc 2014-02-09 01:35:24 +01:00
Nick Coghlan aa029dad50 Tweaks to What's New and some referenced docs 2014-02-09 10:10:24 +10:00
Nick Coghlan 96bb437ae8 Close #20563: Declare ipaddress API stable 2014-02-09 09:18:26 +10:00
Senthil Kumaran 127242654d merge from 3.3
Include the mention of ResourceWarning being displayed by default by the test runner.
Addressing #issue 20529
2014-02-08 14:28:44 -08:00
Senthil Kumaran 409ea5dac1 Include the mention of ResourceWarning being displayed by default by the test runner.
Addressing #issue 20529
2014-02-08 14:28:03 -08:00
Victor Stinner c1567df61e asyncio doc: document missing event loop methods 2014-02-08 23:22:58 +01:00
Victor Stinner ffbe3c67df asyncio doc: sort methods 2014-02-08 22:50:07 +01:00
Ethan Furman ca1b794dac Close issue20534: all pickle protocols now supported. 2014-02-08 11:36:27 -08:00
Nick Coghlan 73afe2a972 Close #20481: Disallow mixed type input in statistics
The most appropriate coercion rules are not yet clear, so simply
disallowing mixed type input for 3.4.

(Committed on Steven's behalf)
2014-02-08 19:58:04 +10:00
Victor Stinner 85310a50a9 Issue #20505: Remove resolution and _granularity from selectors and asyncio
* Remove selectors.BaseSelector.resolution attribute
* Remove asyncio.BaseEventLoop._granularity attribute
2014-02-07 23:34:58 +01:00
R David Murray 27e9de669b #20531: Revert e20f98a8ed71, the 3.4 version of the #19063 fix. 2014-02-07 12:40:37 -05:00
Victor Stinner 790202d613 asyncio doc: mention that asyncio is not thread-safe 2014-02-07 19:03:05 +01:00
R David Murray 02384bfa94 #20477: add examples of using the new contentmanager API. 2014-02-07 10:55:17 -05:00
Serhiy Storchaka 303718c3d7 Fix empty strings to empty bytes objects. 2014-02-06 21:11:33 +02:00
Serhiy Storchaka 5e028ae09e Fix empty strings to empty bytes objects. 2014-02-06 21:10:41 +02:00
Ethan Furman c72e638643 Close issue20412: Updated Enum docs to have referencable Enum and IntEnum classes 2014-02-06 08:13:14 -08:00
Brett Cannon 3303b6abc8 Merge for issue #20488 2014-02-06 09:49:53 -05:00
Brett Cannon 07fbd78473 Issue #20488: Update docs to say importlib is *the* implementaiton of
import and not *an* implementation.
2014-02-06 09:46:08 -05:00
Brett Cannon f811bbfe6c Issue #6386: When executing a script that's a symlink, the directory
where the symlink resolves to is added to sys.path, not the directory
containing the symlink itself.

Thanks to Sanko Resic for an initial attempt at the patch.
2014-02-06 09:22:51 -05:00
Ronald Oussoren 94e44a935b Issue #14455: fix handling of unsigned long long values for binary plist files
Values in the range of an unsigned long long, but outside of the range
of a signed long long were serialized as a negative value.

Due to a bug in PyObjC my test scripts indicated that the previous behavior
matched Apple's plist code, instead the handle large unsigned values correctly.

The change to plistlib.py is from a patch by Serhiy.
2014-02-06 11:19:18 +01:00
R David Murray 58af25e930 #14515: clarify that TemporaryDirectory's __enter__ returns the name. 2014-02-05 14:56:39 -05:00
R David Murray 23686074b0 #14515: clarify that TemporaryDirectory's __enter__ returns the name. 2014-02-05 14:53:40 -05:00