Merge pull request #85 from t2y/fix-double-imported

Lukasa · Lukasa · commit ab3718547cd5 · 2015-02-19T09:05:54.000Z
Fixed to clean up double imported constants
diff --git a/hyper/http20/hpack.py b/hyper/http20/hpack.py
@@ -13,7 +13,7 @@
 from ..compat import to_byte
 from .huffman import HuffmanDecoder, HuffmanEncoder
 from hyper.http20.huffman_constants import (
-    REQUEST_CODES, REQUEST_CODES_LENGTH, REQUEST_CODES, REQUEST_CODES_LENGTH
+    REQUEST_CODES, REQUEST_CODES_LENGTH
 )
 from .exceptions import HPACKEncodingError
 
diff --git a/test/test_hpack_integration.py b/test/test_hpack_integration.py
@@ -7,7 +7,7 @@
 from hyper.http20.hpack import Decoder, Encoder
 from hyper.http20.huffman import HuffmanDecoder, HuffmanEncoder
 from hyper.http20.huffman_constants import (
-    REQUEST_CODES, REQUEST_CODES_LENGTH, REQUEST_CODES, REQUEST_CODES_LENGTH
+    REQUEST_CODES, REQUEST_CODES_LENGTH
 )
 from binascii import unhexlify
 from pytest import skip

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`from ..compat import to_byte`
`14`	`14`	`from .huffman import HuffmanDecoder, HuffmanEncoder`
`15`	`15`	`from hyper.http20.huffman_constants import (`
`16`		`- REQUEST_CODES, REQUEST_CODES_LENGTH, REQUEST_CODES, REQUEST_CODES_LENGTH`
	`16`	`+ REQUEST_CODES, REQUEST_CODES_LENGTH`
`17`	`17`	`)`
`18`	`18`	`from .exceptions import HPACKEncodingError`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`from hyper.http20.hpack import Decoder, Encoder`
`8`	`8`	`from hyper.http20.huffman import HuffmanDecoder, HuffmanEncoder`
`9`	`9`	`from hyper.http20.huffman_constants import (`
`10`		`- REQUEST_CODES, REQUEST_CODES_LENGTH, REQUEST_CODES, REQUEST_CODES_LENGTH`
	`10`	`+ REQUEST_CODES, REQUEST_CODES_LENGTH`
`11`	`11`	`)`
`12`	`12`	`from binascii import unhexlify`
`13`	`13`	`from pytest import skip`