xarvos/witchie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of unicode in py2

Browse source
This commit is contained in:
Ivan Habunek 2017-04-17 09:58:36 +02:00
parent a666689c8d
commit 64086cd0fe
No known key found for this signature in database
GPG key ID: CDBD63C43A30BB95
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
toot/api.py
View file

@ -4,7 +4,6 @@ import logging
import requests
from requests import Request, Session
from future.moves.urllib.parse import quote_plus
from toot import App, User, CLIENT_NAME, CLIENT_WEBSITE

16
toot/console.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
#
from __future__ import unicode_literals
from __future__ import print_function
import os
@ -25,19 +25,19 @@ class ConsoleError(Exception):
def red(text):
return u"\033[31m{}\033[0m".format(text)
return "\033[31m{}\033[0m".format(text)
def green(text):
return u"\033[32m{}\033[0m".format(text)
return "\033[32m{}\033[0m".format(text)
def yellow(text):
return u"\033[33m{}\033[0m".format(text)
return "\033[33m{}\033[0m".format(text)
def blue(text):
return u"\033[34m{}\033[0m".format(text)
return "\033[34m{}\033[0m".format(text)
def print_error(text):
@ -287,7 +287,7 @@ def _find_account(app, user, account_name):
response = api.search(app, user, account_name, False)
for account in response['accounts']:
if account['acct'] == account_name:
if account['acct'] == account_name or "@" + account['acct'] == account_name:
return account
@ -306,7 +306,7 @@ def cmd_follow(app, user, args):
api.follow(app, user, account['id'])
print(green(u"✓ You are now following %s" % args.account))
print(green("✓ You are now following %s" % args.account))
def cmd_unfollow(app, user, args):
@ -324,7 +324,7 @@ def cmd_unfollow(app, user, args):
api.unfollow(app, user, account['id'])
print(green(u"✓ You are no longer following %s" % args.account))
print(green("✓ You are no longer following %s" % args.account))
def cmd_whoami(app, user, args):