remove python2 legacy tweaks

chsdi/templates/htmlpopup/kgs.mako

@@ -34,17 +34,7 @@
         dataGeoAdminHost = request.registry.settings['datageoadminhost']
         csv_url = dataGeoAdminHost + "/" + c['layerBodId']  + "/image/meta.txt"
         csv_file = None
-        # TODO python2 clean-up
-        try:
-            from urllib2 import urlopen
-            csv_file = urlopen(csv_url)
-            reader = csv.reader(csv_file, delimiter =';')  # creates the reader object
-            next(reader) # Skip header
-            pic_list = [map(lambda x: x.decode("utf-8"), row) for row in reader if int(row[0]) == c['featureId']]
-            csv_file.close()
-        except ImportError:
-            # Python3 fallback
-            from urllib.request import urlopen
+        from urllib.request import urlopen
             csv_file = urlopen(csv_url).read().decode('utf-8')
             reader = csv.reader(csv_file.splitlines(), delimiter =';')  # creates the reader object
             next(reader) # Skip header

chsdi/templates/htmlpopup/lubis.mako

@@ -6,11 +6,7 @@ import datetime
 from pyramid.url import route_url
 import chsdi.lib.helpers as h
 import markupsafe
-# TODO python2 clean-up
-try:
-    from urllib import urlencode
-except ImportError:
-    from urllib.parse import urlencode
+from urllib.parse import urlencode
 
 def br(text):
     return text.replace('\n', markupsafe.Markup('<br />'))

chsdi/templates/htmlpopup/lubis_stac.mako

@@ -8,11 +8,7 @@ import chsdi.lib.helpers as h
 import markupsafe
 logger = logging.getLogger(__name__)
 
-# TODO python2 clean-up
-try:
-    from urllib import urlencode
-except ImportError:
-    from urllib.parse import urlencode
+from urllib.parse import urlencode
 
 def br(text):
     return text.replace('\n', markupsafe.Markup('<br />'))