[gobject-introspection] giscanner: Use absolute_import for all Python files
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] giscanner: Use absolute_import for all Python files
- Date: Wed, 30 Sep 2015 03:08:47 +0000 (UTC)
commit 2cfccfb860bbc8c5be77792012172bceb7e8b9e2
Author: Simon Feltman <sfeltman src gnome org>
Date: Mon Apr 28 14:55:27 2014 -0700
giscanner: Use absolute_import for all Python files
Use absolute_import to ensure Python 3 compatibility of the code base.
https://bugzilla.gnome.org/show_bug.cgi?id=679438
giscanner/__init__.py | 2 +-
giscanner/annotationmain.py | 2 ++
giscanner/ast.py | 2 ++
giscanner/cachestore.py | 2 ++
giscanner/codegen.py | 1 +
giscanner/collections/__init__.py | 1 +
giscanner/docmain.py | 2 ++
giscanner/docwriter.py | 2 ++
giscanner/dumper.py | 2 ++
giscanner/gdumpparser.py | 2 ++
giscanner/girparser.py | 2 ++
giscanner/girwriter.py | 1 +
giscanner/introspectablepass.py | 1 +
giscanner/libtoolimporter.py | 2 ++
giscanner/maintransformer.py | 2 ++
giscanner/message.py | 2 ++
giscanner/scannermain.py | 2 ++
giscanner/sectionparser.py | 2 ++
giscanner/shlibs.py | 2 ++
giscanner/sourcescanner.py | 2 ++
giscanner/testcodegen.py | 2 ++
giscanner/transformer.py | 2 ++
giscanner/utils.py | 1 +
giscanner/xmlwriter.py | 1 +
misc/update-glib-annotations.py | 1 +
misc/verbump.py | 2 ++
tests/scanner/annotationparser/test_parser.py | 1 +
tests/scanner/annotationparser/test_patterns.py | 2 +-
tests/scanner/test_sourcescanner.py | 2 ++
tests/scanner/test_transformer.py | 2 ++
tests/warn/warningtester.py | 2 ++
tools/g-ir-tool-template.in | 2 +-
32 files changed, 53 insertions(+), 3 deletions(-)
---
diff --git a/giscanner/__init__.py b/giscanner/__init__.py
index 5ab7a95..139b518 100644
--- a/giscanner/__init__.py
+++ b/giscanner/__init__.py
@@ -17,7 +17,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
-
+from __future__ import absolute_import
import os
builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
if builddir is not None:
diff --git a/giscanner/annotationmain.py b/giscanner/annotationmain.py
index 618cf47..42e3c76 100644
--- a/giscanner/annotationmain.py
+++ b/giscanner/annotationmain.py
@@ -18,6 +18,8 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
+
import optparse
from giscanner import message
diff --git a/giscanner/ast.py b/giscanner/ast.py
index 9f1e4cc..a3f422c 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -19,6 +19,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import copy
from itertools import chain
diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
index bc5443d..abab276 100644
--- a/giscanner/cachestore.py
+++ b/giscanner/cachestore.py
@@ -18,6 +18,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import errno
import cPickle
import glob
diff --git a/giscanner/codegen.py b/giscanner/codegen.py
index 20e087b..1e6bcb2 100644
--- a/giscanner/codegen.py
+++ b/giscanner/codegen.py
@@ -19,6 +19,7 @@
#
from __future__ import with_statement
+from __future__ import absolute_import
from contextlib import contextmanager
diff --git a/giscanner/collections/__init__.py b/giscanner/collections/__init__.py
index aa3814a..05fdf07 100644
--- a/giscanner/collections/__init__.py
+++ b/giscanner/collections/__init__.py
@@ -18,6 +18,7 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
from .counter import Counter
from .ordereddict import OrderedDict
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
index b5baf99..de1958b 100644
--- a/giscanner/docmain.py
+++ b/giscanner/docmain.py
@@ -18,6 +18,8 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
+
import os
import argparse
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 8052a42..09915c4 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -21,6 +21,8 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
+
import os
import re
import tempfile
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 18725c8..e8d4d26 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -19,6 +19,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import os
import sys
import subprocess
diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
index 405ce28..da3e721 100644
--- a/giscanner/gdumpparser.py
+++ b/giscanner/gdumpparser.py
@@ -18,6 +18,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import os
import sys
import tempfile
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index 248e223..e8dd991 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -18,6 +18,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import os
from xml.etree.cElementTree import parse
diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 1af1ba5..8b488f4 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -20,6 +20,7 @@
#
from __future__ import with_statement
+from __future__ import absolute_import
from . import ast
from .xmlwriter import XMLWriter
diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py
index ac68b9f..6a8547d 100644
--- a/giscanner/introspectablepass.py
+++ b/giscanner/introspectablepass.py
@@ -16,6 +16,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
from . import ast
from . import message
diff --git a/giscanner/libtoolimporter.py b/giscanner/libtoolimporter.py
index c850103..1e7ff37 100644
--- a/giscanner/libtoolimporter.py
+++ b/giscanner/libtoolimporter.py
@@ -18,6 +18,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import imp
import os
import sys
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index f294982..d41a96b 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -17,6 +17,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import re
from . import ast
diff --git a/giscanner/message.py b/giscanner/message.py
index a6bdfaa..e222724 100644
--- a/giscanner/message.py
+++ b/giscanner/message.py
@@ -20,6 +20,8 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
+
import os
import sys
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 89ec193..b04bb10 100755
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -20,6 +20,8 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
+
import errno
import optparse
import os
diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py
index ed4660f..528e5c8 100644
--- a/giscanner/sectionparser.py
+++ b/giscanner/sectionparser.py
@@ -17,6 +17,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import re
from . import ast
from .utils import to_underscores
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index cd0c10f..424cad0 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -19,6 +19,8 @@
# 02110-1301, USA.
#
+from __future__ import absolute_import
+
import os
import platform
import re
diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index e66ed7d..15a9c98 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -19,6 +19,8 @@
#
from __future__ import with_statement
+from __future__ import absolute_import
+
import os
import subprocess
import tempfile
diff --git a/giscanner/testcodegen.py b/giscanner/testcodegen.py
index 5080ed1..ef12351 100644
--- a/giscanner/testcodegen.py
+++ b/giscanner/testcodegen.py
@@ -18,6 +18,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
from StringIO import StringIO
from . import ast
from .codegen import CCodeGenerator
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 133edd4..c5b0a2e 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -18,6 +18,8 @@
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
+
import os
import sys
import subprocess
diff --git a/giscanner/utils.py b/giscanner/utils.py
index e9ae0b6..bac402d 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -17,6 +17,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
+from __future__ import absolute_import
import errno
import re
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 5fdcffe..c1cca85 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -19,6 +19,7 @@
#
from __future__ import with_statement
+from __future__ import absolute_import
import os
diff --git a/misc/update-glib-annotations.py b/misc/update-glib-annotations.py
index ba1e24d..71670a3 100755
--- a/misc/update-glib-annotations.py
+++ b/misc/update-glib-annotations.py
@@ -3,6 +3,7 @@
# e.g.:
# ./update-glib-annotations.py ../../glib ../../glib/_build
+from __future__ import absolute_import
import os
import sys
diff --git a/misc/verbump.py b/misc/verbump.py
index 0c7d593..ac2e1b3 100644
--- a/misc/verbump.py
+++ b/misc/verbump.py
@@ -3,6 +3,8 @@
# * Create a git tag
# * Bump version in configure.ac and commit it
+from __future__ import absolute_import
+
import re
import os
import sys
diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py
index 99c5da7..01bd000 100644
--- a/tests/scanner/annotationparser/test_parser.py
+++ b/tests/scanner/annotationparser/test_parser.py
@@ -25,6 +25,7 @@ test_parser.py
Tests ensuring annotationparser.py continues to function correctly.
'''
+from __future__ import absolute_import
import difflib
import os
diff --git a/tests/scanner/annotationparser/test_patterns.py b/tests/scanner/annotationparser/test_patterns.py
index 738a83f..327f240 100644
--- a/tests/scanner/annotationparser/test_patterns.py
+++ b/tests/scanner/annotationparser/test_patterns.py
@@ -18,7 +18,6 @@
# 02110-1301, USA.
#
-
'''
test_patterns.py
@@ -30,6 +29,7 @@ should match, resulting symbolic groups are verified
against the expected output.
'''
+from __future__ import absolute_import
from giscanner.annotationparser import (COMMENT_BLOCK_START_RE, COMMENT_BLOCK_END_RE,
COMMENT_ASTERISK_RE, INDENTATION_RE, EMPTY_LINE_RE,
diff --git a/tests/scanner/test_sourcescanner.py b/tests/scanner/test_sourcescanner.py
index 3963683..a665554 100644
--- a/tests/scanner/test_sourcescanner.py
+++ b/tests/scanner/test_sourcescanner.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
import unittest
import tempfile
import os
diff --git a/tests/scanner/test_transformer.py b/tests/scanner/test_transformer.py
index 37dbce9..c9ca75f 100644
--- a/tests/scanner/test_transformer.py
+++ b/tests/scanner/test_transformer.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
import unittest
import tempfile
import os
diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
index b211791..4138518 100644
--- a/tests/warn/warningtester.py
+++ b/tests/warn/warningtester.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
import __builtin__
import os
import sys
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index 43eea46..343e89d 100644
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#
-
+from __future__ import absolute_import
import os
import sys
import __builtin__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]