X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/6f04f47c8f973a5c8ab3647e62dc19979d3ec1ba..98a1d50bd9c33b6cc9f281617400374e306378f7:/catacomb/__init__.py diff --git a/catacomb/__init__.py b/catacomb/__init__.py index 508f1f8..bd8aa57 100644 --- a/catacomb/__init__.py +++ b/catacomb/__init__.py @@ -655,10 +655,23 @@ _augment(KeySZSet, _tmp) ### Key data objects. class _tmp: + def merge(me, file, report = None): + """KF.merge(FILE, [report = ])""" + name = file.name + lno = 1 + for line in file: + me.mergeline(name, lno, line, report) + lno += 1 + return me def __repr__(me): return '%s(%r)' % (_clsname(me), me.name) _augment(KeyFile, _tmp) class _tmp: + def extract(me, file, filter = ''): + """KEY.extract(FILE, [filter = ])""" + line = me.extractline(filter) + file.write(line) + return me def __repr__(me): return '%s(%r)' % (_clsname(me), me.fulltag) _augment(Key, _tmp)