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
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
diff -ur IMAPClient-0.12.orig/imapclient/test/test_imapclient.py IMAPClient-0.12/imapclient/test/test_imapclient.py
|
|
--- imapclient/test/test_imapclient.py 2015-01-12 19:36:18.000000000 +0800
|
|
+++ imapclient/test/test_imapclient.py 2015-01-17 08:42:46.669121934 +0800
|
|
@@ -10,7 +10,7 @@
|
|
from datetime import datetime
|
|
from mock import patch, sentinel, Mock
|
|
|
|
-from imapclient import six
|
|
+import six
|
|
from imapclient.fixed_offset import FixedOffset
|
|
from .testable_imapclient import TestableIMAPClient as IMAPClient
|
|
from .imapclient_test import IMAPClientTest
|
|
diff -ur IMAPClient-0.12.orig/imapclient/test/test_imap_utf7.py IMAPClient-0.12/imapclient/test/test_imap_utf7.py
|
|
--- imapclient/test/test_imap_utf7.py 2015-01-12 19:36:18.000000000 +0800
|
|
+++ imapclient/test/test_imap_utf7.py 2015-01-17 08:43:23.893392410 +0800
|
|
@@ -4,7 +4,7 @@
|
|
|
|
from __future__ import unicode_literals
|
|
|
|
-from imapclient.six import text_type, binary_type, int2byte, unichr
|
|
+from six import text_type, binary_type, int2byte, unichr
|
|
from imapclient.imap_utf7 import decode, encode
|
|
from imapclient.test.util import unittest
|
|
|
|
diff -ur IMAPClient-0.12.orig/imapclient/test/test_response_lexer.py IMAPClient-0.12/imapclient/test/test_response_lexer.py
|
|
--- imapclient/test/test_response_lexer.py 2015-01-12 19:36:18.000000000 +0800
|
|
+++ imapclient/test/test_response_lexer.py 2015-01-17 08:42:14.749747748 +0800
|
|
@@ -5,7 +5,7 @@
|
|
from __future__ import unicode_literals
|
|
|
|
from imapclient.response_lexer import TokenSource
|
|
-from imapclient.six import next
|
|
+from six import next
|
|
from imapclient.test.util import unittest
|
|
|
|
|