Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
b2900404
Commit
b2900404
authored
Oct 07, 2015
by
M J Harvey
Browse files
removed permissive arg on constructor to keep python 2 happy
parent
3dee925d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
wrappers/python/simtk/openmm/app/charmmparameterset.py
wrappers/python/simtk/openmm/app/charmmparameterset.py
+2
-2
No files found.
wrappers/python/simtk/openmm/app/charmmparameterset.py
View file @
b2900404
...
@@ -100,7 +100,7 @@ class CharmmParameterSet(object):
...
@@ -100,7 +100,7 @@ class CharmmParameterSet(object):
except
ValueError
:
except
ValueError
:
raise
CharmmFileError
(
'Could not convert %s to %s'
%
(
msg
,
type
))
raise
CharmmFileError
(
'Could not convert %s to %s'
%
(
msg
,
type
))
def
__init__
(
self
,
*
args
,
permissive
=
False
):
def
__init__
(
self
,
*
args
):
# Instantiate the list types
# Instantiate the list types
self
.
atom_types_str
=
dict
()
self
.
atom_types_str
=
dict
()
self
.
atom_types_int
=
dict
()
self
.
atom_types_int
=
dict
()
...
@@ -136,7 +136,7 @@ class CharmmParameterSet(object):
...
@@ -136,7 +136,7 @@ class CharmmParameterSet(object):
else
:
else
:
raise
TypeError
(
'Unrecognized file type: %s'
%
arg
)
raise
TypeError
(
'Unrecognized file type: %s'
%
arg
)
for
top
in
tops
:
self
.
readTopologyFile
(
top
)
for
top
in
tops
:
self
.
readTopologyFile
(
top
)
for
par
in
pars
:
self
.
readParameterFile
(
par
,
permissive
=
permissive
)
for
par
in
pars
:
self
.
readParameterFile
(
par
)
for
strf
in
strs
:
self
.
readStreamFile
(
strf
)
for
strf
in
strs
:
self
.
readStreamFile
(
strf
)
@
classmethod
@
classmethod
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment