suzanne.soy/cadquery-freecad-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48 from dcowden/module-changes

Browse Source 
Fixed version numbers so that you can use == to grab test for a specific...
This commit is contained in:
Jeremy Wright 2014-12-01 09:17:06 -05:00
commit d9ca06a6e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cadquery/freecad_impl/verutil.py
View File

@ -138,7 +138,7 @@ def fc_import(modulename):
_fcver = freecad_version() _fcver = freecad_version()
if _fcver >= (0, 13): if _fcver[0:2] >= (0, 13):
if modulename in _find_submodules(): if modulename in _find_submodules():
return import_module(modulename) return import_module(modulename)
elif re.sub("^FreeCAD\\.", "", modulename) in _find_submodules(): elif re.sub("^FreeCAD\\.", "", modulename) in _find_submodules():
@ -146,7 +146,7 @@ def fc_import(modulename):
else: else:
raise ImportError, "Module %s not found/allowed in %s" % ( raise ImportError, "Module %s not found/allowed in %s" % (
modulename, _PATH) modulename, _PATH)
elif _fcver >= (0, 12): elif _fcver[0:2] == (0, 12):
return import_module(modulename) return import_module(modulename)
else: else:
raise RuntimeError, "Invalid freecad version: %s" % \ raise RuntimeError, "Invalid freecad version: %s" % \