From 762a52edde09297e87c640797219c9bb8255d50a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 25 Apr 2011 04:50:28 +0100 Subject: Fix some compat issues with json/simplejson --- djangorestframework/compat.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'djangorestframework/compat.py') diff --git a/djangorestframework/compat.py b/djangorestframework/compat.py index 3e82bd98..22b57186 100644 --- a/djangorestframework/compat.py +++ b/djangorestframework/compat.py @@ -125,4 +125,12 @@ except: # 'request': self.request # } #) - return http.HttpResponseNotAllowed(allowed_methods) \ No newline at end of file + return http.HttpResponseNotAllowed(allowed_methods) + +# parse_qs +try: + # python >= ? + from urlparse import parse_qs +except ImportError: + # python <= ? + from cgi import parse_qs \ No newline at end of file -- cgit v1.2.3 From b358fbdbe9cbd4ce644c4b2c7b9b4cec0811e14e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Apr 2011 14:32:56 +0100 Subject: More refactoring - move various less core stuff into utils etc --- djangorestframework/compat.py | 66 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 7 deletions(-) (limited to 'djangorestframework/compat.py') diff --git a/djangorestframework/compat.py b/djangorestframework/compat.py index 22b57186..98fbbb62 100644 --- a/djangorestframework/compat.py +++ b/djangorestframework/compat.py @@ -1,9 +1,24 @@ """Compatability module to provide support for backwards compatability with older versions of django/python""" +# cStringIO only if it's available +try: + import cStringIO as StringIO +except ImportError: + import StringIO + + +# parse_qs +try: + # python >= ? + from urlparse import parse_qs +except ImportError: + # python <= ? + from cgi import parse_qs + + # django.test.client.RequestFactory (Django >= 1.3) try: from django.test.client import RequestFactory - except ImportError: from django.test import Client from django.core.handlers.wsgi import WSGIRequest @@ -49,7 +64,7 @@ except ImportError: # django.views.generic.View (Django >= 1.3) try: from django.views.generic import View -except: +except ImportError: from django import http from django.utils.functional import update_wrapper # from django.utils.log import getLogger @@ -127,10 +142,47 @@ except: #) return http.HttpResponseNotAllowed(allowed_methods) -# parse_qs + try: - # python >= ? - from urlparse import parse_qs + import markdown + import re + + class CustomSetextHeaderProcessor(markdown.blockprocessors.BlockProcessor): + """Override markdown's SetextHeaderProcessor, so that ==== headers are

and ---- headers are

. + + We use

for the resource name.""" + + # Detect Setext-style header. Must be first 2 lines of block. + RE = re.compile(r'^.*?\n[=-]{3,}', re.MULTILINE) + + def test(self, parent, block): + return bool(self.RE.match(block)) + + def run(self, parent, blocks): + lines = blocks.pop(0).split('\n') + # Determine level. ``=`` is 1 and ``-`` is 2. + if lines[1].startswith('='): + level = 2 + else: + level = 3 + h = markdown.etree.SubElement(parent, 'h%d' % level) + h.text = lines[0].strip() + if len(lines) > 2: + # Block contains additional lines. Add to master blocks for later. + blocks.insert(0, '\n'.join(lines[2:])) + + def apply_markdown(text): + """Simple wrapper around markdown.markdown to apply our CustomSetextHeaderProcessor, + and also set the base level of '#' style headers to

.""" + extensions = ['headerid(level=2)'] + safe_mode = False, + output_format = markdown.DEFAULT_OUTPUT_FORMAT + + md = markdown.Markdown(extensions=markdown.load_extensions(extensions), + safe_mode=safe_mode, + output_format=output_format) + md.parser.blockprocessors['setextheader'] = CustomSetextHeaderProcessor(md.parser) + return md.convert(text) + except ImportError: - # python <= ? - from cgi import parse_qs \ No newline at end of file + apply_markdown = None \ No newline at end of file -- cgit v1.2.3 From 92c015e0495b7cf39b0d0387fe6d376812a9ebef Mon Sep 17 00:00:00 2001 From: markotibold Date: Wed, 18 May 2011 22:13:48 +0200 Subject: Most of the actual work so far has been markup really. --- djangorestframework/compat.py | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'djangorestframework/compat.py') diff --git a/djangorestframework/compat.py b/djangorestframework/compat.py index 98fbbb62..45a695c8 100644 --- a/djangorestframework/compat.py +++ b/djangorestframework/compat.py @@ -1,4 +1,6 @@ -"""Compatability module to provide support for backwards compatability with older versions of django/python""" +""" +Compatability module to provide support for backwards compatability with older versions of django/python +""" # cStringIO only if it's available try: @@ -27,24 +29,25 @@ except ImportError: # Lovely stuff class RequestFactory(Client): """ - Class that lets you create mock Request objects for use in testing. + Class that lets you create mock :obj:`Request` objects for use in testing. - Usage: + Usage:: - rf = RequestFactory() - get_request = rf.get('/hello/') - post_request = rf.post('/submit/', {'foo': 'bar'}) + rf = RequestFactory() + get_request = rf.get('/hello/') + post_request = rf.post('/submit/', {'foo': 'bar'}) - This class re-uses the django.test.client.Client interface, docs here: - http://www.djangoproject.com/documentation/testing/#the-test-client + This class re-uses the :class:`django.test.client.Client` interface. Of which + you can find the docs here__. - Once you have a request object you can pass it to any view function, - just as if that view had been hooked up using a URLconf. + __ http://www.djangoproject.com/documentation/testing/#the-test-client + Once you have a :obj:`request` object you can pass it to any :func:`view` function, + just as if that :func:`view` had been hooked up using a URLconf. """ def request(self, **request): """ - Similar to parent class, but returns the request object as soon as it + Similar to parent class, but returns the :obj:`request` object as soon as it has created it. """ environ = { @@ -148,9 +151,11 @@ try: import re class CustomSetextHeaderProcessor(markdown.blockprocessors.BlockProcessor): - """Override markdown's SetextHeaderProcessor, so that ==== headers are

and ---- headers are

. + """ + Override `markdown`'s :class:`SetextHeaderProcessor`, so that ==== headers are

and ---- headers are

. - We use

for the resource name.""" + We use

for the resource name. + """ # Detect Setext-style header. Must be first 2 lines of block. RE = re.compile(r'^.*?\n[=-]{3,}', re.MULTILINE) @@ -172,8 +177,11 @@ try: blocks.insert(0, '\n'.join(lines[2:])) def apply_markdown(text): - """Simple wrapper around markdown.markdown to apply our CustomSetextHeaderProcessor, - and also set the base level of '#' style headers to

.""" + """ + Simple wrapper around :func:`markdown.markdown` to apply our :class:`CustomSetextHeaderProcessor`, + and also set the base level of '#' style headers to

. + """ + extensions = ['headerid(level=2)'] safe_mode = False, output_format = markdown.DEFAULT_OUTPUT_FORMAT -- cgit v1.2.3 From 82c4ca96126cfedd4a8471452d956e8bb432ba5b Mon Sep 17 00:00:00 2001 From: markotibold Date: Thu, 19 May 2011 19:36:30 +0200 Subject: The core is now documented from the docstrings in the source. --- djangorestframework/compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'djangorestframework/compat.py') diff --git a/djangorestframework/compat.py b/djangorestframework/compat.py index 45a695c8..0274511a 100644 --- a/djangorestframework/compat.py +++ b/djangorestframework/compat.py @@ -1,5 +1,5 @@ """ -Compatability module to provide support for backwards compatability with older versions of django/python +The :mod:`compatability` module provides support for backwards compatability with older versions of django/python. """ # cStringIO only if it's available @@ -42,7 +42,7 @@ except ImportError: __ http://www.djangoproject.com/documentation/testing/#the-test-client - Once you have a :obj:`request` object you can pass it to any :func:`view` function, + Once you have a `request` object you can pass it to any :func:`view` function, just as if that :func:`view` had been hooked up using a URLconf. """ def request(self, **request): -- cgit v1.2.3