Fixed basestring and pop() in models.py

4 jobs for small_fix in 29 minutes and 10 seconds (queued for 6 seconds)