[75998] trunk/dports/python/py27-pydicom
eborisch at macports.org
eborisch at macports.org
Tue Feb 15 07:22:02 PST 2011
Revision: 75998
http://trac.macports.org/changeset/75998
Author: eborisch at macports.org
Date: 2011-02-15 07:22:00 -0800 (Tue, 15 Feb 2011)
Log Message:
-----------
py27-pydicom: Rename patch files
Modified Paths:
--------------
trunk/dports/python/py27-pydicom/Portfile
Added Paths:
-----------
trunk/dports/python/py27-pydicom/files/patch-dicom-UID.py.diff
trunk/dports/python/py27-pydicom/files/patch-dicom-test-_write_stds.py.diff
trunk/dports/python/py27-pydicom/files/patch-dicom-test-test_UID.py.diff
Removed Paths:
-------------
trunk/dports/python/py27-pydicom/files/patch.dicom_UID.py
trunk/dports/python/py27-pydicom/files/patch.dicom_test__write_stds.py
trunk/dports/python/py27-pydicom/files/patch.dicom_test_test_UID.py
Modified: trunk/dports/python/py27-pydicom/Portfile
===================================================================
--- trunk/dports/python/py27-pydicom/Portfile 2011-02-15 15:15:51 UTC (rev 75997)
+++ trunk/dports/python/py27-pydicom/Portfile 2011-02-15 15:22:00 UTC (rev 75998)
@@ -30,8 +30,8 @@
# Patches from upstream revision 156044badd:
# See http://code.google.com/p/pydicom/issues/detail?id=96
-patchfiles patch.dicom_UID.py \
- patch.dicom_test__write_stds.py \
- patch.dicom_test_test_UID.py
+patchfiles patch-dicom-UID.py.diff \
+ patch-dicom-test-_write_stds.py.diff \
+ patch-dicom-test-test_UID.py.diff
depends_lib-append port:py27-numpy
Copied: trunk/dports/python/py27-pydicom/files/patch-dicom-UID.py.diff (from rev 75997, trunk/dports/python/py27-pydicom/files/patch.dicom_UID.py)
===================================================================
--- trunk/dports/python/py27-pydicom/files/patch-dicom-UID.py.diff (rev 0)
+++ trunk/dports/python/py27-pydicom/files/patch-dicom-UID.py.diff 2011-02-15 15:22:00 UTC (rev 75998)
@@ -0,0 +1,14 @@
+--- dicom/UID.py.orig 2011-01-27 12:24:59.000000000 -0600
++++ dicom/UID.py 2011-01-27 12:25:37.000000000 -0600
+@@ -77,9 +77,9 @@
+
+ def __eq__(self, other):
+ """Override string equality so either name or UID number match passes"""
+- if str.__eq__(self, other):
++ if str.__eq__(self, other) is True: # 'is True' needed (issue 96)
+ return True
+- if str.__eq__(self.name, other):
++ if str.__eq__(self.name, other) is True: # 'is True' needed (issue 96)
+ return True
+ return False
+
Copied: trunk/dports/python/py27-pydicom/files/patch-dicom-test-_write_stds.py.diff (from rev 75997, trunk/dports/python/py27-pydicom/files/patch.dicom_test__write_stds.py)
===================================================================
--- trunk/dports/python/py27-pydicom/files/patch-dicom-test-_write_stds.py.diff (rev 0)
+++ trunk/dports/python/py27-pydicom/files/patch-dicom-test-_write_stds.py.diff 2011-02-15 15:22:00 UTC (rev 75998)
@@ -0,0 +1,11 @@
+--- dicom/test/_write_stds.py.orig 2011-02-15 09:07:21.000000000 -0600
++++ dicom/test/_write_stds.py 2011-02-15 09:07:37.000000000 -0600
+@@ -36,7 +36,7 @@
+ # Implicit VR, big endian, SQ's with defined lengths
+ # Realized after coding this that there is no Impl VR big endian in DICOM std;
+ # however, it seems to exist as a GE private transfer syntax.
+-# Will leave this here for now, but not test with it.
++# Will leave this here for now.
+ impl_BE_deflen_std_hex = (
+ "00 10 00 10 " # (0010, 0010) Patient's Name
+ "00 00 00 0c " # length 12
Copied: trunk/dports/python/py27-pydicom/files/patch-dicom-test-test_UID.py.diff (from rev 75997, trunk/dports/python/py27-pydicom/files/patch.dicom_test_test_UID.py)
===================================================================
--- trunk/dports/python/py27-pydicom/files/patch-dicom-test-test_UID.py.diff (rev 0)
+++ trunk/dports/python/py27-pydicom/files/patch-dicom-test-test_UID.py.diff 2011-02-15 15:22:00 UTC (rev 75998)
@@ -0,0 +1,19 @@
+--- dicom/test/test_UID.py.orig 2011-01-27 12:23:41.000000000 -0600
++++ dicom/test/test_UID.py 2011-01-27 12:24:16.000000000 -0600
+@@ -32,6 +32,16 @@
+ uid = UID('1.2.840.10008.1.2')
+ self.assertEqual(uid, 'Implicit VR Little Endian', "UID equality failed on name")
+ self.assertEqual(uid, '1.2.840.10008.1.2', "UID equality failed on number string")
++ def testCompareNumber(self):
++ """UID: comparing against a number give False............."""
++ # From issue 96
++ uid = UID('1.2.3')
++ self.assertNotEqual(uid, 3, "Comparison against a number returned True")
++ def testCompareNone(self):
++ """UID: comparing against None give False................."""
++ # From issue 96
++ uid = UID('1.2.3')
++ self.assertNotEqual(uid, None, "Comparison against a number returned True")
+ def testTransferSyntaxes(self):
+ pass
+
Deleted: trunk/dports/python/py27-pydicom/files/patch.dicom_UID.py
===================================================================
--- trunk/dports/python/py27-pydicom/files/patch.dicom_UID.py 2011-02-15 15:15:51 UTC (rev 75997)
+++ trunk/dports/python/py27-pydicom/files/patch.dicom_UID.py 2011-02-15 15:22:00 UTC (rev 75998)
@@ -1,14 +0,0 @@
---- dicom/UID.py.orig 2011-01-27 12:24:59.000000000 -0600
-+++ dicom/UID.py 2011-01-27 12:25:37.000000000 -0600
-@@ -77,9 +77,9 @@
-
- def __eq__(self, other):
- """Override string equality so either name or UID number match passes"""
-- if str.__eq__(self, other):
-+ if str.__eq__(self, other) is True: # 'is True' needed (issue 96)
- return True
-- if str.__eq__(self.name, other):
-+ if str.__eq__(self.name, other) is True: # 'is True' needed (issue 96)
- return True
- return False
-
Deleted: trunk/dports/python/py27-pydicom/files/patch.dicom_test__write_stds.py
===================================================================
--- trunk/dports/python/py27-pydicom/files/patch.dicom_test__write_stds.py 2011-02-15 15:15:51 UTC (rev 75997)
+++ trunk/dports/python/py27-pydicom/files/patch.dicom_test__write_stds.py 2011-02-15 15:22:00 UTC (rev 75998)
@@ -1,11 +0,0 @@
---- dicom/test/_write_stds.py.orig 2011-02-15 09:07:21.000000000 -0600
-+++ dicom/test/_write_stds.py 2011-02-15 09:07:37.000000000 -0600
-@@ -36,7 +36,7 @@
- # Implicit VR, big endian, SQ's with defined lengths
- # Realized after coding this that there is no Impl VR big endian in DICOM std;
- # however, it seems to exist as a GE private transfer syntax.
--# Will leave this here for now, but not test with it.
-+# Will leave this here for now.
- impl_BE_deflen_std_hex = (
- "00 10 00 10 " # (0010, 0010) Patient's Name
- "00 00 00 0c " # length 12
Deleted: trunk/dports/python/py27-pydicom/files/patch.dicom_test_test_UID.py
===================================================================
--- trunk/dports/python/py27-pydicom/files/patch.dicom_test_test_UID.py 2011-02-15 15:15:51 UTC (rev 75997)
+++ trunk/dports/python/py27-pydicom/files/patch.dicom_test_test_UID.py 2011-02-15 15:22:00 UTC (rev 75998)
@@ -1,19 +0,0 @@
---- dicom/test/test_UID.py.orig 2011-01-27 12:23:41.000000000 -0600
-+++ dicom/test/test_UID.py 2011-01-27 12:24:16.000000000 -0600
-@@ -32,6 +32,16 @@
- uid = UID('1.2.840.10008.1.2')
- self.assertEqual(uid, 'Implicit VR Little Endian', "UID equality failed on name")
- self.assertEqual(uid, '1.2.840.10008.1.2', "UID equality failed on number string")
-+ def testCompareNumber(self):
-+ """UID: comparing against a number give False............."""
-+ # From issue 96
-+ uid = UID('1.2.3')
-+ self.assertNotEqual(uid, 3, "Comparison against a number returned True")
-+ def testCompareNone(self):
-+ """UID: comparing against None give False................."""
-+ # From issue 96
-+ uid = UID('1.2.3')
-+ self.assertNotEqual(uid, None, "Comparison against a number returned True")
- def testTransferSyntaxes(self):
- pass
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110215/d00dbc97/attachment.html>
More information about the macports-changes
mailing list