[#7864] update pyflakes to avoid invalid warnings from @property.setter dupe fn name; fix new pyflakes warnings
diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py
index 36aa29e..d941e9e 100644
--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -359,8 +359,8 @@
def dfs(root, graph, depth=0):
yield depth, root
- for c in graph[root][1]:
- for r in dfs(c, graph, depth + 1):
+ for node in graph[root][1]:
+ for r in dfs(node, graph, depth + 1):
yield r
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index 34210ce..b36449c 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -254,8 +254,8 @@
columns = []
def find_column(columns):
- for i, c in enumerate(columns):
- if c is None:
+ for i, col in enumerate(columns):
+ if col is None:
return i
columns.append(None)
return len(columns) - 1
@@ -757,8 +757,8 @@
visited.add(next)
yield next
for p in parents[next]:
- for c in children[p]:
- if c not in visited:
+ for child in children[p]:
+ if child not in visited:
break
else:
to_visit.append(p)
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index a85680b..ee47274 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -275,18 +275,18 @@
_id = obj['id'].split('#')[1]
obj['object'] = mongo_objects.get(_id)
# Some objects can be deleted, but still have index in solr, should skip those
- objects = [obj for obj in objects if obj.get('object')]
+ objects = [o for o in objects if o.get('object')]
def convert_fields(obj):
# throw the type away (e.g. '_s' from 'url_s')
result = {}
- for k,v in obj.iteritems():
+ for k,val in obj.iteritems():
name = k.rsplit('_', 1)
if len(name) == 2:
name = name[0]
else:
name = k
- result[name] = v
+ result[name] = val
return result
return {
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 3cd14fb..36932a3 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -583,8 +583,8 @@
txns = []
to_rollback = []
try:
- for c in connections:
- txn = c.begin_twophase()
+ for conn in connections:
+ txn = conn.begin_twophase()
txns.append(txn)
to_rollback.append(txn)
yield
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index b66ecec..db460a1 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -551,7 +551,7 @@
try:
App = ac.load()
# If so, we don't want it listed
- except KeyError as e:
+ except KeyError:
log.exception('AppConfig %s references invalid tool %s',
ac._id, ac.tool_name)
continue
diff --git a/Allura/allura/tests/test_commands.py b/Allura/allura/tests/test_commands.py
index 1c298c5..f6800b7 100644
--- a/Allura/allura/tests/test_commands.py
+++ b/Allura/allura/tests/test_commands.py
@@ -193,11 +193,10 @@
cmd._update_indexes(collection, indexes)
collection_call_order = {}
- for i, call in enumerate(collection.mock_calls):
- method_name = call[0]
+ for i, call_ in enumerate(collection.mock_calls):
+ method_name = call_[0]
collection_call_order[method_name] = i
- assert collection_call_order['ensure_index'] < collection_call_order[
- 'drop_index'], collection.mock_calls
+ assert collection_call_order['ensure_index'] < collection_call_order['drop_index'], collection.mock_calls
def test_update_indexes_unique_changes(self):
collection = Mock(name='collection')
diff --git a/Allura/allura/tests/unit/test_repo.py b/Allura/allura/tests/unit/test_repo.py
index 7411db5..9008571 100644
--- a/Allura/allura/tests/unit/test_repo.py
+++ b/Allura/allura/tests/unit/test_repo.py
@@ -42,9 +42,9 @@
M.repository.CommitDoc.make(dict(
_id=str(i)))
for i in range(10)]
- for p, c in zip(commits, commits[1:]):
- p.child_ids = [c._id]
- c.parent_ids = [p._id]
+ for p, com in zip(commits, commits[1:]):
+ p.child_ids = [com._id]
+ com.parent_ids = [p._id]
for ci in commits:
ci.m.save()
self.commits = commits
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index cf70b7d..dcc93d1 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -359,8 +359,7 @@
if not oid.startswith(prefix):
break
seen_oids.add(oid)
- return [
- oid for oid in oids if oid not in seen_oids]
+ return [o for o in oids if o not in seen_oids]
def refresh_commit_info(self, oid, seen_object_ids, lazy=True):
from allura.model.repository import CommitDoc
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index c1865e9..affe94b 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -282,8 +282,8 @@
for a in artifacts:
users.add(a['submitter'])
users.add(a['assigned_to'])
- for c in a['comments']:
- users.add(c['submitter'])
+ for com in a['comments']:
+ users.add(com['submitter'])
return users
def find_unknown_users(self, users):
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index b846f42..4f20d88 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -57,7 +57,7 @@
from allura.lib.widgets.subscriptions import SubscribeForm
from allura.lib.plugin import ImportIdConverter
from allura.controllers import AppDiscussionController, AppDiscussionRestController
-from allura.controllers import attachments as ac
+from allura.controllers import attachments as att
from allura.controllers import BaseController
from allura.controllers.feed import FeedArgs, FeedController
@@ -1531,12 +1531,12 @@
}
-class AttachmentController(ac.AttachmentController):
+class AttachmentController(att.AttachmentController):
AttachmentClass = TM.TicketAttachment
edit_perm = 'update'
-class AttachmentsController(ac.AttachmentsController):
+class AttachmentsController(att.AttachmentsController):
AttachmentControllerClass = AttachmentController
NONALNUM_RE = re.compile(r'\W+')
diff --git a/requirements.txt b/requirements.txt
index 6de0f60..5664528 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -74,7 +74,7 @@
ipython==1.2.1
mock==1.0.1
nose==1.3.4
-pyflakes==0.5.0
+pyflakes==0.8.1
WebTest==1.4.0
testfixtures==3.0.0
q==2.3
