Merge branch 'release/1.0.2'

RyanBalfanz · Oct 24, 2011 · db560b1 · db560b1
2 parents 275d010 + 3fc3b7d
commit db560b1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ src/doc/.build/
 
 *.pyc
 *.log
+*.IMG
diff --git a/README.rst b/README.rst
@@ -3,6 +3,7 @@ PyPDS
 =====
 
 - Overview_
+- Documentation_
 - Installation_
 - Examples_
 - CommandLineTools_
@@ -19,28 +20,31 @@ Overview
 PyPDS is a python interface to `Planetary Data System <http://pds.jpl.nasa.gov/>`_ (PDS) data products.
 For more information please visit the `PyPDS Wiki <http://wiki.github.com/RyanBalfanz/PyPDS/>`_ and the Sphinx documentation included in the source.
 
+.. _Documentation:
+
+Documentation
+=============
+
+The `latest documentation <http://readthedocs.org/docs/pypds/en/latest/>`_ is available on Read the Docs.
+
 .. _Installation:
 
 Installation
 ============
 
+#. Install PIL
 
-An easy way to get started using PyPDS is to clone its GitHub repository. The repository includes a directory containing some example PDS files to work with.
+#. Install PyPDS
 
-The following will place a directory called PyPDS in your working directory.
+	* From the Python Package Index
 
-	git clone git://github.com/RyanBalfanz/PyPDS.git
-
-For instant gratification, change to the PyPDS/ directory and fire up a Python interpreter.
+		pip install PyPDS
 
-	cd PyPDS/
-	python
-
-From there you should be able to start playing with PyPDS and the some test files (several are available in Downloads).
-
-Or, if you'd like to install PyPDS system wide, first grab a copy of the code as above. Then install with distutils. PyPDS is on PyPI (http://pypi.python.org/pypi/PyPDS) but not yet easy_install/pip installable.
+	* From the GitHub repository
+
+		git clone git://github.com/RyanBalfanz/PyPDS.git
 
-	python setup.py install
+If you want to contribute, consider creating your own fork and submitting a pull request.
 
 .. _Examples:
 

diff --git a/pds/imageextractor.py b/pds/imageextractor.py
@@ -15,8 +15,11 @@
 import sys
 import unittest
 
-import Image
-
+try:
+	import Image
+except ImportError:
+		from PIL import Image
+
 from core.common import open_pds
 from core.parser import Parser
 from core.extractorbase import ExtractorBase, ExtractorError

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
+## The following requirements were added by pip --freeze:
 PIL==1.1.7
-distribute==0.6.10
+docutils==0.7
+restview==1.2.2
 wsgiref==0.1.2