summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-02-27 23:26:07 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-02-27 23:26:07 -0500
commitecd55063697ed23d125098fd143bcefbcc3b942d (patch)
treef976d3ddbd86dead9a91d86bd4b274f1615700b6
parente554090b2e9cd08a817f02e2196dd5c359dae0e9 (diff)
downloadaskbot-ecd55063697ed23d125098fd143bcefbcc3b942d.tar.gz
askbot-ecd55063697ed23d125098fd143bcefbcc3b942d.tar.bz2
askbot-ecd55063697ed23d125098fd143bcefbcc3b942d.zip
two bugfixes
-rwxr-xr-xfbconnect/pjson.py4
-rwxr-xr-xforum/models/repute.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/fbconnect/pjson.py b/fbconnect/pjson.py
index 6a395b97..273b684e 100755
--- a/fbconnect/pjson.py
+++ b/fbconnect/pjson.py
@@ -155,8 +155,8 @@ class JsonReader(object):
except KeyError:
try:
result = int(ch)
- except ValueError:
- raise ReadException, "The character %s is not a hex digit." % ch
+ except ValueError:
+ raise ReadException, "The character %s is not a hex digit." % ch
return result
def _readComment(self):
diff --git a/forum/models/repute.py b/forum/models/repute.py
index cac761da..a47ce47d 100755
--- a/forum/models/repute.py
+++ b/forum/models/repute.py
@@ -83,7 +83,7 @@ class ReputeManager(models.Manager):
today = datetime.date.today()
sums = self.filter(models.Q(reputation_type=1) | models.Q(reputation_type=-8),
user=user, reputed_at__range=(today, today + datetime.timedelta(1))). \
- agregate(models.Sum('positive'), models.SUM('negative'))
+ agregate(models.Sum('positive'), models.Sum('negative'))
return sums['positive__sum'] + sums['negative__sum']
else:
@@ -106,4 +106,4 @@ class Repute(models.Model):
class Meta:
app_label = 'forum'
- db_table = u'repute' \ No newline at end of file
+ db_table = u'repute'