Skip to content

Commit

Permalink
Merge pull request coleifer#64 from medwards/whitespaceheeyah
Browse files Browse the repository at this point in the history
Whitespace, hee-YAH!
  • Loading branch information
coleifer committed Mar 21, 2012
2 parents 6cf9de8 + e469be1 commit 8af7af5
Show file tree
Hide file tree
Showing 6 changed files with 929 additions and 929 deletions.
2 changes: 1 addition & 1 deletion bench/run_bench.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def test_list_entries_for_user(m):
b = m.create_blog(u, 'blog%d' % i)
for j in xrange(10):
e = m.create_entry(b, 'entry%d' % i, '')

for user in m.list_users():
for i in xrange(100):
entries = m.list_entries_by_user(user)
Expand Down
2 changes: 1 addition & 1 deletion bench/sqlalc_bench/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class User(Base):
__tablename__ = 'sqlalc_users'

id = Column(Integer, primary_key=True)
username = Column(String)
active = Column(Boolean)
Expand Down
4 changes: 2 additions & 2 deletions example/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def join():
email=request.form['email'],
join_date=datetime.datetime.now()
)

# mark the user as being 'authenticated' by setting the session vars
auth_user(user)
return redirect(url_for('homepage'))
Expand Down Expand Up @@ -237,7 +237,7 @@ def user_detail(username):
# using the "get_object_or_404" shortcut here to get a user with a valid
# username or short-circuit and display a 404 if no user exists in the db
user = get_object_or_404(User, username=username)

# get all the users messages ordered newest-first -- note how we're accessing
# the messages -- user.message_set. could also have written it as:
# Message.select().where(user=user).order_by(('pub_date', 'desc'))
Expand Down
Loading

0 comments on commit 8af7af5

Please sign in to comment.