Changed the way we load the version in setup.py in order to properly perform coverage.

Also added fallback on add_attachment for the case where we do not have the filestreamer module.

Author: ssbarnea

.coveragerc

@@ -1,6 +1,7 @@
 [run]
 data_file = .coverage
 source = jira
+branch = True
 
 [report]
 exclude_lines =
@@ -9,3 +10,5 @@ exclude_lines =
     raise AssertionError
     raise NotImplementedError
     if __name__ == .__main__.:
+
+ignore_errors = True

README.rst

@@ -41,7 +41,7 @@ Feeling impatient? I like your style.
 
 .. code-block:: python
 
-        from jira.client import JIRA
+        from jira import JIRA
 
         jira = JIRA('https://jira.atlassian.com')
 

examples/basic_auth.py

@@ -1,7 +1,7 @@
 # This script shows how to connect to a JIRA instance with a
 # username and password over HTTP BASIC authentication.
 
-from jira.client import JIRA
+from jira import JIRA
 
 # By default, the client will connect to a JIRA instance started from the Atlassian Plugin SDK.
 # See

examples/basic_use.py

@@ -1,7 +1,7 @@
 # This script shows how to use the client in anonymous mode
 # against jira.atlassian.com.
 
-from jira.client import JIRA
+from jira import JIRA
 
 # By default, the client will connect to a JIRA instance started from the Atlassian Plugin SDK
 # (see https://developer.atlassian.com/display/DOCS/Installing+the+Atlassian+Plugin+SDK for details).

jira/client.py

@@ -27,8 +27,11 @@
 
 from six import string_types, integer_types
 from six.moves import html_parser
-from requests_toolbelt import MultipartEncoder
 import requests
+try:
+    from requests_toolbelt import MultipartEncoder
+except:
+    pass
 
 # JIRA specific resources
 from jira.resources import Resource, Issue, Comment, Project, Attachment, Component, Dashboard, Filter, Votes, Watchers, \
@@ -37,6 +40,7 @@
 # GreenHopper specific resources
 from jira.resources import GreenHopperResource, Board, Sprint
 from jira.resilientsession import ResilientSession
+from jira import __version__
 from .utils import threaded_requests, json_loads, JIRAError, CaseInsensitiveDict
 
 try:
@@ -52,6 +56,9 @@
 # if encoding != 'UTF8':
 #    warnings.warn("Python default encoding is '%s' instead of 'UTF8' which means that there is a big change of having problems. Possible workaround http://stackoverflow.com/a/17628350/99834" % encoding)
 
+# we do want to log warrning from our code
+logging.captureWarnings(True)
+
 
 def translate_resource_args(func):
     """
@@ -205,6 +212,20 @@ def __init__(self, server=None, options=None, basic_auth=None, oauth=None, valid
             globals()['logging'].error("invalid server_info: %s", si)
             raise e
 
+        self._check_update_()
+
+    def _check_update_(self):
+        # check if the current version of the library is outdated
+        import json
+        import urllib2
+        response = urllib2.urlopen(
+            "http://pypi.python.org/pypi/jira/json")
+        data = json.load(response)
+        released_version = data['info']['version']
+        if released_version > __version__:
+            warnings.warn("You are running an outdated version of JIRA Python %s. Current version is %s. Do not file any bugs against older versions." % (
+                __version__, released_version))
+
     def __del__(self):
         session = getattr(self, "_session", None)
         if session is not None:
@@ -355,14 +376,21 @@ def add_attachment(self, issue, attachment, filename=None):
         if not fname:
             fname = os.path.basename(attachment.name)
 
-        def file_stream():
-            return MultipartEncoder(
-                fields={
-                    'file': (fname, attachment, 'text/plain')}
-            )
-        m = file_stream()
-        r = self._session.post(
-            url, data=m, headers=CaseInsensitiveDict({'content-type': m.content_type}), retry_data=file_stream)  # 'multipart/form-data'
+        if 'MultipartEncoder' not in globals():
+            r = self._session.post(
+                url,
+                files={
+                    'file': (fname, attachment, 'application/octet-stream')},
+                headers=CaseInsensitiveDict({'content-type': None}))
+        else:
+            def file_stream():
+                return MultipartEncoder(
+                    fields={
+                        'file': (fname, attachment, 'text/plain')}
+                )
+            m = file_stream()
+            r = self._session.post(
+                url, data=m, headers=CaseInsensitiveDict({'content-type': m.content_type}), retry_data=file_stream)
 
         attachment = Attachment(self._options, self._session, json_loads(r)[0])
         return attachment
@@ -2402,8 +2430,7 @@ def create_sprint(self, name, board_id, startDate=None, endDate=None):
               "remoteLinks": []
         }"""
 
-        payload = {}
-        payload['name'] = name
+        payload = {'name': name}
         if startDate:
             payload["startDate"] = startDate
         if endDate:

jira/jirashell.py

@@ -23,8 +23,7 @@
 from requests_oauthlib import OAuth1
 
 import webbrowser
-from jira.client import JIRA
-from jira import __version__
+from jira import JIRA, __version__
 
 CONFIG_PATH = os.path.join(
     os.path.expanduser('~'), '.jira-python', 'jirashell.ini')

jira/version.py

@@ -3,4 +3,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into the jira module
-__version__ = '0.35'
+__version__ = '0.36'

setup.py

@@ -1,20 +1,27 @@
 #!/usr/bin/env python
 import logging
 import os
+import re
 import sys
 import warnings
 
 from setuptools import setup, find_packages, Command
 from setuptools.command.test import test as TestCommand
 
 NAME = "jira"
-from jira import __version__
 
+# Get the version - do not use normal import because it does break coverage
+base_path = os.path.dirname(__file__)
+fp = open(os.path.join(base_path, NAME, 'version.py'))
+__version__ = re.compile(r".*__version__ = '(.*?)'",
+                     re.S).match(fp.read()).group(1)
+fp.close()
 
 
 # this should help getting annoying warnings from inside distutils
 warnings.simplefilter('ignore', UserWarning)
 
+
 class PyTest(TestCommand):
     user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
 
@@ -47,6 +54,7 @@ def initialize_options(self):
         try:
             import coveralls
             self.pytest_args.append("--cov=%s" % NAME)
+            self.pytest_args.extend(["--cov-report", "term"])
             self.pytest_args.extend(["--cov-report", "xml"])
 
         except ImportError:
@@ -133,7 +141,7 @@ def run(self):
     bugtrack_url='https://github.com/pycontribs/jira/issues',
     home_page='https://github.com/pycontribs/jira',
     keywords='jira atlassian rest api',
-    
+
     classifiers=[
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.5',
@@ -146,7 +154,7 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules',
-		'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',