Merge branch 'dev' into f-kwargs-to-parameters

.gitlab-ci.yml

@@ -47,7 +47,7 @@ pylint:
   tags: [ docker ]
   stage: linting
   script:
-    - pylint3 --unsafe-load-any-extension=y -d all -e E,F src/caosdb/common
+    - pylint --unsafe-load-any-extension=y -d all -e E,F src/caosdb/common
   allow_failure: true
 
 

src/caosdb/apiutils.py

@@ -517,9 +517,9 @@ def getOriginUrlIn(folder):
     with open(t.name, "r") as t:
         urlString = "Fetch URL:"
 
-        for l in t.readlines():
-            if urlString in l:
-                return l[l.find(urlString) + len(urlString):].strip()
+        for line in t.readlines():
+            if urlString in line:
+                return line[line.find(urlString) + len(urlString):].strip()
 
     return None