libervia-backend: sat/plugins/plugin_misc

comparison sat/plugins/plugin_misc_file.py @ 3028:ab2696e34d29

Python 3 port: /!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 19:08:41 +0200
parents	003b8b4b56a7
children	d1464548055a

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # SAT plugin for file tansfer
 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
 This plugin manage the various ways of sending a file, and choose the best one."""
 ),
 }
-SENDING = D_(u"Please select a file to send to {peer}")
+SENDING = D_("Please select a file to send to {peer}")
-SENDING_TITLE = D_(u"File sending")
+SENDING_TITLE = D_("File sending")
 CONFIRM = D_(
-u'{peer} wants to send the file "{name}" to you:\n{desc}\n\nThe file has a size of {size_human}\n\nDo you accept ?'
+'{peer} wants to send the file "{name}" to you:\n{desc}\n\nThe file has a size of {size_human}\n\nDo you accept ?'
 )
-CONFIRM_TITLE = D_(u"Confirm file transfer")
+CONFIRM_TITLE = D_("Confirm file transfer")
-CONFIRM_OVERWRITE = D_(u"File {} already exists, are you sure you want to overwrite ?")
+CONFIRM_OVERWRITE = D_("File {} already exists, are you sure you want to overwrite ?")
-CONFIRM_OVERWRITE_TITLE = D_(u"File exists")
+CONFIRM_OVERWRITE_TITLE = D_("File exists")
 SECURITY_LIMIT = 30
 PROGRESS_ID_KEY = "progress_id"
 "fileSend",
 ".plugin",
 in_sign="ssssa{ss}s",
 out_sign="a{ss}",
 method=self._fileSend,
-async=True,
+async_=True,
 )
 self._file_callbacks = []
 host.importMenu(
 (D_("Action"), D_("send file")),
 self._fileSendMenu,
 @param file_desc(unicode, None): description of the file
 @param profile: %(doc_profile)s
 @return (dict): action dictionary, with progress id in case of success, else xmlui message
 """
 if not os.path.isfile(filepath):
-raise exceptions.DataError(u"The given path doesn't link to a file")
+raise exceptions.DataError("The given path doesn't link to a file")
 if not filename:
 filename = os.path.basename(filepath) or "_"
 for namespace, callback, priority, method_name in self._file_callbacks:
 has_feature = yield self.host.hasFeature(client, namespace, peer_jid)
 if has_feature:
 log.info(
-u"{name} method will be used to send the file".format(
+"{name} method will be used to send the file".format(
 name=method_name
 )
 )
 progress_id = yield callback(
 client, peer_jid, filepath, filename, file_desc, extra
 )
 defer.returnValue({"progress": progress_id})
-msg = u"Can't find any method to send file to {jid}".format(jid=peer_jid.full())
+msg = "Can't find any method to send file to {jid}".format(jid=peer_jid.full())
 log.warning(msg)
 defer.returnValue(
 {
 "xmlui": xml_tools.note(
-u"Can't transfer file", msg, C.XMLUI_DATA_LVL_WARNING
+"Can't transfer file", msg, C.XMLUI_DATA_LVL_WARNING
 ).toXml()
 }
 )
 def _onFileChoosed(self, client, peer_jid, data):
 @param method_name(unicode): short name for the method, namespace will be used if None
 """
 for data in self._file_callbacks:
 if namespace == data[0]:
 raise exceptions.ConflictError(
-u"A method with this namespace is already registered"
+"A method with this namespace is already registered"
 )
 self._file_callbacks.append(
 (namespace, callback, priority, method_name or namespace)
 )
 self._file_callbacks.sort(key=lambda data: data[2], reverse=True)
 def unregister(self, namespace):
 for idx, data in enumerate(self._file_callbacks):
 if data[0] == namespace:
 del [idx]
 return
-raise exceptions.NotFound(u"The namespace to unregister doesn't exist")
+raise exceptions.NotFound("The namespace to unregister doesn't exist")
 # Dialogs with user
 # the overwrite check is done here
 def openFileWrite(self, client, file_path, transfer_data, file_data, stream_object):
 """
 if data.get("cancelled", False):
 return False
 path = data["path"]
 file_data["file_path"] = file_path = os.path.join(path, file_data["name"])
-log.debug(u"destination file path set to {}".format(file_path))
+log.debug("destination file path set to {}".format(file_path))
 # we manage case where file already exists
 if os.path.exists(file_path):
 def check_overwrite(overwrite):
 return ret_value
 filename = file_data["name"]
 assert filename and not "/" in filename
 assert PROGRESS_ID_KEY in file_data
 # human readable size
-file_data["size_human"] = u"{:.6n} Mio".format(
+file_data["size_human"] = "{:.6n} Mio".format(
 float(file_data["size"]) / (1024 ** 2)
 )
 d = xml_tools.deferDialog(
 self.host,
 _(CONFIRM).format(peer=peer_jid.full(), **file_data),

Mercurial > libervia-backend

comparison sat/plugins/plugin_misc_file.py @ 3028:ab2696e34d29