summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorZaheer Chothia <zaheer.chothia@gmail.com>2012-10-18 13:02:48 (GMT)
committerZaheer Chothia <zaheer.chothia@gmail.com>2012-10-18 13:03:20 (GMT)
commit1d5daecfaf1853f87af1d99fb84c347576648474 (patch)
treebfaaf9021a0bfd8bf26d4788812b2a02860d11fb /misc
parentb022e789fd9b087e0acbeca502d586d49dd3e2f2 (diff)
downloadNinja-1d5daecfaf1853f87af1d99fb84c347576648474.zip
Ninja-1d5daecfaf1853f87af1d99fb84c347576648474.tar.gz
Ninja-1d5daecfaf1853f87af1d99fb84c347576648474.tar.bz2
Add support for Python 3
Diffstat (limited to 'misc')
-rw-r--r--misc/ninja_syntax.py2
-rwxr-xr-xmisc/ninja_test.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/misc/ninja_syntax.py b/misc/ninja_syntax.py
index 66babbe..3572dd9 100644
--- a/misc/ninja_syntax.py
+++ b/misc/ninja_syntax.py
@@ -71,7 +71,7 @@ class Writer(object):
if variables:
if isinstance(variables, dict):
- iterator = variables.iteritems()
+ iterator = iter(variables.items())
else:
iterator = iter(variables)
diff --git a/misc/ninja_test.py b/misc/ninja_test.py
index b56033e..2aef7ff 100755
--- a/misc/ninja_test.py
+++ b/misc/ninja_test.py
@@ -15,7 +15,11 @@
# limitations under the License.
import unittest
-from StringIO import StringIO
+
+try:
+ from StringIO import StringIO
+except ImportError:
+ from io import StringIO
import ninja_syntax