mirror of
https://github.com/python/cpython.git
synced 2024-11-24 00:38:00 +01:00
00ee7baf49
which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
542 lines
20 KiB
Python
542 lines
20 KiB
Python
r"""UUID objects (universally unique identifiers) according to RFC 4122.
|
|
|
|
This module provides immutable UUID objects (class UUID) and the functions
|
|
uuid1(), uuid3(), uuid4(), uuid5() for generating version 1, 3, 4, and 5
|
|
UUIDs as specified in RFC 4122.
|
|
|
|
If all you want is a unique ID, you should probably call uuid1() or uuid4().
|
|
Note that uuid1() may compromise privacy since it creates a UUID containing
|
|
the computer's network address. uuid4() creates a random UUID.
|
|
|
|
Typical usage:
|
|
|
|
>>> import uuid
|
|
|
|
# make a UUID based on the host ID and current time
|
|
>>> uuid.uuid1()
|
|
UUID('a8098c1a-f86e-11da-bd1a-00112444be1e')
|
|
|
|
# make a UUID using an MD5 hash of a namespace UUID and a name
|
|
>>> uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org')
|
|
UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e')
|
|
|
|
# make a random UUID
|
|
>>> uuid.uuid4()
|
|
UUID('16fd2706-8baf-433b-82eb-8c7fada847da')
|
|
|
|
# make a UUID using a SHA-1 hash of a namespace UUID and a name
|
|
>>> uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org')
|
|
UUID('886313e1-3b8a-5372-9b90-0c9aee199e5d')
|
|
|
|
# make a UUID from a string of hex digits (braces and hyphens ignored)
|
|
>>> x = uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')
|
|
|
|
# convert a UUID to a string of hex digits in standard form
|
|
>>> str(x)
|
|
'00010203-0405-0607-0809-0a0b0c0d0e0f'
|
|
|
|
# get the raw 16 bytes of the UUID
|
|
>>> x.bytes
|
|
'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
|
|
|
|
# make a UUID from a 16-byte string
|
|
>>> uuid.UUID(bytes=x.bytes)
|
|
UUID('00010203-0405-0607-0809-0a0b0c0d0e0f')
|
|
"""
|
|
|
|
__author__ = 'Ka-Ping Yee <ping@zesty.ca>'
|
|
|
|
RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [
|
|
'reserved for NCS compatibility', 'specified in RFC 4122',
|
|
'reserved for Microsoft compatibility', 'reserved for future definition']
|
|
|
|
class UUID(object):
|
|
"""Instances of the UUID class represent UUIDs as specified in RFC 4122.
|
|
UUID objects are immutable, hashable, and usable as dictionary keys.
|
|
Converting a UUID to a string with str() yields something in the form
|
|
'12345678-1234-1234-1234-123456789abc'. The UUID constructor accepts
|
|
five possible forms: a similar string of hexadecimal digits, or a tuple
|
|
of six integer fields (with 32-bit, 16-bit, 16-bit, 8-bit, 8-bit, and
|
|
48-bit values respectively) as an argument named 'fields', or a string
|
|
of 16 bytes (with all the integer fields in big-endian order) as an
|
|
argument named 'bytes', or a string of 16 bytes (with the first three
|
|
fields in little-endian order) as an argument named 'bytes_le', or a
|
|
single 128-bit integer as an argument named 'int'.
|
|
|
|
UUIDs have these read-only attributes:
|
|
|
|
bytes the UUID as a 16-byte string (containing the six
|
|
integer fields in big-endian byte order)
|
|
|
|
bytes_le the UUID as a 16-byte string (with time_low, time_mid,
|
|
and time_hi_version in little-endian byte order)
|
|
|
|
fields a tuple of the six integer fields of the UUID,
|
|
which are also available as six individual attributes
|
|
and two derived attributes:
|
|
|
|
time_low the first 32 bits of the UUID
|
|
time_mid the next 16 bits of the UUID
|
|
time_hi_version the next 16 bits of the UUID
|
|
clock_seq_hi_variant the next 8 bits of the UUID
|
|
clock_seq_low the next 8 bits of the UUID
|
|
node the last 48 bits of the UUID
|
|
|
|
time the 60-bit timestamp
|
|
clock_seq the 14-bit sequence number
|
|
|
|
hex the UUID as a 32-character hexadecimal string
|
|
|
|
int the UUID as a 128-bit integer
|
|
|
|
urn the UUID as a URN as specified in RFC 4122
|
|
|
|
variant the UUID variant (one of the constants RESERVED_NCS,
|
|
RFC_4122, RESERVED_MICROSOFT, or RESERVED_FUTURE)
|
|
|
|
version the UUID version number (1 through 5, meaningful only
|
|
when the variant is RFC_4122)
|
|
"""
|
|
|
|
def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
|
|
int=None, version=None):
|
|
r"""Create a UUID from either a string of 32 hexadecimal digits,
|
|
a string of 16 bytes as the 'bytes' argument, a string of 16 bytes
|
|
in little-endian order as the 'bytes_le' argument, a tuple of six
|
|
integers (32-bit time_low, 16-bit time_mid, 16-bit time_hi_version,
|
|
8-bit clock_seq_hi_variant, 8-bit clock_seq_low, 48-bit node) as
|
|
the 'fields' argument, or a single 128-bit integer as the 'int'
|
|
argument. When a string of hex digits is given, curly braces,
|
|
hyphens, and a URN prefix are all optional. For example, these
|
|
expressions all yield the same UUID:
|
|
|
|
UUID('{12345678-1234-5678-1234-567812345678}')
|
|
UUID('12345678123456781234567812345678')
|
|
UUID('urn:uuid:12345678-1234-5678-1234-567812345678')
|
|
UUID(bytes='\x12\x34\x56\x78'*4)
|
|
UUID(bytes_le='\x78\x56\x34\x12\x34\x12\x78\x56' +
|
|
'\x12\x34\x56\x78\x12\x34\x56\x78')
|
|
UUID(fields=(0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x567812345678))
|
|
UUID(int=0x12345678123456781234567812345678)
|
|
|
|
Exactly one of 'hex', 'bytes', 'bytes_le', 'fields', or 'int' must
|
|
be given. The 'version' argument is optional; if given, the resulting
|
|
UUID will have its variant and version set according to RFC 4122,
|
|
overriding the given 'hex', 'bytes', 'bytes_le', 'fields', or 'int'.
|
|
"""
|
|
|
|
if [hex, bytes, bytes_le, fields, int].count(None) != 4:
|
|
raise TypeError('need one of hex, bytes, bytes_le, fields, or int')
|
|
if hex is not None:
|
|
hex = hex.replace('urn:', '').replace('uuid:', '')
|
|
hex = hex.strip('{}').replace('-', '')
|
|
if len(hex) != 32:
|
|
raise ValueError('badly formed hexadecimal UUID string')
|
|
int = long(hex, 16)
|
|
if bytes_le is not None:
|
|
if len(bytes_le) != 16:
|
|
raise ValueError('bytes_le is not a 16-char string')
|
|
bytes = (bytes_le[3] + bytes_le[2] + bytes_le[1] + bytes_le[0] +
|
|
bytes_le[5] + bytes_le[4] + bytes_le[7] + bytes_le[6] +
|
|
bytes_le[8:])
|
|
if bytes is not None:
|
|
if len(bytes) != 16:
|
|
raise ValueError('bytes is not a 16-char string')
|
|
int = long(('%02x'*16) % tuple(map(ord, bytes)), 16)
|
|
if fields is not None:
|
|
if len(fields) != 6:
|
|
raise ValueError('fields is not a 6-tuple')
|
|
(time_low, time_mid, time_hi_version,
|
|
clock_seq_hi_variant, clock_seq_low, node) = fields
|
|
if not 0 <= time_low < 1<<32L:
|
|
raise ValueError('field 1 out of range (need a 32-bit value)')
|
|
if not 0 <= time_mid < 1<<16L:
|
|
raise ValueError('field 2 out of range (need a 16-bit value)')
|
|
if not 0 <= time_hi_version < 1<<16L:
|
|
raise ValueError('field 3 out of range (need a 16-bit value)')
|
|
if not 0 <= clock_seq_hi_variant < 1<<8L:
|
|
raise ValueError('field 4 out of range (need an 8-bit value)')
|
|
if not 0 <= clock_seq_low < 1<<8L:
|
|
raise ValueError('field 5 out of range (need an 8-bit value)')
|
|
if not 0 <= node < 1<<48L:
|
|
raise ValueError('field 6 out of range (need a 48-bit value)')
|
|
clock_seq = (clock_seq_hi_variant << 8L) | clock_seq_low
|
|
int = ((time_low << 96L) | (time_mid << 80L) |
|
|
(time_hi_version << 64L) | (clock_seq << 48L) | node)
|
|
if int is not None:
|
|
if not 0 <= int < 1<<128L:
|
|
raise ValueError('int is out of range (need a 128-bit value)')
|
|
if version is not None:
|
|
if not 1 <= version <= 5:
|
|
raise ValueError('illegal version number')
|
|
# Set the variant to RFC 4122.
|
|
int &= ~(0xc000 << 48L)
|
|
int |= 0x8000 << 48L
|
|
# Set the version number.
|
|
int &= ~(0xf000 << 64L)
|
|
int |= version << 76L
|
|
self.__dict__['int'] = int
|
|
|
|
def __cmp__(self, other):
|
|
if isinstance(other, UUID):
|
|
return cmp(self.int, other.int)
|
|
return NotImplemented
|
|
|
|
def __hash__(self):
|
|
return hash(self.int)
|
|
|
|
def __int__(self):
|
|
return self.int
|
|
|
|
def __repr__(self):
|
|
return 'UUID(%r)' % str(self)
|
|
|
|
def __setattr__(self, name, value):
|
|
raise TypeError('UUID objects are immutable')
|
|
|
|
def __str__(self):
|
|
hex = '%032x' % self.int
|
|
return '%s-%s-%s-%s-%s' % (
|
|
hex[:8], hex[8:12], hex[12:16], hex[16:20], hex[20:])
|
|
|
|
def get_bytes(self):
|
|
bytes = ''
|
|
for shift in range(0, 128, 8):
|
|
bytes = chr((self.int >> shift) & 0xff) + bytes
|
|
return bytes
|
|
|
|
bytes = property(get_bytes)
|
|
|
|
def get_bytes_le(self):
|
|
bytes = self.bytes
|
|
return (bytes[3] + bytes[2] + bytes[1] + bytes[0] +
|
|
bytes[5] + bytes[4] + bytes[7] + bytes[6] + bytes[8:])
|
|
|
|
bytes_le = property(get_bytes_le)
|
|
|
|
def get_fields(self):
|
|
return (self.time_low, self.time_mid, self.time_hi_version,
|
|
self.clock_seq_hi_variant, self.clock_seq_low, self.node)
|
|
|
|
fields = property(get_fields)
|
|
|
|
def get_time_low(self):
|
|
return self.int >> 96L
|
|
|
|
time_low = property(get_time_low)
|
|
|
|
def get_time_mid(self):
|
|
return (self.int >> 80L) & 0xffff
|
|
|
|
time_mid = property(get_time_mid)
|
|
|
|
def get_time_hi_version(self):
|
|
return (self.int >> 64L) & 0xffff
|
|
|
|
time_hi_version = property(get_time_hi_version)
|
|
|
|
def get_clock_seq_hi_variant(self):
|
|
return (self.int >> 56L) & 0xff
|
|
|
|
clock_seq_hi_variant = property(get_clock_seq_hi_variant)
|
|
|
|
def get_clock_seq_low(self):
|
|
return (self.int >> 48L) & 0xff
|
|
|
|
clock_seq_low = property(get_clock_seq_low)
|
|
|
|
def get_time(self):
|
|
return (((self.time_hi_version & 0x0fffL) << 48L) |
|
|
(self.time_mid << 32L) | self.time_low)
|
|
|
|
time = property(get_time)
|
|
|
|
def get_clock_seq(self):
|
|
return (((self.clock_seq_hi_variant & 0x3fL) << 8L) |
|
|
self.clock_seq_low)
|
|
|
|
clock_seq = property(get_clock_seq)
|
|
|
|
def get_node(self):
|
|
return self.int & 0xffffffffffff
|
|
|
|
node = property(get_node)
|
|
|
|
def get_hex(self):
|
|
return '%032x' % self.int
|
|
|
|
hex = property(get_hex)
|
|
|
|
def get_urn(self):
|
|
return 'urn:uuid:' + str(self)
|
|
|
|
urn = property(get_urn)
|
|
|
|
def get_variant(self):
|
|
if not self.int & (0x8000 << 48L):
|
|
return RESERVED_NCS
|
|
elif not self.int & (0x4000 << 48L):
|
|
return RFC_4122
|
|
elif not self.int & (0x2000 << 48L):
|
|
return RESERVED_MICROSOFT
|
|
else:
|
|
return RESERVED_FUTURE
|
|
|
|
variant = property(get_variant)
|
|
|
|
def get_version(self):
|
|
# The version bits are only meaningful for RFC 4122 UUIDs.
|
|
if self.variant == RFC_4122:
|
|
return int((self.int >> 76L) & 0xf)
|
|
|
|
version = property(get_version)
|
|
|
|
def _find_mac(command, args, hw_identifiers, get_index):
|
|
import os
|
|
for dir in ['', '/sbin/', '/usr/sbin']:
|
|
executable = os.path.join(dir, command)
|
|
if not os.path.exists(executable):
|
|
continue
|
|
|
|
try:
|
|
# LC_ALL to get English output, 2>/dev/null to
|
|
# prevent output on stderr
|
|
cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args)
|
|
pipe = os.popen(cmd)
|
|
except IOError:
|
|
continue
|
|
|
|
for line in pipe:
|
|
words = line.lower().split()
|
|
for i in range(len(words)):
|
|
if words[i] in hw_identifiers:
|
|
return int(words[get_index(i)].replace(':', ''), 16)
|
|
return None
|
|
|
|
def _ifconfig_getnode():
|
|
"""Get the hardware address on Unix by running ifconfig."""
|
|
|
|
# This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes.
|
|
for args in ('', '-a', '-av'):
|
|
mac = _find_mac('ifconfig', args, ['hwaddr', 'ether'], lambda i: i+1)
|
|
if mac:
|
|
return mac
|
|
|
|
import socket
|
|
ip_addr = socket.gethostbyname(socket.gethostname())
|
|
|
|
# Try getting the MAC addr from arp based on our IP address (Solaris).
|
|
mac = _find_mac('arp', '-an', [ip_addr], lambda i: -1)
|
|
if mac:
|
|
return mac
|
|
|
|
# This might work on HP-UX.
|
|
mac = _find_mac('lanscan', '-ai', ['lan0'], lambda i: 0)
|
|
if mac:
|
|
return mac
|
|
|
|
return None
|
|
|
|
def _ipconfig_getnode():
|
|
"""Get the hardware address on Windows by running ipconfig.exe."""
|
|
import os, re
|
|
dirs = ['', r'c:\windows\system32', r'c:\winnt\system32']
|
|
try:
|
|
import ctypes
|
|
buffer = ctypes.create_string_buffer(300)
|
|
ctypes.windll.kernel32.GetSystemDirectoryA(buffer, 300)
|
|
dirs.insert(0, buffer.value.decode('mbcs'))
|
|
except:
|
|
pass
|
|
for dir in dirs:
|
|
try:
|
|
pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all')
|
|
except IOError:
|
|
continue
|
|
for line in pipe:
|
|
value = line.split(':')[-1].strip().lower()
|
|
if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value):
|
|
return int(value.replace('-', ''), 16)
|
|
|
|
def _netbios_getnode():
|
|
"""Get the hardware address on Windows using NetBIOS calls.
|
|
See http://support.microsoft.com/kb/118623 for details."""
|
|
import win32wnet, netbios
|
|
ncb = netbios.NCB()
|
|
ncb.Command = netbios.NCBENUM
|
|
ncb.Buffer = adapters = netbios.LANA_ENUM()
|
|
adapters._pack()
|
|
if win32wnet.Netbios(ncb) != 0:
|
|
return
|
|
adapters._unpack()
|
|
for i in range(adapters.length):
|
|
ncb.Reset()
|
|
ncb.Command = netbios.NCBRESET
|
|
ncb.Lana_num = ord(adapters.lana[i])
|
|
if win32wnet.Netbios(ncb) != 0:
|
|
continue
|
|
ncb.Reset()
|
|
ncb.Command = netbios.NCBASTAT
|
|
ncb.Lana_num = ord(adapters.lana[i])
|
|
ncb.Callname = '*'.ljust(16)
|
|
ncb.Buffer = status = netbios.ADAPTER_STATUS()
|
|
if win32wnet.Netbios(ncb) != 0:
|
|
continue
|
|
status._unpack()
|
|
bytes = map(ord, status.adapter_address)
|
|
return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +
|
|
(bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])
|
|
|
|
# Thanks to Thomas Heller for ctypes and for his help with its use here.
|
|
|
|
# If ctypes is available, use it to find system routines for UUID generation.
|
|
_uuid_generate_random = _uuid_generate_time = _UuidCreate = None
|
|
try:
|
|
import ctypes, ctypes.util
|
|
_buffer = ctypes.create_string_buffer(16)
|
|
|
|
# The uuid_generate_* routines are provided by libuuid on at least
|
|
# Linux and FreeBSD, and provided by libc on Mac OS X.
|
|
for libname in ['uuid', 'c']:
|
|
try:
|
|
lib = ctypes.CDLL(ctypes.util.find_library(libname))
|
|
except:
|
|
continue
|
|
if hasattr(lib, 'uuid_generate_random'):
|
|
_uuid_generate_random = lib.uuid_generate_random
|
|
if hasattr(lib, 'uuid_generate_time'):
|
|
_uuid_generate_time = lib.uuid_generate_time
|
|
|
|
# On Windows prior to 2000, UuidCreate gives a UUID containing the
|
|
# hardware address. On Windows 2000 and later, UuidCreate makes a
|
|
# random UUID and UuidCreateSequential gives a UUID containing the
|
|
# hardware address. These routines are provided by the RPC runtime.
|
|
# NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last
|
|
# 6 bytes returned by UuidCreateSequential are fixed, they don't appear
|
|
# to bear any relationship to the MAC address of any network device
|
|
# on the box.
|
|
try:
|
|
lib = ctypes.windll.rpcrt4
|
|
except:
|
|
lib = None
|
|
_UuidCreate = getattr(lib, 'UuidCreateSequential',
|
|
getattr(lib, 'UuidCreate', None))
|
|
except:
|
|
pass
|
|
|
|
def _unixdll_getnode():
|
|
"""Get the hardware address on Unix using ctypes."""
|
|
_uuid_generate_time(_buffer)
|
|
return UUID(bytes=_buffer.raw).node
|
|
|
|
def _windll_getnode():
|
|
"""Get the hardware address on Windows using ctypes."""
|
|
if _UuidCreate(_buffer) == 0:
|
|
return UUID(bytes=_buffer.raw).node
|
|
|
|
def _random_getnode():
|
|
"""Get a random node ID, with eighth bit set as suggested by RFC 4122."""
|
|
import random
|
|
return random.randrange(0, 1<<48L) | 0x010000000000L
|
|
|
|
_node = None
|
|
|
|
def getnode():
|
|
"""Get the hardware address as a 48-bit positive integer.
|
|
|
|
The first time this runs, it may launch a separate program, which could
|
|
be quite slow. If all attempts to obtain the hardware address fail, we
|
|
choose a random 48-bit number with its eighth bit set to 1 as recommended
|
|
in RFC 4122.
|
|
"""
|
|
|
|
global _node
|
|
if _node is not None:
|
|
return _node
|
|
|
|
import sys
|
|
if sys.platform == 'win32':
|
|
getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
|
|
else:
|
|
getters = [_unixdll_getnode, _ifconfig_getnode]
|
|
|
|
for getter in getters + [_random_getnode]:
|
|
try:
|
|
_node = getter()
|
|
except:
|
|
continue
|
|
if _node is not None:
|
|
return _node
|
|
|
|
_last_timestamp = None
|
|
|
|
def uuid1(node=None, clock_seq=None):
|
|
"""Generate a UUID from a host ID, sequence number, and the current time.
|
|
If 'node' is not given, getnode() is used to obtain the hardware
|
|
address. If 'clock_seq' is given, it is used as the sequence number;
|
|
otherwise a random 14-bit sequence number is chosen."""
|
|
|
|
# When the system provides a version-1 UUID generator, use it (but don't
|
|
# use UuidCreate here because its UUIDs don't conform to RFC 4122).
|
|
if _uuid_generate_time and node is clock_seq is None:
|
|
_uuid_generate_time(_buffer)
|
|
return UUID(bytes=_buffer.raw)
|
|
|
|
global _last_timestamp
|
|
import time
|
|
nanoseconds = int(time.time() * 1e9)
|
|
# 0x01b21dd213814000 is the number of 100-ns intervals between the
|
|
# UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
|
|
timestamp = int(nanoseconds/100) + 0x01b21dd213814000L
|
|
if timestamp <= _last_timestamp:
|
|
timestamp = _last_timestamp + 1
|
|
_last_timestamp = timestamp
|
|
if clock_seq is None:
|
|
import random
|
|
clock_seq = random.randrange(1<<14L) # instead of stable storage
|
|
time_low = timestamp & 0xffffffffL
|
|
time_mid = (timestamp >> 32L) & 0xffffL
|
|
time_hi_version = (timestamp >> 48L) & 0x0fffL
|
|
clock_seq_low = clock_seq & 0xffL
|
|
clock_seq_hi_variant = (clock_seq >> 8L) & 0x3fL
|
|
if node is None:
|
|
node = getnode()
|
|
return UUID(fields=(time_low, time_mid, time_hi_version,
|
|
clock_seq_hi_variant, clock_seq_low, node), version=1)
|
|
|
|
def uuid3(namespace, name):
|
|
"""Generate a UUID from the MD5 hash of a namespace UUID and a name."""
|
|
import md5
|
|
hash = md5.md5(namespace.bytes + name).digest()
|
|
return UUID(bytes=hash[:16], version=3)
|
|
|
|
def uuid4():
|
|
"""Generate a random UUID."""
|
|
|
|
# When the system provides a version-4 UUID generator, use it.
|
|
if _uuid_generate_random:
|
|
_uuid_generate_random(_buffer)
|
|
return UUID(bytes=_buffer.raw)
|
|
|
|
# Otherwise, get randomness from urandom or the 'random' module.
|
|
try:
|
|
import os
|
|
return UUID(bytes=os.urandom(16), version=4)
|
|
except:
|
|
import random
|
|
bytes = [chr(random.randrange(256)) for i in range(16)]
|
|
return UUID(bytes=bytes, version=4)
|
|
|
|
def uuid5(namespace, name):
|
|
"""Generate a UUID from the SHA-1 hash of a namespace UUID and a name."""
|
|
import sha
|
|
hash = sha.sha(namespace.bytes + name).digest()
|
|
return UUID(bytes=hash[:16], version=5)
|
|
|
|
# The following standard UUIDs are for use with uuid3() or uuid5().
|
|
|
|
NAMESPACE_DNS = UUID('6ba7b810-9dad-11d1-80b4-00c04fd430c8')
|
|
NAMESPACE_URL = UUID('6ba7b811-9dad-11d1-80b4-00c04fd430c8')
|
|
NAMESPACE_OID = UUID('6ba7b812-9dad-11d1-80b4-00c04fd430c8')
|
|
NAMESPACE_X500 = UUID('6ba7b814-9dad-11d1-80b4-00c04fd430c8')
|