[Python-modules-commits] r33367 - in packages/circuits/trunk/debian (3 files)
eriol-guest at users.alioth.debian.org
eriol-guest at users.alioth.debian.org
Tue Jul 14 00:30:14 UTC 2015
Date: Tuesday, July 14, 2015 @ 00:30:12
Author: eriol-guest
Revision: 33367
Use system six instead of the embedded copy
Added:
packages/circuits/trunk/debian/patches/06_use-system-six.patch
Modified:
packages/circuits/trunk/debian/changelog
packages/circuits/trunk/debian/patches/series
Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog 2015-07-13 18:02:33 UTC (rev 33366)
+++ packages/circuits/trunk/debian/changelog 2015-07-14 00:30:12 UTC (rev 33367)
@@ -24,11 +24,13 @@
- Remove Google AdSense tracking code.
* debian/patches/05_remove-privacy-breach-badges.patch
- Remove badges fetched from external websites.
+ * debian/patches/06_use-system-six.patch
+ - Use system six instead of the embedded copy.
* debian/rules
- Remove fabric scripts to not pollute namespace.
- Remove Python implementation of htpasswd.
- -- Daniele Tricoli <eriol at mornie.org> Mon, 13 Jul 2015 18:26:53 +0200
+ -- Daniele Tricoli <eriol at mornie.org> Tue, 14 Jul 2015 02:26:37 +0200
circuits (2.1.0-2) unstable; urgency=low
Added: packages/circuits/trunk/debian/patches/06_use-system-six.patch
===================================================================
--- packages/circuits/trunk/debian/patches/06_use-system-six.patch (rev 0)
+++ packages/circuits/trunk/debian/patches/06_use-system-six.patch 2015-07-14 00:30:12 UTC (rev 33367)
@@ -0,0 +1,313 @@
+Description: Use system six instead of the embedded copy.
+Author: Daniele Tricoli <eriol at mornie.org>
+Last-Update: 2015-07-14
+Forwarded: not-needed
+
+--- a/circuits/core/bridge.py
++++ b/circuits/core/bridge.py
+@@ -22,7 +22,7 @@
+ from .events import Event, exception
+ from .handlers import handler
+ from .components import BaseComponent
+-from ..six import b
++from six import b
+
+
+ _sentinel = b('~~~')
+--- a/circuits/core/manager.py
++++ b/circuits/core/manager.py
+@@ -34,7 +34,7 @@
+ from .values import Value
+ from ..tools import tryimport
+ from .handlers import handler
+-from ..six import create_bound_method, next
++from six import create_bound_method, next
+ from .events import exception, generate_events, signal, started, stopped, Event
+
+
+--- a/circuits/core/values.py
++++ b/circuits/core/values.py
+@@ -8,7 +8,7 @@
+
+
+ from .events import Event
+-from ..six import string_types
++from six import string_types
+
+
+ class Value(object):
+--- a/circuits/io/file.py
++++ b/circuits/io/file.py
+@@ -24,7 +24,7 @@
+ from circuits.core.utils import findcmp
+ from circuits.core import handler, Component, Event
+ from circuits.core.pollers import BasePoller, Poller
+-from circuits.six import binary_type, string_types, PY3
++from six import binary_type, string_types, PY3
+
+ from .events import close, closed, eof, error, opened, read, ready
+
+--- a/circuits/io/serial.py
++++ b/circuits/io/serial.py
+@@ -15,7 +15,7 @@
+ from circuits.core.pollers import BasePoller, Poller
+ from circuits.core.utils import findcmp
+ from circuits.tools import tryimport
+-from circuits.six import binary_type, string_types
++from six import binary_type, string_types
+
+ from .events import closed, error, opened, read, ready, close
+
+--- a/circuits/net/sockets.py
++++ b/circuits/net/sockets.py
+@@ -36,7 +36,7 @@
+ HAS_SSL = 0
+
+
+-from circuits.six import binary_type
++from six import binary_type
+ from circuits.core.utils import findcmp
+ from circuits.core import handler, BaseComponent
+ from circuits.core.pollers import BasePoller, Poller
+--- a/circuits/node/utils.py
++++ b/circuits/node/utils.py
+@@ -11,7 +11,7 @@
+ import json
+
+ from circuits.core import Event
+-from circuits.six import bytes_to_str, text_type
++from six import bytes_to_str, text_type
+
+
+ def load_event(s):
+--- a/circuits/protocols/line.py
++++ b/circuits/protocols/line.py
+@@ -13,7 +13,7 @@
+
+ from circuits.core import handler, Event, BaseComponent
+
+-from circuits.six import b
++from six import b
+
+
+ LINESEP = re.compile(b("\r?\n"))
+--- a/circuits/protocols/websocket.py
++++ b/circuits/protocols/websocket.py
+@@ -6,7 +6,7 @@
+ import os
+ import random
+
+-from circuits.six import string_types
++from six import string_types
+ from circuits.core.handlers import handler
+ from circuits.core.components import BaseComponent
+ from circuits.net.events import write, read, close
+--- a/circuits/tools/__init__.py
++++ b/circuits/tools/__init__.py
+@@ -11,7 +11,7 @@
+ from functools import wraps
+ from warnings import warn, warn_explicit
+
+-from circuits.six import _func_code
++from six import _func_code
+
+
+ def tryimport(modules, obj=None, message=None):
+--- a/circuits/web/dispatchers/dispatcher.py
++++ b/circuits/web/dispatchers/dispatcher.py
+@@ -13,7 +13,7 @@
+ except ImportError:
+ from urllib.parse import quote, unquote # NOQA
+
+-from circuits.six import text_type
++from six import text_type
+
+ from circuits import handler, BaseComponent, Event
+
+--- a/circuits/web/dispatchers/jsonrpc.py
++++ b/circuits/web/dispatchers/jsonrpc.py
+@@ -12,7 +12,7 @@
+
+ json = tryimport(("json", "simplejson"))
+
+-from circuits.six import binary_type
++from six import binary_type
+ from circuits import handler, Event, BaseComponent
+
+
+--- a/circuits/web/dispatchers/xmlrpc.py
++++ b/circuits/web/dispatchers/xmlrpc.py
+@@ -13,7 +13,7 @@
+ except ImportError:
+ from xmlrpclib import dumps, loads, Fault # NOQA
+
+-from circuits.six import binary_type
++from six import binary_type
+ from circuits import handler, Event, BaseComponent
+
+
+--- a/circuits/web/errors.py
++++ b/circuits/web/errors.py
+@@ -16,7 +16,7 @@
+
+ from circuits import Event
+
+-from ..six import string_types
++from six import string_types
+ from .constants import SERVER_URL, SERVER_VERSION
+ from .constants import DEFAULT_ERROR_MESSAGE, HTTP_STATUS_CODES
+
+--- a/circuits/web/headers.py
++++ b/circuits/web/headers.py
+@@ -8,7 +8,7 @@
+ """
+
+ import re
+-from circuits.six import iteritems, u, b
++from six import iteritems, u, b
+
+ # Regular expression that matches `special' characters in parameters, the
+ # existance of which force quoting of the parameter value.
+--- a/circuits/web/http.py
++++ b/circuits/web/http.py
+@@ -20,7 +20,7 @@
+ from urlparse import urlparse, urlunparse # NOQA
+
+
+-from circuits.six import text_type
++from six import text_type
+ from circuits.net.events import close, write
+ from circuits.core import handler, BaseComponent, Value
+
+--- a/circuits/web/loggers.py
++++ b/circuits/web/loggers.py
+@@ -13,7 +13,7 @@
+ from io import IOBase
+ from email._parseaddr import _monthnames
+
+-from circuits.six import string_types
++from six import string_types
+ from circuits.core import handler, BaseComponent
+
+
+--- a/circuits/web/parsers/http.py
++++ b/circuits/web/parsers/http.py
+@@ -18,7 +18,7 @@
+ from urllib.parse import unquote # NOQA
+
+
+-from circuits.six import b, bytes_to_str, MAXSIZE
++from six import b, bytes_to_str, MAXSIZE
+
+
+ from ..headers import Headers
+--- a/circuits/web/parsers/multipart.py
++++ b/circuits/web/parsers/multipart.py
+@@ -49,7 +49,7 @@
+ except ImportError: # pragma: no cover (fallback for Python 2.5)
+ from StringIO import StringIO as BytesIO
+
+-from circuits.six import text_type
++from six import text_type
+
+ ##############################################################################
+ ################################ Helper & Misc ################################
+--- a/circuits/web/parsers/querystring.py
++++ b/circuits/web/parsers/querystring.py
+@@ -7,7 +7,7 @@
+ from urllib.parse import parse_qsl # NOQA
+
+
+-from circuits.six import iteritems, string_types
++from six import iteritems, string_types
+
+
+ class QueryStringToken(object):
+--- a/circuits/web/url.py
++++ b/circuits/web/url.py
+@@ -33,7 +33,7 @@
+ from urllib import quote, unquote # NOQA
+ from urlparse import urljoin, urlparse, urlunparse # NOQA
+
+-from circuits.six import b, string_types, text_type
++from six import b, string_types, text_type
+
+ # Come codes that we'll need
+ IDNA = codecs.lookup('idna')
+--- a/circuits/web/utils.py
++++ b/circuits/web/utils.py
+@@ -26,7 +26,7 @@
+ except ImportError:
+ from cgi import parse_qs as _parse_qs # NOQA
+
+-from circuits.six import iterbytes
++from six import iterbytes
+
+ from .exceptions import RangeUnsatisfiable, RequestEntityTooLarge
+
+--- a/circuits/web/websockets/dispatcher.py
++++ b/circuits/web/websockets/dispatcher.py
+@@ -7,7 +7,7 @@
+ import hashlib
+
+
+-from circuits.six import b
++from six import b
+ from circuits.web.errors import httperror
+ from circuits import handler, BaseComponent
+ from circuits.net.events import connect, disconnect
+--- a/circuits/web/wrappers.py
++++ b/circuits/web/wrappers.py
+@@ -19,7 +19,7 @@
+
+ from .url import parse_url
+ from .headers import Headers
+-from ..six import binary_type
++from six import binary_type
+ from .errors import httperror
+ from circuits.net.sockets import BUFSIZE
+ from .constants import HTTP_STATUS_CODES, SERVER_VERSION
+--- a/tests/protocols/test_irc.py
++++ b/tests/protocols/test_irc.py
+@@ -18,7 +18,7 @@
+ KICK, TOPIC, MODE, INVITE, NAMES, WHOIS
+ )
+
+-from circuits.six import u
++from six import u
+
+
+ class App(Component):
+--- a/tests/web/test_bad_requests.py
++++ b/tests/web/test_bad_requests.py
+@@ -6,7 +6,7 @@
+ except ImportError:
+ from http.client import HTTPConnection # NOQA
+
+-from circuits.six import b
++from six import b
+ from circuits.web import Controller
+
+
+--- a/tests/web/test_core.py
++++ b/tests/web/test_core.py
+@@ -3,7 +3,7 @@
+ import pytest
+
+
+-from circuits.six import b, u
++from six import b, u
+ from circuits.web import Controller
+
+
+--- a/tests/web/test_unicode.py
++++ b/tests/web/test_unicode.py
+@@ -6,7 +6,7 @@
+ except ImportError:
+ from http.client import HTTPConnection # NOQA
+
+-from circuits.six import b
++from six import b
+ from circuits.web import Controller
+ from circuits.web.client import Client, request
+
Modified: packages/circuits/trunk/debian/patches/series
===================================================================
--- packages/circuits/trunk/debian/patches/series 2015-07-13 18:02:33 UTC (rev 33366)
+++ packages/circuits/trunk/debian/patches/series 2015-07-14 00:30:12 UTC (rev 33367)
@@ -3,3 +3,4 @@
03_disable-address-check.patch
04_remove-google-adsense.patch
05_remove-privacy-breach-badges.patch
+06_use-system-six.patch
More information about the Python-modules-commits
mailing list