]> granicus.if.org Git - python/log
python
11 years agoSort whatsnew entries alphabetically
Antoine Pitrou [Mon, 12 Aug 2013 18:48:15 +0000 (20:48 +0200)]
Sort whatsnew entries alphabetically

11 years agoAdd whatsnew entries for 3.4.
Antoine Pitrou [Mon, 12 Aug 2013 18:46:47 +0000 (20:46 +0200)]
Add whatsnew entries for 3.4.

11 years agoIssue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
Larry Hastings [Mon, 12 Aug 2013 17:53:20 +0000 (13:53 -0400)]
Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.

11 years agoIssue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
Larry Hastings [Mon, 12 Aug 2013 17:49:30 +0000 (13:49 -0400)]
Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.

11 years agoCloses issue #18598: Have the exception message for
Brett Cannon [Mon, 12 Aug 2013 17:29:11 +0000 (13:29 -0400)]
Closes issue #18598: Have the exception message for
importlib.import_module() include the name of the module when the
'package' argument is missing but needed.

11 years agoIssue 18693: Put custom __dir__ back in place. Will instead look at fixing `help()`.
Ethan Furman [Mon, 12 Aug 2013 13:51:41 +0000 (06:51 -0700)]
Issue 18693: Put custom __dir__ back in place.  Will instead look at fixing `help()`.

11 years agoAdd some docstrings, clarify others, and fix formatting.
Eli Bendersky [Sun, 11 Aug 2013 23:48:44 +0000 (16:48 -0700)]
Add some docstrings, clarify others, and fix formatting.

11 years agoClose #12645: Clarify and reformat the documentation of import_fresh_module
Eli Bendersky [Sun, 11 Aug 2013 22:43:30 +0000 (15:43 -0700)]
Close #12645: Clarify and reformat the documentation of import_fresh_module

11 years agoIssue #12645: Clarify and reformat the documentation of import_fresh_module
Eli Bendersky [Sun, 11 Aug 2013 22:38:08 +0000 (15:38 -0700)]
Issue #12645: Clarify and reformat the documentation of import_fresh_module

11 years agoIssue #18706: Fix a test for issue #18681 so it no longer breaks test_codeccallbacks*.
Serhiy Storchaka [Sun, 11 Aug 2013 17:13:36 +0000 (20:13 +0300)]
Issue #18706: Fix a test for issue #18681 so it no longer breaks test_codeccallbacks*.

11 years agoIssue #18706: Fix a test for issue #18681 so it no longer breaks test_codeccallbacks*.
Serhiy Storchaka [Sun, 11 Aug 2013 17:12:20 +0000 (20:12 +0300)]
Issue #18706: Fix a test for issue #18681 so it no longer breaks test_codeccallbacks*.

11 years ago#18663: merge with 3.3.
Ezio Melotti [Sun, 11 Aug 2013 10:05:37 +0000 (13:05 +0300)]
#18663: merge with 3.3.

11 years ago#18663: document that assertAlmostEqual also works when the values are equal and...
Ezio Melotti [Sun, 11 Aug 2013 10:04:50 +0000 (13:04 +0300)]
#18663: document that assertAlmostEqual also works when the values are equal and add tests.

11 years agoIssue #15301: skip new test method so Windows builtbots stop failing.
Terry Jan Reedy [Sun, 11 Aug 2013 00:58:59 +0000 (20:58 -0400)]
Issue #15301: skip new test method so Windows builtbots stop failing.

11 years agoMerge
Terry Jan Reedy [Sat, 10 Aug 2013 22:40:04 +0000 (18:40 -0400)]
Merge

11 years agoMerge heads
Terry Jan Reedy [Sat, 10 Aug 2013 22:33:37 +0000 (18:33 -0400)]
Merge heads

11 years agoIssue #10241: Clear extension module dict copies at interpreter shutdown.
Antoine Pitrou [Sat, 10 Aug 2013 22:30:09 +0000 (00:30 +0200)]
Issue #10241: Clear extension module dict copies at interpreter shutdown.
Patch by Neil Schemenauer, minimally modified.

(re-apply after fix for tkinter-related crash)

11 years agoIssue #18676: Merge from 3.3
Terry Jan Reedy [Sat, 10 Aug 2013 22:23:18 +0000 (18:23 -0400)]
Issue #18676: Merge from 3.3

11 years agoFix refcounting issue with extension types in tkinter.
Antoine Pitrou [Sat, 10 Aug 2013 22:22:30 +0000 (00:22 +0200)]
Fix refcounting issue with extension types in tkinter.
(issue #15721)

11 years agoIssue #18676: Change 'positive' to 'non-negative' in queue.py put and get
Terry Jan Reedy [Sat, 10 Aug 2013 22:17:13 +0000 (18:17 -0400)]
Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
docstrings and ValueError messages. Patch by Zhongyue Luo

11 years agoMerge with 3.3
Terry Jan Reedy [Sat, 10 Aug 2013 21:46:48 +0000 (17:46 -0400)]
Merge with 3.3

11 years agoIssue #18429: Add user-oriented News entry about Format / Format Paragraph
Terry Jan Reedy [Sat, 10 Aug 2013 21:46:24 +0000 (17:46 -0400)]
Issue #18429: Add user-oriented News entry about Format / Format Paragraph
now working with comment block selections. Patch was part of 18226 patch.

11 years agoMerge with 3.3
Terry Jan Reedy [Sat, 10 Aug 2013 20:57:02 +0000 (16:57 -0400)]
Merge with 3.3

11 years agoIssue #18226: Add docstrings and unittests for idlelib/FormatParagraph.py.
Terry Jan Reedy [Sat, 10 Aug 2013 20:56:28 +0000 (16:56 -0400)]
Issue #18226: Add docstrings and unittests for idlelib/FormatParagraph.py.
Move comment code to a separate function so it can be separately tested.
Original patches by Todd Rovito and Phil Webster.

11 years agoClose #18693: __dir__ removed from Enum; help() now helpful.
Ethan Furman [Sat, 10 Aug 2013 20:07:49 +0000 (13:07 -0700)]
Close #18693: __dir__ removed from Enum; help() now helpful.

11 years agoClose #18264: int- and float-derived enums now converted to int or float.
Ethan Furman [Sat, 10 Aug 2013 20:01:45 +0000 (13:01 -0700)]
Close #18264: int- and float-derived enums now converted to int or float.

11 years ago#18681: merge with 3.3.
Ezio Melotti [Sat, 10 Aug 2013 17:01:43 +0000 (20:01 +0300)]
#18681: merge with 3.3.

11 years ago#18681: Fix a NameError in imp.reload() (noticed by Weizhao Li).
Ezio Melotti [Sat, 10 Aug 2013 16:59:36 +0000 (19:59 +0300)]
#18681: Fix a NameError in imp.reload() (noticed by Weizhao Li).

11 years agoNull merge of 3.3 merge heads.
R David Murray [Sat, 10 Aug 2013 16:14:58 +0000 (12:14 -0400)]
Null merge of 3.3 merge heads.

11 years agoMerge heads.
R David Murray [Sat, 10 Aug 2013 16:13:44 +0000 (12:13 -0400)]
Merge heads.

11 years agoMerge heads.
R David Murray [Sat, 10 Aug 2013 16:08:41 +0000 (12:08 -0400)]
Merge heads.

11 years agoMerge #8112: Update the documenting xmlrpc server to use getfullargspec.
R David Murray [Sat, 10 Aug 2013 16:03:54 +0000 (12:03 -0400)]
Merge #8112: Update the documenting xmlrpc server to use getfullargspec.

11 years ago#8112: Update the documenting xmlrpc server to use getfullargspec.
R David Murray [Sat, 10 Aug 2013 16:01:47 +0000 (12:01 -0400)]
#8112: Update the documenting xmlrpc server to use getfullargspec.

Before this patch it would raise an error when trying to display
documentation for a method that used annotations.

Patch by Claudiu Popa.

11 years ago#18505: merge with 3.3.
Ezio Melotti [Sat, 10 Aug 2013 15:57:52 +0000 (18:57 +0300)]
#18505: merge with 3.3.

11 years ago#18505: fix duplicate name and remove duplicate test. Patch by Vajrasky Kok.
Ezio Melotti [Sat, 10 Aug 2013 15:57:12 +0000 (18:57 +0300)]
#18505: fix duplicate name and remove duplicate test.  Patch by Vajrasky Kok.

11 years agoMerge typo fixes from 3.3.
Ezio Melotti [Sat, 10 Aug 2013 15:47:37 +0000 (18:47 +0300)]
Merge typo fixes from 3.3.

11 years agoFix a couple of typos.
Ezio Melotti [Sat, 10 Aug 2013 15:47:07 +0000 (18:47 +0300)]
Fix a couple of typos.

11 years ago#18453: merge with 3.3.
Ezio Melotti [Sat, 10 Aug 2013 15:37:36 +0000 (18:37 +0300)]
#18453: merge with 3.3.

11 years ago#18453: fix unused variables in test_xmlrpc. Patch by Vajrasky Kok.
Ezio Melotti [Sat, 10 Aug 2013 15:37:05 +0000 (18:37 +0300)]
#18453: fix unused variables in test_xmlrpc.  Patch by Vajrasky Kok.

11 years ago#18465: merge with 3.3.
Ezio Melotti [Sat, 10 Aug 2013 15:30:57 +0000 (18:30 +0300)]
#18465: merge with 3.3.

11 years ago#18465: fix unused variables in test_minidom. Patch by Vajrasky Kok.
Ezio Melotti [Sat, 10 Aug 2013 15:30:29 +0000 (18:30 +0300)]
#18465: fix unused variables in test_minidom.  Patch by Vajrasky Kok.

11 years ago#18484: merge with 3.3.
Ezio Melotti [Sat, 10 Aug 2013 15:20:59 +0000 (18:20 +0300)]
#18484: merge with 3.3.

11 years ago#18484: improve test coverage of http.cookiejar. Patch by Vajrasky Kok.
Ezio Melotti [Sat, 10 Aug 2013 15:20:09 +0000 (18:20 +0300)]
#18484: improve test coverage of http.cookiejar.  Patch by Vajrasky Kok.

11 years ago#18483: merge with 3.3.
Ezio Melotti [Sat, 10 Aug 2013 15:08:13 +0000 (18:08 +0300)]
#18483: merge with 3.3.

11 years ago#18483: add one more date format in test_http2time_formats. Patch by Vajrasky Kok.
Ezio Melotti [Sat, 10 Aug 2013 15:07:25 +0000 (18:07 +0300)]
#18483: add one more date format in test_http2time_formats.  Patch by Vajrasky Kok.

11 years agoIssue #15651: PEP 3121 refactoring for _elementtree
Eli Bendersky [Sat, 10 Aug 2013 15:00:39 +0000 (08:00 -0700)]
Issue #15651: PEP 3121 refactoring for _elementtree

Patch by Antoine Pitrou (based on Robin Schreiber's original patch)

11 years agotypo, changeset dd0d751cc7f1 belongs to issue #16499 not issue #16400
Christian Heimes [Sat, 10 Aug 2013 14:38:23 +0000 (16:38 +0200)]
typo, changeset dd0d751cc7f1 belongs to issue #16499 not issue #16400

11 years agoIssue #16400: Add command line option for isolated mode.
Christian Heimes [Sat, 10 Aug 2013 14:36:18 +0000 (16:36 +0200)]
Issue #16400: Add command line option for isolated mode.

 -I

    Run Python in isolated mode. This also implies -E and -s. In isolated mode
    sys.path contains neither the script’s directory nor the user’s
    site-packages directory. All PYTHON* environment variables are ignored,
    too. Further restrictions may be imposed to prevent the user from
    injecting malicious code.

11 years agoIssue #18668: Further clarify m_size setting for non-negative values
Eli Bendersky [Sat, 10 Aug 2013 12:58:10 +0000 (05:58 -0700)]
Issue #18668: Further clarify m_size setting for non-negative values

11 years agoIssue #18668: Further clarify m_size setting for non-negative values
Eli Bendersky [Sat, 10 Aug 2013 12:57:27 +0000 (05:57 -0700)]
Issue #18668: Further clarify m_size setting for non-negative values

11 years agoNull merge related to #18600.
R David Murray [Fri, 9 Aug 2013 20:20:06 +0000 (16:20 -0400)]
Null merge related to #18600.

For 3.3, we just deleted the example.  In 3.4 it was fixed.

11 years ago#18600: In 3.3, as_string does not accept a policy keyword.
R David Murray [Fri, 9 Aug 2013 20:17:00 +0000 (16:17 -0400)]
#18600: In 3.3, as_string does not accept a policy keyword.

Also, document the policy keyword that was added to Message in 3.3.

11 years ago#18600: add policy to add_string, and as_bytes and __bytes__ methods.
R David Murray [Fri, 9 Aug 2013 20:15:28 +0000 (16:15 -0400)]
#18600: add policy to add_string, and as_bytes and __bytes__ methods.

This was triggered by wanting to make the doctest in email.policy.rst pass;
as_bytes and __bytes__ are clearly useful now that we have BytesGenerator.
Also updated the Message docs to document the policy keyword that was
added in 3.3.

11 years agoCloses #18671: Output more information when logging exceptions occur.
Vinay Sajip [Thu, 8 Aug 2013 17:28:53 +0000 (18:28 +0100)]
Closes #18671: Output more information when logging exceptions occur.

11 years ago#18357: merge with 3.3.
Ezio Melotti [Thu, 8 Aug 2013 17:12:57 +0000 (20:12 +0300)]
#18357: merge with 3.3.

11 years ago#18357: add tests for dictview set difference. Patch by Fraser Tweedale.
Ezio Melotti [Thu, 8 Aug 2013 17:12:28 +0000 (20:12 +0300)]
#18357: add tests for dictview set difference.  Patch by Fraser Tweedale.

11 years ago#18581: merge with 3.3.
Ezio Melotti [Thu, 8 Aug 2013 16:37:52 +0000 (19:37 +0300)]
#18581: merge with 3.3.

11 years ago#18581: remove duplicate test and run a test class that was skipped. Initial patch...
Ezio Melotti [Thu, 8 Aug 2013 16:36:36 +0000 (19:36 +0300)]
#18581: remove duplicate test and run a test class that was skipped.  Initial patch by Vajrasky Kok.

11 years agoFix a typo in PyUnicode_CopyCharacters() documentation.
Serhiy Storchaka [Thu, 8 Aug 2013 13:49:45 +0000 (16:49 +0300)]
Fix a typo in PyUnicode_CopyCharacters() documentation.

11 years agoFix a typo in PyUnicode_CopyCharacters() documentation.
Serhiy Storchaka [Thu, 8 Aug 2013 13:47:43 +0000 (16:47 +0300)]
Fix a typo in PyUnicode_CopyCharacters() documentation.

11 years ago#18267: merge with 3.3.
Ezio Melotti [Thu, 8 Aug 2013 12:46:13 +0000 (15:46 +0300)]
#18267: merge with 3.3.

11 years ago#18267: make whitespace consistent and fix an operator.
Ezio Melotti [Thu, 8 Aug 2013 12:45:56 +0000 (15:45 +0300)]
#18267: make whitespace consistent and fix an operator.

11 years ago#18273: merge with 3.3.
Ezio Melotti [Thu, 8 Aug 2013 12:18:26 +0000 (15:18 +0300)]
#18273: merge with 3.3.

11 years ago#18273: move the tests in Lib/test/json_tests to Lib/test/test_json and make them...
Ezio Melotti [Thu, 8 Aug 2013 12:03:45 +0000 (15:03 +0300)]
#18273: move the tests in Lib/test/json_tests to Lib/test/test_json and make them discoverable by unittest.  Patch by Zachary Ware.

11 years agoIssue #15301: Parsing fd, uid, and gid parameters for builtins
Larry Hastings [Thu, 8 Aug 2013 07:19:50 +0000 (00:19 -0700)]
Issue #15301: Parsing fd, uid, and gid parameters for builtins
in Modules/posixmodule.c is now far more robust.

11 years agoClosing #18668: Properly document setting m_size in PyModuleDef
Eli Bendersky [Wed, 7 Aug 2013 12:54:28 +0000 (05:54 -0700)]
Closing #18668: Properly document setting m_size in PyModuleDef

11 years agoIssue #18668: Properly document setting m_size in PyModuleDef
Eli Bendersky [Wed, 7 Aug 2013 12:52:20 +0000 (05:52 -0700)]
Issue #18668: Properly document setting m_size in PyModuleDef

11 years agoIssue #18665: fix typos. Patch by Vajrasky Kok.
Antoine Pitrou [Tue, 6 Aug 2013 21:06:59 +0000 (23:06 +0200)]
Issue #18665: fix typos.  Patch by Vajrasky Kok.

11 years agoIssue #18666: improve test_frame a bit. Patch by Vajrasky Kok.
Antoine Pitrou [Tue, 6 Aug 2013 21:05:23 +0000 (23:05 +0200)]
Issue #18666: improve test_frame a bit. Patch by Vajrasky Kok.

11 years agoNormalize whitespace
Antoine Pitrou [Tue, 6 Aug 2013 20:57:31 +0000 (22:57 +0200)]
Normalize whitespace

11 years agoIssue #18621: Prevent the site module's patched builtins from keeping too many refere...
Antoine Pitrou [Tue, 6 Aug 2013 20:56:40 +0000 (22:56 +0200)]
Issue #18621: Prevent the site module's patched builtins from keeping too many references alive for too long.

11 years agoImprove verbose reporting of shutdown phase by using the "public" module name
Antoine Pitrou [Tue, 6 Aug 2013 20:50:15 +0000 (22:50 +0200)]
Improve verbose reporting of shutdown phase by using the "public" module name

11 years agoIn _PyGC_Fini(), lose the reference that was kept to the time module
Antoine Pitrou [Tue, 6 Aug 2013 18:50:48 +0000 (20:50 +0200)]
In _PyGC_Fini(), lose the reference that was kept to the time module

11 years ago#18443: remove the TextMate entry now that the bundle has been removed and fix orderi...
Ezio Melotti [Tue, 6 Aug 2013 16:52:25 +0000 (19:52 +0300)]
#18443: remove the TextMate entry now that the bundle has been removed and fix ordering.  Patch by Févry Thibault.

11 years agoIssue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.
Christian Heimes [Tue, 6 Aug 2013 14:03:33 +0000 (16:03 +0200)]
Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.

11 years agoIssue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.
Christian Heimes [Tue, 6 Aug 2013 13:59:16 +0000 (15:59 +0200)]
Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.

11 years agoIssue #14323: Expanded the number of digits in the coefficients for the
Serhiy Storchaka [Tue, 6 Aug 2013 08:51:23 +0000 (11:51 +0300)]
Issue #14323: Expanded the number of digits in the coefficients for the
RGB -- YIQ conversions so that they match the FCC NTSC versions.

11 years agoPut the most important and most frequency accessed struct member first.
Raymond Hettinger [Tue, 6 Aug 2013 05:43:22 +0000 (22:43 -0700)]
Put the most important and most frequency accessed struct member first.

11 years agoReplace outdated optimization with clearer code that compiles better.
Raymond Hettinger [Tue, 6 Aug 2013 05:24:50 +0000 (22:24 -0700)]
Replace outdated optimization with clearer code that compiles better.

Letting the compiler decide how to optimize the multiply by five
gives it the freedom to make better choices for the best technique
for a given target machine.

For example, GCC on x86_64 produces a little bit better code:

Old-way (3 steps with a data dependency between each step):

    shrq    $5, %r13
    leaq    1(%rbx,%r13), %rax
    leaq    (%rax,%rbx,4), %rbx

New-way (3 steps with no dependency between the first two steps
         which can be run in parallel):

    leaq    (%rbx,%rbx,4), %rax     # i*5
    shrq    $5, %r13                # perturb >>= PERTURB_SHIFT
    leaq    1(%r13,%rax), %rbx      # 1 + perturb + i*5

11 years agoFollowup to 862ab99ab570: I forgot to add the magnificent test_frame.py.
Antoine Pitrou [Mon, 5 Aug 2013 21:35:43 +0000 (23:35 +0200)]
Followup to 862ab99ab570: I forgot to add the magnificent test_frame.py.

11 years agoIssue #17934: Add a clear() method to frame objects, to help clean up expensive detai...
Antoine Pitrou [Mon, 5 Aug 2013 21:26:40 +0000 (23:26 +0200)]
Issue #17934: Add a clear() method to frame objects, to help clean up expensive details (local variables) and break reference cycles.

11 years agoIssue #4885: Add weakref support to mmap objects. Patch by Valerie Lambert.
Antoine Pitrou [Mon, 5 Aug 2013 21:17:30 +0000 (23:17 +0200)]
Issue #4885: Add weakref support to mmap objects.  Patch by Valerie Lambert.

11 years ago* Fix the assertions in hashlib to use unittest assertion methods instead of
Gregory P. Smith [Mon, 5 Aug 2013 20:14:37 +0000 (13:14 -0700)]
* Fix the assertions in hashlib to use unittest assertion methods instead of
  evil assert statements.
* Add an additional assert to the new test_name_attribute test that actually
  confirms that a hash created using each h.name results in a new hash sharing
  the same name.

11 years agoIssue #18661: typo in grp.struct_group docstring (fix merged from 3.3). Thanks Vajra...
Mark Dickinson [Mon, 5 Aug 2013 16:57:54 +0000 (17:57 +0100)]
Issue #18661: typo in grp.struct_group docstring (fix merged from 3.3).  Thanks Vajrasky Kok.

11 years agoIssue #18661: typo in grp.struct_group docstring. Thanks Vajrasky Kok.
Mark Dickinson [Mon, 5 Aug 2013 16:57:01 +0000 (17:57 +0100)]
Issue #18661: typo in grp.struct_group docstring.  Thanks Vajrasky Kok.

11 years agoIssue #18659: Backed out changeset cfd875bcbe41 after buildbot failures.
Mark Dickinson [Mon, 5 Aug 2013 09:59:36 +0000 (10:59 +0100)]
Issue #18659: Backed out changeset cfd875bcbe41 after buildbot failures.

11 years agoIssue #18659: fix test_format test that wasn't being executed. Thanks Vajrasky Kok...
Mark Dickinson [Mon, 5 Aug 2013 09:30:14 +0000 (10:30 +0100)]
Issue #18659: fix test_format test that wasn't being executed.  Thanks Vajrasky Kok for the patch.

11 years ago#18657: remove duplicate entries from Misc/ACKS.
R David Murray [Sun, 4 Aug 2013 19:48:29 +0000 (15:48 -0400)]
#18657: remove duplicate entries from Misc/ACKS.

Patch by Madison May.

11 years agoSilence compiler warnings for strict function prototype declarations.
Raymond Hettinger [Sun, 4 Aug 2013 19:43:37 +0000 (12:43 -0700)]
Silence compiler warnings for strict function prototype declarations.

11 years agoIssue #18151: Replace remaining Idle 'open...close' pairs with 'with open'.
Terry Jan Reedy [Sun, 4 Aug 2013 19:39:03 +0000 (15:39 -0400)]
Issue #18151: Replace remaining Idle 'open...close' pairs with 'with open'.

11 years agoSilence compiler warning for an unused declaration
Raymond Hettinger [Sun, 4 Aug 2013 19:00:36 +0000 (12:00 -0700)]
Silence compiler warning for an unused declaration

11 years agoSilence compiler warning about an uninitialized variable
Raymond Hettinger [Sun, 4 Aug 2013 18:51:03 +0000 (11:51 -0700)]
Silence compiler warning about an uninitialized variable

11 years agoIssue 18532: Added tests and documentation to formally specify the .name attribute...
Jason R. Coombs [Sat, 3 Aug 2013 09:39:39 +0000 (11:39 +0200)]
Issue 18532: Added tests and documentation to formally specify the .name attribute on hashlib objects.

11 years agoMerge: #18657: remove duplicate entries from Misc/ACKS.
R David Murray [Sun, 4 Aug 2013 19:50:08 +0000 (15:50 -0400)]
Merge: #18657: remove duplicate entries from Misc/ACKS.

11 years agomerge
Raymond Hettinger [Sun, 4 Aug 2013 19:43:59 +0000 (12:43 -0700)]
merge

11 years agoMerge with 3.3
Terry Jan Reedy [Sun, 4 Aug 2013 19:39:32 +0000 (15:39 -0400)]
Merge with 3.3

11 years agoMerge.
Alexander Belopolsky [Sun, 4 Aug 2013 19:19:49 +0000 (15:19 -0400)]
Merge.

11 years agoReuse us_per_second in delta_total_seconds.
Alexander Belopolsky [Sun, 4 Aug 2013 19:18:58 +0000 (15:18 -0400)]
Reuse us_per_second in delta_total_seconds.

11 years agomerge
Raymond Hettinger [Sun, 4 Aug 2013 19:04:11 +0000 (12:04 -0700)]
merge

11 years agoMerge.
Alexander Belopolsky [Sun, 4 Aug 2013 18:52:42 +0000 (14:52 -0400)]
Merge.