summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Feltman <sfeltman@src.gnome.org>2014-04-28 15:23:30 -0700
committerThomas A Caswell <tcaswell@gmail.com>2015-09-29 15:01:48 -0400
commit8d6456344b80fa5f8f745fc92e364ee8b6a75cbf (patch)
tree7bd2f38555b01d3f11f031595618c6c739bb3f9a
parent2cfccfb860bbc8c5be77792012172bceb7e8b9e2 (diff)
downloadgobject-introspection-8d6456344b80fa5f8f745fc92e364ee8b6a75cbf.tar.gz
giscanner: Enable "true division" for all Python files
Import Python 3 compatible "true division" from the future (PEP 238). This changes the Python 2 classic division which uses floor division on integers to true division. Verfied we don't actually use the division operator anywhere in the code base so this a safety for supporting both Python 2 and 3. https://bugzilla.gnome.org/show_bug.cgi?id=679438
-rw-r--r--giscanner/annotationmain.py1
-rw-r--r--giscanner/annotationparser.py1
-rw-r--r--giscanner/ast.py1
-rw-r--r--giscanner/cachestore.py1
-rw-r--r--giscanner/codegen.py1
-rw-r--r--giscanner/collections/__init__.py1
-rw-r--r--giscanner/docmain.py1
-rw-r--r--giscanner/docwriter.py1
-rw-r--r--giscanner/dumper.py1
-rw-r--r--giscanner/gdumpparser.py1
-rw-r--r--giscanner/girparser.py1
-rw-r--r--giscanner/girwriter.py1
-rw-r--r--giscanner/introspectablepass.py1
-rw-r--r--giscanner/libtoolimporter.py1
-rw-r--r--giscanner/maintransformer.py1
-rw-r--r--giscanner/message.py1
-rwxr-xr-xgiscanner/scannermain.py1
-rw-r--r--giscanner/sectionparser.py1
-rw-r--r--giscanner/shlibs.py1
-rw-r--r--giscanner/sourcescanner.py1
-rw-r--r--giscanner/testcodegen.py1
-rw-r--r--giscanner/transformer.py1
-rw-r--r--giscanner/utils.py1
-rwxr-xr-xgiscanner/xmlwriter.py1
-rwxr-xr-xmisc/update-glib-annotations.py1
-rw-r--r--misc/verbump.py1
-rw-r--r--tests/scanner/annotationparser/test_parser.py1
-rw-r--r--tests/scanner/annotationparser/test_patterns.py1
-rw-r--r--tests/scanner/test_sourcescanner.py1
-rw-r--r--tests/scanner/test_transformer.py1
-rw-r--r--tests/warn/warningtester.py1
-rw-r--r--tools/g-ir-tool-template.in1
32 files changed, 32 insertions, 0 deletions
diff --git a/giscanner/annotationmain.py b/giscanner/annotationmain.py
index 42e3c76d..874cd23c 100644
--- a/giscanner/annotationmain.py
+++ b/giscanner/annotationmain.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import optparse
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index e1a18003..60c96b89 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -108,6 +108,7 @@ Refer to the `GTK-Doc manual`_ for more detailed usage information.
from __future__ import absolute_import
+from __future__ import division
import os
import re
diff --git a/giscanner/ast.py b/giscanner/ast.py
index a3f422c0..9d118fd1 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -20,6 +20,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import copy
from itertools import chain
diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
index abab276b..c1ea4e89 100644
--- a/giscanner/cachestore.py
+++ b/giscanner/cachestore.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import errno
import cPickle
diff --git a/giscanner/codegen.py b/giscanner/codegen.py
index 1e6bcb2f..9e00e261 100644
--- a/giscanner/codegen.py
+++ b/giscanner/codegen.py
@@ -20,6 +20,7 @@
from __future__ import with_statement
from __future__ import absolute_import
+from __future__ import division
from contextlib import contextmanager
diff --git a/giscanner/collections/__init__.py b/giscanner/collections/__init__.py
index 05fdf072..0c7f0b0c 100644
--- a/giscanner/collections/__init__.py
+++ b/giscanner/collections/__init__.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
from .counter import Counter
from .ordereddict import OrderedDict
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
index de1958b8..3152f1b8 100644
--- a/giscanner/docmain.py
+++ b/giscanner/docmain.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import argparse
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 09915c4f..9f7ebc97 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -22,6 +22,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import re
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index e8d4d26e..9e5ba9e0 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -20,6 +20,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import sys
diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
index da3e721c..8773e883 100644
--- a/giscanner/gdumpparser.py
+++ b/giscanner/gdumpparser.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import sys
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index e8dd991d..bfa0ac09 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 8b488f45..a3447060 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -21,6 +21,7 @@
from __future__ import with_statement
from __future__ import absolute_import
+from __future__ import division
from . import ast
from .xmlwriter import XMLWriter
diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py
index 6a8547d0..8880b379 100644
--- a/giscanner/introspectablepass.py
+++ b/giscanner/introspectablepass.py
@@ -17,6 +17,7 @@
# Boston, MA 02111-1307, USA.
#
from __future__ import absolute_import
+from __future__ import division
from . import ast
from . import message
diff --git a/giscanner/libtoolimporter.py b/giscanner/libtoolimporter.py
index 1e7ff376..6ae4ec37 100644
--- a/giscanner/libtoolimporter.py
+++ b/giscanner/libtoolimporter.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import imp
import os
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index d41a96b6..c8288536 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -18,6 +18,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import re
diff --git a/giscanner/message.py b/giscanner/message.py
index e222724d..117f1957 100644
--- a/giscanner/message.py
+++ b/giscanner/message.py
@@ -21,6 +21,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import sys
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index b04bb109..63df7264 100755
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -21,6 +21,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import errno
import optparse
diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py
index 528e5c84..3ff3bf0f 100644
--- a/giscanner/sectionparser.py
+++ b/giscanner/sectionparser.py
@@ -18,6 +18,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import re
from . import ast
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index 424cad05..cd90cfb5 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -20,6 +20,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import platform
diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index 15a9c983..8f145028 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -20,6 +20,7 @@
from __future__ import with_statement
from __future__ import absolute_import
+from __future__ import division
import os
import subprocess
diff --git a/giscanner/testcodegen.py b/giscanner/testcodegen.py
index ef123517..b827a2d8 100644
--- a/giscanner/testcodegen.py
+++ b/giscanner/testcodegen.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
from StringIO import StringIO
from . import ast
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index c5b0a2eb..abead495 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -19,6 +19,7 @@
#
from __future__ import absolute_import
+from __future__ import division
import os
import sys
diff --git a/giscanner/utils.py b/giscanner/utils.py
index bac402d5..d03ca3e0 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -18,6 +18,7 @@
# Boston, MA 02111-1307, USA.
#
from __future__ import absolute_import
+from __future__ import division
import errno
import re
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index c1cca858..535bb6eb 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -20,6 +20,7 @@
from __future__ import with_statement
from __future__ import absolute_import
+from __future__ import division
import os
diff --git a/misc/update-glib-annotations.py b/misc/update-glib-annotations.py
index 71670a36..34fd3e89 100755
--- a/misc/update-glib-annotations.py
+++ b/misc/update-glib-annotations.py
@@ -4,6 +4,7 @@
# ./update-glib-annotations.py ../../glib ../../glib/_build
from __future__ import absolute_import
+from __future__ import division
import os
import sys
diff --git a/misc/verbump.py b/misc/verbump.py
index ac2e1b35..0db54452 100644
--- a/misc/verbump.py
+++ b/misc/verbump.py
@@ -4,6 +4,7 @@
# * Bump version in configure.ac and commit it
from __future__ import absolute_import
+from __future__ import division
import re
import os
diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py
index 01bd000e..17eb12b3 100644
--- a/tests/scanner/annotationparser/test_parser.py
+++ b/tests/scanner/annotationparser/test_parser.py
@@ -26,6 +26,7 @@ Tests ensuring annotationparser.py continues to function correctly.
'''
from __future__ import absolute_import
+from __future__ import division
import difflib
import os
diff --git a/tests/scanner/annotationparser/test_patterns.py b/tests/scanner/annotationparser/test_patterns.py
index 327f240d..1648a08b 100644
--- a/tests/scanner/annotationparser/test_patterns.py
+++ b/tests/scanner/annotationparser/test_patterns.py
@@ -30,6 +30,7 @@ against the expected output.
'''
from __future__ import absolute_import
+from __future__ import division
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 a6655540..0f1e4837 100644
--- a/tests/scanner/test_sourcescanner.py
+++ b/tests/scanner/test_sourcescanner.py
@@ -1,4 +1,5 @@
from __future__ import absolute_import
+from __future__ import division
import unittest
import tempfile
diff --git a/tests/scanner/test_transformer.py b/tests/scanner/test_transformer.py
index c9ca75f3..cf315809 100644
--- a/tests/scanner/test_transformer.py
+++ b/tests/scanner/test_transformer.py
@@ -1,4 +1,5 @@
from __future__ import absolute_import
+from __future__ import division
import unittest
import tempfile
diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
index 4138518a..600260d2 100644
--- a/tests/warn/warningtester.py
+++ b/tests/warn/warningtester.py
@@ -1,4 +1,5 @@
from __future__ import absolute_import
+from __future__ import division
import __builtin__
import os
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index 343e89da..b3eb29ab 100644
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -19,6 +19,7 @@
# 02110-1301, USA.
#
from __future__ import absolute_import
+from __future__ import division
import os
import sys
import __builtin__