run modernizer

bootstrap.py

@@ -18,6 +18,7 @@
 use the -c option to specify an alternate configuration file.
 """
 
+from __future__ import print_function
 import os
 import shutil
 import sys
@@ -73,7 +74,7 @@
 
 options, args = parser.parse_args()
 if options.version:
-    print("bootstrap.py version %s" % __version__)
+    print(("bootstrap.py version %s" % __version__))
     sys.exit(0)
 
 
@@ -83,7 +84,7 @@
 try:
     from urllib.request import urlopen
 except ImportError:
-    from urllib2 import urlopen
+    from six.moves.urllib.request import urlopen
 
 ez = {}
 if os.path.exists('ez_setup.py'):

src/plone/app/debugtoolbar/browser/context.py

@@ -95,7 +95,7 @@ def update(self):
                 continue
 
             # FIXME: Should we include ComputedAttribute here ? [glenfant]
-            if isinstance(attr, (int, long, float, six.string_types, bool, list, tuple, dict, set, frozenset)):
+            if isinstance(attr, (int, float, six.string_types, bool, list, tuple, dict, set, frozenset)):
                 self.variables.append({
                     'name': name,
                     'primitive': True,