Merge pull request #15268 from dagwieers/csvfile-encoding

Support different encoding types in csvfile lookup plugin
This commit is contained in:
James Cammarata 2016-04-04 15:06:51 -04:00
commit 83367dc52f

View file

@ -23,13 +23,43 @@ import csv
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase from ansible.plugins.lookup import LookupBase
class CSVRecoder:
"""
Iterator that reads an encoded stream and reencodes the input to UTF-8
"""
def __init__(self, f, encoding='utf-8'):
self.reader = codecs.getreader(encoding)(f)
def __iter__(self):
return self
def next(self):
return self.reader.next().encode("utf-8")
class CSVReader:
"""
A CSV reader which will iterate over lines in the CSV file "f",
which is encoded in the given encoding.
"""
def __init__(self, f, dialect=csv.excel, encoding='utf-8', **kwds):
f = CSVRecoder(f, encoding)
self.reader = csv.reader(f, dialect=dialect, **kwds)
def next(self):
row = self.reader.next()
return [unicode(s, 'utf-8') for s in row]
def __iter__(self):
return self
class LookupModule(LookupBase): class LookupModule(LookupBase):
def read_csv(self, filename, key, delimiter, encoding='utf-8', dflt=None, col=1): def read_csv(self, filename, key, delimiter, encoding='utf-8', dflt=None, col=1):
try: try:
f = codecs.open(filename, 'r', encoding=encoding) f = open(filename, 'r')
creader = csv.reader(f, delimiter=str(delimiter)) creader = CSVReader(f, delimiter=str(delimiter), encoding=encoding)
for row in creader: for row in creader:
if row[0] == key: if row[0] == key: