1.1 --- a/simplex/accessors.py Sun Oct 02 00:19:49 2011 +0200
1.2 +++ b/simplex/accessors.py Sun Oct 02 00:29:33 2011 +0200
1.3 @@ -61,6 +61,7 @@
1.4
1.5 self.accessor = accessor
1.6 self.converters = converters
1.7 + self._converters = map(self.get_converter, self.converters)
1.8
1.9 def get_converter(self, converter):
1.10 return converter and converter.convert or (lambda x: x)
1.11 @@ -71,8 +72,7 @@
1.12 converter.reset()
1.13
1.14 def convert(self, term):
1.15 - converters = map(self.get_converter, self.converters)
1.16 - return [convert(value) for convert, value in zip(converters, term)]
1.17 + return [convert(value) for convert, value in zip(self._converters, term)]
1.18
1.19 def get_key(self, record):
1.20 key = self.accessor.get_key(record)
2.1 --- a/test_indexed.py Sun Oct 02 00:19:49 2011 +0200
2.2 +++ b/test_indexed.py Sun Oct 02 00:29:33 2011 +0200
2.3 @@ -13,7 +13,7 @@
2.4 sys.exit(1)
2.5
2.6 f = open(filename)
2.7 -converters = [(numeric == "true" and int or None) for field in fields]
2.8 +converters = [(numeric == "true" and NumericDecoder() or None) for field in fields]
2.9 accessor = Converted(DelimitedRecord(fields), converters)
2.10 reader = TextFile(f, Iterator(accessor))
2.11
3.1 --- a/test_scan.py Sun Oct 02 00:19:49 2011 +0200
3.2 +++ b/test_scan.py Sun Oct 02 00:29:33 2011 +0200
3.3 @@ -13,7 +13,7 @@
3.4 sys.exit(1)
3.5
3.6 f = open(filename)
3.7 -converters = [(numeric == "true" and int or None) for field in fields]
3.8 +converters = [(numeric == "true" and NumericDecoder() or None) for field in fields]
3.9 accessor = Converted(DelimitedRecord(fields), converters)
3.10 reader = TextFile(f, Iterator(accessor))
3.11