OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2026-02-23 15:49:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(types): fix incorrect nested type names

Browse Source 
There was a name-duplication which led to un-inmplemented types.

The good thing is that this was the last issue that kept all 72
APIs from compiling.
This commit is contained in:
Sebastian Thiel
2015-03-11 21:59:28 +01:00
parent 7e243936f2
commit 4f794ef5ff
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mako/lib/util.py
View File

@@ -255,7 +255,8 @@ def canonical_type_name(s):
return capitalize(s)
def nested_type_name(sn, pn):
return sn + canonical_type_name(pn)
suffix = canonical_type_name(pn)
return sn + suffix
# Make properties which are reserved keywords usable
def mangle_ident(n):
@@ -633,7 +634,7 @@ def new_context(schemas, resources):
rs = s
# end this is already a perfectly valid type
properties = s.get('properties', {rs.id: s})
properties = s.get('properties', {'': s})
for pn, p in properties.iteritems():
link_used(p, rs)
if is_nested_type_property(p):
@@ -645,12 +646,13 @@ def new_context(schemas, resources):
if 'items' in p:
ns.update((k, deepcopy(v)) for k, v in p.items.iteritems())
recurse_properties(nested_type_name(prefix, pn), ns, ns, append_unique(parent_ids, rs.id))
recurse_properties(ns.id, ns, ns, append_unique(parent_ids, rs.id))
elif _is_map_prop(p):
recurse_properties(nested_type_name(prefix, pn), rs, p.additionalProperties, append_unique(parent_ids, rs.id))
recurse_properties(nested_type_name(prefix, pn), rs,
p.additionalProperties, append_unique(parent_ids, rs.id))
elif 'items' in p:
# it's an array
recurse_properties(nested_type_name(prefix, pn), rs, p.items, append_unique(parent_ids, rs.id))
recurse_properties(nested_type_name(prefix, pn), rs,
p.items, append_unique(parent_ids, rs.id))
# end handle prop itself
# end for each property
# end utility