CorpusFiltergraph

Merge lp:~jtv/corpusfiltergraph/cross-python into lp:~domy/corpusfiltergraph/old-sourceforge-trunk

  1. cross-python
  2. Merge into old-sourceforge-trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Merge reported by: Jeroen T. Vermeulen
Merged at revision: not available
Proposed branch: lp:~jtv/corpusfiltergraph/cross-python
Merge into: lp:~domy/corpusfiltergraph/old-sourceforge-trunk
Diff against target: 1176 lines (+311/-32)
67 files modified
trunk/lib/corpusfg/cfgparser.py (+21/-17)
trunk/lib/corpusfg/common.py (+11/-1)
trunk/lib/corpusfg/corpusfg.py (+4/-0)
trunk/lib/corpusfg/filtergraph.py (+4/-0)
trunk/lib/corpusfg/flock.py (+11/-6)
trunk/lib/corpusfg/graphs/extract-dictionary/aligner-extract-dictionary.py (+5/-0)
trunk/lib/corpusfg/graphs/extract-dictionary/en/extract-dictionary.py (+4/-0)
trunk/lib/corpusfg/graphs/extract-dictionary/zh_hk/extract-dictionary.py (+4/-0)
trunk/lib/corpusfg/manager.py (+4/-0)
trunk/lib/corpusfg/plugins/add-line-numbers.py (+4/-0)
trunk/lib/corpusfg/plugins/aligner-passthrough.py (+4/-0)
trunk/lib/corpusfg/plugins/aligner-special-join.py (+4/-0)
trunk/lib/corpusfg/plugins/aligner-special-split.py (+4/-0)
trunk/lib/corpusfg/plugins/convert-lowercase.py (+4/-0)
trunk/lib/corpusfg/plugins/convert-subscript.py (+4/-0)
trunk/lib/corpusfg/plugins/convert-superscript.py (+4/-0)
trunk/lib/corpusfg/plugins/convert-uppercase.py (+4/-0)
trunk/lib/corpusfg/plugins/count-token.py (+4/-0)
trunk/lib/corpusfg/plugins/delete-files.py (+4/-0)
trunk/lib/corpusfg/plugins/detokenize-split-characters.py (+4/-0)
trunk/lib/corpusfg/plugins/escape-spaces.py (+4/-0)
trunk/lib/corpusfg/plugins/ja/convert-ansi2full.py (+4/-0)
trunk/lib/corpusfg/plugins/ja/convert-full2ansi.py (+4/-0)
trunk/lib/corpusfg/plugins/null-copyfile.py (+4/-0)
trunk/lib/corpusfg/plugins/reader-file.py (+4/-0)
trunk/lib/corpusfg/plugins/reader-gettext.py (+4/-0)
trunk/lib/corpusfg/plugins/reader-null.py (+4/-0)
trunk/lib/corpusfg/plugins/reader-tab.py (+4/-0)
trunk/lib/corpusfg/plugins/reader-tmx.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-all.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-blanks-left-right.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-blanks-left.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-blanks-right.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-blanks.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-html-tags.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-irrelevant-left.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-irrelevant-right.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-irrelevant.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-multi-blanks.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-multi-spaces.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-paragraph-tags.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-spaces-left-right.py (+5/-0)
trunk/lib/corpusfg/plugins/remove-spaces-left.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-spaces-right.py (+4/-0)
trunk/lib/corpusfg/plugins/remove-spaces.py (+4/-0)
trunk/lib/corpusfg/plugins/repair-escapes.py (+3/-0)
trunk/lib/corpusfg/plugins/replace-by-list.py (+4/-0)
trunk/lib/corpusfg/plugins/replace-regex.py (+4/-0)
trunk/lib/corpusfg/plugins/special-join.py (+4/-0)
trunk/lib/corpusfg/plugins/special-secondary-output.py (+4/-0)
trunk/lib/corpusfg/plugins/special-split.py (+4/-0)
trunk/lib/corpusfg/plugins/split-sentences.py (+4/-0)
trunk/lib/corpusfg/plugins/subprocess-synch.py (+4/-0)
trunk/lib/corpusfg/plugins/tokenize-split-characters.py (+4/-0)
trunk/lib/corpusfg/plugins/unescape-spaces.py (+4/-0)
trunk/lib/corpusfg/plugins/unicode-decode-entities.py (+4/-0)
trunk/lib/corpusfg/plugins/unicode-normalize.py (+4/-0)
trunk/lib/corpusfg/plugins/writer-file.py (+4/-0)
trunk/lib/corpusfg/plugins/writer-null.py (+4/-0)
trunk/lib/corpusfg/plugins/writer-tab.py (+4/-0)
trunk/lib/corpusfg/plugins/writer-tmx.py (+4/-0)
trunk/lib/corpusfg/plugins/zh_cn/convert-zh2traditional.py (+4/-0)
trunk/lib/corpusfg/plugins/zh_hk/convert-zh2simplified.py (+4/-0)
trunk/lib/corpusfg/progress_bar.py (+12/-8)
trunk/lib/corpusfg/pstat.py (+5/-0)
trunk/lib/corpusfg/stats.py (+5/-0)
trunk/lib/corpusfg/unicode_block.py (+5/-0)
To merge this branch: bzr merge lp:~jtv/corpusfiltergraph/cross-python
Reviewer Review Type Date Requested Status
Tom Hoar Pending
Review via email: mp+146336@code.launchpad.net

Commit message

Python 3.x compatibility boiler plate, and initial fixes.

Description of the change

This changes the way the python interpreter reads the source code to be more like python 3.x. The goal is to ease transition to 3.x by first moving towards a common dialect that is compatible between the two versions.

The relevant changes in dialect are:
 * "print" is now a function, not a keyword.
 * String literals are unicode, not raw bytes, by default. (Use the "b" prefix where you do want raw bytes).
 * You can't just turn a bytes string into a unicode string. It takes proper decoding.

(There are more, but I don't think they will be particularly noticeable here).

Run this through its motions and it will crash in a few places. I still have to do more of that, so treat this branch as a work in progress.

Jeroen

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'trunk/lib/corpusfg/cfgparser.py'
2--- trunk/lib/corpusfg/cfgparser.py 2013-01-01 15:15:07 +0000
3+++ trunk/lib/corpusfg/cfgparser.py 2013-02-04 03:21:20 +0000
4@@ -8,6 +8,10 @@
5 #version:
6 #4.5.337 - bugfix for UTF-8 in values that become folder names
7
8+from __future__ import absolute_import, print_function, unicode_literals
9+
10+__metaclass__ = type
11+
12 import sys
13 import os
14 import codecs
15@@ -372,45 +376,45 @@
16 def _display(cfg):
17 for k in sorted(cfg.keys()):
18 if type(cfg[k]) is dict:
19- print unicode(k).join(['[',']'])
20+ print(k.decode('utf-8').join(['[',']']))
21 for kk in sorted(cfg[k].keys()):
22 if type(cfg[k][kk]) is dict:
23- print unicode(kk).join([' [',']'])
24+ print(kk.decode('utf-8').join([' [',']']))
25 for kkk in sorted(cfg[k][kk].keys()):
26 if type(cfg[k][kk][kkk]) is dict:
27- print unicode(kkk).join([' [',']'])
28+ print(kkk.decode('utf-8').join([' [',']']))
29 for kkkk in sorted(cfg[k][kk][kkk].keys()):
30 if type(cfg[k][kk][kkk][kkkk]) is dict:
31- print unicode(kkkk).join([' [',']'])
32+ print(kkkk.decode('utf-8').join([' [',']']))
33 for kkkkk in sorted(cfg[k][kk][kkk][kkkk].keys()):
34 if type(cfg[k][kk][kkk][kkkk][kkkkk]) is dict:
35- print unicode(kkkkk).join([' [',']'])
36+ print(kkkkk.decode('utf-8').join([' [',']']))
37 for kkkkkk in sorted(cfg[k][kk][kkk][kkkk][kkkkk].keys()):
38 if type(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk]) is dict:
39- print unicode(kkkkkk).join([' [',']'])
40+ print(kkkkkk.decode('utf-8').join([' [',']']))
41 for kkkkkkk in sorted(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk].keys()):
42 if type(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk]) is dict:
43- print unicode(kkkkkkk).join([' [',']'])
44+ print(kkkkkkk.decode('utf-8').join([' [',']']))
45 for kkkkkkkk in sorted(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk].keys()):
46 if type(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk][kkkkkkkk]) is dict:
47- print unicode(kkkkkkkk).join([' [',']'])
48+ print(kkkkkkkk.decode('utf-8').join([' [',']']))
49 else:
50- print ' ','='.join([unicode(kkkkkkkk),unicode(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk][kkkkkkkk])])
51+ print(' ','='.join([kkkkkkkk.decode('utf-8'),unicode(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk][kkkkkkkk])]))
52 else:
53- print ' ','='.join([unicode(kkkkkkk),unicode(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk])])
54+ print(' ','='.join([kkkkkkk.decode('utf-8'),cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk][kkkkkkk].decode('utf-8')]))
55 else:
56- print ' ','='.join([unicode(kkkkkk),unicode(cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk])])
57+ print(' ','='.join([kkkkkk.decode('utf-8'),cfg[k][kk][kkk][kkkk][kkkkk][kkkkkk].decode('utf-8')]))
58 else:
59- print ' ','='.join([unicode(kkkkk),unicode(cfg[k][kk][kkk][kkkk][kkkkk])])
60+ print(' ','='.join([kkkkk.decode('utf-8'),cfg[k][kk][kkk][kkkk][kkkkk].decode('utf-8')]))
61 else:
62- print ' ','='.join([unicode(kkkk),unicode(cfg[k][kk][kkk][kkkk])])
63+ print(' ','='.join([kkkk.decode('utf-8'),cfg[k][kk][kkk][kkkk].decode('utf-8')]))
64 else:
65- print ' ','='.join([unicode(kkk),unicode(cfg[k][kk][kkk])])
66+ print(' ','='.join([kkk.decode('utf-8'),cfg[k][kk][kkk].decode('utf-8')]))
67 else:
68- print ' ','='.join([unicode(kk),unicode(cfg[k][kk])])
69+ print(' ','='.join([kk.decode('utf-8'),cfg[k][kk].decode('utf-8')]))
70 else:
71- print ' ','='.join([unicode(k),unicode(cfg[k])])
72- print
73+ print(' ','='.join([k.decode('utf-8'),cfg[k].decode('utf-8')]))
74+ print()
75
76 def _updatedir(masters,working,lrunas,forcesetup):
77
78
79=== modified file 'trunk/lib/corpusfg/common.py'
80--- trunk/lib/corpusfg/common.py 2013-01-01 15:15:07 +0000
81+++ trunk/lib/corpusfg/common.py 2013-02-04 03:21:20 +0000
82@@ -8,6 +8,10 @@
83 #version:
84 #4.5.337 - bugfix for UTF-8 in values that become folder names
85
86+from __future__ import absolute_import, print_function, unicode_literals
87+
88+__metaclass__ = type
89+
90 import sys
91 import os
92 import time
93@@ -21,7 +25,13 @@
94 import heapq
95 import locale
96
97-locale.setlocale(locale.LC_ALL, 'C')
98+try:
99+ locale.setlocale(locale.LC_ALL, 'C')
100+except ValueError:
101+ # We use unicode_literals, but Python 2.x needs the locale name to be a
102+ # plain str.
103+ locale.setlocale(locale.LC_ALL, b'C')
104+
105
106 (fs,root,rttype,stage,supdom,dom,subdom) = range(0,7)
107 (basename,rdrlang,srclang,kind) = range(-1,-5,-1)
108
109=== modified file 'trunk/lib/corpusfg/corpusfg.py'
110--- trunk/lib/corpusfg/corpusfg.py 2013-01-01 15:15:07 +0000
111+++ trunk/lib/corpusfg/corpusfg.py 2013-02-04 03:21:20 +0000
112@@ -8,6 +8,10 @@
113 #version:
114 #4.5.337 - bugfix for UTF-8 in values that become folder names
115
116+from __future__ import absolute_import, print_function, unicode_literals
117+
118+__metaclass__ = type
119+
120 import sys
121 import os
122 import logging
123
124=== modified file 'trunk/lib/corpusfg/filtergraph.py'
125--- trunk/lib/corpusfg/filtergraph.py 2013-01-01 15:15:07 +0000
126+++ trunk/lib/corpusfg/filtergraph.py 2013-02-04 03:21:20 +0000
127@@ -8,6 +8,10 @@
128 #version:
129 #4.5.337 - bugfix for UTF-8 in values that become folder names
130
131+from __future__ import absolute_import, print_function, unicode_literals
132+
133+__metaclass__ = type
134+
135 import sys
136 import os
137 import shutil
138
139=== modified file 'trunk/lib/corpusfg/flock.py'
140--- trunk/lib/corpusfg/flock.py 2013-01-01 15:15:07 +0000
141+++ trunk/lib/corpusfg/flock.py 2013-02-04 03:21:20 +0000
142@@ -5,6 +5,11 @@
143 #4.5.337 - version update
144
145 ## {{{ http://code.activestate.com/recipes/498171/ (r3)
146+
147+from __future__ import absolute_import, print_function, unicode_literals
148+
149+__metaclass__ = type
150+
151 # flock.py
152 import os
153 import socket
154@@ -32,14 +37,14 @@
155 if self.islocked():
156 if self.debug:
157 lock = self._readlock()
158- print 'Previous lock detected: %s' % self.pddr(lock)
159+ print('Previous lock detected: %s' % self.pddr(lock))
160 return False
161 try:
162 fh = open(self.path, 'w')
163 fh.write('%s\n'%(self.addr()))
164 fh.close()
165 if self.debug:
166- print 'Acquired lock: %s' % self.fddr()
167+ print('Acquired lock: %s' % self.fddr())
168 except:
169 if os.path.isfile(self.path):
170 try:
171@@ -55,7 +60,7 @@
172 try:
173 os.unlink(self.path)
174 if self.debug:
175- print 'Released lock: %s' % self.fddr()
176+ print('Released lock: %s' % self.fddr())
177 except:
178 raise (self.FileLockReleaseError, 'Error releasing lock: %s' % self.fddr())
179 return self
180@@ -106,13 +111,13 @@
181 if lock:
182 sleep(20)
183 else:
184- print 'locked!'
185+ print('locked!')
186
187 # test2.py
188 from flock import flock
189 lock = flock('tmp.lock', True).acquire()
190 if lock:
191- print ' doing stuff'
192+ print(' doing stuff')
193 else:
194- print 'locked!'
195+ print('locked!')
196 ## end of http://code.activestate.com/recipes/498171/ }}}
197
198=== modified file 'trunk/lib/corpusfg/graphs/extract-dictionary/aligner-extract-dictionary.py'
199--- trunk/lib/corpusfg/graphs/extract-dictionary/aligner-extract-dictionary.py 2013-01-01 15:15:07 +0000
200+++ trunk/lib/corpusfg/graphs/extract-dictionary/aligner-extract-dictionary.py 2013-02-04 03:21:20 +0000
201@@ -8,6 +8,11 @@
202 #version:
203 #4.5.337 - version update
204
205+
206+from __future__ import absolute_import, print_function, unicode_literals
207+
208+__metaclass__ = type
209+
210 import re
211 import common as cf
212
213
214=== modified file 'trunk/lib/corpusfg/graphs/extract-dictionary/en/extract-dictionary.py'
215--- trunk/lib/corpusfg/graphs/extract-dictionary/en/extract-dictionary.py 2013-01-01 15:15:07 +0000
216+++ trunk/lib/corpusfg/graphs/extract-dictionary/en/extract-dictionary.py 2013-02-04 03:21:20 +0000
217@@ -8,6 +8,10 @@
218 #version:
219 #4.5.337 - version update
220
221+from __future__ import absolute_import, print_function, unicode_literals
222+
223+__metaclass__ = type
224+
225 import re
226 import common as cf
227
228
229=== modified file 'trunk/lib/corpusfg/graphs/extract-dictionary/zh_hk/extract-dictionary.py'
230--- trunk/lib/corpusfg/graphs/extract-dictionary/zh_hk/extract-dictionary.py 2013-01-01 15:15:07 +0000
231+++ trunk/lib/corpusfg/graphs/extract-dictionary/zh_hk/extract-dictionary.py 2013-02-04 03:21:20 +0000
232@@ -8,6 +8,10 @@
233 #version:
234 #4.5.337 - version update
235
236+from __future__ import absolute_import, print_function, unicode_literals
237+
238+__metaclass__ = type
239+
240 import re
241 import common as cf
242
243
244=== modified file 'trunk/lib/corpusfg/manager.py'
245--- trunk/lib/corpusfg/manager.py 2013-01-01 15:15:07 +0000
246+++ trunk/lib/corpusfg/manager.py 2013-02-04 03:21:20 +0000
247@@ -8,6 +8,10 @@
248 #version:
249 #4.5.337 - version update
250
251+from __future__ import absolute_import, print_function, unicode_literals
252+
253+__metaclass__ = type
254+
255 import sys
256 import os
257 from flock import flock
258
259=== modified file 'trunk/lib/corpusfg/plugins/add-line-numbers.py'
260--- trunk/lib/corpusfg/plugins/add-line-numbers.py 2013-01-01 15:15:07 +0000
261+++ trunk/lib/corpusfg/plugins/add-line-numbers.py 2013-02-04 03:21:20 +0000
262@@ -8,6 +8,10 @@
263 #version:
264 #4.5.337 - bugfix for UTF-8 in values that become folder names
265
266+from __future__ import absolute_import, print_function, unicode_literals
267+
268+__metaclass__ = type
269+
270 import os
271 import sys
272 import common as cf
273
274=== modified file 'trunk/lib/corpusfg/plugins/aligner-passthrough.py'
275--- trunk/lib/corpusfg/plugins/aligner-passthrough.py 2013-01-01 15:15:07 +0000
276+++ trunk/lib/corpusfg/plugins/aligner-passthrough.py 2013-02-04 03:21:20 +0000
277@@ -8,6 +8,10 @@
278 #version:
279 #4.5.337 - version update
280
281+from __future__ import absolute_import, print_function, unicode_literals
282+
283+__metaclass__ = type
284+
285 import os
286 import common as cf
287
288
289=== modified file 'trunk/lib/corpusfg/plugins/aligner-special-join.py'
290--- trunk/lib/corpusfg/plugins/aligner-special-join.py 2013-01-01 15:15:07 +0000
291+++ trunk/lib/corpusfg/plugins/aligner-special-join.py 2013-02-04 03:21:20 +0000
292@@ -8,6 +8,10 @@
293 #version:
294 #4.5.337 - version update
295
296+from __future__ import absolute_import, print_function, unicode_literals
297+
298+__metaclass__ = type
299+
300 from copy import deepcopy
301 import common as cf
302
303
304=== modified file 'trunk/lib/corpusfg/plugins/aligner-special-split.py'
305--- trunk/lib/corpusfg/plugins/aligner-special-split.py 2013-01-01 15:15:07 +0000
306+++ trunk/lib/corpusfg/plugins/aligner-special-split.py 2013-02-04 03:21:20 +0000
307@@ -8,6 +8,10 @@
308 #version:
309 #4.5.337 - version update
310
311+from __future__ import absolute_import, print_function, unicode_literals
312+
313+__metaclass__ = type
314+
315 from copy import deepcopy
316 import common as cf
317
318
319=== modified file 'trunk/lib/corpusfg/plugins/convert-lowercase.py'
320--- trunk/lib/corpusfg/plugins/convert-lowercase.py 2013-01-01 15:15:07 +0000
321+++ trunk/lib/corpusfg/plugins/convert-lowercase.py 2013-02-04 03:21:20 +0000
322@@ -8,6 +8,10 @@
323 #version:
324 #4.5.337 - bugfix for UTF-8 in values that become folder names
325
326+from __future__ import absolute_import, print_function, unicode_literals
327+
328+__metaclass__ = type
329+
330 import os
331 import sys
332 import common as cf
333
334=== modified file 'trunk/lib/corpusfg/plugins/convert-subscript.py'
335--- trunk/lib/corpusfg/plugins/convert-subscript.py 2013-01-01 15:15:07 +0000
336+++ trunk/lib/corpusfg/plugins/convert-subscript.py 2013-02-04 03:21:20 +0000
337@@ -8,6 +8,10 @@
338 #version:
339 #4.5.337 - bugfix for UTF-8 in values that become folder names
340
341+from __future__ import absolute_import, print_function, unicode_literals
342+
343+__metaclass__ = type
344+
345 import os
346 import sys
347 import re
348
349=== modified file 'trunk/lib/corpusfg/plugins/convert-superscript.py'
350--- trunk/lib/corpusfg/plugins/convert-superscript.py 2013-01-01 15:15:07 +0000
351+++ trunk/lib/corpusfg/plugins/convert-superscript.py 2013-02-04 03:21:20 +0000
352@@ -8,6 +8,10 @@
353 #version:
354 #4.5.337 - bugfix for UTF-8 in values that become folder names
355
356+from __future__ import absolute_import, print_function, unicode_literals
357+
358+__metaclass__ = type
359+
360 import os
361 import sys
362 import re
363
364=== modified file 'trunk/lib/corpusfg/plugins/convert-uppercase.py'
365--- trunk/lib/corpusfg/plugins/convert-uppercase.py 2013-01-01 15:15:07 +0000
366+++ trunk/lib/corpusfg/plugins/convert-uppercase.py 2013-02-04 03:21:20 +0000
367@@ -8,6 +8,10 @@
368 #version:
369 #4.5.337 - bugfix for UTF-8 in values that become folder names
370
371+from __future__ import absolute_import, print_function, unicode_literals
372+
373+__metaclass__ = type
374+
375 import os
376 import sys
377 import common as cf
378
379=== modified file 'trunk/lib/corpusfg/plugins/count-token.py'
380--- trunk/lib/corpusfg/plugins/count-token.py 2013-01-01 15:15:07 +0000
381+++ trunk/lib/corpusfg/plugins/count-token.py 2013-02-04 03:21:20 +0000
382@@ -8,6 +8,10 @@
383 #version:
384 #4.5.337 - bugfix for UTF-8 in values that become folder names
385
386+from __future__ import absolute_import, print_function, unicode_literals
387+
388+__metaclass__ = type
389+
390 import os
391 import sys
392 import common as cf
393
394=== modified file 'trunk/lib/corpusfg/plugins/delete-files.py'
395--- trunk/lib/corpusfg/plugins/delete-files.py 2013-01-01 15:15:07 +0000
396+++ trunk/lib/corpusfg/plugins/delete-files.py 2013-02-04 03:21:20 +0000
397@@ -8,6 +8,10 @@
398 #version:
399 #4.5.337 - version update
400
401+from __future__ import absolute_import, print_function, unicode_literals
402+
403+__metaclass__ = type
404+
405 import os
406 import sys
407 import logging
408
409=== modified file 'trunk/lib/corpusfg/plugins/detokenize-split-characters.py'
410--- trunk/lib/corpusfg/plugins/detokenize-split-characters.py 2013-01-01 15:15:07 +0000
411+++ trunk/lib/corpusfg/plugins/detokenize-split-characters.py 2013-02-04 03:21:20 +0000
412@@ -8,6 +8,10 @@
413 #version:
414 #4.5.337 - bugfix for UTF-8 in values that become folder names
415
416+from __future__ import absolute_import, print_function, unicode_literals
417+
418+__metaclass__ = type
419+
420 import os
421 import sys
422 import common as cf
423
424=== modified file 'trunk/lib/corpusfg/plugins/escape-spaces.py'
425--- trunk/lib/corpusfg/plugins/escape-spaces.py 2013-01-01 15:15:07 +0000
426+++ trunk/lib/corpusfg/plugins/escape-spaces.py 2013-02-04 03:21:20 +0000
427@@ -8,6 +8,10 @@
428 #version:
429 #4.5.337 - bugfix for UTF-8 in values that become folder names
430
431+from __future__ import absolute_import, print_function, unicode_literals
432+
433+__metaclass__ = type
434+
435 import os
436 import sys
437 import common as cf
438
439=== modified file 'trunk/lib/corpusfg/plugins/ja/convert-ansi2full.py'
440--- trunk/lib/corpusfg/plugins/ja/convert-ansi2full.py 2013-01-01 15:15:07 +0000
441+++ trunk/lib/corpusfg/plugins/ja/convert-ansi2full.py 2013-02-04 03:21:20 +0000
442@@ -8,6 +8,10 @@
443 #version:
444 #4.5.337 - bugfix for UTF-8 in values that become folder names
445
446+from __future__ import absolute_import, print_function, unicode_literals
447+
448+__metaclass__ = type
449+
450 import os
451 import sys
452 import common as cf
453
454=== modified file 'trunk/lib/corpusfg/plugins/ja/convert-full2ansi.py'
455--- trunk/lib/corpusfg/plugins/ja/convert-full2ansi.py 2013-01-01 15:15:07 +0000
456+++ trunk/lib/corpusfg/plugins/ja/convert-full2ansi.py 2013-02-04 03:21:20 +0000
457@@ -8,6 +8,10 @@
458 #version:
459 #4.5.337 - bugfix for UTF-8 in values that become folder names
460
461+from __future__ import absolute_import, print_function, unicode_literals
462+
463+__metaclass__ = type
464+
465 import os
466 import sys
467 import common as cf
468
469=== modified file 'trunk/lib/corpusfg/plugins/null-copyfile.py'
470--- trunk/lib/corpusfg/plugins/null-copyfile.py 2013-01-01 15:15:07 +0000
471+++ trunk/lib/corpusfg/plugins/null-copyfile.py 2013-02-04 03:21:20 +0000
472@@ -8,6 +8,10 @@
473 #version:
474 #4.5.337 - version update
475
476+from __future__ import absolute_import, print_function, unicode_literals
477+
478+__metaclass__ = type
479+
480 import os
481
482 import common as cf
483
484=== modified file 'trunk/lib/corpusfg/plugins/reader-file.py'
485--- trunk/lib/corpusfg/plugins/reader-file.py 2013-01-01 15:15:07 +0000
486+++ trunk/lib/corpusfg/plugins/reader-file.py 2013-02-04 03:21:20 +0000
487@@ -8,6 +8,10 @@
488 #version:
489 #4.5.337 - version update
490
491+from __future__ import absolute_import, print_function, unicode_literals
492+
493+__metaclass__ = type
494+
495 import sys
496 import os
497 import stat
498
499=== modified file 'trunk/lib/corpusfg/plugins/reader-gettext.py'
500--- trunk/lib/corpusfg/plugins/reader-gettext.py 2013-01-01 15:15:07 +0000
501+++ trunk/lib/corpusfg/plugins/reader-gettext.py 2013-02-04 03:21:20 +0000
502@@ -8,6 +8,10 @@
503 #version:
504 #4.5.337 - version update
505
506+from __future__ import absolute_import, print_function, unicode_literals
507+
508+__metaclass__ = type
509+
510 import sys
511 import os
512 import stat
513
514=== modified file 'trunk/lib/corpusfg/plugins/reader-null.py'
515--- trunk/lib/corpusfg/plugins/reader-null.py 2013-01-01 15:15:07 +0000
516+++ trunk/lib/corpusfg/plugins/reader-null.py 2013-02-04 03:21:20 +0000
517@@ -8,6 +8,10 @@
518 #version:
519 #4.5.337 - version update
520
521+from __future__ import absolute_import, print_function, unicode_literals
522+
523+__metaclass__ = type
524+
525 import sys
526 import os
527 import stat
528
529=== modified file 'trunk/lib/corpusfg/plugins/reader-tab.py'
530--- trunk/lib/corpusfg/plugins/reader-tab.py 2013-01-01 15:15:07 +0000
531+++ trunk/lib/corpusfg/plugins/reader-tab.py 2013-02-04 03:21:20 +0000
532@@ -8,6 +8,10 @@
533 #version:
534 #4.5.337 - version update
535
536+from __future__ import absolute_import, print_function, unicode_literals
537+
538+__metaclass__ = type
539+
540 import sys
541 import os
542 import stat
543
544=== modified file 'trunk/lib/corpusfg/plugins/reader-tmx.py'
545--- trunk/lib/corpusfg/plugins/reader-tmx.py 2013-01-01 15:15:07 +0000
546+++ trunk/lib/corpusfg/plugins/reader-tmx.py 2013-02-04 03:21:20 +0000
547@@ -8,6 +8,10 @@
548 #version:
549 #4.5.337 - version update
550
551+from __future__ import absolute_import, print_function, unicode_literals
552+
553+__metaclass__ = type
554+
555 import sys
556 import os
557 import stat
558
559=== modified file 'trunk/lib/corpusfg/plugins/remove-all.py'
560--- trunk/lib/corpusfg/plugins/remove-all.py 2013-01-01 15:15:07 +0000
561+++ trunk/lib/corpusfg/plugins/remove-all.py 2013-02-04 03:21:20 +0000
562@@ -8,6 +8,10 @@
563 #version:
564 #4.5.337 - bugfix for UTF-8 in values that become folder names
565
566+from __future__ import absolute_import, print_function, unicode_literals
567+
568+__metaclass__ = type
569+
570 import os
571 import sys
572 import common as cf
573
574=== modified file 'trunk/lib/corpusfg/plugins/remove-blanks-left-right.py'
575--- trunk/lib/corpusfg/plugins/remove-blanks-left-right.py 2013-01-01 15:15:07 +0000
576+++ trunk/lib/corpusfg/plugins/remove-blanks-left-right.py 2013-02-04 03:21:20 +0000
577@@ -8,6 +8,10 @@
578 #version:
579 #4.5.337 - bugfix for UTF-8 in values that become folder names
580
581+from __future__ import absolute_import, print_function, unicode_literals
582+
583+__metaclass__ = type
584+
585 import os
586 import sys
587 import common as cf
588
589=== modified file 'trunk/lib/corpusfg/plugins/remove-blanks-left.py'
590--- trunk/lib/corpusfg/plugins/remove-blanks-left.py 2013-01-01 15:15:07 +0000
591+++ trunk/lib/corpusfg/plugins/remove-blanks-left.py 2013-02-04 03:21:20 +0000
592@@ -8,6 +8,10 @@
593 #version:
594 #4.5.337 - bugfix for UTF-8 in values that become folder names
595
596+from __future__ import absolute_import, print_function, unicode_literals
597+
598+__metaclass__ = type
599+
600 import os
601 import sys
602 import common as cf
603
604=== modified file 'trunk/lib/corpusfg/plugins/remove-blanks-right.py'
605--- trunk/lib/corpusfg/plugins/remove-blanks-right.py 2013-01-01 15:15:07 +0000
606+++ trunk/lib/corpusfg/plugins/remove-blanks-right.py 2013-02-04 03:21:20 +0000
607@@ -8,6 +8,10 @@
608 #version:
609 #4.5.337 - bugfix for UTF-8 in values that become folder names
610
611+from __future__ import absolute_import, print_function, unicode_literals
612+
613+__metaclass__ = type
614+
615 import os
616 import sys
617 import common as cf
618
619=== modified file 'trunk/lib/corpusfg/plugins/remove-blanks.py'
620--- trunk/lib/corpusfg/plugins/remove-blanks.py 2013-01-01 15:15:07 +0000
621+++ trunk/lib/corpusfg/plugins/remove-blanks.py 2013-02-04 03:21:20 +0000
622@@ -8,6 +8,10 @@
623 #version:
624 #4.5.337 - bugfix for UTF-8 in values that become folder names
625
626+from __future__ import absolute_import, print_function, unicode_literals
627+
628+__metaclass__ = type
629+
630 import os
631 import sys
632 import common as cf
633
634=== modified file 'trunk/lib/corpusfg/plugins/remove-html-tags.py'
635--- trunk/lib/corpusfg/plugins/remove-html-tags.py 2013-01-01 15:15:07 +0000
636+++ trunk/lib/corpusfg/plugins/remove-html-tags.py 2013-02-04 03:21:20 +0000
637@@ -8,6 +8,10 @@
638 #version:
639 #4.5.337 - bugfix for UTF-8 in values that become folder names
640
641+from __future__ import absolute_import, print_function, unicode_literals
642+
643+__metaclass__ = type
644+
645 import os
646 import sys
647 import re
648
649=== modified file 'trunk/lib/corpusfg/plugins/remove-irrelevant-left.py'
650--- trunk/lib/corpusfg/plugins/remove-irrelevant-left.py 2013-01-01 15:15:07 +0000
651+++ trunk/lib/corpusfg/plugins/remove-irrelevant-left.py 2013-02-04 03:21:20 +0000
652@@ -8,6 +8,10 @@
653 #version:
654 #4.5.337 - bugfix for UTF-8 in values that become folder names
655
656+from __future__ import absolute_import, print_function, unicode_literals
657+
658+__metaclass__ = type
659+
660 import os
661 import sys
662 import string
663
664=== modified file 'trunk/lib/corpusfg/plugins/remove-irrelevant-right.py'
665--- trunk/lib/corpusfg/plugins/remove-irrelevant-right.py 2013-01-01 15:15:07 +0000
666+++ trunk/lib/corpusfg/plugins/remove-irrelevant-right.py 2013-02-04 03:21:20 +0000
667@@ -8,6 +8,10 @@
668 #version:
669 #4.5.337 - bugfix for UTF-8 in values that become folder names
670
671+from __future__ import absolute_import, print_function, unicode_literals
672+
673+__metaclass__ = type
674+
675 import os
676 import sys
677 import string
678
679=== modified file 'trunk/lib/corpusfg/plugins/remove-irrelevant.py'
680--- trunk/lib/corpusfg/plugins/remove-irrelevant.py 2013-01-01 15:15:07 +0000
681+++ trunk/lib/corpusfg/plugins/remove-irrelevant.py 2013-02-04 03:21:20 +0000
682@@ -8,6 +8,10 @@
683 #version:
684 #4.5.337 - bugfix for UTF-8 in values that become folder names
685
686+from __future__ import absolute_import, print_function, unicode_literals
687+
688+__metaclass__ = type
689+
690 import os
691 import sys
692 import string
693
694=== modified file 'trunk/lib/corpusfg/plugins/remove-multi-blanks.py'
695--- trunk/lib/corpusfg/plugins/remove-multi-blanks.py 2013-01-01 15:15:07 +0000
696+++ trunk/lib/corpusfg/plugins/remove-multi-blanks.py 2013-02-04 03:21:20 +0000
697@@ -8,6 +8,10 @@
698 #version:
699 #4.5.337 - bugfix for UTF-8 in values that become folder names
700
701+from __future__ import absolute_import, print_function, unicode_literals
702+
703+__metaclass__ = type
704+
705 import os
706 import sys
707 import common as cf
708
709=== modified file 'trunk/lib/corpusfg/plugins/remove-multi-spaces.py'
710--- trunk/lib/corpusfg/plugins/remove-multi-spaces.py 2013-01-01 15:15:07 +0000
711+++ trunk/lib/corpusfg/plugins/remove-multi-spaces.py 2013-02-04 03:21:20 +0000
712@@ -8,6 +8,10 @@
713 #version:
714 #4.5.337 - bugfix for UTF-8 in values that become folder names
715
716+from __future__ import absolute_import, print_function, unicode_literals
717+
718+__metaclass__ = type
719+
720 import os
721 import sys
722 import re
723
724=== modified file 'trunk/lib/corpusfg/plugins/remove-paragraph-tags.py'
725--- trunk/lib/corpusfg/plugins/remove-paragraph-tags.py 2013-01-01 15:15:07 +0000
726+++ trunk/lib/corpusfg/plugins/remove-paragraph-tags.py 2013-02-04 03:21:20 +0000
727@@ -8,6 +8,10 @@
728 #version:
729 #4.5.337 - bugfix for UTF-8 in values that become folder names
730
731+from __future__ import absolute_import, print_function, unicode_literals
732+
733+__metaclass__ = type
734+
735 import os
736 import sys
737 import re
738
739=== modified file 'trunk/lib/corpusfg/plugins/remove-spaces-left-right.py'
740--- trunk/lib/corpusfg/plugins/remove-spaces-left-right.py 2013-01-01 15:15:07 +0000
741+++ trunk/lib/corpusfg/plugins/remove-spaces-left-right.py 2013-02-04 03:21:20 +0000
742@@ -8,6 +8,11 @@
743 #version:
744 #4.5.337 - bugfix for UTF-8 in values that become folder names
745
746+from __future__ import absolute_import, print_function, unicode_literals
747+
748+__metaclass__ = type
749+
750+
751 import os
752 import sys
753 import common as cf
754
755=== modified file 'trunk/lib/corpusfg/plugins/remove-spaces-left.py'
756--- trunk/lib/corpusfg/plugins/remove-spaces-left.py 2013-01-01 15:15:07 +0000
757+++ trunk/lib/corpusfg/plugins/remove-spaces-left.py 2013-02-04 03:21:20 +0000
758@@ -8,6 +8,10 @@
759 #version:
760 #4.5.337 - bugfix for UTF-8 in values that become folder names
761
762+from __future__ import absolute_import, print_function, unicode_literals
763+
764+__metaclass__ = type
765+
766 import os
767 import sys
768 import common as cf
769
770=== modified file 'trunk/lib/corpusfg/plugins/remove-spaces-right.py'
771--- trunk/lib/corpusfg/plugins/remove-spaces-right.py 2013-01-01 15:15:07 +0000
772+++ trunk/lib/corpusfg/plugins/remove-spaces-right.py 2013-02-04 03:21:20 +0000
773@@ -8,6 +8,10 @@
774 #version:
775 #4.5.337 - bugfix for UTF-8 in values that become folder names
776
777+from __future__ import absolute_import, print_function, unicode_literals
778+
779+__metaclass__ = type
780+
781 import os
782 import sys
783 import common as cf
784
785=== modified file 'trunk/lib/corpusfg/plugins/remove-spaces.py'
786--- trunk/lib/corpusfg/plugins/remove-spaces.py 2013-01-01 15:15:07 +0000
787+++ trunk/lib/corpusfg/plugins/remove-spaces.py 2013-02-04 03:21:20 +0000
788@@ -8,6 +8,10 @@
789 #version:
790 #4.5.337 - bugfix for UTF-8 in values that become folder names
791
792+from __future__ import absolute_import, print_function, unicode_literals
793+
794+__metaclass__ = type
795+
796 import os
797 import sys
798 import re
799
800=== modified file 'trunk/lib/corpusfg/plugins/repair-escapes.py'
801--- trunk/lib/corpusfg/plugins/repair-escapes.py 2013-01-01 15:15:07 +0000
802+++ trunk/lib/corpusfg/plugins/repair-escapes.py 2013-02-04 03:21:20 +0000
803@@ -8,6 +8,9 @@
804 #version:
805 #4.5.337 - bugfix for UTF-8 in values that become folder names
806
807+from __future__ import absolute_import, print_function, unicode_literals
808+
809+__metaclass__ = type
810
811 import os
812 import sys
813
814=== modified file 'trunk/lib/corpusfg/plugins/replace-by-list.py'
815--- trunk/lib/corpusfg/plugins/replace-by-list.py 2013-01-01 15:15:07 +0000
816+++ trunk/lib/corpusfg/plugins/replace-by-list.py 2013-02-04 03:21:20 +0000
817@@ -8,6 +8,10 @@
818 #version:
819 #4.5.337 - bugfix for UTF-8 in values that become folder names
820
821+from __future__ import absolute_import, print_function, unicode_literals
822+
823+__metaclass__ = type
824+
825 import os
826 import sys
827 import common as cf
828
829=== modified file 'trunk/lib/corpusfg/plugins/replace-regex.py'
830--- trunk/lib/corpusfg/plugins/replace-regex.py 2013-01-01 15:15:07 +0000
831+++ trunk/lib/corpusfg/plugins/replace-regex.py 2013-02-04 03:21:20 +0000
832@@ -8,6 +8,10 @@
833 #version:
834 #4.5.337 - bugfix for UTF-8 in values that become folder names
835
836+from __future__ import absolute_import, print_function, unicode_literals
837+
838+__metaclass__ = type
839+
840 import os
841 import sys
842 import re
843
844=== modified file 'trunk/lib/corpusfg/plugins/special-join.py'
845--- trunk/lib/corpusfg/plugins/special-join.py 2013-01-01 15:15:07 +0000
846+++ trunk/lib/corpusfg/plugins/special-join.py 2013-02-04 03:21:20 +0000
847@@ -8,6 +8,10 @@
848 #version:
849 #4.5.337 - version update
850
851+from __future__ import absolute_import, print_function, unicode_literals
852+
853+__metaclass__ = type
854+
855 from copy import deepcopy
856 import common as cf
857
858
859=== modified file 'trunk/lib/corpusfg/plugins/special-secondary-output.py'
860--- trunk/lib/corpusfg/plugins/special-secondary-output.py 2013-01-01 15:15:07 +0000
861+++ trunk/lib/corpusfg/plugins/special-secondary-output.py 2013-02-04 03:21:20 +0000
862@@ -8,6 +8,10 @@
863 #version:
864 #4.5.337 - version update
865
866+from __future__ import absolute_import, print_function, unicode_literals
867+
868+__metaclass__ = type
869+
870 import codecs
871 import common as cf
872
873
874=== modified file 'trunk/lib/corpusfg/plugins/special-split.py'
875--- trunk/lib/corpusfg/plugins/special-split.py 2013-01-01 15:15:07 +0000
876+++ trunk/lib/corpusfg/plugins/special-split.py 2013-02-04 03:21:20 +0000
877@@ -8,6 +8,10 @@
878 #version:
879 #4.5.337 - version update
880
881+from __future__ import absolute_import, print_function, unicode_literals
882+
883+__metaclass__ = type
884+
885 from copy import deepcopy
886 import common as cf
887
888
889=== modified file 'trunk/lib/corpusfg/plugins/split-sentences.py'
890--- trunk/lib/corpusfg/plugins/split-sentences.py 2013-01-01 15:15:07 +0000
891+++ trunk/lib/corpusfg/plugins/split-sentences.py 2013-02-04 03:21:20 +0000
892@@ -8,6 +8,10 @@
893 #version:
894 #4.5.337 - bugfix for UTF-8 in values that become folder names
895
896+from __future__ import absolute_import, print_function, unicode_literals
897+
898+__metaclass__ = type
899+
900 import os
901 import sys
902 import common as cf
903
904=== modified file 'trunk/lib/corpusfg/plugins/subprocess-synch.py'
905--- trunk/lib/corpusfg/plugins/subprocess-synch.py 2013-01-01 15:15:07 +0000
906+++ trunk/lib/corpusfg/plugins/subprocess-synch.py 2013-02-04 03:21:20 +0000
907@@ -8,6 +8,10 @@
908 #version:
909 #4.5.337 - bugfix for UTF-8 in values that become folder names
910
911+from __future__ import absolute_import, print_function, unicode_literals
912+
913+__metaclass__ = type
914+
915 import os
916 import sys
917 import subprocess
918
919=== modified file 'trunk/lib/corpusfg/plugins/tokenize-split-characters.py'
920--- trunk/lib/corpusfg/plugins/tokenize-split-characters.py 2013-01-01 15:15:07 +0000
921+++ trunk/lib/corpusfg/plugins/tokenize-split-characters.py 2013-02-04 03:21:20 +0000
922@@ -8,6 +8,10 @@
923 #version:
924 #4.5.337 - bugfix for UTF-8 in values that become folder names
925
926+from __future__ import absolute_import, print_function, unicode_literals
927+
928+__metaclass__ = type
929+
930 import os
931 import sys
932 import common as cf
933
934=== modified file 'trunk/lib/corpusfg/plugins/unescape-spaces.py'
935--- trunk/lib/corpusfg/plugins/unescape-spaces.py 2013-01-01 15:15:07 +0000
936+++ trunk/lib/corpusfg/plugins/unescape-spaces.py 2013-02-04 03:21:20 +0000
937@@ -8,6 +8,10 @@
938 #version:
939 #4.5.337 - bugfix for UTF-8 in values that become folder names
940
941+from __future__ import absolute_import, print_function, unicode_literals
942+
943+__metaclass__ = type
944+
945 import os
946 import sys
947 import common as cf
948
949=== modified file 'trunk/lib/corpusfg/plugins/unicode-decode-entities.py'
950--- trunk/lib/corpusfg/plugins/unicode-decode-entities.py 2013-01-01 15:15:07 +0000
951+++ trunk/lib/corpusfg/plugins/unicode-decode-entities.py 2013-02-04 03:21:20 +0000
952@@ -8,6 +8,10 @@
953 #version:
954 #4.5.337 - bugfix for UTF-8 in values that become folder names
955
956+from __future__ import absolute_import, print_function, unicode_literals
957+
958+__metaclass__ = type
959+
960 import os
961 import sys
962 import re
963
964=== modified file 'trunk/lib/corpusfg/plugins/unicode-normalize.py'
965--- trunk/lib/corpusfg/plugins/unicode-normalize.py 2013-01-01 15:15:07 +0000
966+++ trunk/lib/corpusfg/plugins/unicode-normalize.py 2013-02-04 03:21:20 +0000
967@@ -8,6 +8,10 @@
968 #version:
969 #4.5.337 - bugfix for UTF-8 in values that become folder names
970
971+from __future__ import absolute_import, print_function, unicode_literals
972+
973+__metaclass__ = type
974+
975 import os
976 import sys
977 import unicodedata
978
979=== modified file 'trunk/lib/corpusfg/plugins/writer-file.py'
980--- trunk/lib/corpusfg/plugins/writer-file.py 2013-01-01 15:15:07 +0000
981+++ trunk/lib/corpusfg/plugins/writer-file.py 2013-02-04 03:21:20 +0000
982@@ -8,6 +8,10 @@
983 #version:
984 #4.5.337 - version update
985
986+from __future__ import absolute_import, print_function, unicode_literals
987+
988+__metaclass__ = type
989+
990 import sys
991 import os
992 import shutil
993
994=== modified file 'trunk/lib/corpusfg/plugins/writer-null.py'
995--- trunk/lib/corpusfg/plugins/writer-null.py 2013-01-01 15:15:07 +0000
996+++ trunk/lib/corpusfg/plugins/writer-null.py 2013-02-04 03:21:20 +0000
997@@ -8,6 +8,10 @@
998 #version:
999 #4.5.337 - version update
1000
1001+from __future__ import absolute_import, print_function, unicode_literals
1002+
1003+__metaclass__ = type
1004+
1005 import sys
1006 import os
1007 import shutil
1008
1009=== modified file 'trunk/lib/corpusfg/plugins/writer-tab.py'
1010--- trunk/lib/corpusfg/plugins/writer-tab.py 2013-01-01 15:15:07 +0000
1011+++ trunk/lib/corpusfg/plugins/writer-tab.py 2013-02-04 03:21:20 +0000
1012@@ -8,6 +8,10 @@
1013 #version:
1014 #4.5.337 - version update
1015
1016+from __future__ import absolute_import, print_function, unicode_literals
1017+
1018+__metaclass__ = type
1019+
1020 import sys
1021 import os
1022 import shutil
1023
1024=== modified file 'trunk/lib/corpusfg/plugins/writer-tmx.py'
1025--- trunk/lib/corpusfg/plugins/writer-tmx.py 2013-01-01 15:15:07 +0000
1026+++ trunk/lib/corpusfg/plugins/writer-tmx.py 2013-02-04 03:21:20 +0000
1027@@ -8,6 +8,10 @@
1028 #version:
1029 #4.5.337 - version update
1030
1031+from __future__ import absolute_import, print_function, unicode_literals
1032+
1033+__metaclass__ = type
1034+
1035 import sys
1036 import os
1037 import shutil
1038
1039=== modified file 'trunk/lib/corpusfg/plugins/zh_cn/convert-zh2traditional.py'
1040--- trunk/lib/corpusfg/plugins/zh_cn/convert-zh2traditional.py 2013-01-01 15:15:07 +0000
1041+++ trunk/lib/corpusfg/plugins/zh_cn/convert-zh2traditional.py 2013-02-04 03:21:20 +0000
1042@@ -8,6 +8,10 @@
1043 #version:
1044 #4.5.337 - bugfix for UTF-8 in values that become folder names
1045
1046+from __future__ import absolute_import, print_function, unicode_literals
1047+
1048+__metaclass__ = type
1049+
1050 import os
1051 import sys
1052 import common as cf
1053
1054=== modified file 'trunk/lib/corpusfg/plugins/zh_hk/convert-zh2simplified.py'
1055--- trunk/lib/corpusfg/plugins/zh_hk/convert-zh2simplified.py 2013-01-01 15:15:07 +0000
1056+++ trunk/lib/corpusfg/plugins/zh_hk/convert-zh2simplified.py 2013-02-04 03:21:20 +0000
1057@@ -8,6 +8,10 @@
1058 #version:
1059 #4.5.337 - bugfix for UTF-8 in values that become folder names
1060
1061+from __future__ import absolute_import, print_function, unicode_literals
1062+
1063+__metaclass__ = type
1064+
1065 import os
1066 import sys
1067 import common as cf
1068
1069=== modified file 'trunk/lib/corpusfg/progress_bar.py'
1070--- trunk/lib/corpusfg/progress_bar.py 2013-01-01 15:15:07 +0000
1071+++ trunk/lib/corpusfg/progress_bar.py 2013-02-04 03:21:20 +0000
1072@@ -25,6 +25,10 @@
1073 # Precision Translation Tools downloaded from: http://www.5dollarwhitebox.org/drupal/node/65
1074 # (moved ProgressBar._init_() to ProgressBar.reset() for reuse.)
1075
1076+from __future__ import absolute_import, print_function, unicode_literals
1077+
1078+__metaclass__ = type
1079+
1080 ''' Modifications for Corpus Filtergraph v4.5
1081 Copyright © 2010-2013 Precision Translation Tools Co., Ltd.
1082
1083@@ -126,29 +130,29 @@
1084 print
1085 limit = 1000000
1086
1087- print 'Example 1: Fixed Bar'
1088+ print('Example 1: Fixed Bar')
1089 prog = ProgressBar(0, limit, 75, mode='fixed')
1090 oldprog = str(prog)
1091 for i in xrange(limit+1):
1092 prog.update_amount(i)
1093 if oldprog != str(prog):
1094- print prog, '\r',
1095+ print(prog, end='\r')
1096 sys.stdout.flush()
1097 oldprog=str(prog)
1098
1099- print '\n\n'
1100+ print('\n\n')
1101
1102- print 'Example 2: Dynamic Bar'
1103+ print('Example 2: Dynamic Bar')
1104 prog = ProgressBar(0, limit, 75, mode='dynamic', char='-')
1105 oldprog = str(prog)
1106 for i in xrange(limit+1):
1107 prog.increment_amount()
1108 if oldprog != str(prog):
1109- print prog, '\r',
1110+ print(prog, end='\r')
1111 sys.stdout.flush()
1112 oldprog=str(prog)
1113
1114- print '\n\n'
1115+ print('\n\n')
1116
1117 if __name__ == '__main__':
1118 main()
1119@@ -167,7 +171,7 @@
1120 while count <= total:
1121 count += 1
1122 prog.increment_amount()
1123- print prog, '\r',
1124+ print(prog, end='\r')
1125 sys.stdout.flush()
1126-print
1127+print()
1128 '''
1129
1130=== modified file 'trunk/lib/corpusfg/pstat.py'
1131--- trunk/lib/corpusfg/pstat.py 2012-05-02 15:46:23 +0000
1132+++ trunk/lib/corpusfg/pstat.py 2013-02-04 03:21:20 +0000
1133@@ -24,6 +24,11 @@
1134 # Comments and/or additions are welcome (send e-mail to:
1135 # strang@nmr.mgh.harvard.edu).
1136 #
1137+
1138+from __future__ import absolute_import, print_function, unicode_literals
1139+
1140+__metaclass__ = type
1141+
1142 '''
1143 pstat.py module
1144
1145
1146=== modified file 'trunk/lib/corpusfg/stats.py'
1147--- trunk/lib/corpusfg/stats.py 2012-05-02 15:46:23 +0000
1148+++ trunk/lib/corpusfg/stats.py 2013-02-04 03:21:20 +0000
1149@@ -24,6 +24,11 @@
1150 # Comments and/or additions are welcome (send e-mail to:
1151 # strang@nmr.mgh.harvard.edu).
1152 #
1153+
1154+from __future__ import absolute_import, print_function, unicode_literals
1155+
1156+__metaclass__ = type
1157+
1158 '''
1159 stats.py module
1160
1161
1162=== modified file 'trunk/lib/corpusfg/unicode_block.py'
1163--- trunk/lib/corpusfg/unicode_block.py 2012-05-02 15:46:23 +0000
1164+++ trunk/lib/corpusfg/unicode_block.py 2013-02-04 03:21:20 +0000
1165@@ -1,6 +1,11 @@
1166 #! /usr/bin/env python
1167 # -*- coding: utf8 -*-
1168
1169+from __future__ import absolute_import, print_function, unicode_literals
1170+
1171+__metaclass__ = type
1172+
1173+
1174 def block(ch):
1175 '''Return the Unicode block name for ch, or 'No Block' if ch has no block.'''
1176 if type(ch) == type(''): ch = unicode(ch)

Subscribers

People subscribed via source and target branches

to all changes: