Changes for pydkim -> dkimpy

ChangeLog

@@ -1,4 +1,5 @@
 2012-02-03 Version 0.5.1
+    - Rename tarball to dkimpy to avoid confusion with original project
     - Apply performance patch from <https://launchpad.net/bugs/901591>
     - save parsed signatures in DKIM object
     - do not require DNS/dnspython for signing

PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 1.0
-Name: pydkim
+Name: dkimpy
-Version: 0.5
+Version: 0.5.1
 Summary: DKIM (DomainKeys Identified Mail)
-Home-page: http://hewgill.com/pydkim/
+Home-page: https://launchapd.net/dkimpy
-Author: Greg Hewgill
+Author: Scott Kitterman
-Author-email: greg@hewgill.com
+Author-email: scott@kitterman.com
 License: BSD-like
-Description: pydkim is a Python library that implements DKIM (DomainKeys
+Description: dkimpy is a Python library that implements DKIM (DomainKeys
         Identified Mail) email signing and verification.
 Platform: UNKNOWN

README

@@ -1,14 +1,17 @@
-pydkim - DKIM (DomainKeys Identified Mail)
+dkimpy - DKIM (DomainKeys Identified Mail)
+https://launchpad.net/dkimpy/
+
+Fork of:
 http://hewgill.com/pydkim/
 
 INTRODUCTION
 
-pydkim is a library that implements DKIM (DomainKeys Identified Mail) email
+dkimpy is a library that implements DKIM (DomainKeys Identified Mail) email
 signing and verification.
 
 VERSION
 
-This is pydkim 0.5.
+This is dkimpy 0.5.1.
 
 REQUIREMENTS
 
@@ -17,13 +20,13 @@ REQUIREMENTS
 
 INSTALLATION
 
-To build and install pydkim:
+To build and install dkimpy:
 
     python setup.py install
 
 TESTING
 
-To run pydkim's test suite:
+To run dkimpy's test suite:
 
     PYTHONPATH=. python dkim
 or
@@ -38,14 +41,12 @@ Alternatively, if you have testrepository installed:
 
 USAGE
 
-The pydkim library offers one module called dkim. The sign() function takes an
+The dkimpy library offers one module called dkim. The sign() function takes an
 RFC822 formatted message, along with some signing options, and returns a
 DKIM-Signature header line that can be prepended to the message. The verify()
 function takes an RFC822 formatted message, and returns True or False depending
 on whether the signature verifies correctly.
 
-For full documentation, see: http://hewgill.local/pydkim/html/
-
 Two helper programs are also supplied: dkimsign.py and dkimverify.py.
 
 dkimsign.py is a filter that reads an RFC822 message on standard input, and
@@ -62,4 +63,5 @@ code 1.
 
 FEEDBACK
 
-Bug reports may be sent to <greg@hewgill.com>.
+Bug reports may be submitted to the bug tracker for the dkimpy project on
+launchpad.

dkim/tests/test_dkim.py

@@ -87,7 +87,7 @@ class TestSignAndVerify(unittest.TestCase):
         self.assertFalse(res)
 
     def test_dkim_dignature_canonicalization(self):
-      # <https://bugs.edge.launchpad.net/ubuntu/+source/pydkim/+bug/587783>
+      # <https://bugs.launchpad.net/ubuntu/+source/pydkim/+bug/587783>
       # Relaxed-mode header signing is wrong
       sample_msg = """\
 From: mbp@canonical.com
@@ -131,7 +131,7 @@ b/mPfjC0QJTocVBq6Za/PlzfV+Py92VaCak19F4WrbVTK5Gg5tW220MCAwEAAQ=="""
         self.assertTrue(result)
 
     def test_extra_headers(self):
-        # <https://bugs.launchpad.net/pydkim/+bug/737311>
+        # <https://bugs.launchpad.net/dkimpy/+bug/737311>
         # extra headers above From caused failure
         #message = read_test_data("test_extra.message")
         message = read_test_data("message.mbox")
@@ -152,7 +152,7 @@ b/mPfjC0QJTocVBq6Za/PlzfV+Py92VaCak19F4WrbVTK5Gg5tW220MCAwEAAQ=="""
                 self.assertTrue(res)
 
     def test_multiple_from_fails(self):
-        # <https://bugs.launchpad.net/pydkim/+bug/644046>
+        # <https://bugs.launchpad.net/dkimpy/+bug/644046>
         # additional From header fields should cause verify failure
         hfrom = b'From: "Resident Evil" <sales@spammer.com>\r\n'
         h,b = self.message.split(b'\n\n',1)

dkim/util.py

@@ -71,8 +71,8 @@ def parse_tag_value(tag_list):
 
 
 def get_default_logger():
-    """Get the default pydkim logger."""
+    """Get the default dkimpy logger."""
-    logger = logging.getLogger('pydkim')
+    logger = logging.getLogger('dkimpy')
     if not logger.handlers:
         logger.addHandler(NullHandler())
     return logger

man/dkimsign.1

@@ -155,4 +155,4 @@ The identity is optional and defaults to "@domain".
 This version of \fBdkimsign\fR was written by Greg Hewgill <greg@hewgill.com>.
 .PP
 This man-page was created by Scott Kitterman <scott@kitterman.com> and is
-licensed under the same terms as pydkim.
+licensed under the same terms as dkimpy.

man/dkimverify.1

@@ -147,4 +147,4 @@ code 1.
 This version of \fBdkimsign\fR was written by Greg Hewgill <greg@hewgill.com>.
 .PP
 This man-page was created by Scott Kitterman <scott@kitterman.com> and is
-licensed under the same terms as pydkim.
+licensed under the same terms as dkimpy.

setup.py

@@ -19,7 +19,7 @@
 # Copyright (c) 2008 Greg Hewgill http://hewgill.com
 #
 # This has been modified from the original software.
-# Copyright (c) 2011 Scott Kitterman <scott@kitterman.com>
+# Copyright (c) 2011,2012 Scott Kitterman <scott@kitterman.com>
 
 from distutils.core import setup
 import os
@@ -27,15 +27,15 @@ import os
 version = "0.5.1"
 
 setup(
-    name = "pydkim",
+    name = "dkimipy",
     version = version,
     description = "DKIM (DomainKeys Identified Mail)",
     long_description =
-    """pydkim is a Python library that implements DKIM (DomainKeys
+    """dkimpy is a Python library that implements DKIM (DomainKeys
 Identified Mail) email signing and verification.""",
-    author = "Greg Hewgill",
+    author = "Scott Kitterman",
-    author_email = "greg@hewgill.com",
+    author_email = "scott@kitterman.com",
-    url = "http://hewgill.com/pydkim/",
+    url = "https://launchpad.net/dkimpy",
     license = "BSD-like",
     packages = ["dkim"],
     scripts = ["dkimsign.py", "dkimverify.py"],