From owner-svn-ports-all@FreeBSD.ORG Mon Nov 5 21:39:58 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 251E4A73; Mon, 5 Nov 2012 21:39:58 +0000 (UTC) (envelope-from duchateau.olivier@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id AA4798FC16; Mon, 5 Nov 2012 21:39:57 +0000 (UTC) Received: by mail-ob0-f182.google.com with SMTP id wc20so7789576obb.13 for ; Mon, 05 Nov 2012 13:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=xvjUKjJJAlAyNWOHHi4V8zsMXcYqaUlQpRD06bxr+bs=; b=VSBk6LtE7QHPh+j3AA9OTB8buIwLCUlJ0ia0WckLgBqIscWj4geHRsUD5i8LeYqQJR RS6NaL8aoezukzPzzZTkjJEwe5EPnBfM70Jfn0hat7BoiKBl1hp9ebq9Hi6nfs9Sfn+1 o5hoF84wgYmeEE/WFIgjsT6gkh2l2jJflF+uuRuI9hJQTMPuymr6a9CwVRviWDFRpX0p uDeSIX5swAOYAHr4pS2jCDdtCBOEt7sEz0NoE7TrZIPv4SZ49GtqPrCpo5+ezdu3DTyK 7R6RRU2iLT6ZZk1V5lNfojsU+L6yJUAbzhOvg5SURe+StZu7i71q0TiRbLoqJ8kfWzDS 7vqg== MIME-Version: 1.0 Received: by 10.60.171.80 with SMTP id as16mr8781949oec.49.1352151596758; Mon, 05 Nov 2012 13:39:56 -0800 (PST) Received: by 10.76.22.196 with HTTP; Mon, 5 Nov 2012 13:39:56 -0800 (PST) In-Reply-To: <201211052114.qA5LEsRg087131@svn.freebsd.org> References: <201211052114.qA5LEsRg087131@svn.freebsd.org> Date: Mon, 5 Nov 2012 21:39:56 +0000 Message-ID: Subject: Re: svn commit: r307031 - head/Tools/scripts From: Olivier Duchateau To: Sofian Brabez Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2012 21:39:58 -0000 2012/11/5 Sofian Brabez : > Author: sbz > Date: Mon Nov 5 21:14:54 2012 > New Revision: 307031 > URL: http://svnweb.freebsd.org/changeset/ports/307031 > > Log: > - Fix runtime utf-8 problems using codec encoder and system locale > > PR: ports/173195 > Submitted by: rm > Reviewed by: sbz (myself) > Feature safe: yes > > Modified: > head/Tools/scripts/getpatch > > Modified: head/Tools/scripts/getpatch > ============================================================================== > --- head/Tools/scripts/getpatch Mon Nov 5 20:10:03 2012 (r307030) > +++ head/Tools/scripts/getpatch Mon Nov 5 21:14:54 2012 (r307031) > @@ -29,6 +29,8 @@ > # MAINTAINER= sbz@FreeBSD.org > > import argparse > +import codecs > +import locale > import re > import sys > if sys.version_info.major == 3: > @@ -49,6 +51,7 @@ class GetPatch(object): > self.url = str() > self.patch = str() > self.output_stdout = False > + self.default_locale = locale.getdefaultlocale()[1].lower() > > def fetch(self, *largs, **kwargs): > raise NotImplementedError() > @@ -56,8 +59,8 @@ class GetPatch(object): > def write(self, filename, data): > if filename.endswith(('.patch', '.txt')): > filename = filename[:filename.rindex('.')]+'.diff' > - f=open(filename, 'w') > - f.write(data.decode()) > + f=codecs.open(filename, encoding=self.default_locale, mode='w') > + f.write(data.decode(self.default_locale)) > f.close() > self.out("[+] %s created" % filename) > > @@ -79,7 +82,7 @@ class GetPatch(object): > data = urllib2.urlopen(url).read() > > if self.output_stdout: > - sys.stdout.write(data.decode()) > + sys.stdout.write(data.decode(self.default_locale)) > else: > self.write(p, data) > Why not use sys.getfilesystemencoding() ? -- olivier