zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix in how class names are determined

Browse Source
This commit is contained in:
Todd Gamblin 2014-01-03 11:43:29 -08:00
parent 208db9b002
commit 30d3b32085
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/spack/spack/packages/__init__.py
View File

@ -203,7 +203,10 @@ def class_name_for_package_name(pkg_name):
conflicts don't matter because the classes are in different modules. conflicts don't matter because the classes are in different modules.
""" """
validate_package_name(pkg_name) validate_package_name(pkg_name)
class_name = string.capwords(pkg_name.replace('_', '-'), '-')
class_name = pkg_name.replace('_', '-')
class_name = string.capwords(class_name, '-')
class_name = class_name.replace('-', '')
# If a class starts with a number, prefix it with Number_ to make it a valid # If a class starts with a number, prefix it with Number_ to make it a valid
# Python class name. # Python class name.
@ -241,7 +244,7 @@ def get_class_for_package_name(pkg_name):
if not re.match(r'%s' % spack.module_path, spack.packages_path): if not re.match(r'%s' % spack.module_path, spack.packages_path):
raise RuntimeError("Packages path is not a submodule of spack.") raise RuntimeError("Packages path is not a submodule of spack.")
class_name = pkg_name.capitalize() class_name = class_name_for_package_name(pkg_name)
try: try:
module_name = "%s.%s" % (packages_module(), pkg_name) module_name = "%s.%s" % (packages_module(), pkg_name)
module = __import__(module_name, fromlist=[class_name]) module = __import__(module_name, fromlist=[class_name])