Incorperate Construct as a sub-module and update documentation accord…

…ingly.

INSTALL

@@ -4,20 +4,16 @@ To install Python Audio Tools, you simply need to run:
 
 make install
 
-as root from this source directory. This will use the Python interpreter 
+as root from this source directory. This will use the Python interpreter
 to install the audiotools Python module and the executable scripts.
 It will then install the man pages from the doc/ subdirectory.
-If you do not have the Construct Python module installed, you can run:
 
-make construct_install
-
-as root from the audiotools source directory to install it.
 To verify your Python Audio Tools installation, run:
 
 audiotools-config
 
-as a normal user. This will load the audiotools Python module, 
-if possible, and deliver a listing of available audio formats and 
+as a normal user. This will load the audiotools Python module,
+if possible, and deliver a listing of available audio formats and
 current system settings.
 
 
@@ -26,36 +22,30 @@ current system settings.
 * The audiotools.cdio module doesn't build correctly
 
   Check that you have the CDIO library installed, commonly known as libcdio
-  If libcdio is installed the module still doesn't build, ensure that 
+  If libcdio is installed the module still doesn't build, ensure that
   you've also installed any accompanying libcdio-devel package.
 
 
-* The Construct module isn't found
-
-  Run the "make construct_install" command from this source directory, 
-  as root, to install this module.
-
-
 * audiotools-config lists formats as unavailable
 
   Certain audio formats require external programs. For instance,
-  to use FLAC files, Python Audio Tools requires the flac and metaflac 
-  programs. If these cannot be found in the regular executable search path 
+  to use FLAC files, Python Audio Tools requires the flac and metaflac
+  programs. If these cannot be found in the regular executable search path
   or from the config file, you will not be able to use that format.
   Check your system's package manager for programs which may be available
   but not yet installed.
 
 
 * My Python interpreter isn't found, or I wish to use a different one
 
-  The first line of Makefile is which Python interpreter is being used for 
+  The first line of Makefile is which Python interpreter is being used for
   installation of both the Python Audio Tools and Construct module.
   For instance, to use a Python interpreter located at
   /opt/python/bin/python, you should change that line to read:
 
   export PYTHON = /opt/python/bin/python
 
-  Running make will then invoke the new interpreter for installation of 
+  Running make will then invoke the new interpreter for installation of
   the audiotools module and scripts.
 
 

Makefile

@@ -14,16 +14,15 @@ clean:
 	rm -rfv build
 	rm -fv audiotools/*.pyc
 	cd docs && $(MAKE) clean
-	cd pyconstruct && $(MAKE) clean
 
 distclean: clean
 	cd docs && $(MAKE) distclean
 
 construct:
-	cd pyconstruct && $(MAKE)
+	### This target is no longer required ###
 
 construct_install:
-	cd pyconstruct && $(MAKE) install
+	### This target is no longer required ###
 
 
 #translation specific targets below

audiotools/__init__.py

@@ -23,6 +23,8 @@
     print >>sys.stderr,"*** Python 2.5.0 or better required"
     sys.exit(1)
 
+
+from . import construct as Con
 import subprocess
 import re
 import cStringIO
@@ -294,18 +296,6 @@ def partial_info(self,s):
         pass
 
 
-try:
-    import construct as Con
-except ImportError:
-    try:
-        import Construct as Con
-    except ImportError:
-        msg = Messenger("audiotols",None)
-        msg.error(_(u"construct module not found"))
-        msg.info(_(u"To remedy this: \"make construct_install\""))
-        msg.info(_(u"from the audiotools source directory to install the Construct module."))
-        sys.exit(1)
-
 #raised by open() if the file cannot be identified or opened correctly
 class UnsupportedFile(Exception): pass
 

docs/install.ms

@@ -18,14 +18,6 @@ This will use the Python interpreter to install the audiotools
 Python module and the executable scripts.
 It will then install the man pages from the \fCdoc/\fR
 subdirectory.
-If you do not have the Construct Python module installed,
-you can run:
-.LP
-.ft C
-make construct_install
-.ft
-.LP
-as root from the audiotools source directory to install it.
 .PP
 To verify your Python Audio Tools installation, run:
 .LP
@@ -52,13 +44,6 @@ ensure that you've also installed any accompanying \fClibcdio-devel\fR
 package.
 .PP
 .IP \(bu
-.B "The Construct module isn't found"
-.PP
-Run the \fCmake construct_install\fR command from the audiotools
-source directory, as root, to install this module.
-.PP
-.PP
-.IP \(bu
 .B "The installer complains about missing `python/config/Makefile' of some sort"
 .PP
 Your distribution probably has separate "python" and "python-devel" packages
@@ -108,7 +93,7 @@ with the following command:
 .B "My Python interpreter isn't found, or I wish to use a different one"
 .PP
 The first line of \fCMakefile\fR is which Python interpreter is being
-used for installation of both the Python Audio Tools and Construct module.
+used for installation of Python Audio Tools.
 For instance, to use a Python interpreter located at
 \fC/opt/python/bin/python\fR, you should change that line to read:
 .LP

docs/prereqs.ms

@@ -12,9 +12,6 @@
 Python 2.5.0		
 http://www.python.org
 .IP \(bu
-Construct (included)	
-http://construct.wikispaces.com
-.IP \(bu
 libcdio			
 http://www.gnu.org/software/libcdio
 .IP \(bu
@@ -55,7 +52,7 @@ cdrdao
 http://cdrdao.sourceforge.net/
 .RE
 .PP
-Python 2.5.0 or higher, libcdio and Construct 2.00 or higher are required.
+Python 2.5.0 or higher and libcdio are required.
 The rest are optional but recommended in order to get the most out of
 these tools.
 .TS

setup.py

@@ -96,7 +96,9 @@ def pkg_config(package, option):
        author = 'Brian Langenberger',
        author_email = 'tuffy@users.sourceforge.net',
        url='http://audiotools.sourceforge.net',
-       packages = ["audiotools"],
+       packages = ["audiotools",
+                   "audiotools.construct",
+                   "audiotools.construct.lib"],
        ext_modules = extensions,
        data_files = [("/etc",["audiotools.cfg"]),
                      ("share/audiotools",["glade/coverview.glade"]),