Skip to content

Commit d3cdb55

Browse files
committed
revert changes that prevented import of support
1 parent 9c5a4b8 commit d3cdb55

24 files changed

Lines changed: 24 additions & 23 deletions

bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ def __getitem__(self, cls):
179179

180180
gbl.std.make_shared = make_smartptr(gbl.std.shared_ptr, gbl.std.make_shared)
181181
gbl.std.make_unique = make_smartptr(gbl.std.unique_ptr, gbl.std.make_unique)
182+
gbl.gInterpreter = gbl.TInterpreter.Instance()
182183
del make_smartptr
183184

184185

bindings/pyroot/cppyy/cppyy/test/test_aclassloader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest, os
22
from pytest import raises, mark
3-
from .support import setup_make, IS_WINDOWS
3+
from support import setup_make, IS_WINDOWS
44

55
test_dct = "libexample_cxx"
66

bindings/pyroot/cppyy/cppyy/test/test_advancedcpp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44
from pytest import mark, raises, skip
55

6-
from .support import IS_WINDOWS, ispypy, pylong, setup_make
6+
from support import IS_WINDOWS, ispypy, pylong, setup_make
77

88
test_dct = "advancedcpp_cxx"
99

bindings/pyroot/cppyy/cppyy/test/test_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22
from pytest import raises, skip
3-
from .support import ispypy
3+
from support import ispypy
44

55

66
class TestAPI:

bindings/pyroot/cppyy/cppyy/test/test_boost.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os, pytest
22
from pytest import mark, raises, skip
3-
from .support import setup_make
3+
from support import setup_make
44

55
noboost = False
66
if not (os.path.exists(os.path.join(os.path.sep, 'usr', 'include', 'boost')) or \

bindings/pyroot/cppyy/cppyy/test/test_concurrent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22
from pytest import raises, skip, mark
3-
from .support import IS_MAC_ARM, IS_WINDOWS
3+
from support import IS_MAC_ARM, IS_WINDOWS
44

55

66

bindings/pyroot/cppyy/cppyy/test/test_conversions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import py, pytest, os
22
from pytest import raises, mark
3-
from .support import setup_make, IS_WINDOWS
3+
from support import setup_make, IS_WINDOWS
44

55
test_dct = "conversions_cxx"
66

bindings/pyroot/cppyy/cppyy/test/test_cpp11features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sys, pytest, os
22
from pytest import mark, raises
3-
from .support import setup_make, ispypy, IS_MAC_ARM, IS_WINDOWS
3+
from support import setup_make, ispypy, IS_MAC_ARM, IS_WINDOWS
44

55

66
test_dct = "cpp11features_cxx"

bindings/pyroot/cppyy/cppyy/test/test_crossinheritance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os, pytest
22
from pytest import raises, skip, mark
3-
from .support import setup_make, pylong, IS_MAC_ARM, IS_WINDOWS
3+
from support import setup_make, pylong, IS_MAC_ARM, IS_WINDOWS
44

55
test_dct = "crossinheritance_cxx"
66

bindings/pyroot/cppyy/cppyy/test/test_datatypes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sys, pytest, os
22
from pytest import mark, raises, skip
3-
from .support import setup_make, pylong, pyunicode, IS_MAC, IS_MAC_ARM, IS_WINDOWS
3+
from support import setup_make, pylong, pyunicode, IS_MAC, IS_MAC_ARM, IS_WINDOWS
44

55
test_dct = "datatypes_cxx"
66

0 commit comments

Comments
 (0)