Merge pull request #6350 from fchapoton/minor_old_py2

remove traces of python2 ; other ruff UP fixes

Author: edgarcosta

lmfdb/artin_representations/math_classes.py

@@ -424,7 +424,7 @@ def GaloisLabel(self):
         return self._data['GaloisLabel']
 
     def group(self):
-        n, t = [int(z) for z in self._data['GaloisLabel'].split("T")]
+        n, t = (int(z) for z in self._data['GaloisLabel'].split("T"))
         return group_display_short(n, t)
 
     def pretty_galois_knowl(self):

lmfdb/knowledge/knowl.py

@@ -1,10 +1,10 @@
 # the basic knowledge object, with database awareness, …
 
-from datetime import datetime, timedelta
 from collections import defaultdict
-import time
+from datetime import datetime, timedelta
+import re
 import subprocess
-import sys
+import time
 
 from psycodict.base import PostgresBase
 from psycodict import DelayCommit
@@ -17,7 +17,7 @@
 from psycopg2.sql import SQL, Identifier, Placeholder
 from sage.all import cached_function
 
-import re
+
 text_keywords = re.compile(r"\b[a-zA-Z0-9-]{3,}\b")
 top_knowl_re = re.compile(r"(.*)\.top$")
 comment_knowl_re = re.compile(r"(.*)\.(\d+)\.comment$")
@@ -582,11 +582,8 @@ def code_references(self, knowl):
         matches = []
         for kid in kids:
             try:
-                if sys.version_info[0] == 3:
-                    matches.extend(subprocess.check_output(['git', 'grep', '--full-name', '--line-number', '--context', '2', """['"]%s['"]""" % (kid.replace('.',r'\.'))],encoding='utf-8').split('\n--\n'))
-                else:
-                    matches.extend(subprocess.check_output(['git', 'grep', '--full-name', '--line-number', '--context', '2', """['"]%s['"]""" % (kid.replace('.',r'\.'))]).split('\n--\n'))
-            except subprocess.CalledProcessError: # no matches
+                matches.extend(subprocess.check_output(['git', 'grep', '--full-name', '--line-number', '--context', '2', """['"]%s['"]""" % (kid.replace('.',r'\.'))],encoding='utf-8').split('\n--\n'))
+            except subprocess.CalledProcessError:  # no matches
                 pass
         return [self._process_git_grep(match) for match in matches]
 
@@ -600,11 +597,8 @@ def check_sed_safety(self, knowlid):
         - -1 if the knowl is referenced but cannot be safely replaced.
         """
         try:
-            if sys.version_info[0] == 3:
-                matches = subprocess.check_output(['git', 'grep', """['"]%s['"]""" % (knowlid.replace('.',r'\.'))],encoding='utf-8').split('\n')
-            else:
-                matches = subprocess.check_output(['git', 'grep', """['"]%s['"]""" % (knowlid.replace('.',r'\.'))]).split('\n')
-        except subprocess.CalledProcessError: # no matches
+            matches = subprocess.check_output(['git', 'grep', """['"]%s['"]""" % (knowlid.replace('.',r'\.'))],encoding='utf-8').split('\n')
+        except subprocess.CalledProcessError:  # no matches
             return 0
 
         easy_matches = subprocess.check_output(['git', 'grep', knowlid.replace('.',r'\.')],encoding='utf-8').split('\n')
@@ -705,10 +699,7 @@ def broken_links_code(self):
         ids that show up in an expression of the form ``KNOWL('BAD_ID')``.
         """
         all_kids = {k['id'] for k in self.get_all_knowls(['id'])}
-        if sys.version_info[0] == 3:
-            matches = subprocess.check_output(['git', 'grep', '-E', '--full-name', '--line-number', '--context', '2', link_finder_re.pattern],encoding='utf-8').split('\n--\n')
-        else:
-            matches = subprocess.check_output(['git', 'grep', '-E', '--full-name', '--line-number', '--context', '2', link_finder_re.pattern]).split('\n--\n')
+        matches = subprocess.check_output(['git', 'grep', '-E', '--full-name', '--line-number', '--context', '2', link_finder_re.pattern],encoding='utf-8').split('\n--\n')
         results = []
         for match in matches:
             lines = match.split('\n')

lmfdb/nfutils/psort.py

@@ -170,7 +170,7 @@ def prime_label(P):
 def prime_from_label(K, lab):
     """Return the prime of K from a label, or 0 is there is no such prime
     """
-    n, j = [ZZ(c) for c in lab.split(".")]
+    n, j = (ZZ(c) for c in lab.split("."))
     p, f = n.factor()[0]
     make_keys(K,p)
     d = K.psort_dict[p]
@@ -316,15 +316,17 @@ def ppower_norm_ideal_key(Q):
     """
     return (Q.norm(), ppower_norm_ideal_index(Q))
 
+
 def ppower_norm_ideal_label(Q):
     r""" return the label of an ideal of prime-power norm.
     """
     return "{}.{}".format(Q.norm(),ppower_norm_ideal_index(Q))
 
+
 def ppower_norm_ideal_from_label(K,lab):
     r""" return the ideal of prime-power norm from its label.
     """
-    n, i = [int(c) for c in lab.split(".")]
+    n, i = (int(c) for c in lab.split("."))
     p, f = ZZ(n).factor()[0]
     make_keys(K,p)
     PP = K.primes_dict[p]
@@ -369,12 +371,14 @@ def ideal_label(I):
     """
     return "{}.{}".format(I.norm(),ideal_norm_index(I))
 
+
 def ideal_from_label(K,lab):
     r""" Return the ideal with a given label.
     """
-    n, j = [int(c) for c in lab.split(".")]
+    n, j = (int(c) for c in lab.split("."))
     return ideals_of_norm(K,ZZ(n))[j-1]
 
+
 def ideals_iterator(K,minnorm=1,maxnorm=Infinity):
     r""" Return an iterator over all ideals of norm n up to maxnorm (sorted).
     """

lmfdb/users/main.py

@@ -319,7 +319,6 @@ def admin():
 @app.route("/restartserver")
 @admin_required
 def restart():
-    import sys
     from subprocess import Popen, PIPE
     from urllib.parse import urlparse
     urlparts = urlparse(request.url)
@@ -330,14 +329,12 @@ def restart():
     else:
         command = None
     if command:
-        if sys.version_info[0] == 3:
-            out = Popen(command, stdout=PIPE, encoding='utf-8').communicate()[0]
-        else:
-            out = Popen(command, stdout=PIPE).communicate()[0]
+        out = Popen(command, stdout=PIPE, encoding='utf-8').communicate()[0]
         return out.replace('\n', '<br>')
     else:
         return "Only supported in beta.lmfdb.org, prodweb1.lmfdb.xyz, and prodweb2.lmfdb.xyz"
 
+
 class Reviewer(Uploader):
     """
     This uploader is used to collect UploadSection objects from different sections of the LMFDB that use them.
@@ -346,6 +343,7 @@ def __init__(self):
         from lmfdb.modular_curves.upload import Points, PointCompleteness, GonalityBounds, Models, UniversalEC, MultiKnowl
         super().__init__([Points(), PointCompleteness(), GonalityBounds(), Models(), UniversalEC(), MultiKnowl()])
 
+
 @login_page.route("/uploads", methods=["GET", "POST"])
 @login_required
 def review_uploads():