diff options
| author |  Karl Ramm <kcr@1ts.org> | 2013-09-28 19:22:44 -0400 |
|---|---|---|
| committer | Karl Ramm <kcr@1ts.org> | 2013-09-28 19:22:44 -0400 |
| commit | 124bccf49c41e6747d4942f1dd338d3673c7d515 (patch) | |
| tree | 95f1fa084cb024b146d2cc531ade2208c7ad1f1a | |
| parent | 32ccbdb58fe588f14168e5b21e89591237c8b017 (diff) | |
rename zephyr python modules to zephyr_ctypes
Having more plausible claimants to the title of "python zephyr module"
installed was interfering with builds.
| -rw-r--r-- | debian/libzephyr-python.files | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | lib/zephyr_tests.py | 2 | ||||
| -rw-r--r-- | lib/zephyr_tests.txt | 2 | ||||
| -rwxr-xr-x | python/zephyr_ctypes.py (renamed from python/zephyr.py) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/debian/libzephyr-python.files b/debian/libzephyr-python.files index 5e373d8..4188d73 100644 --- a/debian/libzephyr-python.files +++ b/debian/libzephyr-python.files @@ -1 +1 @@ -usr/lib/python2.5/site-packages/zephyr.py +usr/lib/python2.5/site-packages/zephyr_ctypes.py diff --git a/debian/rules b/debian/rules index eba0709..e931af8 100755 --- a/debian/rules +++ b/debian/rules @@ -130,7 +130,7 @@ install: build cp -rp debian/tmp/etc/zephyr/acl debian/tmp-$$dir/etc/zephyr; \ done mkdir -p debian/tmp/usr/lib/python2.5/site-packages - install -c -m 644 python/zephyr.py debian/tmp/usr/lib/python2.5/site-packages + install -c -m 644 python/zephyr_ctypes.py debian/tmp/usr/lib/python2.5/site-packages # Build architecture-independent files here. # Pass -i to all debhelper commands in this target to reduce clutter. diff --git a/lib/zephyr_tests.py b/lib/zephyr_tests.py index 4685c87..d8a0aca 100755 --- a/lib/zephyr_tests.py +++ b/lib/zephyr_tests.py @@ -16,7 +16,7 @@ import ctypes.util import time from ctypes import c_int, c_char, POINTER, c_char_p, sizeof -from zephyr import * +from zephyr_ctypes import * __revision__ = "$Id$" try: diff --git a/lib/zephyr_tests.txt b/lib/zephyr_tests.txt index e3fe0ab..38aa799 100644 --- a/lib/zephyr_tests.txt +++ b/lib/zephyr_tests.txt @@ -189,7 +189,7 @@ Trivial test of ZOpenPort and ZClosePort: >>> assert port != 0 >>> print type(_z.ZGetDestAddr()) - <class 'zephyr.sockaddr_in'> + <class 'zephyr_ctypes.sockaddr_in'> >>> print _z.ZGetDestAddr().sin_family.pformat() ['AF_INET(2)'] >>> print _z.ZGetDestAddr().sin_addr.pformat() diff --git a/python/zephyr.py b/python/zephyr_ctypes.py index 9825ada..9825ada 100755 --- a/python/zephyr.py +++ b/python/zephyr_ctypes.py |