From: Aleksey Maksimov Date: Sat, 12 Apr 2014 14:00:21 +0000 (+0800) Subject: Fixed incorrect merge X-Git-Tag: v0.2.23~23^2~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c95441ad4de8536fa55613bce7467be914b3f5a7;p=tools%2Fpython-jenkinsapi.git Fixed incorrect merge --- diff --git a/jenkinsapi/fingerprint.py b/jenkinsapi/fingerprint.py index a30a79f..0fa279c 100644 --- a/jenkinsapi/fingerprint.py +++ b/jenkinsapi/fingerprint.py @@ -5,11 +5,6 @@ Module for jenkinsapi Fingerprint from jenkinsapi.jenkinsbase import JenkinsBase from jenkinsapi.custom_exceptions import ArtifactBroken - from urllib2 import HTTPError -except ImportError: - # Python3 - from urllib.error import HTTPError - import re import requests