move from pywmdockapps to wmdocklib

setup.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
+from __future__ import absolute_import
+from setuptools import setup, Extension
 
 # Set these so they match your system.
-from __future__ import absolute_import
 XLibDir = '/usr/lib/x11'
 XIncludes = '/usr/include/x11'
 
-from setuptools import setup, Extension
-
+# Changed 'wmdocklib.pywmgeneral' -> 'pywmdockapps.pywmgeneral'
+# Changed source path 'wmdocklib/pywmgeneral.c' -> 'pywmdockapps/pywmgeneral.c'
 pywmgeneral = Extension('wmdocklib.pywmgeneral',
                   libraries = ['Xpm', 'Xext', 'X11'],
                   library_dirs = [XLibDir],
@@ -16,7 +17,7 @@ pywmgeneral = Extension('wmdocklib.pywmgeneral',
 setup(
     name="pywmdockapps",
     version = "$Revision: 1.99 $"[11:-2],
-    description="This helper functions for windowmaker dockapps\nRead the whole story at http://pywmdockapps.sourceforge.net/",
+    description="This helper functions for windowmaker dockapps",
     author="Kristoffer Erlandsson & al.",
     author_email="mfrasca@zonnet.nl",
     url="http://pywmdockapps.sourceforge.net",

wmdocklib/__init__.py

@@ -1,12 +1,13 @@
-"""\
-wmdocklib is a python module that will help you develop WindowMaker dockapps
-in python.  It is mostly a wrapper around the functions from the popular
-wmgeneral.c, but some new functions are added too.
+"""
+pywmdockapps is a python module that will help you develop WindowMaker dockapps 
+in python. It is a wrapper around the functions from wmgeneral.c.
 
-to get help about a contained package, try:
-help(wmdocklib.<name>)
+To get help about a contained package, try:                                     
+help(pywmdockapps.<name>)                                                        
 """                                                                             
 from .pywmgeneral import *
 from .pywmhelpers import *
 
-__all__ = ['wmoo']
+# __all__ controls what 'from pywmdockapps import *' pulls in.
+# If you want users to see 'pywmgeneral' and 'pywmhelpers' too, add them here.
+__all__ = ['wmoo', 'pywmgeneral', 'pywmhelpers']

wmdocklib/pywmhelpers.py

@@ -26,14 +26,14 @@ Some changes to handle the additional event handling in pywmgeneral
 First workingish version
 """
 
-import os, re
+import os, re, sys
 import configparser
 
 charset_start = None
 charset_width = None
 pattern_start = None
 
-import wmdocklib.pywmgeneral as pywmgeneral
+from . import pywmgeneral
 defaultRGBFileList = [
     '/etc/X11/rgb.txt',
     '/usr/lib/X11/rgb.txt',
@@ -145,7 +145,13 @@ def readXPM(fileName):
     Raise IOError if we run into trouble when trying to read the file.  This
     function has not been tested extensively.  do not try to use more than 
     """
-    with open(fileName, 'r') as f:
+    if hasattr(sys, '_MEIPASS'):
+        base_path = os.path.join(sys._MEIPASS, "wmdocklib")
+    else:
+        base_path = "wmdocklib"
+    filePath = os.path.join(base_path, fileName)
+
+    with open(filePath, 'r') as f:
         lines = [l.rstrip('\n') for l in f.readlines()]
     s = ''.join(lines)
     res = []
@@ -436,7 +442,13 @@ def getColorCode(colorName, rgbFileName=None):
     if rgbFileName is None:
         raise ValueError('cannot find rgb file')
 
-    with open(rgbFileName, 'r') as f:
+    if hasattr(sys, '_MEIPASS'):
+        base_path = os.path.join(sys._MEIPASS, "wmdocklib")
+    else:
+        base_path = "wmdocklib"
+    rgbFilePath = os.path.join(base_path, rgbFileName)
+
+    with open(rgbFilePath, 'r') as f:
         lines = f.readlines()
     for l in lines:
         if l[0] != '!':

wmdocklib/wmoo.py

@@ -1,6 +1,6 @@
 import sys, time
-import wmdocklib.pywmhelpers as pywmhelpers
-import wmdocklib.pywmgeneral as pywmgeneral
+from . import pywmhelpers as pywmhelpers
+from . import pywmgeneral as pywmgeneral
 
 debug = 0