wirawan0/wpylib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added comment_char option for text_input object creation.

Browse Source 
* Memory leak bugfix: Use instance method weakref.
This commit is contained in:
Wirawan Purwanto
2012-02-15 23:02:11 -05:00
parent 5666280a45
commit f8a101fbe9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iofmt/text_input.py
View File

@@ -29,6 +29,7 @@ import numpy
from wpylib.file.file_utils import open_input_file from wpylib.file.file_utils import open_input_file
from wpylib.py import make_unbound_instance_method from wpylib.py import make_unbound_instance_method
import wpylib.py.im_weakref
class text_input(object): class text_input(object):
'''Text input reader with support for UNIX-style comment marker (#) and '''Text input reader with support for UNIX-style comment marker (#) and
@@ -233,18 +234,21 @@ class text_input(object):
for (o,v) in opts.iteritems(): for (o,v) in opts.iteritems():
if o == "expand_errorbar": if o == "expand_errorbar":
self.expand_errorbar(v) self.expand_errorbar(v)
if o == "skip_blank_lines": elif o == "skip_blank_lines":
self.skip_blank_lines = v self.skip_blank_lines = v
elif o == "comment_char":
self.comment_char = v
else: else:
raise "ValueError", "Invalid option: %s" % (o,) raise ValueError, "Invalid option: %s" % (o,)
return self return self
# Option for errorbar expansion: # Option for errorbar expansion:
def expand_errorbar(self, v=True): def expand_errorbar(self, v=True):
'''Enables or disables errorbar expansion.''' '''Enables or disables errorbar expansion.'''
from wpylib.py.im_weakref import im_ref
if v: if v:
self.opt_expand_errorbar = True self.opt_expand_errorbar = True
self.field_filtering_proc = self.expand_errorbar_hook self.field_filtering_proc = im_ref(self.expand_errorbar_hook)
else: else:
self.opt_expand_errorbar = False self.opt_expand_errorbar = False
self.field_filtering_proc = lambda flds : flds self.field_filtering_proc = lambda flds : flds