From 96432a9a4ff849da6c3f450253198b83cf3fbde9 Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Mon, 9 Nov 2015 14:30:30 +0200
Subject: Cleanup

---
 servo/migrations/0043_auto_20151109_1354.py | 19 +++++++++++++++++++
 servo/models/device.py                      | 11 +++++++----
 servo/urls/default.py                       |  4 ++--
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 servo/migrations/0043_auto_20151109_1354.py

(limited to 'servo')

diff --git a/servo/migrations/0043_auto_20151109_1354.py b/servo/migrations/0043_auto_20151109_1354.py
new file mode 100644
index 0000000..77a604f
--- /dev/null
+++ b/servo/migrations/0043_auto_20151109_1354.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('servo', '0042_auto_20151026_1555'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='location',
+            name='title',
+            field=models.CharField(default='New Location', unique=True, max_length=255, verbose_name='Name'),
+        ),
+    ]
diff --git a/servo/models/device.py b/servo/models/device.py
index b7e1ca3..85abeb9 100644
--- a/servo/models/device.py
+++ b/servo/models/device.py
@@ -2,6 +2,7 @@
 
 import re
 import gsxws
+from gsxws import diagnostics
 from os.path import basename
 from django_countries import countries
 from django.core.validators import RegexValidator
@@ -280,7 +281,9 @@ class Device(models.Model):
         return device
 
     def to_gsx(self):
-        """Returns the corresponding gsxws Product object"""
+        """
+        Returns the corresponding gsxws Product object
+        """
         if len(self.imei):
             return gsxws.Product(self.imei)
         return gsxws.Product(self.sn)
@@ -472,7 +475,9 @@ class Device(models.Model):
         return super(Device, self).save(*args, **kwargs)
 
     def get_absolute_url(self):
-        return reverse('devices-view_device', args=[self.product_line, self.slug, self.pk])
+        return reverse('devices-view_device', args=[self.product_line,
+                                                    self.slug,
+                                                    self.pk])
 
     def get_purchase_country(self):
         # Return device's purchase country, can be 2-letter code (from checkin) or
@@ -485,7 +490,6 @@ class Device(models.Model):
         return countries.countries.get(self.purchase_country, '')
 
     def run_test(self, test_id, request):
-        from gsxws import diagnostics
         GsxAccount.default(request.user)
         diags = diagnostics.Diagnostics(self.sn)
         diags.shipTo = request.user.location.gsx_shipto
@@ -493,7 +497,6 @@ class Device(models.Model):
         return diags.run_test()
 
     def fetch_tests(self, request):
-        from gsxws import diagnostics
         GsxAccount.default(request.user)
         diags = diagnostics.Diagnostics(self.sn)
         diags.shipTo = request.user.location.gsx_shipto
diff --git a/servo/urls/default.py b/servo/urls/default.py
index 81a4575..a8be378 100644
--- a/servo/urls/default.py
+++ b/servo/urls/default.py
@@ -25,8 +25,8 @@ urlpatterns = patterns(
 
     url(r'^barcode/([\w\-]+)/$', 'servo.views.note.show_barcode',
         name='barcodes-view'),
-    url(r'^files/(?P<pk>\d+)/view/$', files.view_file),
-    url(r'^files/(?P<path>.+)/$', files.get_file),
+    url(r'^files/(?P<pk>\d+)/view/$', files.view_file, name="files-view_file"),
+    url(r'^files/(?P<path>.+)/$', files.get_file, name="files-get_file"),
 
     url(r'^login/$', account.login, name="accounts-login"),
     url(r'^logout/$', account.logout, name="accounts-logout"),
-- 
cgit v1.2.3