maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[codegen/python] Don't use __all__ (#4873)

Browse source
This commit is contained in:
Komal 2020-06-24 11:41:03 -07:00 committed by GitHub
parent 31770c3300
commit ed752bc384
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
pkg/codegen/python/gen.go
View file

@ -242,46 +242,27 @@ func (mod *modContext) gen(fs fs) error {
return nil
}
func (mod *modContext) submodulesExist() bool {
if len(mod.children) <= 0 {
return false
}
if len(mod.children) == 1 && mod.children[0].mod == "config" {
return false
}
return true
}
// genInit emits an __init__.py module, optionally re-exporting other members or submodules.
func (mod *modContext) genInit(exports []string) string {
w := &bytes.Buffer{}
mod.genHeader(w, false)
// If there are subpackages, export them in the __all__ variable.
if len(mod.children) > 0 {
sort.Slice(mod.children, func(i, j int) bool {
return PyName(mod.children[i].mod) < PyName(mod.children[j].mod)
})
if mod.submodulesExist() {
fmt.Fprintf(w, "import importlib\n")
fmt.Fprintf(w, "# Make subpackages available:\n")
fmt.Fprintf(w, "__all__ = [")
for i, mod := range mod.children {
child := mod.mod
if mod.compatibility == kubernetes20 {
// Extract version suffix from child modules. Nested versions will have their own __init__.py file.
// Example: apps/v1beta1 -> v1beta1
if match := k8sVersionSuffix.FindStringSubmatchIndex(child); len(match) != 0 {
child = child[match[2]:match[3]]
}
}
if i > 0 {
fmt.Fprintf(w, ", ")
}
fmt.Fprintf(w, "'%s'", PyName(child))
}
fmt.Fprintf(w, "]\n")
fmt.Fprintf(w, "for pkg in __all__:\n")
fmt.Fprintf(w, " if pkg != 'config':\n")
fmt.Fprintf(w, " importlib.import_module(f'{__name__}.{pkg}')\n")
}
// Now, import anything to export flatly that is a direct export rather than sub-module.
// Import anything to export flatly that is a direct export rather than sub-module.
if len(exports) > 0 {
if len(mod.children) > 0 {
fmt.Fprintf(w, "\n")
}
sort.Slice(exports, func(i, j int) bool {
return PyName(exports[i]) < PyName(exports[j])
})
@ -298,6 +279,34 @@ func (mod *modContext) genInit(exports []string) string {
}
}
// If there are subpackages, import them with importlib.
if mod.submodulesExist() {
sort.Slice(mod.children, func(i, j int) bool {
return PyName(mod.children[i].mod) < PyName(mod.children[j].mod)
})
fmt.Fprintf(w, "\n# Make subpackages available:\n")
fmt.Fprintf(w, "_submodules = [\n")
for i, mod := range mod.children {
child := mod.mod
if mod.compatibility == kubernetes20 {
// Extract version suffix from child modules. Nested versions will have their own __init__.py file.
// Example: apps/v1beta1 -> v1beta1
if match := k8sVersionSuffix.FindStringSubmatchIndex(child); len(match) != 0 {
child = child[match[2]:match[3]]
}
}
if i > 0 {
fmt.Fprintf(w, ",\n")
}
fmt.Fprintf(w, " '%s'", PyName(child))
}
fmt.Fprintf(w, ",\n]\n")
fmt.Fprintf(w, "for pkg in _submodules:\n")
fmt.Fprintf(w, " if pkg != 'config':\n")
fmt.Fprintf(w, " importlib.import_module(f'{__name__}.{pkg}')\n")
}
return w.String()
}

7
sdk/python/lib/pulumi/__init__.py
View file

@ -18,8 +18,7 @@ providers and libraries in the Pulumi ecosystem use to create and manage
resources.
"""
# Make subpackages available.
__all__ = ['runtime', 'dynamic', 'policy']
import importlib
# Make all module members inside of this package available as package members.
from .asset import (
@ -86,3 +85,7 @@ from .log import (
from .stack_reference import (
StackReference,
)
# Make subpackages available.
for pkg in ['runtime', 'dynamic', 'policy']:
importlib.import_module(f'{__name__}.{pkg}')