--- a/eric6/CondaInterface/__init__.py	Sat Apr 10 17:54:58 2021 +0200
+++ b/eric6/CondaInterface/__init__.py	Sat Apr 10 18:31:17 2021 +0200
@@ -35,12 +35,12 @@
         
         proc = QProcess()
         proc.start(exe, ["info", "--json"])
-        if not proc.waitForStarted(15000):
+        if not proc.waitForStarted(msecs=15000):
             __CondaVersionStr = QCoreApplication.translate(
                 "CondaInterface",
                 '<conda not found or not configured.>')
         else:
-            proc.waitForFinished(15000)
+            proc.waitForFinished(msecs=15000)
             output = str(proc.readAllStandardOutput(),
                          Preferences.getSystem("IOEncoding"),
                          'replace').strip()
@@ -63,10 +63,9 @@
                     int(i) for i in __CondaVersionStr.split(".")
                 )
                 __CondaRootPrefix = jsonDict["root_prefix"]
-                if "user_rc_path" in jsonDict:
-                    __CondaUserConfig = jsonDict["user_rc_path"]
-                elif "rc_path" in jsonDict:
-                    __CondaUserConfig = jsonDict["rc_path"]
+                __CondaUserConfig = jsonDict.get("user_rc_path")
+                if __CondaUserConfig is None:
+                    __CondaUserConfig = jsonDict.get("rc_path")
                 
                 __initialized = True