Some pylint and pyupgrade cleanups (#29)

* Fix line endings of empty files

* Use `not in` for membership test

* Remove unused imports

* Fix implicit string concatenation

* Remove python 2 coding statement

* Change python2's Text into str

* Remove useless linebreaks

* Remove useless parentheses

* Use new-style dictionary and set constructors

* There is no more IOError (alias to OSError now)

* Use .format instead of % string interpolation

* Use super() without redundant arguments

* Remove redundant read flag from open

* Avoid building lists unnecessarily

* Use f-strings with python 3.6

* Black reformat

Co-authored-by: Michael Osthege <[email protected]>

Author: Armavica

doc/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # pytensor documentation build configuration file, created by
 # sphinx-quickstart on Tue Oct  7 16:34:06 2008.
 #

doc/extending/extending_pytensor_solution_1.py

@@ -73,7 +73,6 @@ def grad(self, inputs, output_grads):
 import numpy as np
 
 from tests import unittest_tools as utt
-from pytensor import function, printing
 from pytensor import tensor as at
 from pytensor.graph.basic import Apply
 from pytensor.graph.op import Op

doc/generate_dtype_tensor_table.py

@@ -1,5 +1,3 @@
-
-
 letters = [
     ('b', 'int8'),
     ('w', 'int16'),

doc/scripts/docgen.py

@@ -1,8 +1,6 @@
-
 import sys
 import os
 import shutil
-import inspect
 import getopt
 from collections import defaultdict
 
@@ -16,7 +14,7 @@
         sys.argv[1:],
         'o:f:',
         ['rst', 'help', 'nopdf', 'cache', 'check', 'test'])
-    options.update(dict([x, y or True] for x, y in opts))
+    options.update({x: y or True for x, y in opts})
     if options['--help']:
         print(f'Usage: {sys.argv[0]} [OPTIONS] [files...]')
         print('  -o <dir>: output the html files in the specified dir')
@@ -100,8 +98,6 @@ def call_sphinx(builder, workdir):
                 shutil.rmtree(workdir)
             except OSError as e:
                 print('OSError:', e)
-            except IOError as e:
-                print('IOError:', e)
 
     if options['--test']:
         mkdir("doc")

pytensor/_version.py

@@ -105,7 +105,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
             return None, None
     else:
         if verbose:
-            print("unable to find command, tried %s" % (commands,))
+            print(f"unable to find command, tried {commands}")
         return None, None
     stdout = process.communicate()[0].strip().decode()
     if process.returncode != 0:
@@ -155,7 +155,7 @@ def git_get_keywords(versionfile_abs):
     # _version.py.
     keywords = {}
     try:
-        with open(versionfile_abs, "r") as fobj:
+        with open(versionfile_abs) as fobj:
             for line in fobj:
                 if line.strip().startswith("git_refnames ="):
                     mo = re.search(r'=\s*"(.*)"', line)
@@ -351,7 +351,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
             if verbose:
                 fmt = "tag '%s' doesn't start with prefix '%s'"
                 print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % (
+            pieces["error"] = "tag '{}' doesn't start with prefix '{}'".format(
                 full_tag,
                 tag_prefix,
             )

pytensor/compile/debugmode.py

@@ -1604,7 +1604,7 @@ def f():
                     # storage will be None
                     if thunk_py:
                         _logger.debug(
-                            f"{i} - running thunk_py with None as " "output storage"
+                            f"{i} - running thunk_py with None as output storage"
                         )
                         try:
                             thunk_py()
@@ -2063,15 +2063,15 @@ def __init__(
                     infolog = StringIO()
                     print("Optimization process is unstable...", file=infolog)
                     print(
-                        "  (HINT: Ops that the nodes point to must compare " "equal)",
+                        "  (HINT: Ops that the nodes point to must compare equal)",
                         file=infolog,
                     )
                     print(
-                        "(event index)  (one event trace)  (other event " "trace)",
+                        "(event index)  (one event trace)  (other event trace)",
                         file=infolog,
                     )
                     print(
-                        "-------------------------------------------------" "----",
+                        "-----------------------------------------------------",
                         file=infolog,
                     )
                     for j in range(max(len(li), len(l0))):
@@ -2292,7 +2292,7 @@ def __init__(
 
         if not isinstance(linker, _DummyLinker):
             raise Exception(
-                "DebugMode can only use its own linker! You " "should not provide one.",
+                "DebugMode can only use its own linker! You should not provide one.",
                 linker,
             )
 
@@ -2318,7 +2318,7 @@ def __init__(
             self.require_matching_strides = require_matching_strides
 
         if not (self.check_c_code or self.check_py_code):
-            raise ValueError("DebugMode has to check at least one of c and py " "code")
+            raise ValueError("DebugMode has to check at least one of c and py code")
 
     def __str__(self):
         return "DebugMode(linker={}, optimizer={})".format(

pytensor/compile/function/__init__.py

@@ -300,9 +300,7 @@ def opt_log1p(node):
     if uses_tuple:
         # we must use old semantics in this case.
         if profile:
-            raise NotImplementedError(
-                "profiling not supported in old-style " "function"
-            )
+            raise NotImplementedError("profiling not supported in old-style function")
         if uses_updates or uses_givens:
             raise NotImplementedError(
                 "In() instances and tuple inputs trigger the old "

pytensor/compile/function/pfunc.py

@@ -181,7 +181,7 @@ def clone_inputs(i):
             raise TypeError("update target must be a SharedVariable", store_into)
         if store_into in update_d:
             raise ValueError(
-                "this shared variable already has an update " "expression",
+                "this shared variable already has an update expression",
                 (store_into, update_d[store_into]),
             )
 

pytensor/compile/nanguardmode.py

@@ -225,7 +225,7 @@ def do_check_on(value, nd, var=None):
                     print(pytensor.printing.debugprint(nd, file="str"), file=sio)
                 else:
                     print(
-                        "NanGuardMode found an error in an input of the " "graph.",
+                        "NanGuardMode found an error in an input of the graph.",
                         file=sio,
                     )
                 # Add the stack trace

pytensor/compile/profiling.py

@@ -1308,7 +1308,7 @@ def compute_max_stats(running_memory, stats):
 
         if len(fct_memory) > 1:
             print(
-                "Memory Profile (the max between all functions in " "that profile)",
+                "Memory Profile (the max between all functions in that profile)",
                 file=file,
             )
         else: