[Python] Format code of JupyROOT sources with ruff

Author: guitargeek

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/__init__.py

@@ -1,7 +1,7 @@
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Author: Danilo Piparo <Danilo.Piparo@cern.ch> CERN
 #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #
@@ -15,18 +15,19 @@
 
 from ROOT._jupyroot.helpers import utils
 
-if 'win32' not in sys.platform:
+if "win32" not in sys.platform:
     from ROOT._jupyroot.helpers import cppcompleter
 
 # Check if we are in the IPython shell
 try:
     import builtins
 except ImportError:
     import __builtin__ as builtins  # Py2
-_is_ipython = hasattr(builtins, '__IPYTHON__')
+_is_ipython = hasattr(builtins, "__IPYTHON__")
 
 if _is_ipython:
-    if 'win32' not in sys.platform:
+    if "win32" not in sys.platform:
         from IPython import get_ipython
+
         cppcompleter.load_ipython_extension(get_ipython())
     utils.iPythonize()

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/helpers/__init__.py

@@ -1,7 +1,7 @@
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Author: Danilo Piparo <Danilo.Piparo@cern.ch> CERN
 #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/helpers/cppcompleter.py

@@ -1,9 +1,9 @@
 # -*- coding:utf-8 -*-
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Author: Danilo Piparo <Danilo.Piparo@cern.ch> CERN
 #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #
@@ -47,8 +47,9 @@
 }
 """
 
+
 class CppCompleter(object):
-    '''
+    """
     Completer which interfaces to the TTabCom of ROOT. It is activated
     (deactivated) upon the load(unload) of the load of the extension.
 
@@ -96,7 +97,7 @@ class CppCompleter(object):
     >>> comp.deactivate()
     >>> for suggestion in comp._completeImpl("TG"):
     ...     print(suggestion)
-    '''
+    """
 
     def __init__(self):
         self.hook = None
@@ -107,7 +108,7 @@ def __init__(self):
     def activate(self):
         self.active = True
         if self.firstActivation:
-            if platform.system() == 'Windows':
+            if platform.system() == "Windows":
                 dlOpenRint = 'gInterpreter->LoadFile("libRint.dll");'
             else:
                 utils.declareCppCode('#include "dlfcn.h"')
@@ -120,22 +121,22 @@ def activate(self):
     def deactivate(self):
         self.active = False
 
-    def _getSuggestions(self,line):
+    def _getSuggestions(self, line):
         if self.active:
             return self.hook(line)
         return []
 
-    def _getLastAccessorPos(self,line):
+    def _getLastAccessorPos(self, line):
         accessorPos = -1
         for accessor in self.accessors:
             tmpAccessorPos = line.rfind(accessor)
             if accessorPos < tmpAccessorPos:
-                accessorPos = tmpAccessorPos+len(accessor)
+                accessorPos = tmpAccessorPos + len(accessor)
         return accessorPos
 
     def _completeImpl(self, line):
-        line=line.split()[-1]
-        suggestions = [ str(s) for s in self._getSuggestions(line) ]
+        line = line.split()[-1]
+        suggestions = [str(s) for s in self._getSuggestions(line)]
         suggestions = filter(lambda s: len(s.strip()) != 0, suggestions)
         suggestions = sorted(suggestions)
         if not suggestions:
@@ -144,12 +145,12 @@ def _completeImpl(self, line):
         # brackets at the end of a line. Jupyter seems to expect functions
         # without these brackets to work properly. The brackets of'operator()'
         # must not be removed
-        suggestions = [sugg[:-2] if sugg[-2:] == '()' and sugg != 'operator()' else sugg for sugg in suggestions]
-        suggestions = [sugg[:-1] if sugg[-1:] == '(' else sugg for sugg in suggestions]
+        suggestions = [sugg[:-2] if sugg[-2:] == "()" and sugg != "operator()" else sugg for sugg in suggestions]
+        suggestions = [sugg[:-1] if sugg[-1:] == "(" else sugg for sugg in suggestions]
         # If a function signature is encountered, add an empty item to the
         # suggestions. Try to guess a function signature by an opening bracket
         # ignoring 'operator()'.
-        are_signatures = "(" in "".join(filter(lambda s: s != 'operator()', suggestions))
+        are_signatures = "(" in "".join(filter(lambda s: s != "operator()", suggestions))
         accessorPos = self._getLastAccessorPos(line)
         if are_signatures:
             suggestions = [" "] + suggestions
@@ -158,26 +159,27 @@ def _completeImpl(self, line):
             # suggestion already contains the variable name, this can happen if
             # e.g. there is only one valid completion
             if len(suggestions) > 1 or line[:accessorPos] != suggestions[0][:accessorPos]:
-                suggestions = [line[:accessorPos]+sugg for sugg in suggestions]
+                suggestions = [line[:accessorPos] + sugg for sugg in suggestions]
         return suggestions
 
-    def complete(self, ip, event) :
-        '''
+    def complete(self, ip, event):
+        """
         Autocomplete interfacing to TTabCom. If an accessor of a scope is
         present in the line, the suggestions are prepended with the line.
         That's how completers work. For example:
         myGraph.Set<tab> will return "myGraph.Set+suggestion in the list of
         suggestions.
-        '''
+        """
         return self._completeImpl(event.line)
 
 
 _cppCompleter = CppCompleter()
 
+
 def load_ipython_extension(ipython):
     _cppCompleter.activate()
-    ipython.set_hook('complete_command', _cppCompleter.complete, re_key=r"[(.*)[\.,::,\->](.*)]|(.*)")
+    ipython.set_hook("complete_command", _cppCompleter.complete, re_key=r"[(.*)[\.,::,\->](.*)]|(.*)")
+
 
 def unload_ipython_extension(ipython):
     _cppCompleter.deactivate()
-

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/helpers/handlers.py

@@ -1,8 +1,8 @@
 # -*- coding:utf-8 -*-
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Authors: Danilo Piparo
 #           Omar Zapata <Omar.Zapata@cern.ch> http://oproject.org
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #
@@ -21,7 +21,7 @@
 
 
 class IOHandler(object):
-    r'''Class used to capture output from C/C++ libraries.
+    r"""Class used to capture output from C/C++ libraries.
     >>> import sys
     >>> h = IOHandler()
     >>> h.GetStdout()
@@ -31,7 +31,8 @@ class IOHandler(object):
     >>> h.GetStreamsDicts()
     (None, None)
     >>> del h
-    '''
+    """
+
     def __init__(self):
         _lib.JupyROOTExecutorHandler_Ctor()
 
@@ -51,17 +52,18 @@ def EndCapture(self):
         _lib.JupyROOTExecutorHandler_EndCapture()
 
     def GetStdout(self):
-       return _lib.JupyROOTExecutorHandler_GetStdout()
+        return _lib.JupyROOTExecutorHandler_GetStdout()
 
     def GetStderr(self):
-       return _lib.JupyROOTExecutorHandler_GetStderr()
+        return _lib.JupyROOTExecutorHandler_GetStderr()
 
     def GetStreamsDicts(self):
-       out = self.GetStdout()
-       err = self.GetStderr()
-       outDict = {'name': 'stdout', 'text': out} if out != "" else None
-       errDict = {'name': 'stderr', 'text': err} if err != "" else None
-       return outDict,errDict
+        out = self.GetStdout()
+        err = self.GetStderr()
+        outDict = {"name": "stdout", "text": out} if out != "" else None
+        errDict = {"name": "stderr", "text": err} if err != "" else None
+        return outDict, errDict
+
 
 class Poller(Thread):
     def __init__(self):
@@ -85,10 +87,11 @@ def run(self):
     def Stop(self):
         if self.is_alive():
             self.queue.put(None)
-            self.join() 
+            self.join()
+
 
 class Runner(object):
-    ''' Asynchrously run functions
+    """Asynchrously run functions
     >>> import time
     >>> def f(code):
     ...    print(code)
@@ -112,7 +115,8 @@ class Runner(object):
     >>> print(r.HasFinished())
     True
     >>> p.Stop()
-    '''
+    """
+
     def __init__(self, function, poller):
         self.function = function
         self.poller = poller
@@ -126,13 +130,14 @@ def AsyncRun(self, argument):
 
     def Wait(self):
         while self.poller.is_running:
-            timeSleep(.1)
+            timeSleep(0.1)
 
     def HasFinished(self):
         return not self.poller.is_running
 
+
 class JupyROOTDeclarer(Runner):
-    ''' Asynchrously execute declarations
+    """Asynchrously execute declarations
     >>> import ROOT
     >>> p = Poller(); p.start()
     >>> d = JupyROOTDeclarer(p)
@@ -141,34 +146,41 @@ class JupyROOTDeclarer(Runner):
     >>> ROOT.f()
     3
     >>> p.Stop()
-    '''
+    """
+
     def __init__(self, poller):
-       super(JupyROOTDeclarer, self).__init__(_lib.JupyROOTDeclarer, poller)
+        super(JupyROOTDeclarer, self).__init__(_lib.JupyROOTDeclarer, poller)
+
 
 class JupyROOTExecutor(Runner):
-    r''' Asynchrously execute process lines
+    r"""Asynchrously execute process lines
     >>> import ROOT
     >>> p = Poller(); p.start()
     >>> d = JupyROOTExecutor(p)
     >>> d.Run('cout << "Here am I" << endl;')
     1
     >>> p.Stop()
-    '''
+    """
+
     def __init__(self, poller):
-       super(JupyROOTExecutor, self).__init__(_lib.JupyROOTExecutor, poller)
+        super(JupyROOTExecutor, self).__init__(_lib.JupyROOTExecutor, poller)
+
 
 def display_drawables(displayFunction):
     drawers = helpers.utils.GetDrawers()
     for drawer in drawers:
         for dobj in drawer.GetDrawableObjects():
             displayFunction(dobj)
 
+
 class JupyROOTDisplayer(Runner):
-    ''' Display all canvases'''
+    """Display all canvases"""
+
     def __init__(self, poller):
-       super(JupyROOTDisplayer, self).__init__(display_drawables, poller)
+        super(JupyROOTDisplayer, self).__init__(display_drawables, poller)
 
-def RunAsyncAndPrint(executor, code, ioHandler, printFunction, displayFunction, silent = False, timeout = 0.1):
+
+def RunAsyncAndPrint(executor, code, ioHandler, printFunction, displayFunction, silent=False, timeout=0.1):
     ioHandler.Clear()
     ioHandler.InitCapture()
     executor.AsyncRun(code)
@@ -179,11 +191,11 @@ def RunAsyncAndPrint(executor, code, ioHandler, printFunction, displayFunction,
             ioHandler.Clear()
         if executor.HasFinished():
             break
-        timeSleep(.1)
+        timeSleep(0.1)
     executor.Wait()
     ioHandler.EndCapture()
 
+
 def Display(displayer, displayFunction):
     displayer.AsyncRun(displayFunction)
     displayer.Wait()
-

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/helpers/utils.py

@@ -610,7 +610,12 @@ def _getJsCode(self):
             options = ""
 
         thisJsCode = _jsCode.format(
-            jsCanvasWidth=width, jsCanvasHeight=height, jsonLength=len(json), jsonZip=jsonzip, jsDrawOptions=options, jsDivId=divId
+            jsCanvasWidth=width,
+            jsCanvasHeight=height,
+            jsonLength=len(json),
+            jsonZip=jsonzip,
+            jsDrawOptions=options,
+            jsDivId=divId,
         )
         return thisJsCode
 

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/html/__init__.py

@@ -1,7 +1,7 @@
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Author: Danilo Piparo <Danilo.Piparo@cern.ch> CERN
 #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/html/cpphighlighter.py

@@ -1,7 +1,7 @@
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Author: Danilo Piparo <Danilo.Piparo@cern.ch> CERN
 #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #
@@ -30,9 +30,9 @@ class CppHighlighter(Preprocessor):
     Detects and tags code cells that use the C++ language.
     """
 
-    magics = [ '%%cpp' ]
-    cpp = 'cpp'
-    python = 'python'
+    magics = ["%%cpp"]
+    cpp = "cpp"
+    python = "python"
 
     def __init__(self, config=None, **kw):
         super(CppHighlighter, self).__init__(config=config, **kw)
@@ -52,14 +52,14 @@ def matches(self, source, reg_expr):
     def _preprocess_cell_python(self, cell, resources, cell_index):
         # Mark %%cpp and %%dcl code cells as cpp
         if cell.cell_type == "code" and self.matches(cell.source, self.re_magic_language):
-            cell['metadata']['magics_language'] = self.cpp
+            cell["metadata"]["magics_language"] = self.cpp
 
         return cell, resources
 
     def _preprocess_cell_cpp(self, cell, resources, cell_index):
         # Mark all code cells as cpp
         if cell.cell_type == "code":
-            cell['metadata']['magics_language'] = self.cpp
+            cell["metadata"]["magics_language"] = self.cpp
 
         return cell, resources
 

bindings/pyroot/pythonizations/python/ROOT/_jupyroot/kernel/__init__.py

@@ -1,8 +1,8 @@
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Author: Omar Zapata <Omar.Zapata@cern.ch> http://oproject.org
 #  Author: Danilo Piparo <Danilo.Piparo@cern.ch> CERN
 #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 ################################################################################
 # Copyright (C) 1995-2020, Rene Brun and Fons Rademakers.                      #