Revert "fix merge conflict"

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
This commit is contained in:
Diana Huang
2013-04-26 12:40:35 -04:00
parent 5560a4add4
commit 2df3fe9344
30 changed files with 87 additions and 391 deletions

View File

@@ -6,11 +6,10 @@ from django.core.management.base import BaseCommand, CommandError
from django.contrib.auth.models import User
import comment_client as cc
class Command(BaseCommand):
help = 'Reload forum (comment client) users from existing users'
def adduser(self, user):
def adduser(self,user):
print user
try:
cc_user = cc.User.from_django_user(user)
@@ -23,7 +22,8 @@ class Command(BaseCommand):
uset = [User.objects.get(username=x) for x in args]
else:
uset = User.objects.all()
for user in uset:
self.adduser(user)