Skip to content

Commit

Permalink
Merge pull request #214 from GoogleCloudPlatform/djangourls
Browse files Browse the repository at this point in the history
Fix up Django URLs
  • Loading branch information
waprin committed Mar 3, 2016
2 parents edcff80 + deb1e86 commit f0a425f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions cloud_logging/api/list_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

# [START all]
import argparse
import sys

from googleapiclient import discovery
from oauth2client.client import GoogleCredentials
Expand All @@ -39,7 +38,7 @@ def list_logs(project_id, logging_service):
response = request.execute()
if not response:
print("No logs found in {0} project").format(project_id)
return False
return False
for log in response['logs']:
print(log['name'])

Expand Down
2 changes: 1 addition & 1 deletion container_engine/django_tutorial/mysite/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from django.contrib.staticfiles.urls import staticfiles_urlpatterns

urlpatterns = [
url(r'^', include('polls.urls')),
url(r'^$', include('polls.urls')),
]

# Only serve static files from Django during development
Expand Down
2 changes: 1 addition & 1 deletion managed_vms/django_cloudsql/mysite/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
from django.conf.urls import include, url
from django.contrib import admin

urlpatterns = [url(r'^polls/', include('polls.urls')),
urlpatterns = [url(r'^$', include('polls.urls')),
url(r'^admin/', admin.site.urls)]

0 comments on commit f0a425f

Please sign in to comment.