[Python-checkins] r77326 - in python/branches/py3k: Lib/decimal.py

[mark.dickinson]

Author: mark.dickinson
Date: Wed Jan  6 17:22:15 2010
New Revision: 77326

Log:
Merged revisions 77324 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77324 | mark.dickinson | 2010-01-06 16:20:22 +0000 (Wed, 06 Jan 2010) | 2 lines
  
  Add missing docstring for Context.divmod.  Thanks Juan José Conti.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/decimal.py

Modified: python/branches/py3k/Lib/decimal.py
==============================================================================
--- python/branches/py3k/Lib/decimal.py	(original)
+++ python/branches/py3k/Lib/decimal.py	Wed Jan  6 17:22:15 2010
@@ -4132,6 +4132,13 @@
         return a.__floordiv__(b, context=self)
 
     def divmod(self, a, b):
+        """Return (a // b, a % b)
+
+        >>> ExtendedContext.divmod(Decimal(8), Decimal(3))
+        (Decimal('2'), Decimal('2'))
+        >>> ExtendedContext.divmod(Decimal(8), Decimal(4))
+        (Decimal('2'), Decimal('0'))
+        """
         return a.__divmod__(b, context=self)
 
     def exp(self, a):