Mercurial Repositories > eric / file diff

--- a/eric6/PipInterface/Pip.py	Sun Apr 11 16:53:48 2021 +0200
+++ b/eric6/PipInterface/Pip.py	Sun Apr 11 18:45:10 2021 +0200
@@ -583,22 +583,21 @@
                 
                 proc = QProcess()
                 proc.start(interpreter, args)
-                if proc.waitForStarted(15000):
-                    if proc.waitForFinished(30000):
-                        output = str(proc.readAllStandardOutput(),
-                                     Preferences.getSystem("IOEncoding"),
-                                     'replace').strip()
-                        try:
-                            jsonList = json.loads(output)
-                        except Exception:
-                            jsonList = []
-                        
-                        for package in jsonList:
-                            if isinstance(package, dict):
-                                packages.append((
-                                    package["name"],
-                                    package["version"],
-                                ))
+                if proc.waitForStarted(15000) and proc.waitForFinished(30000):
+                    output = str(proc.readAllStandardOutput(),
+                                 Preferences.getSystem("IOEncoding"),
+                                 'replace').strip()
+                    try:
+                        jsonList = json.loads(output)
+                    except Exception:
+                        jsonList = []
+                    
+                    for package in jsonList:
+                        if isinstance(package, dict):
+                            packages.append((
+                                package["name"],
+                                package["version"],
+                            ))
            
         return packages
     
@@ -645,23 +644,22 @@
                 
                 proc = QProcess()
                 proc.start(interpreter, args)
-                if proc.waitForStarted(15000):
-                    if proc.waitForFinished(30000):
-                        output = str(proc.readAllStandardOutput(),
-                                     Preferences.getSystem("IOEncoding"),
-                                     'replace').strip()
-                        try:
-                            jsonList = json.loads(output)
-                        except Exception:
-                            jsonList = []
-                        
-                        for package in jsonList:
-                            if isinstance(package, dict):
-                                packages.append((
-                                    package["name"],
-                                    package["version"],
-                                    package["latest_version"],
-                                ))
+                if proc.waitForStarted(15000) and proc.waitForFinished(30000):
+                    output = str(proc.readAllStandardOutput(),
+                                 Preferences.getSystem("IOEncoding"),
+                                 'replace').strip()
+                    try:
+                        jsonList = json.loads(output)
+                    except Exception:
+                        jsonList = []
+                    
+                    for package in jsonList:
+                        if isinstance(package, dict):
+                            packages.append((
+                                package["name"],
+                                package["version"],
+                                package["latest_version"],
+                            ))
            
         return packages