Merge pull request #827 from penguinolog/py2_artifacts

Author: blink1073

examples/embedding/internal_ipkernel.py

@@ -20,7 +20,7 @@ def mpl_kernel(gui):
     return kernel
 
 
-class InternalIPKernel(object):
+class InternalIPKernel:
 
     def init_ipkernel(self, backend):
         # Start IPython kernel with GUI event loop and mpl support

ipykernel/comm/comm.py

@@ -50,7 +50,7 @@ def _default_topic(self):
     def __init__(self, target_name='', data=None, metadata=None, buffers=None, **kwargs):
         if target_name:
             kwargs['target_name'] = target_name
-        super(Comm, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         if self.kernel:
             if self.primary:
                 # I am primary, open my peer.

ipykernel/compiler.py

@@ -59,7 +59,7 @@ def get_file_name(code):
 class XCachingCompiler(CachingCompiler):
 
     def __init__(self, *args, **kwargs):
-        super(XCachingCompiler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.log = None
 
     def get_code_name(self, raw_code, code, number):

ipykernel/debugger.py

@@ -540,7 +540,7 @@ async def richInspectVariables(self, message):
         else:
             # The code has stopped on a breakpoint, we use the setExpression
             # request to get the rich representation of the variable
-            code = "get_ipython().display_formatter.format(" + var_name + ")"
+            code = f"get_ipython().display_formatter.format({var_name})"
             frame_id = message["arguments"]["frameId"]
             seq = message["seq"]
             reply = await self._forward_message(

ipykernel/displayhook.py

@@ -12,7 +12,7 @@
 from jupyter_client.session import extract_header, Session
 
 
-class ZMQDisplayHook(object):
+class ZMQDisplayHook:
     """A simple displayhook that publishes the object's repr over a ZeroMQ
     socket."""
     topic = b'execute_result'

ipykernel/eventloops.py

@@ -229,7 +229,7 @@ def loop_tk(kernel):
     # file handlers are not available on Windows
     if hasattr(app, 'createfilehandler'):
         # A basic wrapper for structural similarity with the Windows version
-        class BasicAppWrapper(object):
+        class BasicAppWrapper:
             def __init__(self, app):
                 self.app = app
                 self.app.withdraw()
@@ -257,7 +257,7 @@ def process_stream_events(stream, *a, **kw):
         # Tk uses milliseconds
         poll_interval = int(1000 * kernel._poll_interval)
 
-        class TimedAppWrapper(object):
+        class TimedAppWrapper:
             def __init__(self, app, func):
                 self.app = app
                 self.app.withdraw()

ipykernel/gui/gtk3embed.py

@@ -23,7 +23,7 @@
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class GTKEmbed(object):
+class GTKEmbed:
     """A class to embed a kernel into the GTK main event loop.
     """
     def __init__(self, kernel):

ipykernel/gui/gtkembed.py

@@ -21,7 +21,7 @@
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class GTKEmbed(object):
+class GTKEmbed:
     """A class to embed a kernel into the GTK main event loop.
     """
     def __init__(self, kernel):

ipykernel/inprocess/blocking.py

@@ -23,7 +23,7 @@
 class BlockingInProcessChannel(InProcessChannel):
 
     def __init__(self, *args, **kwds):
-        super(BlockingInProcessChannel, self).__init__(*args, **kwds)
+        super().__init__(*args, **kwds)
         self._in_queue = Queue()
 
     def call_handlers(self, msg):

ipykernel/inprocess/channels.py

@@ -9,12 +9,12 @@
 # Channel classes
 #-----------------------------------------------------------------------------
 
-class InProcessChannel(object):
+class InProcessChannel:
     """Base class for in-process channels."""
     proxy_methods = []
 
     def __init__(self, client=None):
-        super(InProcessChannel, self).__init__()
+        super().__init__()
         self.client = client
         self._is_alive = False
 
@@ -57,7 +57,7 @@ def process_events(self):
 
 
 
-class InProcessHBChannel(object):
+class InProcessHBChannel:
     """A dummy heartbeat channel interface for in-process kernels.
 
     Normally we use the heartbeat to check that the kernel process is alive.
@@ -68,7 +68,7 @@ class InProcessHBChannel(object):
     time_to_dead = 3.0
 
     def __init__(self, client=None):
-        super(InProcessHBChannel, self).__init__()
+        super().__init__()
         self.client = client
         self._is_alive = False
         self._pause = True