merge upstream

pull/8/head
Philipp Hagemeister 14 years ago
commit 2b70537d7b

@ -1 +1 @@
2011.03.29 2011.08.04

@ -50,11 +50,11 @@ except ImportError:
try: try:
import lxml.etree import lxml.etree
except ImportError: # Python < 2.6 except ImportError:
pass # Handled below pass # Handled below
std_headers = { std_headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20100101 Firefox/4.0b11', 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1',
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', 'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'Accept-Encoding': 'gzip, deflate', 'Accept-Encoding': 'gzip, deflate',
@ -2974,7 +2974,7 @@ if __name__ == '__main__':
# Parse command line # Parse command line
parser = optparse.OptionParser( parser = optparse.OptionParser(
usage='Usage: %prog [options] url...', usage='Usage: %prog [options] url...',
version='2011.07.09-phihag', version='2011.08.04-phihag',
conflict_handler='resolve', conflict_handler='resolve',
) )

Loading…
Cancel
Save