radarsys Commit - r174:fe01c8eee39a · Jicamarca Repository

Fix prints for python 3...

Juan C. Espinoza -

r174:fe01c8eee39a

parent child

Context file:

r174:fe01c8eee39a

Collapse all files

apps/abs/models.py +5 -5

                     module_port = self.device.port_address
                     read_route = 'http://'+module_ip+':'+str(module_port)+'/read'
-                    print read_route
+                    print(read_route)
                     answer = ''
                     module_bits = ''
                         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
                         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
                     for j in jobs:
                             j.join()
-                    print "List processing complete."
+                    print("List processing complete.")
                     return 1

apps/abs/urls.py +1 -1

             from django.conf.urls import url
-            import views
+            from apps.abs import views
             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', views.abs_conf, name='url_abs_conf'),

apps/abs/widgets.py 0 -1

             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 = """<style>

apps/main/views.py +5 -7

                 kwargs = {}
                 campaigns = Campaign.objects.filter(start_date__lte=datetime.now(),
                                                     end_date__gte=datetime.now()).order_by('-start_date')
                 if id_camp:
                     campaign = get_object_or_404(Campaign, pk = id_camp)
                     form = OperationForm(initial={'campaign': campaign.id}, campaigns=campaigns)
                     kwargs['form'] = form
                     return render(request, 'operation.html', kwargs)
                 #---Experiment
                 keys = ['id', 'name', 'start_time', 'end_time', 'status']
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiments
                 #---Radar
                 kwargs['locations'] = campaign.get_experiments_by_location()
-                print kwargs['locations']
                 #---Else
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = campaign.name
                 kwargs['form'] = form
                 return render(request, 'operation.html', kwargs)
                     return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
                 else:
                     return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages