From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 5 Dec 2014 03:51:54 +0000 (+0000)
Subject: Merge "Get rid of py26 references: OrderedDict, httplib, xml testing"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1b0c20e3269d605ed3748dfae442a546a84c2336;p=openstack-build%2Fneutron-build.git

Merge "Get rid of py26 references: OrderedDict, httplib, xml testing"
---

1b0c20e3269d605ed3748dfae442a546a84c2336
diff --cc neutron/tests/base.py
index 07914f531,420c8ed9d..56678fe7b
--- a/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@@ -25,9 -25,9 +25,8 @@@ errors due to duplicate configuration d
  
  import logging as std_logging
  import os.path
- import sys
  
  import fixtures
 -import mock
  from oslo.config import cfg
  from oslo.messaging import conffixture as messaging_conffixture