Fixed import

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.0.17 (2019-02-01)
+===================
+ * Fixed import
+
+
 0.0.16 (2019-01-17)
 ===================
  * Fixed import

transtool/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.0.16'
+__version__ = '0.0.17'
 
 default_app_config = 'transtool.apps.TrantoolConfig'

transtool/tools.py

@@ -3,6 +3,7 @@
 import os
 import re
 import polib
+from django.utils.encoding import force_str
 from django.utils import timezone
 
 
@@ -27,16 +28,12 @@ def get_lc_files_list(search_root, exts=('.po', '.mo')):
 def get_diff_po(po1_fn, po2_fn):
  po1_lines = []
  po2_lines = []
- for entry in sorted(polib.pofile(po1_fn), key=lambda obj: obj.msgid):
- po1_lines.append((
- u'msgid {}\n\n'
- u'msgstr {}\n\n'
- ).format(entry.msgid, entry.msgstr))
- for entry in sorted(polib.pofile(po2_fn), key=lambda obj: obj.msgid):
- po2_lines.append((
- u'msgid {}\n\n'
- u'msgstr {}\n\n'
- ).format(entry.msgid, entry.msgstr))
+ for entry in sorted(polib.pofile(po1_fn, wrapwidth=8000), key=lambda obj: obj.msgid):
+ entry.occurrences.clear()
+ po1_lines.append(force_str(entry))
+ for entry in sorted(polib.pofile(po2_fn, wrapwidth=8000), key=lambda obj: obj.msgid):
+ entry.occurrences.clear()
+ po2_lines.append(force_str(entry))
  added = removed = 0
  for diff_line in difflib.unified_diff(po1_lines, po2_lines):
  if diff_line.startswith('+++ ') or diff_line.startswith('--- ') or diff_line.startswith('@@ '):