Skip to content

Commit

Permalink
Merge pull request #97 from terrycojones/pyflakes-cleanup
Browse files Browse the repository at this point in the history
Pyflakes cleanup
  • Loading branch information
pennersr committed Sep 3, 2012
2 parents f741056 + bf4ac22 commit 905ca40
Show file tree
Hide file tree
Showing 28 changed files with 14 additions and 66 deletions.
1 change: 0 additions & 1 deletion allauth/socialaccount/migrations/0001_initial.py
Expand Up @@ -2,7 +2,6 @@
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
2 changes: 0 additions & 2 deletions allauth/socialaccount/migrations/0002_genericmodels.py
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
from django.conf import settings

class Migration(SchemaMigration):
Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):
depends_on = (('socialaccount', '0001_initial'),)
Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
@@ -1,8 +1,5 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

class Migration(DataMigration):

Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/facebook/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
1 change: 0 additions & 1 deletion allauth/socialaccount/providers/facebook/provider.py
Expand Up @@ -9,7 +9,6 @@
from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
from allauth.socialaccount.app_settings import QUERY_EMAIL
from allauth.socialaccount.models import SocialApp
from allauth.socialaccount.helpers import import_path

from locale import get_default_locale_callable

Expand Down
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/github/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/google/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/linkedin/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/oauth/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
1 change: 0 additions & 1 deletion allauth/socialaccount/providers/oauth/views.py
@@ -1,6 +1,5 @@
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.utils.http import urlencode

from allauth.socialaccount.helpers import render_authentication_error
from allauth.socialaccount.providers.oauth.client import (OAuthClient,
Expand Down
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/oauth2/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):
depends_on = (('socialaccount', '0001_initial'),)
Expand Down
@@ -1,8 +1,5 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

class Migration(DataMigration):

Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
8 changes: 3 additions & 5 deletions allauth/socialaccount/providers/openid/utils.py
@@ -1,7 +1,5 @@
import base64

from django.http import HttpResponseRedirect

from openid.store.interface import OpenIDStore as OIDStore
from openid.association import Association as OIDAssociation

Expand All @@ -12,7 +10,7 @@ class DBOpenIDStore(OIDStore):
max_nonce_age = 6 * 60 * 60

def storeAssociation(self, server_url, assoc=None):
stored_assoc = OpenIDStore.objects.create(
OpenIDStore.objects.create(
server_url=server_url,
handle=assoc.handle,
secret=base64.encodestring(assoc.secret),
Expand Down Expand Up @@ -60,13 +58,13 @@ def removeAssociation(self, server_url, handle):

def useNonce(self, server_url, timestamp, salt):
try:
nonce = OpenIDNonce.objects.get(
OpenIDNonce.objects.get(
server_url=server_url,
timestamp=timestamp,
salt=salt
)
except OpenIDNonce.DoesNotExist:
nonce = OpenIDNonce.objects.create(
OpenIDNonce.objects.create(
server_url=server_url,
timestamp=timestamp,
salt=salt
Expand Down
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/soundcloud/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):
depends_on = (('socialaccount', '0001_initial'),)
Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
@@ -1,8 +1,5 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

class Migration(DataMigration):

Expand Down
@@ -1,8 +1,6 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

Expand Down
2 changes: 0 additions & 2 deletions allauth/socialaccount/providers/twitter/models.py
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
2 changes: 0 additions & 2 deletions docs/conf.py
Expand Up @@ -11,8 +11,6 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys, os

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
Expand Down
Binary file modified example/example.db
Binary file not shown.
22 changes: 11 additions & 11 deletions setup.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import os
import sys
from fnmatch import fnmatchcase

from setuptools import setup,find_packages
Expand All @@ -21,30 +22,30 @@ def find_package_data(where=".", package="", exclude=standard_exclude,
"""
Return a dictionary suitable for use in ``package_data``
in a distutils ``setup.py`` file.
The dictionary looks like::
{"package": [files]}
Where ``files`` is a list of all the files in that package that
don't match anything in ``exclude``.
If ``only_in_packages`` is true, then top-level directories that
are not packages won't be included (but directories under packages
will).
Directories matching any pattern in ``exclude_directories`` will
be ignored; by default directories with leading ``.``, ``CVS``,
and ``_darcs`` will be ignored.
If ``show_ignored`` is true, then all the files that aren't
included in package data are shown on stderr (for debugging
purposes).
Note patterns use wildcards, or can be exact paths (including
leading ``./``), and all searching is case-insensitive.
"""

out = {}
stack = [(convert_path(where), "", package, only_in_packages)]
while stack:
Expand Down Expand Up @@ -104,8 +105,8 @@ def find_package_data(where=".", package="", exclude=standard_exclude,
long_description=open('README.rst').read(),
url='http://github.com/pennersr/django-allauth',
keywords='django auth account social openid twitter facebook oauth registration',
install_requires=['django',
'oauth2',
install_requires=['django',
'oauth2',
'python-openid'],
include_package_data=True,
classifiers=[
Expand All @@ -124,4 +125,3 @@ def find_package_data(where=".", package="", exclude=standard_exclude,

if __name__ == '__main__':
setup(**METADATA)

0 comments on commit 905ca40

Please sign in to comment.