From aa95ccbab79d8270e60bec91c01808c912799ca7 Mon Sep 17 00:00:00 2001 From: Michael Elovskikh Date: Fri, 22 Feb 2013 18:50:09 +0600 Subject: Fixed UnicodeDecodeError on get_name and get_description methods --- rest_framework/renderers.py | 5 +++-- rest_framework/views.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 637904c4..bc5d0ed5 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -14,6 +14,7 @@ import json from django import forms from django.http.multipartparser import parse_header from django.template import RequestContext, loader, Template +from django.utils.encoding import force_unicode from rest_framework.compat import yaml from rest_framework.exceptions import ConfigurationError from rest_framework.settings import api_settings @@ -405,13 +406,13 @@ class BrowsableAPIRenderer(BaseRenderer): try: return view.get_name() except AttributeError: - return view.__doc__ + return force_unicode(view.__doc__) def get_description(self, view): try: return view.get_description(html=True) except AttributeError: - return view.__doc__ + return force_unicode(view.__doc__) def render(self, data, accepted_media_type=None, renderer_context=None): """ diff --git a/rest_framework/views.py b/rest_framework/views.py index fa742582..a3a3ac25 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -4,6 +4,7 @@ Provides an APIView class that is used as the base of all class-based views. from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from django.http import Http404 +from django.utils.encoding import force_unicode from django.utils.html import escape from django.utils.safestring import mark_safe from django.views.decorators.csrf import csrf_exempt @@ -96,7 +97,7 @@ class APIView(View): Override to customize. """ # TODO: deprecate? - name = self.__class__.__name__ + name = force_unicode(self.__class__.__name__) name = _remove_trailing_string(name, 'View') return _camelcase_to_spaces(name) @@ -106,7 +107,7 @@ class APIView(View): Override to customize. """ # TODO: deprecate? - description = self.__doc__ or '' + description = force_unicode(self.__doc__) or u'' description = _remove_leading_indent(description) if html: return self.markup_description(description) -- cgit v1.2.3 From 3ad5ebaea62471863cb79e66b4414eef9002effa Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 22 Feb 2013 13:38:20 +0000 Subject: Fix name fallback for BrowsableAPIRenderer --- rest_framework/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index bc5d0ed5..65568023 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -406,7 +406,7 @@ class BrowsableAPIRenderer(BaseRenderer): try: return view.get_name() except AttributeError: - return force_unicode(view.__doc__) + return force_unicode(view.__class__.__name__) def get_description(self, view): try: -- cgit v1.2.3 From a39de47cc7e6861a1d06b8ab1893f7358cf281f9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 22 Feb 2013 12:36:52 +0000 Subject: XML cleanup --- rest_framework/renderers.py | 38 ++++++++++++++- rest_framework/utils/__init__.py | 102 --------------------------------------- 2 files changed, 36 insertions(+), 104 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 65568023..d041dd4f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -15,14 +15,17 @@ from django import forms from django.http.multipartparser import parse_header from django.template import RequestContext, loader, Template from django.utils.encoding import force_unicode +from django.utils.xmlutils import SimplerXMLGenerator from rest_framework.compat import yaml from rest_framework.exceptions import ConfigurationError from rest_framework.settings import api_settings from rest_framework.request import clone_request -from rest_framework.utils import dict2xml from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework import exceptions, parsers, status, VERSION +from rest_framework.compat import StringIO +from rest_framework.compat import six +from rest_framework.compat import smart_text class BaseRenderer(object): @@ -119,7 +122,38 @@ class XMLRenderer(BaseRenderer): """ if data is None: return '' - return dict2xml(data) + + stream = StringIO() + + xml = SimplerXMLGenerator(stream, "utf-8") + xml.startDocument() + xml.startElement("root", {}) + + self._to_xml(xml, data) + + xml.endElement("root") + xml.endDocument() + return stream.getvalue() + + def _to_xml(self, xml, data): + if isinstance(data, (list, tuple)): + for item in data: + xml.startElement("list-item", {}) + self._to_xml(xml, item) + xml.endElement("list-item") + + elif isinstance(data, dict): + for key, value in six.iteritems(data): + xml.startElement(key, {}) + self._to_xml(xml, value) + xml.endElement(key) + + elif data is None: + # Don't output any value + pass + + else: + xml.characters(smart_text(data)) class YAMLRenderer(BaseRenderer): diff --git a/rest_framework/utils/__init__.py b/rest_framework/utils/__init__.py index 3bab3b5f..e69de29b 100644 --- a/rest_framework/utils/__init__.py +++ b/rest_framework/utils/__init__.py @@ -1,102 +0,0 @@ -from __future__ import unicode_literals -from django.utils.xmlutils import SimplerXMLGenerator -from rest_framework.compat import StringIO -from rest_framework.compat import six -from rest_framework.compat import smart_text -import re -import xml.etree.ElementTree as ET - - -# From xml2dict -class XML2Dict(object): - - def __init__(self): - pass - - def _parse_node(self, node): - node_tree = {} - # Save attrs and text, hope there will not be a child with same name - if node.text: - node_tree = node.text - for (k, v) in node.attrib.items(): - k, v = self._namespace_split(k, v) - node_tree[k] = v - #Save childrens - for child in node.getchildren(): - tag, tree = self._namespace_split(child.tag, self._parse_node(child)) - if tag not in node_tree: # the first time, so store it in dict - node_tree[tag] = tree - continue - old = node_tree[tag] - if not isinstance(old, list): - node_tree.pop(tag) - node_tree[tag] = [old] # multi times, so change old dict to a list - node_tree[tag].append(tree) # add the new one - - return node_tree - - def _namespace_split(self, tag, value): - """ - Split the tag '{http://cs.sfsu.edu/csc867/myscheduler}patients' - ns = http://cs.sfsu.edu/csc867/myscheduler - name = patients - """ - result = re.compile("\{(.*)\}(.*)").search(tag) - if result: - value.namespace, tag = result.groups() - return (tag, value) - - def parse(self, file): - """parse a xml file to a dict""" - f = open(file, 'r') - return self.fromstring(f.read()) - - def fromstring(self, s): - """parse a string""" - t = ET.fromstring(s) - unused_root_tag, root_tree = self._namespace_split(t.tag, self._parse_node(t)) - return root_tree - - -def xml2dict(input): - return XML2Dict().fromstring(input) - - -# Piston: -class XMLRenderer(): - def _to_xml(self, xml, data): - if isinstance(data, (list, tuple)): - for item in data: - xml.startElement("list-item", {}) - self._to_xml(xml, item) - xml.endElement("list-item") - - elif isinstance(data, dict): - for key, value in six.iteritems(data): - xml.startElement(key, {}) - self._to_xml(xml, value) - xml.endElement(key) - - elif data is None: - # Don't output any value - pass - - else: - xml.characters(smart_text(data)) - - def dict2xml(self, data): - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement("root", {}) - - self._to_xml(xml, data) - - xml.endElement("root") - xml.endDocument() - return stream.getvalue() - - -def dict2xml(input): - return XMLRenderer().dict2xml(input) -- cgit v1.2.3