Merge pull request #675 from awesto/releases/0.11.x

Bump to version 0.11.2
awesto · Oct 27, 2017 · 51cb522 · 51cb522
2 parents 16af409 + 2283ba0
commit 51cb522
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # django-SHOP
 
-[![Build Status](https://travis-ci.org/awesto/django-shop.svg?branch=master)](https://travis-ci.org/awesto/django-shop)
+[![Build Status](https://travis-ci.org/awesto/django-shop.svg?branch=master)](https://travis-ci.org/awesto/django-shop?branch=master)
 [![PyPI version](https://img.shields.io/pypi/v/django-shop.svg)](https://pypi.python.org/pypi/django-shop)
 [![Join the chat at https://gitter.im/awesto/django-shop](https://badges.gitter.im/awesto/django-shop.svg)](https://gitter.im/awesto/django-shop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Software license](https://img.shields.io/pypi/l/django-shop.svg)](https://pypi.python.org/pypi/django-shop)

diff --git a/docs/authors.rst b/docs/authors.rst
@@ -34,6 +34,7 @@ CONTRIBUTORS
 * Martin Ogden
 * Mike Yumatov
 * Mikhail Kolesnik
+* Nicolas Pascal
 * Pavel Zhukov
 * Pedro Gracia
 * Per Rosengren

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -27,6 +27,7 @@ Changelog for django-SHOP
 * Paid but unshipped orders, now can be refunded. Possible be refactoring class
   ``CancelOrderWorkflowMixin``, which handles payment refunds.
 * Add Order status to Order Detail View, so that the customer immediately sees what's going on.
+* Add support for Python-3.6.
 
 
 0.11.1

diff --git a/shop/models/fields.py b/shop/models/fields.py
@@ -6,7 +6,7 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.six import python_2_unicode_compatible, with_metaclass, string_types
+from django.utils.six import python_2_unicode_compatible, string_types
 from django.utils.translation import ugettext_lazy as _, ugettext