124 self.assertEqual(global_sysconfig.get_config_var('CC'), |
124 self.assertEqual(global_sysconfig.get_config_var('CC'), |
125 sysconfig.get_config_var('CC')) |
125 sysconfig.get_config_var('CC')) |
126 |
126 |
127 --- Python-3.4.1/Lib/importlib/_bootstrap.py.~1~ 2014-05-18 22:19:38.000000000 -0700 |
127 --- Python-3.4.1/Lib/importlib/_bootstrap.py.~1~ 2014-05-18 22:19:38.000000000 -0700 |
128 +++ Python-3.4.1/Lib/importlib/_bootstrap.py 2014-08-27 08:46:00.145242823 -0700 |
128 +++ Python-3.4.1/Lib/importlib/_bootstrap.py 2014-08-27 08:46:00.145242823 -0700 |
129 @@ -2046,6 +2046,15 @@ |
129 @@ -2046,6 +2046,14 @@ |
130 is_namespace = _path_isdir(base_path) |
130 is_namespace = _path_isdir(base_path) |
131 # Check for a file w/ a proper suffix exists. |
131 # Check for a file w/ a proper suffix exists. |
132 for suffix, loader_class in self._loaders: |
132 for suffix, loader_class in self._loaders: |
133 + message = 'checking {!r}: {!r}'.format(self.path, suffix) |
133 + message = 'checking {!r}: {!r}'.format(self.path, suffix) |
134 + _verbose_message(message, verbosity=2) |
134 + _verbose_message(message, verbosity=2) |
135 + # If in 64-bit mode, append /64 to the path for .so files. |
135 + # If in 64-bit mode, append /64 to the path for .so files. |
136 + if suffix.endswith('.so') and sys.maxsize != 2 ** 31 - 1: |
136 + if suffix.endswith('.so') and sys.maxsize != 2 ** 31 - 1: |
137 + full_path = _path_join(self.path, '64', tail_module + suffix) |
137 + full_path = _path_join(self.path, '64', tail_module + suffix) |
138 + _verbose_message('trying {}'.format(full_path), verbosity=2) |
138 + _verbose_message('trying {}'.format(full_path), verbosity=2) |
139 + if _path_isfile(full_path): |
139 + if _path_isfile(full_path): |
140 + self.path += '/64' |
|
141 + return self._get_spec(loader_class, fullname, full_path, None, target) |
140 + return self._get_spec(loader_class, fullname, full_path, None, target) |
142 full_path = _path_join(self.path, tail_module + suffix) |
141 full_path = _path_join(self.path, tail_module + suffix) |
143 _verbose_message('trying {}'.format(full_path), verbosity=2) |
142 _verbose_message('trying {}'.format(full_path), verbosity=2) |
144 if cache_module + suffix in cache: |
143 if cache_module + suffix in cache: |
145 --- Python-3.4.0/Lib/sysconfig.py.~1~ 2014-03-16 19:31:30.000000000 -0700 |
144 --- Python-3.4.0/Lib/sysconfig.py.~1~ 2014-03-16 19:31:30.000000000 -0700 |