From 7d223186411e4276d7239f6b8b998220038a4743 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 25 Sep 2014 22:19:36 +0800 Subject: [PATCH] don't require ssl.https since it cannot yet be built for win32 --- frontend/ui/translator.lua | 11 ++++++----- frontend/ui/wikipedia.lua | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/ui/translator.lua b/frontend/ui/translator.lua index 13299d438..90a6bf4ee 100644 --- a/frontend/ui/translator.lua +++ b/frontend/ui/translator.lua @@ -1,8 +1,3 @@ -local socket = require('socket') -local url = require('socket.url') -local http = require('socket.http') -local https = require('ssl.https') -local ltn12 = require('ltn12') local JSON = require("JSON") local DEBUG = require("dbg") @@ -36,6 +31,12 @@ end -- return decoded JSON table from translate server --]] function Translator:loadPage(target_lang, source_lang, text) + local socket = require('socket') + local url = require('socket.url') + local http = require('socket.http') + local https = require('ssl.https') + local ltn12 = require('ltn12') + local request, sink = {}, {} local query = "" self.trans_params.tl = target_lang diff --git a/frontend/ui/wikipedia.lua b/frontend/ui/wikipedia.lua index b75bd9c05..baa98c7af 100644 --- a/frontend/ui/wikipedia.lua +++ b/frontend/ui/wikipedia.lua @@ -1,8 +1,3 @@ -local socket = require('socket') -local url = require('socket.url') -local http = require('socket.http') -local https = require('ssl.https') -local ltn12 = require('ltn12') local JSON = require("JSON") local DEBUG = require("dbg") @@ -33,6 +28,12 @@ end -- return decoded JSON table from Wikipedia --]] function Wikipedia:loadPage(text, lang, intro, plain) + local socket = require('socket') + local url = require('socket.url') + local http = require('socket.http') + local https = require('ssl.https') + local ltn12 = require('ltn12') + local request, sink = {}, {} local query = "" self.wiki_params.exintro = intro and "" or nil