@@ -181,41 +181,39 @@ def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
181181 raise ValueError ('badly formed hexadecimal UUID string' )
182182 int = int_ (hex , 16 )
183183 if bytes_le is not None :
184- if len (bytes_le ) != 16 :
185- raise ValueError ('bytes_le is not a 16-char string' )
184+ iflen (bytes_le ) != 16 :
185+ raiValueError ('bytes_le is not a 16-char string' )
186186 bytes = (bytes_le [4 - 1 ::- 1 ] + bytes_le [6 - 1 :4 - 1 :- 1 ] +
187- bytes_le [8 - 1 :6 - 1 :- 1 ] + bytes_le [8 :])
188- if bytes is not None :
189- if len (bytes ) != 16 :
190- raise ValueError ('bytes is not a 16-char string' )
191- assert isinstance (bytes , bytes_ ), repr (bytes )
187+ bytes_le [8 - 1 :6 - 1 :- 1 ] + bytes_le [8 :])ifbytes :
188+ len (bytes ) != 16 :
189+ ValueError ('bytes is not a 16-char string' )
190+ assertisinstance (bytes , bytes_ ), repr (bytes )
192191 int = int_ .from_bytes (bytes ) # big endian
193- if fields is not None :
194- if len (fields ) != 6 :
195- raise ValueError ('fields is not a 6-tuple' )
192+ len (fields ) != 6 :
193+ raiseValueError ('fields is not a 6-tuple' )
196194 (time_low , time_mid , time_hi_version ,
197195 clock_seq_hi_variant , clock_seq_low , node ) = fields
198- if not 0 <= time_low < 1 << 32 :
199- raise ValueError ('field 1 out of range (need a 32-bit value)' )
200- if not 0 <= time_mid < 1 << 16 :
201- raise ValueError ('field 2 out of range (need a 16-bit value)' )
202- if not 0 <= time_hi_version < 1 << 16 :
203- raise ValueError ('field 3 out of range (need a 16-bit value)' )
204- if not 0 <= clock_seq_hi_variant < 1 << 8 :
205- raise ValueError ('field 4 out of range (need an 8-bit value)' )
196+ ifnot 0 <= time_low < 1 << 32 :
197+ raiseValueError ('field 1 out of range (need a 32-bit value)' )
198+ ifnot0 <= time_mid < 1 << 16 :
199+ ValueError ('field 2 out of range (need a 16-bit value)' )
200+ ifnot0 <= time_hi_version < 1 << 16 :
201+ raiseValueError ('field 3 out of range (need a 16-bit value)' )
202+ ifnot0 <= clock_seq_hi_variant < 1 << 8 :
203+ raiseValueError ('field 4 out of range (need an 8-bit value)' )
206204 if not 0 <= clock_seq_low < 1 << 8 :
207- raise ValueError ('field 5 out of range (need an 8-bit value)' )
205+ raiseValueError ('field 5 out of range (need an 8-bit value)' )
208206 if not 0 <= node < 1 << 48 :
209- raise ValueError ('field 6 out of range (need a 48-bit value)' )
207+ raiseValueError ('field 6 out of range (need a 48-bit value)' )
210208 clock_seq = (clock_seq_hi_variant << 8 ) | clock_seq_low
211209 int = ((time_low << 96 ) | (time_mid << 80 ) |
212210 (time_hi_version << 64 ) | (clock_seq << 48 ) | node )
213211 if int is not None :
214212 if not 0 <= int < 1 << 128 :
215- raise ValueError ('int is out of range (need a 128-bit value)' )
213+ raiseValueError ('int is out of range (need a 128-bit value)' )
216214 if version is not None :
217215 if not 1 <= version <= 5 :
218- raise ValueError ('illegal version number' )
216+ raiseValueError ('illegal version number' )
219217 # Set the variant to RFC 4122.
220218 int &= ~ (0xc000 << 48 )
221219 int |= 0x8000 << 48
@@ -230,37 +228,36 @@ def __getstate__(self):
230228 if self .is_safe != SafeUUID .unknown :
231229 # is_safe is a SafeUUID instance. Return just its value, so that
232230 # it can be un-pickled in older Python versions without SafeUUID.
233- d ['is_safe' ] = self .is_safe .value
234- return d
231+ d ['is_safe' ] = self .is_safe .valu
235232
236- def __setstate__ (self , state ):
233+ def__setstate__ (self , state ):
237234 object .__setattr__ (self , 'int' , state ['int' ])
238235 # is_safe was added in 3.7; it is also omitted when it is "unknown"
239236 object .__setattr__ (self , 'is_safe' ,
240237 SafeUUID (state ['is_safe' ])
241238 if 'is_safe' in state else SafeUUID .unknown )
242239
243- def __eq__ (self , other ):
244- if isinstance (other , UUID ):
245- return self .int == other .int
246- return NotImplemented
240+ def__eq__ (self , other ):
241+ ifisinstance (other , UUID ):
242+ returnself .int == other .int
243+ returnNotImplemented
247244
248245 # Q. What's the value of being able to sort UUIDs?
249246 # A. Use them as keys in a B-Tree or similar mapping.
250247
251- def __lt__ (self , other ):
252- if isinstance (other , UUID ):
253- return self .int < other .int
254- return NotImplemented
248+ def__lt__ (self , other ):
249+ ifisinstance (other , UUID ):
250+ returnself .int < other .int
251+ returnNotImplemented
255252
256- def __gt__ (self , other ):
257- if isinstance (other , UUID ):
258- return self .int > other .int
259- return NotImplemented
253+ def_gt__ (self , other ):
254+ ifisinstance (other , UUID ):
255+ returnself .int > other .int
256+ returnNotImplemented
260257
261- def __le__ (self , other ):
262- if isinstance (other , UUID ):
263- return self .int <= other .int
258+ def__le__ (self , other ):
259+ ifisinstance (other , UUID ):
260+ returnself .int <= other .int
264261 return NotImplemented
265262
266263 def __ge__ (self , other ):
0 commit comments