[LNT] Python 3 support: use Python 3 module names

Summary:
Adapt imports to use Python 3 module names by installing them as
aliases. Due to the clear separation between text and binary data in
Python 3, this also requires changing all I/O in profilev2impl to be
binary I/O with encoding/decoding for text and some adaptation to the
integer to ULEB conversion code. Installing aliases was produced by
running futurize's stage2 libfuturize.fixes.fix_future_standard_library
and further edited by hand to adapt that I/O code.

Reviewers: cmatthews, hubert.reinterpretcast, kristof.beyls, leandron, PrzemekWirkus

Reviewed By: PrzemekWirkus

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D67823

Author: Thomas Preud'homme

lnt/lnttool/admin.py

@@ -1,16 +1,18 @@
 #!/usr/bin/env python
+from future import standard_library
+standard_library.install_aliases()
 import click
 from .common import submit_options
 
 
 def _load_dependencies():
-    global yaml, sys, requests, json, os, httplib
+    global yaml, sys, requests, json, os, http
     import yaml
     import sys
     import requests
     import json
     import os
-    import httplib
+    import http.client
 
 
 def _error(msg):
@@ -101,7 +103,7 @@ def _check_response(response):
         return
 
     sys.stderr.write("%d: %s\n" %
-                     (status_code, httplib.responses.get(status_code, '')))
+                     (status_code, http.client.responses.get(status_code, '')))
     sys.stderr.write("\n%s\n" % response.text)
     sys.exit(1)
 

lnt/lnttool/viewcomparison.py

@@ -60,7 +60,7 @@ def action_view_comparison(report_a, report_b, hostname, port, dry_run,
     import os
     import shutil
     import tempfile
-    import thread
+    import _thread
 
     init_logger(logging.ERROR)
 
@@ -98,7 +98,7 @@ def action_view_comparison(report_a, report_b, hostname, port, dry_run,
             logger.info("opening comparison view: %s" % (comparison_url,))
 
             if not dry_run:
-                thread.start_new_thread(_start_browser, (comparison_url, True))
+                _thread.start_new_thread(_start_browser, (comparison_url, True))
 
             # Run the webserver.
             app = lnt.server.ui.app.App.create_with_instance(instance)

lnt/server/ui/app.py

@@ -1,5 +1,7 @@
 from __future__ import print_function
-import StringIO
+from future import standard_library
+standard_library.install_aliases()
+import io
 import logging
 import logging.handlers
 import sys
@@ -97,7 +99,7 @@ def get_db(self):
         # FIXME: Conditionalize on an is_production variable.
         show_sql = bool(self.args.get('db_log') or self.form.get('db_log'))
         if show_sql:
-            g.db_log = StringIO.StringIO()
+            g.db_log = io.StringIO()
             logger = logging.getLogger("sqlalchemy")
             logger.addHandler(logging.StreamHandler(g.db_log))
         return self.db

lnt/server/ui/filters.py

@@ -1,6 +1,6 @@
 from future import standard_library
 standard_library.install_aliases()
-import StringIO
+import io
 import datetime
 import pprint
 import urllib.parse
@@ -26,7 +26,7 @@ def filter_aspctcell(value, class_=None, style=None, attributes=None, *args,
 
 
 def filter_pprint(value):
-    stream = StringIO.StringIO()
+    stream = io.StringIO()
     pprint.pprint(value, stream)
     return stream.getvalue()
 

lnt/server/ui/views.py

@@ -1,10 +1,12 @@
+from future import standard_library
+standard_library.install_aliases()
 import datetime
 import json
 import os
 import re
 import time
 from collections import namedtuple, defaultdict
-from urlparse import urlparse, urljoin
+from urllib.parse import urlparse, urljoin
 
 import flask
 import sqlalchemy.sql

lnt/testing/profile/profilev1impl.py

@@ -1,5 +1,7 @@
+from future import standard_library
+standard_library.install_aliases()
 from lnt.testing.profile.profile import ProfileImpl
-import cPickle
+import pickle
 import zlib
 
 
@@ -48,11 +50,11 @@ def checkFile(fn):
     @staticmethod
     def deserialize(fobj):
         o = zlib.decompress(fobj.read())
-        data = cPickle.loads(o)
+        data = pickle.loads(o)
         return ProfileV1(data)
 
     def serialize(self, fname=None):
-        obj = cPickle.dumps(self.data)
+        obj = pickle.dumps(self.data)
         compressed_obj = zlib.compress(obj)
 
         if fname is None:

lnt/testing/profile/profilev2impl.py

@@ -1,7 +1,8 @@
 from __future__ import absolute_import
 from builtins import range
+from future import standard_library
+standard_library.install_aliases()
 from .profile import ProfileImpl
-import StringIO
 import bz2
 import copy
 import io
@@ -92,7 +93,7 @@ def readNum(fobj):
     n = 0
     shift = 0
     while True:
-        b = ord(fobj.read(1))
+        b = bytearray(fobj.read(1))[0]
         n |= (b & 0x7F) << shift
         shift += 7
         if (b & 0x80) == 0:
@@ -108,7 +109,7 @@ def writeNum(fobj, n):
         n >>= 7
         if n != 0:
             b |= 0x80
-        fobj.write(chr(b))
+        fobj.write(bytearray([b]))
 
         if n == 0:
             break
@@ -118,15 +119,15 @@ def readString(fobj):
     """
     Read a string from a stream.
     """
-    return fobj.readline()[:-1]
+    return fobj.readline()[:-1].decode()
 
 
 def writeString(fobj, s):
     """
     Write a string to a stream.
     """
-    fobj.write(str(s))
-    fobj.write('\n')
+    fobj.write(s.encode())
+    fobj.write(u'\n'.encode())
 
 
 def readFloat(fobj):
@@ -183,7 +184,7 @@ def copy(self):
 class CompressedSection(Section):
     def read(self, fobj):
         fobj.seek(self.offset + self.start)
-        _io = StringIO.StringIO(bz2.decompress(fobj.read(self.size)))
+        _io = io.BytesIO(bz2.decompress(fobj.read(self.size)))
         return self.deserialize(_io)
 
     def write(self, fobj):
@@ -214,12 +215,12 @@ def read(self, fobj):
             raise NotImplementedError()
 
         else:
-            _io = StringIO.StringIO(bz2.decompress(fobj.read(self.size)))
+            _io = io.BytesIO(bz2.decompress(fobj.read(self.size)))
             self.size = len(_io.getvalue())
             return self.deserialize(_io)
 
     def write(self, fobj):
-        _io = StringIO.StringIO()
+        _io = io.BytesIO()
         if self.pool_fname:
             raise NotImplementedError()
 
@@ -334,7 +335,7 @@ def setOffsetFor(self, fname, value):
 
     def extractForFunction(self, fname, counters):
         offset = self.function_offsets[fname]
-        _io = StringIO.StringIO(self.data)
+        _io = io.BytesIO(self.data)
         _io.seek(offset)
         counters.sort()
         while True:
@@ -384,7 +385,7 @@ def setOffsetFor(self, fname, value):
 
     def extractForFunction(self, fname):
         offset = self.function_offsets[fname]
-        _io = StringIO.StringIO(self.data)
+        _io = io.BytesIO(self.data)
         _io.seek(offset)
         last_address = 0
         while True:
@@ -436,7 +437,7 @@ def setOffsetFor(self, fname, value):
     def extractForFunction(self, fname):
         offset = self.function_offsets[fname]
 
-        _io = StringIO.StringIO(self.data)
+        _io = io.BytesIO(self.data)
         _io.seek(offset)
         while True:
             n = readNum(_io)
@@ -455,7 +456,7 @@ def __init__(self):
         # Populate data with a single character initially so that zero is
         # never a valid string pool index. LineText relies upon this to use
         # zero as a sentinel.
-        self.data = StringIO.StringIO('\n')
+        self.data = io.BytesIO(u'\n'.encode())
         self.pool_read = False
 
     def serialize(self, fobj):
@@ -464,7 +465,7 @@ def serialize(self, fobj):
 
     def deserialize(self, fobj):
         # FIXME: Make this lazy!
-        self.data = StringIO.StringIO(fobj.read(self.size))
+        self.data = io.BytesIO(fobj.read(self.size))
 
     def upgrade(self, impl):
         pass
@@ -591,7 +592,7 @@ def deserialize(fobj):
     def serialize(self, fname=None):
         # If we're not writing to a file, emulate a file object instead.
         if fname is None:
-            fobj = StringIO.StringIO()
+            fobj = io.BytesIO()
         else:
             fobj = open(fname, 'wb')
 
@@ -613,7 +614,7 @@ def serialize(self, fname=None):
 
         # We need to write all sections first, so we know their offset
         # before we write the header.
-        tmpio = StringIO.StringIO()
+        tmpio = io.BytesIO()
         offsets = {}
         sizes = {}
         for section in sections:

lnt/testing/util/rcs.py

@@ -1,3 +1,5 @@
+from future import standard_library
+standard_library.install_aliases()
 import re
 import os
 from lnt.util import logger

lnt/tests/compile.py

@@ -1,5 +1,7 @@
 """Single file compile-time performance testing"""
 from __future__ import print_function
+from future import standard_library
+standard_library.install_aliases()
 import errno
 import hashlib
 import json

lnt/util/wsgi_restart.py

@@ -1,18 +1,20 @@
 # This code lifted from the mod_wsgi docs.
 from __future__ import print_function
+from future import standard_library
+standard_library.install_aliases()
 import os
 import sys
 import signal
 import threading
 import atexit
-import Queue
+import queue
 
 _interval = 1.0
 _times = {}
 _files = []
 
 _running = False
-_queue = Queue.Queue()
+_queue = queue.Queue()
 _lock = threading.Lock()