Merge branch 'master' into devel

CHANGES.txt

@@ -1,3 +1,6 @@
+Jul 27, 2013 - v0.2.8  Fixed inconsistency regarding configuration
+    file directory on windows (issue91).
+
 Jul 25, 2013 - v0.2.7  Warns but no longer errors out when neither library is
     found (issue89).
 

docs/source/conf.py

@@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
 # The short X.Y version.
 version = '0.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.7'
+release = '0.2.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

glymur/lib/config.py

@@ -145,9 +145,8 @@ def get_configdir():
 
     if 'HOME' in os.environ and os.name != 'nt':
         # HOME is set by WinPython to something unusual, so we don't
-        # want that. 
+        # necessarily want that. 
         return os.path.join(os.environ['HOME'], '.config', 'glymur')
 
-    if os.name == 'nt':
+    # Last stand.  Should handle windows... others?
-        # Windows.
+    return os.path.join(os.path.expanduser('~'), 'glymur')
-        return os.path.join(os.path.expanduser('~'), 'glymur')

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import sys
 
 kwargs = {'name': 'Glymur',
-          'version': '0.2.7',
+          'version': '0.2.8',
           'description': 'Tools for accessing JPEG2000 files',
           'long_description': open('README.md').read(),
           'author': 'John Evans',