Merged revisions 76884-76885,76887,76889-76890,76895 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r76884 | georg.brandl | 2009-12-19 18:35:49 +0100 (Sa, 19 Dez 2009) | 9 lines
Merged revisions 76883 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76883 | georg.brandl | 2009-12-19 18:34:32 +0100 (Sa, 19 Dez 2009) | 1 line
#7521: remove Py_GetBuildNumber(), which was removed in favor of Py_GetBuildInfo().
........
................
r76885 | georg.brandl | 2009-12-19 18:36:20 +0100 (Sa, 19 Dez 2009) | 1 line
#7521: remove PyEval_GetRestricted() from the docs.
................
r76887 | georg.brandl | 2009-12-19 18:46:40 +0100 (Sa, 19 Dez 2009) | 9 lines
Recorded merge of revisions 76886 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76886 | georg.brandl | 2009-12-19 18:43:33 +0100 (Sa, 19 Dez 2009) | 1 line
#7493: review of Design FAQ by Florent Xicluna.
........
................
r76889 | georg.brandl | 2009-12-19 18:57:51 +0100 (Sa, 19 Dez 2009) | 1 line
#7499: Review of Library FAQ by Florent Xicluna.
................
r76890 | georg.brandl | 2009-12-19 18:59:59 +0100 (Sa, 19 Dez 2009) | 1 line
#7500: add "Python 3 review needed" comments and fix a few obvious errors.
................
r76895 | georg.brandl | 2009-12-19 19:23:28 +0100 (Sa, 19 Dez 2009) | 1 line
#7380: Fix some str/bytearray/bytes issues in uuid docs and implementation.
................
diff --git a/Lib/uuid.py b/Lib/uuid.py
index b17f1c8..6e687943 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -13,7 +13,7 @@
>>> import uuid
# make a UUID based on the host ID and current time
- >>> uuid.uuid1()
+ >>> uuid.uuid1() # doctest: +SKIP
UUID('a8098c1a-f86e-11da-bd1a-00112444be1e')
# make a UUID using an MD5 hash of a namespace UUID and a name
@@ -21,7 +21,7 @@
UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e')
# make a random UUID
- >>> uuid.uuid4()
+ >>> uuid.uuid4() # doctest: +SKIP
UUID('16fd2706-8baf-433b-82eb-8c7fada847da')
# make a UUID using a SHA-1 hash of a namespace UUID and a name
@@ -237,7 +237,7 @@
bytes = bytearray()
for shift in range(0, 128, 8):
bytes.insert(0, (self.int >> shift) & 0xff)
- return bytes
+ return bytes_(bytes)
@property
def bytes_le(self):