summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-11-29 21:58:39 +0000
committerSteven Barth <steven@midlink.org>2008-11-29 21:58:39 +0000
commit0b34ab07d4834e7b8329f50a3fe64df3ae232053 (patch)
treecdc2417e8e9666ee73aa244405e5f6c73fe66a0d
parenta4fcc13388f2795b83921d1f0bd85b4d1d49ac7e (diff)
Scope compatibility fixes
-rw-r--r--libs/cbi/luasrc/cbi.lua6
-rw-r--r--libs/web/luasrc/dispatcher.lua2
-rw-r--r--libs/web/luasrc/http.lua2
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 0808fb1b7..d19e0eb73 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -27,15 +27,15 @@ limitations under the License.
module("luci.cbi", package.seeall)
require("luci.template")
-require("luci.util")
+local util = require("luci.util")
require("luci.http")
require("luci.uvl")
require("luci.fs")
--local event = require "luci.sys.event"
local uci = require("luci.model.uci")
-local class = luci.util.class
-local instanceof = luci.util.instanceof
+local class = util.class
+local instanceof = util.instanceof
FORM_NODATA = 0
FORM_PROCEED = 0
diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index cae5492f6..d3daa46a6 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -32,7 +32,7 @@ local util = require "luci.util"
local http = require "luci.http"
module("luci.dispatcher", package.seeall)
-context = luci.util.threadlocal()
+context = util.threadlocal()
authenticator = {}
diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index c5a85ea4d..bac997952 100644
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -25,7 +25,7 @@ limitations under the License.
]]--
local ltn12 = require "luci.ltn12"
-local proto = require "luci.http.protocol"
+local protocol = require "luci.http.protocol"
local util = require "luci.util"
local string = require "string"
local coroutine = require "coroutine"