Merge pull request hexylena#69 from bernt-matthias/topic/dropins2

make loading of original module work also for environments containing "argparse2tool"

Author: bernt-matthias

argparse2tool/__init__.py

@@ -6,12 +6,17 @@
     pass
 
 
-__version__ = '0.4.8'
+__version__ = '0.4.9'
 
 
 def load_argparse():
     ARGPARSE_NUMBER = 1
-    return load_conflicting_package('argparse', 'argparse2tool', ARGPARSE_NUMBER)
+    return load_conflicting_package('argparse', 'argparse2tool/dropins', ARGPARSE_NUMBER)
+
+
+def load_click():
+    CLICK_NUMBER = 5
+    return load_conflicting_package('click', 'argparse2tool/dropins', CLICK_NUMBER)
 
 
 def load_conflicting_package(name, not_name, module_number):
@@ -37,10 +42,9 @@ def load_conflicting_package(name, not_name, module_number):
     for path in sys.path:
         try:
             (f, pathname, desc) = imp.find_module(name, [path])
-            if not_name not in pathname and desc[2] == module_number:
-                imp.load_module(random_name, f, pathname, desc)
-                return sys.modules[random_name]
-        except Exception:
-            # Many sys.paths won't contain the module of interest
-            pass
+        except ImportError:
+            continue
+        if not_name not in pathname and desc[2] == module_number:
+            imp.load_module(random_name, f, pathname, desc)
+            return sys.modules[random_name]
     return None

argparse2tool/dropins/click/__init__.py

@@ -4,11 +4,10 @@
 
 from click import click_cwl_translation as cct
 from argparse2tool.cmdline2cwl import cwl_tool as cwlt
-from argparse2tool import load_conflicting_package
+from argparse2tool import load_click
 from argparse2tool.cmdline2cwl import Arg2CWLParser
 
-CLICK_NUMBER = 5
-click = load_conflicting_package('click', 'argparse2tool', CLICK_NUMBER)
+click = load_click()
 __selfmodule__ = sys.modules[__name__]
 # This fetches a reference to ourselves
 

examples/example-click.cwl

@@ -1,5 +1,5 @@
 #!/usr/bin/env cwl-runner
-# This tool description was generated automatically by argparse2tool ver. 0.4.8
+# This tool description was generated automatically by argparse2tool ver. 0.4.9
 # To generate again: $ example-click.py --generate_cwl_tool
 # Help: $ example --help_arg2cwl