19877230 importing native module causes python 3.4 to fail further imports from .py files s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 22 Oct 2014 15:26:11 -0700
branchs11-update
changeset 3785 6a3f91179f05
parent 3784 d6eabdbf55cb
child 3786 fa9d2da4d216
19877230 importing native module causes python 3.4 to fail further imports from .py files
components/pylint/pylint-GENFRAG.p5m
components/pylint/pylint-PYVER.p5m
components/python/python34/patches/06-solaris-64-bit.patch
--- a/components/python/python34/patches/06-solaris-64-bit.patch	Wed Oct 01 13:17:07 2014 -0700
+++ b/components/python/python34/patches/06-solaris-64-bit.patch	Wed Oct 22 15:26:11 2014 -0700
@@ -126,7 +126,7 @@
  
 --- Python-3.4.1/Lib/importlib/_bootstrap.py.~1~	2014-05-18 22:19:38.000000000 -0700
 +++ Python-3.4.1/Lib/importlib/_bootstrap.py	2014-08-27 08:46:00.145242823 -0700
[email protected]@ -2046,6 +2046,15 @@
[email protected]@ -2046,6 +2046,14 @@
                  is_namespace = _path_isdir(base_path)
          # Check for a file w/ a proper suffix exists.
          for suffix, loader_class in self._loaders:
@@ -137,7 +137,6 @@
 +                full_path = _path_join(self.path, '64', tail_module + suffix)
 +                _verbose_message('trying {}'.format(full_path), verbosity=2)
 +                if _path_isfile(full_path):
-+                    self.path += '/64'
 +                    return self._get_spec(loader_class, fullname, full_path, None, target)
              full_path = _path_join(self.path, tail_module + suffix)
              _verbose_message('trying {}'.format(full_path), verbosity=2)