') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [Python] Fix incorrectly capitalized mustache identifier in apis template by harmony7 · Pull Request #12045 · OpenAPITools/openapi-generator · GitHub
Skip to content

[Python] Fix incorrectly capitalized mustache identifier in apis template - #12045

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
harmony7:ruby-apis-template-fix
Apr 5, 2022
Merged

[Python] Fix incorrectly capitalized mustache identifier in apis template#12045
wing328 merged 1 commit into
OpenAPITools:masterfrom
harmony7:ruby-apis-template-fix

Conversation

@harmony7

@harmony7harmony7 commented Apr 5, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

This tiny PR fixes the spelling of an identifier that was incorrectly cased in a mustache template. The fix only affects a comment in the output, so it will make no runtime difference when consuming a generated client.

In the Python generator, the package name is available as {{packageName}}, but in src/main/resources/python/__init__apis.mustache, it was being referenced as {{packagename}}.
This produced incorrect output such as:

# In order to avoid this, import only the API that you directly need like:## from .api.my_api import MyApi

(note the missing package name)

The corrected output:

# In order to avoid this, import only the API that you directly need like:## from my_package.api.my_api import MyApi

cc @cliffano@zlx@autopp

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples: 
    ./mvnw clean package ./bin/generate-samples.sh
./bin/utils/export_docs_generators.sh
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    For Windows users, please run the script in Git BASH.
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@harmony7
harmony7 marked this pull request as ready for review April 5, 2022 03:18
@harmony7

harmony7 commented Apr 5, 2022

Copy link
Copy Markdown
ContributorAuthor

Hi, the CI is giving problems in the "samples up-to-date" step.

The details reveal a problem with a completely unrelated file, so I don't think this is a problem on my end. Can someone check the status of this for me? thanks.

@wing328wing328 changed the title [Ruby] Fix incorrectly capitalized mustache identifier in apis template[Python] Fix incorrectly capitalized mustache identifier in apis templateApr 5, 2022
@wing328

wing328 commented Apr 5, 2022

Copy link
Copy Markdown
Member

Hi, the CI is giving problems in the "samples up-to-date" step.

I've fixed that in the master.

Your PR looks good. Thanks for that.

@wing328
wing328 merged commit efc1a66 into OpenAPITools:masterApr 5, 2022
@wing328

wing328 commented Apr 5, 2022

Copy link
Copy Markdown
Member

cc @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @arun-nalla (2019/11) @spacether (2019/11) ❤️

@wing328wing328 added this to the 6.0.0 milestone Apr 5, 2022
@harmony7

harmony7 commented Apr 5, 2022

Copy link
Copy Markdown
ContributorAuthor

Yes of course this is Python. I got confused I guess, have been using different generators one after the other.

Thanks for the approval and merge, cheers =)

@harmony7
harmony7 deleted the ruby-apis-template-fix branch April 5, 2022 11:04
cachescrubber pushed a commit to cachescrubber/openapi-generator that referenced this pull request Apr 9, 2022
@harmony7Lars Uffmann
[Ruby] Fix incorrectly capitalized identifier in apis template (OpenA…
91bfb2f
…PITools#12045)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Client: PythonIssue: Non-operational

Projects

None yet

Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@harmony7@wing328