Mercurial > hg > cc > cirrus_work

annotate bin/sort_date.py @ 109:52c6a9b0fc8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loosen must-match criterion in the both-messy case
author Henry Thompson <ht@markup.co.uk>
date Tue, 19 Sep 2023 19:29:41 +0100
parents 9f7a35bf07f9
children ab3d547f3e76
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
73
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
1 #!/usr/bin/python3
104
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
2 '''Process output of lmh_warc [new 3-column version]
97
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
3 Usage: <(uz ....warc.gz | fgrep $'\t'|sed "/GMT$/s/\([^ ]\)GMT$/\1 GMT/")
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
4 '''
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
5
73
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
6 # Assumes you have used grep -v $'\t' on input for speed
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
7 # Recommended to also sed '/GMT$/s/\([^ ]\)GMT$/\1 GMT/'
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
8 # to fix a common 'bad' timestamp (~ .2% of inputs)
97
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
9
73
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
10 import email.utils
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
11 import sys
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
12 from urllib.parse import urlsplit, quote, unquote
104
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
13 import surt
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
14
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
15 import re, codecs
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
16
88
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
17 WPAT = re.compile('(,www\\d*)+\\)')
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
18
77
bf09a1d80d7b make CC's own sorting explicit
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 76
diff changeset
19 # Thanks to https://stackoverflow.com/a/8776871
bf09a1d80d7b make CC's own sorting explicit
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 76
diff changeset
20 import locale
bf09a1d80d7b make CC's own sorting explicit
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 76
diff changeset
21 from functools import cmp_to_key
76
eeef811f734d handle corner cases with final . and initial www..+
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 75
diff changeset
22
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
23 def percent_encode(ude):
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
24 #print(ude.object,ude.object[ude.start:ude.end])
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
25 return (''.join('%%%X'%c for c in ude.object[ude.start:ude.end]),
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
26 ude.end)
75
177f7df2bf46 handle %-encoded utf-8 as idna
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 73
diff changeset
27
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
28 codecs.register_error('percent',percent_encode)
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
29
108
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
30 def _u_esc(c):
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
31 if c<65536:
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
32 return '\\u%04X'%c
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
33 else:
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
34 return '\\U%08X'%c
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
35
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
36 def java_unicode_encode(ude):
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
37 '''like backslashreplace but use uppercase and \ u00NN instead of \ xnn'''
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
38 return (''.join(_u_esc(ord(c)) for c in ude.object[ude.start:ude.end]),
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
39 ude.end)
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
40
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
41 codecs.register_error('java_unicode',java_unicode_encode)
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
42
86
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
43 # From RFC-3986:
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
44 # gen-delims = ":" / "/" / "?" / "#" / "[" / "]" / "@"
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
45 # sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
46 # / "*" / "+" / "," / ";" / "="
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
47 # But # _is_ escaped in Java surt results
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
48 # and additionally " \ : < = > ? \ ^ _ ` { | } are not
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
49
88
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
50 # Note also that although quote already does _not_ quote - . / _ ~
97
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
51 # they are included below as that's what we find in surt.surt 0.3.1
88
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
52
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
53 # Also, Java surt strips _all_ leading 'www\d*.',
86
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
54 # where python3 surt only strips the first one.
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
55
104
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
56 # And Java strips so-called option session-ids, but python doesn't
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
57
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
58 import surt.DefaultIAURLCanonicalizer, surt.GoogleURLCanonicalizer
107
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
59 import surt.URLRegexTransformer
104
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
60
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
61 def notDefaultCanon(hu,**options):
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
62 if surt.GoogleURLCanonicalizer.DECIMAL_IP.match(hu.host):
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
63 # Try to fix the incompatibility between Java and
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
64 # Python surt handling of 'octal' numbers in numeric IPv4 addresses
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
65 # and it should! See "After this line:
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
66 #
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
67 # 15,225,107,143)" in .../azure/notes.txt
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
68 try:
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
69 bytestrs = hu.host.split(b'.')
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
70 hu.host = b'.'.join(b'%d'%int(bs) for bs in bytestrs)
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
71 except ValueError:
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
72 pass
107
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
73
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
74 return surt.DefaultIAURLCanonicalizer.canonicalize(hu, **options)
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
75
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
76 # Hack this to reproduce the Java bug
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
77 surt.URLRegexTransformer._RES_QUERY_SESSIONID = [
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
78 re.compile(b"(.*&)(?:jsessionid=[0-9a-z]{32})(?:&(.*))?$", re.I),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
79 re.compile(b"(.*&)(?:phpsessid=[0-9a-z]{32})(?:&(.*))?$", re.I),
108
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
80 re.compile(b"(.*[a-z]*)(?:sid=[0-9a-z]{32})(?:&(.*))?$", re.I),
107
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
81 re.compile(b"(.*&)(?:aspsessionid[a-z]{8}=[a-zA-Z]{24})(?:&(.*))?$", re.I),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
82 re.compile(b"(.*&)(?:cfid=[^&]+&cftoken=[^&]+)(?:&(.*))?$", re.I),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
83 ]
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
84
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
85 # Above based on this from broken Java code:
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
86 # https://github.com/iipc/webarchive-commons/commit/5cfff50a03263208520ca2d260229eefb2aec2f7
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
87 #(.+)(?:jsessionid=[0-9a-zA-Z]{32})(?:&(.*))?$", "jsessionid=", 1, 2),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
88 #(.+)(?:phpsessid=[0-9a-zA-Z]{32})(?:&(.*))?$", "phpsessid=", 1, 2),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
89 #(.+)(?:sid=[0-9a-zA-Z]{32})(?:&(.*))?$", "sid=", 1, 2),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
90 #(.+)(?:ASPSESSIONID[a-zA-Z]{8}=[a-zA-Z]{24})(?:&(.*))?$", "aspsessionid", 1, 2),
40c460fed99f working on sessionID pblms, still
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 104
diff changeset
91 #(.+)(?:cfid=[^&]+&cftoken=[^&]+)(?:&(.*))?$",
104
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
92
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
93 def cdx_key(uristring):
104
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
94 _surt = quote(unquote(surt.surt(uristring,
fc9a045c872b use my own Canonicalizer to fix more obscure
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 97
diff changeset
95 canonicalizer=notDefaultCanon),
86
3a2ae6057242 handle double .www, more keep-me chars
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 85
diff changeset
96 errors='percent'),
88
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
97 safe='''!"$&'()*+,-./:;<=>?@[\]^_`{|}~''' # '
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
98 ).lower()
49faf679d7df final keystroke fixes, recurse and decimal www stripping
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 86
diff changeset
99 return WPAT.sub(')',_surt)
73
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
100
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
101 def keyed(l):
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
102 uri, cc_stamp, dateTime = l.split('\t',2)
77
bf09a1d80d7b make CC's own sorting explicit
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 76
diff changeset
103 #print('ul',uri,file=sys.stderr)
73
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
104 try:
76
eeef811f734d handle corner cases with final . and initial www..+
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 75
diff changeset
105 try:
eeef811f734d handle corner cases with final . and initial www..+
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 75
diff changeset
106 epoch = email.utils.parsedate_to_datetime(dateTime).timestamp()
eeef811f734d handle corner cases with final . and initial www..+
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 75
diff changeset
107 except OverflowError:
eeef811f734d handle corner cases with final . and initial www..+
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 75
diff changeset
108 epoch = 32535215999.0
97
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
109 return ((cdx_key(uri), cc_stamp, uri), epoch)
75
177f7df2bf46 handle %-encoded utf-8 as idna
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 73
diff changeset
110 except (TypeError,IndexError,ValueError) as e:
73
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
111 print(dateTime.rstrip(),e,sep='\t',file=sys.stderr)
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
112 return
e8c667bf8965 compute timestamps, key and sort lmh lines
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff changeset
113
97
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
114 fstr = sys.argv[1]
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
115
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
116 with open(fstr,"r") as ff:
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
117 # crucial that the following is done _after_ the file is opened
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
118 # with the default (utf-8) locale!
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
119 locale.setlocale(locale.LC_ALL, "C")
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
120 ctk=cmp_to_key(locale.strcoll)
97
135a8c56dcc2 include full URI in output
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 88
diff changeset
121 for key, ts in sorted((kk for l in ff if (kk:=keyed(l)) is not None),
85
1daa8e444cfe work-around for weird handling of %-encoding in Java impl. of SURT
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 84
diff changeset
122 key=lambda x:x[0]):
108
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
123 print(key[0],key[1],key[2].encode('ascii',errors=java_unicode)
9f7a35bf07f9 one more sid fix,
Henry Thompson <ht@markup.co.uk>
parents: 107
diff changeset
124 ,ts,sep='\t')
77
bf09a1d80d7b make CC's own sorting explicit
Henry S. Thompson <ht@inf.ed.ac.uk>
parents: 76
diff changeset
125