[tor-commits] [tor/master] Port practracker unit tests to python 3

[asn at torproject.org]

commit 5d98b54725efb15e904ea7abacdfe85da2a82bc5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 1 14:00:48 2019 -0400

    Port practracker unit tests to python 3
---
 scripts/maint/practracker/practracker_tests.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/maint/practracker/practracker_tests.py b/scripts/maint/practracker/practracker_tests.py
index 865f68d18..45719d6cb 100755
--- a/scripts/maint/practracker/practracker_tests.py
+++ b/scripts/maint/practracker/practracker_tests.py
@@ -4,7 +4,12 @@
 
 import unittest
 
-import StringIO
+try:
+    # python 2 names the module this way...
+    from StringIO import StringIO
+except ImportError:
+    # python 3 names the module this way.
+    from io import StringIO
 
 import metrics
 
@@ -38,7 +43,7 @@ fun,(
 
 class TestFunctionLength(unittest.TestCase):
     def test_function_length(self):
-        funcs = StringIO.StringIO(function_file)
+        funcs = StringIO(function_file)
         # All functions should have length 2
         for name, lines in metrics.get_function_lines(funcs):
             self.assertEqual(name, "fun")
@@ -50,7 +55,7 @@ class TestFunctionLength(unittest.TestCase):
 
 class TestIncludeCount(unittest.TestCase):
     def test_include_count(self):
-        f = StringIO.StringIO("""
+        f = StringIO("""
   #   include <abc.h>
   #   include "def.h"
 #include "ghi.h"