From 0911ec5330e460f79daca557bb03114276def026 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Fri, 25 Jan 2013 00:56:12 +0000 Subject: Clean up directory structure to be better aligned with other leap python project, add __init__.py to modules directories, and add query callback function to couchdb in alias_resolver.py for check_recipient feature. --- src/leap/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/leap/__init__.py (limited to 'src/leap/__init__.py') diff --git a/src/leap/__init__.py b/src/leap/__init__.py new file mode 100644 index 0000000..5fefbbf --- /dev/null +++ b/src/leap/__init__.py @@ -0,0 +1,9 @@ +# -*- encoding: utf-8 -*- + +from leap import mx +from leap import util +from leap import tests + +__all__ = ['mx', 'util', 'tests'] +__author__ = util.version.authors +__version__ = util.version.getVersion() -- cgit v1.2.3 From 687eca3f8e6b6f04d89c606726d65b0861c55e57 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Fri, 25 Jan 2013 15:59:43 +0000 Subject: Updated leap module structure in /src/leap/__init__.py. --- src/leap/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/leap/__init__.py') diff --git a/src/leap/__init__.py b/src/leap/__init__.py index 5fefbbf..cf897e4 100644 --- a/src/leap/__init__.py +++ b/src/leap/__init__.py @@ -1,9 +1,8 @@ # -*- encoding: utf-8 -*- -from leap import mx -from leap import util -from leap import tests +import mx +import util -__all__ = ['mx', 'util', 'tests'] +__all__ = ['mx', 'util'] __author__ = util.version.authors __version__ = util.version.getVersion() -- cgit v1.2.3 From 2d0170b51a064788eb68af75d5f0d4efb40e386f Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Mon, 28 Jan 2013 18:01:00 +0000 Subject: Fixed module structure, again, due to directory layout change. --- src/leap/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/leap/__init__.py') diff --git a/src/leap/__init__.py b/src/leap/__init__.py index cf897e4..99a951f 100644 --- a/src/leap/__init__.py +++ b/src/leap/__init__.py @@ -1,8 +1,12 @@ # -*- encoding: utf-8 -*- -import mx -import util +from leap import mx +from leap import util +from leap.util import version as mxversion __all__ = ['mx', 'util'] -__author__ = util.version.authors -__version__ = util.version.getVersion() +__author__ = mxversion.authors +__version__ = mxversion.getVersion() + +print "Authors: %s" % __author__ +print "Version: %s" % __version__ -- cgit v1.2.3 From d486c13af17133e2e5a2bfe6e5a862bfea6736ff Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Fri, 15 Feb 2013 19:27:53 +0000 Subject: Module directory layout changes, with corresponding __init__.py changes. --- src/leap/__init__.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'src/leap/__init__.py') diff --git a/src/leap/__init__.py b/src/leap/__init__.py index 99a951f..8846fbc 100644 --- a/src/leap/__init__.py +++ b/src/leap/__init__.py @@ -1,12 +1,25 @@ # -*- encoding: utf-8 -*- +__all__ = ['mx'] +__author__ = version.authors +__version__ = version.getVersion() + from leap import mx -from leap import util -from leap.util import version as mxversion +from leap.mx import util +from leap.mx.util import version + -__all__ = ['mx', 'util'] -__author__ = mxversion.authors -__version__ = mxversion.getVersion() +def _print_authors_nicely(): + if hasattr(version, 'authors'): + assert isinstance(version.authors, list) + if len(version.authors) > 0: + first = version.authors.pop() + __author__ = (" ".join(first[:2])) + if len(version.authors) > 0: + for auth in version.authors: + joined = " ".join(auth[:2]) + __author__ += ("\n%s" % joined) + -print "Authors: %s" % __author__ -print "Version: %s" % __version__ +print "Version: %s" % version.getVersion() +print "Authors: %s" % _print_authors_nicely() -- cgit v1.2.3 From 73d33d4caac1cd5e0be63584f72de92742a2c91a Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Sat, 16 Feb 2013 22:54:53 +0000 Subject: Cleaned up version tracking and printing. --- src/leap/__init__.py | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'src/leap/__init__.py') diff --git a/src/leap/__init__.py b/src/leap/__init__.py index 8846fbc..8b30f3d 100644 --- a/src/leap/__init__.py +++ b/src/leap/__init__.py @@ -1,25 +1,12 @@ # -*- encoding: utf-8 -*- +""" +leap/__init__.py +---------------- +Module intialization file for leap. +""" -__all__ = ['mx'] -__author__ = version.authors -__version__ = version.getVersion() - -from leap import mx -from leap.mx import util from leap.mx.util import version - -def _print_authors_nicely(): - if hasattr(version, 'authors'): - assert isinstance(version.authors, list) - if len(version.authors) > 0: - first = version.authors.pop() - __author__ = (" ".join(first[:2])) - if len(version.authors) > 0: - for auth in version.authors: - joined = " ".join(auth[:2]) - __author__ += ("\n%s" % joined) - - -print "Version: %s" % version.getVersion() -print "Authors: %s" % _print_authors_nicely() +__all__ = ['mx'] +__author__ = version.getAuthors() +__version__ = version.getVersion() -- cgit v1.2.3