commit: 4c44549c625c6503b07eff3398e566252f551e47
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 6 22:13:45 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 6 22:35:46 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=4c44549c
gkeys/setup.py py2man import fix
The ebuild install was failing to find options.py. adding back an absolute
import worked.
---
gkeys-gen/setup.py | 7 +------
gkeys/setup.py | 7 +------
py2man/manpages.py | 2 +-
3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/gkeys-gen/setup.py b/gkeys-gen/setup.py
index 15c3434..1512219 100755
--- a/gkeys-gen/setup.py
+++ b/gkeys-gen/setup.py
@@ -13,12 +13,7 @@ from gkeygen import __version__, __license__
from gkeygen import Gkeys_Map
from gkeygen.actions import Action_Map, Available_Actions
-try:
- from py2man import manpages
-except ImportError:
- print('creating py2man symlink')
- os.symlink('../py2man', 'py2man')
- from py2man import manpages
+from py2man import manpages
# this affects the names of all the directories we do stuff with
diff --git a/gkeys/setup.py b/gkeys/setup.py
index fdb8e18..5a20738 100755
--- a/gkeys/setup.py
+++ b/gkeys/setup.py
@@ -13,12 +13,7 @@ from gkeys import __version__, __license__
from gkeys import Gkeys_Map
from gkeys.action_map import Action_Map, Available_Actions
-try:
- from py2man import manpages
-except ImportError:
- print('creating py2man symlink')
- os.symlink('../py2man', 'py2man')
- from py2man import manpages
+from py2man import manpages
# this affects the names of all the directories we do stuff with
diff --git a/py2man/manpages.py b/py2man/manpages.py
index 8b87afa..9e75d2e 100644
--- a/py2man/manpages.py
+++ b/py2man/manpages.py
@@ -6,7 +6,7 @@ import codecs
import os
from datetime import datetime
-from options import LONG_OPTS, SHORT_OPTS
+from py2man.options import LONG_OPTS, SHORT_OPTS
ActionStr = '.BR gkeys-%s (1),'
