python 2.6 support, tests and fixes

Author: maxtepkeev

.travis.yml

@@ -1,12 +1,14 @@
 language: python
 python:
-  - "2.7"
-  - "3.2"
-  - "3.3"
+  - 2.6
+  - 2.7
+  - 3.2
+  - 3.3
 install:
-  - "pip install -r tests/requirements.txt --use-mirrors"
-  - "pip install coveralls"
+  - pip install -r tests/requirements.txt --use-mirrors
+  - pip install coveralls
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
 script:
-  - "nosetests --with-coverage --cover-package=redmine"
+  - nosetests --with-coverage --cover-erase --cover-package=redmine
 after_success:
-  - "coveralls"
+  - coveralls

docs/changelog.rst

@@ -4,6 +4,8 @@ Changelog
 0.1.1 (2014-0X-XX)
 ------------------
 
+- Added: Python 2.6 support
+- Fixed: Resource representation was broken in Python 2.x, i.e. __repr__()
 - Fixed: dir() call on a resource object didn't work in Python 3.2.x
 - Changed: WikiPage resource refresh() method now automatically determines it's project_id
 

redmine/managers.py

@@ -84,7 +84,7 @@ def get(self, resource_id, **params):
         if self.resource_class.query_one is None or self.resource_class.container_one is None:
             raise ResourceBadMethodError()
 
-        self.url = '{}{}'.format(self.redmine.url, self.resource_class.query_one.format(resource_id, **params))
+        self.url = '{0}{1}'.format(self.redmine.url, self.resource_class.query_one.format(resource_id, **params))
         self.params = params
         self.container = self.resource_class.container_one
 
@@ -98,7 +98,7 @@ def all(self, **params):
         if self.resource_class.query_all is None or self.resource_class.container_all is None:
             raise ResourceBadMethodError()
 
-        self.url = '{}{}'.format(self.redmine.url, self.resource_class.query_all)
+        self.url = '{0}{1}'.format(self.redmine.url, self.resource_class.query_all)
         self.params = params
         self.container = self.resource_class.container_all
         return ResourceSet(self)
@@ -112,11 +112,11 @@ def filter(self, **filters):
             raise ResourceNoFiltersProvidedError()
 
         try:
-            self.url = '{}{}'.format(self.redmine.url, self.resource_class.query_filter.format(**filters))
+            self.url = '{0}{1}'.format(self.redmine.url, self.resource_class.query_filter.format(**filters))
             self.container = self.resource_class.container_filter.format(**filters)
         except KeyError:
             if self.resource_class.query_all is not None and self.resource_class.container_all is not None:
-                self.url = '{}{}'.format(self.redmine.url, self.resource_class.query_all)
+                self.url = '{0}{1}'.format(self.redmine.url, self.resource_class.query_all)
                 self.container = self.resource_class.container_all
             else:
                 raise ResourceFilterError()

redmine/resources.py

@@ -1,3 +1,4 @@
+import sys
 from datetime import datetime
 from redmine.managers import ResourceManager
 from redmine.exceptions import ResourceAttrError
@@ -84,7 +85,7 @@ def __getattr__(self, item):
 
             # If item should be requested from Redmine, let's do it
             elif item in _RESOURCE_RELATIONS_MAP and self.attributes[item] is None:
-                filters = {'{}_id'.format(self.__class__.__name__.lower()): self.id}
+                filters = {'{0}_id'.format(self.__class__.__name__.lower()): self.id}
                 manager = ResourceManager(self.manager.redmine, _RESOURCE_RELATIONS_MAP[item])
                 return manager.filter(**filters)
 
@@ -121,11 +122,11 @@ def __iter__(self):
 
     def __repr__(self):
         """Official representation of the Redmine resource"""
-        return '<{}.{} #{} "{}">'.format(
+        return '<{0}.{1} #{2} "{3}">'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.id,
-            self.name
+            self.name.encode('utf-8') if sys.version_info[0] < 3 else self.name
         )
 
 
@@ -134,7 +135,7 @@ class Project(_Resource):
     container_all = 'projects'
     container_one = 'project'
     query_all = '/projects.json'
-    query_one = '/projects/{}.json'
+    query_one = '/projects/{0}.json'
 
     _relations = {
         'wiki_pages': None,
@@ -152,7 +153,7 @@ class Issue(_Resource):
     container_one = 'issue'
     container_filter = 'issues'
     query_all = '/issues.json'
-    query_one = '/issues/{}.json'
+    query_one = '/issues/{0}.json'
     query_filter = '/issues.json'
 
     _relations = {
@@ -162,14 +163,14 @@ class Issue(_Resource):
 
     def __repr__(self):
         try:
-            return '<{}.{} #{} "{}">'.format(
+            return '<{0}.{1} #{2} "{3}">'.format(
                 self.__class__.__module__,
                 self.__class__.__name__,
                 self.id,
-                self.subject
+                self.subject.encode('utf-8') if sys.version_info[0] < 3 else self.subject
             )
         except ResourceAttrError:
-            return '<{}.{} #{}>'.format(
+            return '<{0}.{1} #{2}>'.format(
                 self.__class__.__module__,
                 self.__class__.__name__,
                 self.id
@@ -182,11 +183,11 @@ class TimeEntry(_Resource):
     container_one = 'time_entry'
     container_filter = 'time_entries'
     query_all = '/time_entries.json'
-    query_one = '/time_entries/{}.json'
+    query_one = '/time_entries/{0}.json'
     query_filter = '/issues/{issue_id}/time_entries.json'
 
     def __repr__(self):
-        return '<{}.{} #{}>'.format(
+        return '<{0}.{1} #{2}>'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.id
@@ -202,22 +203,22 @@ class Enumeration(_Resource):
 class Attachment(_Resource):
     version = '1.3'
     container_one = 'attachment'
-    query_one = '/attachments/{}.json'
+    query_one = '/attachments/{0}.json'
 
     def __repr__(self):
-        return '<{}.{} #{} "{}">'.format(
+        return '<{0}.{1} #{2} "{3}">'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.id,
-            self.filename
+            self.filename.encode('utf-8') if sys.version_info[0] < 3 else self.filename
         )
 
 
 class IssueJournal(_Resource):
     version = '1.0'
 
     def __repr__(self):
-        return '<{}.{} #{}>'.format(
+        return '<{0}.{1} #{2}>'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.id
@@ -229,16 +230,16 @@ class WikiPage(_Resource):
     container_filter = 'wiki_pages'
     container_one = 'wiki_page'
     query_filter = '/projects/{project_id}/wiki/index.json'
-    query_one = '/projects/{project_id}/wiki/{}.json'
+    query_one = '/projects/{project_id}/wiki/{0}.json'
 
     def refresh(self):
         return self.manager.get(self.title, **{'project_id': self.manager.params['project_id']})
 
     def __repr__(self):
-        return '<{}.{} "{}">'.format(
+        return '<{0}.{1} "{2}">'.format(
             self.__class__.__module__,
             self.__class__.__name__,
-            self.title
+            self.title.encode('utf-8') if sys.version_info[0] < 3 else self.title
         )
 
 
@@ -247,10 +248,10 @@ class ProjectMembership(_Resource):
     container_filter = 'memberships'
     container_one = 'membership'
     query_filter = '/projects/{project_id}/memberships.json'
-    query_one = '/memberships/{}.json'
+    query_one = '/memberships/{0}.json'
 
     def __repr__(self):
-        return '<{}.{} #{}>'.format(
+        return '<{0}.{1} #{2}>'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.id
@@ -262,18 +263,18 @@ class IssueCategory(_Resource):
     container_filter = 'issue_categories'
     container_one = 'issue_category'
     query_filter = '/projects/{project_id}/issue_categories.json'
-    query_one = '/issue_categories/{}.json'
+    query_one = '/issue_categories/{0}.json'
 
 
 class IssueRelation(_Resource):
     version = '1.3'
     container_filter = 'relations'
     container_one = 'relation'
     query_filter = '/issues/{issue_id}/relations.json'
-    query_one = '/relations/{}.json'
+    query_one = '/relations/{0}.json'
 
     def __repr__(self):
-        return '<{}.{} #{}>'.format(
+        return '<{0}.{1} #{2}>'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.id
@@ -285,7 +286,7 @@ class Version(_Resource):
     container_filter = 'versions'
     container_one = 'version'
     query_filter = '/projects/{project_id}/versions.json'
-    query_one = '/versions/{}.json'
+    query_one = '/versions/{0}.json'
 
 
 class User(_Resource):
@@ -294,19 +295,19 @@ class User(_Resource):
     container_one = 'user'
     container_filter = 'users'
     query_all = '/users.json'
-    query_one = '/users/{}.json'
+    query_one = '/users/{0}.json'
     query_filter = '/users.json'
 
     def __repr__(self):
         try:
             return super(User, self).__repr__()
         except ResourceAttrError:
-            return '<{}.{} #{} "{} {}">'.format(
+            return '<{0}.{1} #{2} "{3} {4}">'.format(
                 self.__class__.__module__,
                 self.__class__.__name__,
                 self.id,
-                self.firstname,
-                self.lastname
+                self.firstname.encode('utf-8') if sys.version_info[0] < 3 else self.firstname,
+                self.lastname.encode('utf-8') if sys.version_info[0] < 3 else self.lastname
             )
 
 
@@ -315,15 +316,15 @@ class Group(_Resource):
     container_all = 'groups'
     container_one = 'group'
     query_all = '/groups.json'
-    query_one = '/groups/{}.json'
+    query_one = '/groups/{0}.json'
 
 
 class Role(_Resource):
     version = '1.4'
     container_all = 'roles'
     container_one = 'role'
     query_all = '/roles.json'
-    query_one = '/roles/{}.json'
+    query_one = '/roles/{0}.json'
 
 
 class News(_Resource):

redmine/resultsets.py

@@ -61,7 +61,7 @@ def __len__(self):
 
     def __repr__(self):
         """Official representation of ResourceSet object"""
-        return '<{}.{} object with {} resources>'.format(
+        return '<{0}.{1} object with {2} resources>'.format(
             self.__class__.__module__,
             self.__class__.__name__,
             self.manager.resource_class.__name__

tests/__init__.py

@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 try:
     from unittest import mock