[2/3] incubator-ariatosca git commit: ARIA-392 Failing to load ruamel.yaml

[mx...@apache.org]

ARIA-392 Failing to load ruamel.yaml


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/0c4b2aa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0c4b2aa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0c4b2aa2

Branch: refs/heads/ARIA-392-Failing-to-load-ruamel.yaml
Commit: 0c4b2aa2aff17c211fcc1f7d91d162eef125bb14
Parents: 19e95f7
Author: max-orlov <ma...@gigaspaces.com>
Authored: Mon Oct 23 15:58:14 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Tue Nov 7 15:50:45 2017 +0200

----------------------------------------------------------------------
 aria/__init__.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0c4b2aa2/aria/__init__.py
----------------------------------------------------------------------
diff --git a/aria/__init__.py b/aria/__init__.py
index a059877..f04b549 100644
--- a/aria/__init__.py
+++ b/aria/__init__.py
@@ -17,14 +17,45 @@
 The ARIA root package provides entry points for extension and storage initialization.
 """
 
+import os
 import sys
+import types
 
 from pkgutil import iter_modules
 import pkg_resources
-
 aria_package_name = 'apache-ariatosca'
 __version__ = pkg_resources.get_distribution(aria_package_name).version
 
+
+
+
+try:
+    import ruamel                                           # noqa: F401
+except ImportError:
+    if sys.version_info[0] > 2:
+        raise
+
+    # Traverse all of the site-packages and try to load ruamel.
+    for packages_dir in sys.path:
+        ruamel_path = os.path.join(packages_dir, 'ruamel')
+        if not os.path.exists(ruamel_path):
+            continue
+
+        # If the top dir has an __init__.py file, the loading should have
+        # succeeded automatically
+        if os.path.exists(os.path.join(ruamel_path, '__init__.py')):
+            raise
+
+        # Dynamically create mapping to the ruamel package
+        ruamel_module = sys.modules.setdefault(
+            'ruamel',
+            types.ModuleType('ruamel')
+        )
+        # add path to the mapped package
+        ruamel_module.__dict__.setdefault('__path__', []).append(ruamel_path)
+
+
+
 from .orchestrator.decorators import workflow, operation  # pylint: disable=wrong-import-position
 from . import (  # pylint: disable=wrong-import-position
     extension,