X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=blobdiff_plain;f=src%2Fweb%2Fbase.py;fp=src%2Fweb%2Fbase.py;h=6b25ded18d99a417ed5a77623523ab6ad1e4d5ba;hp=e000ca33718516c59b5d827e4bdd1fb532c4837a;hb=440aba92db685306d6e7260781d084eb7365b5d4;hpb=7ccbc261b58882396794dde70e7a29fc5719055c

diff --git a/src/web/base.py b/src/web/base.py
index e000ca33..6b25ded1 100644
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -119,26 +119,16 @@ class BaseHandler(tornado.web.RequestHandler):
 		return remote_ips.pop()
 
 	@lazy_property
-	def remote(self):
+	def current_address(self):
 		address = self.get_remote_ip()
 
 		if address:
-			return self.backend.geoip.lookup(address)
+			return util.Address(self.backend, address)
 
 	@lazy_property
 	def current_country_code(self):
-		remote_ip = self.get_remote_ip()
-
-		if remote_ip:
-			return self.backend.geoip.get_country(remote_ip)
-
-	def get_remote_location(self):
-		if not hasattr(self, "__remote_location"):
-			remote_ip = self.get_remote_ip()
-
-			self.__remote_location = self.geoip.get_location(remote_ip)
-
-		return self.__remote_location
+		if self.current_address:
+			return self.current_address.country_code
 
 	def get_argument_int(self, *args, **kwargs):
 		arg = self.get_argument(*args, **kwargs)
@@ -237,10 +227,6 @@ class BaseHandler(tornado.web.RequestHandler):
 	def releases(self):
 		return self.backend.releases
 
-	@property
-	def geoip(self):
-		return self.backend.geoip
-
 	@property
 	def talk(self):
 		return self.backend.talk