mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 09:57:55 +03:00 
			
		
		
		
	Drop urlobject2
This commit is contained in:
		
							parent
							
								
									a2d0fd2c40
								
							
						
					
					
						commit
						a5213d4023
					
				| 
						 | 
					@ -16,7 +16,6 @@ For more information, check out [the documentation][docs], in particular, the tu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Python (2.6, 2.7)
 | 
					* Python (2.6, 2.7)
 | 
				
			||||||
* Django (1.3, 1.4, 1.5)
 | 
					* Django (1.3, 1.4, 1.5)
 | 
				
			||||||
* [URLObject][urlobject] (2.0.0+)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
**Optional:**
 | 
					**Optional:**
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,20 @@
 | 
				
			||||||
 | 
					from django.http import QueryDict
 | 
				
			||||||
from django.template import Library
 | 
					from django.template import Library
 | 
				
			||||||
from urlobject import URLObject
 | 
					from urlparse import urlparse, urlunparse
 | 
				
			||||||
register = Library()
 | 
					register = Library()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					def replace_query_param(url, key, val):
 | 
				
			||||||
 | 
					    (scheme, netloc, path, params, query, fragment) = urlparse(url)
 | 
				
			||||||
 | 
					    query_dict = QueryDict(query).copy()
 | 
				
			||||||
 | 
					    query_dict[key] = val
 | 
				
			||||||
 | 
					    query = query_dict.urlencode()
 | 
				
			||||||
 | 
					    return urlunparse((scheme, netloc, path, params, query, fragment))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def add_query_param(url, param):
 | 
					def add_query_param(url, param):
 | 
				
			||||||
    return unicode(URLObject(url).with_query(param))
 | 
					    key, val = param.split('=')
 | 
				
			||||||
 | 
					    return replace_query_param(url, key, val)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
register.filter('add_query_param', add_query_param)
 | 
					register.filter('add_query_param', add_query_param)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,6 @@ REST framework requires the following:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Python (2.6, 2.7)
 | 
					* Python (2.6, 2.7)
 | 
				
			||||||
* Django (1.3, 1.4, 1.5)
 | 
					* Django (1.3, 1.4, 1.5)
 | 
				
			||||||
* [URLObject][urlobject] (2.0.0+)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
The following packages are optional:
 | 
					The following packages are optional:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
									
									
									
									
								
							| 
						 | 
					@ -63,7 +63,7 @@ setup(
 | 
				
			||||||
    packages=get_packages('djangorestframework'),
 | 
					    packages=get_packages('djangorestframework'),
 | 
				
			||||||
    package_data=get_package_data('djangorestframework'),
 | 
					    package_data=get_package_data('djangorestframework'),
 | 
				
			||||||
    test_suite='djangorestframework.runtests.runcoverage.main',
 | 
					    test_suite='djangorestframework.runtests.runcoverage.main',
 | 
				
			||||||
    install_requires=['URLObject>=0.6.0'],
 | 
					    install_requires=[],
 | 
				
			||||||
    classifiers=[
 | 
					    classifiers=[
 | 
				
			||||||
        'Development Status :: 4 - Beta',
 | 
					        'Development Status :: 4 - Beta',
 | 
				
			||||||
        'Environment :: Web Environment',
 | 
					        'Environment :: Web Environment',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user