From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 22 Sep 2014 18:58:13 +0000 (-0500)
Subject: Merge branch 'merge-python3-port'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a6252cbf211691aa9d81fd535f5af7bcdbbd6620;p=mediagoblin.git

Merge branch 'merge-python3-port'

Conflicts:
	setup.py
---

a6252cbf211691aa9d81fd535f5af7bcdbbd6620
diff --cc mediagoblin/gmg_commands/users.py
index d34f50e2,93b72ea4..63c48690
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@@ -129,9 -133,9 +133,9 @@@ def deleteuser(args)
      db = mg_globals.database
  
      user = db.User.query.filter_by(
 -        username=unicode(args.username.lower())).one()
 +        username=unicode(args.username.lower())).first()
      if user:
          user.delete()
-         print 'The user %s has been deleted' % args.username
+         print('The user %s has been deleted' % args.username)
      else:
-         print 'The user %s doesn\'t exist' % args.username
+         print('The user %s doesn\'t exist' % args.username)
diff --cc setup.py
index 327221d2,e1c3c618..a644a3c3
--- a/setup.py
+++ b/setup.py
@@@ -113,7 -125,8 +125,7 @@@ try
      author='Free Software Foundation and contributors',
      author_email='cwebber@gnu.org',
      url="http://mediagoblin.org/",
-     long_description=open(READMEFILE).read(),
 -    download_url="http://mediagoblin.org/download/",
+     long_description=long_description,
      description='MediaGoblin is a web application for publishing all kinds of media',
      classifiers=[
          "Development Status :: 3 - Alpha",