mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-03 23:47:28 -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
65 lines
1.5 KiB
Diff
65 lines
1.5 KiB
Diff
--- a/paste/debug/fsdiff.py
|
|
+++ b/paste/debug/fsdiff.py
|
|
@@ -12,10 +12,14 @@
|
|
import os
|
|
from fnmatch import fnmatch
|
|
from datetime import datetime
|
|
+
|
|
try:
|
|
- from UserDict import IterableUserDict
|
|
+ import collections.UserDict as IterableUserDict
|
|
except ImportError:
|
|
- from paste.util.UserDict24 import IterableUserDict
|
|
+ try:
|
|
+ from UserDict import IterableUserDict
|
|
+ except ImportError:
|
|
+ from paste.util.UserDict24 import IterableUserDict
|
|
import operator
|
|
import re
|
|
|
|
--- a/paste/request.py
|
|
+++ b/paste/request.py
|
|
@@ -22,10 +22,12 @@
|
|
from StringIO import StringIO
|
|
import urlparse
|
|
import urllib
|
|
+
|
|
try:
|
|
from UserDict import DictMixin
|
|
except ImportError:
|
|
- from paste.util.UserDict24 import DictMixin
|
|
+ from collections import MutableMapping as DictMixin
|
|
+
|
|
from paste.util.multidict import MultiDict
|
|
|
|
__all__ = ['get_cookies', 'get_cookie_dict', 'parse_querystring',
|
|
--- a/paste/urlmap.py
|
|
+++ b/paste/urlmap.py
|
|
@@ -4,7 +4,10 @@
|
|
Map URL prefixes to WSGI applications. See ``URLMap``
|
|
"""
|
|
|
|
-from UserDict import DictMixin
|
|
+try:
|
|
+ from UserDict import DictMixin
|
|
+except ImportError:
|
|
+ from collections import MutableMapping as DictMixin
|
|
import re
|
|
import os
|
|
import cgi
|
|
--- a/paste/util/multidict.py
|
|
+++ b/paste/util/multidict.py
|
|
@@ -3,7 +3,11 @@
|
|
import cgi
|
|
import copy
|
|
import sys
|
|
-from UserDict import DictMixin
|
|
+
|
|
+try:
|
|
+ from UserDict import DictMixin
|
|
+except ImportError:
|
|
+ from collections import MutableMapping as DictMixin
|
|
|
|
class MultiDict(DictMixin):
|
|
|