From c95441ad4de8536fa55613bce7467be914b3f5a7 Mon Sep 17 00:00:00 2001 From: Aleksey Maksimov Date: Sat, 12 Apr 2014 22:00:21 +0800 Subject: [PATCH] Fixed incorrect merge --- jenkinsapi/fingerprint.py | 5 ----- 1 file changed, 5 deletions(-) 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 -- 2.7.4