From 41fd748cdf7a6bcb14b664ded16f339eb864900c Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Mon, 15 Jun 2015 10:22:37 +0200
Subject: Merge self_ip and self_useragent into one plugin

---
 searx/plugins/__init__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'searx/plugins/__init__.py')

diff --git a/searx/plugins/__init__.py b/searx/plugins/__init__.py
index a16ae5fc3..bc4a0fba3 100644
--- a/searx/plugins/__init__.py
+++ b/searx/plugins/__init__.py
@@ -20,8 +20,7 @@ from searx import logger
 logger = logger.getChild('plugins')
 
 from searx.plugins import (https_rewrite,
-                           self_ip,
-                           self_useragent,
+                           self,
                            search_on_category_select)
 
 required_attrs = (('name', str),
@@ -72,6 +71,5 @@ class PluginStore():
 
 plugins = PluginStore()
 plugins.register(https_rewrite)
-plugins.register(self_ip)
-plugins.register(self_useragent)
+plugins.register(self)
 plugins.register(search_on_category_select)
-- 
cgit v1.2.3