From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat, 7 Apr 2007 23:27:49 +0000 (+0000)
Subject: plugins: remove excess requires and Net::HTTP.version setups
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=a7c40c145f5be6c7c99752bb0af93c0735971694;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

plugins: remove excess requires and Net::HTTP.version setups
---

diff --git a/data/rbot/plugins/dict.rb b/data/rbot/plugins/dict.rb
index d486e97b..ef162215 100644
--- a/data/rbot/plugins/dict.rb
+++ b/data/rbot/plugins/dict.rb
@@ -18,8 +18,6 @@
 #
 # TODO: cache results and reuse them if get_cached returns a cache copy
 
-require 'uri'
-
 DEMAURO_LEMMA = /<anchor>(.*?)(?: - (.*?))<go href="lemma.php\?ID=(\d+)"\/><\/anchor>/
 
 class DictPlugin < Plugin
diff --git a/data/rbot/plugins/fish.rb b/data/rbot/plugins/fish.rb
index 57bbefd0..140c9570 100644
--- a/data/rbot/plugins/fish.rb
+++ b/data/rbot/plugins/fish.rb
@@ -1,7 +1,3 @@
-require 'net/http'
-require 'uri/common'
-Net::HTTP.version_1_2
-
 class BabelPlugin < Plugin
   LANGS = %w{en fr de it pt es nl ru zh zt el ja ko}
 
diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index aea6dc4c..da98dd08 100644
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -13,10 +13,6 @@
 # TODO:: use lr=lang_<code> or whatever is most appropriate to let google know
 #        it shouldn't use the bot's location to find the preferred language
 
-require 'uri'
-
-Net::HTTP.version_1_2
-
 GOOGLE_WAP_LINK = /<a accesskey="(\d)" href=".*?u=(.*?)">(.*?)<\/a>/im
 GOOGLE_CALC_RESULT = %r{<p><table><tr><td><img src=/images/calc_img\.gif></td><td>&nbsp;</td><td nowrap><font size=\+1><b>(.+)</b></td></tr><tr><td>}
 
diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index 0b75febe..1a4b9d74 100644
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -1,5 +1,3 @@
-require 'uri'
-
 class UrbanPlugin < Plugin
 
   def help( plugin, topic="")
diff --git a/data/rbot/plugins/url.rb b/data/rbot/plugins/url.rb
index 36401604..d1c9b6bb 100644
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -1,5 +1,3 @@
-require 'uri'
-
 Url = Struct.new("Url", :channel, :nick, :time, :url)
 TITLE_RE = /<\s*?title\s*?>(.+?)<\s*?\/title\s*?>/im
 LINK_INFO = "[Link Info]"
diff --git a/data/rbot/plugins/weather.rb b/data/rbot/plugins/weather.rb
index cdabf9c1..da6a2116 100644
--- a/data/rbot/plugins/weather.rb
+++ b/data/rbot/plugins/weather.rb
@@ -11,7 +11,6 @@
 #
 # License:: GPL v2
 
-require 'uri'
 require 'rexml/document'
 
 # Wraps NOAA National Weather Service information
diff --git a/data/rbot/plugins/wserver.rb b/data/rbot/plugins/wserver.rb
index fdb4207d..a888ad0c 100644
--- a/data/rbot/plugins/wserver.rb
+++ b/data/rbot/plugins/wserver.rb
@@ -1,7 +1,3 @@
-require 'net/http'
-require 'uri'
-Net::HTTP.version_1_2
-
 class WserverPlugin < Plugin
   def help(plugin, topic="")
     "wserver <uri> => try and determine what webserver <uri> is using"