pythonmobile
diff --git a/‎examples/README‎
Lines changed: 3 additions & 3 deletions b/‎examples/README‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎examples/util.py‎ ‎examples/exutil.py‎examples/util.py renamed to examples/exutil.py b/‎examples/util.py‎ ‎examples/exutil.py‎examples/util.py renamed to examples/exutil.py
diff --git a/‎examples/httpconsumer.py‎
Lines changed: 3 additions & 3 deletions b/‎examples/httpconsumer.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎examples/sampleserver.py‎
Lines changed: 7 additions & 6 deletions b/‎examples/sampleserver.py‎
Lines changed: 7 additions & 6 deletions
@@ -4,13 +4,13 @@ BaseHTTPServer.
 
 To get the example system running:
 
-1) Start the consumer server:
+1) Start the consumer server (from within the examples dir):
 
-	python examples/httpconsumer.py
+	python httpconsumer.py
 
 2) In a different terminal, start the server:
 
-	python examples/sampleserver.py
+	python sampleserver.py
 
 
 3) Open your web browser, and go to the consumer server:
 
@@ -3,7 +3,7 @@
 
 from urlparse import urlparse
 
-from openid.examples import util
+import exutil
 from openid.consumer import OpenIDConsumer, SimpleHTTPClient
 from openid.interface import Request
 from openid.association import *
@@ -45,7 +45,7 @@ def invalidate(self, server_url, assoc_handle):
                 del self.associations[i]
                 break
 
-class ConsumerHandler(util.HTTPHandler):
+class ConsumerHandler(exutil.HTTPHandler):
     def _simplePage(self, msg):
         self._headers()
         self.wfile.write("""
@@ -78,7 +78,7 @@ def do_GET(self):
         try:
             # parse the input url
             proto, host, selector, params, qs, frag = urlparse(self.path)
-            query = util.parseQuery(qs)
+            query = exutil.parseQuery(qs)
 
             # dispatch based on query args
             if 'identity_url' in query:
 
@@ -3,12 +3,13 @@
 import time, random, Cookie
 
 from openid.util import random_string, w3cdate, append_args
-from openid.examples import util
 from openid.errors import ProtocolError, NoOpenIDArgs
 from openid.server import OpenIDServer
 from openid.interface import Request, response_page, redirect
 from openid.association import ServerAssociation
 
+import exutil
+
 addr = 'http://localhost:8082/'
 
 class ConcreteServer(OpenIDServer):
@@ -199,7 +200,7 @@ def get_setup_response(self, req):
 </html>
 """
 
-class ServerHandler(util.HTTPHandler):
+class ServerHandler(exutil.HTTPHandler):
     def handleOpenIDRequest(self, req):
         try:
             response = server.handle(req)
@@ -258,7 +259,7 @@ def login(self, query):
 
     def do_GET(self):
         parsed = urlparse(self.path)
-        query = util.parseQuery(parsed[4])
+        query = exutil.parseQuery(parsed[4])
         action = query.get('action')
         if action == 'openid':
             try:
@@ -288,11 +289,11 @@ def do_POST(self):
         # post data is urlencoded args
         content_length = int(self.headers['Content-Length'])
         post_data = self.rfile.read(content_length)
-        query = util.parseQuery(post_data)
-        query.update(util.parseQuery(urlparse(self.path)[4]))
+        query = exutil.parseQuery(post_data)
+        query.update(exutil.parseQuery(urlparse(self.path)[4]))
         action = query.get('action')
         if action is None:
-            action = util.parseQuery(urlparse(self.path)[4]).get('action')
+            action = exutil.parseQuery(urlparse(self.path)[4]).get('action')
 
         if action == 'openid':
             self.handleOpenIDRequest(Request(query, 'POST'))