Permalink
Browse files

bug 674526, address review comments by peterbe, r=peterbe

  • Loading branch information...
1 parent aef81fd commit e4344be95bcb561de725a218e817efbed0729e89 @Pike Pike committed Apr 17, 2012
View
@@ -1,39 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is l10n django site.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-'''Models to map bugzilla.mozilla.org l10n components and to store
-templated bug suites, to be filed on new localizations.
-'''
@@ -10,8 +10,9 @@ var Clusterer = function (data, smoothing_function) {
if (a[i].constructor == Array) {
flat = flat.concat(this._flatten(a[i]));
}
- else
+ else {
flat.push(a[i]);
+ }
}
return flat.sort(function (a, b) {
return a - b;
View
@@ -81,7 +81,7 @@ def __unicode__(self):
if 'mbdb' in settings.INSTALLED_APPS:
from mbdb.models import File
- File # silence check.py
+ File # silence pyflakes
else:
class File(models.Model):
class Meta:
@@ -91,7 +91,6 @@ class Meta:
def __unicode__(self):
return self.path
- File # silence check.py
class ChangesetManager(models.Manager):
View
@@ -43,10 +43,9 @@
try:
import cPickle as pickle
- pickle.dumps
+ pickle # silence pyflakes
except ImportError:
import pickle
- pickle.dumps
class PickledObject(str):
View
@@ -45,10 +45,9 @@
import time
try:
import json
- json.dumps # silence check.py
+ json.dumps # silence pyflakes
except:
from django.utils import simplejson as json
- json.dumps # silence check.py
from nose.tools import eq_, ok_
from test_utils import TestCase
from django import http
View
@@ -42,10 +42,9 @@
from django.shortcuts import get_object_or_404
try:
import json
- json.dumps # silence check.py
+ json.dumps # silence pyflakes
except ImportError:
from django.utils import simplejson as json
- json.dumps # silence check.py
from life.models import Repository, Changeset, Push, Branch
@@ -226,10 +226,9 @@ def content(self, request, signoffs):
try:
from mercurial.hg import repository
from mercurial.ui import ui as _ui
- _ui # silence check.py
+ _ui # silence pyflakes
except:
_ui = None
- _ui # silence check.py
if _ui is not None:
for plat in sorted(multis.keys()):
try:

0 comments on commit e4344be

Please sign in to comment.