Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions tools/pcmparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
from copy import deepcopy
import re

from .getkw import Section, GetkwParser
from .pcmdata import CODATAdict, allowedSolvents

isAngstrom = False
Expand Down Expand Up @@ -80,6 +79,9 @@ def parse_pcm_input(inputFile, write_out=False):

...
"""
from importlib import reload
from . import getkw

# Set up valid keywords.
valid_keywords = setup_keywords()

Expand All @@ -88,7 +90,8 @@ def parse_pcm_input(inputFile, write_out=False):

# Set up a GetKw object and let it parse our input:
# here is where the magic happens.
inkw = GetkwParser().parseFile(uppercased)
getkw = reload(getkw)
inkw = getkw.GetkwParser().parseFile(uppercased)
# Remove temporary file
os.remove(uppercased)
inkw.sanitize(valid_keywords)
Expand Down Expand Up @@ -153,6 +156,8 @@ def setup_keywords():
"""
Sets up sections, keywords and respective callback functions.
"""
from .getkw import Section

# Top-level section
top = Section('toplevel', callback=verify_top)
top.set_status(True)
Expand Down