From 97c3202973df6b3a414a92b4f4e662e24453c1fa Mon Sep 17 00:00:00 2001
From: MegaIng1 <trampchamp@hotmail.de>
Date: Fri, 16 Apr 2021 13:50:25 +0200
Subject: [PATCH] Make verify_used_files work with stdlib.

---
 lark/lark.py         |  4 ++--
 lark/load_grammar.py | 43 ++++++++++++++++++++++++++-----------------
 lark/utils.py        |  9 ---------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lark/lark.py b/lark/lark.py
index 1839a87..d55591a 100644
--- a/lark/lark.py
+++ b/lark/lark.py
@@ -8,8 +8,8 @@ from io import open
 import tempfile
 from warnings import warn
 
-from .utils import STRING_TYPE, Serialize, SerializeMemoizer, FS, isascii, logger, ABC, abstractmethod, verify_used_files
-from .load_grammar import load_grammar, FromPackageLoader, Grammar
+from .utils import STRING_TYPE, Serialize, SerializeMemoizer, FS, isascii, logger, ABC, abstractmethod
+from .load_grammar import load_grammar, FromPackageLoader, Grammar, verify_used_files
 from .tree import Tree
 from .common import LexerConf, ParserConf
 
diff --git a/lark/load_grammar.py b/lark/load_grammar.py
index 830fc02..ea5e390 100644
--- a/lark/load_grammar.py
+++ b/lark/load_grammar.py
@@ -2,6 +2,7 @@
 import hashlib
 import os.path
 import sys
+from collections import namedtuple
 from copy import copy, deepcopy
 from io import open
 import pkgutil
@@ -673,19 +674,7 @@ class Grammar:
         return terminals, compiled_rules, self.ignore
 
 
-class PackageResource(object):
-    """
-    Represents a path inside a Package. Used by `FromPackageLoader`
-    """
-    def __init__(self, pkg_name, path):
-        self.pkg_name = pkg_name
-        self.path = path
-
-    def __str__(self):
-        return "<%s: %s>" % (self.pkg_name, self.path)
-
-    def __repr__(self):
-        return "%s(%r, %r)" % (type(self).__name__, self.pkg_name, self.path)
+PackageResource = namedtuple('PackageResource', 'pkg_name path')
 
 
 class FromPackageLoader(object):
@@ -1151,13 +1140,14 @@ class GrammarBuilder:
                     joined_path = os.path.join(source, grammar_path)
                     with open(joined_path, encoding='utf8') as f:
                         text = f.read()
-                    h = hashlib.md5(text.encode('utf8')).hexdigest()
-                    if self.used_files.get(joined_path, h) != h:
-                        raise RuntimeError("Grammar file was changed during importing")
-                    self.used_files[joined_path] = h
             except IOError:
                 continue
             else:
+                h = hashlib.md5(text.encode('utf8')).hexdigest()
+                if self.used_files.get(joined_path, h) != h:
+                    raise RuntimeError("Grammar file was changed during importing")
+                self.used_files[joined_path] = h
+                    
                 gb = GrammarBuilder(self.global_keep_all_tokens, self.import_paths, self.used_files)
                 gb.load_grammar(text, joined_path, mangle)
                 gb._remove_unused(map(mangle, aliases))
@@ -1215,6 +1205,25 @@ class GrammarBuilder:
         # resolve_term_references(term_defs)
         return Grammar(rule_defs, term_defs, self._ignore_names)
 
+
+def verify_used_files(file_hashes):
+    for path, old in file_hashes.items():
+        text = None
+        if isinstance(path, str) and os.path.exists(path):
+            with open(path, encoding='utf8') as f:
+                text = f.read()
+        elif isinstance(path, PackageResource):
+            with suppress(IOError):
+                text = pkgutil.get_data(*path).decode('utf-8')
+        if text is None: # We don't know how to load the path. ignore it.
+            continue
+            
+        current = hashlib.md5(text.encode()).hexdigest()
+        if old != current:
+            logger.info("File %r changed, rebuilding Parser" % path)
+            return False
+    return True
+
 def load_grammar(grammar, source, import_paths, global_keep_all_tokens):
     builder = GrammarBuilder(global_keep_all_tokens, import_paths)
     builder.load_grammar(grammar, source)
diff --git a/lark/utils.py b/lark/utils.py
index f399b08..c9bdf88 100644
--- a/lark/utils.py
+++ b/lark/utils.py
@@ -298,15 +298,6 @@ class FS:
         else:
             return open(name, mode, **kwargs)
 
-def verify_used_files(file_hashes):
-    for path, old in file_hashes.items():
-        with open(path, encoding='utf8') as f:
-            text = f.read()
-        current = hashlib.md5(text.encode()).hexdigest()
-        if old != current:
-            logger.info("File %r changed, rebuilding Parser" % path)
-            return False
-    return True
 
 
 def isascii(s):