mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-10 01:47:29 -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
22 lines
460 B
Diff
22 lines
460 B
Diff
--- requests-2.2.0/requests/compat.py
|
|
+++ requests-2.2.0/requests/compat.py
|
|
@@ -4,7 +4,7 @@
|
|
pythoncompat
|
|
"""
|
|
|
|
-from .packages import chardet
|
|
+import chardet
|
|
|
|
import sys
|
|
|
|
--- requests-2.2.0/setup.py
|
|
+++ requests-2.2.0/setup.py
|
|
@@ -17,7 +17,6 @@
|
|
packages = [
|
|
'requests',
|
|
'requests.packages',
|
|
- 'requests.packages.chardet',
|
|
'requests.packages.urllib3',
|
|
'requests.packages.urllib3.packages',
|
|
'requests.packages.urllib3.contrib',
|