Merge branch 'release/0.4.4'v0.4.4

6 files changed, 12 insertions, 3 deletions

diff --git a/HISTORY.rst b/HISTORY.rst
index e69970c..bc256bf 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,11 @@
 History
 -------
 
+0.4.4
++++++
+
+* Restore python 2.5 compatibility
+
 0.4.3
 +++++
 
diff --git a/README.rst b/README.rst
index 7546373..0509f1f 100644
--- a/README.rst
+++ b/README.rst
@@ -126,7 +126,7 @@ I have the following in my ``~/.dotfilesrc``: ::
   ignore = [
       '.git',
       '.gitignore',
-      '*.swp]
+      '*.swp']
 
 Any file you list in ``ignore`` will be skipped. The ``ignore`` option supports
 glob file patterns.
diff --git a/dotfiles/__init__.py b/dotfiles/__init__.py
index 63e0d2b..26cd367 100644
--- a/dotfiles/__init__.py
+++ b/dotfiles/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from .core import *
+__all__ = ["core"]
diff --git a/dotfiles/cli.py b/dotfiles/cli.py
index b77fb95..a056f70 100644
--- a/dotfiles/cli.py
+++ b/dotfiles/cli.py
@@ -6,6 +6,8 @@ dotfiles.cli
 This module provides the CLI interface to dotfiles.
 """
 
+from __future__ import absolute_import
+
 import os
 from . import core
 import ConfigParser
diff --git a/dotfiles/core.py b/dotfiles/core.py
index 60bfc1e..a1aec45 100644
--- a/dotfiles/core.py
+++ b/dotfiles/core.py
@@ -12,7 +12,7 @@ import shutil
 import fnmatch
 
 
-__version__ = '0.4.3'
+__version__ = '0.4.4'
 __author__ = "Jon Bernard"
 __license__ = "GPL"
 
diff --git a/test_dotfiles.py b/test_dotfiles.py
index f9d6fcf..85cdce6 100755
--- a/test_dotfiles.py
+++ b/test_dotfiles.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
 import os
 import shutil
 import tempfile