Mercurial > libervia-backend

diff sat/plugins/plugin_misc_upload.py @ 3028:ab2696e34d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3cac3d050046
children e75024e41f81
line wrap: on
line diff
--- a/sat/plugins/plugin_misc_upload.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/plugins/plugin_misc_upload.py	Tue Aug 13 19:08:41 2019 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # SAT plugin for file tansfer
@@ -41,8 +41,8 @@
 }
 
 
-UPLOADING = D_(u"Please select a file to upload")
-UPLOADING_TITLE = D_(u"File upload")
+UPLOADING = D_("Please select a file to upload")
+UPLOADING_TITLE = D_("File upload")
 BOOL_OPTIONS = ("ignore_tls_errors",)
 
 
@@ -58,7 +58,7 @@
             in_sign="sssa{ss}s",
             out_sign="a{ss}",
             method=self._fileUpload,
-            async=True,
+            async_=True,
         )
         self._upload_callbacks = []
 
@@ -97,12 +97,12 @@
                 and fail.value.condition == 'not-acceptable'):
                 reason = fail.value.text
             else:
-                reason = unicode(fail.value)
-            msg = D_(u"Can't upload file: {reason}").format(reason=reason)
+                reason = str(fail.value)
+            msg = D_("Can't upload file: {reason}").format(reason=reason)
             log.warning(msg)
             return {
                 "xmlui": xml_tools.note(
-                    msg, D_(u"Can't upload file"), C.XMLUI_DATA_LVL_WARNING
+                    msg, D_("Can't upload file"), C.XMLUI_DATA_LVL_WARNING
                 ).toXml()
             }
 
@@ -130,7 +130,7 @@
         if options is None:
             options = {}
         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")
         for method_name, available_cb, upload_cb, priority in self._upload_callbacks:
             try:
                 upload_jid = yield available_cb(upload_jid, client.profile)
@@ -138,7 +138,7 @@
                 continue  # no entity managing this extension found
 
             log.info(
-                u"{name} method will be used to upload the file".format(name=method_name)
+                "{name} method will be used to upload the file".format(name=method_name)
             )
             progress_id_d, download_d = yield upload_cb(
                 filepath, filename, upload_jid, options, client.profile
@@ -146,7 +146,7 @@
             progress_id = yield progress_id_d
             defer.returnValue((progress_id, download_d))
 
-        raise exceptions.NotFound(u"Can't find any method to upload a file")
+        raise exceptions.NotFound("Can't find any method to upload a file")
 
     def register(self, method_name, available_cb, upload_cb, priority=0):
         """Register a fileUploading method
@@ -167,7 +167,7 @@
         for data in self._upload_callbacks:
             if method_name == data[0]:
                 raise exceptions.ConflictError(
-                    u"A method with this name is already registered"
+                    "A method with this name is already registered"
                 )
         self._upload_callbacks.append((method_name, available_cb, upload_cb, priority))
         self._upload_callbacks.sort(key=lambda data: data[3], reverse=True)
@@ -177,4 +177,4 @@
             if data[0] == method_name:
                 del [idx]
                 return
-        raise exceptions.NotFound(u"The name to unregister doesn't exist")
+        raise exceptions.NotFound("The name to unregister doesn't exist")