summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst5
-rw-r--r--urllib3/__init__.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index f96f0a96..944907b3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,11 +1,14 @@
Changes
=======
-1.2.1 (Soon)
+1.2.1 (2012-02-05)
++++++++++++
* Fixed another bug related to when ``ssl`` module is not available. (Issue #41)
+* Location parsing errors now raise ``urllib3.exceptions.LocationParseError``
+ which inherits from ``ValueError``.
+
1.2 (2012-01-29)
++++++++++++++++
diff --git a/urllib3/__init__.py b/urllib3/__init__.py
index bb4635e2..87ea65b7 100644
--- a/urllib3/__init__.py
+++ b/urllib3/__init__.py
@@ -10,7 +10,7 @@ urllib3 - Thread-safe connection pooling and re-using.
__author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
__license__ = 'MIT'
-__version__ = '1.2'
+__version__ = '1.2.1'
from .connectionpool import (