From a5fbdb43cc72e911bc2f304aad9a52c9d5b3a2b2 Mon Sep 17 00:00:00 2001
From: John-Mark Gurney <jmg@funkthat.com>
Date: Tue, 25 Apr 2006 18:23:13 -0800
Subject: [PATCH] drop debugging from ContentDirectory...

print traceback if it isn't the exception to return a special
errorcode..

[git-p4: depot-paths = "//depot/": change = 774]
---
 ContentDirectory.py | 28 ++++++++++++----------------
 upnp.py             |  3 +++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ContentDirectory.py b/ContentDirectory.py
index dbcef3b..3773ddf 100644
--- a/ContentDirectory.py
+++ b/ContentDirectory.py
@@ -122,22 +122,18 @@ class ContentDirectoryControl(UPnPPublisher, dict):
 		if ObjectID not in self:
 			raise errorCode(701)
 
-		try:
-			if BrowseFlag == 'BrowseDirectChildren':
-				ch = self.getchildren(ObjectID)[StartingIndex: StartingIndex + RequestedCount]
-				filter(lambda x, s = self, d = didl: d.addItem(s[x.id].checkUpdate()) and None, ch)
-			else:
-				didl.addItem(self[ObjectID])
-
-			result = {'BrowseResponse': {'Result': didl.toString() ,
-			    'NumberReturned': didl.numItems(),
-			    'TotalMatches': didl.numItems(),
-			    'UpdateID': self[ObjectID].updateID }}
-
-		except:
-			traceback.print_exc(file=log.logfile)
-
-		log.msg('Returning: %s' % result)
+		if BrowseFlag == 'BrowseDirectChildren':
+			ch = self.getchildren(ObjectID)[StartingIndex: StartingIndex + RequestedCount]
+			filter(lambda x, s = self, d = didl: d.addItem(s[x.id].checkUpdate()) and None, ch)
+		else:
+			didl.addItem(self[ObjectID])
+
+		result = {'BrowseResponse': {'Result': didl.toString() ,
+		    'NumberReturned': didl.numItems(),
+		    'TotalMatches': didl.numItems(),
+		    'UpdateID': self[ObjectID].updateID }}
+
+		#log.msg('Returning: %s' % result)
 
 		return result
 
diff --git a/upnp.py b/upnp.py
index 473fa06..617c5c1 100644
--- a/upnp.py
+++ b/upnp.py
@@ -4,6 +4,7 @@
 # Copyright 2005, Tim Potter <tpot@samba.org>
 
 from twisted.web import soap
+from twisted.python import log
 
 import SOAPpy
 
@@ -27,6 +28,8 @@ class UPnPPublisher(soap.SOAPPublisher):
 		else:
 			if isinstance(e, errorCode):
 				status = e.status
+			else:
+				failure.printTraceback(file = log.logfile)
 			fault = SOAPpy.faultType("%s:Server" % SOAPpy.NS.ENV_T, "Method %s failed." % methodName)
 		response = SOAPpy.buildSOAP(fault, encoding=self.encoding)
 		self._sendResponse(request, response, status=status)