nodeshot.interop.sync general cleanup #178

ninuxorg · Oct 1, 2014 · 336c459 · 336c459
1 parent 5b900b5
commit 336c459
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 27 deletions.
diff --git a/nodeshot/interop/sync/models/layer_external.py b/nodeshot/interop/sync/models/layer_external.py
@@ -1,5 +1,3 @@
-import simplejson as json
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError, ImproperlyConfigured, ObjectDoesNotExist
@@ -113,7 +111,7 @@ def synchronizer(self):
             self._synchronizer_class = None
         # init synchronizer only if necessary
         if not self._synchronizer:
-            self._synchronizer = self.synchronizer_class(self.layer)
+            self._synchronizer = (self.synchronizer_class)(self.layer)
         return self._synchronizer
 
     @property

diff --git a/nodeshot/interop/sync/models/node_external.py b/nodeshot/interop/sync/models/node_external.py
@@ -1,8 +1,5 @@
-import simplejson as json
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from django.core.exceptions import ValidationError
 
 from nodeshot.core.nodes.models import Node
 

diff --git a/nodeshot/interop/sync/synchronizers/base.py b/nodeshot/interop/sync/synchronizers/base.py
@@ -194,52 +194,102 @@ class GenericGisSynchronizer(HttpRetrieverMixin, BaseSynchronizer):
         {
             'name': 'field_name',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'name', 'verbose_name': _('name field'), 'help_text': _('corresponding name field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'name',
+                'verbose_name': _('name field'),
+                'help_text': _('corresponding name field on external source')
+            }
         },
         {
             'name': 'field_status',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'status', 'verbose_name': _('status field'), 'help_text': _('corresponding status field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'status',
+                'verbose_name': _('status field'),
+                'help_text': _('corresponding status field on external source')
+            }
         },
         {
             'name': 'field_description',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'description', 'verbose_name': _('description field'), 'help_text': _('corresponding description field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'description',
+                'verbose_name': _('description field'),
+                'help_text': _('corresponding description field on external source')
+            }
         },
         {
             'name': 'field_address',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'address', 'verbose_name': _('address field'), 'help_text': _('corresponding address field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'address',
+                'verbose_name': _('address field'),
+                'help_text': _('corresponding address field on external source')
+            }
         },
         {
             'name': 'field_is_published',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'is_published', 'verbose_name': _('is_published field'), 'help_text': _('corresponding is_published field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'is_published',
+                'verbose_name': _('is_published field'),
+                'help_text': _('corresponding is_published field on external source')
+            }
         },
         {
             'name': 'field_user',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'user', 'verbose_name': _('user field'), 'help_text': _('corresponding user field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'user',
+                'verbose_name': _('user field'),
+                'help_text': _('corresponding user field on external source')
+            }
         },
         {
             'name': 'field_elev',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'elev', 'verbose_name': _('elev field'), 'help_text': _('corresponding elev field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'elev',
+                'verbose_name': _('elev field'),
+                'help_text': _('corresponding elev field on external source')
+            }
         },
         {
             'name': 'field_notes',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'notes', 'verbose_name': _('notes field'), 'help_text': _('corresponding notes field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'notes',
+                'verbose_name': _('notes field'),
+                'help_text': _('corresponding notes field on external source')
+            }
         },
         {
             'name': 'field_added',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'added', 'verbose_name': _('added field'), 'help_text': _('corresponding added field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'added',
+                'verbose_name': _('added field'),
+                'help_text': _('corresponding added field on external source')
+            }
         },
         {
             'name': 'field_updated',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'updated', 'verbose_name': _('updated field'), 'help_text': _('corresponding updated field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'updated',
+                'verbose_name': _('updated field'),
+                'help_text': _('corresponding updated field on external source')
+            }
         }
     ]
 

diff --git a/nodeshot/interop/sync/synchronizers/georss.py b/nodeshot/interop/sync/synchronizers/georss.py
@@ -35,52 +35,104 @@ class GeoRss(XMLParserMixin, GenericGisSynchronizer):
         {
             'name': 'field_name',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'title', 'verbose_name': _('name field'), 'help_text': _('corresponding name field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'title',
+                'verbose_name': _('name field'),
+                'help_text': _('corresponding name field on external source')
+            }
         },
         {
             'name': 'field_status',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'status', 'verbose_name': _('status field'), 'help_text': _('corresponding status field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'status',
+                'verbose_name': _('status field'),
+                'help_text': _('corresponding status field on external source')
+            }
         },
         {
             'name': 'field_description',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': '', 'blank': True, 'verbose_name': _('description field'), 'help_text': _('corresponding description field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': '',
+                'blank': True,
+                'verbose_name': _('description field'),
+                'help_text': _('corresponding description field on external source')
+            }
         },
         {
             'name': 'field_address',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'address', 'verbose_name': _('address field'), 'help_text': _('corresponding address field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default':
+                'address',
+                'verbose_name': _('address field'),
+                'help_text': _('corresponding address field on external source')
+            }
         },
         {
             'name': 'field_is_published',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'is_published', 'verbose_name': _('is_published field'), 'help_text': _('corresponding is_published field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'is_published',
+                'verbose_name': _('is_published field'),
+                'help_text': _('corresponding is_published field on external source')
+            }
         },
         {
             'name': 'field_user',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'user', 'verbose_name': _('user field'), 'help_text': _('corresponding user field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'user',
+                'verbose_name': _('user field'),
+                'help_text': _('corresponding user field on external source')
+            }
         },
         {
             'name': 'field_elev',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'elev', 'verbose_name': _('elev field'), 'help_text': _('corresponding elev field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'elev',
+                'verbose_name': _('elev field'),
+                'help_text': _('corresponding elev field on external source')
+            }
         },
         {
             'name': 'field_notes',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'notes', 'verbose_name': _('notes field'), 'help_text': _('corresponding notes field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'notes',
+                'verbose_name': _('notes field'),
+                'help_text': _('corresponding notes field on external source')
+            }
         },
         {
             'name': 'field_added',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'pubDate', 'verbose_name': _('added field'), 'help_text': _('corresponding added field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'pubDate',
+                'verbose_name': _('added field'),
+                'help_text': _('corresponding added field on external source')
+            }
         },
         {
             'name': 'field_updated',
             'class': 'CharField',
-            'kwargs': { 'max_length': 64, 'default': 'updated', 'verbose_name': _('updated field'), 'help_text': _('corresponding updated field on external source') }
+            'kwargs': {
+                'max_length': 64,
+                'default': 'updated',
+                'verbose_name': _('updated field'),
+                'help_text': _('corresponding updated field on external source')
+            }
         }
     ]
 

diff --git a/nodeshot/interop/sync/views.py b/nodeshot/interop/sync/views.py
@@ -1,5 +1,4 @@
 from django.contrib.admin.sites import site
-from django.core.exceptions import ValidationError
 from nodeshot.core.layers.models import Layer
 
 from .models import LayerExternal