Some cleanup.

Also trying to make it usuable from other tools (imports become a bit tricky here :/ ).
This commit is contained in:
Bastien Montagne 2012-07-08 09:27:33 +00:00
parent b91bc4f037
commit d96275a5c3
3 changed files with 4 additions and 10 deletions

@ -25,8 +25,7 @@
import os import os
# XXX Relative import does not work here when used from Blender... # XXX Relative import does not work here when used from Blender...
#from . import settings from bl_i18n_utils import settings
import bl_i18n_utils.settings as settings
#classes = set() #classes = set()

@ -26,7 +26,6 @@ import subprocess
import os import os
import sys import sys
import re import re
#from codecs import open
import tempfile import tempfile
import argparse import argparse
import time import time
@ -40,14 +39,11 @@ COMMENT_PREFIX = settings.COMMENT_PREFIX
COMMENT_PREFIX_SOURCE = settings.COMMENT_PREFIX_SOURCE COMMENT_PREFIX_SOURCE = settings.COMMENT_PREFIX_SOURCE
CONTEXT_PREFIX = settings.CONTEXT_PREFIX CONTEXT_PREFIX = settings.CONTEXT_PREFIX
FILE_NAME_MESSAGES = settings.FILE_NAME_MESSAGES FILE_NAME_MESSAGES = settings.FILE_NAME_MESSAGES
#FILE_NAME_POTFILES = settings.FILE_NAME_POTFILES
FILE_NAME_POT = settings.FILE_NAME_POT FILE_NAME_POT = settings.FILE_NAME_POT
SOURCE_DIR = settings.SOURCE_DIR SOURCE_DIR = settings.SOURCE_DIR
POTFILES_DIR = settings.POTFILES_SOURCE_DIR POTFILES_DIR = settings.POTFILES_SOURCE_DIR
SRC_POTFILES = settings.FILE_NAME_SRC_POTFILES SRC_POTFILES = settings.FILE_NAME_SRC_POTFILES
#GETTEXT_XGETTEXT_EXECUTABLE = settings.GETTEXT_XGETTEXT_EXECUTABLE
#GETTEXT_KEYWORDS = settings.GETTEXT_KEYWORDS
CONTEXT_DEFAULT = settings.CONTEXT_DEFAULT CONTEXT_DEFAULT = settings.CONTEXT_DEFAULT
PYGETTEXT_ALLOWED_EXTS = settings.PYGETTEXT_ALLOWED_EXTS PYGETTEXT_ALLOWED_EXTS = settings.PYGETTEXT_ALLOWED_EXTS

@ -23,9 +23,8 @@
import os import os
import sys import sys
import collections import collections
from codecs import open
import settings from bl_i18n_utils import settings
COMMENT_PREFIX = settings.COMMENT_PREFIX COMMENT_PREFIX = settings.COMMENT_PREFIX
@ -145,7 +144,7 @@ def parse_messages(fname):
clean_vars() clean_vars()
with open(fname, 'r', "utf-8") as f: with open(fname, 'r', encoding="utf-8") as f:
for line_nr, line in enumerate(f): for line_nr, line in enumerate(f):
line = stripeol(line) line = stripeol(line)
if line == "": if line == "":
@ -248,7 +247,7 @@ def write_messages(fname, messages, commented, fuzzy):
"returned values). commented and fuzzy are two sets containing msgid. " \ "returned values). commented and fuzzy are two sets containing msgid. " \
"Returns the number of written messages." "Returns the number of written messages."
num = 0 num = 0
with open(fname, 'w', "utf-8") as f: with open(fname, 'w', encoding="utf-8") as f:
for msgkey, val in messages.items(): for msgkey, val in messages.items():
msgctxt, msgid = msgkey msgctxt, msgid = msgkey
f.write("\n".join(val["comment_lines"])) f.write("\n".join(val["comment_lines"]))