mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-06 12:37:34 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
31 lines
858 B
Diff
31 lines
858 B
Diff
From 93f4fe97f664c207e769186fe79961bf5a998447 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Wack <wackou@gmail.com>
|
|
Date: Thu, 25 Apr 2013 16:05:05 +0200
|
|
Subject: [PATCH] Fixed some unicode issues when reading files from disk
|
|
|
|
---
|
|
guessit/fileutils.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/guessit/fileutils.py b/guessit/fileutils.py
|
|
index 2fca6b7..dc077e6 100644
|
|
--- a/guessit/fileutils.py
|
|
+++ b/guessit/fileutils.py
|
|
@@ -22,6 +22,7 @@
|
|
from guessit import s, u
|
|
import os.path
|
|
import zipfile
|
|
+import io
|
|
|
|
|
|
def split_path(path):
|
|
@@ -84,4 +85,4 @@ def load_file_in_same_dir(ref_file, filename):
|
|
zfile = zipfile.ZipFile(zfilename)
|
|
return zfile.read('/'.join(path[i + 1:]))
|
|
|
|
- return u(open(os.path.join(*path)).read())
|
|
+ return u(io.open(os.path.join(*path), encoding='utf-8').read())
|
|
--
|
|
1.8.1.6
|
|
|