From 606078cabb24ddf1e2cb29175e6d7deae73f5749 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Tue, 3 Apr 2018 11:39:59 +0200 Subject: Global variables are evil. Tests under both py2k and py3k pass. --- wlp.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'wlp.py') diff --git a/wlp.py b/wlp.py index 64d7361..aaef6e8 100644 --- a/wlp.py +++ b/wlp.py @@ -1,27 +1,11 @@ -# -*- coding: utf-8 -*- import wlp_parser -__current_file = None - - -def setfilebyname(name): - global __current_file - __current_file = open(name, 'r') - - -def setfilebyfd(fd): - global __current_file - __current_file = fd - - -def mkdict(): +def mkdict(infile): dict = {} - if __current_file is None: - raise ValueError('current file has not been set.') tree = wlp_parser.parser.parse( - wlp_parser.lexer.lex(__current_file.read())) + wlp_parser.lexer.lex(infile.read())) for subtree in tree: current_key = subtree[0].getstr().strip('<>') -- cgit