diff options
| author | jvoisin | 2012-12-20 18:08:44 +0100 |
|---|---|---|
| committer | jvoisin | 2012-12-20 18:08:44 +0100 |
| commit | ce6c61bd56b126742cc95435945c13bfa8671b28 (patch) | |
| tree | 8eb5a98a6598e9448c3cdc19a6999094f3a7b65f /MAT/parser.py | |
| parent | 6be21f0acb7c540fad89b6c0b9b54197a435238f (diff) | |
| parent | 893ce1a7ce01a1983b3605e424775df6500c2608 (diff) | |
Merge branch 'master' into gui_options
Conflicts:
mat-gui
Diffstat (limited to 'MAT/parser.py')
| -rw-r--r-- | MAT/parser.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAT/parser.py b/MAT/parser.py index 4427b01..6be2b03 100644 --- a/MAT/parser.py +++ b/MAT/parser.py | |||
| @@ -23,7 +23,7 @@ class GenericParser(object): | |||
| 23 | ''' | 23 | ''' |
| 24 | Parent class of all parsers | 24 | Parent class of all parsers |
| 25 | ''' | 25 | ''' |
| 26 | def __init__(self, filename, parser, mime, backup, add2archive): | 26 | def __init__(self, filename, parser, mime, backup, **kwargs): |
| 27 | self.filename = '' | 27 | self.filename = '' |
| 28 | self.parser = parser | 28 | self.parser = parser |
| 29 | self.mime = mime | 29 | self.mime = mime |