Changeset 2331

Timestamp:

11/26/07 17:03:04 (14 months ago)

Author:

markybob

Message:

tweak try/catch again

Files:

• tags/deluge-0.5.6.96/src/deluge_core.cpp (modified) (2 diffs)
• trunk/src/deluge_core.cpp (modified) (2 diffs)

tags/deluge-0.5.6.96/src/deluge_core.cpp

@@ -183 +183 @@
 {
     try{
-        for (unsigned long i = 0; i < M_torrents->size(); i++)
-            if ((*M_torrents)[i].unique_ID == unique_ID)
-                return i;
-        RAISE_INT(DelugeError, "No such unique_ID.");
+      for (unsigned long i = 0; i < M_torrents->size(); i++)
+          if ((*M_torrents)[i].unique_ID == unique_ID)
+              return i;
+      RAISE_INT(DelugeError, "No such unique_ID.");
     }
     catch(invalid_handle&)
@@ -1803 +1803 @@
   if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker))
     return NULL;
-  long index = get_index_from_unique_ID(unique_ID);
-  if (PyErr_Occurred())
-    return NULL;
 
   try {
+      long index = get_index_from_unique_ID(unique_ID);
+      if (PyErr_Occurred())
+        return NULL;
       if (M_torrents->at(index).handle.is_valid()){
         std::vector<libtorrent::announce_entry> trackerlist;

trunk/src/deluge_core.cpp

@@ -183 +183 @@
 {
     try{
-        for (unsigned long i = 0; i < M_torrents->size(); i++)
-            if ((*M_torrents)[i].unique_ID == unique_ID)
-                return i;
-        RAISE_INT(DelugeError, "No such unique_ID.");
+      for (unsigned long i = 0; i < M_torrents->size(); i++)
+          if ((*M_torrents)[i].unique_ID == unique_ID)
+              return i;
+      RAISE_INT(DelugeError, "No such unique_ID.");
     }
     catch(invalid_handle&)
@@ -1803 +1803 @@
   if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker))
     return NULL;
-  long index = get_index_from_unique_ID(unique_ID);
-  if (PyErr_Occurred())
-    return NULL;
 
   try {
+      long index = get_index_from_unique_ID(unique_ID);
+      if (PyErr_Occurred())
+        return NULL;
       if (M_torrents->at(index).handle.is_valid()){
         std::vector<libtorrent::announce_entry> trackerlist;