From: Steven Barth <steven@midlink.org>
Date: Sat, 29 Nov 2008 21:59:06 +0000 (+0000)
Subject: Scope compatibility fixes
X-Git-Tag: 0.8.2~14
X-Git-Url: http://git.openwrt.org/project/luci.git/?a=commitdiff_plain;h=499981160b0a2e1c4e6b2d2b962f405c84ef097a;p=project%2Fluci.git

Scope compatibility fixes
---

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index f733560caf..c3ddc38274 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 2323cf8d29..8773974cf3 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 c5a85ea4d9..bac9979522 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"