fix for unencrypted property in config.xml (#1113)

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/create/creator.py

@@ -344,7 +344,7 @@ def _extract_archive_files(self, location, model_name, model_value):
 
         # model value should be a list, comma-delimited string, or string
         model_paths = model_value
-        if isinstance(model_value, str):
+        if isinstance(model_value, basestring):
             model_paths = model_value.split(',')
 
         for model_path in model_paths:

core/src/main/python/wlsdeploy/tool/create/custom_folder_helper.py

@@ -113,7 +113,7 @@ def update_security_folder(self, location, model_type, model_subtype, model_name
             # encrypt the value with domain encryption.
 
             requires_encrypted = property_descriptor.getValue('encrypted')
-            if requires_encrypted and not self.is_encrypted(model_value) and isinstance(model_value, str):
+            if requires_encrypted and not self.is_encrypted(model_value) and isinstance(model_value, basestring):
                 model_value = self.weblogic_helper.encrypt(model_value, self.model_context.get_domain_home())
 
             property_type = parameter_types[0]

core/src/main/python/wlsdeploy/tool/util/credential_injector.py

@@ -115,7 +115,7 @@ def check_and_tokenize(self, model_dict, attribute, location):
         elif folder_path.endswith(MAIL_SESSION) and (attribute == PROPERTIES):
             # users and passwords are property assignments
             value = model_dict[attribute]
-            is_string = isinstance(value, str)
+            is_string = isinstance(value, basestring)
 
             # for discover, value is a string at this point
             split_value = ';'