From: Diane Trout Date: Tue, 12 Apr 2016 22:46:36 +0000 (-0700) Subject: Switch to GenericIPAddressField X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=69676af994467c711ee0437ab053c3af765f6cc8 Switch to GenericIPAddressField Django 1.9 added support for ipv6 addresses and changed from IPAddressField to GenericIPAddressField --- diff --git a/bcmagic/models.py b/bcmagic/models.py index c91905b..f75fdef 100644 --- a/bcmagic/models.py +++ b/bcmagic/models.py @@ -23,7 +23,7 @@ class Printer(models.Model): """ name = models.CharField(max_length=256) model = models.CharField(max_length=64, choices=PRINTER_MODELS) - ip_address = models.IPAddressField() + ip_address = models.GenericIPAddressField() label_shape = models.CharField(max_length=32, choices=LABEL_SHAPES) label_width = models.FloatField(help_text='width or diameter in inches') label_height = models.FloatField(help_text='height in inches') diff --git a/labels/models.py b/labels/models.py index fa5920b..13a9b94 100644 --- a/labels/models.py +++ b/labels/models.py @@ -8,7 +8,7 @@ class LabelPrinter(models.Model): """ name = models.CharField(max_length=256) model = models.CharField(max_length=64, default='ZM400') - ip_address = models.IPAddressField() + ip_address = models.GenericIPAddressField() labels = models.CharField(max_length=200) notes = models.TextField(null=True, blank=True)