small fixes

calcpy/__init__.py

@@ -143,7 +143,7 @@ def unload_previewer(self):
 
 def load_ipython_extension(ip:IPython.InteractiveShell):
     if ip.profile != CALCPY_PROFILE_NAME:
-        print(f'warning: Not using the {CALCPY_PROFILE_NAME} profile (current profile is {ip.profile}')
+        print(f'warning: Not using the {CALCPY_PROFILE_NAME} profile (current profile: \'{ip.profile}\')')
 
     ip.calcpy = CalcPy(ip)
     ip.push({'calcpy': ip.calcpy}, interactive=False)

calcpy/__main__.py

@@ -1,7 +1,6 @@
 import calcpy
 import IPython
 import argparse
-import os
 
 def main():
     parser = argparse.ArgumentParser()

calcpy/formatters.py

@@ -176,7 +176,7 @@ def sympy_expr_formatter(s, printer, cycle):
     out = pretty_s
 
     try:
-        if not isinstance(s, (sympy.core.numbers.Integer, sympy.core.numbers.Float)):
+        if not isinstance(s, (sympy.Integer, sympy.Float)):
             evalu_s = pretty(evalf(s), n_col - len(" ≈ "), n_row)
             if evalu_s != pretty_s:
                 out = pretty_stack(out, " ≈ ", evalu_s, n_col)
@@ -215,6 +215,7 @@ def init(ip: IPython.InteractiveShell):
     sympy.interactive.printing.init_printing(
         pretty_print=True,
         use_latex='mathjax',
+        use_unicode=not (ip.config.TerminalInteractiveShell.simple_prompt==True),
         num_columns=shutil.get_terminal_size().columns,
         ip=ip)
 
@@ -223,7 +224,7 @@ def init(ip: IPython.InteractiveShell):
     IPython.lib.pretty.for_type(datetime.datetime, datetime_formatter)
     IPython.lib.pretty.for_type(datetime.timedelta, timedelta_formatter)
     IPython.lib.pretty.for_type(sympy.printing.defaults.Printable, ip_sympy_pretty_if_oneline_formatter)
-    IPython.lib.pretty.for_type(sympy.matrices.common.MatrixShaping, ip_matrix_formatter)
+    IPython.lib.pretty.for_type(sympy.matrices.MatrixBase, ip_matrix_formatter)
     IPython.lib.pretty.for_type(sympy.combinatorics.Cycle, sympy_pretty_formatter)
     IPython.lib.pretty.for_type(sympy.combinatorics.Permutation, ip_permutation_formatter)
 
@@ -238,7 +239,7 @@ def init(ip: IPython.InteractiveShell):
     formatter.for_type(tuple, iterable_formatter)
     formatter.for_type(dict, sympy_dict_formatter)
     formatter.for_type(sympy.Expr, sympy_expr_formatter)
-    formatter.for_type(sympy.matrices.common.MatrixCommon, sympy_expr_formatter)
+    formatter.for_type(sympy.matrices.MatrixBase, sympy_expr_formatter)
     formatter.for_type(sympy.core.function.FunctionClass, IPython.lib.pretty._function_pprint)
     formatter.for_type(sympy.combinatorics.Permutation, sympy_pretty_formatter)
     formatter.for_type(sympy.combinatorics.Cycle, sympy_pretty_formatter)

calcpy/info.py

@@ -22,20 +22,14 @@ def print_info_job(res):
     try:
         res_p = pretty(res)
 
-        if isinstance(res, (float, sympy.core.numbers.Float)):
+        if isinstance(res, (float, sympy.Float)):
             print(f'\n{pretty(sympy.Rational(res))} = Rational(_)')
-        elif isinstance(res, (complex, sympy.core.numbers.Float)):
+        elif isinstance(res, (complex, sympy.Rational)):
             pass
-        elif isinstance(res, (int, sympy.core.numbers.Integer)):
-            f_dict = sympy.factorint(res)
-            f_expr = None
-            for base, expo in f_dict.items():
-                pow = sympy.Pow(base, expo, evaluate=False)
-                if f_expr is None:
-                    f_expr = pow
-                else:
-                    f_expr = sympy.Mul(f_expr, pow, evaluate=False)
-            print(f'\n{pretty(f_expr)}       {pretty(f_dict)} = _.factorint()')
+        elif isinstance(res, (int, sympy.Integer)):
+            factors_dict = sympy.factorint(res)
+            factors_expr = sympy.Mul(*[sympy.Pow(base, expo, evaluate=False) for base, expo in factors_dict.items()], evaluate=False)
+            print(f'\n{pretty(factors_expr)}       {pretty(factors_dict)} = factorint(_)')
         elif isinstance(res, sympy.Expr):
             # sympy.factor(res, extension=[i]) could be nice (when len(res.free_symbols) >= 1) but not working most of the time
             if len(res.free_symbols) == 1:
@@ -119,7 +113,7 @@ def print_info_job(res):
             N_p = pretty(sympy.N(res))
             if N_p != res_p:
                 print(f'\n{N_p} = N(_)')
-        elif isinstance(res, sympy.matrices.common.MatrixCommon):
+        elif isinstance(res, sympy.matrices.MatrixBase):
             if res.rows == res.cols:
                 print(f'\n{pretty(sympy.det(res))} = det(_)')
                 print(f'{pretty(sympy.trace(res))} = trace(_)')

calcpy/tests/test_startup_time.py

@@ -12,7 +12,7 @@ def test_startup_time(n=10):
         start_time = time.time()
         subprocess.check_call(['calcpy', '-c', '4+4'], stdout=None, stdin=subprocess.PIPE)
         elapsed.append(time.time() - start_time)
-    print(elapsed)
+        print(elapsed[-1])
     print(f'max {max(elapsed)}')
     print(f'min {min(elapsed)}')
     print(f'avg {sum(elapsed)/n}')

calcpy/tests/test_transformers.py

@@ -1,8 +1,10 @@
 from sympy import symbols
+from datetime import datetime
 
 def test_autodate(ip):
     dt = ip.run_cell('d"today"-d"yesterday"').result
     assert dt.days == 1 or 24*60*60-1 <= dt.seconds <= 24*60*60
+    assert ip.run_cell('d\'1 January 1970\'').result == datetime(1970, 1, 1)
 
 def test_auto_product(ip):
     assert ip.run_cell('2(1+1)').result == 4

previewer/__init__.py

@@ -72,6 +72,12 @@ def sandbox_pre(self):
             sys.modules[module_name] = None
 
     def sandbox_post(self):
+        try:
+            # cache tz before removing access to it
+            import tzlocal
+            tzlocal.reload_localzone()
+        except (ModuleNotFoundError, ImportError):
+            pass
         import subprocess
         subprocess.Popen = None
         import builtins

previewer/__main__.py

@@ -9,4 +9,7 @@
     ns_conn, ns_conn_c = mp.Pipe()
     sys.stdin.close()
     proc = IPythonProcess(exec_conn_c, ctrl_conn_c, ns_conn_c, interactive=True)
-    proc.join()
+    try:
+        proc.join()
+    except KeyboardInterrupt:
+        pass

setup.py

@@ -22,6 +22,7 @@
     install_requires=[
         'requests',
         'ipython',
+        'pickleshare',
         'matplotlib',
         'sympy',
         'dateparser',