diff --git a/docs/news.txt b/docs/news.txt
index c057a7bf9a2..9ae47977293 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -13,6 +13,8 @@ Beta release mid-July 2011, final release early August.
 * Fixed issue #295 - Reinstall a package when using the ``install -I`` option
 * Fixed issue #283 - Finds a Git tag pointing to same commit as origin/master
 * Fixed issue #279 - Use absolute path for path to docs in setup.py
+* Fixed issue #320 - Correctly handle exceptions on Python3.
+* Fixed issue #314 - Correctly parse ``--editable`` lines in requirements files
 
 1.0.1 (2011-04-30)
 ------------------
diff --git a/pip/download.py b/pip/download.py
index 6fe73eaf8d2..87d6ad97af9 100644
--- a/pip/download.py
+++ b/pip/download.py
@@ -347,7 +347,7 @@ def _download_url(resp, link, temp_location):
         download_hash = md5()
     try:
         total_length = int(resp.info()['content-length'])
-    except (ValueError, KeyError):
+    except (ValueError, KeyError, TypeError):
         total_length = 0
     downloaded = 0
     show_progress = total_length > 40*1000 or not total_length
diff --git a/pip/req.py b/pip/req.py
index 87cfd98b456..7110abc9352 100644
--- a/pip/req.py
+++ b/pip/req.py
@@ -1257,7 +1257,7 @@ def parse_requirements(filename, finder=None, comes_from=None, options=None):
                 if line.startswith('-e'):
                     line = line[2:].strip()
                 else:
-                    line = line[len('--editable'):].strip()
+                    line = line[len('--editable'):].strip().lstrip('=')
                 req = InstallRequirement.from_editable(
                     line, comes_from=comes_from, default_vcs=options.default_vcs)
             else: