Merge pull request mdtraj#1180 from Eigenstate/pullme

Handle unexpected keyword arguments gracefully in psf and prmtop parsers
xianqiangsun · Oct 1, 2016 · a53bac2 · a53bac2
2 parents c22c829 + 72b9f26
commit a53bac2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mdtraj/formats/prmtop.py b/mdtraj/formats/prmtop.py
@@ -85,7 +85,7 @@ def _get_pointer_value(pointer_label, raw_data):
     return float(raw_data['POINTERS'][index])
 
 
-def load_prmtop(filename):
+def load_prmtop(filename, **kwargs):
     """Load an AMBER prmtop topology file from disk.
 
     Parameters

diff --git a/mdtraj/formats/psf.py b/mdtraj/formats/psf.py
@@ -161,7 +161,7 @@ def _parse_psf_section(psf):
             line = psf.readline().strip()
     return title, pointers, data
 
-def load_psf(fname):
+def load_psf(fname, **kwargs):
     """Load a CHARMM or XPLOR PSF file from disk
 
     Parameters