From 083c7fbb32726f25d13204d497d929c98ba04d9d Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 9 Jan 2012 19:16:15 +0000 Subject: [PATCH 1/2] Fix #1936 : Referenced before assignment error in json_api --- deluge/ui/web/json_api.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index 7fe4db169..120cef85a 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -354,7 +354,7 @@ class EventQueue(object): :type listener_id: string :param event: The event name :type event: string - """ + """ if event not in self.__events: def on_event(*args): @@ -375,7 +375,7 @@ class EventQueue(object): :param listener_id: A unique id for the listener :type listener_id: string - """ + """ # Check to see if we have anything to return immediately if listener_id in self.__queue: @@ -409,7 +409,7 @@ class EventQueue(object): :type listener_id: string :param event: The event name :type event: string - """ + """ self.__events[event].remove(listener_id) if not self.__events[event]: client.deregister_event_handler(event, self.__handlers[event]) @@ -735,11 +735,11 @@ class WebApi(JSONComponent): @export def get_host_status(self, host_id): """ - Returns the current status for the specified host. + Returns the current status for the specified host. :param host_id: the hash id of the host :type host_id: string - """ + """ def response(status, info=None): return host_id, host, port, status, info @@ -747,6 +747,8 @@ class WebApi(JSONComponent): try: host_id, host, port, user, password = self.get_host(host_id) except TypeError, e: + host = None + port = None return response(_("Offline")) def on_connect(connected, c, host_id): @@ -784,8 +786,8 @@ class WebApi(JSONComponent): @export def start_daemon(self, port): """ - Starts a local daemon. - """ + Starts a local daemon. + """ client.start_daemon(port, get_config_dir()) @export @@ -947,7 +949,7 @@ class WebApi(JSONComponent): :param event: The event name :type event: string - """ + """ self.event_queue.add_listener(__request__.session_id, event) @export @@ -957,12 +959,12 @@ class WebApi(JSONComponent): :param event: The event name :type event: string - """ + """ self.event_queue.remove_listener(__request__.session_id, event) @export def get_events(self): """ Retrieve the pending events for the session. - """ + """ return self.event_queue.get_events(__request__.session_id) From 25d930b3076b84f13022c1ff5110c5aceb637d55 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 9 Jan 2012 19:58:37 +0000 Subject: [PATCH 2/2] Fix #1929 : Update setup.py to clean deluge*.egg_info dir from root dir --- setup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) mode change 100644 => 100755 setup.py diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index f5d26fb22..5b0183c9b --- a/setup.py +++ b/setup.py @@ -17,9 +17,9 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, write to: -# The Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor -# Boston, MA 02110-1301, USA. +# The Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301, USA. # try: @@ -450,6 +450,14 @@ class clean_plugins(cmd.Command): os.remove(os.path.join(path, fpath)) os.removedirs(path) + ROOT_EGG_INFO_DIR_PATH = "deluge*.egg-info" + + for path in glob.glob(ROOT_EGG_INFO_DIR_PATH): + print("Deleting %s" % path) + for fpath in os.listdir(path): + os.remove(os.path.join(path, fpath)) + os.removedirs(path) + class clean(_clean): sub_commands = _clean.sub_commands + [('clean_plugins', None)]