Mercurial > libervia-backend

diff sat_frontends/jp/cmd_bookmarks.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 003b8b4b56a7
children fee60f17ebac
line wrap: on
line diff
--- a/sat_frontends/jp/cmd_bookmarks.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat_frontends/jp/cmd_bookmarks.py	Tue Aug 13 19:08:41 2019 +0200
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import base
+from . import base
 from sat.core.i18n import _
 
 __commands__ = ["Bookmarks"]
@@ -33,7 +33,7 @@
         self.parser.add_argument('-t', '--type', type=str, choices=TYPES, default=TYPES[0], help=_("bookmarks type (default: %(default)s)"))
 
     def _errback(self, failure):
-        print (("Something went wrong: [%s]") % failure)
+        print((("Something went wrong: [%s]") % failure))
         self.host.quit(1)
 
 class BookmarksList(BookmarksCommon):
@@ -48,20 +48,20 @@
             if not data[location]:
                 continue
             loc_mess = []
-            loc_mess.append(u"%s:" % location)
+            loc_mess.append("%s:" % location)
             book_mess = []
-            for book_link, book_data in data[location].items():
+            for book_link, book_data in list(data[location].items()):
                 name = book_data.get('name')
                 autojoin = book_data.get('autojoin', 'false') == 'true'
                 nick = book_data.get('nick')
-                book_mess.append(u"\t%s[%s%s]%s" % ((name+' ') if name else '',
+                book_mess.append("\t%s[%s%s]%s" % ((name+' ') if name else '',
                                                  book_link,
-                                                 u' (%s)' % nick if nick else '',
-                                                 u' (*)' if autojoin else ''))
-            loc_mess.append(u'\n'.join(book_mess))
-            mess.append(u'\n'.join(loc_mess))
+                                                 ' (%s)' % nick if nick else '',
+                                                 ' (*)' if autojoin else ''))
+            loc_mess.append('\n'.join(book_mess))
+            mess.append('\n'.join(loc_mess))
 
-        print u'\n\n'.join(mess)
+        print('\n\n'.join(mess))
 
 
 class BookmarksRemove(BookmarksCommon):
@@ -72,7 +72,7 @@
 
     def add_parser_options(self):
         super(BookmarksRemove, self).add_parser_options()
-        self.parser.add_argument('bookmark', type=base.unicode_decoder, help=_('jid (for muc bookmark) or url of to remove'))
+        self.parser.add_argument('bookmark', help=_('jid (for muc bookmark) or url of to remove'))
 
     def start(self):
         self.host.bridge.bookmarksRemove(self.args.type, self.args.bookmark, self.args.location, self.host.profile, callback = lambda: self.host.quit(), errback=self._errback)
@@ -86,16 +86,16 @@
 
     def add_parser_options(self):
         super(BookmarksAdd, self).add_parser_options(location_default='auto')
-        self.parser.add_argument('bookmark', type=base.unicode_decoder, help=_('jid (for muc bookmark) or url of to remove'))
-        self.parser.add_argument('-n', '--name', type=base.unicode_decoder, help=_("bookmark name"))
+        self.parser.add_argument('bookmark', help=_('jid (for muc bookmark) or url of to remove'))
+        self.parser.add_argument('-n', '--name', help=_("bookmark name"))
         muc_group = self.parser.add_argument_group(_('MUC specific options'))
-        muc_group.add_argument('-N', '--nick', type=base.unicode_decoder, help=_('nickname'))
+        muc_group.add_argument('-N', '--nick', help=_('nickname'))
         muc_group.add_argument('-a', '--autojoin', action='store_true', help=_('join room on profile connection'))
 
     def start(self):
         if self.args.type == 'url' and (self.args.autojoin or self.args.nick is not None):
             # XXX: Argparse doesn't seem to manage this case, any better way ?
-            print _(u"You can't use --autojoin or --nick with --type url")
+            print(_("You can't use --autojoin or --nick with --type url"))
             self.host.quit(1)
         data = {}
         if self.args.autojoin: