This project is archived. Its data is read-only.

Commit ae88e73f authored Aug 29, 2012 by Claude Paroz

Replaced some smart_xxx by force_xxx equivalent

smart_str/smart_text should only be used when a potential lazy
string should be preserved in the result of the function call.

parent 36df198e

django/contrib/databrowse/datastructures.py

+6 −6

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ from __future__ import unicode_literals
		from django.db import models
		from django.utils import formats
		from django.utils.text import capfirst
		from django.utils.encoding import smart_text, smart_str, iri_to_uri
		from django.utils.encoding import smart_text, force_str, iri_to_uri
		from django.db.models.query import QuerySet
		from django.utils.encoding import python_2_unicode_compatible

		@@ -23,7 +23,7 @@ class EasyModel(object):
		self.verbose_name_plural = model._meta.verbose_name_plural

		def __repr__(self):
		return smart_str('<EasyModel for %s>' % self.model._meta.object_name)
		return force_str('<EasyModel for %s>' % self.model._meta.object_name)

		def model_databrowse(self):
		"Returns the ModelDatabrowse class for this model."
		@@ -62,7 +62,7 @@ class EasyField(object):
		self.model, self.field = easy_model, field

		def __repr__(self):
		return smart_str('<EasyField for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
		return force_str('<EasyField for %s.%s>' % (self.model.model._meta.object_name, self.field.name))

		def choices(self):
		for value, label in self.field.choices:
		@@ -80,7 +80,7 @@ class EasyChoice(object):
		self.value, self.label = value, label

		def __repr__(self):
		return smart_str('<EasyChoice for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
		return force_str('<EasyChoice for %s.%s>' % (self.model.model._meta.object_name, self.field.name))

		def url(self):
		return '%s%s/%s/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.field.name, iri_to_uri(self.value))
		@@ -91,7 +91,7 @@ class EasyInstance(object):
		self.model, self.instance = easy_model, instance

		def __repr__(self):
		return smart_str('<EasyInstance for %s (%s)>' % (self.model.model._meta.object_name, self.instance._get_pk_val()))
		return force_str('<EasyInstance for %s (%s)>' % (self.model.model._meta.object_name, self.instance._get_pk_val()))

		def __str__(self):
		val = smart_text(self.instance)
		@@ -135,7 +135,7 @@ class EasyInstanceField(object):
		self.raw_value = getattr(instance.instance, field.name)

		def __repr__(self):
		return smart_str('<EasyInstanceField for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
		return force_str('<EasyInstanceField for %s.%s>' % (self.model.model._meta.object_name, self.field.name))

		def values(self):
		"""

django/core/cache/backends/memcached.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ from threading import local
		from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError

		from django.utils import six
		from django.utils.encoding import smart_str
		from django.utils.encoding import force_str

		class BaseMemcachedCache(BaseCache):
		def __init__(self, server, params, library, value_not_found_exception):
		@@ -53,7 +53,7 @@ class BaseMemcachedCache(BaseCache):

		def make_key(self, key, version=None):
		# Python 2 memcache requires the key to be a byte string.
		return smart_str(super(BaseMemcachedCache, self).make_key(key, version))
		return force_str(super(BaseMemcachedCache, self).make_key(key, version))

		def add(self, key, value, timeout=0, version=None):
		key = self.make_key(key, version=version)

django/core/files/uploadedfile.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ from io import BytesIO
		from django.conf import settings
		from django.core.files.base import File
		from django.core.files import temp as tempfile
		from django.utils.encoding import smart_str
		from django.utils.encoding import force_str

		__all__ = ('UploadedFile', 'TemporaryUploadedFile', 'InMemoryUploadedFile',
		'SimpleUploadedFile')
		@@ -30,7 +30,7 @@ class UploadedFile(File):
		self.charset = charset

		def __repr__(self):
		return smart_str("<%s: %s (%s)>" % (
		return force_str("<%s: %s (%s)>" % (
		self.__class__.__name__, self.name, self.content_type))

		def _get_name(self):

django/core/handlers/wsgi.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ from django.core import signals
		from django.core.handlers import base
		from django.core.urlresolvers import set_script_prefix
		from django.utils import datastructures
		from django.utils.encoding import force_text, smart_str, iri_to_uri
		from django.utils.encoding import force_str, force_text, iri_to_uri
		from django.utils.log import getLogger

		logger = getLogger('django.request')
		@@ -246,5 +246,5 @@ class WSGIHandler(base.BaseHandler):
		response_headers = [(str(k), str(v)) for k, v in response.items()]
		for c in response.cookies.values():
		response_headers.append((str('Set-Cookie'), str(c.output(header=''))))
		start_response(smart_str(status), response_headers)
		start_response(force_str(status), response_headers)
		return response

django/core/management/base.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ import traceback
		import django
		from django.core.exceptions import ImproperlyConfigured
		from django.core.management.color import color_style
		from django.utils.encoding import smart_str
		from django.utils.encoding import force_str
		from django.utils.six import StringIO


		@@ -65,7 +65,7 @@ class OutputWrapper(object):
		msg += ending
		style_func = [f for f in (style_func, self.style_func, lambda x:x)
		if f is not None][0]
		self._out.write(smart_str(style_func(msg)))
		self._out.write(force_str(style_func(msg)))


		class BaseCommand(object):