Improve get_future_imports implementation.

[etc/vim.git] / blib2to3 / pgen2 / grammar.py

diff --git a/blib2to3/pgen2/grammar.py b/blib2to3/pgen2/grammar.py
index 088c58bfa99c1b1b0ea5f269604e919e74685c3c..a1da546eee20e12fc29d442835d80bea6379e40c 100644 (file)
--- a/blib2to3/pgen2/grammar.py
+++ b/blib2to3/pgen2/grammar.py
@@ -13,7 +13,6 @@ fallback token code OP, but the parser needs the actual token code.
 """
 
 # Python imports
 """
 
 # Python imports

-import collections

 import pickle
 
 # Local imports
 import pickle
 
 # Local imports


@@ -86,21 +85,9 @@ class Grammar(object):
         self.start = 256
 
     def dump(self, filename):
         self.start = 256
 
     def dump(self, filename):

-        """Dump the grammar tables to a pickle file.
-
-        dump() recursively changes all dict to OrderedDict, so the pickled file
-        is not exactly the same as what was passed in to dump(). load() uses the
-        pickled file to create the tables, but  only changes OrderedDict to dict
-        at the top level; it does not recursively change OrderedDict to dict.
-        So, the loaded tables are different from the original tables that were
-        passed to load() in that some of the OrderedDict (from the pickled file)
-        are not changed back to dict. For parsing, this has no effect on
-        performance because OrderedDict uses dict's __getitem__ with nothing in
-        between.
-        """
+        """Dump the grammar tables to a pickle file."""

         with open(filename, "wb") as f:
         with open(filename, "wb") as f:

-            d = _make_deterministic(self.__dict__)
-            pickle.dump(d, f, 2)
+            pickle.dump(self.__dict__, f, pickle.HIGHEST_PROTOCOL)

 
     def load(self, filename):
         """Load the grammar tables from a pickle file."""
 
     def load(self, filename):
         """Load the grammar tables from a pickle file."""


@@ -141,17 +128,6 @@ class Grammar(object):
         print("start", self.start)
 
 
         print("start", self.start)
 
 

-def _make_deterministic(top):
-    if isinstance(top, dict):
-        return collections.OrderedDict(
-            sorted(((k, _make_deterministic(v)) for k, v in top.items())))
-    if isinstance(top, list):
-        return [_make_deterministic(e) for e in top]
-    if isinstance(top, tuple):
-        return tuple(_make_deterministic(e) for e in top)
-    return top
-
-

 # Map from operator to number (since tokenize doesn't do this)
 
 opmap_raw = """
 # Map from operator to number (since tokenize doesn't do this)
 
 opmap_raw = """