Move Extractor class to it's own file.

3 files changed, 118 insertions, 74 deletions

diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
new file mode 100644
index 0000000..8a3132c
--- /dev/null
+++ b/mirrorselect/extractor.py
@@ -0,0 +1,116 @@
+#-*- coding:utf-8 -*-
+
+"""Mirrorselect 2.x
+ Tool for selecting Gentoo source and rsync mirrors.
+
+Copyright 2005-2012 Gentoo Foundation
+
+	Copyright (C) 2005 Colin Kingsley <tercel@gentoo.org>
+	Copyright (C) 2008 Zac Medico <zmedico@gentoo.org>
+	Copyright (C) 2009 Sebastian Pipping <sebastian@pipping.org>
+	Copyright (C) 2009 Christian Ruppert <idl0r@gentoo.org>
+	Copyright (C) 2012 Brian Dolbec <dolsen@gentoo.org>
+
+Distributed under the terms of the GNU General Public License v2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+"""
+
+import sys
+
+if int(sys.version[0]) == 3:
+	import urllib.request, urllib.parse, urllib.error
+	url_parse = urllib.parse
+	url_open = urllib.request.urlopen
+else:
+	import urllib
+	import urlparse
+	url_parse = urlparse.urlparse
+	url_open = urllib.urlopen
+
+
+from mirrorselect.mirrorparser3 import MirrorParser3
+
+
+class Extractor(object):
+	"""The Extractor employs a MirrorParser3 object to get a list of valid
+	mirrors, and then filters them. Only the mirrors that should be tested, based on
+	user input are saved. They will be in the hosts attribute."""
+
+	def __init__(self, list_url, options, output):
+		self.output = output
+		filters = {}
+		for opt in ["country", "region"]:
+			value = getattr(options, opt)
+			if value is not None:
+				filters[opt] = value
+				self.output.print_info('Limiting test to "%s=%s" hosts. \n'
+					%(opt, value))
+		for opt in ["ftp", "http"]:
+			if getattr(options, opt):
+				filters["proto"] = opt
+				self.output.print_info('Limiting test to %s hosts. \n' % opt )
+		parser = MirrorParser3()
+		self.hosts = []
+
+		self.unfiltered_hosts = self.getlist(parser, list_url)
+
+		self.hosts = self.filter_hosts(filters, self.unfiltered_hosts)
+
+		self.output.write('Extractor(): fetched mirrors.xml,'
+				' %s hosts after filtering\n' % len(self.hosts), 2)
+
+
+	@staticmethod
+	def filter_hosts(filters, hosts):
+		"""Filter the hosts to the criteria passed in
+		Return the filtered list
+		"""
+		if not len(filters):
+			return hosts
+		filtered = []
+		for uri, data in hosts:
+			good = True
+			for f in filters:
+				if data[f] != filters[f]:
+					good = False
+					continue
+			if good:
+				filtered.append((uri, data))
+		return filtered
+
+
+	def getlist(self, parser, url):
+		"""
+		Uses the supplied parser to get a list of urls.
+		Takes a parser object, url, and filering options.
+		"""
+
+		self.output.write('getlist(): fetching ' + url + '\n', 2)
+
+		self.output.print_info('Downloading a list of mirrors...')
+
+		try:
+			parser.parse(url_open(url).read())
+		except EnvironmentError:
+			pass
+
+		if len(parser.tuples()) == 0:
+			self.output.print_err('Could not get mirror list. '
+				'Check your internet connection.')
+
+		self.output.write(' Got %d mirrors.\n' % len(parser.tuples()))
+
+		return parser.tuples()
+
diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index ca7d794..d309624 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -43,7 +43,8 @@ import sys
 from optparse import OptionParser
 from mirrorselect.mirrorparser3 import MIRRORS_3_XML, MIRRORS_RSYNC_DATA
 from mirrorselect.output import Output, ColoredFormatter
-from mirrorselect.selectors import Deep, Shallow, Extractor, Interactive
+from mirrorselect.selectors import Deep, Shallow, Interactive
+from mirrorselect.extractor import Extractor
 from mirrorselect.version import version
 
 # eprefix compatibility
diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
index 3e77221..9d718fd 100644
--- a/mirrorselect/selectors.py
+++ b/mirrorselect/selectors.py
@@ -47,82 +47,9 @@ else:
 	url_open = urllib.urlopen
 
 
-from mirrorselect.mirrorparser3 import MirrorParser3
 from mirrorselect.output import encoder, get_encoding, decode_selection
 
 
-class Extractor(object):
-	"""The Extractor employs a MirrorParser3 object to get a list of valid
-	mirrors, and then filters them. Only the mirrors that should be tested, based on
-	user input are saved. They will be in the hosts attribute."""
-
-	def __init__(self, list_url, options, output):
-		self.output = output
-		filters = {}
-		for opt in ["country", "region"]:
-			value = getattr(options, opt)
-			if value is not None:
-				filters[opt] = value
-				self.output.print_info('Limiting test to "%s=%s" hosts. \n'
-					%(opt, value))
-		for opt in ["ftp", "http"]:
-			if getattr(options, opt):
-				filters["proto"] = opt
-				self.output.print_info('Limiting test to %s hosts. \n' % opt )
-		parser = MirrorParser3()
-		self.hosts = []
-
-		self.unfiltered_hosts = self.getlist(parser, list_url)
-
-		self.hosts = self.filter_hosts(filters, self.unfiltered_hosts)
-
-		self.output.write('Extractor(): fetched mirrors.xml,'
-				' %s hosts after filtering\n' % len(self.hosts), 2)
-
-
-	@staticmethod
-	def filter_hosts(filters, hosts):
-		"""Filter the hosts to the criteria passed in
-		Return the filtered list
-		"""
-		if not len(filters):
-			return hosts
-		filtered = []
-		for uri, data in hosts:
-			good = True
-			for f in filters:
-				if data[f] != filters[f]:
-					good = False
-					continue
-			if good:
-				filtered.append((uri, data))
-		return filtered
-
-
-	def getlist(self, parser, url):
-		"""
-		Uses the supplied parser to get a list of urls.
-		Takes a parser object, url, and filering options.
-		"""
-
-		self.output.write('getlist(): fetching ' + url + '\n', 2)
-
-		self.output.print_info('Downloading a list of mirrors...')
-
-		try:
-			parser.parse(url_open(url).read())
-		except EnvironmentError:
-			pass
-
-		if len(parser.tuples()) == 0:
-			self.output.print_err('Could not get mirror list. '
-				'Check your internet connection.')
-
-		self.output.write(' Got %d mirrors.\n' % len(parser.tuples()))
-
-		return parser.tuples()
-
-
 class Shallow(object):
 	"""handles rapid server selection via netselect"""