Merge.

stephenmcd · stephenmcd · commit 594f599c20fc · 2013-09-22T15:41:02.000+10:00
diff --git a/django_socketio/example_project/chat/urls.py b/django_socketio/example_project/chat/urls.py
@@ -1,5 +1,5 @@
 
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns("chat.views",
diff --git a/django_socketio/urls.py b/django_socketio/urls.py
@@ -1,8 +1,4 @@
-# Patch for django 1.3 compatibility
-try:
-    from django.conf.urls import patterns, url
-except ImportError:
-    from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from django.conf import settings
 from django.utils.importlib import import_module

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-from django.conf.urls.defaults import patterns, include, url`
	`2`	`+from django.conf.urls import patterns, url`
`3`	`3`
`4`	`4`
`5`	`5`	`urlpatterns = patterns("chat.views",`