Merge 0.10->trunk

[prosody.git] / util / events.lua

diff --git a/util/events.lua b/util/events.lua
index e93d62045b37e6e664a9c96352d986b293f49816..825ffb19b110f7e4d7e517d52fd34fbe6aaeb001 100644 (file)
--- a/util/events.lua
+++ b/util/events.lua
@@ -9,13 +9,14 @@
 
 local pairs = pairs;
 local t_insert = table.insert;
+local t_remove = table.remove;
 local t_sort = table.sort;
 local setmetatable = setmetatable;
 local next = next;
 
-module "events"
+local _ENV = nil;
 
-function new()
+local function new()
        local handlers = {};
        local global_wrappers;
        local wrappers = {};
@@ -121,7 +122,7 @@ function new()
                if not w then return; end
                for i = #w, 1 do
                        if w[i] == wrapper then
-                               table.remove(w, i);
+                               t_remove(w, i);
                        end
                end
                if #w == 0 then
@@ -150,4 +151,6 @@ function new()
        };
 end
 
-return _M;
+return {
+       new = new;
+};