Scope compatibility fixes

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 0808fb1b7e69e2fee2164d86fd089f5a851d3a47..d19e0eb73e7baf483902adf24eaea588dee6afe3 100644 (file)
--- 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 cae5492f60994f4218220cdac3a8cee108791db2..d3daa46a687a7f454c0bb97c607fcd9a59f6c3e2 100644 (file)
--- 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 c5a85ea4d9f777187855549adabf0c18e199f32a..bac9979522d6bfaa89291d636d90d15584531c1b 100644 (file)
--- 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"