RemoteLayer_UTF8.diff

diff --git a/geonode/layers/models.py b/geonode/layers/models.py
index 57fd4e7f8a154523f68c67328b10e9f3f5e431ad..6b66522124068bc217808ceb866abc3f034f6e3d 100644
--- a/geonode/layers/models.py
+++ b/geonode/layers/models.py
@@ -534,7 +534,7 @@ def pre_save_layer(instance, sender, **kwargs):
     logger.debug("In pre_save_layer")
     if instance.alternate is None:
         instance.alternate = _get_alternate_name(instance)
-    logger.debug("instance.alternate is: {}".format(instance.alternate))
+    logger.debug(u"instance.alternate is: {}".format(instance.alternate))
 
     base_file, info = instance.get_base_file()
 
diff --git a/geonode/services/serviceprocessors/wms.py b/geonode/services/serviceprocessors/wms.py
index 694e2b9cce746d84634ebad1ec316906a2fcaca5..cc4f86e352237dd4519deb101d008c690dadd2b6 100644
--- a/geonode/services/serviceprocessors/wms.py
+++ b/geonode/services/serviceprocessors/wms.py
@@ -183,7 +183,8 @@ class WmsServiceHandler(base.ServiceHandlerBase,
 
         """
         layer_meta = self.get_resource(resource_id)
-        logger.debug("layer_meta: {}".format(layer_meta))
+        logger.debug("hello owrld")
+        logger.debug(u"layer_meta: {}".format(layer_meta))
         if self.indexing_method == CASCADED:
             logger.debug("About to import cascaded layer...")
             geoserver_resource = self._import_cascaded_resource(layer_meta)
@@ -278,10 +279,10 @@ class WmsServiceHandler(base.ServiceHandlerBase,
             "legend_options": (
                 "fontAntiAliasing:true;fontSize:12;forceLabels:on")
         }
-        kvp = "&".join("{}={}".format(*item) for item in params.items())
-        legend_url = "{}?{}".format(
+        kvp = "&".join(u"{}={}".format(*item) for item in params.items())
+        legend_url = u"{}?{}".format(
             geonode_layer.remote_service.service_url, kvp)
-        logger.debug("legend_url: {}".format(legend_url))
+        logger.debug(u"legend_url: {}".format(legend_url))
         Link.objects.get_or_create(
             resource=geonode_layer.resourcebase_ptr,
             url=legend_url,
diff --git a/geonode/services/views.py b/geonode/services/views.py
index c6b4ad5ef870a917a0967c3adfc782be50416c79..b6d37e568128df78ccbc0bd212fc673626c696d5 100644
--- a/geonode/services/views.py
+++ b/geonode/services/views.py
@@ -143,7 +143,7 @@ def harvest_resources(request, service_id):
             "resource_id", flat=True).filter(service=service, status=enumerations.PROCESSED)
         if available_resources:
             not_yet_harvested = [
-                r for r in available_resources if str(r.id) not in already_harvested]
+                r for r in available_resources if unicode(r.id) not in already_harvested]
             not_yet_harvested.sort(key=lambda resource: resource.id)
         else:
             not_yet_harvested = ['Cannot parse any resource at this time!']
@@ -182,7 +182,7 @@ def harvest_resources(request, service_id):
         requested = list(set(requested))
         resources_to_harvest = []
         for id in _gen_harvestable_ids(requested, available_resources):
-            logger.debug("id: {}".format(id))
+            logger.debug(u"id: {}".format(id))
             harvest_job, created = HarvestJob.objects.get_or_create(
                 service=service,
                 resource_id=id
@@ -192,7 +192,7 @@ def harvest_resources(request, service_id):
                 tasks.harvest_resource.apply_async((harvest_job.id,))
             else:
                 logger.warning(
-                    "resource {} already has a harvest job".format(id))
+                    u"resource {} already has a harvest job".format(id))
         msg_async = _("The selected resources are being imported")
         msg_sync = _("The selected resources have been imported")
         messages.add_message(
@@ -204,7 +204,7 @@ def harvest_resources(request, service_id):
             "harvest_resources" if handler.has_unharvested_resources(
                 service) else "service_detail"
         )
-        result = redirect(reverse(go_to, kwargs={"service_id": service.id}))
+        result = redirect(reverse(go_to, kwargs={u"service_id": service.id}))
     else:
         result = None
     return result
@@ -230,18 +230,18 @@ def harvest_single_resource(request, service_id, resource_id):
     messages.add_message(
         request,
         messages.SUCCESS,
-        _("Resource {} is being processed".format(resource_id))
+        _(u"Resource {} is being processed".format(resource_id))
     )
     return redirect(
         reverse("service_detail",
-                kwargs={"service_id": service.id})
+                kwargs={u"service_id": service.id})
     )
 
 
 def _gen_harvestable_ids(requested_ids, available_resources):
-    available_resource_ids = [str(r.id) for r in available_resources]
+    available_resource_ids = [unicode(r.id) for r in available_resources]
     for id in requested_ids:
-        identifier = str(id)
+        identifier = unicode(id)
         if identifier in available_resource_ids:
             yield identifier