From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Aug 2019 18:00:48 +0000 (-0400)
Subject: Port practracker unit tests to python 3
X-Git-Tag: tor-0.4.2.1-alpha~107^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d98b54725efb15e904ea7abacdfe85da2a82bc5;p=thirdparty%2Ftor.git

Port practracker unit tests to python 3
---

diff --git a/scripts/maint/practracker/practracker_tests.py b/scripts/maint/practracker/practracker_tests.py
index 865f68d186..45719d6cb7 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"