Author: rjollos
Date: Tue Feb 11 18:10:50 2014
New Revision: 1567247
URL: http://svn.apache.org/r1567247
Log:
0.8dev: PEP-0008 changes - ordered imports, removed unused imports, removed
unused local variable.
Modified:
bloodhound/trunk/bloodhound_multiproduct/multiproduct/api.py
bloodhound/trunk/bloodhound_multiproduct/multiproduct/product_admin.py
bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/query.py
bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/web_ui.py
bloodhound/trunk/bloodhound_multiproduct/tests/versioncontrol/api.py
bloodhound/trunk/bloodhound_multiproduct/tests/web_ui.py
bloodhound/trunk/trac/trac/resource.py
Modified: bloodhound/trunk/bloodhound_multiproduct/multiproduct/api.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/multiproduct/api.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/multiproduct/api.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/multiproduct/api.py Tue Feb 11
18:10:50 2014
@@ -47,7 +47,7 @@ from trac.wiki.parser import WikiParser
from multiproduct.dbcursor import GLOBAL_PRODUCT
from multiproduct.model import Product, ProductResourceMap, ProductSetting
from multiproduct.util import EmbeddedLinkFormatter, IDENTIFIER, \
- using_sqlite_backend, using_mysql_backend
+ using_mysql_backend, using_sqlite_backend
__all__ = ['MultiProductSystem', 'PRODUCT_SYNTAX_DELIMITER']
Modified: bloodhound/trunk/bloodhound_multiproduct/multiproduct/product_admin.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/multiproduct/product_admin.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/multiproduct/product_admin.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/multiproduct/product_admin.py Tue
Feb 11 18:10:50 2014
@@ -36,11 +36,11 @@ from trac.web.chrome import Chrome, add_
from multiproduct.env import ProductEnvironment
from multiproduct.model import Product
from multiproduct.perm import sudo
+from multiproduct.util import ReplacementComponent
import multiproduct.versioncontrol
import trac.versioncontrol.admin
from trac.versioncontrol import DbRepositoryProvider, RepositoryManager
-from multiproduct.util import ReplacementComponent
#--------------------------
# Product admin panel
Modified: bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/query.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/query.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/query.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/query.py Tue
Feb 11 18:10:50 2014
@@ -43,7 +43,7 @@ from trac.resource import Resource
from multiproduct.dbcursor import GLOBAL_PRODUCT
from multiproduct.env import lookup_product_env, resolve_product_href, \
- ProductEnvironment
+ ProductEnvironment
class ProductQuery(Query):
Modified: bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/web_ui.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/web_ui.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/web_ui.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/multiproduct/ticket/web_ui.py Tue
Feb 11 18:10:50 2014
@@ -32,14 +32,14 @@ from trac.resource import Resource, get_
from trac.search import search_to_sql, shorten_result
from trac.util.datefmt import from_utimestamp
from trac.util.translation import _, tag_
-from trac.wiki.parser import WikiParser
from multiproduct.api import MultiProductSystem, PRODUCT_SYNTAX_DELIMITER_RE
-from multiproduct.env import lookup_product_env, ProductEnvironment
-from multiproduct.util import IDENTIFIER
+from multiproduct.env import ProductEnvironment
from multiproduct.model import Product
+from multiproduct.util import IDENTIFIER
from multiproduct.web_ui import ProductModule
+
class ProductTicketModule(TicketModule):
"""Product Overrides for the TicketModule"""
@@ -60,8 +60,8 @@ class ProductTicketModule(TicketModule):
# If product arg present then redirect to
# /products/<qct_product>/newticket .
- if not productid and not qct_product and not isinstance(self.env,
- ProductEnvironment):
+ if not productid and not qct_product and \
+ not isinstance(self.env, ProductEnvironment):
default_product = self.env.config.get('ticket',
'default_product')
products = Product.select(self.env, {'fields': ['prefix']})
@@ -94,11 +94,11 @@ class ProductTicketModule(TicketModule):
# executed in global scope -> assume ticketid=UID, redirect to product
with self.env.db_direct_query as db:
rows = db("""SELECT id,product FROM ticket WHERE uid=%s""",
- (ticketid,))
+ (ticketid,))
if not rows:
msg = "Ticket with uid %(uid)s does not exist."
raise ResourceNotFound(_(msg, uid=ticketid),
- _("Invalid ticket number"))
+ _("Invalid ticket number"))
tid, prefix = rows[0]
req.redirect(req.href.products(prefix, 'ticket', tid))
@@ -159,10 +159,11 @@ class ProductTicketModule(TicketModule):
shorten_result(desc, terms))
# Attachments
- for result in AttachmentModule(self.env).get_search_results(
- req, ticket_realm, terms):
+ for result in AttachmentModule(self.env) \
+ .get_search_results(req, ticket_realm, terms):
yield result
+
class ProductReportModule(ReportModule):
"""Multiproduct replacement for ReportModule"""
@@ -184,8 +185,8 @@ class ProductReportModule(ReportModule):
for s in super(ProductReportModule, self).get_wiki_syntax():
yield s
# Previously unmatched prefix
- yield (r"!?\{(?P<prp>%s(?:\s+|(?:%s)))[0-9]+\}" %
- (IDENTIFIER, PRODUCT_SYNTAX_DELIMITER_RE),
+ yield (r"!?\{(?P<prp>%s(?:\s+|(?:%s)))[0-9]+\}"
+ % (IDENTIFIER, PRODUCT_SYNTAX_DELIMITER_RE),
lambda x, y, z: self._format_link(x, 'report', y[1:-1], y, z))
# Absolute product report syntax
yield (r"!?\{(?P<prns>global:|product:%s(?:\s+|:))"
@@ -193,8 +194,8 @@ class ProductReportModule(ReportModule):
lambda x, y, z: (self._format_mplink(x, 'report', y[1:-1], y,
z)))
def _format_link(self, formatter, ns, target, label, fullmatch=None):
- intertrac = formatter.shorthand_intertrac_helper(ns, target, label,
- fullmatch)
+ intertrac = \
+ formatter.shorthand_intertrac_helper(ns, target, label, fullmatch)
if intertrac:
return intertrac
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/versioncontrol/api.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/versioncontrol/api.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/versioncontrol/api.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/versioncontrol/api.py Tue
Feb 11 18:10:50 2014
@@ -27,7 +27,7 @@ from trac.versioncontrol.tests.api impor
from multiproduct.env import ProductEnvironment
from tests.env import MultiproductTestCase
-class ProductResourceManagerTestCase(ResourceManagerTestCase, \
+class ProductResourceManagerTestCase(ResourceManagerTestCase,
MultiproductTestCase):
@property
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/web_ui.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/web_ui.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/web_ui.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/web_ui.py Tue Feb 11
18:10:50 2014
@@ -32,9 +32,9 @@ from trac.web.main import RequestDispatc
from multiproduct.api import MultiProductSystem
from multiproduct.env import ProductEnvironment
+from multiproduct.hooks import ProductRequestWithSession
from multiproduct.model import Product
from multiproduct.web_ui import ProductModule
-from multiproduct.hooks import ProductRequestWithSession
from tests.env import MultiproductTestCase
Modified: bloodhound/trunk/trac/trac/resource.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/trac/trac/resource.py?rev=1567247&r1=1567246&r2=1567247&view=diff
==============================================================================
--- bloodhound/trunk/trac/trac/resource.py (original)
+++ bloodhound/trunk/trac/trac/resource.py Tue Feb 11 18:10:50 2014
@@ -791,8 +791,7 @@ def resource_exists(env, resource):
False
"""
try:
- rsys = ResourceSystem(manager_for_neighborhood(env,
- resource.neighborhood))
+ ResourceSystem(manager_for_neighborhood(env, resource.neighborhood))
except ResourceNotFound:
return False
manager = ResourceSystem(env).get_resource_manager(resource.realm)
