|
154 | 154 | # *****************************************************************************
|
155 | 155 | from __future__ import annotations
|
156 | 156 |
|
| 157 | +import bz2 as comp_other |
157 | 158 | import pickletools
|
158 | 159 | import re
|
159 | 160 | import sys
|
160 | 161 | import types
|
161 |
| - |
162 |
| -from typing import TYPE_CHECKING, Literal |
163 | 162 | import zlib as comp
|
164 |
| -import bz2 as comp_other |
165 |
| - |
166 | 163 | from pickletools import genops
|
167 |
| - |
168 |
| -from sage.misc.sage_input import SageInputBuilder, SageInputExpression |
| 164 | +from typing import Literal |
| 165 | + |
| 166 | +from sage.misc.persist import ( |
| 167 | + SageUnpickler, |
| 168 | + dumps, |
| 169 | + register_unpickle_override, |
| 170 | + unpickle_global, |
| 171 | + unpickle_override, |
| 172 | +) |
169 | 173 | from sage.misc.sage_eval import sage_eval
|
170 |
| -from sage.misc.persist import (unpickle_override, unpickle_global, dumps, |
171 |
| - register_unpickle_override, SageUnpickler) |
172 |
| - |
173 |
| -if TYPE_CHECKING: |
174 |
| - from sage.misc.sage_input import SageInputBuilder, SageInputExpression |
175 |
| - |
| 174 | +from sage.misc.sage_input import SageInputBuilder, SageInputExpression |
176 | 175 |
|
177 | 176 | # Python 3 does not have a "ClassType". Instead, we ensure that
|
178 | 177 | # isinstance(foo, ClassType) will always return False.
|
@@ -849,14 +848,13 @@ def _APPENDS_helper(self, lst, slice):
|
849 | 848 | else:
|
850 | 849 | for s in slice:
|
851 | 850 | self.sib.command(lst, self.sib.name('list').append(lst, self.sib(s)))
|
| 851 | + elif self.pedantic: |
| 852 | + app = self.sib(lst).append |
| 853 | + for s in slice: |
| 854 | + self.sib.command(lst, app(self.sib(s))) |
852 | 855 | else:
|
853 |
| - if self.pedantic: |
854 |
| - app = self.sib(lst).append |
855 |
| - for s in slice: |
856 |
| - self.sib.command(lst, app(self.sib(s))) |
857 |
| - else: |
858 |
| - for s in slice: |
859 |
| - self.sib.command(lst, self.sib(lst).append(self.sib(s))) |
| 856 | + for s in slice: |
| 857 | + self.sib.command(lst, self.sib(lst).append(self.sib(s))) |
860 | 858 | else:
|
861 | 859 | self.sib.command(lst, self.sib.name('unpickle_appends')(self.sib(lst), slice_exp))
|
862 | 860 | self.push(lst)
|
@@ -2513,7 +2511,7 @@ def unpickle_extension(code):
|
2513 | 2511 | <class 'sage.misc.explain_pickle.EmptyNewstyleClass'>
|
2514 | 2512 | sage: remove_extension('sage.misc.explain_pickle', 'EmptyNewstyleClass', 42)
|
2515 | 2513 | """
|
2516 |
| - from copyreg import _inverted_registry, _extension_cache |
| 2514 | + from copyreg import _extension_cache, _inverted_registry |
2517 | 2515 | # copied from .get_extension() in pickle.py
|
2518 | 2516 | nil = []
|
2519 | 2517 | obj = _extension_cache.get(code, nil)
|
|
0 commit comments