Changeset 15065

Timestamp:

Nov 19, 2015, 3:34:39 AM (5 years ago)

Author:

Ryan J Ollos

Message:

0.1.4: Conform to PEP8

Location:

sharedcookieauthplugin/trunk

Files:

• setup.py (modified) (2 diffs)
• sharedcookieauth/__init__.py (modified) (1 diff)
• sharedcookieauth/sharedcookieauth.py (modified) (3 diffs)

sharedcookieauthplugin/trunk/setup.py

@@ -1 +1 @@
 from setuptools import find_packages, setup
 
-version='0.1.4'
-
 setup(name='SharedCookieAuth',
-      version=version,
+      version='0.1.4',
       description="share cookies between trac projects in the same directory",
       author='Jeff Hammel',
@@ -15 +13 @@
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests*']),
       include_package_data=True,
-      package_data={ 'sharedcookieauth': ['templates/*', 'htdocs/*'] },
+      package_data={'sharedcookieauth': ['templates/*', 'htdocs/*']},
       zip_safe=False,
-      entry_points = """
+      entry_points="""
       [trac.plugins]
-      sharedcookieauth = sharedcookieauth
+      sharedcookieauth = sharedcookieauth.SharedCookieAuth
       """,
       )
-

sharedcookieauthplugin/trunk/sharedcookieauth/__init__.py

@@ -1 @@
-# 
-from sharedcookieauth import *

sharedcookieauthplugin/trunk/sharedcookieauth/sharedcookieauth.py

@@ -8 +8 @@
 
 from trac.core import *
+from trac.env import open_environment
 from trac.web.api import IAuthenticator
 from trac.web.main import RequestDispatcher
-from trac.env import open_environment
 
 
 class SharedCookieAuth(Component):
 
-    ### class-level data
     implements(IAuthenticator)
 
-    ### method for IAuthenticator
+    # IAuthenticator methods
 
     def authenticate(self, req):
@@ -29 +28 @@
         else:
             req.environ['shared_cookie_auth'] = None
-            if req.incookie.has_key('trac_auth'):
+            if 'trac_auth' in req.incookie:
                 for project, dispatcher in self.dispatchers().items():
                     agent = dispatcher.authenticate(req)
@@ -39 +38 @@
         return None
 
-    ### internal methods
+    # Internal methods
 
     def dispatchers(self):
         if not hasattr(self, '_dispatchers'):
-
             dispatchers = {}
             base_path, project = os.path.split(self.env.path)
-            projects = [ i for i in os.listdir(base_path)
-                         if i != project ]
+            projects = [i for i in os.listdir(base_path) if i != project]
 
             for project in projects: