From: Aleksey Maksimov <ctpeko3a@gmail.com>
Date: Sat, 12 Apr 2014 13:56:25 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/python3_experimental' into python3_experimental
X-Git-Tag: v0.2.23~23^2~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61573357e6571cdd5478243d094e76cc6062f299;p=tools%2Fpython-jenkinsapi.git

Merge remote-tracking branch 'upstream/python3_experimental' into python3_experimental

Conflicts:
	jenkinsapi/fingerprint.py
---

61573357e6571cdd5478243d094e76cc6062f299
diff --cc jenkinsapi/fingerprint.py
index 0fa279c,271415a..a30a79f
--- a/jenkinsapi/fingerprint.py
+++ b/jenkinsapi/fingerprint.py
@@@ -5,8 -5,13 +5,13 @@@ Module for jenkinsapi Fingerprin
  from jenkinsapi.jenkinsbase import JenkinsBase
  from jenkinsapi.custom_exceptions import ArtifactBroken
  
 -try:
+     from urllib2 import HTTPError
+ except ImportError:
+     # Python3
+     from urllib.error import HTTPError
+ 
  import re
 +import requests
  
  import logging