[Python-modules-commits] [lazr.smtptest] 01/03: Import lazr.smtptest_2.0.3.orig.tar.gz

Barry Warsaw barry at moszumanska.debian.org
Sat Jan 10 03:49:17 UTC 2015


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository lazr.smtptest.

commit b5ea676bfd89883ec9f4a9de0bda57c6a89a110e
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 9 22:42:28 2015 -0500

    Import lazr.smtptest_2.0.3.orig.tar.gz
---
 PKG-INFO                             |  2 +-
 conf.py                              |  2 +-
 lazr.smtptest.egg-info/PKG-INFO      |  2 +-
 lazr/__init__.py                     | 20 ++++++++------------
 lazr/smtptest/__init__.py            |  2 +-
 lazr/smtptest/controller.py          |  2 +-
 lazr/smtptest/docs/NEWS.rst          | 21 ++++++---------------
 lazr/smtptest/docs/README_fixture.py |  2 +-
 lazr/smtptest/docs/__init__.py       |  2 +-
 lazr/smtptest/docs/fixture.py        |  2 +-
 lazr/smtptest/docs/queue_fixture.py  |  2 +-
 lazr/smtptest/docs/usage_fixture.py  |  2 +-
 lazr/smtptest/server.py              |  2 +-
 lazr/smtptest/version.txt            |  2 +-
 setup.py                             |  2 +-
 15 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index dac9f33..8a4866b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lazr.smtptest
-Version: 2.0.2
+Version: 2.0.3
 Summary: A test framework for SMTP based applications
 Home-page: https://launchpad.net/lazr.smtptest
 Author: LAZR Developers
diff --git a/conf.py b/conf.py
index b8bf91f..cb087c0 100644
--- a/conf.py
+++ b/conf.py
@@ -42,7 +42,7 @@ master_doc = 'README'
 
 # General information about the project.
 project = u'lazr.smtptest'
-copyright = u'2013-2014, LAZR developers'
+copyright = u'2013-2015, LAZR developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/lazr.smtptest.egg-info/PKG-INFO b/lazr.smtptest.egg-info/PKG-INFO
index dac9f33..8a4866b 100644
--- a/lazr.smtptest.egg-info/PKG-INFO
+++ b/lazr.smtptest.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lazr.smtptest
-Version: 2.0.2
+Version: 2.0.3
 Summary: A test framework for SMTP based applications
 Home-page: https://launchpad.net/lazr.smtptest
 Author: LAZR Developers
diff --git a/lazr/__init__.py b/lazr/__init__.py
index 98351f6..9193136 100644
--- a/lazr/__init__.py
+++ b/lazr/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest.
 #
@@ -14,14 +14,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
 
-# This is a namespace package, however under >= Python 3.3, let it be a true
-# namespace package (i.e. this cruft isn't necessary).
-import sys
-
-if sys.hexversion < 0x30300f0:
-    try:
-        import pkg_resources
-        pkg_resources.declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
+# This is a namespace package.
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/lazr/smtptest/__init__.py b/lazr/smtptest/__init__.py
index 62844df..46a4653 100644
--- a/lazr/smtptest/__init__.py
+++ b/lazr/smtptest/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/controller.py b/lazr/smtptest/controller.py
index b3668f4..0bd6edf 100644
--- a/lazr/smtptest/controller.py
+++ b/lazr/smtptest/controller.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/docs/NEWS.rst b/lazr/smtptest/docs/NEWS.rst
index 1899d94..b4f6378 100644
--- a/lazr/smtptest/docs/NEWS.rst
+++ b/lazr/smtptest/docs/NEWS.rst
@@ -2,38 +2,34 @@
 NEWS for lazr.smtptest
 ======================
 
-2.0.2 (2014-08-20)
+2.0.3 (2015-01-05)
 ==================
+- Always use old-style namespace package registration in ``lazr/__init__.py``
+  since the mere presence of this file subverts PEP 420 style namespace
+  packages.  (LP: #1407816)
 
+2.0.2 (2014-08-20)
+==================
 - Disable `test_suite` in setup.py; nose doesn't work well with
   `python setup.py test` since plugins are disabled.
 - Use `python setup.py nosetests` in tox.ini.
 
-
 2.0.1 (2014-08-19)
 ==================
-
 - Remove the dependency on `distribute` which has been merged back into
   `setuptools`.  (LP: #1273639)
 - Add tox.ini for the preferred way to run the test suite.
 
-
 2.0 (2013-01-05)
 ================
-
 - Ported to Python 3.  Now support Python 2.6, 2.7, 3.2, and 3.3.
-
 - Removed the dependency on zc.buildout.
-
 - Use nose for testing.
 
-
 1.3 (2011-06-07)
 ================
-
 - Make the test server thread-safe with other code that starts an asyncore
   loop.  Requires Python 2.6 or 2.7.
-
 - Be cleaner about stopping the server: before, it left sockets running
   ans simply cleared out the socket map.  In an associated change, the EXIT
   smtp command sends the reply first, and then shuts down the server, rather
@@ -41,20 +37,15 @@ NEWS for lazr.smtptest
 
 1.2 (2009-07-07)
 ================
-
 - [bug 393621] QueueServer.reset() was added to clear the message queue.  This
   is invoked by sending an SMTP RSET command to the server, or through
   Controller.reset().
 
-
 1.1 (2009-06-29)
 ================
-
 - [bug 391650] A non-public API was added to make QueueController more easily
   subclassable.
 
-
 1.0 (2009-06-22)
 ================
-
 - Initial release
diff --git a/lazr/smtptest/docs/README_fixture.py b/lazr/smtptest/docs/README_fixture.py
index f5e72ca..2360db1 100644
--- a/lazr/smtptest/docs/README_fixture.py
+++ b/lazr/smtptest/docs/README_fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/docs/__init__.py b/lazr/smtptest/docs/__init__.py
index 4efe3db..1b4b413 100644
--- a/lazr/smtptest/docs/__init__.py
+++ b/lazr/smtptest/docs/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/docs/fixture.py b/lazr/smtptest/docs/fixture.py
index f00ce30..c1e3c1e 100644
--- a/lazr/smtptest/docs/fixture.py
+++ b/lazr/smtptest/docs/fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/docs/queue_fixture.py b/lazr/smtptest/docs/queue_fixture.py
index f5e72ca..2360db1 100644
--- a/lazr/smtptest/docs/queue_fixture.py
+++ b/lazr/smtptest/docs/queue_fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/docs/usage_fixture.py b/lazr/smtptest/docs/usage_fixture.py
index f5e72ca..2360db1 100644
--- a/lazr/smtptest/docs/usage_fixture.py
+++ b/lazr/smtptest/docs/usage_fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/server.py b/lazr/smtptest/server.py
index b45f871..f8e5ccf 100644
--- a/lazr/smtptest/server.py
+++ b/lazr/smtptest/server.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
diff --git a/lazr/smtptest/version.txt b/lazr/smtptest/version.txt
index e9307ca..50ffc5a 100644
--- a/lazr/smtptest/version.txt
+++ b/lazr/smtptest/version.txt
@@ -1 +1 @@
-2.0.2
+2.0.3
diff --git a/setup.py b/setup.py
index 237faf9..1eb18c0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/lazr.smtptest.git



More information about the Python-modules-commits mailing list