comparison mercurial/dispatch.py @ 32158:89153b0d4881

py3: make adefaults keys str to be compatible with getattr getattr passes a str value of the attribute to be looked and keys in adefaults dict are bytes which resulted in AttributeError. This patch abuses r'' to make the keys str.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 04 May 2017 00:44:53 +0530
parents c3dcec6cbc1b
children bd872f64a8ba
comparison
equal deleted inserted replaced
32157:09fb3d3b1b3a 32158:89153b0d4881
477 def args(self): 477 def args(self):
478 args = pycompat.maplist(util.expandpath, self.givenargs) 478 args = pycompat.maplist(util.expandpath, self.givenargs)
479 return aliasargs(self.fn, args) 479 return aliasargs(self.fn, args)
480 480
481 def __getattr__(self, name): 481 def __getattr__(self, name):
482 adefaults = {'norepo': True, 'optionalrepo': False, 'inferrepo': False} 482 adefaults = {r'norepo': True,
483 r'optionalrepo': False, r'inferrepo': False}
483 if name not in adefaults: 484 if name not in adefaults:
484 raise AttributeError(name) 485 raise AttributeError(name)
485 if self.badalias or util.safehasattr(self, 'shell'): 486 if self.badalias or util.safehasattr(self, 'shell'):
486 return adefaults[name] 487 return adefaults[name]
487 return getattr(self.fn, name) 488 return getattr(self.fn, name)