Show More
@@ -122,6 +122,18 b' def _reportimporterror(ui, err, failed, ' | |||
|
122 | 122 | if ui.debugflag: |
|
123 | 123 | ui.traceback() |
|
124 | 124 | |
|
125 | def _rejectunicode(name, xs): | |
|
126 | if isinstance(xs, (list, set, tuple)): | |
|
127 | for x in xs: | |
|
128 | _rejectunicode(name, x) | |
|
129 | elif isinstance(xs, dict): | |
|
130 | for k, v in xs.items(): | |
|
131 | _rejectunicode(name, k) | |
|
132 | _rejectunicode(b'%s.%s' % (name, util.forcebytestr(k)), v) | |
|
133 | elif isinstance(xs, type(u'')): | |
|
134 | raise error.ProgrammingError(b"unicode %r found in %s" % (xs, name), | |
|
135 | hint="use b'' to make it byte string") | |
|
136 | ||
|
125 | 137 | # attributes set by registrar.command |
|
126 | 138 | _cmdfuncattrs = ('norepo', 'optionalrepo', 'inferrepo') |
|
127 | 139 | |
@@ -134,19 +146,22 b' def _validatecmdtable(ui, cmdtable):' | |||
|
134 | 146 | "registrar.command to register '%s'" % c, '4.6') |
|
135 | 147 | missing = [a for a in _cmdfuncattrs if not util.safehasattr(f, a)] |
|
136 | 148 | if not missing: |
|
137 | for option in e[1]: | |
|
138 | default = option[2] | |
|
139 | if isinstance(default, type(u'')): | |
|
140 | raise error.ProgrammingError( | |
|
141 | "option '%s.%s' has a unicode default value" | |
|
142 | % (c, option[1]), | |
|
143 | hint=("change the %s.%s default value to a " | |
|
144 | "non-unicode string" % (c, option[1]))) | |
|
145 | 149 | continue |
|
146 | 150 | raise error.ProgrammingError( |
|
147 | 151 | 'missing attributes: %s' % ', '.join(missing), |
|
148 | 152 | hint="use @command decorator to register '%s'" % c) |
|
149 | 153 | |
|
154 | def _validatetables(ui, mod): | |
|
155 | """Sanity check for loadable tables provided by extension module""" | |
|
156 | for t in ['cmdtable', 'colortable', 'configtable']: | |
|
157 | _rejectunicode(t, getattr(mod, t, {})) | |
|
158 | for t in ['filesetpredicate', 'internalmerge', 'revsetpredicate', | |
|
159 | 'templatefilter', 'templatefunc', 'templatekeyword']: | |
|
160 | o = getattr(mod, t, None) | |
|
161 | if o: | |
|
162 | _rejectunicode(t, o._table) | |
|
163 | _validatecmdtable(ui, getattr(mod, 'cmdtable', {})) | |
|
164 | ||
|
150 | 165 | def load(ui, name, path): |
|
151 | 166 | if name.startswith('hgext.') or name.startswith('hgext/'): |
|
152 | 167 | shortname = name[6:] |
@@ -168,7 +183,7 b' def load(ui, name, path):' | |||
|
168 | 183 | ui.warn(_('(third party extension %s requires version %s or newer ' |
|
169 | 184 | 'of Mercurial; disabling)\n') % (shortname, minver)) |
|
170 | 185 | return |
|
171 |
_validate |
|
|
186 | _validatetables(ui, mod) | |
|
172 | 187 | |
|
173 | 188 | _extensions[shortname] = mod |
|
174 | 189 | _order.append(shortname) |
@@ -1707,8 +1707,8 b' Prohibit the use of unicode strings as t' | |||
|
1707 | 1707 | > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py |
|
1708 | 1708 | > EOF |
|
1709 | 1709 | $ hg -R $TESTTMP/opt-unicode-default dummy |
|
1710 |
*** failed to import extension test_unicode_default_value from $TESTTMP/test_unicode_default_value.py: |
|
|
1711 | *** (change the dummy.opt default value to a non-unicode string) | |
|
1710 | *** failed to import extension test_unicode_default_value from $TESTTMP/test_unicode_default_value.py: unicode u'value' found in cmdtable.dummy | |
|
1711 | *** (use b'' to make it byte string) | |
|
1712 | 1712 | hg: unknown command 'dummy' |
|
1713 | 1713 | (did you mean summary?) |
|
1714 | 1714 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now