Show More
@@ -118,6 +118,9 b' pypats = [' | |||
|
118 | 118 | "linebreak after :"), |
|
119 | 119 | (r'class\s[^(]:', "old-style class, use class foo(object)"), |
|
120 | 120 | (r'^\s+del\(', "del isn't a function"), |
|
121 | (r'\band\(', "and isn't a function"), | |
|
122 | (r'\bor\(', "or isn't a function"), | |
|
123 | (r'\bnot\(', "not isn't a function"), | |
|
121 | 124 | (r'^\s+except\(', "except isn't a function"), |
|
122 | 125 | (r',]', "unneeded trailing ',' in list"), |
|
123 | 126 | # (r'class\s[A-Z][^\(]*\((?!Exception)', |
@@ -1120,7 +1120,7 b' def debugpushkey(ui, repopath, namespace' | |||
|
1120 | 1120 | key, old, new = keyinfo |
|
1121 | 1121 | r = target.pushkey(namespace, key, old, new) |
|
1122 | 1122 | ui.status(str(r) + '\n') |
|
1123 |
return not |
|
|
1123 | return not r | |
|
1124 | 1124 | else: |
|
1125 | 1125 | for k, v in target.listkeys(namespace).iteritems(): |
|
1126 | 1126 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
@@ -111,7 +111,7 b' def _demandimport(name, globals=None, lo' | |||
|
111 | 111 | mod = getattr(mod, comp) |
|
112 | 112 | for x in fromlist: |
|
113 | 113 | # set requested submodules for demand load |
|
114 |
if not |
|
|
114 | if not hasattr(mod, x): | |
|
115 | 115 | setattr(mod, x, _demandmod(x, mod.__dict__, locals)) |
|
116 | 116 | return mod |
|
117 | 117 |
General Comments 0
You need to be logged in to leave comments.
Login now