diff --git a/apps/abs/models.py b/apps/abs/models.py index 65558c4..242a374 100644 --- a/apps/abs/models.py +++ b/apps/abs/models.py @@ -283,7 +283,7 @@ class ABSConfiguration(Configuration): module_port = self.device.port_address read_route = 'http://'+module_ip+':'+str(module_port)+'/read' - print read_route + print(read_route) answer = '' module_bits = '' @@ -410,10 +410,10 @@ class ABSConfiguration(Configuration): sock.connect(module_address) sock.send(message_tx) sock.close() - print "Writing abs module:"+module_address[0]+"..." + print("Writing abs module:"+module_address[0]+"...") except: sock = None - print "Problem writing abs module:"+module_address[0] + print("Problem writing abs module:"+module_address[0]) return 0 return 1 @@ -427,7 +427,7 @@ class ABSConfiguration(Configuration): try: self.beam_selector(i,beam_pos) except: - print "Problem with module: 192.168.1."+str(i) + print("Problem with module: 192.168.1."+str(i)) self.message = "Problem with module: 192.168.1."+str(i) #return 0 return 1 @@ -554,7 +554,7 @@ class ABSConfiguration(Configuration): for j in jobs: j.join() - print "List processing complete." + print("List processing complete.") return 1 diff --git a/apps/abs/urls.py b/apps/abs/urls.py index 5f89083..f0d8495 100644 --- a/apps/abs/urls.py +++ b/apps/abs/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -import views +from apps.abs import views urlpatterns = ( url(r'^(?P-?\d+)/$', views.abs_conf, name='url_abs_conf'), diff --git a/apps/abs/widgets.py b/apps/abs/widgets.py index adf17e5..d7c0900 100644 --- a/apps/abs/widgets.py +++ b/apps/abs/widgets.py @@ -4,7 +4,6 @@ from itertools import chain from django import forms from django.utils.safestring import mark_safe -from django.utils.encoding import force_unicode from django.utils.html import conditional_escape style = """