diff --git a/src/mako/api/lib/mbuild.mako b/src/mako/api/lib/mbuild.mako index 50d847ebca..3d9a6ca848 100644 --- a/src/mako/api/lib/mbuild.mako +++ b/src/mako/api/lib/mbuild.mako @@ -1,7 +1,7 @@ <%! from util import (put_and, rust_test_fn_invisible, rust_doc_test_norun, rust_doc_comment, rb_type, mb_type, singular, hub_type, to_fqan, indent_all_but_first_by, - method_params, activity_rust_type, mangle_ident, activity_input_type, get_word, + activity_rust_type, mangle_ident, activity_input_type, get_word, split_camelcase_s, property, is_pod_property, TREF, IO_REQUEST, schema_to_required_property, rust_copy_value_s, is_required_property, hide_rust_doc_test, build_all_params, REQUEST_VALUE_PROPERTY_NAME, organize_params, diff --git a/src/mako/api/lib/rbuild.mako b/src/mako/api/lib/rbuild.mako index 9c7be9e0c4..33288f81d7 100644 --- a/src/mako/api/lib/rbuild.mako +++ b/src/mako/api/lib/rbuild.mako @@ -1,6 +1,6 @@ <%! from util import (put_and, rust_test_fn_invisible, rust_doc_test_norun, rust_doc_comment, - rb_type, singular, hub_type, mangle_ident, mb_type, method_params, property, + rb_type, singular, hub_type, mangle_ident, mb_type, property, to_fqan, indent_all_but_first_by, activity_input_type, TREF, IO_REQUEST, schema_to_required_property, rust_copy_value_s, organize_params, REQUEST_VALUE_PROPERTY_NAME, diff --git a/src/mako/lib/util.py b/src/mako/lib/util.py index f0bf78a5ff..d961611ba4 100644 --- a/src/mako/lib/util.py +++ b/src/mako/lib/util.py @@ -488,7 +488,7 @@ def iter_acitivities(c): # return a list of parameter structures of all params of the given method dict # apply a prune filter to restrict the set of returned parameters. # The order will always be: partOrder + alpha -def method_params(m, required=None, location=None): +def _method_params(m, required=None, location=None): res = list() po = m.get('parameterOrder', []) for pn, p in m.get('parameters', dict()).iteritems(): @@ -563,7 +563,7 @@ def setter_fn_name(p): fn_name = 'add_' + fn_name return fn_name -# method_params(...), request_value|None -> (required_properties, optional_properties, part_prop|None) +# _method_params(...), request_value|None -> (required_properties, optional_properties, part_prop|None) def organize_params(params, request_value): part_prop = None optional_props = list() @@ -615,7 +615,7 @@ def method_media_params(m): # schemas, context, method(dict), 'request'|'response', request_prop_name -> (params, request_value|None) def build_all_params(c, m): request_value = method_request(c, m) - params = method_params(m) + params = _method_params(m) if request_value: params.insert(0, schema_to_required_property(request_value, REQUEST_VALUE_PROPERTY_NAME)) # add the delegate. It's a type parameter, which has to remain in sync with the type-parameters we actually build.