From e4b1ed00dfb6a7e299cc5ff75f8b3b4c7f5cf8f4 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 2 Apr 2018 14:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/fangjia/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 1b41d36..50eda18 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -273,11 +273,7 @@ def dis_feature(query, fields=None): # db1 = client1.fangjia # dsf = db1.average_statistics # s = time.time() -<<<<<<< HEAD - seawater105 = get_collection("fangjia_stat", "district_feature",config.get_mongodb_host(), 27017) -======= seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port()) ->>>>>>> 09017dda8ec82bf1b4eea67648f8c33417df32f7 for err_count in range(0, 10): try: