nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Centralize encoding guesses, default to UTF-8

Browse source 
This might not be enough for print() and could need a locale.setlocale()
even though it is generally discouraged.

closes #1352
This commit is contained in:
Laurent Bachelier 2014-09-03 00:49:51 +02:00
commit 19a95dc0d6
4 changed files with 96 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

28
weboob/applications/pastoob/pastoob.py
View file

@ -19,9 +19,7 @@
import os
import sys
import codecs
import locale
import re
from random import choice
@ -51,14 +49,14 @@ class Pastoob(ReplApplication):
Get information about pastes.
"""
if not line:
print >>sys.stderr, 'This command takes an argument: %s' % self.get_command_help('info', short=True)
print >>self.stderr, 'This command takes an argument: %s' % self.get_command_help('info', short=True)
return 2
self.start_format()
for _id in line.split(' '):
paste = self.get_object(_id, 'get_paste', ['id', 'title', 'language', 'public', 'contents'])
if not paste:
print >>sys.stderr, 'Paste not found: %s' % _id
print >>self.stderr, 'Paste not found: %s' % _id
self.format(paste)
@ -82,27 +80,27 @@ class Pastoob(ReplApplication):
def _get_op(self, _id, binary, command='get'):
if not _id:
print >>sys.stderr, 'This command takes an argument: %s' % self.get_command_help(command, short=True)
print >>self.stderr, 'This command takes an argument: %s' % self.get_command_help(command, short=True)
return 2
try:
paste = self.get_object(_id, 'get_paste', ['contents'])
except PasteNotFound:
print >>sys.stderr, 'Paste not found: %s' % _id
print >>self.stderr, 'Paste not found: %s' % _id
return 3
if not paste:
print >>sys.stderr, 'Unable to handle paste: %s' % _id
print >>self.stderr, 'Unable to handle paste: %s' % _id
return 1
if binary:
if self.interactive:
if not self.ask('The console may become messed up. Are you sure you want to show a binary file on your terminal?', default=False):
print >>sys.stderr, 'Aborting.'
print >>self.stderr, 'Aborting.'
return 1
output = sys.stdout
output = self.stdout
output.write(paste.contents.decode('base64'))
else:
output = codecs.getwriter(sys.stdout.encoding or locale.getpreferredencoding())(sys.stdout)
output = codecs.getwriter(self.encoding)(self.stdout)
output.write(paste.contents)
# add a newline unless we are writing
# in a file or in a pipe
@ -133,11 +131,11 @@ class Pastoob(ReplApplication):
use_stdin = (not filename or filename == '-')
if use_stdin:
if binary:
contents = sys.stdin.read()
contents = self.stdin.read()
else:
contents = self.acquire_input()
if not len(contents):
print >>sys.stderr, 'Empty paste, aborting.'
print >>self.stderr, 'Empty paste, aborting.'
return 1
else:
@ -145,11 +143,11 @@ class Pastoob(ReplApplication):
if binary:
m = open(filename)
else:
m = codecs.open(filename, encoding=locale.getpreferredencoding())
m = codecs.open(filename, encoding=self.encoding)
with m as fp:
contents = fp.read()
except IOError as e:
print >>sys.stderr, 'Unable to open file "%s": %s' % (filename, e.strerror)
print >>self.stderr, 'Unable to open file "%s": %s' % (filename, e.strerror)
return 1
if binary:
@ -166,7 +164,7 @@ class Pastoob(ReplApplication):
if len(backends):
backend = choice(backends[max(backends.keys())])
else:
print >>sys.stderr, 'No suitable backend found.'
print >>self.stderr, 'No suitable backend found.'
return 1
p = backend.new_paste(_id=None)

23
weboob/applications/webcontentedit/webcontentedit.py
View file

@ -21,7 +21,6 @@
import os
import sys
import tempfile
import locale
import codecs
from weboob.core.bcall import CallErrors
@ -105,15 +104,15 @@ class WebContentEdit(ReplApplication):
errors = CallErrors([])
for content in contents:
path = [path for path, c in paths.iteritems() if c == content][0]
sys.stdout.write('Pushing %s...' % content.id.encode('utf-8'))
sys.stdout.flush()
self.stdout.write('Pushing %s...' % content.id.encode('utf-8'))
self.stdout.flush()
try:
self.do('push_content', content, message, minor=minor, backends=[content.backend]).wait()
except CallErrors as e:
errors.errors += e.errors
sys.stdout.write(' error (content saved in %s)\n' % path)
self.stdout.write(' error (content saved in %s)\n' % path)
else:
sys.stdout.write(' done\n')
self.stdout.write(' done\n')
os.unlink(path)
else:
# stdin is not a tty
@ -123,20 +122,20 @@ class WebContentEdit(ReplApplication):
return 2
message, minor = '', False
data = sys.stdin.read()
contents[0].content = data.decode(sys.stdin.encoding or locale.getpreferredencoding())
data = self.stdin.read()
contents[0].content = data.decode(self.guess_encoding(self.stdin))
errors = CallErrors([])
for content in contents:
sys.stdout.write('Pushing %s...' % content.id.encode('utf-8'))
sys.stdout.flush()
self.stdout.write('Pushing %s...' % content.id.encode(self.encoding))
self.stdout.flush()
try:
self.do('push_content', content, message, minor=minor, backends=[content.backend]).wait()
except CallErrors as e:
errors.errors += e.errors
sys.stdout.write(' error\n')
self.stdout.write(' error\n')
else:
sys.stdout.write(' done\n')
self.stdout.write(' done\n')
if len(errors.errors) > 0:
raise errors
@ -190,7 +189,7 @@ class WebContentEdit(ReplApplication):
_id = _id.encode('utf-8')
output = codecs.getwriter(sys.stdout.encoding or locale.getpreferredencoding())(sys.stdout)
output = codecs.getwriter(self.encoding)(self.stdout)
for contents in [content for backend, content in self.do('get_content', _id, revision, backends=backend_names) if content]:
output.write(contents.content)