diff -r 9eed155411f0 -r 4a1db75550bd eric6/Cooperation/CooperationClient.py
--- a/eric6/Cooperation/CooperationClient.py Sat Oct 10 16:03:53 2020 +0200
+++ b/eric6/Cooperation/CooperationClient.py Sun Oct 11 17:54:52 2020 +0200
@@ -10,7 +10,7 @@
import collections
-from PyQt5.QtCore import QObject, pyqtSignal, QProcess, QRegExp
+from PyQt5.QtCore import QObject, pyqtSignal, QProcess
from PyQt5.QtNetwork import (
QHostInfo, QHostAddress, QAbstractSocket, QNetworkInterface
)
@@ -68,13 +68,13 @@
self.__initialConnection = None
- envVariables = ["USERNAME.*", "USER.*", "USERDOMAIN.*",
- "HOSTNAME.*", "DOMAINNAME.*"]
+ envVariables = ["USERNAME", "USERDOMAIN", "USER",
+ "HOSTNAME", "DOMAINNAME"]
environment = QProcess.systemEnvironment()
found = False
for envVariable in envVariables:
for env in environment:
- if QRegExp(envVariable).exactMatch(env):
+ if env.startswith(envVariable):
envList = env.split("=")
if len(envList) == 2:
self.__username = envList[1].strip()
