Set settings.TEMPLATE_DIR to empty tuple if it isn't defined before a…

…ppending to it.
GeoNode · Nov 15, 2016 · 18749e4 · 18749e4
1 parent 8c721e3
commit 18749e4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/osgeo_importer/admin.py b/osgeo_importer/admin.py
@@ -14,6 +14,7 @@ class UploadedDataAdmin(admin.ModelAdmin):
     list_display = ('name', 'user', 'state', 'size', 'complete')
     list_filter = ('user', 'state', 'complete')
 
+
 admin.site.register(UploadLayer, UploadedLayerAdmin)
 admin.site.register(UploadedData, UploadedDataAdmin)
 admin.site.register(UploadFile, UploadAdmin)
diff --git a/osgeo_importer/handlers/geonode/__init__.py b/osgeo_importer/handlers/geonode/__init__.py
@@ -6,6 +6,7 @@
 from osgeo_importer.handlers import ImportHandlerMixin
 from osgeo_importer.handlers import ensure_can_run
 from osgeo_importer.importers import UPLOAD_DIR
+from publish_handler import GeoNodePublishHandler  # NOQA - Moved this code but want it still available here.
 
 
 class GeoNodeMetadataHandler(ImportHandlerMixin):

diff --git a/osgeo_importer/handlers/geonode/backward_compatibility.py b/osgeo_importer/handlers/geonode/backward_compatibility.py
@@ -100,5 +100,6 @@ def set_attributes_bw_compat(layer, attribute_map, overwrite=False, attribute_st
     else:
         logger.debug("No attributes found")
 
+
 if set_attributes is None:
     set_attributes = set_attributes_bw_compat
diff --git a/osgeo_importer/tests/tests_original.py b/osgeo_importer/tests/tests_original.py
@@ -1393,5 +1393,6 @@ def test_csv_with_wkb_geometry(self):
                 }
             )
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/osgeo_importer/utils.py b/osgeo_importer/utils.py
@@ -115,6 +115,7 @@ def handler(self, err_level, err_no, err_msg):
         self.err_no = err_no
         self.err_msg = err_msg
 
+
 lastNum = re.compile(r'(?:[^\d]*(\d+)[^\d]*)+')
 
 

diff --git a/osgeo_importer_prj/settings.py b/osgeo_importer_prj/settings.py
@@ -62,9 +62,12 @@
 
 # Note that Django automatically includes the "templates" dir in all the
 # INSTALLED_APPS, se there is no need to add maps/templates or admin/templates
+try: TEMPLATE_DIRS
+except NameError: TEMPLATE_DIRS = tuple()
+
 TEMPLATE_DIRS = (
-    os.path.join(LOCAL_ROOT, "templates"),
-) + TEMPLATE_DIRS
+        os.path.join(LOCAL_ROOT, "templates"),
+    ) + TEMPLATE_DIRS
 
 # Location of url mappings
 ROOT_URLCONF = 'osgeo_importer_prj.urls'
-Original file line number
+Diff line change
@@ Expand Up / @@ -1393,5 +1393,6 @@ def test_csv_with_wkb_geometry(self): @@
                     }
                 )
     if __name__ == '__main__':
         unittest.main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -115,6 +115,7 @@ def handler(self, err_level, err_no, err_msg):
		self.err_no = err_no
		self.err_msg = err_msg


		lastNum = re.compile(r'(?:[^\d](\d+)[^\d])+')


Expand Down