chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpo...@apache.org
Subject svn commit: r1405261 - in /chemistry/cmislib/trunk/src: cmislib.egg-info/SOURCES.txt cmislib/model.py tests/cmislibtest.py
Date Sat, 03 Nov 2012 02:30:46 GMT
Author: jpotts
Date: Sat Nov  3 02:30:46 2012
New Revision: 1405261

URL: http://svn.apache.org/viewvc?rev=1405261&view=rev
Log:
Added an exception check to a deleteTree call in cmislibtest.py; Made minor tweaks to some
debug code in model.py

Modified:
    chemistry/cmislib/trunk/src/cmislib.egg-info/SOURCES.txt
    chemistry/cmislib/trunk/src/cmislib/model.py
    chemistry/cmislib/trunk/src/tests/cmislibtest.py

Modified: chemistry/cmislib/trunk/src/cmislib.egg-info/SOURCES.txt
URL: http://svn.apache.org/viewvc/chemistry/cmislib/trunk/src/cmislib.egg-info/SOURCES.txt?rev=1405261&r1=1405260&r2=1405261&view=diff
==============================================================================
--- chemistry/cmislib/trunk/src/cmislib.egg-info/SOURCES.txt (original)
+++ chemistry/cmislib/trunk/src/cmislib.egg-info/SOURCES.txt Sat Nov  3 02:30:46 2012
@@ -44,8 +44,8 @@ src/doc/build/examples.html
 src/doc/build/genindex.html
 src/doc/build/index.html
 src/doc/build/install.html
+src/doc/build/modindex.html
 src/doc/build/objects.inv
-src/doc/build/py-modindex.html
 src/doc/build/sample-data.html
 src/doc/build/search.html
 src/doc/build/searchindex.js
@@ -59,26 +59,15 @@ src/doc/build/_sources/index.txt
 src/doc/build/_sources/install.txt
 src/doc/build/_sources/sample-data.txt
 src/doc/build/_sources/tests.txt
-src/doc/build/_static/ajax-loader.gif
 src/doc/build/_static/basic.css
-src/doc/build/_static/comment-bright.png
-src/doc/build/_static/comment-close.png
-src/doc/build/_static/comment.png
 src/doc/build/_static/default.css
 src/doc/build/_static/doctools.js
-src/doc/build/_static/down-pressed.png
-src/doc/build/_static/down.png
 src/doc/build/_static/file.png
 src/doc/build/_static/jquery.js
 src/doc/build/_static/minus.png
 src/doc/build/_static/plus.png
 src/doc/build/_static/pygments.css
 src/doc/build/_static/searchtools.js
-src/doc/build/_static/sidebar.js
-src/doc/build/_static/underscore.js
-src/doc/build/_static/up-pressed.png
-src/doc/build/_static/up.png
-src/doc/build/_static/websupport.js
 src/doc/src/Makefile
 src/doc/src/about.rst
 src/doc/src/code.rst

Modified: chemistry/cmislib/trunk/src/cmislib/model.py
URL: http://svn.apache.org/viewvc/chemistry/cmislib/trunk/src/cmislib/model.py?rev=1405261&r1=1405260&r2=1405261&view=diff
==============================================================================
--- chemistry/cmislib/trunk/src/cmislib/model.py (original)
+++ chemistry/cmislib/trunk/src/cmislib/model.py Sat Nov  3 02:30:46 2012
@@ -1974,11 +1974,11 @@ class CmisObject(object):
             args = {"changeToken": self.properties['cmis:changeToken']}
 
         # the getEntryXmlDoc function may need the object type
+        objectTypeId = None
         if (self.properties.has_key('cmis:objectTypeId') and
             not properties.has_key('cmis:objectTypeId')):
             objectTypeId = self.properties['cmis:objectTypeId']
-
-        self.logger.debug('This object type is:' + objectTypeId)
+            self.logger.debug('This object type is:%s' % objectTypeId)
 
         # build the entry based on the properties provided
         xmlEntryDoc = getEntryXmlDoc(self._repository, objectTypeId, properties)
@@ -4210,7 +4210,7 @@ def getEntryXmlDoc(repo=None, objectType
             if (propValue == None or (type(propValue) == list and propValue[0] == None)):
                 # grab the prop type from the typeDef
                 if (typeDef == None):
-                    moduleLogger.debug('Looking up type def for:' + objectTypeId)
+                    moduleLogger.debug('Looking up type def for: %s' % objectTypeId)
                     typeDef = repo.getTypeDefinition(objectTypeId)
                     #TODO what to do if type not found
                 propType = typeDef.properties[propName].propertyType

Modified: chemistry/cmislib/trunk/src/tests/cmislibtest.py
URL: http://svn.apache.org/viewvc/chemistry/cmislib/trunk/src/tests/cmislibtest.py?rev=1405261&r1=1405260&r2=1405261&view=diff
==============================================================================
--- chemistry/cmislib/trunk/src/tests/cmislibtest.py (original)
+++ chemistry/cmislib/trunk/src/tests/cmislibtest.py Sat Nov  3 02:30:46 2012
@@ -60,7 +60,10 @@ class CmisTestBase(unittest.TestCase):
 
     def tearDown(self):
         """ Clean up after the test. """
-        self._testFolder.deleteTree()
+        try:
+            self._testFolder.deleteTree()
+        except NotSupportedException:
+            print "Couldn't delete test folder because deleteTree is not supported"
 
 
 class CmisClientTest(unittest.TestCase):



Mime
View raw message