From 834365222e037a3afb884243f1e01034eda6a01a Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy@sandywalsh.com>
Date: Fri, 23 May 2014 20:37:26 +0000
Subject: [PATCH] added setup and tox support
---
setup.cfg | 21 +++++++++++
setup.py | 8 ++++
simport/__init__.py | 82 ++++++++++++++++++++++++++++++++++++++++
simport/simport.py | 88 -------------------------------------------
tests/test_simport.py | 2 +-
tox.ini | 10 +++++
6 files changed, 122 insertions(+), 89 deletions(-)
create mode 100644 setup.cfg
create mode 100644 setup.py
delete mode 100644 simport/simport.py
create mode 100644 tox.ini
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..2ff987c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,21 @@
+[metadata]
+name = simport
+author = Dark Secret Software Inc.
+author-email = admin@darksecretsoftware.com
+summary = simple import with python path management
+description-file = README.md
+license = Apache-2
+classifier =
+ Development Status :: 2 - Pre-Alpha
+ Environment :: Console
+ Intended Audience :: Developers
+ Intended Audience :: Information Technology
+ License :: OSI Approved :: Apache Software License
+ Operating System :: OS Independent
+ Programming Language :: Python
+ Topic :: Software Development :: Libraries :: Python Modules
+keywords =
+ import
+[files]
+packages =
+ simport
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..aa2d8a0
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+setup(
+ setup_requires=['pbr'],
+ pbr=True,
+)
diff --git a/simport/__init__.py b/simport/__init__.py
index e69de29..aa0fac6 100644
--- a/simport/__init__.py
+++ b/simport/__init__.py
@@ -0,0 +1,82 @@
+# Copyright 2014 - Dark Secret Software Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import imp
+import logging
+import os
+import sys
+
+
+LOG = logging.getLogger(__name__)
+
+
+class MissingModule(Exception):
+ pass
+
+
+class BadDirectory(Exception):
+ pass
+
+
+class MissingMethodOrFunction(Exception):
+ pass
+
+
+def _get_module(target):
+ """Import a named class, module, method or function.
+
+ Accepts these formats:
+ ".../file/path|module_name:Class.method"
+ ".../file/path|module_name:function"
+
+ If a fully qualified file is specified, it implies the
+ file is not already on the Python Path, in which case
+ it will be added.
+
+ For example, if I import /home/foo/my_code.py (and
+ /home/foo is not in the python path) as
+ "/home/foo/my_code.py|mycode:MyClass.mymethod"
+ then /home/foo will be added to the python path and
+ the module loaded as normal.
+ """
+
+ directory, sep, namespace = target.rpartition('|')
+ module, sep, class_or_function = namespace.rpartition(':')
+ if not module:
+ raise MissingModule("Need a module path for %s (%s)" %
+ (namespace, target))
+
+ if directory and directory not in sys.path:
+ if not os.path.isdir(directory):
+ raise BadDirectory("No such directory: '%s'" % directory)
+ sys.path.append(directory)
+
+ if not class_or_function:
+ raise MissingMethodOrFunction("No Method or Function specified")
+
+ __import__(module)
+
+ klass, sep, function = class_or_function.rpartition('.')
+ return module, klass, function
+
+
+def load(target):
+ """Get the actual implementation of the target."""
+ module, klass, function = _get_module(target)
+ if not klass:
+ return getattr(sys.modules[module], function)
+
+ class_object = getattr(sys.modules[module], klass)
+ return getattr(class_object, function)
diff --git a/simport/simport.py b/simport/simport.py
deleted file mode 100644
index ba43771..0000000
--- a/simport/simport.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014 - Dark Secret Software Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import imp
-import logging
-import os
-import sys
-
-
-LOG = logging.getLogger(__name__)
-
-
-class MissingModule(Exception):
- pass
-
-
-class BadDirectory(Exception):
- pass
-
-
-class MissingMethodOrFunction(Exception):
- pass
-
-
-def _get_module(target):
- """Import a named class, module, method or function.
-
- Accepts these formats:
- ".../file/path|module_name:Class.method"
- ".../file/path|module_name:function"
-
- If a fully qualified file is specified, it implies the
- file is not already on the Python Path, in which case
- it will be added.
-
- For example, if I import /home/foo/my_code.py (and
- /home/foo is not in the python path) as
- "/home/foo/my_code.py|mycode:MyClass.mymethod"
- then /home/foo will be added to the python path and
- the module loaded as normal.
- """
-
- print "cwd:", os.getcwd()
- directory, sep, namespace = target.rpartition('|')
- module, sep, class_or_function = namespace.rpartition(':')
- if not module:
- raise MissingModule("Need a module path for %s (%s)" %
- (namespace, target))
-
- if directory and directory not in sys.path:
- print "add directory:", directory
- if not os.path.isdir(directory):
- raise BadDirectory("No such directory: '%s'" % directory)
- sys.path.append(directory)
-
- if not class_or_function:
- raise MissingMethodOrFunction("No Method or Function specified")
-
- print "__IMPORT__"
- __import__(module)
-
- klass, sep, function = class_or_function.rpartition('.')
- print "CLASS:", klass, "FUNCTION:", function
- return module, klass, function
-
-
-def load(target):
- """Get the actual implementation of the target."""
- module, klass, function = _get_module(target)
- if not klass:
- print "NOT CLASS"
- return getattr(sys.modules[module], function)
-
- print "DIR", dir(sys.modules[module])
- class_object = getattr(sys.modules[module], klass)
- return getattr(class_object, function)
diff --git a/tests/test_simport.py b/tests/test_simport.py
index 3799b05..7771df1 100644
--- a/tests/test_simport.py
+++ b/tests/test_simport.py
@@ -1,7 +1,7 @@
import sys
import unittest
-from simport import simport
+import simport
# Internal functions and classes.
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..8157ba1
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = py26,py27
+
+[testenv]
+deps =
+ coverage
+ nose
+ mock
+
+commands = nosetests -d -v --with-coverage --cover-inclusive --cover-package simport []