Merge branch 'landscapeio/master' into 'landscapeio/develop'

jakirkham · jakirkham · commit b4dca8702cb7 · 2016-08-19T20:24:23.000-04:00
diff --git a/pylint_plugin_utils/__init__.py b/pylint_plugin_utils/__init__.py
@@ -1,5 +1,8 @@
 import sys
-from pylint.utils import UnknownMessage
+try:
+    from pylint.utils import UnknownMessage
+except ImportError:
+    from pylint.utils import UnknownMessageError as UnknownMessage
 
 
 def get_class(module_name, kls):
diff --git a/setup.py b/setup.py
@@ -17,6 +17,7 @@
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
 )
 
 setup(

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`'Programming Language :: Python :: 2.7',`
`18`	`18`	`'Programming Language :: Python :: 3.3',`
`19`	`19`	`'Programming Language :: Python :: 3.4',`
	`20`	`+ 'Programming Language :: Python :: 3.5',`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`setup(`