Commits

jaraco  committed 9dc6a87

Removed dependence on jaraco.util and enum, bumped to 1.2.2

  • Participants
  • Parent commits e8fb8fe

Comments (0)

Files changed (4)

File docs/index.txt

 Changes
 -------
 
+1.2.2
+~~~~~
+
+* Removed dependence on enum and jaraco.util
+
 1.2
 ~~~
 

File jaraco/nxt/_enum.py

 
 	@classmethod
 	def dictionary(cls):
-		from jaraco.util.dictlib import DictFilter
-		return dict(DictFilter(cls.__dict__, include_pattern='[^_].*'))
+		"Return all of the class attributes that do not begin with _"
+		items = cls.__dict__.items()
+		pub_items = (
+			(key, value)
+			for (key, value) in items
+			if not key.startswith('_')
+			)
+		return dict(pub_items)
 
 	@classmethod
 	def keys(cls):

File jaraco/nxt/controller.py

 __svnauthor__='$Author$'[9:-2]
 
 import jaraco.nxt
-from jaraco.input import Joystick
+try:
+	from jaraco.input import Joystick
+except ImportError:
+	import sys
+	from textwrap import dedent
+	msg = dedent("""
+		%s module requires jaraco.input.
+		Unable to import jaraco.input.
+		Consider installing with easy_install jaraco.input.
+		""".strip() % __name__)
 from jaraco.nxt import Connection
 from jaraco.nxt.messages import SetOutputState, OutputPort, RunState
 
 name = 'jaraco.nxt'
 
 setup (name = name,
-		version = '1.2.1',
+		version = '1.2.2',
 		description = 'Logo Mindstorms NXT Routines',
 		long_description = open('docs/index.txt').read().strip(),
 		author = 'Jason R. Coombs',
 		),
 		install_requires=[
 			'pyserial>=2.2',
-			'enum>=0.4.3',
-			'jaraco.util>=2.0',
 		],
 		extras_require = {
 			'input': 'jaraco.input>=1.0dev',