aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/acme/srtool_acme.py10
-rwxr-xr-xbin/acme/srtool_defect.py10
-rwxr-xr-xbin/acme/srtool_jira.py13
3 files changed, 6 insertions, 27 deletions
diff --git a/bin/acme/srtool_acme.py b/bin/acme/srtool_acme.py
index c302e1cb..b3453dff 100755
--- a/bin/acme/srtool_acme.py
+++ b/bin/acme/srtool_acme.py
@@ -47,13 +47,9 @@ dir_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
sys.path.insert(0, dir_path)
from common.srt_schema import ORM
-try:
- from datetime import datetime, date
- from urllib.request import urlopen, URLError
- from urllib.parse import urlparse
-except ImportError:
- from urllib2 import urlopen, URLError
- from urlparse import urlparse
+from datetime import datetime, date
+from urllib.request import urlopen, URLError
+from urllib.parse import urlparse
srtDbName = 'srt.sqlite'
diff --git a/bin/acme/srtool_defect.py b/bin/acme/srtool_defect.py
index dbd1b7f9..2cf58375 100755
--- a/bin/acme/srtool_defect.py
+++ b/bin/acme/srtool_defect.py
@@ -33,23 +33,13 @@ import argparse
import sqlite3
import subprocess
import json
-import urllib
from time import sleep
-from datetime import datetime
# load the srt.sqlite schema indexes
dir_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
sys.path.insert(0, dir_path)
from common.srt_schema import ORM
-try:
- from datetime import datetime, date
- from urllib.request import urlopen, URLError
- from urllib.parse import urlparse
-except ImportError:
- from urllib2 import urlopen, URLError
- from urlparse import urlparse
-
srtDbName = 'srt.sqlite'
srtErrorLog = 'srt_errors.txt'
diff --git a/bin/acme/srtool_jira.py b/bin/acme/srtool_jira.py
index 78b35f03..a0a90851 100755
--- a/bin/acme/srtool_jira.py
+++ b/bin/acme/srtool_jira.py
@@ -43,24 +43,17 @@ import argparse
import sqlite3
import subprocess
import json
-import urllib
from jira import JIRA
from time import sleep
-from datetime import datetime
+from datetime import datetime, date
+from urllib.request import urlopen, URLError
+from urllib.parse import urlparse
# load the srt.sqlite schema indexes
dir_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
sys.path.insert(0, dir_path)
from common.srt_schema import ORM
-try:
- from datetime import datetime, date
- from urllib.request import urlopen, URLError
- from urllib.parse import urlparse
-except ImportError:
- from urllib2 import urlopen, URLError
- from urlparse import urlparse
-
srtDbName = 'srt.sqlite'
srtErrorLog = 'srt_errors.txt'