##// END OF EJS Templates
py3: add __bool__ to every class defining __nonzero__...
Gregory Szorc -
r31476:413b4400 default
parent child Browse files
Show More
@@ -318,7 +318,7 b' pypats = ['
318 'legacy exception syntax; use "as" instead of ","'),
318 'legacy exception syntax; use "as" instead of ","'),
319 (r':\n( )*( ){1,3}[^ ]', "must indent 4 spaces"),
319 (r':\n( )*( ){1,3}[^ ]', "must indent 4 spaces"),
320 (r'release\(.*wlock, .*lock\)', "wrong lock release order"),
320 (r'release\(.*wlock, .*lock\)', "wrong lock release order"),
321 (r'\b__bool__\b', "__bool__ should be __nonzero__ in Python 2"),
321 (r'\bdef\s+__bool__\b', "__bool__ should be __nonzero__ in Python 2"),
322 (r'os\.path\.join\(.*, *(""|\'\')\)',
322 (r'os\.path\.join\(.*, *(""|\'\')\)',
323 "use pathutil.normasprefix(path) instead of os.path.join(path, '')"),
323 "use pathutil.normasprefix(path) instead of os.path.join(path, '')"),
324 (r'\s0[0-7]+\b', 'legacy octal syntax; use "0o" prefix instead of "0"'),
324 (r'\s0[0-7]+\b', 'legacy octal syntax; use "0o" prefix instead of "0"'),
@@ -165,6 +165,7 b' def gettimer(ui, opts=None):'
165 self.hexfunc = node.short
165 self.hexfunc = node.short
166 def __nonzero__(self):
166 def __nonzero__(self):
167 return False
167 return False
168 __bool__ = __nonzero__
168 def startitem(self):
169 def startitem(self):
169 pass
170 pass
170 def data(self, **data):
171 def data(self, **data):
@@ -296,6 +296,8 b' class lazyancestors(object):'
296 except StopIteration:
296 except StopIteration:
297 return False
297 return False
298
298
299 __bool__ = __nonzero__
300
299 def __iter__(self):
301 def __iter__(self):
300 """Generate the ancestors of _initrevs in reverse topological order.
302 """Generate the ancestors of _initrevs in reverse topological order.
301
303
@@ -271,6 +271,8 b' class unbundlerecords(object):'
271 def __nonzero__(self):
271 def __nonzero__(self):
272 return bool(self._sequences)
272 return bool(self._sequences)
273
273
274 __bool__ = __nonzero__
275
274 class bundleoperation(object):
276 class bundleoperation(object):
275 """an object that represents a single bundling process
277 """an object that represents a single bundling process
276
278
@@ -534,6 +534,8 b' class changectx(basectx):'
534 def __nonzero__(self):
534 def __nonzero__(self):
535 return self._rev != nullrev
535 return self._rev != nullrev
536
536
537 __bool__ = __nonzero__
538
537 @propertycache
539 @propertycache
538 def _changeset(self):
540 def _changeset(self):
539 return self._repo.changelog.changelogrevision(self.rev())
541 return self._repo.changelog.changelogrevision(self.rev())
@@ -722,6 +724,8 b' class basefilectx(object):'
722 # file is missing
724 # file is missing
723 return False
725 return False
724
726
727 __bool__ = __nonzero__
728
725 def __str__(self):
729 def __str__(self):
726 try:
730 try:
727 return "%s@%s" % (self.path(), self._changectx)
731 return "%s@%s" % (self.path(), self._changectx)
@@ -1238,6 +1242,8 b' class committablectx(basectx):'
1238 def __nonzero__(self):
1242 def __nonzero__(self):
1239 return True
1243 return True
1240
1244
1245 __bool__ = __nonzero__
1246
1241 def _buildflagfunc(self):
1247 def _buildflagfunc(self):
1242 # Create a fallback function for getting file flags when the
1248 # Create a fallback function for getting file flags when the
1243 # filesystem doesn't support them
1249 # filesystem doesn't support them
@@ -1711,6 +1717,8 b' class committablefilectx(basefilectx):'
1711 def __nonzero__(self):
1717 def __nonzero__(self):
1712 return True
1718 return True
1713
1719
1720 __bool__ = __nonzero__
1721
1714 def linkrev(self):
1722 def linkrev(self):
1715 # linked to self._changectx no matter if file is modified or not
1723 # linked to self._changectx no matter if file is modified or not
1716 return self.rev()
1724 return self.rev()
@@ -72,6 +72,8 b' class revnav(object):'
72 """return True if any revision to navigate over"""
72 """return True if any revision to navigate over"""
73 return self._first() is not None
73 return self._first() is not None
74
74
75 __bool__ = __nonzero__
76
75 def _first(self):
77 def _first(self):
76 """return the minimum non-filtered changeset or None"""
78 """return the minimum non-filtered changeset or None"""
77 try:
79 try:
@@ -585,6 +585,8 b' class localrepository(object):'
585 def __nonzero__(self):
585 def __nonzero__(self):
586 return True
586 return True
587
587
588 __bool__ = __nonzero__
589
588 def __len__(self):
590 def __len__(self):
589 return len(self.changelog)
591 return len(self.changelog)
590
592
@@ -431,6 +431,8 b' class manifestdict(object):'
431 # makes it easier for extensions to override.
431 # makes it easier for extensions to override.
432 return len(self._lm) != 0
432 return len(self._lm) != 0
433
433
434 __bool__ = __nonzero__
435
434 def __setitem__(self, key, node):
436 def __setitem__(self, key, node):
435 self._lm[key] = node, self.flags(key, '')
437 self._lm[key] = node, self.flags(key, '')
436
438
@@ -552,6 +552,8 b' class obsstore(object):'
552 pass
552 pass
553 return bool(self._all)
553 return bool(self._all)
554
554
555 __bool__ = __nonzero__
556
555 @property
557 @property
556 def readonly(self):
558 def readonly(self):
557 """True if marker creation is disabled
559 """True if marker creation is disabled
@@ -40,6 +40,8 b' class abstractsmartset(object):'
40 """True if the smartset is not empty"""
40 """True if the smartset is not empty"""
41 raise NotImplementedError()
41 raise NotImplementedError()
42
42
43 __bool__ = __nonzero__
44
43 def __contains__(self, rev):
45 def __contains__(self, rev):
44 """provide fast membership testing"""
46 """provide fast membership testing"""
45 raise NotImplementedError()
47 raise NotImplementedError()
@@ -267,6 +269,8 b' class baseset(abstractsmartset):'
267 def __nonzero__(self):
269 def __nonzero__(self):
268 return bool(len(self))
270 return bool(len(self))
269
271
272 __bool__ = __nonzero__
273
270 def sort(self, reverse=False):
274 def sort(self, reverse=False):
271 self._ascending = not bool(reverse)
275 self._ascending = not bool(reverse)
272 self._istopo = False
276 self._istopo = False
@@ -420,6 +424,8 b' class filteredset(abstractsmartset):'
420 return True
424 return True
421 return False
425 return False
422
426
427 __bool__ = __nonzero__
428
423 def __len__(self):
429 def __len__(self):
424 # Basic implementation to be changed in future patches.
430 # Basic implementation to be changed in future patches.
425 # until this gets improved, we use generator expression
431 # until this gets improved, we use generator expression
@@ -592,6 +598,8 b' class addset(abstractsmartset):'
592 def __nonzero__(self):
598 def __nonzero__(self):
593 return bool(self._r1) or bool(self._r2)
599 return bool(self._r1) or bool(self._r2)
594
600
601 __bool__ = __nonzero__
602
595 @util.propertycache
603 @util.propertycache
596 def _list(self):
604 def _list(self):
597 if not self._genlist:
605 if not self._genlist:
@@ -752,6 +760,8 b' class generatorset(abstractsmartset):'
752 return True
760 return True
753 return False
761 return False
754
762
763 __bool__ = __nonzero__
764
755 def __contains__(self, x):
765 def __contains__(self, x):
756 if x in self._cache:
766 if x in self._cache:
757 return self._cache[x]
767 return self._cache[x]
@@ -970,6 +980,8 b' class spanset(abstractsmartset):'
970 return True
980 return True
971 return False
981 return False
972
982
983 __bool__ = __nonzero__
984
973 def __len__(self):
985 def __len__(self):
974 if not self._hiddenrevs:
986 if not self._hiddenrevs:
975 return abs(self._end - self._start)
987 return abs(self._end - self._start)
General Comments 0
You need to be logged in to leave comments. Login now