Merge pull request #4 from VidScale/allow-to-reload-model-and-enforcer-and-config

Fixed bugs to allow reinit model and enforcer in async mode

Author: leeqvip

casbin/config/config.py

@@ -41,7 +41,7 @@ def add_config(self, section, option, value):
         self._data[section][option] = value
 
     def _parse(self, fname):
-        with open(fname, 'rb') as f:
+        with open(fname, 'r') as f:
             self._parse_buffer(f)
 
     def _parse_buffer(self, f):
@@ -61,7 +61,7 @@ def _parse_buffer(self, f):
                 if len(buf) > 0:
                     self._write(section, line_num, buf)
                 break
-            line = line.strip().decode()
+            line = line.strip()
 
             if '' == line or self.DEFAULT_COMMENT == line[0:1] or self.DEFAULT_COMMENT_SEM == line[0:1]:
                 can_write = True

casbin/model/model.py

@@ -4,7 +4,6 @@
 
 
 class Model(Policy):
-    model = dict()
 
     section_name_map = {
         'r': 'request_definition',

casbin/model/policy.py

@@ -2,7 +2,8 @@
 
 
 class Policy:
-    model = dict()
+    def __init__(self):
+        self.model = {}
 
     def build_role_links(self, rm):
         if "g" not in self.model.keys():

casbin/util/expression.py

@@ -1,7 +1,7 @@
 from simpleeval import simple_eval
 
 
-def evaluate(exp_string, parameters=dict(), functions=dict()):
+def evaluate(exp_string, parameters=None, functions=None):
     exp_string = exp_string.replace("&&", "and")
     exp_string = exp_string.replace("||", "or")
     return simple_eval(exp_string, functions=functions, names=parameters)