veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Prevent SQLA str/unicode warnings by using a Unicode YAML loader

Browse source
This commit is contained in:
Petr Viktorin 2012-10-14 01:35:56 +02:00
parent a2a63938a6
commit fcd4c43fab
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pokedex/main.py
View file

@ -307,6 +307,18 @@ def command_pkm(*args):
if options.yaml: if options.yaml:
import yaml import yaml
# Override the default string handling function
# to always return unicode objects.
# Inspired by http://stackoverflow.com/questions/2890146
# This prevents str/unicode SQLAlchemy warnings.
def construct_yaml_str(self, node):
return self.construct_scalar(node)
class UnicodeLoader(yaml.SafeLoader):
pass
UnicodeLoader.add_constructor(u'tag:yaml.org,2002:str',
construct_yaml_str)
if not files: if not files:
# Use sys.stdin in place of name, handle specially later # Use sys.stdin in place of name, handle specially later
files = [sys.stdin] files = [sys.stdin]
@ -319,7 +331,7 @@ def command_pkm(*args):
content = f.read() content = f.read()
if mode == 'encode': if mode == 'encode':
if options.yaml: if options.yaml:
dict_ = yaml.load(content) dict_ = yaml.load(content, Loader=UnicodeLoader)
else: else:
dict_ = json.loads(content) dict_ = json.loads(content)
struct = cls(session=session, dict_=dict_) struct = cls(session=session, dict_=dict_)