Changeset 8375 for mauRepo/CedaMarkup

Timestamp:

21/06/12 11:00:24 (9 years ago)

Author:

mnagni

Message:

Corrected some pylint error messages

Location:

mauRepo/CedaMarkup/trunk

Files:

• . (modified) (1 prop)
• ceda_markup/__init__.py (modified) (1 diff)
• ceda_markup/atom/entry.py (modified) (4 diffs)
• ceda_markup/opensearch/os_engine.py (modified) (2 diffs)
• ceda_markup/opensearch/os_request.py (modified) (4 diffs)
• ceda_markup/template/atom.py (modified) (1 diff)

mauRepo/CedaMarkup/trunk

@@ -8 +8 @@
 
 .pydevproject
+
+ceda_markup.egg-info

@@ -8 +8 @@
 
 .pydevproject
+
+ceda_markup.egg-info

mauRepo/CedaMarkup/trunk/ceda_markup/__init__.py

@@ +1 @@
+'''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Created on 21 Jun 2012
+
+@author: Maurizio Nagni
+'''
+
 __version__ = '0.0.1'
+
+def extendElement(element, collectionToAppend):
+    '''
+        Manages the extention of an xml.etree.ElementTree instance.
+        As the Element.extend function has been introduced in python2.7
+        for backward compatibility this method chooses the best approach
+        @param element: an instance of xml.etree.ElementTree
+        @param collectionToAppend: a collection to append to the element  
+    '''    
+    if hasattr(element, 'extend'):
+        getattr(element, 'extend')(collectionToAppend)
+        return
+
+    for item in collectionToAppend:
+        getattr(element, 'append')(item)

mauRepo/CedaMarkup/trunk/ceda_markup/atom/entry.py

@@ -32 +32 @@
 '''
 from xml.etree.ElementTree import Element, SubElement
+from ceda_markup import extendElement
 
 class Entry(object):
@@ -103 +104 @@
         if hasattr(self, 'author'):
             if isinstance(self.author, list):
-                entry.extend(self.author)
+                extendElement(entry, self.author)
             else:
                 entry.append(self.author)
@@ -109 +110 @@
         if hasattr(self, 'contributor'):
             if isinstance(self.contributor, list):
-                entry.extend(self.contributor)
+                extendElement(entry, self.contributor)
             else:
                 entry.append(self.contributor)                
@@ -126 +127 @@
         if hasattr(self, 'category'):
             if isinstance(self.category, list):
-                entry.extend(self.category)
+                extendElement(entry, self.category)
             else:
                 entry.append(self.category)

mauRepo/CedaMarkup/trunk/ceda_markup/opensearch/os_engine.py

@@ -33 +33 @@
 
 import mimetypes
-from ceda_markup.opensearch.query import QueryTag
-from ceda_markup.opensearch.os_engine_helper import OSEngineHelper
+from query import QueryTag
+from os_engine_helper import OSEngineHelper
+
 if not mimetypes.inited:
     mimetypes.init()
@@ -73 +74 @@
         return None                
     
-    '''
-    def generateURLPath(self, ospath):
-        """
-            Generate the proper URL path, before the parameters, for the Opensearch:URL tag.
-            This method is supposed to be overridden by classes extending OSREsponse            
-            @param ospath: same value of OSEngine.path
-            @return the default implementation return ospath. 
-        """
-        return ospath
-    '''    
-    
     def getDescription(self, ospath):
         reqDoc = self.osRequest.getDescription(ospath)

mauRepo/CedaMarkup/trunk/ceda_markup/opensearch/os_request.py

@@ -33 +33 @@
 from xml.etree.ElementTree import Element, SubElement, tostring
 from xml.dom import minidom
-from ceda_markup.opensearch.os_engine import get_mimetype
-from ceda_markup.opensearch.osquery import URL_REL_DEFAULT, URL_INDEX_OFFSET_DEFAULT,\
+from os_engine import get_mimetype
+from osquery import URL_REL_DEFAULT, URL_INDEX_OFFSET_DEFAULT,\
     URL_PAGE_OFFSET_DEFAULT
 
@@ -77 +77 @@
         self.query = query
         self.responses = responses
+        self.os_syndacation_right = None
+        self.os_adult_content = True
 
         if os_description:
@@ -103 +105 @@
             self.os_syndacation_right = os_syndacation_right            
             
-        if os_adult_content and os_adult_content not in ['false', 'FALSE', '0', 'no', 'NO']:
-            self.os_adult_content = True                        
+        if os_adult_content and os_adult_content in ['false', 'FALSE', '0', 'no', 'NO']:
+            self.os_adult_content = False                        
             
         self.os_image = os_image
@@ -169 +171 @@
         
         for item in self.responses:            
-            url = self._buildTemplateURL(top, item.extension, self.query.rel, self.query.indexOffset, self.query.pageOffset, ospath)
-            #self.oshelper.assignNamespacePrefix(url)    
-            
+            self._buildTemplateURL(top, item.extension, self.query.rel, self.query.indexOffset, self.query.pageOffset, ospath)
         
         reparsed = minidom.parseString(tostring(top))

mauRepo/CedaMarkup/trunk/ceda_markup/template/atom.py

@@ -31 +31 @@
 @author: Maurizio Nagni
 '''
-from ceda_markup.template.osresponse import OSResponse
+from osresponse import OSResponse
 
 class OSAtomResponse(OSResponse):

@@ -8 +8 @@
 
 .pydevproject
+
+ceda_markup.egg-info