Fix previous import; Version bump

dwlinux · Mar 3, 2016 · 789bda6 · 789bda6
1 parent 7fe0740
commit 789bda6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,6 @@
 ### Version History:
 
+- 1.2.17: Fix UnicodeEncodeError on redirect; Add in retry on urllib3 TimeOutError
 - 1.2.16: Add in proxy prompts
 - 1.2.15: Fix a severe bug (accidental directory deletion) in `download` command intoduced in 1.2.14
 - 1.2.14: Add in `download` command

diff --git a/bypy.py b/bypy.py
@@ -44,7 +44,7 @@
 from __future__ import division
 
 ### special variables that say about this module
-__version__ = '1.2.16'
+__version__ = '1.2.17'
 
 ### return (error) codes
 # they are put at the top because:
@@ -199,10 +199,11 @@ def fixenc(stdenc):
 try:
  from requests.packages.urllib3.exceptions import ReadTimeoutError
 except:
- from urllib3.exceptions import ReadTimeoutError
-else:
- print("Something seems wrong with the urllib3 installation.\nQuitting")
- onexit(EFatal)
+ try:
+ from urllib3.exceptions import ReadTimeoutError
+ except:
+ print("Something seems wrong with the urllib3 installation.\nQuitting")
+ sys.exit(EFatal)
 
 # there was a WantWriteError uncaught exception for Urllib3:
 # https://github.com/shazow/urllib3/pull/412