Mercurial Repositories > eric / file comparison
comparison: src/eric7/RemoteServerInterface/EricServerInterface.py
src/eric7/RemoteServerInterface/EricServerInterface.py
- branch
- eric7
- changeset 10949
- 2057b1b198a5
- parent 10928
- 46651e194fbe
- child 10958
- 79842be466d3
equal
deleted
inserted
replaced
| 10948:89b36a39fe69 | 10949:2057b1b198a5 |
|---|---|
| 226 def disconnectFromServer(self): | 226 def disconnectFromServer(self): |
| 227 """ | 227 """ |
| 228 Public method to disconnect from the eric remote server. | 228 Public method to disconnect from the eric remote server. |
| 229 """ | 229 """ |
| 230 if self.__connection is not None and self.__connection.isValid(): | 230 if self.__connection is not None and self.__connection.isValid(): |
| 231 # signal we are abouzt to disconnect | 231 # signal we are about to disconnect |
| 232 self.aboutToDisconnect.emit() | 232 self.aboutToDisconnect.emit() |
| 233 | 233 |
| 234 # disconnect from the eric-ide server | 234 # disconnect from the eric-ide server |
| 235 self.__connection.disconnectFromHost() | 235 self.__connection.disconnectFromHost() |
| 236 if self.__connection is not None: | 236 if self.__connection is not None: |
| 275 @return connected host as "host name:port" or an empty string, if there is no | 275 @return connected host as "host name:port" or an empty string, if there is no |
| 276 valid connection | 276 valid connection |
| 277 @rtype str | 277 @rtype str |
| 278 """ | 278 """ |
| 279 if self.isServerConnected(): | 279 if self.isServerConnected(): |
| 280 return f"{self.__connection.peerName()}:{self.__connection.peerPort()}" | 280 peerName = self.__connection.peerName() |
| 281 return "{0}:{1}".format( | |
| 282 f"[{peerName}]" if ":" in peerName else peerName, | |
| 283 self.__connection.peerPort(), | |
| 284 ) | |
| 281 else: | 285 else: |
| 282 return "" | 286 return "" |
| 283 | 287 |
| 284 def getHostName(self): | 288 def getHostName(self): |
| 285 """ | 289 """ |
| 471 if reply != "Versions": | 475 if reply != "Versions": |
| 472 raise ValueError(f"unsupported reply received ({reply})") | 476 raise ValueError(f"unsupported reply received ({reply})") |
| 473 | 477 |
| 474 else: | 478 else: |
| 475 hostname = params["hostname"] | 479 hostname = params["hostname"] |
| 476 versionText = self.tr("<h2>{0}Version Numbers</h2><table>").format( | 480 versionInfo = [ |
| 477 self.tr("{0} - ").format(hostname) if hostname else "" | 481 "<h2>", |
| 482 self.tr("{0}Version Numbers").format( | |
| 483 self.tr("{0} - ").format(hostname) if hostname else "" | |
| 484 ), | |
| 485 "</h2><table>", | |
| 486 ] | |
| 487 | |
| 488 # eric7 server version | |
| 489 versionInfo.extend( | |
| 490 [ | |
| 491 "<tr><td></td><td></td></tr>", | |
| 492 f"<tr><td><b>eric7_server</b></td>" | |
| 493 f"<td>{params['version']} </td></tr>", | |
| 494 "<tr><td></td><td></td></tr>", | |
| 495 ] | |
| 478 ) | 496 ) |
| 479 | 497 |
| 480 # Python version | 498 # Python version |
| 481 versionText += ( | 499 versionInfo.append( |
| 482 """<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>""" | 500 f"<tr><td><b>Python</b></td>" |
| 483 ).format(params["python"], params["py_bitsize"]) | 501 f"<td>{params['python']}, {params['py_bitsize']}</td></tr>" |
| 484 | 502 ) |
| 485 # eric7 version | 503 |
| 486 versionText += ( | 504 versionInfo.append("</table>") |
| 487 """<tr><td><b>eric7_server</b></td><td>{0}</td></tr>""" | |
| 488 ).format(params["version"]) | |
| 489 | |
| 490 versionText += self.tr("""</table>""") | |
| 491 | 505 |
| 492 EricMessageBox.about( | 506 EricMessageBox.about( |
| 493 None, | 507 None, |
| 494 self.tr("eric-ide Server Versions"), | 508 self.tr("eric-ide Server Versions"), |
| 495 versionText, | 509 "".join(versionInfo), |
| 496 ) | 510 ) |
| 497 | 511 |
| 498 ####################################################################### | 512 ####################################################################### |
| 499 ## Reply handler methods | 513 ## Reply handler methods |
| 500 ####################################################################### | 514 ####################################################################### |
