gistfile1.diff

pyt@worker2:~/ab-buildout$ git diff HEAD
diff --git a/ab/apps/advert/forms.py b/ab/apps/advert/forms.py
index 608237e..e80f156 100755
--- a/ab/apps/advert/forms.py
+++ b/ab/apps/advert/forms.py
@@ -885,11 +885,6 @@ class Search_form(forms.Form):
                 regions.append(self.cleaned_data["%s%i"%( 'country', i)])
             elif self.cleaned_data["%s%i"%( 'region', i)]:
                 regions.append(self.cleaned_data["%s%i"%( 'region', i)])
-                               try:
-                    if self.cleaned_data["%s%i"%( 'region', i)].get_children():
-                        regions.extend(list(self.cleaned_data["%s%i"%( 'region', i)].get_children()))
-                except:
-                    pass
         
         q = q.filter(Q_makes[0] | Q_makes[1] | Q_makes[2])
         if regions:
diff --git a/ab/cron/statistic.py b/ab/cron/statistic.py
index 5fa91d6..f86c12e 100755
--- a/ab/cron/statistic.py
+++ b/ab/cron/statistic.py
@@ -31,7 +31,7 @@ def collect(*args, **kwargs):
 
     t = time.localtime()
     date = time.mktime((t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour-1, 0, 0, t.tm_wday, t.tm_yday, t.tm_isdst))
-    for rec in mongodb.statistics.find({'date': {'$lte': date}},timeout = False):
+    for rec in mongodb.statistics.find({'date': {'$lte': date}}):
         model = None
         try:
             model = eval(rec['class'])
diff --git a/ab/settings/production.py b/ab/settings/production.py
index e3fc150..26f99fe 100644
--- a/ab/settings/production.py
+++ b/ab/settings/production.py
@@ -76,10 +76,3 @@ try:
 except AutoReconnect:
     MONGODB = None
 
-#==============================================================================
-# CKEditor
-#==============================================================================
-CKEDITOR_MEDIA_PREFIX = os.path.join(MEDIA_URL,"ck_media/ckeditor/")
-CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'ck_uploads')
-CKEDITOR_UPLOAD_PREFIX = os.path.join(MEDIA_URL,"ck_uploads/")
-#------------------------------------------------------------------------------
\ No newline at end of file