From 81bb0cd8d1ba162e5093ee7689bc947f9bdecdf4 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 17 Sep 2010 09:54:28 +0200
Subject: [PATCH 1/3] #524: Open intersphinx inventories in binary mode on
 Windows, since version 2 contains zlib-compressed data.

---
 CHANGES                   | 3 +++
 sphinx/ext/intersphinx.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a053a61b4..80129b1ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 Release 1.0.4 (in development)
 ==============================
 
+* #524: Open intersphinx inventories in binary mode on Windows,
+  since version 2 contains zlib-compressed data.
+
 * #513: Allow giving non-local URIs for JavaScript files, e.g.
   in the JSMath extension.
 
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 10015fc12..292557db8 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -109,7 +109,7 @@ def fetch_inventory(app, uri, inv):
         if inv.find('://') != -1:
             f = urllib2.urlopen(inv)
         else:
-            f = open(path.join(app.srcdir, inv))
+            f = open(path.join(app.srcdir, inv), 'rb')
     except Exception, err:
         app.warn('intersphinx inventory %r not fetchable due to '
                  '%s: %s' % (inv, err.__class__, err))

From a3afc2a202a9a093597a4c3864672c368d2b4c18 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 17 Sep 2010 10:02:07 +0200
Subject: [PATCH 2/3] Update for 1.0.4.

---
 CHANGES            | 4 ++--
 sphinx/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 80129b1ed..9a03a384b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-Release 1.0.4 (in development)
-==============================
+Release 1.0.4 (Sep 17, 2010)
+============================
 
 * #524: Open intersphinx inventories in binary mode on Windows,
   since version 2 contains zlib-compressed data.
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 5a6c3571c..5710d1a89 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -12,8 +12,8 @@
 import sys
 from os import path
 
-__version__ = '1.0.3+'
-__released__ = '1.0.3'  # used when Sphinx builds its own docs
+__version__  = '1.0.4'
+__released__ = '1.0.4'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))