Merge c8ce5ba into 9b3eb6b

.gitignore

@@ -0,0 +1,9 @@
+*.pyc
+*.idea
+*.swp
+.coverage
+env*/
+dist/
+build/
+*.egg-info/
+.idea/

.hgtags

@@ -4,11 +4,18 @@
 27a222ccc739de48d114ae282f848aad27775904 SubversionImport
 87ace7ce5663b6c662bcfa54818e099ffdcceb53 release_Yapsy-1.8
 43a85ec50934b636dce6647eb5342b70b809ca20 release_Yapsy-1.9
+ee9987b833d65887487af38cecf0eb9ed6b871eb release_Yapsy-1.9-python3
 991a7a83265127a463c845fa56ada2183cdaafe3 release_Yapsy-1.10
 991a7a83265127a463c845fa56ada2183cdaafe3 release_Yapsy-1.10
 0000000000000000000000000000000000000000 release_Yapsy-1.10
 0000000000000000000000000000000000000000 release_Yapsy-1.10
 b934a474c2e8fa765bfda7bce134060184284872 release_Yapsy-1.10
 a5c62d9f560fa44bbf41fdd0d2c9ddc85144f637 release_Yapsy-1.10.1
+7000b8072f00e42d9c448092bbd2149cc76e8d21 release_Yapsy-1.10-python3
+0000000000000000000000000000000000000000 release_Yapsy-1.10-python3
+0000000000000000000000000000000000000000 release_Yapsy-1.10-python3
+87fbef4ba66ba9f98692e9b657479fe5daae12a2 release_Yapsy-1.10-python3
+f59fd5772939d6779725d0bb55b612ba5b254534 release_Yapsy-1.10.1-python3
 5c0ff8646c2e1b6e0a4676b57676ed5adbe6b479 release_Yapsy-1.10.2
-95b58ee3f7f4cd225caf8ff84bf5808fbf52279a release_Yapsy-1.10.323
+c1f8228a9fd08bbffbfd8b6b8ecd1de5c2d9236f release_Yapsy-1.10.2-python3
+777d3daf4648d8395be90a2059c749bca191cbcd release_Yapsy-1.10.323-python3

.travis.yml

@@ -2,6 +2,9 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
 
 # command to install dependencies
 install:

README.md

@@ -13,7 +13,7 @@ To get more details about the sources please look:
 
 Yapsy's development is [hosted at Sourceforge](http://sourceforge.net/projects/yapsy/)
 
-Yapsy is also continuously tested on [travis-ci](https://travis-ci.org):
+Yapsy is also continuously tested on [travis-ci](https://travis-ci.org): 
 
 [![Build Status](https://travis-ci.org/tibonihoo/yapsy.png?branch=master)](https://travis-ci.org/tibonihoo/yapsy) 
 [![Coverage Status](https://coveralls.io/repos/tibonihoo/yapsy/badge.png?branch=master)](https://coveralls.io/r/tibonihoo/yapsy?branch=master)

package/CHANGELOG.txt

@@ -1,3 +1,9 @@
+version-X.XX.XXX [unreleased]
+
+  - code: one branch for python3 and python2
+  - code: pep8 with 'autopep8 -aaa -i  -r .'
+  - code: PluginManger can also throw other exceptions in issubclass  
+
 version-1.10.423 [2014-06-07]
 
   - code: Speed optimisation for the regexp compiled in __init__.py (see https://sourceforge.net/p/yapsy/patches/4/)
@@ -18,6 +24,8 @@ version-1.10.2 [2013-05-22]
 
   - code: fix compatibility with python2.5
   - doc: add links to travis-ci and readthedocs.org
+  - code: fix AutoInstall test failures [contrib. Agustin Henze]
+  - code: replace deprecated methods usage (for Python3)
 
 version-1.10.1 [2013-01-13]
 

package/MANIFEST.in

@@ -1,6 +1,7 @@
 include README.txt
 include LICENSE.txt
 include CHANGELOG.txt
+include runtests.py
 
 recursive-include test *.py *-plugin *.zip
 

package/README.txt

@@ -3,7 +3,7 @@ build a plugin system into a wider application.
 
 The main purpose is to depend only on Python's standard libraries and
 to implement only the basic functionalities needed to detect, load and
-keep track of several plugins. It supports both Python 2 and 3.
+keep track of several plugins.
 
 To use yapsy, make sure that the "yapsy" directory is in your Python
 loading path and just import the needed class from yapsy (e.g. "from

package/TODO.txt

@@ -4,6 +4,7 @@
 
 Next Release
 
+- follow evolutions from default branch
 
 Later
 

package/doc/conf.py

@@ -11,17 +11,18 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
+import os
 
 SRC_DIR = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))
 sys.path = [SRC_DIR] + sys.path
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
+# sys.path.append(os.path.abspath('.'))
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration -----------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -40,16 +41,16 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Yapsy'
-copyright = u'2010-2014, Thibauld Nion'
+project = 'Yapsy'
+copyright = '2010-2014, Thibauld Nion'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 
 import sys
-sys.path.insert(0,os.path.dirname(__file__))
+sys.path.insert(0, os.path.dirname(__file__))
 import yapsy
 # The short X.Y version.
 version = yapsy.__version__
@@ -94,7 +95,7 @@
 #modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output ---------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
@@ -104,14 +105,14 @@
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    "sidebarbgcolor" : "#777",
+    "sidebarbgcolor": "#777",
     "sidebarlinkcolor": "#e0cede",
-    "relbarbgcolor" : "#999",
+    "relbarbgcolor": "#999",
     "relbarlinkcolor": "#e0cede",
-    "footerbgcolor" : "#777",
-    "headtextcolor" : "#5c3566",
+    "footerbgcolor": "#777",
+    "headtextcolor": "#5c3566",
     "linkcolor": "#5c3566",
-    }
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@@ -125,12 +126,12 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = os.path.join(SRC_DIR,"artwork","yapsy-big.png")
+html_logo = os.path.join(SRC_DIR, "artwork", "yapsy-big.png")
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = os.path.join(SRC_DIR,"artwork","yapsy-favicon.ico")
+html_favicon = os.path.join(SRC_DIR, "artwork", "yapsy-favicon.ico")
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -176,7 +177,7 @@
 htmlhelp_basename = 'Yapsydoc'
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output --------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -187,8 +188,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Yapsy.tex', u'Yapsy Documentation',
-   u'Thibauld Nion', 'manual'),
+    ('index', 'Yapsy.tex', 'Yapsy Documentation',
+     'Thibauld Nion', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

package/runtests.py

@@ -0,0 +1,61 @@
+#!/usr/bin/python
+# -*- coding: utf-8; tab-width: 4; indent-tabs-mode: t; python-indent: 4 -*-
+
+
+"""
+Main file to launch the tests.
+"""
+
+import sys
+import getopt
+import unittest
+import logging
+
+
+from test.test_All import MainTestSuite
+
+
+def usage():
+    """
+    Show/explain the options.
+    """
+    return """python main.py [OPTIONS]
+
+Options:
+
+	-h or --help Print this help text
+
+	-d Switch the logger to DEBUG mode.
+
+	-v Switch the test to verbose mode.
+"""
+
+
+def main(argv):
+    """
+    Launch all the test.
+    """
+    try:
+        opts, args = getopt.getopt(argv[1:], "vdh", ["help"])
+    except getopt.GetoptError:
+        print(usage())
+        sys.exit(2)
+    loglevel = logging.ERROR
+    test_verbosity = 1
+    for o, a in opts:
+        if o in ("-h", "--help"):
+            print(usage())
+            sys.exit(0)
+        elif o == "-d":
+            loglevel = logging.DEBUG
+        elif o == "-v":
+            test_verbosity = 2
+    logging.basicConfig(level=loglevel,
+                        format='%(asctime)s %(levelname)s %(message)s')
+
+    # launch the testing process
+    unittest.TextTestRunner(verbosity=test_verbosity).run(MainTestSuite)
+
+
+if __name__ == "__main__":
+    main(sys.argv)

package/setup.py

@@ -25,43 +25,45 @@
       python setup.py sdist bdist_egg upload
 
   - build the documentation
-   
+
       python setup.py build_sphinx
 """
 
 import os
 from setuptools import setup
 
-# just in case setup.py is launched from elsewhere that the containing directory
+# just in case setup.py is launched from elsewhere that the containing
+# directory
 originalDir = os.getcwd()
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 try:
-	setup(
-		name = "Yapsy",
-		version = __import__("yapsy").__version__,
-		packages = ['yapsy'],
-		package_dir = {'yapsy':'yapsy'},
-
-		# the unit tests
-		test_suite = "test.test_All.MainTestSuite",
-
-		# metadata for upload to PyPI
-		author = "Thibauld Nion",
-		author_email = "thibauld@tibonihoo.net",
-		description = "Yet another plugin system",
-		license = "BSD",
-		keywords = "plugin manager",
-		url = "http://yapsy.sourceforge.net",
-		# more details
-		long_description = open("README.txt").read(),
-		classifiers=['Development Status :: 5 - Production/Stable',
-					 'Intended Audience :: Developers',
-					 'License :: OSI Approved :: BSD License',
-					 'Operating System :: OS Independent',
-					 'Programming Language :: Python',
-					 'Topic :: Software Development :: Libraries :: Python Modules'],
-		platforms='All',
-		)
-
+    setup(
+        name="Yapsy",
+        version=__import__("yapsy").__version__,
+        packages=['yapsy'],
+        package_dir={'yapsy': 'yapsy'},
+
+        # the unit tests
+        test_suite="test.test_All.MainTestSuite",
+
+        # metadata for upload to PyPI
+        author="Thibauld Nion",
+        author_email="thibauld@tibonihoo.net",
+        description="Yet another plugin system",
+        license="BSD",
+        keywords="plugin manager",
+        url="http://yapsy.sourceforge.net",
+        # more details
+            long_description=open("README.txt").read(),
+            classifiers=['Development Status :: 5 - Production/Stable',
+                         'Intended Audience :: Developers',
+                         'License :: OSI Approved :: BSD License',
+                         'Operating System :: OS Independent',
+                         'Programming Language :: Python',
+                         'Programming Language :: Python :: 3',
+                         'Topic :: Software Development :: Libraries :: Python Modules'],
+            platforms='All',
+    )
+
 finally:
-  os.chdir(originalDir)
+    os.chdir(originalDir)