Merge branch 'release/1.1'

Author: neogeographica

.travis.yml

@@ -1,5 +1,7 @@
 language: python
 python:
+  - "3.3"
+  - "3.2"
   - "2.7"
   - "2.6"
 install:

HISTORY.rst

@@ -1,6 +1,10 @@
 Changelog
 ---------
 
+- **1.1** (2014-02-16)
+
+  - Python 3 support.
+
 - **1.0** (2013-11-21)
 
   - Minor improvements to setup script, comments, and docs.

Makefile

@@ -21,13 +21,17 @@ publish: infup
 	python setup.py sdist --formats=gztar,zip upload
 	python2.6 setup.py bdist_egg upload
 	python2.7 setup.py bdist_egg upload
+	python3.2 setup.py bdist_egg upload
+	python3.3 setup.py bdist_egg upload
 	python setup.py bdist_wininst -p win32 upload
 	python setup.py bdist_wininst -p win-amd64 upload
 
 dist: readme
 	python setup.py sdist --formats=gztar,zip
 	python2.6 setup.py bdist_egg
 	python2.7 setup.py bdist_egg
+	python3.2 setup.py bdist_egg
+	python3.3 setup.py bdist_egg
 	python setup.py bdist_wininst -p win32
 	python setup.py bdist_wininst -p win-amd64
 
@@ -40,6 +44,7 @@ clean:
 	-rm *.pyc
 	-rm test/*.pyc
 	-rm -rf test/__pycache__
+	-rm -rf __pycache__
 	cd docs; make clean
 
 superclean: clean

README.rst

@@ -20,8 +20,8 @@ The main component delivered by expak installation is a pure Python module,
 for programmatically working with pak files. The installation also creates a
 command-line utility for simple resource-extraction operations.
 
-Currently expak is compatible with Python 2.6 and 2.7. It has no dependencies
-outside of the standard Python modules.
+Currently expak is compatible with Python 2.6, 2.7, 3.2, and 3.3. It has no
+dependencies outside of the standard Python modules.
 
 The quakesounds_ application is an example use of expak.
 
@@ -36,9 +36,10 @@ Prerequisites
 -------------
 
 It's a Python module and utility, so you need Python! If you don't have Python
-installed, `go get it`_. Note that while both Python 2 and Python 3 are
-available, for expak specifically you will want to get the latest version of
-Python 2.
+installed, `go get it`_. The latest stable version of either Python 2 or Python 3
+will work... if you're new to Python, you should look elsewhere for advice on
+whether to use 2 or 3, but the general consideration is that currently more
+stuff is compatible with Python 2.
 
 You'll probably also want a Python package manager to help install expak (and
 other things). If you're going to be running on Windows, you can skip this
@@ -77,15 +78,13 @@ installed but can't or don't want to use pip:
 Finally, if you are on Windows, you could also choose to use an installer
 program, although the methods above work fine on Windows. Custom expak
 installers are included in the downloads list for expak
-`at the Python Package Index`_ (PyPI), and also `at Crate.io`_ or other PyPI
-mirrors.
+`at the Python Package Index`_ (PyPI).
 
 If PyPI and its mirrors are down, the Windows installers and other forms of
 distribution files (including source distribution) are mirrored
 `in the releases for the GitHub repo`_.
 
 .. _at the Python Package Index: https://pypi.python.org/pypi/expak
-.. _at Crate.io: https://crate.io/packages/expak
 .. _in the releases for the GitHub repo: https://github.com/neogeographica/expak/releases
 
 .. _documentation_section:

README.rst.in

@@ -21,9 +21,10 @@ Prerequisites
 -------------
 
 It's a Python module and utility, so you need Python! If you don't have Python
-installed, `go get it`_. Note that while both Python 2 and Python 3 are
-available, for expak specifically you will want to get the latest version of
-Python 2.
+installed, `go get it`_. The latest stable version of either Python 2 or Python 3
+will work... if you're new to Python, you should look elsewhere for advice on
+whether to use 2 or 3, but the general consideration is that currently more
+stuff is compatible with Python 2.
 
 You'll probably also want a Python package manager to help install expak (and
 other things). If you're going to be running on Windows, you can skip this
@@ -62,15 +63,13 @@ installed but can't or don't want to use pip:
 Finally, if you are on Windows, you could also choose to use an installer
 program, although the methods above work fine on Windows. Custom expak
 installers are included in the downloads list for expak
-`at the Python Package Index`_ (PyPI), and also `at Crate.io`_ or other PyPI
-mirrors.
+`at the Python Package Index`_ (PyPI).
 
 If PyPI and its mirrors are down, the Windows installers and other forms of
 distribution files (including source distribution) are mirrored
 `in the releases for the GitHub repo`_.
 
 .. _at the Python Package Index: https://pypi.python.org/pypi/expak
-.. _at Crate.io: https://crate.io/packages/expak
 .. _in the releases for the GitHub repo: https://github.com/neogeographica/expak/releases
 
 .. _documentation_section:

docs/blurb.txt

@@ -5,8 +5,8 @@ The main component delivered by expak installation is a pure Python module,
 for programmatically working with pak files. The installation also creates a
 command-line utility for simple resource-extraction operations.
 
-Currently expak is compatible with Python 2.6 and 2.7. It has no dependencies
-outside of the standard Python modules.
+Currently expak is compatible with Python 2.6, 2.7, 3.2, and 3.3. It has no
+dependencies outside of the standard Python modules.
 
 The quakesounds_ application is an example use of expak.