Merge branch 'master' of https://github.com/FOSSEE/online_test into edit_questionpaper

Resolved
Conflicts:
	yaksh/views.py

1 files changed, 5 insertions, 1 deletions

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 7d4a0d3..bc9b4c0 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -9,7 +9,11 @@ from taggit.managers import TaggableManager
 from taggit.forms import TagField
 from django.forms.models import inlineformset_factory
 from django.db.models import Q
-from string import letters, punctuation, digits
+try:
+    from string import letters
+except ImportError:
+    from string import ascii_letters as letters
+from string import punctuation, digits
 import datetime
 import pytz