--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Mon Sep 23 19:22:12 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Mon Sep 23 20:03:20 2019 +0200 @@ -41,12 +41,11 @@ self.vcs = vcs self.client = self.vcs.getClient() - self.client.callback_cancel = \ - self._clientCancelCallback - self.client.callback_get_login = \ - self._clientLoginCallback - self.client.callback_ssl_server_trust_prompt = \ + self.client.callback_cancel = self._clientCancelCallback + self.client.callback_get_login = self._clientLoginCallback + self.client.callback_ssl_server_trust_prompt = ( self._clientSslServerTrustPromptCallback + ) self.show() QApplication.processEvents() @@ -70,37 +69,41 @@ "<td>{0}</td></tr>").format(path) if info['URL']: infoStr += self.tr( - "<tr><td><b>Url:</b></td><td>{0}</td></tr>")\ - .format(info['URL']) + "<tr><td><b>Url:</b></td><td>{0}</td></tr>" + ).format(info['URL']) if info['rev']: infoStr += self.tr( - "<tr><td><b>Revision:</b></td><td>{0}</td></tr>")\ - .format(info['rev'].number) + "<tr><td><b>Revision:</b></td><td>{0}</td></tr>" + ).format(info['rev'].number) if info['repos_root_URL']: infoStr += self.tr( "<tr><td><b>Repository root URL:</b></td>" - "<td>{0}</td></tr>").format(info['repos_root_URL']) + "<td>{0}</td></tr>" + ).format(info['repos_root_URL']) if info['repos_UUID']: infoStr += self.tr( "<tr><td><b>Repository UUID:</b></td>" - "<td>{0}</td></tr>").format(info['repos_UUID']) + "<td>{0}</td></tr>" + ).format(info['repos_UUID']) if info['last_changed_author']: infoStr += self.tr( "<tr><td><b>Last changed author:</b></td>" - "<td>{0}</td></tr>")\ - .format(info['last_changed_author']) + "<td>{0}</td></tr>" + ).format(info['last_changed_author']) if info['last_changed_date']: infoStr += self.tr( "<tr><td><b>Last Changed Date:</b></td>" - "<td>{0}</td></tr>")\ - .format(formatTime(info['last_changed_date'])) - if info['last_changed_rev'] and \ - info['last_changed_rev'].kind == \ - pysvn.opt_revision_kind.number: + "<td>{0}</td></tr>" + ).format(formatTime(info['last_changed_date'])) + if ( + info['last_changed_rev'] and + info['last_changed_rev'].kind == + pysvn.opt_revision_kind.number + ): infoStr += self.tr( "<tr><td><b>Last changed revision:</b></td>" - "<td>{0}</td></tr>")\ - .format(info['last_changed_rev'].number) + "<td>{0}</td></tr>" + ).format(info['last_changed_rev'].number) if info['kind']: if info['kind'] == pysvn.node_kind.file: nodeKind = self.tr("file") @@ -111,28 +114,28 @@ else: nodeKind = self.tr("unknown") infoStr += self.tr( - "<tr><td><b>Node kind:</b></td><td>{0}</td></tr>")\ - .format(nodeKind) + "<tr><td><b>Node kind:</b></td><td>{0}</td></tr>" + ).format(nodeKind) if info['lock']: lockInfo = info['lock'] infoStr += self.tr( - "<tr><td><b>Lock Owner:</b></td><td>{0}</td></tr>")\ - .format(lockInfo['owner']) + "<tr><td><b>Lock Owner:</b></td><td>{0}</td></tr>" + ).format(lockInfo['owner']) infoStr += self.tr( "<tr><td><b>Lock Creation Date:</b></td>" - "<td>{0}</td></tr>")\ - .format(formatTime(lockInfo['creation_date'])) + "<td>{0}</td></tr>" + ).format(formatTime(lockInfo['creation_date'])) if lockInfo['expiration_date'] is not None: infoStr += self.tr( "<tr><td><b>Lock Expiration Date:</b></td>" - "<td>{0}</td></tr>")\ - .format(formatTime(lockInfo['expiration_date'])) + "<td>{0}</td></tr>" + ).format(formatTime(lockInfo['expiration_date'])) infoStr += self.tr( - "<tr><td><b>Lock Token:</b></td><td>{0}</td></tr>")\ - .format(lockInfo['token']) + "<tr><td><b>Lock Token:</b></td><td>{0}</td></tr>" + ).format(lockInfo['token']) infoStr += self.tr( - "<tr><td><b>Lock Comment:</b></td><td>{0}</td></tr>")\ - .format(lockInfo['comment']) + "<tr><td><b>Lock Comment:</b></td><td>{0}</td></tr>" + ).format(lockInfo['comment']) if info['wc_info']: wcInfo = info['wc_info'] if wcInfo['schedule']: @@ -145,31 +148,31 @@ elif wcInfo['schedule'] == pysvn.wc_schedule.replace: schedule = self.tr("replace") infoStr += self.tr( - "<tr><td><b>Schedule:</b></td><td>{0}</td></tr>")\ - .format(schedule) + "<tr><td><b>Schedule:</b></td><td>{0}</td></tr>" + ).format(schedule) if wcInfo['copyfrom_url']: infoStr += self.tr( "<tr><td><b>Copied From URL:</b></td>" - "<td>{0}</td></tr>")\ - .format(wcInfo['copyfrom_url']) + "<td>{0}</td></tr>" + ).format(wcInfo['copyfrom_url']) infoStr += self.tr( "<tr><td><b>Copied From Rev:</b></td>" - "<td>{0}</td></tr>")\ - .format(wcInfo['copyfrom_rev'].number) + "<td>{0}</td></tr>" + ).format(wcInfo['copyfrom_rev'].number) if wcInfo['text_time']: infoStr += self.tr( "<tr><td><b>Text Last Updated:</b></td>" - "<td>{0}</td></tr>")\ - .format(formatTime(wcInfo['text_time'])) + "<td>{0}</td></tr>" + ).format(formatTime(wcInfo['text_time'])) if wcInfo['prop_time']: infoStr += self.tr( "<tr><td><b>Properties Last Updated:</b></td>" - "<td>{0}</td></tr>")\ - .format(formatTime(wcInfo['prop_time'])) + "<td>{0}</td></tr>" + ).format(formatTime(wcInfo['prop_time'])) if wcInfo['checksum']: infoStr += self.tr( - "<tr><td><b>Checksum:</b></td><td>{0}</td></tr>")\ - .format(wcInfo['checksum']) + "<tr><td><b>Checksum:</b></td><td>{0}</td></tr>" + ).format(wcInfo['checksum']) infoStr += "</table>" self.infoBrowser.setHtml(infoStr) except pysvn.ClientError as e: