Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Lewis <jtl1728@rit.edu>2010-01-07 22:13:01 (GMT)
committer Justin Lewis <jtl1728@rit.edu>2010-01-07 22:13:01 (GMT)
commite862019244af94097ad6ea4603893b8a04797575 (patch)
treea241811f0a95a43bc68753211e39b7bbc37921cb
parentf51439416132da311841b409b5150530bd86f407 (diff)
Added try block around file list download
-rw-r--r--FileShare.activity/FileShareActivity.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/FileShare.activity/FileShareActivity.py b/FileShare.activity/FileShareActivity.py
index 1926d12..b557671 100644
--- a/FileShare.activity/FileShareActivity.py
+++ b/FileShare.activity/FileShareActivity.py
@@ -130,14 +130,17 @@ class FileShareActivity(Activity):
else:
#IN SERVER MODE, GET SERVER FILE LIST
def call():
- conn = httplib.HTTPConnection( self.server_ip, self.server_port)
- conn.request("GET", "/filelist")
- r1 = conn.getresponse()
- if r1.status == 200:
- data = r1.read()
- conn.close()
- self.incomingRequest('filelist',data)
- else:
+ try:
+ conn = httplib.HTTPConnection( self.server_ip, self.server_port)
+ conn.request("GET", "/filelist")
+ r1 = conn.getresponse()
+ if r1.status == 200:
+ data = r1.read()
+ conn.close()
+ self.incomingRequest('filelist',data)
+ else:
+ self._alert("Error getting file list")
+ except:
self._alert("Error getting file list")
self.show_throbber(False)