Python 2/3 changes.

Author: vinnyrose

polymorphic_tree/admin/parentadmin.py

@@ -1,3 +1,4 @@
+from future.builtins import str, int
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db import transaction
@@ -168,10 +169,10 @@ def api_node_moved_view(self, request):
  Update the position of a node, from a API request.
  """
  try:
- moved_id = long(request.POST['moved_id'])
- target_id = long(request.POST['target_id'])
+ moved_id = int(request.POST['moved_id'])
+ target_id = int(request.POST['target_id'])
  position = request.POST['position']
- previous_parent_id = long(request.POST['previous_parent_id']) or None
+ previous_parent_id = int(request.POST['previous_parent_id']) or None
 
  # Not using .non_polymorphic() so all models are downcasted to the derived model.
  # This causes the signal below to be emitted from the proper class as well.

polymorphic_tree/models.py

@@ -3,11 +3,12 @@
 """
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from django.utils.six import integer_types
 from mptt.models import MPTTModel, MPTTModelBase, TreeForeignKey
 from polymorphic import PolymorphicModel
 from polymorphic.base import PolymorphicModelBase
 from polymorphic_tree.managers import PolymorphicMPTTModelManager
-
+from future.utils import with_metaclass
 
 def _get_base_polymorphic_model(ChildModel):
  """
@@ -45,7 +46,7 @@ def clean(self, value, model_instance):
  def _validate_parent(self, parent, model_instance):
  if not parent:
  return
- elif isinstance(parent, (int, long)):
+ elif isinstance(parent, integer_types):
  # TODO: Improve this code, it's a bit of a hack now because the base model is not known in the NodeTypePool.
  base_model = _get_base_polymorphic_model(model_instance.__class__)
 
@@ -61,11 +62,10 @@ def _validate_parent(self, parent, model_instance):
 
 
 
-class PolymorphicMPTTModel(MPTTModel, PolymorphicModel):
+class PolymorphicMPTTModel(with_metaclass(PolymorphicMPTTModelBase, MPTTModel, PolymorphicModel)):
  """
  The base class for all nodes; a mapping of an URL to content (e.g. a HTML page, text file, blog, etc..)
  """
- __metaclass__ = PolymorphicMPTTModelBase
 
  #: Whether the node type allows to have children.
  can_have_children = True

polymorphic_tree/templatetags/polymorphic_tree_admin_tags.py

@@ -1,3 +1,4 @@
+from future.builtins import next
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.contenttypes.models import ContentType
 from django.template import Library, Node, TemplateSyntaxError, Variable
@@ -53,7 +54,7 @@ def _render_node(self, context, cl, node):
  bits.append(self._render_node(context, cl, child))
 
  columns = self._get_column_repr(cl, node) # list(tuple(name, html), ..)
- first_real_column = (col for col in columns if col[0] != 'action_checkbox').next()
+ first_real_column = next(col for col in columns if col[0] != 'action_checkbox')
 
  context['columns'] = columns
  context['other_columns'] = [col for col in columns if col[0] not in ('action_checkbox', first_real_column[0])]

polymorphic_tree/templatetags/stylable_admin_list.py

@@ -11,6 +11,7 @@
 
 This feature can be activated by simply extending the template stylable/admin/change_list.html
 """
+from future.builtins import zip, str
 from django.conf import settings
 from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
 from django.core.exceptions import ObjectDoesNotExist
@@ -83,7 +84,7 @@ def stylable_result_headers(cl):
  else:
  header['class_attrib'] = mark_safe(' class="col-%s"' % field_name)
 
- if header.has_key('url_primary') and not header.has_key('url'):
+ if 'url_primary' in header and 'url' not in header:
  header['url'] = header['url_primary'] # Django 1.3 template compatibility.
 
  yield header

setup.py

@@ -39,9 +39,10 @@ def find_version(*parts):
  'django-polymorphic>=0.4.2',
  'django-mptt>=0.5.1',
  'django-tag-parser>=1.0.0',
+ 'future>=0.12.2',
  ],
  requires=[
- 'Django (>=1.3)', # Using staticfiles
+ 'Django (>=1.4)', # Using staticfiles
  ],
  description="A polymorphic mptt structure to display content in a tree.",
  long_description=read('README.rst'),
@@ -66,6 +67,7 @@ def find_version(*parts):
  'Programming Language :: Python',
  'Programming Language :: Python :: 2.6',
  'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
  'Topic :: Internet :: WWW/HTTP',
  'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
  'Topic :: Software Development :: Libraries :: Python Modules',