Fixed conflict after merging PR 254

pint/quantity.py

@@ -102,6 +102,12 @@ class _Quantity(SharedRegistryObject):
         ret.__used = self.__used
         return ret
 
+    def __deepcopy__(self, memo):
+        ret = self.__class__(copy.deepcopy(self._magnitude, memo), 
+                copy.deepcopy(self._units, memo))
+        ret.__used = self.__used
+        return ret
+
     def __str__(self):
         return format(self)
 

pint/testsuite/test_issues.py

@@ -3,6 +3,7 @@
 from __future__ import division, unicode_literals, print_function, absolute_import
 
 import math
+import copy
 
 from pint import UnitRegistry
 from pint.unit import UnitsContainer
@@ -499,3 +500,10 @@ class TestIssuesNP(QuantityTestCase):
         self.assertEqual(np.float32(a/b), 1000.)
         self.assertEqual(np.float64(a/b), 1000.)
         self.assertEqual(np.float128(a/b), 1000.)
+
+    def test_issue252(self):
+        ur = UnitRegistry()
+        q = ur("3 F")
+        t = copy.deepcopy(q)
+        u = t.to(ur.mF)
+        self.assertQuantityEqual(q.to(ur.mF), u)