From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 14 Oct 2009 19:09:48 +0000 (+0000)
Subject: Fix py3k warnings in the uuid module
X-Git-Tag: v2.7a1~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04437ebadd8f3c086ecc920d98c4868ae1d27a35;p=python

Fix py3k warnings in the uuid module
---

diff --git a/Lib/uuid.py b/Lib/uuid.py
index 4840fa5d0f..6aaa2b4751 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -489,8 +489,8 @@ def uuid1(node=None, clock_seq=None):
     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 = int(nanoseconds//100) + 0x01b21dd213814000L
+    if _last_timestamp is not None and timestamp <= _last_timestamp:
         timestamp = _last_timestamp + 1
     _last_timestamp = timestamp
     if clock_seq is None: