@@ -1010,10 +1010,8 @@ def format_stdin_to_stdout(
10101010
10111011 if content is None :
10121012 src , encoding , newline = decode_bytes (sys .stdin .buffer .read (), mode )
1013- elif Preview .normalize_cr_newlines in mode :
1014- src , encoding , newline = content , "utf-8" , "\n "
10151013 else :
1016- src , encoding , newline = content , "utf-8" , ""
1014+ src , encoding , newline = content , "utf-8" , "\n "
10171015
10181016 dst = src
10191017 try :
@@ -1029,12 +1027,8 @@ def format_stdin_to_stdout(
10291027 )
10301028 if write_back == WriteBack .YES :
10311029 # Make sure there's a newline after the content
1032- if Preview .normalize_cr_newlines in mode :
1033- if dst and dst [- 1 ] != "\n " and dst [- 1 ] != "\r " :
1034- dst += newline
1035- else :
1036- if dst and dst [- 1 ] != "\n " :
1037- dst += "\n "
1030+ if dst and dst [- 1 ] != "\n " and dst [- 1 ] != "\r " :
1031+ dst += newline
10381032 f .write (dst )
10391033 elif write_back in (WriteBack .DIFF , WriteBack .COLOR_DIFF ):
10401034 now = datetime .now (timezone .utc )
@@ -1224,16 +1218,13 @@ def f(
12241218def _format_str_once (
12251219 src_contents : str , * , mode : Mode , lines : Collection [tuple [int , int ]] = ()
12261220) -> str :
1227- if Preview .normalize_cr_newlines in mode :
1228- normalized_contents , _ , newline_type = decode_bytes (
1229- src_contents .encode ("utf-8" ), mode
1230- )
1221+ normalized_contents , _ , newline_type = decode_bytes (
1222+ src_contents .encode ("utf-8" ), mode
1223+ )
12311224
1232- src_node = lib2to3_parse (
1233- normalized_contents .lstrip (), target_versions = mode .target_versions
1234- )
1235- else :
1236- src_node = lib2to3_parse (src_contents .lstrip (), mode .target_versions )
1225+ src_node = lib2to3_parse (
1226+ normalized_contents .lstrip (), target_versions = mode .target_versions
1227+ )
12371228
12381229 dst_blocks : list [LinesBlock ] = []
12391230 if mode .target_versions :
@@ -1280,22 +1271,9 @@ def _format_str_once(
12801271 for block in dst_blocks :
12811272 dst_contents .extend (block .all_lines ())
12821273 if not dst_contents :
1283- if Preview .normalize_cr_newlines in mode :
1284- if "\n " in normalized_contents :
1285- return newline_type
1286- else :
1287- # Use decode_bytes to retrieve the correct source newline (CRLF or LF),
1288- # and check if normalized_content has more than one line
1289- normalized_content , _ , newline = decode_bytes (
1290- src_contents .encode ("utf-8" ), mode
1291- )
1292- if "\n " in normalized_content :
1293- return newline
1294- return ""
1295- if Preview .normalize_cr_newlines in mode :
1296- return "" .join (dst_contents ).replace ("\n " , newline_type )
1297- else :
1298- return "" .join (dst_contents )
1274+ if "\n " in normalized_contents :
1275+ return newline_type
1276+ return "" .join (dst_contents ).replace ("\n " , newline_type )
12991277
13001278
13011279def decode_bytes (src : bytes , mode : Mode ) -> tuple [FileContent , Encoding , NewLine ]:
@@ -1309,24 +1287,21 @@ def decode_bytes(src: bytes, mode: Mode) -> tuple[FileContent, Encoding, NewLine
13091287 if not lines :
13101288 return "" , encoding , "\n "
13111289
1312- if Preview .normalize_cr_newlines in mode :
1313- if lines [0 ][- 2 :] == b"\r \n " :
1314- if b"\r " in lines [0 ][:- 2 ]:
1315- newline = "\r "
1316- else :
1317- newline = "\r \n "
1318- elif lines [0 ][- 1 :] == b"\n " :
1319- if b"\r " in lines [0 ][:- 1 ]:
1320- newline = "\r "
1321- else :
1322- newline = "\n "
1290+ if lines [0 ][- 2 :] == b"\r \n " :
1291+ if b"\r " in lines [0 ][:- 2 ]:
1292+ newline = "\r "
13231293 else :
1324- if b"\r " in lines [0 ]:
1325- newline = "\r "
1326- else :
1327- newline = "\n "
1294+ newline = "\r \n "
1295+ elif lines [0 ][- 1 :] == b"\n " :
1296+ if b"\r " in lines [0 ][:- 1 ]:
1297+ newline = "\r "
1298+ else :
1299+ newline = "\n "
13281300 else :
1329- newline = "\r \n " if lines [0 ][- 2 :] == b"\r \n " else "\n "
1301+ if b"\r " in lines [0 ]:
1302+ newline = "\r "
1303+ else :
1304+ newline = "\n "
13301305
13311306 srcbuf .seek (0 )
13321307 with io .TextIOWrapper (srcbuf , encoding ) as tiow :
0 commit comments