Ticket #111: trac_111.patch

sage/combinat/matrices/latin.py

@@ -131 +131 @@
 #*****************************************************************************
 
 import sets
-import copy
 
 from sage.matrix.all import matrix
 from sage.rings.all import ZZ
@@ -318 +317 @@
 
         return self.square == Q.square
 
-    def copy(self):
+    def __copy__(self):
         """
         To copy a latin square we must copy the underlying matrix.
         
         EXAMPLES::
         
             sage: A = LatinSquare(matrix(ZZ, [[0, 1], [2, 3]]))
-            sage: B = A.copy()
-            sage: A
+            sage: B = copy(A)
+            sage: B
             [0 1]
             [2 3]
         """
-
         C = LatinSquare(self.square.nrows(), self.square.ncols())
-        C.square = self.square.copy()
+        from copy import copy
+        C.square = copy(self.square)
         return C
 
     def clear_cells(self):
@@ -908 +907 @@
 
         n = self.nrows()
 
-        G = self.copy()
+        from copy import copy
+        G = copy(self)
 
         for r in range(n-1, -1, -1):
             for c in range(n-1, -1, -1):
@@ -1117 +1117 @@
         for x in DLXCPP(dlx_rows):
             nr_found += 1
 
-            Q = copy.deepcopy(self)
+            from copy import deepcopy
+            Q = deepcopy(self)
 
             for y in x:
                 if len(dlx_rows[y]) == 1: continue # dummy row
@@ -1987 +1988 @@
     r1 = r2 = c1 = c2 = x = y = z = -1
     proper = True
 
-    L = L_start.copy()
+    from copy import copy
+    L = copy(L_start)
 
     L_rce = L
     L_cer = LatinSquare(n, n)
@@ -2642 +2644 @@
     for i in SOLUTIONS.keys():
         soln = list(i)
 
-        Q = copy.deepcopy(P)
+        from copy import deepcopy
+        Q = deepcopy(P)
 
         for x in soln:
             (r, c, e) = cmap[tuple(dlx_rows[x])]
@@ -2688 +2691 @@
     assert T1.nrows() == T2.nrows()
 
     n = T1.nrows()
-
-    Q1 = T1.copy()
-    Q2 = T2.copy()
+    
+    from copy import copy
+    Q1 = copy(T1)
+    Q2 = copy(T2)
 
     for r in range(n):
         for c in range(n):

sage/databases/database.py

@@ -572 +572 @@
         from copy import copy
         return copy(self.__query_string__)
         
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of the query.
         
@@ -581 +581 @@
             sage: q = 'select graph_id,graph6,num_vertices,num_edges from graph_data where graph_id<=(?) and num_vertices=(?)'
             sage: param = (22,5)
             sage: Q = GenericSQLQuery(G,q,param)
-            sage: R = Q.copy()
+            sage: R = copy(Q)
             sage: R.get_query_string()
             'select graph_id,graph6,num_vertices,num_edges from graph_data where graph_id<=(?) and num_vertices=(?)'
             sage: R.show()
@@ -1000 +1000 @@
         else:
             self.__query_string__ = ''
             
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of itself.
         
@@ -1032 +1032 @@
             55                   E?C_                 6                   
             210                  F???W                7                   
             211                  F??G_                7                   
-            sage: R = Q.copy()
+            sage: R = copy(Q)
             sage: print R
             Query for sql database: ...graphs.db
             Query string: SELECT graph_data.graph_id, graph_data.graph6, graph_data.num_vertices FROM graph_data WHERE graph_data.num_edges < ?
@@ -1154 +1154 @@
                 self.__param_tuple__ = self.__param_tuple__ + other.__param_tuple__
 
         else:
-            if not self.__query_string__: return other.copy()
-            if not other.__query_string__: return self.copy()
+            from copy import copy
+            if not self.__query_string__: return copy(other)
+            if not other.__query_string__: return copy(self)
             if join_table is None or join_dict is None:
                 pattern = ' JOIN '
                 if re.search(pattern,self.__query_string__) or re.search(pattern,other.__query_string__):
@@ -1167 +1168 @@
                 if s[0] != o[0]:
                     raise ValueError('Input queries query different tables but join parameters are NoneType')
 
-            q = self.copy()
+            q = copy(self)
             
             # inner join clause
             if join_dict is not None:
@@ -1288 +1289 @@
             
             self.__param_tuple__ = self.__param_tuple__ + other.__param_tuple__
         else:
-            q = self.copy()
+            from copy import copy
+            q = copy(self)
             if not self.__query_string__: return q
-            if not other.__query_string__: return other.copy()
+            if not other.__query_string__: return copy(other)
             if join_table is None or join_dict is None:
                 pattern = ' JOIN '
                 if re.search(pattern,self.__query_string__) or re.search(pattern,other.__query_string__):
@@ -1355 +1357 @@
                 self.__query_string__ = re.sub(' WHERE ',' WHERE NOT ( ',self.__query_string__) + ' )'
             else: return
         else:
-            if not self.__query_string__: return self.copy()
+            if not self.__query_string__: 
+                from copy import copy
+                return copy(self)
             q = SQLQuery(self.__database__)
             q.__query_string__ = re.sub(' WHERE ',' WHERE NOT ( ',self.__query_string__)
             q.__query_string__ += ' )'
@@ -1543 +1547 @@
                 s += '\n'
         return s
 
-    def copy(self):
+    def __copy__(self):
         """
         Returns an instance of SQLDatabase that points to a copy database,
         and allows modification.
@@ -1552 +1556 @@
             sage: DB = SQLDatabase()
             sage: DB.create_table('lucy',{'id':{'sql':'INTEGER', 'primary_key':True, 'index':True},'a1':{'sql':'bool','primary_key':False}, 'b2':{'sql':'int', 'primary_key':False}})
             sage: DB.add_rows('lucy', [(0,1,1),(1,1,4),(2,0,7),(3,1,384),(4,1,978932)],['id','a1','b2'])
-            sage: d = DB.copy()
+            sage: d = copy(DB)
             
             sage: d.show('lucy')
             a1                   id                   b2                  
@@ -1591 +1595 @@
             1                    4                    978932
 
         """
-        from copy import copy
         # copy .db file
         new_loc = tmp_filename() + '.db'
         os.system('cp '+ self.__dblocation__ + ' ' + new_loc)

sage/groups/perm_gps/partn_ref/refinement_python.pyx

@@ -142 +142 @@
         """
         PS_move_min_to_front(self.c_ps, start, end)
 
-    def copy(self):
+    def __copy__(self):
         """
 
         EXAMPLE::
         
             sage: from sage.groups.perm_gps.partn_ref.refinement_python import PythonPartitionStack
             sage: P = PythonPartitionStack(7)
-            sage: Q = P.copy()
+            sage: Q = copy(P)
             sage: P.display()
             (0 1 2 3 4 5 6)
             sage: Q.display()

sage/libs/ntl/ntl_ZZX.pyx

@@ -149 +149 @@
         cpp_delete_array(val)
         return result
 
-    def copy(self):
-        """
-        Return a copy of self.
-
-        EXAMPLES:
-            sage: x = ntl.ZZX([1,32])
-            sage: y = x.copy()
-            sage: y == x
-            True
-            sage: y is x
-            False
-        """
-        _sig_on
-        return self.__copy__()
-
     def __copy__(self):
         """
         Return a copy of self.
 
         EXAMPLES:
             sage: x = ntl.ZZX([1,32])
-            sage: y = x.copy()
+            sage: y = copy(x)
             sage: y == x
             True
             sage: y is x
@@ -424 +409 @@
         if n < 0:
             raise NotImplementedError
         import sage.groups.generic as generic
-        return generic.power(self, n, one_ZZX.copy())
+        from copy import copy
+        return generic.power(self, n, copy(one_ZZX))
 
     def __cmp__(ntl_ZZX self, ntl_ZZX other):
         """
@@ -822 +808 @@
             []
         """
         if m <= 0:
-            return zero_ZZX.copy()
+            from copy import copy
+            return copy(zero_ZZX)
         _sig_on
         return make_ZZX(ZZX_truncate(&self.x, m))
 
@@ -839 +826 @@
             [10 20]
         """
         if m <= 0:
-            return zero_ZZX.copy()
+            from copy import copy
+            return copy(zero_ZZX)
         return make_ZZX(ZZX_multiply_and_truncate(&self.x, &other.x, m))
 
     def square_and_truncate(self, long m):
@@ -854 +842 @@
             [1 4 10 20]
         """
         if m < 0:
-            return zero_ZZX.copy()
+            from copy import copy
+            return copy(zero_ZZX)
         return make_ZZX(ZZX_square_and_truncate(&self.x, m))
 
     def invert_and_truncate(self, long m):

sage/libs/ntl/ntl_ZZ_pEX.pyx

@@ -181 +181 @@
         sage: f = ntl.ZZ_pEX([a, b, b])
         sage: f
         [[3 2] [1 2] [1 2]]
-        sage: y = f.copy()
+        sage: y = copy(f)
         sage: y == f
         True
         sage: y is f
@@ -194 +194 @@
         r.x = self.x
         return r
 
-    def copy(self):
-        """
-        Return a copy of self.
-
-        EXAMPLES:
-        sage: c=ntl.ZZ_pEContext(ntl.ZZ_pX([1,1,1], 7)) 
-        sage: a = ntl.ZZ_pE([3,2], c)
-        sage: b = ntl.ZZ_pE([1,2], c)
-        sage: f = ntl.ZZ_pEX([a, b, b])
-        sage: f
-        [[3 2] [1 2] [1 2]]
-        sage: y = f.copy()
-        sage: y == f
-        True
-        sage: y is f
-        False
-        sage: f[0] = 0; y
-        [[3 2] [1 2] [1 2]]
-        """
-        return self.__copy__()
-        
     def get_modulus_context(self):
         """
         Returns the structure that holds the underlying NTL modulus.

sage/libs/ntl/ntl_ZZ_pX.pyx

@@ -173 +173 @@
 
         EXAMPLES:
             sage: x = ntl.ZZ_pX([0,5,-3],11)
-            sage: y = x.copy()
+            sage: y = copy(x)
             sage: x == y
             True
             sage: x is y
@@ -186 +186 @@
         r.x = self.x
         return r
 
-    def copy(self):
-        """
-        Return a copy of self.
-
-        EXAMPLES:
-            sage: x = ntl.ZZ_pX([0,5,-3],11)
-            sage: y = x.copy()
-            sage: x == y
-            True
-            sage: x is y
-            False
-            sage: x[0] = 4; y
-            [0 5 8]
-        """
-        return self.__copy__()
-        
     def get_modulus_context(self):
         """
         Return the modulus for self.

sage/libs/pari/gen.pyx

@@ -1048 +1048 @@
         """
         return gcmp_sage(left.g, (<gen>right).g)
 
-    def copy(gen self):
+    def __copy__(gen self):
         _sig_on
         return P.new_gen(gcopy(self.g))
 

sage/modular/modsym/manin_symbols.py

@@ -1664 +1664 @@
         """
         raise NotImplementedError
 
-    def copy(self):
+    def __copy__(self):
         """
         Return a copy of this ManinSymbol.
 
@@ -1673 +1673 @@
             sage: from sage.modular.modsym.manin_symbols import ManinSymbol, ManinSymbolList_gamma0
             sage: m = ManinSymbolList_gamma0(5,8)
             sage: s = ManinSymbol(m,(2,2,3))
-            sage: s2=s.copy()
+            sage: s2 = copy(s)
             sage: s2
             [X^2*Y^4,(2,3)]
         

sage/modules/free_module.py

@@ -116 +116 @@
     sage: A.0[0] = 5
     Traceback (most recent call last):
     ...
-    ValueError: vector is immutable; please change a copy instead (use self.copy())
+    ValueError: vector is immutable; please change a copy instead (use copy())
 
 We can save and load submodules and elements::
 
@@ -5984 +5984 @@
         sage: v[0] = 0 # immutable
         Traceback (most recent call last):
         ...
-        ValueError: vector is immutable; please change a copy instead (use self.copy())
+        ValueError: vector is immutable; please change a copy instead (use copy())
         sage: sage.modules.free_module.basis_seq(V, V.gens())
         [
         (1, 0),

sage/modules/free_module_element.pyx

@@ -510 +510 @@
     def _hash(self):
         return hash(tuple(list(self)))
 
-    def copy(self):
+    def __copy__(self):
         """
         Make a copy of this vector.
         
@@ -518 +518 @@
         
             sage: v = vector([1..5]); v
             (1, 2, 3, 4, 5)
-            sage: w = v.copy()
+            sage: w = copy(v)
             sage: v == w
             True
             sage: v is w
@@ -528 +528 @@
         
             sage: v = vector([1..5], sparse=True); v
             (1, 2, 3, 4, 5)
-            sage: v.copy()
+            sage: copy(v)
             (1, 2, 3, 4, 5)
         """
-        return self.__copy__()
-
-    def __copy__(self):
         if self.is_sparse():
             return self.parent()(self.dict())
         else:
@@ -552 +549 @@
             sage: v[1] = 10
             Traceback (most recent call last):
             ...
-            ValueError: vector is immutable; please change a copy instead (use self.copy())
+            ValueError: vector is immutable; please change a copy instead (use copy())
         """
         self._is_mutable = 0
 
@@ -893 +890 @@
             sage: v[1:2] = [3,5]
             Traceback (most recent call last):
             ...
-            ValueError: vector is immutable; please change a copy instead (use self.copy())
+            ValueError: vector is immutable; please change a copy instead (use copy())
         """
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         cdef Py_ssize_t k, d, n
         d = self.degree()
         R = self.base_ring()
@@ -1533 +1530 @@
 
         if self._degree == 0:
             if sparse == self.is_sparse():
-                return self.copy()
+                from copy import copy
+                return copy(self)
             elif sparse:
                 return self.sparse_vector()
             else:
@@ -1591 +1589 @@
         # We would just use apply_map, except that Cython doesn't
         # allow lambda functions
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
 
         if self.is_sparse():
             v = dict([(i,z.derivative(var)) for i,z in self.dict().items()])
@@ -1843 +1842 @@
         Set entry i of self to value.
         """
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         i = int(i)
         #if not isinstance(i, int):
         #    raise TypeError, "index must an integer"
@@ -1869 +1868 @@
             (5, 3)
         """
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         cdef Py_ssize_t k, n, d
         d = self.degree()
         R = self.base_ring()
@@ -2198 +2197 @@
         Like __setitem__ but with no type or bounds checking.
         """
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         i = int(i)
         if x == 0:
             if self._entries.has_key(i):
@@ -2225 +2224 @@
             TypeError: unable to convert x (=sqrt(2)) to an integer
         """
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         i = int(i)
         #if not isinstance(i, int):
         #    raise TypeError, "index must an integer"

sage/modules/vector_double_dense.pyx

@@ -133 +133 @@
 
         EXAMPLE:
             sage: a = vector(RDF, range(9))
-            sage: a == a.copy()
+            sage: a == copy(a)
             True
         """
         if self._degree == 0:
             return self
-        return self._new(self._vector_numpy.copy())
+        from copy import copy
+        return self._new(copy(self._vector_numpy))
 
     def __init__(self, parent, entries, coerce = True, copy = True):
         """
@@ -302 +303 @@
             (0.0, 2.0, 4.0)
         """
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
         
         cdef Vector_double_dense _right, _left
         _right = right
@@ -320 +322 @@
             True
         """
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
 
         cdef Vector_double_dense _right, _left
         _right = right
@@ -342 +345 @@
         if not right.parent() == self.parent():
             right = self.parent().ambient_module()(right)
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
 
         cdef Vector_double_dense _right, _left
         _right = right
@@ -366 +370 @@
             right = self.parent().ambient_module()(right)
             
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
         
         cdef Vector_double_dense _right, _left
         _right = right
@@ -384 +389 @@
             (0, 3.0, 6.0)
         """
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
 
         return self._new(self._python_dtype(left)*self._vector_numpy)
 
@@ -399 +405 @@
             (0, 3.0, 6.0)
         """
         if self._degree == 0:
-            return self.copy()
+            from copy import copy
+            return copy(self)
 
         return self._new(self._vector_numpy*self._python_dtype(right))
 
@@ -505 +512 @@
             sage: v.numpy()
             array([], dtype=float64)
         """
-        return self._vector_numpy.copy()
+        from copy import copy
+        return copy(self._vector_numpy)
 
     cdef _replace_self_with_numpy(self,cnumpy.ndarray numpy_array):
         """

sage/modules/vector_integer_dense.pyx

@@ -144 +144 @@
         
         """
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         cdef Integer z
         if i < 0 or i >= self._degree:
             raise IndexError

sage/modules/vector_rational_dense.pyx

@@ -145 +145 @@
 
     def __setitem__(self, Py_ssize_t i, x):
         if not self._is_mutable:
-            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
+            raise ValueError, "vector is immutable; please change a copy instead (use copy())"
         cdef Rational z
         if i < 0 or i >= self._degree:
             raise IndexError

sage/rings/finite_field_element.py

@@ -393 +393 @@
             self.__multiplicative_order = order
             return order
     
-    def copy(self):
+    def __copy__(self):
         """
         Return a copy of this element.
         
@@ -404 +404 @@
             sage: a = k(5)
             sage: a
             2
-            sage: a.copy()
+            sage: copy(a)
             2
-            sage: b = a.copy()
+            sage: b = copy(a)
             sage: a == b
             True
             sage: a is b

sage/rings/fraction_field_element.pyx

@@ -176 +176 @@
         except NotImplementedError, s:
             raise ArithmeticError, "unable to reduce because gcd algorithm not implemented on input"            
 
-    def copy(self):
+    def __copy__(self):
         """
         EXAMPLES::
         
             sage: R.<x,y> = ZZ[]
             sage: f = x/y+1; f
             (x + y)/y
-            sage: f.copy()
+            sage: copy(f)
             (x + y)/y
         """
         return self.__class__(self._parent, self.__numerator,

sage/rings/laurent_series_ring_element.pyx

@@ -940 +940 @@
         """
         return self.__u.prec() + self.__n
 
-    def copy(self):
+    def __copy__(self):
         return LaurentSeries(self._parent, self.__u.copy(), self.__n)
 
 

sage/rings/padics/padic_ZZ_pX_CA_element.pyx

@@ -1564 +1564 @@
         ZZ_to_mpz(&ans.value, &tmp_z)
         return ans
 
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of ``self``.
 
@@ -1576 +1576 @@
             sage: W.<w> = R.ext(f)
             sage: b = W(45, 17); b
             4*w^5 + 3*w^7 + w^9 + w^10 + 2*w^11 + w^12 + w^13 + 3*w^14 + w^16 + O(w^17)
-            sage: c = b.copy(); c
+            sage: c = copy(b); c
             4*w^5 + 3*w^7 + w^9 + w^10 + 2*w^11 + w^12 + w^13 + 3*w^14 + w^16 + O(w^17)
             sage: c is b
             False

sage/rings/padics/padic_ZZ_pX_CR_element.pyx

@@ -2190 +2190 @@
         # for now, a simple implementation
         return self * (~right)
 
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of ``self``.
 
@@ -2202 +2202 @@
             sage: W.<w> = R.ext(f)
             sage: b = W(45, 17); b
             4*w^5 + 3*w^7 + w^9 + w^10 + 2*w^11 + w^12 + w^13 + 3*w^14 + w^16 + O(w^17)
-            sage: c = b.copy(); c
+            sage: c = copy(b); c
             4*w^5 + 3*w^7 + w^9 + w^10 + 2*w^11 + w^12 + w^13 + 3*w^14 + w^16 + O(w^17)
             sage: c is b
             False

sage/rings/padics/padic_ZZ_pX_FM_element.pyx

@@ -837 +837 @@
         ZZ_pX_MulMod_pre(ans.value, self.value, ans.value, self.prime_pow.get_top_modulus()[0])
         return ans
 
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of ``self``.
 
@@ -849 +849 @@
             sage: W.<w> = R.ext(f)
             sage: b = W(45); b
             4*w^5 + 3*w^7 + w^9 + w^10 + 2*w^11 + w^12 + w^13 + 3*w^14 + w^16 + 2*w^17 + w^19 + 4*w^20 + w^21 + 3*w^22 + 3*w^23 + 4*w^24 + O(w^25)
-            sage: c = b.copy(); c
+            sage: c = copy(b); c
             4*w^5 + 3*w^7 + w^9 + w^10 + 2*w^11 + w^12 + w^13 + 3*w^14 + w^16 + 2*w^17 + w^19 + 4*w^20 + w^21 + 3*w^22 + 3*w^23 + 4*w^24 + O(w^25)
             sage: c is b
             False

sage/rings/padics/padic_capped_absolute_element.pyx

@@ -807 +807 @@
                 mpz_mod(ans.value, ans.value, self.prime_pow.pow_mpz_t_tmp(ans.absprec)[0])
             return ans
 
-    def copy(pAdicCappedAbsoluteElement self):
+    def __copy__(pAdicCappedAbsoluteElement self):
         """
         Returns a copy of ``self``.
 
         EXAMPLES::
 
-            sage: a = ZpCA(5,6)(17); b = a.copy()
+            sage: a = ZpCA(5,6)(17); b = copy(a)
             sage: a == b
             True
             sage: a is b

sage/rings/padics/padic_capped_relative_element.pyx

@@ -1450 +1450 @@
             ans._normalized = self._normalized
         return ans
 
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of self.
 
         EXAMPLES::
 
-            sage: a = Zp(5,6)(17); b = a.copy()
+            sage: a = Zp(5,6)(17); b = copy(a)
             sage: a == b
             True
             sage: a is b

sage/rings/padics/padic_fixed_mod_element.pyx

@@ -658 +658 @@
         mpz_mod(ans.value, self.value, self.prime_pow.pow_mpz_t_tmp(mpz_get_ui((<Integer>absprec).value))[0])
         return ans
 
-    def copy(self):
+    def __copy__(self):
         """
         Returns a copy of self.
 
         EXAMPLES::
 
-            sage: a = ZpFM(5,6)(17); b = a.copy()
+            sage: a = ZpFM(5,6)(17); b = copy(a)
             sage: a == b
             True
             sage: a is b

sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py

@@ -723 +723 @@
             variable = self.parent().variable_name()
         return pari(self.list()).Polrev(variable)
 
-    def copy(self):
-        return Polynomial_padic_capped_relative_dense(self.parent(), (self._poly.copy(), self._valbase, copy.copy(self._relprecs), self._normalized, copy.copy(self._valaddeds), copy.copy(self._list)), construct = True)
+    def __copy__(self):
+        return Polynomial_padic_capped_relative_dense(self.parent(), (copy.copy(self._poly), self._valbase, copy.copy(self._relprecs), self._normalized, copy.copy(self._valaddeds), copy.copy(self._list)), construct = True)
 
     def degree(self):
         """

sage/rings/polynomial/polynomial_element.pyx

@@ -2502 +2502 @@
                 f = pari(v).Polrev()
                 Rpari = R.pari_nf()
                 if (Rpari.variable() != "a"):
-                    Rpari = Rpari.copy()
+                    Rpari = copy.copy(Rpari)
                     Rpari[0] = Rpari[0]("a")
                     Rpari[6] = [ x("a") for x in Rpari[6] ]
                 G = list(Rpari.nffactor(f))

sage/rings/polynomial/polynomial_element_generic.py

@@ -610 +610 @@
         
         if isinstance(x, Polynomial):
             if x.parent() == self.parent():
-                self.__poly = x.__poly.copy()
+                from copy import copy
+                self.__poly = copy(x.__poly)
                 return
             else:
                 x = [QQ(a) for a in x.list()]
@@ -868 +869 @@
         Return a copy of this polynomial.
         """
         f = Polynomial_rational_dense(self.parent())
-        f.__poly = self.__poly.copy()
+        from copy import copy
+        f.__poly = copy(self.__poly)
         return f
         
     def degree(self, gen=None):

sage/rings/power_series_poly.pyx

@@ -186 +186 @@
 
     def _unsafe_mutate(self, i, value):
         """
-        SAGE assumes throughout that commutative ring elements are immutable.
+        Sage assumes throughout that commutative ring elements are immutable.
         This is relevant for caching, etc.  But sometimes you need to change
         a power series and you really know what you're doing.  That's
         when this function is for you.
@@ -311 +311 @@
 
     def __iter__(self):
         """
-        Return an interator over the coefficients of this power series.
+        Return an iterator over the coefficients of this power series.
 
         EXAMPLES:
             sage: R.<t> = QQ[[]]
@@ -572 +572 @@
         return PowerSeries_poly(self._parent, self.__f.truncate(prec),
                                 min(self._prec, prec), check=False)
         
-    def copy(self):
-        """
-        Return a copy of self.
-
-        EXAMPLES:
-            sage: R.<t> = ZZ[[]]
-            sage: f = t + t^3
-            sage: f.copy()
-            t + t^3
-            sage: f.copy() == f
-            True
-            sage: f.copy() is f
-            False
-        """
-        return PowerSeries_poly(self._parent, self.__f, self._prec, check=False)
-
     def list(self):
         """
         Return the list of known coefficients for self. This is just

sage/rings/rational.pyx

@@ -555 +555 @@
         elif i == 0: return 0
         else: return 1
 
-    def copy(self):
+    def __copy__(self):
         """
         Return a copy of self.
         
@@ -564 +564 @@
         EXAMPLES::
         
             sage: a = -17/37
-            sage: a.copy() is a
+            sage: copy(a) is a
             False
         
         Coercion does not make a new copy::