From 830fa56d388a4b0134b4acf41fc11d3b24835aa5 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Sat, 22 Sep 2012 00:42:44 -0400
Subject: [PATCH] Update the required python-magic version

---
 apps/trash/api.py                     | 19 --------
 apps/trash/migrations/0001_initial.py | 66 ---------------------------
 requirements/production.txt           |  3 +-
 3 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 apps/trash/api.py
 delete mode 100644 apps/trash/migrations/0001_initial.py

diff --git a/apps/trash/api.py b/apps/trash/api.py
deleted file mode 100644
index 0c2ffe182a..0000000000
--- a/apps/trash/api.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from __future__ import absolute_import
-
-from common.querysets import CustomizableQuerySet
-
-from .models import new_delete_method, TrashableQuerySetManager
-
-trashable_models = []        
-
-
-def make_trashable(model, trash_can):
-    trashable_models.append(model)
-    
-    old_manager = getattr(model, '_default_manager')
-    model.add_to_class('objects', CustomizableQuerySet.as_manager(TrashableQuerySetManager))
-    model._default_manager = model.objects
-    model.add_to_class('trash_passthru', old_manager)
-
-    old_delete_method = model.delete
-    model.delete = new_delete_method(trash_can, old_delete_method)
diff --git a/apps/trash/migrations/0001_initial.py b/apps/trash/migrations/0001_initial.py
deleted file mode 100644
index df5c2ef63e..0000000000
--- a/apps/trash/migrations/0001_initial.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'TrashCan'
-        db.create_table('trash_trashcan', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=32)),
-        ))
-        db.send_create_signal('trash', ['TrashCan'])
-
-        # Adding model 'TrashCanItem'
-        db.create_table('trash_trashcanitem', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('trash_can', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['trash.TrashCan'])),
-            ('trashed_at', self.gf('django.db.models.fields.DateTimeField')()),
-            ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
-            ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
-        ))
-        db.send_create_signal('trash', ['TrashCanItem'])
-
-        # Adding unique constraint on 'TrashCanItem', fields ['trash_can', 'content_type', 'object_id']
-        db.create_unique('trash_trashcanitem', ['trash_can_id', 'content_type_id', 'object_id'])
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'TrashCanItem', fields ['trash_can', 'content_type', 'object_id']
-        db.delete_unique('trash_trashcanitem', ['trash_can_id', 'content_type_id', 'object_id'])
-
-        # Deleting model 'TrashCan'
-        db.delete_table('trash_trashcan')
-
-        # Deleting model 'TrashCanItem'
-        db.delete_table('trash_trashcanitem')
-
-
-    models = {
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'trash.trashcan': {
-            'Meta': {'object_name': 'TrashCan'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'})
-        },
-        'trash.trashcanitem': {
-            'Meta': {'unique_together': "(('trash_can', 'content_type', 'object_id'),)", 'object_name': 'TrashCanItem'},
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'trash_can': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['trash.TrashCan']"}),
-            'trashed_at': ('django.db.models.fields.DateTimeField', [], {})
-        }
-    }
-
-    complete_apps = ['trash']
\ No newline at end of file
diff --git a/requirements/production.txt b/requirements/production.txt
index be74918424..de7e66291e 100644
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -13,8 +13,9 @@ django-taggit==0.9.3
 
 # Mimetypes
 
--e git://github.com/ahupp/python-magic.git@a75cf0a4a7790eb106155c947af9612f15693b6e#egg=python-magic
+python-magic==0.4.3
 
+# PDF
 slate==0.3
 pdfminer==20110227