From be3a6dbe83e6a3ae1de344d5647851e864276db6 Mon Sep 17 00:00:00 2001 From: Scott Kitterman Date: Fri, 3 Feb 2012 19:05:34 -0500 Subject: [PATCH] Changes for pydkim -> dkimpy --- ChangeLog | 1 + PKG-INFO | 12 ++++++------ README | 20 +++++++++++--------- dkim/tests/test_dkim.py | 6 +++--- dkim/util.py | 4 ++-- man/dkimsign.1 | 2 +- man/dkimverify.1 | 2 +- setup.py | 12 ++++++------ 8 files changed, 31 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39ac711..80b5960 100644 --- a/ChangeLog +++ b/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 - save parsed signatures in DKIM object - do not require DNS/dnspython for signing diff --git a/PKG-INFO b/PKG-INFO index 671d4c9..771a153 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,11 +1,11 @@ Metadata-Version: 1.0 -Name: pydkim -Version: 0.5 +Name: dkimpy +Version: 0.5.1 Summary: DKIM (DomainKeys Identified Mail) -Home-page: http://hewgill.com/pydkim/ -Author: Greg Hewgill -Author-email: greg@hewgill.com +Home-page: https://launchapd.net/dkimpy +Author: Scott Kitterman +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 diff --git a/README b/README index a5bd464..1a66511 100644 --- a/README +++ b/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 . +Bug reports may be submitted to the bug tracker for the dkimpy project on +launchpad. diff --git a/dkim/tests/test_dkim.py b/dkim/tests/test_dkim.py index 0613cf2..1fbd0e9 100644 --- a/dkim/tests/test_dkim.py +++ b/dkim/tests/test_dkim.py @@ -87,7 +87,7 @@ class TestSignAndVerify(unittest.TestCase): self.assertFalse(res) def test_dkim_dignature_canonicalization(self): - # + # # 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): - # + # # 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): - # + # # additional From header fields should cause verify failure hfrom = b'From: "Resident Evil" \r\n' h,b = self.message.split(b'\n\n',1) diff --git a/dkim/util.py b/dkim/util.py index 84ff1b2..0be290b 100644 --- a/dkim/util.py +++ b/dkim/util.py @@ -71,8 +71,8 @@ def parse_tag_value(tag_list): def get_default_logger(): - """Get the default pydkim logger.""" - logger = logging.getLogger('pydkim') + """Get the default dkimpy logger.""" + logger = logging.getLogger('dkimpy') if not logger.handlers: logger.addHandler(NullHandler()) return logger diff --git a/man/dkimsign.1 b/man/dkimsign.1 index 79d09da..e9d6489 100644 --- a/man/dkimsign.1 +++ b/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 . .PP This man-page was created by Scott Kitterman and is -licensed under the same terms as pydkim. +licensed under the same terms as dkimpy. diff --git a/man/dkimverify.1 b/man/dkimverify.1 index 6d12f7f..0eeae53 100644 --- a/man/dkimverify.1 +++ b/man/dkimverify.1 @@ -147,4 +147,4 @@ code 1. This version of \fBdkimsign\fR was written by Greg Hewgill . .PP This man-page was created by Scott Kitterman and is -licensed under the same terms as pydkim. +licensed under the same terms as dkimpy. diff --git a/setup.py b/setup.py index c34da06..cdba809 100644 --- a/setup.py +++ b/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 +# Copyright (c) 2011,2012 Scott Kitterman 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_email = "greg@hewgill.com", - url = "http://hewgill.com/pydkim/", + author = "Scott Kitterman", + author_email = "scott@kitterman.com", + url = "https://launchpad.net/dkimpy", license = "BSD-like", packages = ["dkim"], scripts = ["dkimsign.py", "dkimverify.py"],