giscanner: Use builtins module in Python 3

Add conditional import for Python 3's renamed builtins module.

https://bugzilla.gnome.org/show_bug.cgi?id=679438

2 files changed, 12 insertions, 4 deletions

diff --git a/tests/scanner/test_transformer.py b/tests/scanner/test_transformer.py
index bd85c8c3..e766d61c 100644
--- a/tests/scanner/test_transformer.py
+++ b/tests/scanner/test_transformer.py
@@ -7,7 +7,11 @@ import unittest
 import tempfile
 import os
 import sys
-import __builtin__
+
+if sys.version_info.major < 3:
+    import __builtin__ as builtins
+else:
+    import builtins
 
 
 os.environ['GI_SCANNER_DISABLE_CACHE'] = '1'
@@ -16,7 +20,7 @@ assert path is not None
 sys.path.insert(0, path)
 
 # Not correct, but enough to get the tests going uninstalled
-__builtin__.__dict__['DATADIR'] = path
+builtins.__dict__['DATADIR'] = path
 
 from giscanner import ast
 from giscanner.sourcescanner import SourceScanner
diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
index d223de09..1f7f91ec 100644
--- a/tests/warn/warningtester.py
+++ b/tests/warn/warningtester.py
@@ -3,17 +3,21 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import __builtin__
 import os
 import sys
 import difflib
 
+if sys.version_info.major < 3:
+    import __builtin__ as builtins
+else:
+    import builtins
+
 path = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
 assert path is not None
 sys.path.insert(0, path)
 
 # Not correct, but enough to get the tests going uninstalled
-__builtin__.__dict__['DATADIR'] = path
+builtins.__dict__['DATADIR'] = path
 
 from giscanner.annotationparser import GtkDocCommentBlockParser
 from giscanner.ast import Include, Namespace