Refactor out more conversions

Author: GiacomoPope

src/flint/arb.pyx

@@ -1,3 +1,6 @@
+from cpython.version cimport PY_MAJOR_VERSION
+from flint.utils.conversion cimport chars_from_str, str_from_chars
+
 cdef _str_trunc(s, trunc=0):
     if trunc > 0 and len(s) > 3 * trunc:
         left = right = trunc

src/flint/flint_base/flint_context.pxd

@@ -9,5 +9,3 @@ cdef class FlintContext:
     cdef arf_rnd_t rnd
     cdef public bint unicode
     cdef public long _cap
-
-    pass

src/flint/fmpz.pyx

@@ -1,3 +1,6 @@
+from cpython.version cimport PY_MAJOR_VERSION
+from flint.utils.conversion cimport chars_from_str
+
 cdef inline int fmpz_set_pylong(fmpz_t x, obj):
     cdef int overflow
     cdef slong longval

src/flint/fmpz_mpoly.pyx

@@ -1,3 +1,6 @@
+from cpython.version cimport PY_MAJOR_VERSION
+from flint.utils.conversion cimport str_from_chars
+
 cdef any_as_fmpz_mpoly(x):
     cdef fmpz_mpoly res
     """

src/flint/fmpz_poly.pyx

@@ -1,3 +1,5 @@
+from cpython.version cimport PY_MAJOR_VERSION
+
 cdef any_as_fmpz_poly(x):
     cdef fmpz_poly res
     if typecheck(x, fmpz_poly):

src/flint/nmod_mat.pyx

@@ -1,3 +1,5 @@
+from flint.utils.conversion cimport matrix_to_str
+
 cdef any_as_nmod_mat(obj, nmod_t mod):
     cdef nmod_mat r
     cdef mp_limb_t v

src/flint/pyflint.pyx

@@ -24,33 +24,6 @@ cdef extern from "Python.h":
     double PyComplex_RealAsDouble(PyObject *op)
     double PyComplex_ImagAsDouble(PyObject *op)
 
-from cpython.version cimport PY_MAJOR_VERSION
-
-cdef chars_from_str(s):
-    if PY_MAJOR_VERSION < 3:
-        return s
-    else:
-        return s.encode('ascii')
-
-cdef str_from_chars(s):
-    if PY_MAJOR_VERSION < 3:
-        return str(s)
-    else:
-        return bytes(s).decode('ascii')
-
-cdef matrix_to_str(tab):
-    if len(tab) == 0 or len(tab[0]) == 0:
-        return "[]"
-    tab = [[str(c) for c in row] for row in tab]
-    widths = []
-    for i in xrange(len(tab[0])):
-        w = max([len(row[i]) for row in tab])
-        widths.append(w)
-    for i in xrange(len(tab)):
-        tab[i] = [s.rjust(widths[j]) for j, s in enumerate(tab[i])]
-        tab[i] = "[" + (", ".join(tab[i])) + "]"
-    return "\n".join(tab)
-
 cdef inline bint typecheck(object ob, object tp):
     return PyObject_TypeCheck(ob, <PyTypeObject*>tp)
 

src/flint/utils/conversion.pxd

@@ -1,5 +1,32 @@
+from cpython.version cimport PY_MAJOR_VERSION
+
 cdef inline long prec_to_dps(n):
     return max(1, int(round(int(n)/3.3219280948873626)-1))
 
 cdef inline long dps_to_prec(n):
-    return max(1, int(round((int(n)+1)*3.3219280948873626)))
+    return max(1, int(round((int(n)+1)*3.3219280948873626)))
+
+cdef inline chars_from_str(s):
+    if PY_MAJOR_VERSION < 3:
+        return s
+    else:
+        return s.encode('ascii')
+
+cdef inline str_from_chars(s):
+    if PY_MAJOR_VERSION < 3:
+        return str(s)
+    else:
+        return bytes(s).decode('ascii')
+
+cdef inline matrix_to_str(tab):
+    if len(tab) == 0 or len(tab[0]) == 0:
+        return "[]"
+    tab = [[str(c) for c in row] for row in tab]
+    widths = []
+    for i in xrange(len(tab[0])):
+        w = max([len(row[i]) for row in tab])
+        widths.append(w)
+    for i in xrange(len(tab)):
+        tab[i] = [s.rjust(widths[j]) for j, s in enumerate(tab[i])]
+        tab[i] = "[" + (", ".join(tab[i])) + "]"
+    return "\n".join(tab)